From 13f36a52a62f616c5ebb80bc6de897c99e3c6ffc Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Tue, 3 Mar 2015 14:02:03 -0500 Subject: [PATCH] Container refactoring --- .../container/ContainerAdvancedElectricMachine.java | 12 ++++++------ .../inventory/container/ContainerChanceMachine.java | 13 +++++++------ .../container/ContainerChemicalInfuser.java | 12 ++++++------ .../container/ContainerChemicalOxidizer.java | 12 ++++++------ .../inventory/container/ContainerDictionary.java | 12 ++++++------ .../inventory/container/ContainerDynamicTank.java | 13 +++++++------ .../container/ContainerElectricMachine.java | 13 +++++++------ .../inventory/container/ContainerElectricPump.java | 13 +++++++------ .../container/ContainerElectrolyticSeparator.java | 13 +++++++------ .../inventory/container/ContainerEnergyCube.java | 12 ++++++------ .../inventory/container/ContainerFactory.java | 12 ++++++------ .../common/inventory/container/ContainerFilter.java | 12 ++++++------ .../container/ContainerFluidicPlenisher.java | 13 +++++++------ .../inventory/container/ContainerGasTank.java | 12 ++++++------ .../container/ContainerInductionMatrix.java | 13 +++++++------ .../container/ContainerLaserAmplifier.java | 13 +++++++------ .../container/ContainerMetallurgicInfuser.java | 13 +++++++------ .../common/inventory/container/ContainerPRC.java | 13 +++++++------ .../inventory/container/ContainerPortableTank.java | 13 +++++++------ .../container/ContainerRobitInventory.java | 2 +- .../inventory/container/ContainerRobitMain.java | 12 ++++++------ .../inventory/container/ContainerRobitSmelting.java | 12 ++++++------ .../container/ContainerRotaryCondensentrator.java | 12 ++++++------ .../container/ContainerSeismicVibrator.java | 13 +++++++------ .../ContainerSolarEvaporationController.java | 6 +++--- .../container/ContainerSolarNeutronActivator.java | 12 ++++++------ .../inventory/container/ContainerTeleporter.java | 13 +++++++------ .../container/ContainerUpgradeManagement.java | 12 ++++++------ 28 files changed, 173 insertions(+), 160 deletions(-) diff --git a/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java index 5d38ec851..96b51e099 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java @@ -26,19 +26,19 @@ public class ContainerAdvancedElectricMachine extends Container addSlotToContainer(new SlotOutput(tentity, 2, 116, 35)); addSlotToContainer(new SlotDischarge(tentity, 3, 31, 35)); - int slotX; + int slotY; - for(slotX = 0; slotX < 3; slotX++) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; slotY++) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; slotX++) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } tileEntity.open(inventory.player); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java index f8f8cd163..c2799862d 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java @@ -24,19 +24,20 @@ public class ContainerChanceMachine extends Container addSlotToContainer(new SlotDischarge(tentity, 1, 56, 53)); addSlotToContainer(new SlotOutput(tentity, 2, 116, 35)); addSlotToContainer(new SlotOutput(tentity, 4, 132, 35)); - int slotX; + + int slotY; - for(slotX = 0; slotX < 3; slotX++) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; slotY++) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; slotX++) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } tileEntity.open(inventory.player); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java index 508d48434..512fbd6f2 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java @@ -24,19 +24,19 @@ public class ContainerChemicalInfuser extends Container addSlotToContainer(new SlotStorageTank(tentity, 2, 80, 65)); addSlotToContainer(new SlotDischarge(tentity, 3, 155, 5)); - int slotX; + int slotY; - for(slotX = 0; slotX < 3; slotX++) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; slotY++) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; slotX++) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } tileEntity.open(inventory.player); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java index ec9189720..d1fa971a5 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java @@ -25,19 +25,19 @@ public class ContainerChemicalOxidizer extends Container addSlotToContainer(new SlotDischarge(tentity, 1, 155, 5)); addSlotToContainer(new SlotStorageTank(tentity, 2, 155, 25)); - int slotX; + int slotY; - for(slotX = 0; slotX < 3; slotX++) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; slotY++) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; slotX++) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } tileEntity.open(inventory.player); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerDictionary.java b/src/main/java/mekanism/common/inventory/container/ContainerDictionary.java index f2ea6dc83..231ffec87 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerDictionary.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerDictionary.java @@ -10,19 +10,19 @@ public class ContainerDictionary extends Container { public ContainerDictionary(InventoryPlayer inventory) { - int slotX; + int slotY; - for(slotX = 0; slotX < 3; slotX++) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; slotY++) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; slotX++) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerDynamicTank.java b/src/main/java/mekanism/common/inventory/container/ContainerDynamicTank.java index 0c4eb8c19..d1d854d68 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerDynamicTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerDynamicTank.java @@ -18,19 +18,20 @@ public class ContainerDynamicTank extends Container tileEntity = tentity; addSlotToContainer(new Slot(tentity, 0, 146, 20)); addSlotToContainer(new SlotOutput(tentity, 1, 146, 51)); - int slotX; + + int slotY; - for(slotX = 0; slotX < 3; slotX++) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; slotY++) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; slotX++) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } tileEntity.open(inventory.player); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java index a11fcabc2..7a155e999 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java @@ -23,19 +23,20 @@ public class ContainerElectricMachine extends Container addSlotToContainer(new Slot(tentity, 0, 56, 17)); addSlotToContainer(new SlotDischarge(tentity, 1, 56, 53)); addSlotToContainer(new SlotOutput(tentity, 2, 116, 35)); - int slotX; + + int slotY; - for(slotX = 0; slotX < 3; slotX++) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; slotY++) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; slotX++) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } tileEntity.open(inventory.player); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java b/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java index b30880334..98de4114d 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java @@ -22,19 +22,20 @@ public class ContainerElectricPump extends Container addSlotToContainer(new Slot(tentity, 0, 28, 20)); addSlotToContainer(new SlotOutput(tentity, 1, 28, 51)); addSlotToContainer(new SlotDischarge(tentity, 2, 143, 35)); - int slotX; + + int slotY; - for(slotX = 0; slotX < 3; slotX++) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; slotY++) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; slotX++) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } tileEntity.open(inventory.player); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java b/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java index c1a7c5192..96414957a 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java @@ -25,19 +25,20 @@ public class ContainerElectrolyticSeparator extends Container addSlotToContainer(new SlotStorageTank(tentity, 1, 59, 52)); addSlotToContainer(new SlotStorageTank(tentity, 2, 101, 52)); addSlotToContainer(new SlotDischarge(tentity, 3, 143, 35)); - int slotX; + + int slotY; - for(slotX = 0; slotX < 3; ++slotX) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; ++slotY) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; ++slotX) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } tileEntity.openInventory(); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java b/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java index a31c05dfb..a6a70b3d2 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java @@ -25,19 +25,19 @@ public class ContainerEnergyCube extends Container addSlotToContainer(new SlotDischarge(unit, 1, 17, 35)); addSlotToContainer(new SlotCharge(unit, 0, 143, 35)); - int slotX; + int slotY; - for(slotX = 0; slotX < 3; ++slotX) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; ++slotY) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; ++slotX) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } tileEntity.open(inventory.player); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFactory.java b/src/main/java/mekanism/common/inventory/container/ContainerFactory.java index 71266ff23..12beb547d 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFactory.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFactory.java @@ -77,19 +77,19 @@ public class ContainerFactory extends Container } } - int slotX; + int slotY; - for(slotX = 0; slotX < 3; slotX++) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; slotY++) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 95 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; slotX++) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 153)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } tileEntity.open(inventory.player); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFilter.java b/src/main/java/mekanism/common/inventory/container/ContainerFilter.java index c8b11d4d9..d6a60cb7e 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFilter.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFilter.java @@ -16,19 +16,19 @@ public class ContainerFilter extends Container { tileEntity = tile; - int slotX; + int slotY; - for(slotX = 0; slotX < 3; slotX++) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; slotY++) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; slotX++) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } tileEntity.open(inventory.player); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java b/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java index 9e41d5785..79831ac2a 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java @@ -22,19 +22,20 @@ public class ContainerFluidicPlenisher extends Container addSlotToContainer(new Slot(tentity, 0, 28, 20)); addSlotToContainer(new SlotOutput(tentity, 1, 28, 51)); addSlotToContainer(new SlotDischarge(tentity, 2, 143, 35)); - int slotX; + + int slotY; - for(slotX = 0; slotX < 3; ++slotX) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; ++slotY) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; ++slotX) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } tileEntity.open(inventory.player); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java b/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java index 37bd1d732..b2917fbac 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java @@ -20,19 +20,19 @@ public class ContainerGasTank extends Container addSlotToContainer(new SlotStorageTank(tentity, 0, 8, 8)); addSlotToContainer(new SlotStorageTank(tentity, 1, 8, 40)); - int slotX; + int slotY; - for(slotX = 0; slotX < 3; slotX++) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; slotY++) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; slotX++) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } tileEntity.open(inventory.player); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerInductionMatrix.java b/src/main/java/mekanism/common/inventory/container/ContainerInductionMatrix.java index 4bf4adbf1..04ad2bd75 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerInductionMatrix.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerInductionMatrix.java @@ -19,19 +19,20 @@ public class ContainerInductionMatrix extends Container tileEntity = tentity; addSlotToContainer(new SlotCharge(tentity, 0, 146, 20)); addSlotToContainer(new SlotDischarge(tentity, 1, 146, 51)); - int slotX; + + int slotY; - for(slotX = 0; slotX < 3; slotX++) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; slotY++) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; slotX++) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } tileEntity.open(inventory.player); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerLaserAmplifier.java b/src/main/java/mekanism/common/inventory/container/ContainerLaserAmplifier.java index e6886a12a..970c29a74 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerLaserAmplifier.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerLaserAmplifier.java @@ -14,19 +14,20 @@ public class ContainerLaserAmplifier extends Container public ContainerLaserAmplifier(InventoryPlayer inventory, TileEntityLaserAmplifier tentity) { tileEntity = tentity; - int slotX; + + int slotY; - for(slotX = 0; slotX < 3; slotX++) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; slotY++) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; slotX++) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } tileEntity.open(inventory.player); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java b/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java index be808b574..88cd2cbb4 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java @@ -26,19 +26,20 @@ public class ContainerMetallurgicInfuser extends Container addSlotToContainer(new Slot(tentity, 1, 17, 35)); addSlotToContainer(new Slot(tentity, 2, 51, 43)); addSlotToContainer(new SlotOutput(tentity, 3, 109, 43)); - int slotX; + + int slotY; - for(slotX = 0; slotX < 3; slotX++) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; slotY++) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; slotX++) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } tileEntity.open(inventory.player); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerPRC.java b/src/main/java/mekanism/common/inventory/container/ContainerPRC.java index 4d11ea3f1..a16ff7c4d 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerPRC.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerPRC.java @@ -22,19 +22,20 @@ public class ContainerPRC extends Container addSlotToContainer(new Slot(tentity, 0, 54, 35)); addSlotToContainer(new SlotDischarge(tentity, 1, 141, 19)); addSlotToContainer(new SlotOutput(tentity, 2, 116, 35)); - int slotX; + + int slotY; - for(slotX = 0; slotX < 3; ++slotX) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; ++slotY) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; ++slotX) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } tileEntity.open(inventory.player); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java b/src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java index a1efb2434..f30ffc361 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java @@ -19,19 +19,20 @@ public class ContainerPortableTank extends Container tileEntity = tentity; addSlotToContainer(new Slot(tentity, 0, 146, 19)); addSlotToContainer(new SlotOutput(tentity, 1, 146, 51)); - int slotX; + + int slotY; - for(slotX = 0; slotX < 3; ++slotX) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; ++slotY) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; ++slotX) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } tileEntity.open(inventory.player); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java index 57cf97c55..10213cae4 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java @@ -35,7 +35,7 @@ public class ContainerRobitInventory extends Container } } - for(slotX = 0; slotX < 9; ++slotX) + for(slotX = 0; slotX < 9; slotX++) { addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java index ae76b9b29..2b857f260 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java @@ -20,19 +20,19 @@ public class ContainerRobitMain extends Container robit.openInventory(); - int slotX; + int slotY; - for(slotX = 0; slotX < 3; ++slotX) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; ++slotY) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; ++slotX) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java index 543018c05..5f4bb3e90 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java @@ -29,19 +29,19 @@ public class ContainerRobitSmelting extends Container addSlotToContainer(new Slot(entity, 29, 56, 53)); addSlotToContainer(new SlotFurnace(inventory.player, entity, 30, 116, 35)); - int slotX; + int slotY; - for(slotX = 0; slotX < 3; ++slotX) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; ++slotY) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; ++slotX) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java b/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java index 4a615cdda..854d08e93 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java @@ -27,19 +27,19 @@ public class ContainerRotaryCondensentrator extends Container addSlotToContainer(new SlotOutput(tentity, 3, 155, 56)); addSlotToContainer(new SlotDischarge(tentity, 4, 155, 5)); - int slotX; + int slotY; - for(slotX = 0; slotX < 3; slotX++) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; slotY++) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; slotX++) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } tileEntity.open(inventory.player); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java b/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java index 1cc6acc99..f4782d7ed 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java @@ -18,19 +18,20 @@ public class ContainerSeismicVibrator extends Container { tileEntity = tentity; addSlotToContainer(new SlotDischarge(tentity, 0, 143, 35)); - int slotX; + + int slotY; - for(slotX = 0; slotX < 3; ++slotX) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; ++slotY) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; ++slotX) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } tileEntity.open(inventory.player); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerSolarEvaporationController.java b/src/main/java/mekanism/common/inventory/container/ContainerSolarEvaporationController.java index 614004725..c6944b4d6 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerSolarEvaporationController.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerSolarEvaporationController.java @@ -26,15 +26,15 @@ public class ContainerSolarEvaporationController extends Container int slotY; - for(slotY = 0; slotY < 3; ++slotY) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotX = 0; slotX < 9; ++slotX) + for(int slotX = 0; slotX < 9; slotX++) { addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotY = 0; slotY < 9; ++slotY) + for(slotY = 0; slotY < 9; slotY++) { addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerSolarNeutronActivator.java b/src/main/java/mekanism/common/inventory/container/ContainerSolarNeutronActivator.java index 48236bae7..fc3cb25df 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerSolarNeutronActivator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerSolarNeutronActivator.java @@ -23,19 +23,19 @@ public class ContainerSolarNeutronActivator extends Container addSlotToContainer(new SlotStorageTank(tentity, 0, 5, 56)); addSlotToContainer(new SlotStorageTank(tentity, 1, 155, 56)); - int slotX; + int slotY; - for(slotX = 0; slotX < 3; slotX++) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; slotY++) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; slotX++) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } tileEntity.open(inventory.player); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java b/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java index e2f2e26f6..573aca61f 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java @@ -18,19 +18,20 @@ public class ContainerTeleporter extends Container { tileEntity = tentity; addSlotToContainer(new SlotDischarge(tentity, 0, 27, 14)); - int slotX; + + int slotY; - for(slotX = 0; slotX < 3; ++slotX) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; ++slotY) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; ++slotX) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } tileEntity.open(inventory.player); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java b/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java index 9507478d9..a0526e16e 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java @@ -20,19 +20,19 @@ public class ContainerUpgradeManagement extends Container tileEntity = tile; addSlotToContainer(new SlotMachineUpgrade((TileEntityContainerBlock)tile, tileEntity.getComponent().getUpgradeSlot(), 154, 7)); - int slotX; + int slotY; - for(slotX = 0; slotX < 3; slotX++) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; slotY++) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); } } - for(slotX = 0; slotX < 9; slotX++) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); } ((TileEntityContainerBlock)tileEntity).open(inventory.player);