diff options
| author | Muramasa <haydenkilloh@gmail.com> | 2016-09-13 23:40:50 +0100 |
|---|---|---|
| committer | Muramasa <haydenkilloh@gmail.com> | 2016-09-13 23:40:50 +0100 |
| commit | 1c195f5aab22c23aed4df944e49631e62312bd8b (patch) | |
| tree | 93463143891c7c18365d3ce94fbe1e81be470d1f /src/main | |
| parent | ccc7a1873918bd337290dc982441f76dbef6060b (diff) | |
| parent | 55133748f138fef56973ee7f670da9d353cbfc73 (diff) | |
| download | GT5-Unofficial-1c195f5aab22c23aed4df944e49631e62312bd8b.tar.gz GT5-Unofficial-1c195f5aab22c23aed4df944e49631e62312bd8b.tar.bz2 GT5-Unofficial-1c195f5aab22c23aed4df944e49631e62312bd8b.zip | |
Merge branch 'refs/heads/Blood-Asp/experimental' into Bugfixes
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot5.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java index 370ee1819d..af8247d4b8 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java @@ -159,6 +159,7 @@ public class GT_MetaTileEntity_AssemblyLine tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, 1, i); if (!addEnergyInputToMachineList(tTileEntity, 16)){ + if (i==0) return false; if (aBaseMetaTileEntity.getBlockOffset(xDir, 1, i) != GregTech_API.sBlockCasings2) {return false;} if (aBaseMetaTileEntity.getMetaIDOffset(xDir, 1, i) != 0) {return false;} } @@ -193,6 +194,7 @@ public class GT_MetaTileEntity_AssemblyLine tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(i, 1, zDir); if (!addEnergyInputToMachineList(tTileEntity, 16)){ + if (i==0) return false; if (aBaseMetaTileEntity.getBlockOffset(i, 1, zDir) != GregTech_API.sBlockCasings2) {return false;} if (aBaseMetaTileEntity.getMetaIDOffset(i, 1, zDir) != 0) {return false;} } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot5.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot5.java index 68aef0bfab..acf06b2912 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot5.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot5.java @@ -15,7 +15,7 @@ public class ProcessingIngot5 implements gregtech.api.interfaces.IOreRecipeRegis public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { if (!aMaterial.contains(SubTag.NO_SMASHING)) { - GT_Values.RA.addBenderRecipe(GT_Utility.copyAmount(5L, new Object[]{aStack}), GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L), (int) Math.max(aMaterial.getMass() * 1L, 1L), 96); + GT_Values.RA.addBenderRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, aMaterial, 1L), (int) Math.max(aMaterial.getMass() * 1L, 1L), 96); } } } |