Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename for clarity.

Browse Source
This commit is contained in:
Florian Nücke
2021-05-09 12:19:52 +02:00
parent 6aee30c29c
commit 0e949ec9f0
6 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/li/cil/oc2/client/ClientSetup.java
View File

@@ -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);

6
src/main/java/li/cil/oc2/client/gui/ComputerContainerScreen.java → src/main/java/li/cil/oc2/client/gui/ComputerInventoryScreen.java
View File

@@ -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<ComputerContainer> {
public final class ComputerInventoryScreen extends ContainerScreen<ComputerInventoryContainer> {
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;

8
src/main/java/li/cil/oc2/common/container/ComputerContainer.java → src/main/java/li/cil/oc2/common/container/ComputerInventoryContainer.java
View File

@@ -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;

11
src/main/java/li/cil/oc2/common/container/ComputerTerminalContainer.java
View File

@@ -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);
}
}

2
src/main/java/li/cil/oc2/common/container/Containers.java
View File

@@ -13,7 +13,7 @@ public final class Containers {
///////////////////////////////////////////////////////////////////
public static final RegistryObject<ContainerType<ComputerContainer>> COMPUTER_CONTAINER = CONTAINERS.register("computer", () -> IForgeContainerType.create(ComputerContainer::create));
public static final RegistryObject<ContainerType<ComputerInventoryContainer>> COMPUTER_CONTAINER = CONTAINERS.register("computer", () -> IForgeContainerType.create(ComputerInventoryContainer::create));
public static final RegistryObject<ContainerType<ComputerTerminalContainer>> COMPUTER_TERMINAL_CONTAINER = CONTAINERS.register("computer_terminal", () -> IForgeContainerType.create(ComputerTerminalContainer::create));
public static final RegistryObject<ContainerType<RobotContainer>> ROBOT_CONTAINER = CONTAINERS.register("robot", () -> IForgeContainerType.create(RobotContainer::create));
public static final RegistryObject<ContainerType<RobotTerminalContainer>> ROBOT_TERMINAL_CONTAINER = CONTAINERS.register("robot_terminal", () -> IForgeContainerType.create(RobotTerminalContainer::create));

6
src/main/java/li/cil/oc2/common/tileentity/ComputerTileEntity.java
View File

@@ -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());
}