Merge remote-tracking branch 'origin/compressor_recipes_mk2' into com…

…pressor_recipes_mk2
GTNewHorizons · Sep 7, 2024 · 4e705ed · 4e705ed
2 parents 58a4aa3 + 9cb4335
commit 4e705ed
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 1 deletion.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -16,7 +16,7 @@ dependencies {
     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.5-GTNH:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.3:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.5: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 }

diff --git a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java
@@ -21,8 +21,12 @@
 import static gregtech.api.enums.Mods.ZTones;
 import static gregtech.api.enums.OrePrefixes.screw;
 import static gregtech.api.util.GTModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES;
+import static gtPlusPlus.core.material.MaterialsAlloy.AQUATIC_STEEL;
+import static gtPlusPlus.core.material.MaterialsAlloy.INCONEL_792;
+import static gtPlusPlus.core.material.MaterialsAlloy.LEAGRISIUM;
 import static gtPlusPlus.core.material.MaterialsAlloy.NITINOL_60;
 import static gtPlusPlus.core.material.MaterialsAlloy.STELLITE;
+import static gtPlusPlus.core.material.MaterialsAlloy.TALONITE;
 
 import java.util.function.Consumer;
 
@@ -697,6 +701,28 @@ public void run() {
                         OrePrefixes.plate.get(Materials.StainlessSteel), 'E', OrePrefixes.circuit.get(Materials.EV),
                         'B', ItemList.Electric_Piston_HV });
 
+        // Fluid Shaper
+        GTModHandler.addCraftingRecipe(
+                ItemList.Machine_Multi_Solidifier.get(1),
+                bits,
+                new Object[] { "CFC", "EAE", "CFC", 'A', ItemList.Machine_IV_FluidSolidifier, 'E',
+                        ItemList.Electric_Pump_IV, 'F', OrePrefixes.circuit.get(Materials.LuV), 'C',
+                        INCONEL_792.getPlate(1) });
+
+        // Solidifier Casing
+        GTModHandler.addCraftingRecipe(
+                ItemList.Casing_Fluid_Solidifier.get(1),
+                bits,
+                new Object[] { "PhP", "TFT", "PwP", 'P', INCONEL_792.getPlate(1), 'F', AQUATIC_STEEL.getFrameBox(1),
+                        'T', TALONITE.getPlate(1) });
+
+        // Solidifier Radiator Casing
+        GTModHandler.addCraftingRecipe(
+                ItemList.Radiator_Fluid_Solidifier.get(2),
+                bits,
+                new Object[] { "BBB", "BPB", "BKB", 'P', ItemList.Casing_Fluid_Solidifier, 'K',
+                        ItemList.Electric_Pump_IV, 'B', LEAGRISIUM.getPlate(1) });
+
         // Large Electric Compressor
         GTModHandler.addCraftingRecipe(
                 ItemList.Machine_Multi_IndustrialCompressor.get(1),

diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java
@@ -11,11 +11,15 @@
 import static gregtech.api.util.GTRecipeBuilder.TICKS;
 import static gregtech.api.util.GTRecipeBuilder.WILDCARD;
 import static gtPlusPlus.core.block.ModBlocks.blockFishTrap;
+import static gtPlusPlus.core.material.MaterialsAlloy.AQUATIC_STEEL;
 import static gtPlusPlus.core.material.MaterialsAlloy.HASTELLOY_C276;
 import static gtPlusPlus.core.material.MaterialsAlloy.HASTELLOY_W;
 import static gtPlusPlus.core.material.MaterialsAlloy.HASTELLOY_X;
+import static gtPlusPlus.core.material.MaterialsAlloy.INCONEL_792;
+import static gtPlusPlus.core.material.MaterialsAlloy.LEAGRISIUM;
 import static gtPlusPlus.core.material.MaterialsAlloy.NITINOL_60;
 import static gtPlusPlus.core.material.MaterialsAlloy.STELLITE;
+import static gtPlusPlus.core.material.MaterialsAlloy.TALONITE;
 import static gtPlusPlus.core.material.MaterialsElements.STANDALONE.CHRONOMATIC_GLASS;
 
 import java.util.HashMap;
@@ -2277,6 +2281,16 @@ public void run() {
                 .itemOutputs(ItemList.Casing_Laser.get(1)).duration(2 * SECONDS + 10 * TICKS).eut(16)
                 .addTo(assemblerRecipes);
 
+        // Solidifier Casing
+        GTValues.RA.stdBuilder().itemInputs(INCONEL_792.getPlate(4), AQUATIC_STEEL.getFrameBox(1), TALONITE.getPlate(2))
+                .itemOutputs(ItemList.Casing_Fluid_Solidifier.get(1)).duration(2 * SECONDS + 10 * TICKS).eut(16)
+                .addTo(assemblerRecipes);
+
+        // Solidifier Radiator Casing
+        GTValues.RA.stdBuilder().itemInputs(ItemList.Casing_Fluid_Solidifier.get(1), ItemList.Electric_Pump_IV.get(1))
+                .fluidInputs(LEAGRISIUM.getFluidStack(1008)).itemOutputs(ItemList.Radiator_Fluid_Solidifier.get(2))
+                .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(assemblerRecipes);
+
         // Electric Compressor Casing
         GTValues.RA.stdBuilder()
                 .itemInputs(