diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2018-02-26 06:06:00 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-02-26 06:06:00 +1000 |
| commit | 90addb9717e2a1bffeec55d064248d6f98835f01 (patch) | |
| tree | 398a97f8c7fffdf04ee03f86df98c0a0a69141cf /src/Java/gtPlusPlus/core/recipe | |
| parent | 8b07c2e2d0b13e8a10bb7c799594bc9b6bf69807 (diff) | |
| download | GT5-Unofficial-90addb9717e2a1bffeec55d064248d6f98835f01.tar.gz GT5-Unofficial-90addb9717e2a1bffeec55d064248d6f98835f01.tar.bz2 GT5-Unofficial-90addb9717e2a1bffeec55d064248d6f98835f01.zip | |
^ Version bump to pre6.
$ Fixed an issue where .get(x) was called on a null item in GTNH.
$ Fixed Alloy Smelting Recipes for small gears that were using an extrusion shape, instead of a mold.
Diffstat (limited to 'src/Java/gtPlusPlus/core/recipe')
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_Extruder.java | 3 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_General.java | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Extruder.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Extruder.java index af41659e8b..a39622e9f8 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Extruder.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Extruder.java @@ -4,6 +4,7 @@ import gregtech.api.util.GT_Utility; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; import gregtech.api.enums.SubTag; import gregtech.api.util.GT_OreDictUnificator; import net.minecraft.item.ItemStack; @@ -38,7 +39,7 @@ public class RECIPES_Extruder implements IOreRecipeRegistrator { GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, (Object) aMaterial.mSmeltInto, (long) tAmount), ((int) Math.max(aMaterialMass * 5L * tAmount, tAmount)/4), 8 * tVoltageMultiplier); GT_Values.RA.addAlloySmelterRecipe(GT_Utility.copyAmount(2L, new Object[]{aStack}), - GregtechItemList.Shape_Extruder_SmallGear.get(0L, new Object[0]), + ItemList.Shape_Mold_Gear_Small.get(0L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, (Object) aMaterial.mSmeltInto, (long) tAmount), ((int) Math.max(aMaterialMass * 10L * tAmount, tAmount)/4), 2 * tVoltageMultiplier); diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java index b4d24b0d6a..d096212e5e 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java @@ -125,7 +125,9 @@ public class RECIPES_General { } //Small Gear Extruder Shape - GT_ModHandler.addCraftingRecipe(GregtechItemList.Shape_Extruder_SmallGear.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Gear, Character.valueOf('X'), OrePrefixes.plate.get(Materials.Steel), Character.valueOf('S'), OrePrefixes.screw.get(Materials.Steel)}); + if (!CORE.GTNH) { + GT_ModHandler.addCraftingRecipe(GregtechItemList.Shape_Extruder_SmallGear.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Gear, Character.valueOf('X'), OrePrefixes.plate.get(Materials.Steel), Character.valueOf('S'), OrePrefixes.screw.get(Materials.Steel)}); + } String[] ironTypes = {"", "Wrought", "Pig", "Any"}; for (int y=0;y<ironTypes.length;y++) { |