From 5bcf3dec0414fd556401ce2db97b317e5e4c073a Mon Sep 17 00:00:00 2001
From: chochem <40274384+chochem@users.noreply.github.com>
Date: Mon, 17 Apr 2023 16:41:29 +0100
Subject: dont make zirconium null

---
 .../com/elisis/gtnhlanth/loader/RecipeLoader.java  | 26 +++++-----------------
 1 file changed, 6 insertions(+), 20 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
index b6e962d966..f21b23b738 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
@@ -1459,26 +1459,12 @@ public class RecipeLoader {
                                             tRecipe.mOutputs[i].stackSize,
                                             WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));
                                     modified = true;
-                                } else if (tRecipe.mOutputs[i]
-                                        .isItemEqual(WerkstoffMaterialPool.Zirconium.get(OrePrefixes.dust, 1))) { // TODO:
-                                                                                                                  // Does
-                                                                                                                  // not
-                                                                                                                  // work
-                                                                                                                  // and
-                                                                                                                  // I
-                                                                                                                  // have
-                                                                                                                  // zero
-                                                                                                                  // clue
-                                                                                                                  // why
-                                            tRecipe.mOutputs[i] = null;
-                                            modified = true;
-                                        } else
-                                    if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1))) {
-                                        tRecipe.mOutputs[i] = GT_Utility.copyAmount(
-                                                tRecipe.mOutputs[i].stackSize,
-                                                WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
-                                        modified = true;
-                                    }
+                                } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1))) {
+                                    tRecipe.mOutputs[i] = GT_Utility.copyAmount(
+                                            tRecipe.mOutputs[i].stackSize,
+                                            WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
+                                    modified = true;
+                                }
                             }
                             if (modified) {
                                 reAdd.add(tRecipe);
-- 
cgit 


From 66d03d9c94b55faf259a2deaf0078678695b2780 Mon Sep 17 00:00:00 2001
From: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com>
Date: Mon, 17 Apr 2023 20:22:20 +0300
Subject: update bs and fix error

---
 src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java b/src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java
index 90b8c503ac..a3fade1f7e 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java
@@ -22,12 +22,12 @@ import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.commons.lang3.reflect.MethodUtils;
 
 import com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool;
-import com.github.bartimaeusnek.bartworks.API.LoaderReference;
 import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
 import com.github.bartimaeusnek.bartworks.util.BW_Util;
 
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.Mods;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.objects.ItemData;
 import gregtech.api.util.GT_Log;
@@ -63,7 +63,7 @@ public class ZPMRubberChanges implements Runnable {
                                 || item.toString().contains("UEV")) && item.hasBeenSet())
                 .forEach(item -> ZPMPlusComponents.add(item.get(1)));
 
-        if (LoaderReference.dreamcraft) {
+        if (Mods.NewHorizonsCoreMod.isModLoaded()) {
             addDreamcraftItemListItems(ZPMPlusComponents);
         }
 
-- 
cgit