diff options
| -rw-r--r-- | src/Java/gregtech/api/util/Recipe_GT.java | 6 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/Java/gregtech/api/util/Recipe_GT.java b/src/Java/gregtech/api/util/Recipe_GT.java index b95f86d46c..77d2315836 100644 --- a/src/Java/gregtech/api/util/Recipe_GT.java +++ b/src/Java/gregtech/api/util/Recipe_GT.java @@ -971,9 +971,11 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{ final ArrayList<PositionedStack> outputStacks = new ArrayList<PositionedStack>(itemLimit + fluidLimit); AutoMap<Object> mNEIMap = new AutoMap<Object>(); for (int i = 0; i < itemLimit; ++i) { + if (this.mOutputs[i] != null) mNEIMap.put((Object) this.mOutputs[i].copy()); } for (int i = 0; i < fluidLimit; ++i) { + if (this.mFluidOutputs[i] != null) mNEIMap.put((Object) GT_Utility.getFluidDisplayStack(this.mFluidOutputs[i], true)); } int xPos[] = new int[] {102, 120, 138}; @@ -1136,9 +1138,11 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{ final ArrayList<PositionedStack> outputStacks = new ArrayList<PositionedStack>(itemLimit + fluidLimit); AutoMap<Object> mNEIMap = new AutoMap<Object>(); for (int i = 0; i < itemLimit; ++i) { + if (this.mOutputs[i] != null) mNEIMap.put((Object) this.mOutputs[i].copy()); } for (int i = 0; i < fluidLimit; ++i) { + if (this.mFluidOutputs[i] != null) mNEIMap.put((Object) GT_Utility.getFluidDisplayStack(this.mFluidOutputs[i], true)); } int xPos[] = new int[] {102, 120, 138}; @@ -1301,10 +1305,12 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{ GT_Recipe_Map_AdvancedVacuumFreezer.FLUID_OUTPUT_COUNT); final ArrayList<PositionedStack> outputStacks = new ArrayList<PositionedStack>(itemLimit + fluidLimit); for (int i = 0; i < itemLimit; ++i) { + if (this.mOutputs[i] != null) outputStacks.add((PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack( (Object) this.mOutputs[i].copy(), 102 + i * 18, 5)); } for (int i = 0; i < fluidLimit; ++i) { + if (this.mFluidOutputs[i] != null) outputStacks.add((PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack( (Object) GT_Utility.getFluidDisplayStack(this.mFluidOutputs[i], true), 102 + i * 18, 23)); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java index d192d89af5..3e290c4452 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java @@ -64,7 +64,7 @@ extends GregtechMetaCasingBlocksAbstract { GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Supply Depot Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Advanced Cryogenic Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Volcanus Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Fusion Casing MK III"); + GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Fusion Machine Casing MK III"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Advanced Fusion Coil"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", "Placeholder"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Placeholder"); @@ -97,11 +97,11 @@ extends GregtechMetaCasingBlocksAbstract { final int aSide) { final Block thisBlock = aWorld.getBlock(xCoord, yCoord, zCoord); final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord); - if ((tMeta != 12 && tMeta != 13)|| !GregtechMetaCasingBlocks3.mConnectedMachineTextures) { + if ((tMeta != 12)|| !GregtechMetaCasingBlocks3.mConnectedMachineTextures) { return getIcon(aSide, tMeta); } final int tStartIndex = 0; - if (tMeta == 12 || tMeta == 13) { + if (tMeta == 12) { final boolean[] tConnectedSides = { aWorld.getBlock(xCoord, yCoord - 1, zCoord) == thisBlock && aWorld.getBlockMetadata(xCoord, yCoord - 1, zCoord) == tMeta, |