cleanup

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;
 

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
+ * For now, only used for stuff with filters and crates as a reference
- * But you should very much use this to kill the giant amount of boilerplate in container classes
+ * implementation, because I really needed to get the te from a container But
- * @author 70k **/
+ * 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){
+	public ContainerBase(InventoryPlayer invPlayer, IInventory tedf) {
-        te = tedf;
+		tile = tedf;
-    }
+	}
-    @Override
-    public boolean canInteractWith(EntityPlayer player) {
-        return te.isUseableByPlayer(player);
-    }
 
-    @Override
+	@Override
-    public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) {
+	public boolean canInteractWith(EntityPlayer player) {
-        ItemStack var3 = null;
+		return tile.isUseableByPlayer(player);
-        Slot var4 = (Slot) this.inventorySlots.get(par2);
+	}
 
-        if(var4 != null && var4.getHasStack()) {
+	@Override
-            ItemStack var5 = var4.getStack();
+	public ItemStack transferStackInSlot(EntityPlayer player, int index) {
-            var3 = var5.copy();
+		ItemStack slotOriginal = null;
+		Slot slot = (Slot) this.inventorySlots.get(index);
 
-            if(par2 <= te.getSizeInventory() - 1) {
+		if(slot != null && slot.getHasStack()) {
-                if(!this.mergeItemStack(var5, te.getSizeInventory(), this.inventorySlots.size(), true)) {
+			ItemStack slotStack = slot.getStack();
-                    return null;
+			slotOriginal = slotStack.copy();
-                }
-            } else if(!this.mergeItemStack(var5, 0, te.getSizeInventory(), false)) {
-                return null;
-            }
 
-            if(var5.stackSize == 0) {
+			if(index <= tile.getSizeInventory() - 1) {
-                var4.putStack(null);
+				if(!this.mergeItemStack(slotStack, tile.getSizeInventory(), this.inventorySlots.size(), true)) {
-            } else {
+					return null;
-                var4.onSlotChanged();
+				}
-            }
+			} 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*/
+		return slotOriginal;
-    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));
-            }
-        }
 
-        for(int i = 0; i < 9; i++) {
+	/** Used to quickly set up the player inventory */
-            this.addSlotToContainer(new Slot(invPlayer, i, playerInvX + i * 18, playerHotbarY));
+	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?
+		for(int i = 0; i < 9; i++) {
-    //- Mellow, 1884
+			this.addSlotToContainer(new Slot(invPlayer, i, playerInvX + i * 18, playerHotbarY));
-    /**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) {
+	// I'm gonna make a farken helper function for this shit, why was it done
-        int slotSize = 18;
+	// the old way for 9 whole ass years?
-        for(int row = 0; row < rows; row++) {
+	// - Mellow, 1884
-            for(int col = 0; col < cols; col++) {
+	/**
-                this.addSlotToContainer(new Slot(inv, col + row * cols + from, x + col * slotSize, y + row * slotSize));
+	 * 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));
+			}
+		}
+	}
 }

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;
 

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;
 

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;
 

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;
 

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

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;
 

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