From 0e949ec9f07af4baf8cc84e85a47dcb261f96d70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sun, 9 May 2021 12:19:52 +0200 Subject: [PATCH] Rename for clarity. --- src/main/java/li/cil/oc2/client/ClientSetup.java | 4 ++-- ...tainerScreen.java => ComputerInventoryScreen.java} | 6 +++--- ...Container.java => ComputerInventoryContainer.java} | 8 ++++---- .../common/container/ComputerTerminalContainer.java | 11 +++++++++-- .../java/li/cil/oc2/common/container/Containers.java | 2 +- .../cil/oc2/common/tileentity/ComputerTileEntity.java | 6 +++--- 6 files changed, 22 insertions(+), 15 deletions(-) rename src/main/java/li/cil/oc2/client/gui/{ComputerContainerScreen.java => ComputerInventoryScreen.java} (89%) rename src/main/java/li/cil/oc2/common/container/{ComputerContainer.java => ComputerInventoryContainer.java} (86%) diff --git a/src/main/java/li/cil/oc2/client/ClientSetup.java b/src/main/java/li/cil/oc2/client/ClientSetup.java index e9cec6ba..f77d519f 100644 --- a/src/main/java/li/cil/oc2/client/ClientSetup.java +++ b/src/main/java/li/cil/oc2/client/ClientSetup.java @@ -1,7 +1,7 @@ package li.cil.oc2.client; import li.cil.oc2.api.bus.device.DeviceType; -import li.cil.oc2.client.gui.ComputerContainerScreen; +import li.cil.oc2.client.gui.ComputerInventoryScreen; import li.cil.oc2.client.gui.ComputerTerminalScreen; import li.cil.oc2.client.gui.RobotContainerScreen; import li.cil.oc2.client.gui.RobotTerminalScreen; @@ -38,7 +38,7 @@ public final class ClientSetup { CustomItemModelProperties.initialize(); CustomItemColors.initialize(); - ScreenManager.registerFactory(Containers.COMPUTER_CONTAINER.get(), ComputerContainerScreen::new); + ScreenManager.registerFactory(Containers.COMPUTER_CONTAINER.get(), ComputerInventoryScreen::new); ScreenManager.registerFactory(Containers.COMPUTER_TERMINAL_CONTAINER.get(), ComputerTerminalScreen::new); ScreenManager.registerFactory(Containers.ROBOT_CONTAINER.get(), RobotContainerScreen::new); ScreenManager.registerFactory(Containers.ROBOT_TERMINAL_CONTAINER.get(), RobotTerminalScreen::new); diff --git a/src/main/java/li/cil/oc2/client/gui/ComputerContainerScreen.java b/src/main/java/li/cil/oc2/client/gui/ComputerInventoryScreen.java similarity index 89% rename from src/main/java/li/cil/oc2/client/gui/ComputerContainerScreen.java rename to src/main/java/li/cil/oc2/client/gui/ComputerInventoryScreen.java index b61aba40..25a98fd3 100644 --- a/src/main/java/li/cil/oc2/client/gui/ComputerContainerScreen.java +++ b/src/main/java/li/cil/oc2/client/gui/ComputerInventoryScreen.java @@ -6,7 +6,7 @@ import li.cil.oc2.api.API; import li.cil.oc2.api.bus.device.DeviceTypes; import li.cil.oc2.client.gui.util.GuiUtils; import li.cil.oc2.common.Constants; -import li.cil.oc2.common.container.ComputerContainer; +import li.cil.oc2.common.container.ComputerInventoryContainer; import net.minecraft.client.gui.screen.inventory.ContainerScreen; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; @@ -15,12 +15,12 @@ import net.minecraft.util.text.TranslationTextComponent; import static java.util.Objects.requireNonNull; -public final class ComputerContainerScreen extends ContainerScreen { +public final class ComputerInventoryScreen extends ContainerScreen { private static final ResourceLocation BACKGROUND = new ResourceLocation(API.MOD_ID, "textures/gui/container/computer.png"); /////////////////////////////////////////////////////////////////// - public ComputerContainerScreen(final ComputerContainer container, final PlayerInventory inventory, final ITextComponent title) { + public ComputerInventoryScreen(final ComputerInventoryContainer container, final PlayerInventory inventory, final ITextComponent title) { super(container, inventory, title); xSize = 176; ySize = 197; diff --git a/src/main/java/li/cil/oc2/common/container/ComputerContainer.java b/src/main/java/li/cil/oc2/common/container/ComputerInventoryContainer.java similarity index 86% rename from src/main/java/li/cil/oc2/common/container/ComputerContainer.java rename to src/main/java/li/cil/oc2/common/container/ComputerInventoryContainer.java index 8d9c50bf..0b2e1f02 100644 --- a/src/main/java/li/cil/oc2/common/container/ComputerContainer.java +++ b/src/main/java/li/cil/oc2/common/container/ComputerInventoryContainer.java @@ -13,15 +13,15 @@ import net.minecraft.util.math.BlockPos; import javax.annotation.Nullable; -public final class ComputerContainer extends AbstractContainer { +public final class ComputerInventoryContainer extends AbstractContainer { @Nullable - public static ComputerContainer create(final int id, final PlayerInventory playerInventory, final PacketBuffer data) { + public static ComputerInventoryContainer create(final int id, final PlayerInventory playerInventory, final PacketBuffer data) { final BlockPos pos = data.readBlockPos(); final TileEntity tileEntity = playerInventory.player.getEntityWorld().getTileEntity(pos); if (!(tileEntity instanceof ComputerTileEntity)) { return null; } - return new ComputerContainer(id, (ComputerTileEntity) tileEntity, playerInventory); + return new ComputerInventoryContainer(id, (ComputerTileEntity) tileEntity, playerInventory); } /////////////////////////////////////////////////////////////////// @@ -30,7 +30,7 @@ public final class ComputerContainer extends AbstractContainer { /////////////////////////////////////////////////////////////////// - public ComputerContainer(final int id, final ComputerTileEntity computer, final PlayerInventory playerInventory) { + public ComputerInventoryContainer(final int id, final ComputerTileEntity computer, final PlayerInventory playerInventory) { super(Containers.COMPUTER_CONTAINER.get(), id); this.computer = computer; diff --git a/src/main/java/li/cil/oc2/common/container/ComputerTerminalContainer.java b/src/main/java/li/cil/oc2/common/container/ComputerTerminalContainer.java index 2454efce..cb2d1e37 100644 --- a/src/main/java/li/cil/oc2/common/container/ComputerTerminalContainer.java +++ b/src/main/java/li/cil/oc2/common/container/ComputerTerminalContainer.java @@ -25,7 +25,7 @@ public final class ComputerTerminalContainer extends AbstractContainer { if (!(tileEntity instanceof ComputerTileEntity)) { return null; } - return new ComputerTerminalContainer(id, (ComputerTileEntity) tileEntity, new IntArray(3)); + return new ComputerTerminalContainer(id, playerInventory.player, (ComputerTileEntity) tileEntity, new IntArray(3)); } /////////////////////////////////////////////////////////////////// @@ -35,7 +35,7 @@ public final class ComputerTerminalContainer extends AbstractContainer { /////////////////////////////////////////////////////////////////// - public ComputerTerminalContainer(final int id, final ComputerTileEntity computer, final IIntArray energyInfo) { + public ComputerTerminalContainer(final int id, final PlayerEntity player, final ComputerTileEntity computer, final IIntArray energyInfo) { super(Containers.COMPUTER_TERMINAL_CONTAINER.get(), id); this.computer = computer; this.energyInfo = energyInfo; @@ -66,4 +66,11 @@ public final class ComputerTerminalContainer extends AbstractContainer { public boolean canInteractWith(final PlayerEntity player) { return isWithinUsableDistance(IWorldPosCallable.of(computer.getWorld(), computer.getPos()), player, Blocks.COMPUTER.get()); } + + @Override + public void onContainerClosed(final PlayerEntity player) { + super.onContainerClosed(player); + + this.computer.removeTerminalUser(player); + } } diff --git a/src/main/java/li/cil/oc2/common/container/Containers.java b/src/main/java/li/cil/oc2/common/container/Containers.java index 95bd5c58..d801e75e 100644 --- a/src/main/java/li/cil/oc2/common/container/Containers.java +++ b/src/main/java/li/cil/oc2/common/container/Containers.java @@ -13,7 +13,7 @@ public final class Containers { /////////////////////////////////////////////////////////////////// - public static final RegistryObject> COMPUTER_CONTAINER = CONTAINERS.register("computer", () -> IForgeContainerType.create(ComputerContainer::create)); + public static final RegistryObject> COMPUTER_CONTAINER = CONTAINERS.register("computer", () -> IForgeContainerType.create(ComputerInventoryContainer::create)); public static final RegistryObject> COMPUTER_TERMINAL_CONTAINER = CONTAINERS.register("computer_terminal", () -> IForgeContainerType.create(ComputerTerminalContainer::create)); public static final RegistryObject> ROBOT_CONTAINER = CONTAINERS.register("robot", () -> IForgeContainerType.create(RobotContainer::create)); public static final RegistryObject> ROBOT_TERMINAL_CONTAINER = CONTAINERS.register("robot_terminal", () -> IForgeContainerType.create(RobotTerminalContainer::create)); diff --git a/src/main/java/li/cil/oc2/common/tileentity/ComputerTileEntity.java b/src/main/java/li/cil/oc2/common/tileentity/ComputerTileEntity.java index 3cfad315..b1955531 100644 --- a/src/main/java/li/cil/oc2/common/tileentity/ComputerTileEntity.java +++ b/src/main/java/li/cil/oc2/common/tileentity/ComputerTileEntity.java @@ -15,7 +15,7 @@ import li.cil.oc2.common.bus.TileEntityDeviceBusElement; import li.cil.oc2.common.bus.device.util.BlockDeviceInfo; import li.cil.oc2.common.bus.device.util.Devices; import li.cil.oc2.common.capabilities.Capabilities; -import li.cil.oc2.common.container.ComputerContainer; +import li.cil.oc2.common.container.ComputerInventoryContainer; import li.cil.oc2.common.container.ComputerTerminalContainer; import li.cil.oc2.common.container.DeviceItemStackHandler; import li.cil.oc2.common.energy.FixedEnergyStorage; @@ -129,7 +129,7 @@ public final class ComputerTileEntity extends AbstractTileEntity implements ITic @Override public Container createMenu(final int id, final PlayerInventory inventory, final PlayerEntity player) { - return new ComputerTerminalContainer(id, ComputerTileEntity.this, new IIntArray() { + return new ComputerTerminalContainer(id, player, ComputerTileEntity.this, new IIntArray() { @Override public int get(final int index) { switch (index) { @@ -166,7 +166,7 @@ public final class ComputerTileEntity extends AbstractTileEntity implements ITic @Override public Container createMenu(final int id, final PlayerInventory inventory, final PlayerEntity player) { - return new ComputerContainer(id, ComputerTileEntity.this, inventory); + return new ComputerInventoryContainer(id, ComputerTileEntity.this, inventory); } }, getPos()); }