diff options
Diffstat (limited to 'src/Java/gtPlusPlus')
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_Extruder.java | 5 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Extruder.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Extruder.java index ba37b73da5..af41659e8b 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Extruder.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Extruder.java @@ -1,6 +1,7 @@ package gtPlusPlus.core.recipe; 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.SubTag; @@ -19,9 +20,9 @@ public class RECIPES_Extruder implements IOreRecipeRegistrator { public void registerOre(final OrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName, final String aModName, final ItemStack aStack) { - if ((aMaterial == Materials.Glass || aMaterial == Materials.WroughtIron + if (!CORE.GTNH && ((aMaterial == Materials.Glass || aMaterial == Materials.WroughtIron || GT_OreDictUnificator.get(OrePrefixes.ingot, (Object) aMaterial, 1L) != null) - && !aMaterial.contains(SubTag.NO_SMELTING)) { + && !aMaterial.contains(SubTag.NO_SMELTING))) { final long aMaterialMass = aMaterial.getMass(); final int tAmount = (int) (aPrefix.mMaterialAmount / 3628800L); if (tAmount > 0 && tAmount <= 64 && aPrefix.mMaterialAmount % 3628800L == 0L) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java index 027c29b8ab..40770b5985 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java @@ -159,6 +159,9 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { //Extruder Shape GregtechItemList.Shape_Extruder_WindmillShaft.set(this.addItem(tLastID = 40, "Extruder Shape (Shaft)", "Extruder Shape for making Windmill Shafts", new Object[0])); + + //GTNH Already adds this. + if (!CORE.GTNH) GregtechItemList.Shape_Extruder_SmallGear.set(this.addItem(221, "Extruder Shape (Small Gear)", "Extruder Shape for making small gears", new Object[0])); |