Reformatted, and ported back some enhancements from the Forge version.

This commit is contained in:
Sebastian Hartte
2020-08-15 02:51:03 +02:00
parent 0a2f03aa92
commit 6c544f2211
358 changed files with 1124 additions and 1831 deletions
@@ -1,6 +1,5 @@
package appeng.integration.modules.jei;
import net.minecraft.client.resource.language.I18n;
import net.minecraft.util.Identifier;
import me.shedaniel.rei.api.EntryStack;
@@ -18,7 +18,6 @@
package appeng.integration.modules.jei;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
@@ -21,8 +21,6 @@ package appeng.integration.modules.jei;
import java.util.ArrayList;
import java.util.List;
import com.google.common.collect.ImmutableList;
import net.minecraft.util.Identifier;
import net.minecraft.util.Language;
@@ -27,14 +27,14 @@ import net.minecraft.block.entity.BlockEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.LiteralText;
import net.minecraft.text.Text;
import net.minecraft.util.hit.HitResult;
import net.minecraft.world.World;
import mcp.mobius.waila.Waila;
import mcp.mobius.waila.api.*;
import mcp.mobius.waila.api.impl.config.WailaConfig;
import mcp.mobius.waila.api.IComponentProvider;
import mcp.mobius.waila.api.IDataAccessor;
import mcp.mobius.waila.api.IPluginConfig;
import mcp.mobius.waila.api.IServerDataProvider;
import appeng.api.parts.IPart;
import appeng.api.parts.PartItemStack;
@@ -18,7 +18,9 @@
package appeng.integration.modules.waila;
import mcp.mobius.waila.api.*;
import mcp.mobius.waila.api.IRegistrar;
import mcp.mobius.waila.api.IWailaPlugin;
import mcp.mobius.waila.api.TooltipPosition;
import appeng.tile.AEBaseBlockEntity;
@@ -96,7 +96,6 @@ public final class ChannelWailaDataProvider extends BasePartWailaDataProvider {
* @param part part to be looked at
* @param tag tag maybe containing the channel information
* @param cache cache with previous knowledge
*
* @return used channels on the cable
*/
private byte getUsedChannels(final IPart part, final CompoundTag tag, final Object2ByteMap<IPart> cache) {
@@ -46,7 +46,6 @@ public final class PartAccessor {
*
* @param te being looked at {@link BlockEntity}
* @param rtr type of ray-trace
*
* @return maybe the looked at {@link IPart}
*/
public Optional<IPart> getMaybePart(final BlockEntity te, final HitResult rtr) {
@@ -61,7 +61,6 @@ public final class PowerStateWailaDataProvider extends BasePartWailaDataProvider
*
* @param isActive if part is active
* @param isPowered if part is powered
*
* @return tooltip of the state
*/
private Text getToolTip(final boolean isActive, final boolean isPowered) {
@@ -20,10 +20,8 @@ package appeng.integration.modules.waila.part;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.util.hit.HitResult;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import appeng.util.LookDirection;
@@ -43,7 +41,6 @@ public final class Tracer {
* @param world word of block
* @param player player viewing block
* @param pos pos of block
*
* @return trace movement. Can be null
*/
public HitResult retraceBlock(final World world, final PlayerEntity player, BlockPos pos) {
@@ -122,7 +122,6 @@ public final class PowerStorageWailaDataProvider extends BaseWailaDataProvider {
*
* @param te te to be looked at
* @param tag tag maybe containing the channel information
*
* @return used channels on the cable
*/
private long getInternalCurrentPower(final CompoundTag tag, final BlockEntity te) {