From 0232e83196bd637b0ff5c1d5e9cd245134e6fe94 Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sun, 14 Jun 2020 21:36:37 +0200 Subject: [PATCH] Consolidated ContainerHelpers. --- .../appeng/container/ContainerLocator.java | 2 +- .../helper/AbstractContainerHelper.java | 33 ------ .../container/helper/PartContainerHelper.java | 107 ------------------ .../container/helper/TileContainerHelper.java | 91 --------------- .../ContainerCellWorkbench.java | 6 +- .../implementations/ContainerChest.java | 6 +- .../implementations/ContainerCondenser.java | 6 +- .../implementations/ContainerCraftAmount.java | 1 - .../ContainerCraftConfirm.java | 1 - .../implementations/ContainerCraftingCPU.java | 7 +- .../ContainerCraftingStatus.java | 1 - .../ContainerCraftingTerm.java | 1 - .../implementations/ContainerDrive.java | 6 +- .../ContainerFormationPlane.java | 6 +- .../implementations/ContainerGrinder.java | 6 +- .../ContainerHelper.java | 34 ++++-- .../implementations/ContainerIOPort.java | 6 +- .../implementations/ContainerInscriber.java | 6 +- .../implementations/ContainerInterface.java | 1 - .../ContainerInterfaceTerminal.java | 6 +- .../ContainerLevelEmitter.java | 6 +- .../implementations/ContainerMAC.java | 6 +- .../ContainerMEMonitorable.java | 1 - .../ContainerMEPortableCell.java | 1 - .../ContainerNetworkStatus.java | 1 - .../implementations/ContainerNetworkTool.java | 1 - .../implementations/ContainerPatternTerm.java | 1 - .../implementations/ContainerPriority.java | 1 - .../implementations/ContainerQNB.java | 6 +- .../implementations/ContainerQuartzKnife.java | 1 - .../ContainerSecurityStation.java | 1 - .../implementations/ContainerSkyChest.java | 6 +- .../ContainerSpatialIOPort.java | 6 +- .../implementations/ContainerStorageBus.java | 6 +- .../implementations/ContainerUpgradeable.java | 1 - .../ContainerVibrationChamber.java | 6 +- .../implementations/ContainerWireless.java | 6 +- .../ContainerWirelessTerm.java | 1 - .../ContainerFluidFormationPlane.java | 6 +- .../fluids/container/ContainerFluidIO.java | 6 +- .../container/ContainerFluidInterface.java | 2 +- .../container/ContainerFluidLevelEmitter.java | 6 +- .../container/ContainerFluidStorageBus.java | 6 +- .../container/ContainerFluidTerminal.java | 2 +- 44 files changed, 92 insertions(+), 327 deletions(-) delete mode 100644 src/main/java/appeng/container/helper/AbstractContainerHelper.java delete mode 100644 src/main/java/appeng/container/helper/PartContainerHelper.java delete mode 100644 src/main/java/appeng/container/helper/TileContainerHelper.java rename src/main/java/appeng/container/{helper => implementations}/ContainerHelper.java (91%) diff --git a/src/main/java/appeng/container/ContainerLocator.java b/src/main/java/appeng/container/ContainerLocator.java index 1465c4c2b..3f63087df 100644 --- a/src/main/java/appeng/container/ContainerLocator.java +++ b/src/main/java/appeng/container/ContainerLocator.java @@ -182,7 +182,7 @@ public final class ContainerLocator { buf.writeByte(side.ordinal()); break; case BLOCK: - buf.writeByte(22); + buf.writeByte(2); buf.writeInt(dimensionId); buf.writeBlockPos(blockPos); break; diff --git a/src/main/java/appeng/container/helper/AbstractContainerHelper.java b/src/main/java/appeng/container/helper/AbstractContainerHelper.java deleted file mode 100644 index f1afe237f..000000000 --- a/src/main/java/appeng/container/helper/AbstractContainerHelper.java +++ /dev/null @@ -1,33 +0,0 @@ -package appeng.container.helper; - -import appeng.api.config.SecurityPermissions; -import appeng.api.networking.IGrid; -import appeng.api.networking.IGridNode; -import appeng.api.networking.energy.IEnergyGrid; -import appeng.api.networking.security.IActionHost; -import appeng.api.networking.security.ISecurityGrid; -import appeng.util.Platform; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; - -abstract class AbstractContainerHelper { - - private final SecurityPermissions requiredPermission; - - public AbstractContainerHelper(SecurityPermissions requiredPermission) { - this.requiredPermission = requiredPermission; - } - - protected boolean checkPermission(PlayerEntity player, Object accessInterface) { - - if (requiredPermission != null) - { - return Platform.checkPermissions(player, accessInterface, requiredPermission, true); - } - - return true; - - } - -} diff --git a/src/main/java/appeng/container/helper/PartContainerHelper.java b/src/main/java/appeng/container/helper/PartContainerHelper.java deleted file mode 100644 index 9184a2e19..000000000 --- a/src/main/java/appeng/container/helper/PartContainerHelper.java +++ /dev/null @@ -1,107 +0,0 @@ -package appeng.container.helper; - -import appeng.api.config.SecurityPermissions; -import appeng.api.parts.IPart; -import appeng.api.parts.IPartHost; -import appeng.container.AEBaseContainer; -import appeng.container.ContainerLocator; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.inventory.container.INamedContainerProvider; -import net.minecraft.inventory.container.SimpleNamedContainerProvider; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraftforge.fml.network.NetworkHooks; - -/** - * Helper for containers that can be opened for {@link appeng.api.parts.IPart parts} that are attached - * to a {@link appeng.api.parts.IPartHost part host}. - * - * @param - * @param

The type of part this container is for. - */ -public final class PartContainerHelper extends AbstractContainerHelper { - - private final Class

partClass; - - private final ContainerFactory factory; - - public PartContainerHelper(ContainerFactory factory, Class

partClass) { - this(factory, partClass, null); - } - - public PartContainerHelper(ContainerFactory factory, Class

partClass, SecurityPermissions requiredPermission) { - super(requiredPermission); - this.partClass = partClass; - this.factory = factory; - } - - /** - * Opens a container that is based around a single tile entity. - * The tile entity's position is encoded in the packet buffer. - */ - public C fromNetwork(int windowId, PlayerInventory inv, PacketBuffer packetBuf) { - BlockPos pos = packetBuf.readBlockPos(); - TileEntity te = inv.player.world.getTileEntity(pos); - if (partClass.isInstance(te)) { - return factory.create(windowId, inv, partClass.cast(te)); - } - return null; - } - - public boolean open(PlayerEntity player, ContainerLocator locator) { - if (!(player instanceof ServerPlayerEntity)) { - // Cannot open containers on the client or for non-players - // FIXME logging? - return false; - } - - if (!locator.hasBlockPos() || !locator.hasSide()) { - return false; // No block was clicked or the side is unknown - // FIXME: If no side is provided, should be try with INTERNAL??? - } - - TileEntity tileEntity = player.world.getTileEntity(locator.getBlockPos()); - if (!(tileEntity instanceof IPartHost)) { - // FIXME logging? - return false; // Wrong tile entity at block position - } - IPartHost partHost = (IPartHost) tileEntity; - IPart part = partHost.getPart(locator.getSide()); - if (!(partClass.isInstance(part))) { - // FIXME logging? - return false; - } - P actualPart = partClass.cast(tileEntity); - - if (!checkPermission(player, actualPart)) { - return false; - } - - // Use block name at position - // FIXME: this is not right, we'd need to check the part's item stack, or custom naming interface impl - ITextComponent title = player.world.getBlockState(locator.getBlockPos()).getBlock().getNameTextComponent(); - - INamedContainerProvider container = new SimpleNamedContainerProvider( - (wnd, p, pl) -> { - C c = factory.create(wnd, p, actualPart); - // Set the original locator on the opened server-side container for it to more - // easily remember how to re-open after being closed. - c.setLocator(locator); - return c; - }, title - ); - NetworkHooks.openGui((ServerPlayerEntity) player, container, locator.getBlockPos()); - - return true; - } - - @FunctionalInterface - public interface ContainerFactory { - C create(int windowId, PlayerInventory playerInv, T part); - } - -} diff --git a/src/main/java/appeng/container/helper/TileContainerHelper.java b/src/main/java/appeng/container/helper/TileContainerHelper.java deleted file mode 100644 index 63a654930..000000000 --- a/src/main/java/appeng/container/helper/TileContainerHelper.java +++ /dev/null @@ -1,91 +0,0 @@ -package appeng.container.helper; - -import appeng.api.config.SecurityPermissions; -import appeng.container.AEBaseContainer; -import appeng.container.ContainerLocator; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.inventory.container.INamedContainerProvider; -import net.minecraft.inventory.container.SimpleNamedContainerProvider; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraftforge.fml.network.NetworkHooks; - -public final class TileContainerHelper extends AbstractContainerHelper { - - private final Class tileEntityClass; - - private final ContainerFactory factory; - - private final SecurityPermissions requiredPermission; - - public TileContainerHelper(ContainerFactory factory, Class tileEntityClass) { - this(factory, tileEntityClass, null); - } - - public TileContainerHelper(ContainerFactory factory, Class tileEntityClass, SecurityPermissions requiredPermission) { - super(requiredPermission); - this.tileEntityClass = tileEntityClass; - this.factory = factory; - this.requiredPermission = requiredPermission; - } - - /** - * Opens a container that is based around a single tile entity. - * The tile entity's position is encoded in the packet buffer. - */ - public C fromNetwork(int windowId, PlayerInventory inv, PacketBuffer packetBuf) { - BlockPos pos = packetBuf.readBlockPos(); - TileEntity te = inv.player.world.getTileEntity(pos); - if (tileEntityClass.isInstance(te)) { - return factory.create(windowId, inv, tileEntityClass.cast(te)); - } - return null; - } - - public boolean open(PlayerEntity player, ContainerLocator locator) { - if (!(player instanceof ServerPlayerEntity)) { - // Cannot open containers on the client or for non-players - return false; - } - - if (!locator.hasBlockPos()) { - return false; // No block was clicked - } - - TileEntity tileEntity = player.world.getTileEntity(locator.getBlockPos()); - if (!tileEntityClass.isInstance(tileEntity)) { - return false; // Wrong tile entity at block position - } - T te = tileEntityClass.cast(tileEntity); - - if (!checkPermission(player, te)) { - return false; - } - - // Use block name at position - ITextComponent title = player.world.getBlockState(locator.getBlockPos()).getBlock().getNameTextComponent(); - - INamedContainerProvider container = new SimpleNamedContainerProvider( - (wnd, p, pl) -> { - C c = factory.create(wnd, p, te); - // Set the original locator on the opened server-side container for it to more - // easily remember how to re-open after being closed. - c.setLocator(locator); - return c; - }, title - ); - NetworkHooks.openGui((ServerPlayerEntity) player, container, locator.getBlockPos()); - - return true; - } - - @FunctionalInterface - public interface ContainerFactory { - C create(int windowId, PlayerInventory playerInv, T tileEntity); - } - -} diff --git a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java index 399c4377c..e791ac11b 100644 --- a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java +++ b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java @@ -22,7 +22,7 @@ package appeng.container.implementations; import java.util.Iterator; import appeng.container.ContainerLocator; -import appeng.container.helper.TileContainerHelper; +import appeng.container.implementations.ContainerHelper; import appeng.util.EnumCycler; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; @@ -60,8 +60,8 @@ public class ContainerCellWorkbench extends ContainerUpgradeable public static ContainerType TYPE; - private static final TileContainerHelper helper - = new TileContainerHelper<>(ContainerCellWorkbench::new, TileCellWorkbench.class); + private static final ContainerHelper helper + = new ContainerHelper<>(ContainerCellWorkbench::new, TileCellWorkbench.class); private final TileCellWorkbench workBench; @GuiSync( 2 ) diff --git a/src/main/java/appeng/container/implementations/ContainerChest.java b/src/main/java/appeng/container/implementations/ContainerChest.java index dbaca8e05..4753bf783 100644 --- a/src/main/java/appeng/container/implementations/ContainerChest.java +++ b/src/main/java/appeng/container/implementations/ContainerChest.java @@ -21,7 +21,7 @@ package appeng.container.implementations; import appeng.api.config.SecurityPermissions; import appeng.container.ContainerLocator; -import appeng.container.helper.TileContainerHelper; +import appeng.container.implementations.ContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; @@ -37,8 +37,8 @@ public class ContainerChest extends AEBaseContainer public static ContainerType TYPE; - private static final TileContainerHelper helper - = new TileContainerHelper<>(ContainerChest::new, TileChest.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper + = new ContainerHelper<>(ContainerChest::new, TileChest.class, SecurityPermissions.BUILD); public ContainerChest( int id, final PlayerInventory ip, final TileChest chest ) { diff --git a/src/main/java/appeng/container/implementations/ContainerCondenser.java b/src/main/java/appeng/container/implementations/ContainerCondenser.java index f3e92cdc1..8d1f38e63 100644 --- a/src/main/java/appeng/container/implementations/ContainerCondenser.java +++ b/src/main/java/appeng/container/implementations/ContainerCondenser.java @@ -24,7 +24,7 @@ import appeng.api.config.Settings; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.helper.TileContainerHelper; +import appeng.container.implementations.ContainerHelper; import appeng.container.interfaces.IProgressProvider; import appeng.container.slot.SlotOutput; import appeng.container.slot.SlotRestrictedInput; @@ -42,8 +42,8 @@ public class ContainerCondenser extends AEBaseContainer implements IProgressProv public static ContainerType TYPE; - private static final TileContainerHelper helper - = new TileContainerHelper<>(ContainerCondenser::new, TileCondenser.class); + private static final ContainerHelper helper + = new ContainerHelper<>(ContainerCondenser::new, TileCondenser.class); private final TileCondenser condenser; @GuiSync( 0 ) diff --git a/src/main/java/appeng/container/implementations/ContainerCraftAmount.java b/src/main/java/appeng/container/implementations/ContainerCraftAmount.java index 456061ab2..811555106 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftAmount.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftAmount.java @@ -22,7 +22,6 @@ package appeng.container.implementations; import javax.annotation.Nonnull; import appeng.container.ContainerLocator; -import appeng.container.helper.ContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; diff --git a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java index 86da73ec8..ea951a5c2 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java @@ -39,7 +39,6 @@ import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.container.guisync.GuiSync; -import appeng.container.helper.ContainerHelper; import appeng.core.AELog; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketMEInventoryUpdate; diff --git a/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java b/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java index 4d13a05c9..fce3da37b 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java @@ -24,7 +24,7 @@ import java.io.IOException; import appeng.api.AEApi; import appeng.api.config.SecurityPermissions; import appeng.container.ContainerLocator; -import appeng.container.helper.TileContainerHelper; +import appeng.container.implementations.ContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.entity.player.PlayerInventory; @@ -41,7 +41,6 @@ import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.container.AEBaseContainer; import appeng.container.guisync.GuiSync; -import appeng.core.AELog; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketMEInventoryUpdate; import appeng.core.sync.packets.PacketValueConfig; @@ -61,8 +60,8 @@ public class ContainerCraftingCPU extends AEBaseContainer implements IMEMonitorH public static ContainerType TYPE; - private static final TileContainerHelper helper - = new TileContainerHelper<>(ContainerCraftingCPU::new, TileCraftingTile.class, SecurityPermissions.CRAFT); + private static final ContainerHelper helper + = new ContainerHelper<>(ContainerCraftingCPU::new, TileCraftingTile.class, SecurityPermissions.CRAFT); private final IItemList list = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList(); private IGrid network; diff --git a/src/main/java/appeng/container/implementations/ContainerCraftingStatus.java b/src/main/java/appeng/container/implementations/ContainerCraftingStatus.java index 0541ec0b1..461d25f5d 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftingStatus.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftingStatus.java @@ -25,7 +25,6 @@ import java.util.List; import appeng.api.config.SecurityPermissions; import appeng.container.ContainerLocator; -import appeng.container.helper.ContainerHelper; import com.google.common.collect.ImmutableSet; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/appeng/container/implementations/ContainerCraftingTerm.java b/src/main/java/appeng/container/implementations/ContainerCraftingTerm.java index b007f8e02..acc1cd24a 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftingTerm.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftingTerm.java @@ -21,7 +21,6 @@ package appeng.container.implementations; import appeng.api.config.SecurityPermissions; import appeng.container.ContainerLocator; -import appeng.container.helper.ContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/appeng/container/implementations/ContainerDrive.java b/src/main/java/appeng/container/implementations/ContainerDrive.java index 2e8731643..20f33189a 100644 --- a/src/main/java/appeng/container/implementations/ContainerDrive.java +++ b/src/main/java/appeng/container/implementations/ContainerDrive.java @@ -20,7 +20,7 @@ package appeng.container.implementations; import appeng.container.ContainerLocator; -import appeng.container.helper.TileContainerHelper; +import appeng.container.implementations.ContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; @@ -36,8 +36,8 @@ public class ContainerDrive extends AEBaseContainer public static ContainerType TYPE; - private static final TileContainerHelper helper - = new TileContainerHelper<>(ContainerDrive::new, TileDrive.class); + private static final ContainerHelper helper + = new ContainerHelper<>(ContainerDrive::new, TileDrive.class); public static ContainerDrive fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); diff --git a/src/main/java/appeng/container/implementations/ContainerFormationPlane.java b/src/main/java/appeng/container/implementations/ContainerFormationPlane.java index 9f522375d..45caee754 100644 --- a/src/main/java/appeng/container/implementations/ContainerFormationPlane.java +++ b/src/main/java/appeng/container/implementations/ContainerFormationPlane.java @@ -20,7 +20,7 @@ package appeng.container.implementations; import appeng.container.ContainerLocator; -import appeng.container.helper.PartContainerHelper; +import appeng.container.implementations.ContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; @@ -45,8 +45,8 @@ public class ContainerFormationPlane extends ContainerUpgradeable public static ContainerType TYPE; - private static final PartContainerHelper helper - = new PartContainerHelper<>(ContainerFormationPlane::new, PartFormationPlane.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper + = new ContainerHelper<>(ContainerFormationPlane::new, PartFormationPlane.class, SecurityPermissions.BUILD); public static ContainerFormationPlane fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); diff --git a/src/main/java/appeng/container/implementations/ContainerGrinder.java b/src/main/java/appeng/container/implementations/ContainerGrinder.java index 85083ae0d..2209064b1 100644 --- a/src/main/java/appeng/container/implementations/ContainerGrinder.java +++ b/src/main/java/appeng/container/implementations/ContainerGrinder.java @@ -20,7 +20,7 @@ package appeng.container.implementations; import appeng.container.ContainerLocator; -import appeng.container.helper.TileContainerHelper; +import appeng.container.implementations.ContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; @@ -38,8 +38,8 @@ public class ContainerGrinder extends AEBaseContainer public static ContainerType TYPE; - private static final TileContainerHelper helper - = new TileContainerHelper<>(ContainerGrinder::new, TileGrinder.class); + private static final ContainerHelper helper + = new ContainerHelper<>(ContainerGrinder::new, TileGrinder.class); public static ContainerGrinder fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); diff --git a/src/main/java/appeng/container/helper/ContainerHelper.java b/src/main/java/appeng/container/implementations/ContainerHelper.java similarity index 91% rename from src/main/java/appeng/container/helper/ContainerHelper.java rename to src/main/java/appeng/container/implementations/ContainerHelper.java index 7ee4fa3d8..38071135a 100644 --- a/src/main/java/appeng/container/helper/ContainerHelper.java +++ b/src/main/java/appeng/container/implementations/ContainerHelper.java @@ -1,4 +1,4 @@ -package appeng.container.helper; +package appeng.container.implementations; import appeng.api.AEApi; import appeng.api.config.SecurityPermissions; @@ -12,6 +12,7 @@ import appeng.container.ContainerLocator; import appeng.core.AELog; import appeng.helpers.ICustomNameObject; import appeng.helpers.WirelessTerminalGuiObject; +import appeng.util.Platform; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.entity.player.ServerPlayerEntity; @@ -23,7 +24,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; -import net.minecraft.world.IWorld; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; @@ -33,18 +33,20 @@ import net.minecraftforge.fml.network.NetworkHooks; * * @param */ -public final class ContainerHelper extends AbstractContainerHelper { +public final class ContainerHelper { private final Class interfaceClass; private final ContainerFactory factory; + private final SecurityPermissions requiredPermission; + public ContainerHelper(ContainerFactory factory, Class interfaceClass) { this(factory, interfaceClass, null); } public ContainerHelper(ContainerFactory factory, Class interfaceClass, SecurityPermissions requiredPermission) { - super(requiredPermission); + this.requiredPermission = requiredPermission; this.interfaceClass = interfaceClass; this.factory = factory; } @@ -119,9 +121,8 @@ public final class ContainerHelper extends Abstrac return getHostFromPlayerInventory(player, locator); } - if (!locator.hasBlockPos() || !locator.hasSide()) { - return null; // No block was clicked or the side is unknown - // FIXME: If no side is provided, should be try with INTERNAL??? + if (!locator.hasBlockPos()) { + return null; // No block was clicked } TileEntity tileEntity = player.world.getTileEntity(locator.getBlockPos()); @@ -129,7 +130,13 @@ public final class ContainerHelper extends Abstrac // The tile entity itself can host a terminal (i.e. Chest!) if (interfaceClass.isInstance(tileEntity)) { return interfaceClass.cast(tileEntity); - } else if (tileEntity instanceof IPartHost) { + } + + if (!locator.hasSide()) { + return null; + } + + if (tileEntity instanceof IPartHost) { // But it could also be a part attached to the tile entity IPartHost partHost = (IPartHost) tileEntity; IPart part = partHost.getPart(locator.getSide()); @@ -187,4 +194,15 @@ public final class ContainerHelper extends Abstrac C create(int windowId, PlayerInventory playerInv, I accessObj); } + private boolean checkPermission(PlayerEntity player, Object accessInterface) { + + if (requiredPermission != null) + { + return Platform.checkPermissions(player, accessInterface, requiredPermission, true); + } + + return true; + + } + } diff --git a/src/main/java/appeng/container/implementations/ContainerIOPort.java b/src/main/java/appeng/container/implementations/ContainerIOPort.java index a94bed938..065463baa 100644 --- a/src/main/java/appeng/container/implementations/ContainerIOPort.java +++ b/src/main/java/appeng/container/implementations/ContainerIOPort.java @@ -20,7 +20,7 @@ package appeng.container.implementations; import appeng.container.ContainerLocator; -import appeng.container.helper.TileContainerHelper; +import appeng.container.implementations.ContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; @@ -44,8 +44,8 @@ public class ContainerIOPort extends ContainerUpgradeable public static ContainerType TYPE; - private static final TileContainerHelper helper - = new TileContainerHelper<>(ContainerIOPort::new, TileIOPort.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper + = new ContainerHelper<>(ContainerIOPort::new, TileIOPort.class, SecurityPermissions.BUILD); public static ContainerIOPort fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); diff --git a/src/main/java/appeng/container/implementations/ContainerInscriber.java b/src/main/java/appeng/container/implementations/ContainerInscriber.java index ae590a454..55f32c6ed 100644 --- a/src/main/java/appeng/container/implementations/ContainerInscriber.java +++ b/src/main/java/appeng/container/implementations/ContainerInscriber.java @@ -23,7 +23,7 @@ import appeng.api.AEApi; import appeng.api.definitions.IItemDefinition; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.helper.TileContainerHelper; +import appeng.container.implementations.ContainerHelper; import appeng.container.interfaces.IProgressProvider; import appeng.container.slot.SlotOutput; import appeng.container.slot.SlotRestrictedInput; @@ -50,8 +50,8 @@ public class ContainerInscriber extends ContainerUpgradeable implements IProgres public static ContainerType TYPE; - private static final TileContainerHelper helper - = new TileContainerHelper<>(ContainerInscriber::new, TileInscriber.class); + private static final ContainerHelper helper + = new ContainerHelper<>(ContainerInscriber::new, TileInscriber.class); public static ContainerInscriber fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); diff --git a/src/main/java/appeng/container/implementations/ContainerInterface.java b/src/main/java/appeng/container/implementations/ContainerInterface.java index 5c6f982b7..46b7f3935 100644 --- a/src/main/java/appeng/container/implementations/ContainerInterface.java +++ b/src/main/java/appeng/container/implementations/ContainerInterface.java @@ -20,7 +20,6 @@ package appeng.container.implementations; import appeng.container.ContainerLocator; -import appeng.container.helper.ContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; diff --git a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java b/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java index 375b69f8b..08efa928e 100644 --- a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java +++ b/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java @@ -26,8 +26,6 @@ import java.util.Map.Entry; import appeng.api.config.SecurityPermissions; import appeng.container.ContainerLocator; -import appeng.container.helper.PartContainerHelper; -import appeng.container.helper.TileContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.entity.player.PlayerInventory; @@ -68,8 +66,8 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer public static ContainerType TYPE; - private static final PartContainerHelper helper - = new PartContainerHelper<>(ContainerInterfaceTerminal::new, PartInterfaceTerminal.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper + = new ContainerHelper<>(ContainerInterfaceTerminal::new, PartInterfaceTerminal.class, SecurityPermissions.BUILD); public static ContainerInterfaceTerminal fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); diff --git a/src/main/java/appeng/container/implementations/ContainerLevelEmitter.java b/src/main/java/appeng/container/implementations/ContainerLevelEmitter.java index b4fe118f7..f2ccfbb8b 100644 --- a/src/main/java/appeng/container/implementations/ContainerLevelEmitter.java +++ b/src/main/java/appeng/container/implementations/ContainerLevelEmitter.java @@ -20,8 +20,6 @@ package appeng.container.implementations; import appeng.container.ContainerLocator; -import appeng.container.helper.PartContainerHelper; -import appeng.container.helper.TileContainerHelper; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; @@ -49,8 +47,8 @@ public class ContainerLevelEmitter extends ContainerUpgradeable public static ContainerType TYPE; - private static final PartContainerHelper helper - = new PartContainerHelper<>(ContainerLevelEmitter::new, PartLevelEmitter.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper + = new ContainerHelper<>(ContainerLevelEmitter::new, PartLevelEmitter.class, SecurityPermissions.BUILD); public static ContainerLevelEmitter fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); diff --git a/src/main/java/appeng/container/implementations/ContainerMAC.java b/src/main/java/appeng/container/implementations/ContainerMAC.java index 1930a7ccf..24cc356ee 100644 --- a/src/main/java/appeng/container/implementations/ContainerMAC.java +++ b/src/main/java/appeng/container/implementations/ContainerMAC.java @@ -25,7 +25,7 @@ import appeng.api.config.Settings; import appeng.api.networking.crafting.ICraftingPatternDetails; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.helper.TileContainerHelper; +import appeng.container.implementations.ContainerHelper; import appeng.container.interfaces.IProgressProvider; import appeng.container.slot.SlotMACPattern; import appeng.container.slot.SlotOutput; @@ -47,8 +47,8 @@ public class ContainerMAC extends ContainerUpgradeable implements IProgressProvi public static ContainerType TYPE; - private static final TileContainerHelper helper - = new TileContainerHelper<>(ContainerMAC::new, TileMolecularAssembler.class); + private static final ContainerHelper helper + = new ContainerHelper<>(ContainerMAC::new, TileMolecularAssembler.class); public static ContainerMAC fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); diff --git a/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java b/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java index 8068e6f40..ef83c5c28 100644 --- a/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java +++ b/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java @@ -26,7 +26,6 @@ import javax.annotation.Nonnull; import appeng.api.implementations.guiobjects.IGuiItemObject; import appeng.container.ContainerLocator; -import appeng.container.helper.ContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.entity.player.PlayerInventory; diff --git a/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java b/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java index 34fb8b58a..f0e08d2ab 100644 --- a/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java +++ b/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java @@ -20,7 +20,6 @@ package appeng.container.implementations; import appeng.container.ContainerLocator; -import appeng.container.helper.ContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; diff --git a/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java b/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java index d173ca1c5..1531c3efd 100644 --- a/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java +++ b/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java @@ -22,7 +22,6 @@ package appeng.container.implementations; import java.io.IOException; import appeng.container.ContainerLocator; -import appeng.container.helper.ContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.entity.player.PlayerInventory; diff --git a/src/main/java/appeng/container/implementations/ContainerNetworkTool.java b/src/main/java/appeng/container/implementations/ContainerNetworkTool.java index 3fc7bde77..dfdf921d7 100644 --- a/src/main/java/appeng/container/implementations/ContainerNetworkTool.java +++ b/src/main/java/appeng/container/implementations/ContainerNetworkTool.java @@ -23,7 +23,6 @@ import appeng.api.implementations.guiobjects.INetworkTool; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.helper.ContainerHelper; import appeng.container.slot.SlotRestrictedInput; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; diff --git a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java index 739ec3136..0c562c792 100644 --- a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java +++ b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java @@ -31,7 +31,6 @@ import appeng.api.storage.data.IItemList; import appeng.container.ContainerLocator; import appeng.container.ContainerNull; import appeng.container.guisync.GuiSync; -import appeng.container.helper.ContainerHelper; import appeng.container.slot.*; import appeng.core.sync.packets.PacketPatternSlot; import appeng.helpers.IContainerCraftingPacket; diff --git a/src/main/java/appeng/container/implementations/ContainerPriority.java b/src/main/java/appeng/container/implementations/ContainerPriority.java index 08b668e7a..9a84cb8d6 100644 --- a/src/main/java/appeng/container/implementations/ContainerPriority.java +++ b/src/main/java/appeng/container/implementations/ContainerPriority.java @@ -20,7 +20,6 @@ package appeng.container.implementations; import appeng.container.ContainerLocator; -import appeng.container.helper.ContainerHelper; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; diff --git a/src/main/java/appeng/container/implementations/ContainerQNB.java b/src/main/java/appeng/container/implementations/ContainerQNB.java index 0c333c16a..9c5b95a92 100644 --- a/src/main/java/appeng/container/implementations/ContainerQNB.java +++ b/src/main/java/appeng/container/implementations/ContainerQNB.java @@ -21,7 +21,7 @@ package appeng.container.implementations; import appeng.api.config.SecurityPermissions; import appeng.container.ContainerLocator; -import appeng.container.helper.TileContainerHelper; +import appeng.container.implementations.ContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; @@ -37,8 +37,8 @@ public class ContainerQNB extends AEBaseContainer public static ContainerType TYPE; - private static final TileContainerHelper helper - = new TileContainerHelper<>(ContainerQNB::new, TileQuantumBridge.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper + = new ContainerHelper<>(ContainerQNB::new, TileQuantumBridge.class, SecurityPermissions.BUILD); public static ContainerQNB fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); diff --git a/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java b/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java index 006741add..192070fe2 100644 --- a/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java +++ b/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java @@ -22,7 +22,6 @@ package appeng.container.implementations; import javax.annotation.Nonnull; import appeng.container.ContainerLocator; -import appeng.container.helper.ContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; diff --git a/src/main/java/appeng/container/implementations/ContainerSecurityStation.java b/src/main/java/appeng/container/implementations/ContainerSecurityStation.java index ca45e8f61..aedf1d9ec 100644 --- a/src/main/java/appeng/container/implementations/ContainerSecurityStation.java +++ b/src/main/java/appeng/container/implementations/ContainerSecurityStation.java @@ -20,7 +20,6 @@ package appeng.container.implementations; import appeng.container.ContainerLocator; -import appeng.container.helper.ContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; diff --git a/src/main/java/appeng/container/implementations/ContainerSkyChest.java b/src/main/java/appeng/container/implementations/ContainerSkyChest.java index 92f6335a2..d3cf4635f 100644 --- a/src/main/java/appeng/container/implementations/ContainerSkyChest.java +++ b/src/main/java/appeng/container/implementations/ContainerSkyChest.java @@ -20,7 +20,7 @@ package appeng.container.implementations; import appeng.container.ContainerLocator; -import appeng.container.helper.TileContainerHelper; +import appeng.container.implementations.ContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; @@ -36,8 +36,8 @@ public class ContainerSkyChest extends AEBaseContainer public static ContainerType TYPE; - private static final TileContainerHelper helper - = new TileContainerHelper<>(ContainerSkyChest::new, TileSkyChest.class); + private static final ContainerHelper helper + = new ContainerHelper<>(ContainerSkyChest::new, TileSkyChest.class); private final TileSkyChest chest; diff --git a/src/main/java/appeng/container/implementations/ContainerSpatialIOPort.java b/src/main/java/appeng/container/implementations/ContainerSpatialIOPort.java index 37a8469b1..6ff8ea0c8 100644 --- a/src/main/java/appeng/container/implementations/ContainerSpatialIOPort.java +++ b/src/main/java/appeng/container/implementations/ContainerSpatialIOPort.java @@ -20,7 +20,7 @@ package appeng.container.implementations; import appeng.container.ContainerLocator; -import appeng.container.helper.TileContainerHelper; +import appeng.container.implementations.ContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; @@ -45,8 +45,8 @@ public class ContainerSpatialIOPort extends AEBaseContainer public static ContainerType TYPE; - private static final TileContainerHelper helper - = new TileContainerHelper<>(ContainerSpatialIOPort::new, TileSpatialIOPort.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper + = new ContainerHelper<>(ContainerSpatialIOPort::new, TileSpatialIOPort.class, SecurityPermissions.BUILD); @GuiSync( 0 ) public long currentPower; diff --git a/src/main/java/appeng/container/implementations/ContainerStorageBus.java b/src/main/java/appeng/container/implementations/ContainerStorageBus.java index 24052d8e5..7bf788e05 100644 --- a/src/main/java/appeng/container/implementations/ContainerStorageBus.java +++ b/src/main/java/appeng/container/implementations/ContainerStorageBus.java @@ -22,8 +22,6 @@ package appeng.container.implementations; import java.util.Iterator; import appeng.container.ContainerLocator; -import appeng.container.helper.PartContainerHelper; -import appeng.container.helper.TileContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; @@ -57,8 +55,8 @@ public class ContainerStorageBus extends ContainerUpgradeable public static ContainerType TYPE; - private static final PartContainerHelper helper - = new PartContainerHelper<>(ContainerStorageBus::new, PartStorageBus.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper + = new ContainerHelper<>(ContainerStorageBus::new, PartStorageBus.class, SecurityPermissions.BUILD); public static ContainerStorageBus fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); diff --git a/src/main/java/appeng/container/implementations/ContainerUpgradeable.java b/src/main/java/appeng/container/implementations/ContainerUpgradeable.java index 42fe55941..cfe38ba4e 100644 --- a/src/main/java/appeng/container/implementations/ContainerUpgradeable.java +++ b/src/main/java/appeng/container/implementations/ContainerUpgradeable.java @@ -20,7 +20,6 @@ package appeng.container.implementations; import appeng.container.ContainerLocator; -import appeng.container.helper.ContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/appeng/container/implementations/ContainerVibrationChamber.java b/src/main/java/appeng/container/implementations/ContainerVibrationChamber.java index 0e1f6c822..a7c6dad4e 100644 --- a/src/main/java/appeng/container/implementations/ContainerVibrationChamber.java +++ b/src/main/java/appeng/container/implementations/ContainerVibrationChamber.java @@ -20,7 +20,7 @@ package appeng.container.implementations; import appeng.container.ContainerLocator; -import appeng.container.helper.TileContainerHelper; +import appeng.container.implementations.ContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; @@ -39,8 +39,8 @@ public class ContainerVibrationChamber extends AEBaseContainer implements IProgr public static ContainerType TYPE; - private static final TileContainerHelper helper - = new TileContainerHelper<>(ContainerVibrationChamber::new, TileVibrationChamber.class); + private static final ContainerHelper helper + = new ContainerHelper<>(ContainerVibrationChamber::new, TileVibrationChamber.class); public static ContainerVibrationChamber fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); diff --git a/src/main/java/appeng/container/implementations/ContainerWireless.java b/src/main/java/appeng/container/implementations/ContainerWireless.java index b8654efb8..188e03105 100644 --- a/src/main/java/appeng/container/implementations/ContainerWireless.java +++ b/src/main/java/appeng/container/implementations/ContainerWireless.java @@ -21,7 +21,7 @@ package appeng.container.implementations; import appeng.api.config.SecurityPermissions; import appeng.container.ContainerLocator; -import appeng.container.helper.TileContainerHelper; +import appeng.container.implementations.ContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; @@ -39,8 +39,8 @@ public class ContainerWireless extends AEBaseContainer public static ContainerType TYPE; - private static final TileContainerHelper helper - = new TileContainerHelper<>(ContainerWireless::new, TileWireless.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper + = new ContainerHelper<>(ContainerWireless::new, TileWireless.class, SecurityPermissions.BUILD); public static ContainerWireless fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); diff --git a/src/main/java/appeng/container/implementations/ContainerWirelessTerm.java b/src/main/java/appeng/container/implementations/ContainerWirelessTerm.java index 7d9726b9d..4c6ad2637 100644 --- a/src/main/java/appeng/container/implementations/ContainerWirelessTerm.java +++ b/src/main/java/appeng/container/implementations/ContainerWirelessTerm.java @@ -20,7 +20,6 @@ package appeng.container.implementations; import appeng.container.ContainerLocator; -import appeng.container.helper.ContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; diff --git a/src/main/java/appeng/fluids/container/ContainerFluidFormationPlane.java b/src/main/java/appeng/fluids/container/ContainerFluidFormationPlane.java index 68fdc6083..bb5567762 100644 --- a/src/main/java/appeng/fluids/container/ContainerFluidFormationPlane.java +++ b/src/main/java/appeng/fluids/container/ContainerFluidFormationPlane.java @@ -3,7 +3,7 @@ package appeng.fluids.container; import appeng.container.ContainerLocator; -import appeng.container.helper.PartContainerHelper; +import appeng.container.implementations.ContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; @@ -23,8 +23,8 @@ public class ContainerFluidFormationPlane extends ContainerFluidConfigurable public static ContainerType TYPE; - private static final PartContainerHelper helper - = new PartContainerHelper<>(ContainerFluidFormationPlane::new, PartFluidFormationPlane.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper + = new ContainerHelper<>(ContainerFluidFormationPlane::new, PartFluidFormationPlane.class, SecurityPermissions.BUILD); public static ContainerFluidFormationPlane fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); diff --git a/src/main/java/appeng/fluids/container/ContainerFluidIO.java b/src/main/java/appeng/fluids/container/ContainerFluidIO.java index 88fa051f0..72585e221 100644 --- a/src/main/java/appeng/fluids/container/ContainerFluidIO.java +++ b/src/main/java/appeng/fluids/container/ContainerFluidIO.java @@ -21,7 +21,7 @@ package appeng.fluids.container; import appeng.api.config.SecurityPermissions; import appeng.container.ContainerLocator; -import appeng.container.helper.PartContainerHelper; +import appeng.container.implementations.ContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; @@ -41,8 +41,8 @@ public class ContainerFluidIO extends ContainerFluidConfigurable public static ContainerType TYPE; - private static final PartContainerHelper helper - = new PartContainerHelper<>(ContainerFluidIO::new, PartSharedFluidBus.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper + = new ContainerHelper<>(ContainerFluidIO::new, PartSharedFluidBus.class, SecurityPermissions.BUILD); public static ContainerFluidIO fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); diff --git a/src/main/java/appeng/fluids/container/ContainerFluidInterface.java b/src/main/java/appeng/fluids/container/ContainerFluidInterface.java index 8cf3f7451..49eed60ec 100644 --- a/src/main/java/appeng/fluids/container/ContainerFluidInterface.java +++ b/src/main/java/appeng/fluids/container/ContainerFluidInterface.java @@ -23,7 +23,7 @@ import appeng.api.config.SecurityPermissions; import appeng.api.storage.data.IAEFluidStack; import appeng.api.util.IConfigManager; import appeng.container.ContainerLocator; -import appeng.container.helper.ContainerHelper; +import appeng.container.implementations.ContainerHelper; import appeng.fluids.helper.DualityFluidInterface; import appeng.fluids.helper.FluidSyncHelper; import appeng.fluids.helper.IFluidInterfaceHost; diff --git a/src/main/java/appeng/fluids/container/ContainerFluidLevelEmitter.java b/src/main/java/appeng/fluids/container/ContainerFluidLevelEmitter.java index 641b6880f..9ad549c95 100644 --- a/src/main/java/appeng/fluids/container/ContainerFluidLevelEmitter.java +++ b/src/main/java/appeng/fluids/container/ContainerFluidLevelEmitter.java @@ -2,7 +2,7 @@ package appeng.fluids.container; import appeng.container.ContainerLocator; -import appeng.container.helper.PartContainerHelper; +import appeng.container.implementations.ContainerHelper; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; @@ -24,8 +24,8 @@ public class ContainerFluidLevelEmitter extends ContainerFluidConfigurable { public static ContainerType TYPE; - private static final PartContainerHelper helper - = new PartContainerHelper<>(ContainerFluidLevelEmitter::new, PartFluidLevelEmitter.class, SecurityPermissions.BUILD); + private static final ContainerHelper helper + = new ContainerHelper<>(ContainerFluidLevelEmitter::new, PartFluidLevelEmitter.class, SecurityPermissions.BUILD); public static ContainerFluidLevelEmitter fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); diff --git a/src/main/java/appeng/fluids/container/ContainerFluidStorageBus.java b/src/main/java/appeng/fluids/container/ContainerFluidStorageBus.java index 7e2145c02..78558233d 100644 --- a/src/main/java/appeng/fluids/container/ContainerFluidStorageBus.java +++ b/src/main/java/appeng/fluids/container/ContainerFluidStorageBus.java @@ -22,7 +22,7 @@ package appeng.fluids.container; import java.util.Iterator; import appeng.container.ContainerLocator; -import appeng.container.helper.PartContainerHelper; +import appeng.container.implementations.ContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; @@ -58,8 +58,8 @@ public class ContainerFluidStorageBus extends ContainerFluidConfigurable public static ContainerType TYPE; - private static final PartContainerHelper helper - = new PartContainerHelper<>(ContainerFluidStorageBus::new, PartFluidStorageBus.class); + private static final ContainerHelper helper + = new ContainerHelper<>(ContainerFluidStorageBus::new, PartFluidStorageBus.class); public static ContainerFluidStorageBus fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { return helper.fromNetwork(windowId, inv, buf); diff --git a/src/main/java/appeng/fluids/container/ContainerFluidTerminal.java b/src/main/java/appeng/fluids/container/ContainerFluidTerminal.java index 96ec7e691..6074e3e71 100644 --- a/src/main/java/appeng/fluids/container/ContainerFluidTerminal.java +++ b/src/main/java/appeng/fluids/container/ContainerFluidTerminal.java @@ -26,7 +26,7 @@ import javax.annotation.Nonnull; import appeng.api.AEApi; import appeng.api.config.*; import appeng.container.ContainerLocator; -import appeng.container.helper.ContainerHelper; +import appeng.container.implementations.ContainerHelper; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.entity.player.ServerPlayerEntity;