From 28e1fdd7f50234d9938705e8b48d864372466363 Mon Sep 17 00:00:00 2001 From: Boblet Date: Thu, 11 Jul 2024 16:05:25 +0200 Subject: [PATCH] cleanup --- .../container/ContainerAutocrafter.java | 1 - .../inventory/container/ContainerBase.java | 127 ++++++++++-------- .../container/ContainerCounterTorch.java | 1 - .../container/ContainerCraneExtractor.java | 1 - .../container/ContainerCraneGrabber.java | 1 - .../container/ContainerCraneRouter.java | 1 - .../container/ContainerCrateBase.java | 9 +- .../container/ContainerMassStorage.java | 1 - .../hbm/inventory/gui/GuiInfoContainer.java | 2 +- 9 files changed, 72 insertions(+), 72 deletions(-) diff --git a/src/main/java/com/hbm/inventory/container/ContainerAutocrafter.java b/src/main/java/com/hbm/inventory/container/ContainerAutocrafter.java index 21f07dd43..a84b3f81c 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerAutocrafter.java +++ b/src/main/java/com/hbm/inventory/container/ContainerAutocrafter.java @@ -5,7 +5,6 @@ import com.hbm.tileentity.machine.TileEntityMachineAutocrafter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/hbm/inventory/container/ContainerBase.java b/src/main/java/com/hbm/inventory/container/ContainerBase.java index 76802fab2..2dd45772b 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerBase.java +++ b/src/main/java/com/hbm/inventory/container/ContainerBase.java @@ -7,75 +7,84 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -/**For now, only used for stuff with filters and crates as a reference implementation, - * because I really needed to get the te from a container - * But you should very much use this to kill the giant amount of boilerplate in container classes - * @author 70k **/ +/** + * For now, only used for stuff with filters and crates as a reference + * implementation, because I really needed to get the te from a container But + * you should very much use this to kill the giant amount of boilerplate in + * container classes + * + * @author 70k + **/ public class ContainerBase extends Container { - public IInventory te; + public IInventory tile; - public ContainerBase (InventoryPlayer invPlayer, IInventory tedf){ - te = tedf; - } - @Override - public boolean canInteractWith(EntityPlayer player) { - return te.isUseableByPlayer(player); - } + public ContainerBase(InventoryPlayer invPlayer, IInventory tedf) { + tile = tedf; + } - @Override - public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) { - ItemStack var3 = null; - Slot var4 = (Slot) this.inventorySlots.get(par2); + @Override + public boolean canInteractWith(EntityPlayer player) { + return tile.isUseableByPlayer(player); + } - if(var4 != null && var4.getHasStack()) { - ItemStack var5 = var4.getStack(); - var3 = var5.copy(); + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int index) { + ItemStack slotOriginal = null; + Slot slot = (Slot) this.inventorySlots.get(index); - if(par2 <= te.getSizeInventory() - 1) { - if(!this.mergeItemStack(var5, te.getSizeInventory(), this.inventorySlots.size(), true)) { - return null; - } - } else if(!this.mergeItemStack(var5, 0, te.getSizeInventory(), false)) { - return null; - } + if(slot != null && slot.getHasStack()) { + ItemStack slotStack = slot.getStack(); + slotOriginal = slotStack.copy(); - if(var5.stackSize == 0) { - var4.putStack(null); - } else { - var4.onSlotChanged(); - } + if(index <= tile.getSizeInventory() - 1) { + if(!this.mergeItemStack(slotStack, tile.getSizeInventory(), this.inventorySlots.size(), true)) { + return null; + } + } else if(!this.mergeItemStack(slotStack, 0, tile.getSizeInventory(), false)) { + return null; + } - var4.onPickupFromSlot(p_82846_1_, var5); - } + if(slotStack.stackSize == 0) { + slot.putStack(null); + } else { + slot.onSlotChanged(); + } - return var3; - } + slot.onPickupFromSlot(player, slotStack); + } - /**Used to quickly set up the player inventory*/ - public void playerInv(InventoryPlayer invPlayer, int playerInvX, int playerInvY, int playerHotbarY){ - for(int i = 0; i < 3; i++) { - for(int j = 0; j < 9; j++) { - this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, playerInvX + j * 18, playerInvY + i * 18)); - } - } + return slotOriginal; + } - for(int i = 0; i < 9; i++) { - this.addSlotToContainer(new Slot(invPlayer, i, playerInvX + i * 18, playerHotbarY)); - } - } + /** Used to quickly set up the player inventory */ + public void playerInv(InventoryPlayer invPlayer, int playerInvX, int playerInvY, int playerHotbarY) { + for(int i = 0; i < 3; i++) { + for(int j = 0; j < 9; j++) { + this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, playerInvX + j * 18, playerInvY + i * 18)); + } + } - // I'm gonna make a farken helper function for this shit, why was it done the old way for 9 whole ass years? - //- Mellow, 1884 - /**Used to add several conventional inventory slots at a time - * @param inv the inventory to add the slots to - * @param from the slot index to start from*/ - public void addSlots(IInventory inv, int from, int x, int y, int rows, int cols) { - int slotSize = 18; - for(int row = 0; row < rows; row++) { - for(int col = 0; col < cols; col++) { - this.addSlotToContainer(new Slot(inv, col + row * cols + from, x + col * slotSize, y + row * slotSize)); - } - } - } + for(int i = 0; i < 9; i++) { + this.addSlotToContainer(new Slot(invPlayer, i, playerInvX + i * 18, playerHotbarY)); + } + } + + // I'm gonna make a farken helper function for this shit, why was it done + // the old way for 9 whole ass years? + // - Mellow, 1884 + /** + * Used to add several conventional inventory slots at a time + * + * @param inv the inventory to add the slots to + * @param from the slot index to start from + */ + public void addSlots(IInventory inv, int from, int x, int y, int rows, int cols) { + int slotSize = 18; + for(int row = 0; row < rows; row++) { + for(int col = 0; col < cols; col++) { + this.addSlotToContainer(new Slot(inv, col + row * cols + from, x + col * slotSize, y + row * slotSize)); + } + } + } } diff --git a/src/main/java/com/hbm/inventory/container/ContainerCounterTorch.java b/src/main/java/com/hbm/inventory/container/ContainerCounterTorch.java index c79d451ac..925b3d7e1 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerCounterTorch.java +++ b/src/main/java/com/hbm/inventory/container/ContainerCounterTorch.java @@ -5,7 +5,6 @@ import com.hbm.tileentity.network.TileEntityRadioTorchCounter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/hbm/inventory/container/ContainerCraneExtractor.java b/src/main/java/com/hbm/inventory/container/ContainerCraneExtractor.java index 0865ba1cc..5c6cc998e 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerCraneExtractor.java +++ b/src/main/java/com/hbm/inventory/container/ContainerCraneExtractor.java @@ -7,7 +7,6 @@ import com.hbm.tileentity.network.TileEntityCraneExtractor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/hbm/inventory/container/ContainerCraneGrabber.java b/src/main/java/com/hbm/inventory/container/ContainerCraneGrabber.java index 52af87123..7b35961ee 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerCraneGrabber.java +++ b/src/main/java/com/hbm/inventory/container/ContainerCraneGrabber.java @@ -7,7 +7,6 @@ import com.hbm.tileentity.network.TileEntityCraneGrabber; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/hbm/inventory/container/ContainerCraneRouter.java b/src/main/java/com/hbm/inventory/container/ContainerCraneRouter.java index 485601c0b..d30d8c8ae 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerCraneRouter.java +++ b/src/main/java/com/hbm/inventory/container/ContainerCraneRouter.java @@ -5,7 +5,6 @@ import com.hbm.tileentity.network.TileEntityCraneRouter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/hbm/inventory/container/ContainerCrateBase.java b/src/main/java/com/hbm/inventory/container/ContainerCrateBase.java index 4207fec3b..96d32b07f 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerCrateBase.java +++ b/src/main/java/com/hbm/inventory/container/ContainerCrateBase.java @@ -2,24 +2,21 @@ package com.hbm.inventory.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; public class ContainerCrateBase extends ContainerBase { //just there so prev stuff doesnt break - protected IInventory crate = te; + protected IInventory crate = tile; public ContainerCrateBase(InventoryPlayer invPlayer, IInventory tedf) { super(invPlayer, tedf); - te.openInventory(); + tile.openInventory(); } @Override public void onContainerClosed(EntityPlayer p_75134_1_) { super.onContainerClosed(p_75134_1_); - te.closeInventory(); + tile.closeInventory(); } } diff --git a/src/main/java/com/hbm/inventory/container/ContainerMassStorage.java b/src/main/java/com/hbm/inventory/container/ContainerMassStorage.java index 75225aa37..899cbc3f2 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerMassStorage.java +++ b/src/main/java/com/hbm/inventory/container/ContainerMassStorage.java @@ -6,7 +6,6 @@ import com.hbm.tileentity.machine.storage.TileEntityMassStorage; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/hbm/inventory/gui/GuiInfoContainer.java b/src/main/java/com/hbm/inventory/gui/GuiInfoContainer.java index ba138e001..bec49c8d3 100644 --- a/src/main/java/com/hbm/inventory/gui/GuiInfoContainer.java +++ b/src/main/java/com/hbm/inventory/gui/GuiInfoContainer.java @@ -306,7 +306,7 @@ public abstract class GuiInfoContainer extends GuiContainer implements INEIGuiHa tag.setInteger("id", Item.getIdFromItem(stack.getItem())); tag.setInteger("meta", stack.getItemDamage()); - TileEntity te = (TileEntity) ((ContainerBase) inventorySlots).te; + TileEntity te = (TileEntity) ((ContainerBase) inventorySlots).tile; PacketDispatcher.wrapper.sendToServer(new NBTControlPacket(tag, te.xCoord, te.yCoord, te.zCoord)); return true; }