aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/core')
-rw-r--r--src/Java/gtPlusPlus/core/lib/CORE.java2
-rw-r--r--src/Java/gtPlusPlus/core/material/ELEMENT.java8
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java20
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/MiningUtils.java31
4 files changed, 45 insertions, 16 deletions
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index f41d2019b6..99092aed71 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -51,7 +51,7 @@ public class CORE {
public static final String name = "GT++";
public static final String MODID = "miscutils";
- public static final String VERSION = "1.7.02.09";
+ public static final String VERSION = "1.7.02.24";
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/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java
index 8ae2bff37b..888f030f56 100644
--- a/src/Java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java
@@ -165,23 +165,23 @@ public final class ELEMENT {
if (a3 == null) {
Logger.INFO("[Material] Fallback attempt to find Trinium failed, dumping materials.");
for (Materials m : Materials.values()) {
- Logger.INFO("[Material] Found "+m.mName);
+ Logger.INFO("[Material] Found "+MaterialUtils.getMaterialName(m));
}
a4 = null;
}
else {
- Logger.INFO("[Material] a3 Found "+a3.mName);
+ Logger.INFO("[Material] a3 Found "+MaterialUtils.getMaterialName(a3));
a4 = a3;
}
}
else {
- Logger.INFO("[Material] a2 Found "+a2.mName);
+ Logger.INFO("[Material] a2 Found "+MaterialUtils.getMaterialName(a2));
a4 = a2;
}
TRINIUM = MaterialUtils.generateMaterialFromGtENUM(a4);
}
else {
- Logger.INFO("[Material] a1 Found "+a1.mName);
+ Logger.INFO("[Material] a1 Found "+MaterialUtils.getMaterialName(a1));
TRINIUM = MaterialUtils.generateMaterialFromGtENUM(a1);
}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index a2295a9da5..f28929a66a 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -10,6 +10,7 @@ import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.material.ALLOY;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.*;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.everglades.dimension.Dimension_Everglades;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import net.minecraft.init.Blocks;
@@ -236,8 +237,8 @@ public class RECIPES_Machines {
EV_MACHINE_BendingMachine= ItemList.Machine_IV_Bender.get(1);
EV_MACHINE_Wiremill= ItemList.Machine_IV_Wiremill.get(1);
HV_MACHINE_Macerator= ItemList.Machine_EV_Macerator.get(1);
- EV_MACHINE_Macerator= ItemList.Machine_IV_Macerator.get(1);
- EV_MACHINE_MassFabricator= ItemList.Machine_LuV_Massfab.get(1);
+ EV_MACHINE_Macerator= ItemList.Machine_IV_Macerator.get(1);
+ EV_MACHINE_MassFabricator= CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK ? ItemList.valueOf("Machine_LuV_Massfab").get(1, ItemList.Machine_IV_Massfab.get(1)) : ItemList.Machine_IV_Massfab.get(1);
EV_MACHINE_Centrifuge= ItemList.Machine_IV_Centrifuge.get(1);
EV_MACHINE_Cutter = ItemList.Machine_IV_Cutter.get(1);
EV_MACHINE_Extruder = ItemList.Machine_IV_Extruder.get(1);
@@ -861,9 +862,13 @@ public class RECIPES_Machines {
GregtechItemList.Pollution_Detector.get(1));
//Air Intake Hatch
+
+ ItemStack aTieredFluidRegulator = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK ? ItemList.valueOf("FluidRegulator_IV").get(1, ItemList.Pump_IV.get(1)) : ItemList.Pump_IV.get(1);
+
+
RecipeUtils.addShapedGregtechRecipe(
CI.component_Plate[6], ItemList.Casing_Grate.get(1), CI.component_Plate[6],
- CI.component_Plate[6], ItemList.FluidRegulator_IV.get(1), CI.component_Plate[6],
+ CI.component_Plate[6], aTieredFluidRegulator, CI.component_Plate[6],
CI.getTieredCircuit(5), ItemList.Hatch_Input_IV.get(1), CI.getTieredCircuit(5),
GregtechItemList.Hatch_Air_Intake.get(1));
@@ -1132,9 +1137,12 @@ public class RECIPES_Machines {
}
if (CORE.ConfigSwitches.enableMultiblock_LargeAutoCrafter){
+
+ ItemStack aCoreBlock = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK ? ItemList.valueOf("Block_IridiumTungstensteel").get(1, ItemUtils.getItemStackOfAmountFromOreDict("blockOsmiridium", 1)) : ItemUtils.getItemStackOfAmountFromOreDict("blockOsmiridium", 1);
+
RecipeUtils.recipeBuilder(
"plateTungstenSteel", CI.craftingToolHammer_Hard, "plateTungstenSteel",
- "plateStellite", ItemList.Block_IridiumTungstensteel.get(1), "plateStellite",
+ "plateStellite", aCoreBlock, "plateStellite",
"plateTungstenSteel", CI.craftingToolWrench, "plateTungstenSteel",
GregtechItemList.Casing_Autocrafter.get(Casing_Amount));
@@ -1257,6 +1265,8 @@ public class RECIPES_Machines {
cell1 = CI.conveyorModule_EV;
cell2 = CI.electricMotor_IV;
ItemStack casingAmazon = GregtechItemList.Casing_AmazonWarehouse.get(1);
+ ItemStack aTieredUnboxinator = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK ? ItemList.valueOf("Machine_LuV_Unboxinator").get(1, ItemList.Machine_IV_Unboxinator.get(1)) : ItemList.Machine_IV_Unboxinator.get(1);
+
RecipeUtils.recipeBuilder(
plate, ItemUtils.getItemStackOfAmountFromOreDict("cableGt12VanadiumGallium", 1), plate,
@@ -1265,7 +1275,7 @@ public class RECIPES_Machines {
GregtechItemList.Casing_AmazonWarehouse.get(Casing_Amount));
RecipeUtils.recipeBuilder(
casingAmazon, CI.getTieredCircuit(7), casingAmazon,
- CI.robotArm_LuV, ItemList.Machine_LuV_Unboxinator.get(1), CI.robotArm_LuV,
+ CI.robotArm_LuV, aTieredUnboxinator, CI.robotArm_LuV,
CI.conveyorModule_LuV, GregtechItemList.Gregtech_Computer_Cube.get(1), CI.conveyorModule_LuV,
GregtechItemList.Amazon_Warehouse_Controller.get(1));
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MiningUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/MiningUtils.java
index 43c77282bb..e7ced98f5a 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/MiningUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/MiningUtils.java
@@ -143,14 +143,22 @@ public class MiningUtils {
}
public static void iterateAllOreTypes() {
- HashMap<String, Integer> M = new HashMap<String, Integer>();
+ HashMap<String, Integer> M = new HashMap<String, Integer>();
+ String aTextWorldGen = null;
if (MiningUtils.findAndMapOreTypesFromGT()) {
int mapKey = 0;
for (AutoMap<GT_Worldgen_GT_Ore_Layer> g : MiningUtils.mOreMaps) {
- for (GT_Worldgen_GT_Ore_Layer h : g) {
+ for (GT_Worldgen_GT_Ore_Layer h : g) {
+
+ try {
+ aTextWorldGen = (String) ReflectionUtils.getField(GT_Worldgen_GT_Ore_Layer.class, "aTextWorldgen").get(h);
+ } catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException e) {
+ aTextWorldGen = h.mWorldGenName;
+ }
+
//if (M.containsKey(h.aTextWorldgen + h.mWorldGenName)) {
- M.put(h.aTextWorldgen + h.mWorldGenName, mapKey);
- Logger.INFO("Found Vein type: " + h.aTextWorldgen + h.mWorldGenName + " in map with key: "+mapKey);
+ M.put(aTextWorldGen + h.mWorldGenName, mapKey);
+ Logger.INFO("Found Vein type: " + aTextWorldGen + h.mWorldGenName + " in map with key: "+mapKey);
//}
}
mapKey++;
@@ -169,6 +177,8 @@ public class MiningUtils {
public static boolean findAndMapOreTypesFromGT() {
//Gets Moon ID
+
+ boolean aEndAsteroids;
try {
if (Class.forName("micdoodle8.mods.galacticraft.core.util.ConfigManagerCore") != null && mMoonID == -99) {
mMoonID = ReflectionUtils.getField(Class.forName("micdoodle8.mods.galacticraft.core.util.ConfigManagerCore"), "idDimensionMoon").getInt(null);
@@ -200,16 +210,25 @@ public class MiningUtils {
for (GT_Worldgen_GT_Ore_Layer x : GT_Worldgen_GT_Ore_Layer.sList) {
if (x.mEnabled) {
+
+
+ try {
+ aEndAsteroids = ReflectionUtils.getField(GT_Worldgen_GT_Ore_Layer.class, "mEndAsteroid").getBoolean(x);
+ }
+ catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException e) {
+ aEndAsteroids = false;
+ }
+
if (x.mOverworld) {
Ores_Overworld.put(x);
}
if (x.mNether) {
Ores_Nether.put(x);
}
- if (x.mEnd || x.mEndAsteroid) {
+ if (x.mEnd || aEndAsteroids) {
Ores_End.put(x);
}
- if (x.mOverworld || x.mNether || (x.mEnd || x.mEndAsteroid)) {
+ if (x.mOverworld || x.mNether || (x.mEnd || aEndAsteroids)) {
continue;
}
/*if (x.mMoon) {
generated by cgit (git 2.46.0) at 2025-06-18 20:32:04 +0000