aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build.gradle4
-rw-r--r--src/Java/gtPlusPlus/core/lib/CORE.java2
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java471
-rw-r--r--src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java3
-rw-r--r--src/resources/mcmod.info2
5 files changed, 247 insertions, 235 deletions
diff --git a/build.gradle b/build.gradle
index aa81e27e60..764a23d9b5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,7 @@ configurations {
}
dependencies {
- compile files('mods/gregtech_1.7.10-5.08.33.jar')
+ compile files('mods/gregtech-5.09.32-dev.jar')
compile files('mods/industrialcraft-2-2.2.720-experimental-dev.jar')
compile fileTree(dir: 'libs', include: '*.jar')
fatJar files('libs/Segment-2.1.1.jar')
@@ -45,7 +45,7 @@ sourceCompatibility = 1.8
targetCompatibility = 1.8
archivesBaseName = "GT-PlusPlus"
-version = "1.7.0-prerelease-11-final"
+version = "1.7.0-prerelease-14-final"
minecraft.version = "1.7.10-10.13.4.1614-1.7.10"
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index 93f40ef737..ed5c7fa90b 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -48,7 +48,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-11-final";
+ public static final String VERSION = "1.7.0-prerelease-14-final";
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_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index ac3ca48167..d2732cac86 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -16,7 +16,6 @@ import gtPlusPlus.core.material.ALLOY;
import gtPlusPlus.core.material.ELEMENT;
import gtPlusPlus.core.material.nuclear.FLUORIDES;
import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.reflect.AddGregtechRecipe;
@@ -33,7 +32,6 @@ public class RECIPES_GREGTECH {
private static void execute() {
cokeOvenRecipes();
electrolyzerRecipes();
- // matterFabRecipes();
assemblerRecipes();
fluidcannerRecipes();
distilleryRecipes();
@@ -114,11 +112,11 @@ public class RECIPES_GREGTECH {
ELEMENT.getInstance().OSMIUM.getDust(4),
ELEMENT.getInstance().IRIDIUM.getDust(4),
ELEMENT.getInstance().CERIUM.getDust(8)
- },
+ },
FluidUtils.getFluidStack("molten.trinium", 136 * 144), 0, 20 * 3000,
2040);
}
-
+
/*
// Red Steel
CORE.RA.addBlastSmelterRecipe(
@@ -173,7 +171,7 @@ public class RECIPES_GREGTECH {
ItemUtils.getItemStackOfAmountFromOreDict("ingotSteel", 1) },
FluidUtils.getFluidStack("molten.tungstensteel", 2 * 144), 0,
MathUtils.findPercentageOfInt(75 * 20, 80), 480);
-
+
// HSS-G
CORE.RA.addBlastSmelterRecipe(
new ItemStack[] { ItemUtils.getGregtechCircuit(14),
@@ -258,7 +256,7 @@ public class RECIPES_GREGTECH {
FluidUtils.getFluidStack("molten.tungstencarbide", 2 * 144), 0,
MathUtils.findPercentageOfInt(
(int) Math.max(Materials.get("TungstenCarbide").getMass() / 40L, 1L)
- * Materials.get("TungstenCarbide").mBlastFurnaceTemp,
+ * Materials.get("TungstenCarbide").mBlastFurnaceTemp,
80),
480);
}
@@ -271,7 +269,7 @@ public class RECIPES_GREGTECH {
ItemUtils.getItemStackOfAmountFromOreDict("dustVanadium", 3) },
FluidUtils.getFluidStack("molten.vanadiumgallium", 4 * 144), 0,
MathUtils.findPercentageOfInt((int) Math.max(Materials.VanadiumGallium.getMass() / 40L, 1L)
- * Materials.VanadiumGallium.mBlastFurnaceTemp, 80),
+ * Materials.VanadiumGallium.mBlastFurnaceTemp, 80),
480);
}
@@ -560,232 +558,243 @@ public class RECIPES_GREGTECH {
}
catch (final NullPointerException e) {
Logger.INFO("[dustCalciumHydroxide] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
- }
+ }
- // 2 LiOH + CaCO3
- try {
+ }
- CORE.RA.addDehydratorRecipe(
- new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 5) }, // Item
- // input
- // (Array,
- // up
- // to
- // 2)
- null, // Fluid input (slot 1)
- null, // Fluid output (slot 2)
- new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 2),
- ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 3) }, // Output
- // Array
- // of
- // Items
- // -
- // Upto
- // 9,
- new int[] { 0 }, 120 * 20, // Time in ticks
- 1000); // EU
+ // Process Waste Water
+ try {
- }
- catch (final NullPointerException e) {
- Logger.INFO("[dustLi2CO3CaOH2] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
- }
+ CORE.RA.addDehydratorRecipe(null, // Item input (Array, up to 2)
+ FluidUtils.getFluidStack("sludge", 1000), // Fluid input
+ // (slot 1)
+ FluidUtils.getFluidStack("nitricacid", 10), // Fluid
+ // output
+ // (slot 2)
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIron", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCopper", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTinyTin", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTinyNickel", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCobalt", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAluminium", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTinySilver", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTinyGold", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIridium", 1) }, // Output
+ // Array
+ // of
+ // Items
+ // -
+ // Upto
+ // 9,
+ new int[] { 10, 5, 5, 4, 4, 3, 2, 2, 1 }, 2 * 20, // Time
+ // in
+ // ticks
+ 500); // EU
- // LiOH Liquid to Dust
- try {
+ }
+ catch (final NullPointerException e) {
+ Logger.INFO("[sludge] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
+ }
- CORE.RA.addDehydratorRecipe(new ItemStack[] { ItemUtils.getGregtechCircuit(0) }, // Item
- // input
- // (Array,
- // up
- // to
- // 2)
- FluidUtils.getFluidStack("lithiumhydroxide", 144), // Fluid
- // input
- // (slot
- // 1)
- null, // Fluid output (slot 2)
- new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 1) }, // Output
- // Array
- // of
- // Items
- // -
- // Upto
- // 9,
- new int[] { 0 }, 1 * 20, // Time in ticks
- 64); // EU
- }
- catch (final NullPointerException e) {
- Logger.INFO("[dustLithiumHydroxide] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
- }
- // Zirconium Chloride -> TetraFluoride
- try {
+ // 2 LiOH + CaCO3
+ try {
- CORE.RA.addDehydratorRecipe(
- new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9),
- ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 9) }, // Item
- // input
- // (Array,
- // up
- // to
- // 2)
- FluidUtils.getFluidStack("hydrofluoricacid", 9 * 144), // Fluid
- // input
- // (slot
- // 1)
- null, // Fluid output (slot 2)
- new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 9),
- ItemUtils.getItemStackOfAmountFromOreDict("dustZrF4", 9) }, // Output
- // Array
- // of
- // Items
- // -
- // Upto
- // 9,
- new int[] { 0 }, 120 * 20, // Time in ticks
- 500); // EU
+ CORE.RA.addDehydratorRecipe(
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 5) }, // Item
+ // input
+ // (Array,
+ // up
+ // to
+ // 2)
+ null, // Fluid input (slot 1)
+ null, // Fluid output (slot 2)
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 2),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 3) }, // Output
+ // Array
+ // of
+ // Items
+ // -
+ // Upto
+ // 9,
+ new int[] { 0 }, 120 * 20, // Time in ticks
+ 1000); // EU
- }
- catch (final NullPointerException e) {
- Logger.INFO("[dustZrF4] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
- }
+ }
+ catch (final NullPointerException e) {
+ Logger.INFO("[dustLi2CO3CaOH2] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
+ }
- // CaF2 + H2SO4 → CaSO4(solid) + 2 HF
- try {
+ // LiOH Liquid to Dust
+ try {
- CORE.RA.addDehydratorRecipe(
- new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustFluorite", 37),
- ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 16) }, // Item
- // input
- // (Array,
- // up
- // to
- // 2)
- FluidUtils.getFluidStack("sulfuricacid", 56 * 144), // Fluid
- // input
- // (slot
- // 1)
- null, // Fluid output (slot 2)
- new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumSulfate", 30),
- ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 16),
- ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 2),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 2) }, // Output
- // Array
- // of
- // Items
- // -
- // Upto
- // 9,
- new int[] { 0, 0, 100, 100, 300, 200 }, 10 * 60 * 20, // Time
- // in
- // ticks
- 230); // EU
+ CORE.RA.addDehydratorRecipe(new ItemStack[] { ItemUtils.getGregtechCircuit(0) }, // Item
+ // input
+ // (Array,
+ // up
+ // to
+ // 2)
+ FluidUtils.getFluidStack("lithiumhydroxide", 144), // Fluid
+ // input
+ // (slot
+ // 1)
+ null, // Fluid output (slot 2)
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 1) }, // Output
+ // Array
+ // of
+ // Items
+ // -
+ // Upto
+ // 9,
+ new int[] { 0 }, 1 * 20, // Time in ticks
+ 64); // EU
- }
- catch (final NullPointerException e) {
- Logger.INFO("[dustFluorite] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
- }
+ }
+ catch (final NullPointerException e) {
+ Logger.INFO("[dustLithiumHydroxide] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
+ }
- // Be(OH)2 + 2 (NH4)HF2 → (NH4)2BeF4 + 2 H2O
- try {
- CORE.RA.addDehydratorRecipe(
- new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumHydroxide", 2),
- ItemUtils.getItemStackOfAmountFromOreDict("cellAmmoniumBifluoride", 4) }, // Item
- // input
- // (Array,
- // up
- // to
- // 2)
- null, // Fluid input (slot 1)
- FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 6000), // Fluid
- // output
- // (slot
- // 2)
- new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 4),
- ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2) }, // Output
- // Array
- // of
- // Items
- // -
- // Upto
- // 9,
- new int[] { 0, 0, 0 }, 32 * 20, // Time in ticks
- 64); // EU
+ // Zirconium Chloride -> TetraFluoride
+ try {
- }
- catch (final NullPointerException e) {
- Logger.INFO("[ammoniumtetrafluoroberyllate] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
- }
+ CORE.RA.addDehydratorRecipe(
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 9) }, // Item
+ // input
+ // (Array,
+ // up
+ // to
+ // 2)
+ FluidUtils.getFluidStack("hydrofluoricacid", 9 * 144), // Fluid
+ // input
+ // (slot
+ // 1)
+ null, // Fluid output (slot 2)
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 9),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustZrF4", 9) }, // Output
+ // Array
+ // of
+ // Items
+ // -
+ // Upto
+ // 9,
+ new int[] { 0 }, 120 * 20, // Time in ticks
+ 500); // EU
- // (NH4)2BeF4 → 2 NH3 + 2 HF + BeF2
- try {
- CORE.RA.addDehydratorRecipe(
- new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 5) }, // Item
- // input
- // (Array,
- // up
- // to
- // 2)
- FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 5000), // Fluid
- // input
- // (slot
- // 1)
- null, // Fluid output (slot 2)
- new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 2),
- ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2),
- ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumFluoride", 1) }, // Output
- // Array
- // of
- // Items
- // -
- // Upto
- // 9,
- new int[] { 0, 0, 0 }, 5 * 60 * 20, // Time in ticks
- 120); // EU
+ }
+ catch (final NullPointerException e) {
+ Logger.INFO("[dustZrF4] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
+ }
- }
- catch (final NullPointerException e) {
- Logger.INFO("[cellBerylliumFluoride] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
- }
+ // CaF2 + H2SO4 → CaSO4(solid) + 2 HF
+ try {
- // Process Waste Water
- try {
+ CORE.RA.addDehydratorRecipe(
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustFluorite", 37),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 16) }, // Item
+ // input
+ // (Array,
+ // up
+ // to
+ // 2)
+ FluidUtils.getFluidStack("sulfuricacid", 56 * 144), // Fluid
+ // input
+ // (slot
+ // 1)
+ null, // Fluid output (slot 2)
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumSulfate", 30),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 16),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 2),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 2) }, // Output
+ // Array
+ // of
+ // Items
+ // -
+ // Upto
+ // 9,
+ new int[] { 0, 0, 100, 100, 300, 200 }, 10 * 60 * 20, // Time
+ // in
+ // ticks
+ 230); // EU
- CORE.RA.addDehydratorRecipe(null, // Item input (Array, up to 2)
- FluidUtils.getFluidStack("sludge", 1000), // Fluid input
- // (slot 1)
- FluidUtils.getFluidStack("nitricacid", 10), // Fluid
- // output
- // (slot 2)
- new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIron", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCopper", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinyTin", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinyNickel", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCobalt", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAluminium", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinySilver", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinyGold", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIridium", 1) }, // Output
- // Array
- // of
- // Items
- // -
- // Upto
- // 9,
- new int[] { 10, 5, 5, 4, 4, 3, 2, 2, 1 }, 2 * 20, // Time
- // in
- // ticks
- 500); // EU
+ }
+ catch (final NullPointerException e) {
+ Logger.INFO("[dustFluorite] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
+ }
- }
- catch (final NullPointerException e) {
- Logger.INFO("[sludge] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
- }
+ // Be(OH)2 + 2 (NH4)HF2 → (NH4)2BeF4 + 2 H2O
+ try {
+ CORE.RA.addDehydratorRecipe(
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumHydroxide", 2),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellAmmoniumBifluoride", 4) }, // Item
+ // input
+ // (Array,
+ // up
+ // to
+ // 2)
+ null, // Fluid input (slot 1)
+ FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 6000), // Fluid
+ // output
+ // (slot
+ // 2)
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2) }, // Output
+ // Array
+ // of
+ // Items
+ // -
+ // Upto
+ // 9,
+ new int[] { 0, 0, 0 }, 32 * 20, // Time in ticks
+ 64); // EU
}
+ catch (final NullPointerException e) {
+ Logger.INFO("[ammoniumtetrafluoroberyllate] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
+ }
+
+ // (NH4)2BeF4 → 2 NH3 + 2 HF + BeF2
+ try {
+ CORE.RA.addDehydratorRecipe(
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 5) }, // Item
+ // input
+ // (Array,
+ // up
+ // to
+ // 2)
+ FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 5000), // Fluid
+ // input
+ // (slot
+ // 1)
+ null, // Fluid output (slot 2)
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 2),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumFluoride", 1) }, // Output
+ // Array
+ // of
+ // Items
+ // -
+ // Upto
+ // 9,
+ new int[] { 0, 0, 0 }, 5 * 60 * 20, // Time in ticks
+ 120); // EU
+
+ }
+ catch (final NullPointerException e) {
+ Logger.INFO("[cellBerylliumFluoride] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
+ }
+
+ // Makes Styrene
+ CORE.RA.addDehydratorRecipe(
+ ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 4), // Item Input
+ FluidUtils.getFluidStack("fluid.ethylbenzene", 4000), // Fluid /
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellStyrene", 3),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1) }, // Output
+ 3 * 20, // Time in ticks
+ 30); // EU
}
@@ -962,7 +971,7 @@ public class RECIPES_GREGTECH {
addAR(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 1),
ItemUtils.getItemStackOfAmountFromOreDict("plateLead", 4), FluidUtils.getFluidStack("oxygen", 1000),
ItemUtils.getSimpleStack(GregtechItemList.Casing_Vanadium_Redox.get(1), 1), 64, 240);
-
+
//Tier 2-6
ItemStack T1 = GregtechItemList.Casing_Vanadium_Redox.get(1);
ItemStack T2 = GregtechItemList.Casing_Vanadium_Redox_IV.get(1);
@@ -970,28 +979,28 @@ public class RECIPES_GREGTECH {
ItemStack T4 = GregtechItemList.Casing_Vanadium_Redox_ZPM.get(1);
ItemStack T5 = GregtechItemList.Casing_Vanadium_Redox_UV.get(1);
ItemStack T6 = GregtechItemList.Casing_Vanadium_Redox_MAX.get(1);
-
+
addAR(T1,
- ItemUtils.getItemStackOfAmountFromOreDict("plateStainlessSteel", 4),
- FluidUtils.getFluidStack("nitrogen", 2000),
- T2, 120, 2000);
+ ItemUtils.getItemStackOfAmountFromOreDict("plateStainlessSteel", 4),
+ FluidUtils.getFluidStack("nitrogen", 2000),
+ T2, 120, 2000);
addAR(T2,
- ItemUtils.getItemStackOfAmountFromOreDict("plateTitanium", 4),
- FluidUtils.getFluidStack("helium", 2000),
- T3, 250, 8000);
+ ItemUtils.getItemStackOfAmountFromOreDict("plateTitanium", 4),
+ FluidUtils.getFluidStack("helium", 2000),
+ T3, 250, 8000);
addAR(T3,
- ItemUtils.getItemStackOfAmountFromOreDict("plateTungsten", 4),
- FluidUtils.getFluidStack("argon", 4000),
- T4, 500, 32000);
+ ItemUtils.getItemStackOfAmountFromOreDict("plateTungsten", 4),
+ FluidUtils.getFluidStack("argon", 4000),
+ T4, 500, 32000);
addAR(T4,
- ItemUtils.getItemStackOfAmountFromOreDict("plateTungstenSteel", 4),
- FluidUtils.getFluidStack("radon", 4000),
- T5, 1000, 128000);
+ ItemUtils.getItemStackOfAmountFromOreDict("plateTungstenSteel", 4),
+ FluidUtils.getFluidStack("radon", 4000),
+ T5, 1000, 128000);
addAR(T5,
- ItemUtils.getItemStackOfAmountFromOreDict("plateIridium", 4),
- FluidUtils.getFluidStack("molten.krypton", 500),
- T6, 2000, 512000);
-
+ ItemUtils.getItemStackOfAmountFromOreDict("plateIridium", 4),
+ FluidUtils.getFluidStack("molten.krypton", 500),
+ T6, 2000, 512000);
+
/*addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloy020", 16),
ItemUtils.getItemStackOfAmountFromOreDict("frameGtIncoloyMA956", 4), null,
GregtechItemList.Casing_Power_SubStation.get(4), 80, 120);*/
@@ -1270,7 +1279,7 @@ public class RECIPES_GREGTECH {
private static void macerationRecipes() {
GT_ModHandler.addPulverisationRecipe(ItemUtils.getItemStackOfAmountFromOreDict("pelletZirconium", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustZrCl4", 1));
-
+
GT_ModHandler.addPulverisationRecipe(ItemUtils.getItemStackOfAmountFromOreDict("blockMeatRaw", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 9));
/*
diff --git a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java b/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
index c3a1f23f53..2dcbe46056 100644
--- a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
+++ b/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
@@ -8,6 +8,7 @@ import net.minecraft.item.ItemStack;
import gregtech.common.items.GT_MetaGenerated_Item_01;
+import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -145,6 +146,7 @@ public class Preloader_GT_OreDict {
}
} catch (final Throwable e) {
+ if (CORE.ConfigSwitches.showHiddenNEIItems) {
FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "A mod tried to register an invalid item with the OreDictionary.");
if (bannedItem != null){
FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Please report this issue to the authors of %s", ItemUtils.getModId(bannedItem));
@@ -160,6 +162,7 @@ public class Preloader_GT_OreDict {
h.printStackTrace();
}
}
+ }
//FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "%s", e.getMessage());
}
return false;
diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info
index 3d2ec378b5..4a78322487 100644
--- a/src/resources/mcmod.info
+++ b/src/resources/mcmod.info
@@ -5,7 +5,7 @@
"description": "Adds over 100 new Multiblocks, Machines, etc to Gregtech.",
"credits": "",
"logoFile": "",
- "version": "1.7.0-prerelease-11-final",
+ "version": "1.7.0-prerelease-14-final",
"mcversion": "1.7.10",
"url": "https://github.com/draknyte1/GTplusplus/wiki",
"updateUrl": "https://github.com/draknyte1/GTplusplus/releases/latest",
generated by cgit (git 2.46.0) at 2025-03-09 05:38:10 +0000