diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Java/gtPlusPlus/core/lib/CORE.java | 3 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_Extruder.java | 3 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_General.java | 4 | ||||
| -rw-r--r-- | src/resources/mcmod.info | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index b40ea8b8f4..e95ce368ca 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -7,7 +7,6 @@ import com.mojang.authlib.GameProfile; import gregtech.api.GregTech_API; import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.api.objects.random.CSPRNG_DO_NOT_USE; import gtPlusPlus.api.objects.random.XSTR; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.gregtech.recipehandlers.GregtechRecipe; @@ -47,7 +46,7 @@ public class CORE { public static final String name = "GT++"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.7.0-prerelease-5"; + public static final String VERSION = "1.7.0-prerelease-6"; public static String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase(); public static String USER_COUNTRY = GeoUtils.determineUsersCountry(); public static boolean isModUpToDate = Utils.isModUpToDate(); 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++) { diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info index a18d28437e..0c6e1ca747 100644 --- a/src/resources/mcmod.info +++ b/src/resources/mcmod.info @@ -5,7 +5,7 @@ "description": "Adds a few various Multiblocks, Machines, etc to Gregtech and a plethora of other mods (Nearly 30!)", "credits": "", "logoFile": "", - "version": "1.7.0-prerelease-5", + "version": "1.7.0-prerelease-6", "mcversion": "1.7.10", "url": "https://github.com/draknyte1/GTplusplus/wiki", "updateUrl": "https://github.com/draknyte1/GTplusplus/releases/latest", |