Merge branch 'master' into air-filter-tooltip

GTNewHorizons · Nov 16, 2024 · 7511542 · 7511542
2 parents 175dba7 + 346cac8
commit 7511542
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,18 +1,18 @@
 // Add your dependencies here
 
 dependencies {
-    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.62:dev")
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.65:dev")
     api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
     api("com.github.GTNewHorizons:Baubles:1.0.4:dev")
 
-    implementation("com.github.GTNewHorizons:GTNHLib:0.5.19:dev")
+    implementation("com.github.GTNewHorizons:GTNHLib:0.5.20:dev")
 
     compileOnly("com.github.GTNewHorizons:AkashicTome:1.1.8:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Avaritia:1.54:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:twilightforest:2.6.35:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.4.24:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Mantle:0.4.2:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.12-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.13-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.2.3:dev") { transitive = false }
     compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
     compileOnly rfg.deobf("curse.maven:witchery-69673:2234410")

diff --git a/src/main/java/com/dreammaster/gthandler/recipes/FluidSolidifierRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/FluidSolidifierRecipes.java
@@ -1,5 +1,6 @@
 package com.dreammaster.gthandler.recipes;
 
+import static gregtech.api.enums.Mods.Avaritia;
 import static gregtech.api.enums.Mods.ExtraUtilities;
 import static gregtech.api.enums.Mods.TinkerConstruct;
 import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes;
@@ -29,6 +30,8 @@ public class FluidSolidifierRecipes implements Runnable {
 
     @Override
     public void run() {
+        makeAvaritiaRecipes();
+
         // Sodium Dust
 
         GTValues.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Ball.get(0L))
@@ -431,4 +434,14 @@ public void run() {
                     .eut(TierEU.RECIPE_UIV).itemOutputs(ItemList.Hawking_Glass.get(1)).addTo(fluidSolidifierRecipes);
         }
     }
+
+    private void makeAvaritiaRecipes() {
+        if (!Avaritia.isModLoaded()) {
+            return;
+        }
+        GTValues.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Block.get(0L))
+                .itemOutputs(Materials.CosmicNeutronium.getBlocks(1))
+                .fluidInputs(Materials.CosmicNeutronium.getMolten(1296L)).duration(15 * SECONDS).eut(TierEU.RECIPE_ZPM)
+                .addTo(fluidSolidifierRecipes);
+    }
 }
diff --git a/src/main/java/com/dreammaster/recipes/RecipeRemover.java b/src/main/java/com/dreammaster/recipes/RecipeRemover.java
@@ -1167,11 +1167,6 @@ public static void run() {
         removeRecipeByOutputDelayed(ItemList.Emitter_UHV.get(1L));
         removeRecipeByOutputDelayed(ItemList.Sensor_UHV.get(1L));
         removeRecipeByOutputDelayed(ItemList.Field_Generator_UHV.get(1L));
-        removeRecipeByOutputDelayed(GregtechItemList.Super_Chest_LV.get(1));
-        removeRecipeByOutputDelayed(GregtechItemList.Super_Chest_MV.get(1));
-        removeRecipeByOutputDelayed(GregtechItemList.Super_Chest_HV.get(1));
-        removeRecipeByOutputDelayed(GregtechItemList.Super_Chest_EV.get(1));
-        removeRecipeByOutputDelayed(GregtechItemList.Super_Chest_IV.get(1));
         removeRecipeByOutputDelayed(GregtechItemList.Industrial_WireFactory.get(1));
         removeRecipeByOutputDelayed(GregtechItemList.Boiler_Advanced_LV.get(1));
         removeRecipeByOutputDelayed(new ItemStack(ModItems.itemBoilerChassis, 1, 0));