Merge branch 'master' into platinum-opti

GTNewHorizons · Sep 21, 2024 · a58682d · a58682d
2 parents 3ae0e88 + e21f588
commit a58682d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 34 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -40,7 +40,7 @@ dependencies {
     api("com.github.GTNewHorizons:NotEnoughIds:2.1.6:dev")
     api("com.github.GTNewHorizons:GTNHLib:0.5.11:dev")
     api("com.github.GTNewHorizons:ModularUI:1.2.8:dev")
-    api("com.github.GTNewHorizons:ModularUI2:2.1.9-1.7.10:dev")
+    api("com.github.GTNewHorizons:ModularUI2:2.1.10-1.7.10:dev")
     api("com.github.GTNewHorizons:waila:1.8.1:dev")
     api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-462-GTNH:dev")
     api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.36-gtnh:dev")
@@ -85,7 +85,7 @@ dependencies {
     compileOnly('com.github.GTNewHorizons:HoloInventory:2.4.12-GTNH:dev') { transitive = false }
     compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
     compileOnly rfg.deobf('curse.maven:minefactory-reloaded-66672:2366150')
-    compileOnly("com.github.GTNewHorizons:OpenComputers:1.10.25-GTNH:dev") {transitive = false}
+    compileOnly("com.github.GTNewHorizons:OpenComputers:1.10.26-GTNH:dev") {transitive = false}
     // https://www.curseforge.com/minecraft/mc-mods/advancedsolarpanels
     compileOnlyApi rfg.deobf('curse.maven:advsolar-362768:2885953')
     compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.25-GTNH:dev') {transitive =  false}

diff --git a/src/main/java/bartworks/system/material/WerkstoffLoader.java b/src/main/java/bartworks/system/material/WerkstoffLoader.java
@@ -319,6 +319,8 @@ public static void setUp() {
     public static final Werkstoff Ferberite = new Werkstoff(
         new short[] { 0xB0, 0xB0, 0xB0, 0 },
         "Ferberite",
+        Werkstoff.Types.getDefaultStatForType(Werkstoff.Types.COMPOUND)
+            .setElektrolysis(false),
         Werkstoff.Types.COMPOUND,
         new Werkstoff.GenerationFeatures(),
         11,
@@ -383,6 +385,8 @@ public static void setUp() {
     public static final Werkstoff Huebnerit = new Werkstoff(
         new short[] { 0x80, 0x60, 0x60, 0 },
         "Huebnerite",
+        Werkstoff.Types.getDefaultStatForType(Werkstoff.Types.COMPOUND)
+            .setElektrolysis(false),
         Werkstoff.Types.COMPOUND,
         new Werkstoff.GenerationFeatures(),
         17,

diff --git a/src/main/java/gtnhlanth/GTNHLanthanides.java b/src/main/java/gtnhlanth/GTNHLanthanides.java
@@ -73,7 +73,6 @@ public static void postInit(FMLPostInitializationEvent e) {
     @EventHandler
     public static void onModLoadingComplete(FMLLoadCompleteEvent e) {
 
-        BotRecipes.removeRecipes();
         RecipeLoader.removeCeriumSources();
 
     }

diff --git a/src/main/java/gtnhlanth/loader/BotRecipes.java b/src/main/java/gtnhlanth/loader/BotRecipes.java
@@ -6,7 +6,6 @@
 import static gregtech.api.recipe.RecipeMaps.chemicalReactorRecipes;
 import static gregtech.api.recipe.RecipeMaps.crackingRecipes;
 import static gregtech.api.recipe.RecipeMaps.distilleryRecipes;
-import static gregtech.api.recipe.RecipeMaps.electrolyzerRecipes;
 import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes;
 import static gregtech.api.util.GTRecipeBuilder.MINUTES;
 import static gregtech.api.util.GTRecipeBuilder.SECONDS;
@@ -15,8 +14,6 @@
 import static gregtech.api.util.GTRecipeConstants.UniversalChemical;
 import static gtnhlanth.common.register.BotWerkstoffMaterialPool.*;
 
-import java.util.HashSet;
-
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -26,7 +23,6 @@
 import gregtech.api.enums.TierEU;
 import gregtech.api.util.GTModHandler;
 import gregtech.api.util.GTOreDictUnificator;
-import gregtech.api.util.GTRecipe;
 import gregtech.api.util.GTUtility;
 import gtnhlanth.common.register.BotWerkstoffMaterialPool;
 import ic2.core.Ic2Items;
@@ -232,31 +228,4 @@ public static void addGTRecipe() {
             .eut(TierEU.RECIPE_EV)
             .addTo(crackingRecipes);
     }
-
-    public static void removeRecipes() {
-        BotRecipes.removeTungstenElectro();
-    }
-
-    public static void removeTungstenElectro() {
-        HashSet<GTRecipe> toDel = new HashSet<>();
-        ItemStack[] toRemove = { Materials.Scheelite.getDust(1), Materials.Tungstate.getDust(1),
-            WerkstoffLoader.Ferberite.get(dust, 1), WerkstoffLoader.Huebnerit.get(dust, 1) };
-        for (GTRecipe tRecipe : electrolyzerRecipes.getAllRecipes()) {
-            if (tRecipe.mFakeRecipe) continue;
-            for (int i = 0; i < tRecipe.mInputs.length; i++) {
-                ItemStack tItem = tRecipe.mInputs[i];
-                if (item == null || !GTUtility.isStackValid(tItem)) continue;
-                for (ItemStack tStack : toRemove) {
-                    if (GTUtility.areStacksEqual(tItem, tStack)) {
-                        toDel.add(tRecipe);
-                        continue;
-                    }
-                }
-            }
-        }
-        electrolyzerRecipes.getBackend()
-            .removeRecipes(toDel);
-        electrolyzerRecipes.getBackend()
-            .reInit();
-    }
 }