yet another batch of RA1 calls removed (#914)

* migrate radio hatch recipes * migrate incubation recipes * finish migrating bw recipes * migrate forgotten recipes * spotless apply * bump dep * fix merge conflict derp --------- Co-authored-by: Martin Robertz <[email protected]>
GTNewHorizons · Aug 15, 2024 · 583174e · 583174e
1 parent 8655eb7
commit 583174e
Show file tree

Hide file tree

Showing 4 changed files with 284 additions and 393 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,7 +1,7 @@
 // Add your dependencies here
 
 dependencies {
-    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.48.150:dev")
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.48.151:dev")
     api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
     api("com.github.GTNewHorizons:Baubles:1.0.4:dev")
     implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.3.3:dev') { transitive = false }

diff --git a/src/main/java/com/dreammaster/bartworksHandler/BW_RadHatchMaterial.java b/src/main/java/com/dreammaster/bartworksHandler/BW_RadHatchMaterial.java
@@ -1,33 +1,41 @@
 package com.dreammaster.bartworksHandler;
 
+import static com.github.bartimaeusnek.bartworks.API.recipe.BartWorksRecipeMaps.radioHatchRecipes;
+import static com.github.bartimaeusnek.bartworks.util.BWRecipes.calcDecayTicks;
 import static gregtech.api.enums.Mods.GTPlusPlus;
+import static gregtech.api.util.GT_RecipeConstants.DECAY_TICKS;
 
 import net.minecraft.item.ItemStack;
 
-import com.github.bartimaeusnek.bartworks.util.BWRecipes;
-
+import gregtech.api.enums.GT_Values;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class BW_RadHatchMaterial {
 
     public static void runRadHatchAdder() {
+        if (!GTPlusPlus.isModLoaded()) {
+            return;
+        }
+
+        ItemStack err = ItemUtils.getErrorStack(1);
+
+        for (Material material : Material.mMaterialMap) {
+            if (material == null || material.vRadiationLevel <= 0) {
+                continue;
+            }
 
-        if (GTPlusPlus.isModLoaded()) {
-            ItemStack err = ItemUtils.getErrorStack(1);
-
-            for (Material material : Material.mMaterialMap) {
-                if (material != null && material.vRadiationLevel > 0) {
-                    int level = (int) material.getProtons();
-                    short[] rgba = material.getRGBA();
-                    if (material.getRod(1) != null && !material.getRod(1).isItemEqual(err)) {
-                        BWRecipes.instance.addRadHatch(material.getRod(1), level, 1, rgba);
-                    }
-                    if (material.getLongRod(1) != null && !material.getLongRod(1).isItemEqual(err)) {
-                        BWRecipes.instance.addRadHatch(material.getLongRod(1), level, 2, rgba);
-                    }
-                }
+            int level = (int) material.getProtons();
+            if (material.getRod(1) != null && !material.getRod(1).isItemEqual(err)) {
+                GT_Values.RA.stdBuilder().itemInputs(material.getRod(1)).duration(1).eut(level)
+                        .metadata(DECAY_TICKS, (int) calcDecayTicks(level)).noOptimize().addTo(radioHatchRecipes);
+            }
+            if (material.getLongRod(1) != null && !material.getLongRod(1).isItemEqual(err)) {
+                GT_Values.RA.stdBuilder().itemInputs(material.getLongRod(1)).duration(2).eut(level)
+                        .metadata(DECAY_TICKS, (int) calcDecayTicks(level)).noOptimize().addTo(radioHatchRecipes);
             }
+
         }
+
     }
 }