Merge branch 'GTNewHorizons:master' into master

GTNewHorizons · Nov 17, 2024 · f60599d · f60599d
2 parents dc99e87 + ccd0a54
commit f60599d
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 10 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.50.65:dev")
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.68:dev")
     api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
     api("com.github.GTNewHorizons:Baubles:1.0.4:dev")
 
@@ -12,7 +12,7 @@ dependencies {
     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.13-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.14-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/GT_CraftingRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java
@@ -1710,14 +1710,30 @@ public void run() {
         }
 
         if (ZTones.isModLoaded()) {
+            // for recycling
             GTModHandler.addCraftingRecipe(
                     GTModHandler.getModItem(ZTones.ID, "stoneTile", 8L, 0),
-                    bits,
+                    GTModHandler.RecipeBits.REVERSIBLE,
+                    new Object[] { " S ", "STS", " S ", 'S', new ItemStack(Blocks.stone_slab, 1), 'T',
+                            new ItemStack(Blocks.stone, 1) });
+            GTModHandler.removeRecipeByOutput(GTModHandler.getModItem(ZTones.ID, "stoneTile", 8L, 0));
+            // actual
+            GTModHandler.addCraftingRecipe(
+                    GTModHandler.getModItem(ZTones.ID, "stoneTile", 8L, 0),
+                    bits4,
                     new Object[] { "SSS", "STS", "SSS", 'S', new ItemStack(Blocks.stone_slab, 1), 'T',
                             new ItemStack(Blocks.stone, 1) });
+            // for recycling
             GTModHandler.addCraftingRecipe(
                     GTModHandler.getModItem(ZTones.ID, "auroraBlock", 8L, 0),
-                    bits,
+                    GTModHandler.RecipeBits.REVERSIBLE,
+                    new Object[] { " G ", "GDG", " G ", 'G', new ItemStack(Blocks.glass, 1), 'D',
+                            new ItemStack(Items.dye, 1, GTValues.W) });
+            GTModHandler.removeRecipeByOutput(GTModHandler.getModItem(ZTones.ID, "auroraBlock", 8L, 0));
+            // actual
+            GTModHandler.addCraftingRecipe(
+                    GTModHandler.getModItem(ZTones.ID, "auroraBlock", 8L, 0),
+                    bits4,
                     new Object[] { "GGG", "GDG", "GGG", 'G', new ItemStack(Blocks.glass, 1), 'D',
                             new ItemStack(Items.dye, 1, GTValues.W) });
             GTModHandler.addCraftingRecipe(

diff --git a/src/main/java/com/dreammaster/gthandler/multiAirFilter/GT_MetaTileEntity_AirFilterBase.java b/src/main/java/com/dreammaster/gthandler/multiAirFilter/GT_MetaTileEntity_AirFilterBase.java
@@ -189,7 +189,8 @@ protected MultiblockTooltipBuilder createTooltip() {
                                 + "^mufflerTier)")
                 .addInfo("every second").addInfo("- multiTierBonus for this controller is " + getBonusByTier())
                 .addInfo("- turbineEff is the efficiency of the Turbine in controller slot")
-                .addInfo("- Effective muffler tier is limited by energy input tier").addSeparator()
+                .addInfo("- Effective muffler tier is limited by energy input tier")
+                .addInfo("- Uses " + this.getRecipe().mEUt + " EU/t while working").addSeparator()
                 .addInfo("Insert " + ItemList.AdsorptionFilter.getIS().getDisplayName() + " in an input bus")
                 .addInfo("  to double pollution cleaning amount (30 uses per item)")
                 .addInfo("Each maintenance issue reduces cleaning amount by 10%").beginStructureBlock(3, 4, 3, true)

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