From dd9de638b6d6c4e406da7f599d757c48eb27c800 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 3 May 2016 00:41:44 -0400 Subject: [PATCH 1/2] Side config fixes --- .../mekanism/common/tile/TileEntityAdvancedFactory.java | 8 ++++---- .../mekanism/common/tile/TileEntityElectricMachine.java | 5 ----- .../java/mekanism/common/tile/TileEntityEliteFactory.java | 8 ++++---- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedFactory.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedFactory.java index af3887f3a..ce894bc39 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedFactory.java @@ -19,11 +19,11 @@ public class TileEntityAdvancedFactory extends TileEntityFactory configComponent = new TileComponentConfig(this, TransmissionType.ITEM, TransmissionType.ENERGY, TransmissionType.GAS); configComponent.addOutput(TransmissionType.ITEM, new SideData("None", EnumColor.GREY, InventoryUtils.EMPTY)); - configComponent.addOutput(TransmissionType.ITEM, new SideData("Energy", EnumColor.DARK_GREEN, new int[] {1})); - configComponent.addOutput(TransmissionType.ITEM, new SideData("Extra", EnumColor.PURPLE, new int[] {4})); configComponent.addOutput(TransmissionType.ITEM, new SideData("Input", EnumColor.DARK_RED, new int[] {5, 6, 7, 8, 9})); configComponent.addOutput(TransmissionType.ITEM, new SideData("Output", EnumColor.DARK_BLUE, new int[] {10, 11, 12, 13, 14})); - configComponent.setConfig(TransmissionType.ITEM, new byte[] {4, 3, 0, 2, 1, 0}); + configComponent.addOutput(TransmissionType.ITEM, new SideData("Energy", EnumColor.DARK_GREEN, new int[] {1})); + configComponent.addOutput(TransmissionType.ITEM, new SideData("Extra", EnumColor.PURPLE, new int[] {4})); + configComponent.setConfig(TransmissionType.ITEM, new byte[] {4, 0, 0, 3, 1, 2}); configComponent.addOutput(TransmissionType.GAS, new SideData("None", EnumColor.GREY, InventoryUtils.EMPTY)); configComponent.addOutput(TransmissionType.GAS, new SideData("Gas", EnumColor.DARK_RED, new int[] {0})); @@ -34,6 +34,6 @@ public class TileEntityAdvancedFactory extends TileEntityFactory upgradeComponent = new TileComponentUpgrade(this, 0); ejectorComponent = new TileComponentEjector(this); - ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(4)); + ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2)); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java index f17dc914c..8517ae36e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java @@ -42,11 +42,6 @@ public abstract class TileEntityElectricMachine Date: Tue, 3 May 2016 16:45:42 -0400 Subject: [PATCH 2/2] Crash check --- .../mekanism/common/tile/component/TileComponentConfig.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java index f1889ee0d..6e0e677bf 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java @@ -149,6 +149,10 @@ public class TileComponentConfig implements ITileComponent { return EMPTY; } + else if(index > getOutputs(type).size()) + { + index = getConfig(type)[side] = 0; + } return getOutputs(type).get(index); }