Merge branch 'master' into Asgardandelion2.0

GTNewHorizons · Jan 24, 2025 · 4fad064 · 4fad064
2 parents f600014 + 50867b4
commit 4fad064
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 0 deletions.
diff --git a/src/main/java/com/dreammaster/gthandler/recipes/FluidExtractorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/FluidExtractorRecipes.java
@@ -1,6 +1,7 @@
 package com.dreammaster.gthandler.recipes;
 
 import static gregtech.api.enums.Mods.OpenBlocks;
+import static gregtech.api.enums.Mods.Thaumcraft;
 import static gregtech.api.enums.Mods.TinkerConstruct;
 import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
 import static gregtech.api.util.GTRecipeBuilder.SECONDS;
@@ -53,6 +54,14 @@ public void run() {
                     .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ender"), 2250)).duration(10 * SECONDS).eut(48)
                     .addTo(fluidExtractionRecipes);
 
+            GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "materials", 1L, 2))
+                    .fluidOutputs(new FluidStack(FluidRegistry.getFluid("stone.seared"), 18)).duration(10 * SECONDS)
+                    .eut(48).addTo(fluidExtractionRecipes);
+
+            GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(Thaumcraft.ID, "blockTaint", 1L, 2))
+                    .fluidOutputs(new FluidStack(FluidRegistry.getFluid("blood"), 45)).duration(50 * SECONDS).eut(48)
+                    .addTo(fluidExtractionRecipes);
+
             GTValues.RA.stdBuilder().itemInputs(new ItemStack(Items.slime_ball, 1, 0))
                     .fluidOutputs(new FluidStack(FluidRegistry.getFluid("glue"), 144)).duration(5 * SECONDS).eut(16)
                     .addTo(fluidExtractionRecipes);

diff --git a/src/main/java/com/dreammaster/scripts/ScriptBiomesOPlenty.java b/src/main/java/com/dreammaster/scripts/ScriptBiomesOPlenty.java
@@ -22,13 +22,16 @@
 import static gregtech.api.util.GTRecipeBuilder.MINUTES;
 import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes;
 
 import java.util.Arrays;
 import java.util.List;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidRegistry;
 
+import com.dreammaster.item.NHItemList;
+
 import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
@@ -306,6 +309,9 @@ public void loadRecipes() {
         GTValues.RA.stdBuilder().itemInputs(getModItem(BiomesOPlenty.ID, "jarEmpty", 1L))
                 .itemOutputs(getModItem(BiomesOPlenty.ID, "jarFilled", 1L)).fluidInputs(Materials.Honey.getFluid(1000L))
                 .duration(2 * SECONDS).eut(1).addTo(fluidCannerRecipes);
+        GTValues.RA.stdBuilder().itemInputs(NHItemList.MushroomPowder.getIS(1), GTUtility.getIntegratedCircuit(16))
+                .itemOutputs(getModItem(BiomesOPlenty.ID, "food", 1, 1, missing)).eut(30).duration(2 * MINUTES)
+                .addTo(chemicalDehydratorRecipes);
 
     }
 }
diff --git a/src/main/java/com/dreammaster/scripts/ScriptTinkersConstruct.java b/src/main/java/com/dreammaster/scripts/ScriptTinkersConstruct.java
@@ -22,10 +22,15 @@
 import static gregtech.api.enums.Mods.Thaumcraft;
 import static gregtech.api.enums.Mods.TinkerConstruct;
 import static gregtech.api.enums.Mods.TinkersMechworks;
+import static gregtech.api.enums.Mods.WitchingGadgets;
 import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes;
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
+import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes;
 import static gregtech.api.util.GTModHandler.getModItem;
+import static gregtech.api.util.GTRecipeBuilder.MINUTES;
 import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes;
 
 import java.util.Arrays;
 import java.util.List;
@@ -34,6 +39,7 @@
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 import com.dreammaster.gthandler.CustomItemList;
@@ -49,6 +55,7 @@
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.TierEU;
 import gregtech.api.util.GTModHandler;
 import gregtech.api.util.GTOreDictUnificator;
 import gregtech.api.util.GTUtility;
@@ -2503,6 +2510,45 @@ public void loadRecipes() {
                         GTUtility.getIntegratedCircuit(6))
                 .itemOutputs(getModItem(TinkerConstruct.ID, "decoration.stoneladder", 4, 0, missing))
                 .duration(3 * SECONDS).eut(30).addTo(assemblerRecipes);
+        GTValues.RA.stdBuilder()
+                .itemInputs(
+                        getModItem(TinkerConstruct.ID, "strangeFood", 1, 1, missing),
+                        GTUtility.getIntegratedCircuit(16))
+                .itemOutputs(getModItem(TinkerConstruct.ID, "jerky", 1, 7, missing)).eut(30).duration(2 * MINUTES)
+                .addTo(chemicalDehydratorRecipes);
+        GTValues.RA.stdBuilder()
+                .itemInputs(
+                        getModItem(TinkerConstruct.ID, "strangeFood", 1, 0, missing),
+                        GTUtility.getIntegratedCircuit(16))
+                .itemOutputs(getModItem(TinkerConstruct.ID, "jerky", 1, 6, missing)).eut(30).duration(2 * MINUTES)
+                .addTo(chemicalDehydratorRecipes);
+        GTValues.RA.stdBuilder()
+                .itemInputs(
+                        getModItem(PamsHarvestCraft.ID, "muttonrawItem", 1, 0, missing),
+                        GTUtility.getIntegratedCircuit(16))
+                .itemOutputs(getModItem(TinkerConstruct.ID, "jerky", 1, 3, missing)).eut(30).duration(2 * MINUTES)
+                .addTo(chemicalDehydratorRecipes);
+        GTValues.RA.stdBuilder()
+                .itemInputs(
+                        getModItem(Thaumcraft.ID, "ItemZombieBrain", 1, 0, missing),
+                        GTUtility.getIntegratedCircuit(16))
+                .itemOutputs(getModItem(WitchingGadgets.ID, "item.WG_MagicFood", 1, 2, missing)).eut(30)
+                .duration(2 * MINUTES).addTo(chemicalDehydratorRecipes);
+
+        GTValues.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Ball.get(0L))
+                .itemOutputs(getModItem(TinkerConstruct.ID, "strangeFood", 1, 1, missing))
+                .fluidInputs(new FluidStack(FluidRegistry.getFluid("blood"), 160)).duration(20 * TICKS)
+                .eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes);
+
+        GTValues.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Block.get(0L))
+                .itemOutputs(getModItem(TinkerConstruct.ID, "MetalBlock", 1, 10, missing))
+                .fluidInputs(new FluidStack(FluidRegistry.getFluid("ender"), 2250)).duration(20 * TICKS)
+                .eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes);
+
+        GTValues.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Block.get(0L))
+                .itemOutputs(getModItem(TinkerConstruct.ID, "Smeltery", 1, 4, missing))
+                .fluidInputs(new FluidStack(FluidRegistry.getFluid("stone.seared"), 360)).duration(20 * TICKS)
+                .eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes);
 
         registerManualIcons();
     }