Merge branch 'GTNewHorizons:master' into compressor_recipes

GTNewHorizons · Aug 29, 2024 · ca0e3d9 · ca0e3d9
2 parents 9d4cba7 + 571756b
commit ca0e3d9
Show file tree

Hide file tree

Showing 39 changed files with 3,309 additions and 9,997 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,29 +1,29 @@
 // Add your dependencies here
 
 dependencies {
-    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.48.148:dev")
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.31: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 }
 
-    compileOnly("com.github.GTNewHorizons:AkashicTome:1.1.4:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:AkashicTome:1.1.6:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Avaritia:1.51:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:twilightforest:2.6.31:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.4.6:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:twilightforest:2.6.33:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.4.8:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Mantle:0.4.1:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.6-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.8-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.2.2:dev") { transitive = false }
     compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
     compileOnly rfg.deobf("curse.maven:witchery-69673:2234410")
     compileOnly("com.github.GTNewHorizons:Chisel:2.15.2-GTNH:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Botania:1.11.3-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Botania:1.11.5-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.2:dev") { transitive = false }
     compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
     compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false }
     compileOnly("com.github.GTNewHorizons:amunra:0.6.0:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Galacticraft:3.2.1-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:ForestryMC:4.9.7:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:DetravScannerMod:1.8.1:dev") { transitive = false }
+    compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.2-GTNH:dev")
 
     runtimeOnlyNonPublishable rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612")
     runtimeOnlyNonPublishable("com.github.GTNewHorizons:WailaHarvestability:1.2.1-GTNH:dev")

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);
             }
+
         }
+
     }
 }