From 8f1d0ec431d55c1704dbf25f298ad73af2d08ca7 Mon Sep 17 00:00:00 2001 From: EnderProyects Date: Sat, 14 Dec 2024 07:55:56 +0100 Subject: [PATCH 1/4] Now kinda all foods can be used add recipes for unobtainable foods, or its ingredients --- .../gthandler/recipes/MixerRecipes.java | 33 +++++++++++++++++++ .../scripts/ScriptBiomesOPlenty.java | 23 +++++++++++++ .../dreammaster/scripts/ScriptExtraTrees.java | 22 +++++++++++++ .../scripts/ScriptThaumicExploration.java | 19 +++++++++++ .../scripts/ScriptThaumicHorizons.java | 11 +++++++ 5 files changed, 108 insertions(+) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java index 84b0e51c7..e196a1f1f 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java @@ -8,7 +8,9 @@ import static gregtech.api.enums.Mods.EnderIO; import static gregtech.api.enums.Mods.ExtraTrees; import static gregtech.api.enums.Mods.Genetics; +import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.KubaTech; import static gregtech.api.enums.Mods.Natura; import static gregtech.api.enums.Mods.OpenComputers; import static gregtech.api.enums.Mods.PamsHarvestCraft; @@ -1198,5 +1200,36 @@ public void run() { MaterialsUEVplus.ExcitedDTEC.getFluid(128000)) .duration(3 * SECONDS).eut(TierEU.RECIPE_UIV).addTo(mixerNonCellRecipes); } + if (KubaTech.isModLoaded() && EnderIO.isModLoaded() + && BiomesOPlenty.isModLoaded() + && Witchery.isModLoaded() + && GregTech.isModLoaded()) { + GTValues.RA.stdBuilder() + .itemInputs( + GTModHandler.getModItem(KubaTech.ID, "kubaitems", 1L, 14), + GTModHandler.getModItem(KubaTech.ID, "kubaitems", 1L, 16), + GTModHandler.getModItem(KubaTech.ID, "kubaitems", 1L, 17), + GTModHandler.getModItem(KubaTech.ID, "kubaitems", 1L, 19), + GTModHandler.getModItem(EnderIO.ID, "bucketVapor_of_levity", 1L), + GTModHandler.getModItem(GregTech.ID, "gt.metaitem.02", 1L, 32009), + GTModHandler.getModItem(BiomesOPlenty.ID, "food", 1L, 10), + GTModHandler.getModItem(Witchery.ID, "potion", 1L), + GTModHandler.getModItem(Witchery.ID, "ingredient", 1L, 40)) + .itemOutputs( + new ItemStack(Items.glass_bottle, 2, 0), + new ItemStack(Items.bucket, 1, 0), + GTModHandler.getModItem(GregTech.ID, "gt.metaitem.01", 1L, 32404)) + .fluidInputs( + FluidRegistry.getFluidStack("potion.diablosauce", 7500), + FluidRegistry.getFluidStack("potion.piratebrew", 2500), + FluidRegistry.getFluidStack("potion.jagi", 2500), + FluidRegistry.getFluidStack("potion.alcopops", 2500), + FluidRegistry.getFluidStack("potion.goldencider", 2500), + FluidRegistry.getFluidStack("potion.chocolatemilk", 7500)) + .fluidOutputs( + FluidRegistry.getFluidStack("potion.diablosauce.strong", 12000), + FluidRegistry.getFluidStack("potion.mundane", 22000)) + .duration(200 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(mixerNonCellRecipes); + } } } diff --git a/src/main/java/com/dreammaster/scripts/ScriptBiomesOPlenty.java b/src/main/java/com/dreammaster/scripts/ScriptBiomesOPlenty.java index f18172979..43a388f5f 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptBiomesOPlenty.java +++ b/src/main/java/com/dreammaster/scripts/ScriptBiomesOPlenty.java @@ -2,11 +2,14 @@ import static com.dreammaster.main.MainRegistry.Module_CustomFuels; import static gregtech.api.enums.Mods.BiomesOPlenty; +import static gregtech.api.enums.Mods.Botany; import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.HardcoreEnderExpansion; import static gregtech.api.enums.Mods.IguanaTweaksTinkerConstruct; import static gregtech.api.enums.Mods.Minecraft; import static gregtech.api.enums.Mods.PamsHarvestCraft; +import static gregtech.api.enums.Mods.RandomThings; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; import static gregtech.api.recipe.RecipeMaps.extractorRecipes; @@ -14,6 +17,7 @@ import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; +import static gregtech.api.recipe.RecipeMaps.mixerRecipes; import static gregtech.api.util.GTModHandler.getModItem; import static gregtech.api.util.GTRecipeBuilder.MINUTES; import static gregtech.api.util.GTRecipeBuilder.SECONDS; @@ -29,6 +33,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; @@ -283,6 +288,24 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Gypsum, 1L), GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Calcite, 1L)) .outputChances(10000, 7500, 2500, 2500).duration(10 * SECONDS).eut(8).addTo(maceratorRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + getModItem(HardcoreEnderExpansion.ID, "end_powder", 8L), + getModItem(RandomThings.ID, "ingredient", 1L, 6)) + .itemOutputs(GTModHandler.getModItem(BiomesOPlenty.ID, "misc", 1L, 4)) + .fluidInputs(FluidRegistry.getFluidStack("endergoo", 1000)).duration(15 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(mixerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 1L), + getModItem(PamsHarvestCraft.ID, "seaweedItem", 32L), + getModItem(Botany.ID, "misc", 1L, 7)) + .itemOutputs(GTModHandler.getModItem(BiomesOPlenty.ID, "coral1", 32L, 11)) + .fluidInputs(FluidRegistry.getFluidStack("weedex9000", 100)).duration(15 * SECONDS) + .eut(TierEU.RECIPE_MV).addTo(mixerRecipes); + 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); } } diff --git a/src/main/java/com/dreammaster/scripts/ScriptExtraTrees.java b/src/main/java/com/dreammaster/scripts/ScriptExtraTrees.java index e1eba286d..4c4774145 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptExtraTrees.java +++ b/src/main/java/com/dreammaster/scripts/ScriptExtraTrees.java @@ -7476,5 +7476,27 @@ public void recipes2() { "stickWood", getModItem(Minecraft.ID, "planks", 1, 5, missing), "stickWood"); + addShapedRecipe( + createItemStack(ExtraTrees.ID, "food", 1, 23, "{meta:23}", missing), + "dustSugar", + getModItem(Minecraft.ID, "sand", 1, 1, missing), + "dustSugar", + getModItem(Minecraft.ID, "sand", 1, 1, missing), + "cropPear", + getModItem(Minecraft.ID, "sand", 1, 1, missing), + "dustSugar", + getModItem(Minecraft.ID, "sand", 1, 1, missing), + "dustSugar"); + addShapedRecipe( + createItemStack(ExtraTrees.ID, "food", 1, 40, "{meta:40}", missing), + "dustLazurite", + "gemChippedOlivine", + "dustLapis", + "dustSugar", + getModItem(Forestry.ID, "fruits", 1, 6, missing), + "gemChippedOlivine", + "dustSodalite", + "dustSugar", + "dustLazurite"); } } diff --git a/src/main/java/com/dreammaster/scripts/ScriptThaumicExploration.java b/src/main/java/com/dreammaster/scripts/ScriptThaumicExploration.java index 149e28ba5..b16347881 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptThaumicExploration.java +++ b/src/main/java/com/dreammaster/scripts/ScriptThaumicExploration.java @@ -2,7 +2,9 @@ import static gregtech.api.enums.Mods.BiomesOPlenty; import static gregtech.api.enums.Mods.ExtraUtilities; +import static gregtech.api.enums.Mods.ForbiddenMagic; import static gregtech.api.enums.Mods.Minecraft; +import static gregtech.api.enums.Mods.Natura; import static gregtech.api.enums.Mods.PamsHarvestCraft; import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Mods.ThaumicExploration; @@ -1888,6 +1890,23 @@ public void loadRecipes() { TCHelper.findInfusionRecipe(getModItem(ThaumicExploration.ID, "talismanFood", 1, 0, missing)))); TCHelper.addResearchPrereq("THINKTANK", "BraincureGTNH", false); ThaumcraftApi.addWarpToResearch("THINKTANK", 2); + ThaumcraftApi.addArcaneCraftingRecipe( + "TalismanfoodtGTNH", + getModItem(ThaumicExploration.ID, "taintBerry", 1, 0, missing), + new AspectList().add(Aspect.getAspect("aer"), 20).add(Aspect.getAspect("aqua"), 20) + .add(Aspect.getAspect("ignis"), 20).add(Aspect.getAspect("terra"), 20) + .add(Aspect.getAspect("ordo"), 25).add(Aspect.getAspect("perditio"), 25), + "tft", + "gbg", + "ggg", + 't', + getModItem(Thaumcraft.ID, "ItemResource", 1, 12, missing), + 'g', + getModItem(Thaumcraft.ID, "ItemResource", 1, 11, missing), + 'b', + getModItem(Natura.ID, "berry.nether", 1, missing), + 'f', + getModItem(ForbiddenMagic.ID, "TaintFruit", 1, missing)); TCHelper.orphanResearch("DREAMCATCHER"); TCHelper.removeResearch("DREAMCATCHER"); new ResearchItem( diff --git a/src/main/java/com/dreammaster/scripts/ScriptThaumicHorizons.java b/src/main/java/com/dreammaster/scripts/ScriptThaumicHorizons.java index 5d891abaf..3a3a51988 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptThaumicHorizons.java +++ b/src/main/java/com/dreammaster/scripts/ScriptThaumicHorizons.java @@ -1,8 +1,12 @@ package com.dreammaster.scripts; +import static gregtech.api.enums.Mods.BiomesOPlenty; import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Mods.ThaumicHorizons; +import static gregtech.api.recipe.RecipeMaps.compressorRecipes; +import static gregtech.api.recipe.RecipeMaps.extractorRecipes; import static gregtech.api.util.GTModHandler.getModItem; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import java.util.Arrays; import java.util.List; @@ -11,6 +15,7 @@ import com.dreammaster.thaumcraft.TCHelper; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.Mods; import gregtech.api.enums.OrePrefixes; @@ -195,5 +200,11 @@ public void loadRecipes() { TCHelper.refreshResearchPages("transductionAmplifier"); TCHelper.refreshResearchPages("vortexStabilizer"); TCHelper.refreshResearchPages("recombinator"); + GTValues.RA.stdBuilder().itemInputs(getModItem(BiomesOPlenty.ID, "flesh", 2, missing)) + .itemOutputs(getModItem(ThaumicHorizons.ID, "meatTH", 1, missing)).duration(15 * SECONDS).eut(2) + .addTo(compressorRecipes); + GTValues.RA.stdBuilder().itemInputs(getModItem(ThaumicHorizons.ID, "meatCookedTH", 1, missing)) + .itemOutputs(getModItem(ThaumicHorizons.ID, "meatNuggetTH", 4, missing)).duration(15 * SECONDS).eut(2) + .addTo(extractorRecipes); } } From 930cc7c31ae50307c1b7ae5ba59c489ed762110a Mon Sep 17 00:00:00 2001 From: EnderProyects Date: Sat, 14 Dec 2024 08:37:30 +0100 Subject: [PATCH 2/4] Fix modhandles Remove unnecesary code --- .../gthandler/recipes/MixerRecipes.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java index e196a1f1f..046372e5a 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java @@ -1200,18 +1200,15 @@ public void run() { MaterialsUEVplus.ExcitedDTEC.getFluid(128000)) .duration(3 * SECONDS).eut(TierEU.RECIPE_UIV).addTo(mixerNonCellRecipes); } - if (KubaTech.isModLoaded() && EnderIO.isModLoaded() - && BiomesOPlenty.isModLoaded() - && Witchery.isModLoaded() - && GregTech.isModLoaded()) { + if (KubaTech.isModLoaded() && EnderIO.isModLoaded() && BiomesOPlenty.isModLoaded() && Witchery.isModLoaded()) { GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(KubaTech.ID, "kubaitems", 1L, 14), - GTModHandler.getModItem(KubaTech.ID, "kubaitems", 1L, 16), - GTModHandler.getModItem(KubaTech.ID, "kubaitems", 1L, 17), - GTModHandler.getModItem(KubaTech.ID, "kubaitems", 1L, 19), + kubatech.api.enums.ItemList.EarlGrayTea.get(1), + kubatech.api.enums.ItemList.LemonTea.get(1), + kubatech.api.enums.ItemList.MilkTea.get(1), + kubatech.api.enums.ItemList.PeppermintTea.get(1), GTModHandler.getModItem(EnderIO.ID, "bucketVapor_of_levity", 1L), - GTModHandler.getModItem(GregTech.ID, "gt.metaitem.02", 1L, 32009), + ItemList.ThermosCan_Ice_Tea.get(1L), GTModHandler.getModItem(BiomesOPlenty.ID, "food", 1L, 10), GTModHandler.getModItem(Witchery.ID, "potion", 1L), GTModHandler.getModItem(Witchery.ID, "ingredient", 1L, 40)) From c30775c58ee300fae4402414bbe4927371039473 Mon Sep 17 00:00:00 2001 From: EnderProyects Date: Sat, 14 Dec 2024 08:40:24 +0100 Subject: [PATCH 3/4] ups --- .../java/com/dreammaster/gthandler/recipes/MixerRecipes.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java index 046372e5a..91a567164 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java @@ -8,7 +8,6 @@ import static gregtech.api.enums.Mods.EnderIO; import static gregtech.api.enums.Mods.ExtraTrees; import static gregtech.api.enums.Mods.Genetics; -import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.enums.Mods.KubaTech; import static gregtech.api.enums.Mods.Natura; @@ -1215,7 +1214,7 @@ public void run() { .itemOutputs( new ItemStack(Items.glass_bottle, 2, 0), new ItemStack(Items.bucket, 1, 0), - GTModHandler.getModItem(GregTech.ID, "gt.metaitem.01", 1L, 32404)) + ItemList.ThermosCan_Empty.get(1L)) .fluidInputs( FluidRegistry.getFluidStack("potion.diablosauce", 7500), FluidRegistry.getFluidStack("potion.piratebrew", 2500), From 414c81348bd03c57cfc8d0dd5ff478575be8c986 Mon Sep 17 00:00:00 2001 From: EnderProyects Date: Sat, 14 Dec 2024 08:42:28 +0100 Subject: [PATCH 4/4] ups 2.0 --- .../java/com/dreammaster/gthandler/recipes/MixerRecipes.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java index 91a567164..e4c36f71d 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java @@ -9,7 +9,6 @@ import static gregtech.api.enums.Mods.ExtraTrees; import static gregtech.api.enums.Mods.Genetics; import static gregtech.api.enums.Mods.IndustrialCraft2; -import static gregtech.api.enums.Mods.KubaTech; import static gregtech.api.enums.Mods.Natura; import static gregtech.api.enums.Mods.OpenComputers; import static gregtech.api.enums.Mods.PamsHarvestCraft; @@ -1199,7 +1198,7 @@ public void run() { MaterialsUEVplus.ExcitedDTEC.getFluid(128000)) .duration(3 * SECONDS).eut(TierEU.RECIPE_UIV).addTo(mixerNonCellRecipes); } - if (KubaTech.isModLoaded() && EnderIO.isModLoaded() && BiomesOPlenty.isModLoaded() && Witchery.isModLoaded()) { + if (EnderIO.isModLoaded() && BiomesOPlenty.isModLoaded() && Witchery.isModLoaded()) { GTValues.RA.stdBuilder() .itemInputs( kubatech.api.enums.ItemList.EarlGrayTea.get(1),