From 76f5804f84f13e457c832b0060e50e0699511f09 Mon Sep 17 00:00:00 2001 From: EnderProyects Date: Wed, 26 Mar 2025 03:33:14 +0100 Subject: [PATCH 01/16] Qol recipes --- dependencies.gradle | 2 +- .../gthandler/recipes/AssemblerRecipes.java | 69 +++++++++++++++++- .../recipes/ChemicalReactorRecipes.java | 9 +++ .../recipes/LaserEngraverRecipes.java | 25 +++++++ .../scripts/ScriptBloodArsenal.java | 14 ++++ .../scripts/ScriptDraconicEvolution.java | 18 +++++ .../dreammaster/scripts/ScriptEnderIO.java | 37 ++++++++++ .../dreammaster/scripts/ScriptMinecraft.java | 10 +++ .../dreammaster/scripts/ScriptProjectRed.java | 9 +++ .../dreammaster/scripts/ScriptThaumcraft.java | 71 +++++++++++++++++++ .../dreammaster/scripts/ScriptWitchery.java | 18 +++++ 11 files changed, 280 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 1b5ec79d4..04f5923ed 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.192:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.195:dev") api("com.github.GTNewHorizons:Yamcl:0.7.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java index 103ca4314..b488c5202 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java @@ -4,7 +4,58 @@ import static goodgenerator.loader.Loaders.advancedRadiationProtectionPlate; import static gregtech.api.enums.GTValues.L; import static gregtech.api.enums.GTValues.W; -import static gregtech.api.enums.Mods.*; +import static gregtech.api.enums.Mods.AE2FluidCraft; +import static gregtech.api.enums.Mods.AE2Stuff; +import static gregtech.api.enums.Mods.AdvancedSolarPanel; +import static gregtech.api.enums.Mods.AppliedEnergistics2; +import static gregtech.api.enums.Mods.Avaritia; +import static gregtech.api.enums.Mods.BiomesOPlenty; +import static gregtech.api.enums.Mods.BloodMagic; +import static gregtech.api.enums.Mods.Botania; +import static gregtech.api.enums.Mods.BuildCraftCore; +import static gregtech.api.enums.Mods.BuildCraftFactory; +import static gregtech.api.enums.Mods.BuildCraftTransport; +import static gregtech.api.enums.Mods.Chisel; +import static gregtech.api.enums.Mods.Computronics; +import static gregtech.api.enums.Mods.EnderIO; +import static gregtech.api.enums.Mods.EnhancedLootBags; +import static gregtech.api.enums.Mods.ExtraBees; +import static gregtech.api.enums.Mods.ExtraUtilities; +import static gregtech.api.enums.Mods.FloodLights; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.ForgeMicroblocks; +import static gregtech.api.enums.Mods.GalacticraftAmunRa; +import static gregtech.api.enums.Mods.GalacticraftCore; +import static gregtech.api.enums.Mods.GalacticraftMars; +import static gregtech.api.enums.Mods.GalaxySpace; +import static gregtech.api.enums.Mods.Gendustry; +import static gregtech.api.enums.Mods.GraviSuite; +import static gregtech.api.enums.Mods.HardcoreEnderExpansion; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.IronChests; +import static gregtech.api.enums.Mods.IronTanks; +import static gregtech.api.enums.Mods.JABBA; +import static gregtech.api.enums.Mods.Minecraft; +import static gregtech.api.enums.Mods.Natura; +import static gregtech.api.enums.Mods.NaturesCompass; +import static gregtech.api.enums.Mods.OpenBlocks; +import static gregtech.api.enums.Mods.OpenComputers; +import static gregtech.api.enums.Mods.OpenGlasses; +import static gregtech.api.enums.Mods.OpenModularTurrets; +import static gregtech.api.enums.Mods.OpenPrinters; +import static gregtech.api.enums.Mods.OpenSecurity; +import static gregtech.api.enums.Mods.PamsHarvestCraft; +import static gregtech.api.enums.Mods.ProjectRedIllumination; +import static gregtech.api.enums.Mods.Railcraft; +import static gregtech.api.enums.Mods.StevesCarts2; +import static gregtech.api.enums.Mods.StorageDrawers; +import static gregtech.api.enums.Mods.SuperSolarPanels; +import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.enums.Mods.TinkerConstruct; +import static gregtech.api.enums.Mods.TwilightForest; +import static gregtech.api.enums.Mods.VisualProspecting; +import static gregtech.api.enums.Mods.Witchery; +import static gregtech.api.enums.Mods.ZTones; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.util.GTModHandler.getModItem; import static gregtech.api.util.GTRecipeBuilder.MINUTES; @@ -48,6 +99,7 @@ import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsBotania; import gregtech.api.enums.MaterialsKevlar; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; @@ -10425,6 +10477,21 @@ private void makeSolderingAlloyRecipes() { .itemOutputs(GTModHandler.getModItem(Computronics.ID, "computronics.dockingUpgrade", 1L, 0)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + + // Hand of Ender + + GTValues.RA.stdBuilder() + .itemInputs( + GTModHandler.getModItem(Botania.ID, "enderEyeBlock", 1L, 0), + GTModHandler.getModItem(Witchery.ID, "witchhand", 1L, 0), + GTModHandler.getModItem(Botania.ID, "manaResource", 5L, 22), + GTModHandler.getModItem(Botania.ID, "manaBeacon", 1L, 5), + new ItemStack(Blocks.ender_chest, 1), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Obsidian, 2L), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(GTModHandler.getModItem(Botania.ID, "enderHand", 1L, 0)) + .fluidInputs(MaterialsBotania.Terrasteel.getMolten(1296)).duration(12 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); } } } diff --git a/src/main/java/com/dreammaster/gthandler/recipes/ChemicalReactorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/ChemicalReactorRecipes.java index fcf27d64b..b793bc9ef 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/ChemicalReactorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/ChemicalReactorRecipes.java @@ -2,6 +2,7 @@ import static bartworks.system.material.WerkstoffLoader.Roquesit; import static goodgenerator.items.GGMaterial.indiumPhosphate; +import static gregtech.api.enums.Mods.Botania; import static gregtech.api.enums.Mods.DraconicEvolution; import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.enums.Mods.Gendustry; @@ -331,6 +332,14 @@ public void run() { .fluidInputs(FluidRegistry.getFluidStack("binnie.bacteria", 1000)).requiresCleanRoom() .duration(60 * MINUTES).eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + GTValues.RA.stdBuilder() + .itemInputs( + GTModHandler.getModItem(Botania.ID, "cocoon", 1L, 0), + GTModHandler.getModItem(Genetics.ID, "misc", 64L, 4)) + .itemOutputs(CustomItemList.TheBigEgg.get(1L)) + .fluidInputs(FluidRegistry.getFluidStack("binnie.bacteria", 1000)).requiresCleanRoom() + .duration(60 * MINUTES).eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + } if (Gendustry.isModLoaded() && IndustrialCraft2.isModLoaded()) { diff --git a/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java index 2060fb176..50b7fb853 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java @@ -1,5 +1,6 @@ package com.dreammaster.gthandler.recipes; +import static gregtech.api.enums.Mods.Botania; import static gregtech.api.enums.Mods.GalacticraftCore; import static gregtech.api.enums.Mods.OpenComputers; import static gregtech.api.enums.Mods.SuperSolarPanels; @@ -243,6 +244,30 @@ public void run() { .itemOutputs(ItemList.Circuit_Wafer_NPIC.get(32)).requiresCleanRoom().duration(60 * 20) .eut(TierEU.RECIPE_UV).addTo(WaferEngravingRecipes); + // Bifrost laser recipes + GTValues.RA.stdBuilder() + .itemInputs( + GTModHandler.getModItem(Botania.ID, "elfGlass", 1L, 0), + GTModHandler.getModItem(Botania.ID, "rainbowRod", 0L, 0)) + .itemOutputs(GTModHandler.getModItem(Botania.ID, "bifrostPerm", 1L, 0)).duration(2 * SECONDS) + .eut(TierEU.RECIPE_IV).addTo(laserEngraverRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + GTModHandler.getModItem(Botania.ID, "livingrock", 1L, 0), + GTModHandler.getModItem(Botania.ID, "elfGlass", 1L, 0), + GTModHandler.getModItem(Botania.ID, "rainbowRod", 0L, 0)) + .itemOutputs(GTModHandler.getModItem(Botania.ID, "shimmerrock", 1L, 0)).duration(2 * SECONDS) + .eut(TierEU.RECIPE_IV).addTo(laserEngraverRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + GTModHandler.getModItem(Botania.ID, "dreamwood", 1L, 1), + GTModHandler.getModItem(Botania.ID, "elfGlass", 1L, 0), + GTModHandler.getModItem(Botania.ID, "rainbowRod", 0L, 0)) + .itemOutputs(GTModHandler.getModItem(Botania.ID, "shimmerwoodPlanks", 1L, 0)).duration(2 * SECONDS) + .eut(TierEU.RECIPE_IV).addTo(laserEngraverRecipes); + // Protomatter recipes GTValues.RA.stdBuilder().fluidInputs(MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(100L)) .duration(10 * SECONDS).eut(TierEU.RECIPE_UIV).fluidOutputs(MaterialsUEVplus.Protomatter.getFluid(100L)) diff --git a/src/main/java/com/dreammaster/scripts/ScriptBloodArsenal.java b/src/main/java/com/dreammaster/scripts/ScriptBloodArsenal.java index d744572fa..6c16a3362 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptBloodArsenal.java +++ b/src/main/java/com/dreammaster/scripts/ScriptBloodArsenal.java @@ -8,6 +8,7 @@ import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Mods.TinkerConstruct; import static gregtech.api.enums.Mods.Witchery; +import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.recipe.RecipeMaps.latheRecipes; @@ -17,7 +18,11 @@ import java.util.Arrays; import java.util.List; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import com.dreammaster.bloodmagic.BloodMagicHelper; import com.dreammaster.tinkersConstruct.TConstructHelper; @@ -30,6 +35,7 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; public class ScriptBloodArsenal implements IScriptLoader { @@ -724,5 +730,13 @@ public void loadRecipes() { GTValues.RA.stdBuilder().itemInputs(getModItem(BloodArsenal.ID, "blood_infused_planks", 1, 0, missing)) .itemOutputs(getModItem(BloodArsenal.ID, "blood_infused_stick", 2, 0, missing)).duration(20).eut(8) .addTo(latheRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.glass, 1), + new ItemStack(Items.flint, 1), + GTUtility.getIntegratedCircuit(2)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("blood"), 100)) + .itemOutputs(getModItem(BloodArsenal.ID, "glass_shard", 1, 0, missing)).duration(6 * SECONDS).eut(20) + .addTo(assemblerRecipes); } } diff --git a/src/main/java/com/dreammaster/scripts/ScriptDraconicEvolution.java b/src/main/java/com/dreammaster/scripts/ScriptDraconicEvolution.java index 6f2a83818..59edef98b 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptDraconicEvolution.java +++ b/src/main/java/com/dreammaster/scripts/ScriptDraconicEvolution.java @@ -6,10 +6,13 @@ import static gregtech.api.enums.Mods.BuildCraftTransport; import static gregtech.api.enums.Mods.DraconicEvolution; import static gregtech.api.enums.Mods.EnderIO; +import static gregtech.api.enums.Mods.ExtraUtilities; import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.enums.Mods.Minecraft; +import static gregtech.api.enums.Mods.NEIOrePlugin; import static gregtech.api.enums.Mods.OpenBlocks; +import static gregtech.api.enums.Mods.OpenComputers; import static gregtech.api.enums.Mods.ProjectRedIntegration; import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.enums.Mods.Thaumcraft; @@ -30,6 +33,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import com.dreammaster.gthandler.CustomItemList; import com.dreammaster.item.NHItemList; @@ -1226,6 +1230,20 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 1L)) .itemOutputs(getModItem(DraconicEvolution.ID, "rainSensor", 1, 0, missing)).duration(10 * SECONDS) .eut(480).addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + getModItem(NEIOrePlugin.ID, "blockDimensionDisplay_Ow", 1, 0), + getModItem(OpenComputers.ID, "hologram2", 1, 0, missing), + createItemStack( + ExtraUtilities.ID, + "microblocks", + 1, + 3, + "{mat:\"tile.extrautils:decorativeBlock1_5\"}", + missing)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("water"), 10000)) + .itemOutputs(getModItem(DraconicEvolution.ID, "earth", 1, 0, missing)).duration(6 * SECONDS).eut(200) + .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(Minecraft.ID, "obsidian", 1, 0, missing), diff --git a/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java b/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java index 58d3403d5..9a2fe0334 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java +++ b/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java @@ -5,6 +5,7 @@ import static gregtech.api.enums.Mods.Avaritia; import static gregtech.api.enums.Mods.Backpack; import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.Botania; import static gregtech.api.enums.Mods.BuildCraftFactory; import static gregtech.api.enums.Mods.DraconicEvolution; import static gregtech.api.enums.Mods.EnderIO; @@ -17,6 +18,7 @@ import static gregtech.api.enums.Mods.OpenBlocks; import static gregtech.api.enums.Mods.ProjectRedIllumination; import static gregtech.api.enums.Mods.ProjectRedIntegration; +import static gregtech.api.enums.Mods.ThaumicExploration; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; @@ -25,11 +27,13 @@ import java.util.Arrays; import java.util.List; +import java.util.Objects; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.thaumcraft.TCHelper; import fox.spiteful.avaritia.crafting.ExtremeCraftingManager; import gregtech.api.enums.GTValues; @@ -40,6 +44,10 @@ import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTUtility; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; +import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.research.ResearchPage; public class ScriptEnderIO implements IScriptLoader { @@ -1871,5 +1879,34 @@ public void loadRecipes() { GregtechItemList.Battery_RE_EV_Lithium.get(1)) .itemOutputs(vibrantCapacitor.copy()).duration(5 * SECONDS).eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); + // SPAWNER + + ThaumcraftApi.addInfusionCraftingRecipe( + "CrucsoulGTNH", + getModItem(EnderIO.ID, "itemBrokenSpawner", 1, 0, missing), + 8, + new AspectList().add(Aspect.getAspect("exanimis"), 34).add(Aspect.getAspect("fames"), 18) + .add(Aspect.getAspect("spiritus"), 62).add(Aspect.getAspect("mortuus"), 64) + .add(Aspect.getAspect("telum"), 24).add(Aspect.getAspect("vinculum"), 46) + .add(Aspect.getAspect("alienis"), 28), + getModItem(ThaumicExploration.ID, "crucibleSouls", 1, 0, missing), + new ItemStack[] { getModItem(Botania.ID, "cocoon", 1, 0, missing), + getModItem(EnderIO.ID, "itemMaterial", 1, 9, missing), + getModItem(EnderIO.ID, "itemMaterial", 1, 17, missing), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Shadow, 1L), + getModItem(EnderIO.ID, "itemFrankenSkull", 1, 4, missing), + getModItem(EnderIO.ID, "itemMaterial", 1, 9, missing), + getModItem(Botania.ID, "cocoon", 1, 0, missing), + getModItem(EnderIO.ID, "itemMaterial", 1, 9, missing), + getModItem(EnderIO.ID, "itemMaterial", 1, 16, missing), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Shadow, 1L), + getModItem(EnderIO.ID, "itemFrankenSkull", 1, 4, missing), + getModItem(EnderIO.ID, "itemMaterial", 1, 9, missing), }); + TCHelper.addResearchPage( + "CrucsoulGTNH", + new ResearchPage( + Objects.requireNonNull( + TCHelper.findInfusionRecipe( + getModItem(EnderIO.ID, "itemBrokenSpawner", 1, 0, missing))))); } } diff --git a/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java b/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java index f004266ba..ad59d2e7b 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java @@ -6,6 +6,7 @@ import static gregtech.api.enums.Mods.BloodArsenal; import static gregtech.api.enums.Mods.Botania; import static gregtech.api.enums.Mods.CarpentersBlocks; +import static gregtech.api.enums.Mods.EnderStorage; import static gregtech.api.enums.Mods.ExtraTrees; import static gregtech.api.enums.Mods.ExtraUtilities; import static gregtech.api.enums.Mods.ForbiddenMagic; @@ -38,12 +39,14 @@ import static gregtech.api.util.GTModHandler.getModItem; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gtPlusPlus.core.recipe.common.CI.bits; import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; import java.util.Arrays; import java.util.List; import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import com.dreammaster.gthandler.CustomItemList; @@ -4996,5 +4999,12 @@ private void craftingRecipes() { null, null, null); + GTModHandler.addCraftingRecipe( + new ItemStack(Blocks.ender_chest, 1), + bits, + new Object[] { "ABA", "ACA", "ADA", 'A', "plateObsidian", 'B', "plateDenseEnderium", 'C', + GTModHandler.getModItem(EnderStorage.ID, "enderChest", 1L, 0), 'D', + new ItemStack(Items.ender_eye, 1) }); + } } diff --git a/src/main/java/com/dreammaster/scripts/ScriptProjectRed.java b/src/main/java/com/dreammaster/scripts/ScriptProjectRed.java index 16221b8c8..74a77cc09 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptProjectRed.java +++ b/src/main/java/com/dreammaster/scripts/ScriptProjectRed.java @@ -5,6 +5,7 @@ import static gregtech.api.enums.Mods.Botania; import static gregtech.api.enums.Mods.Botany; import static gregtech.api.enums.Mods.BuildCraftFactory; +import static gregtech.api.enums.Mods.EtFuturumRequiem; import static gregtech.api.enums.Mods.ExtraBees; import static gregtech.api.enums.Mods.ForbiddenMagic; import static gregtech.api.enums.Mods.Forestry; @@ -63,6 +64,7 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; import gregtech.api.enums.TierEU; +import gregtech.api.util.GTModHandler; import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTUtility; import gtPlusPlus.core.material.MaterialsAlloy; @@ -3802,6 +3804,13 @@ private void recipes2() { GTUtility.getIntegratedCircuit(2)) .itemOutputs(getModItem(ProjectRedTransmission.ID, "projectred.transmission.wire", 1, 0, missing)) .duration(SECONDS).eut(8).addTo(wiremillRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + GTModHandler.getModItem(EtFuturumRequiem.ID, "barrel", 1L, 0), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.WoodSealed, 4L), + GTUtility.getIntegratedCircuit(5)) + .itemOutputs(GTModHandler.getModItem(ProjectRedExploration.ID, "projectred.exploration.barrel", 1L, 0)) + .duration(12 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); } } diff --git a/src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java b/src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java index 49631c14e..a94889673 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java @@ -6,6 +6,7 @@ import static gregtech.api.enums.Mods.BartWorks; import static gregtech.api.enums.Mods.BiomesOPlenty; import static gregtech.api.enums.Mods.BuildCraftFactory; +import static gregtech.api.enums.Mods.Chisel; import static gregtech.api.enums.Mods.ExtraUtilities; import static gregtech.api.enums.Mods.ForbiddenMagic; import static gregtech.api.enums.Mods.Forestry; @@ -41,6 +42,7 @@ import java.util.Arrays; import java.util.List; +import java.util.Objects; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -3982,6 +3984,75 @@ private void artifice() { getModItem(Minecraft.ID, "bone", 1, 0, missing), 'i', "screwThaumium"); + + ThaumcraftApi.addArcaneCraftingRecipe( + "ENCHFABRIC", + getModItem(Thaumcraft.ID, "ItemThaumonomicon", 1, 0, missing), + new AspectList().add(Aspect.getAspect("ordo"), 2).add(Aspect.getAspect("perditio"), 2) + .add(Aspect.getAspect("terra"), 2), + "aba", + "cde", + "aba", + 'a', + new ItemStack(Items.gold_nugget, 1), + 'b', + getModItem(Thaumcraft.ID, "ItemResource", 1, 7, missing), + 'c', + getModItem(Thaumcraft.ID, "ItemResource", 1, 14, missing), + 'd', + new ItemStack(Items.writable_book, 1), + 'e', + getModItem(Thaumcraft.ID, "ItemResource", 1, 9, missing)); + TCHelper.addResearchPage( + "ENCHFABRIC", + new ResearchPage( + Objects.requireNonNull( + TCHelper.findArcaneRecipe( + getModItem(Thaumcraft.ID, "ItemThaumonomicon", 1, 0, missing))))); + + ThaumcraftApi.addArcaneCraftingRecipe( + "BASICARTIFACE", + getModItem(Thaumcraft.ID, "blockTable", 1, 15, missing), + new AspectList().add(Aspect.getAspect("ordo"), 2).add(Aspect.getAspect("perditio"), 2) + .add(Aspect.getAspect("terra"), 2), + "aba", + "aca", + "ada", + 'b', + getModItem(Chisel.ID, "carpet", 1, 13, missing), + 'c', + getModItem(TinkerConstruct.ID, "CraftingSlab", 1, 0, missing), + 'd', + getModItem(Thaumcraft.ID, "blockTable", 1, 0, missing)); + TCHelper.addResearchPage( + "BASICARTIFACE", + new ResearchPage( + Objects.requireNonNull( + TCHelper.findArcaneRecipe(getModItem(Thaumcraft.ID, "blockTable", 1, 15, missing))))); + + ThaumcraftApi.addArcaneCraftingRecipe( + "BASICARTIFACE", + getModItem(Thaumcraft.ID, "blockMetalDevice", 1, 0, missing), + new AspectList().add(Aspect.getAspect("ordo"), 2).add(Aspect.getAspect("perditio"), 2) + .add(Aspect.getAspect("ignis"), 2), + "aba", + "cdc", + "ccc", + 'a', + getModItem(Thaumcraft.ID, "ItemResource", 1, 14, missing), + 'b', + "screwAnyIron", + 'c', + "plateThaumium", + 'd', + "gemFlawlessAmber"); + TCHelper.addResearchPage( + "BASICARTIFACE", + new ResearchPage( + Objects.requireNonNull( + TCHelper.findArcaneRecipe( + getModItem(Thaumcraft.ID, "blockMetalDevice", 1, 0, missing))))); + TCHelper.setResearchAspects( "BONEBOW", new AspectList().add(Aspect.getAspect("telum"), 12).add(Aspect.getAspect("motus"), 9) diff --git a/src/main/java/com/dreammaster/scripts/ScriptWitchery.java b/src/main/java/com/dreammaster/scripts/ScriptWitchery.java index 22c9f6d23..62d53a372 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptWitchery.java +++ b/src/main/java/com/dreammaster/scripts/ScriptWitchery.java @@ -19,6 +19,7 @@ import java.util.Arrays; import java.util.List; +import java.util.Objects; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -292,6 +293,23 @@ public void loadRecipes() { 2, getModItem(Witchery.ID, "ingredient", 1, 153, missing)) .setPages(new ResearchPage("Witchery.research_page.ANOINTINGPASTE.1")).registerResearchItem(); + ThaumcraftApi.addArcaneCraftingRecipe( + "ANOINTINGPASTE", + getModItem(Witchery.ID, "cauldron", 1, 0, missing), + new AspectList().add(Aspect.getAspect("ordo"), 2).add(Aspect.getAspect("ignis"), 2) + .add(Aspect.getAspect("terra"), 2), + "aba", + "aca", + "aaa", + 'b', + getModItem(Witchery.ID, "ingredient", 1, 153, missing), + 'c', + getModItem(Thaumcraft.ID, "blockMetalDevice", 1, 0, missing)); + TCHelper.addResearchPage( + "ANOINTINGPASTE", + new ResearchPage( + Objects.requireNonNull( + TCHelper.findArcaneRecipe(getModItem(Witchery.ID, "cauldron", 1, 0, missing))))); new ResearchItem( "OVEN", "WITCHERY", From 8458f44c053b1835a906a57f6726cd4a2cf80b22 Mon Sep 17 00:00:00 2001 From: EnderProyects Date: Wed, 26 Mar 2025 13:08:40 +0100 Subject: [PATCH 02/16] Update ScriptDraconicEvolution.java --- .../com/dreammaster/scripts/ScriptDraconicEvolution.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptDraconicEvolution.java b/src/main/java/com/dreammaster/scripts/ScriptDraconicEvolution.java index 59edef98b..c376ceac7 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptDraconicEvolution.java +++ b/src/main/java/com/dreammaster/scripts/ScriptDraconicEvolution.java @@ -3,6 +3,7 @@ import static gregtech.api.enums.Mods.AvaritiaAddons; import static gregtech.api.enums.Mods.BloodArsenal; import static gregtech.api.enums.Mods.BloodMagic; +import static gregtech.api.enums.Mods.Botania; import static gregtech.api.enums.Mods.BuildCraftTransport; import static gregtech.api.enums.Mods.DraconicEvolution; import static gregtech.api.enums.Mods.EnderIO; @@ -10,7 +11,6 @@ import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.enums.Mods.Minecraft; -import static gregtech.api.enums.Mods.NEIOrePlugin; import static gregtech.api.enums.Mods.OpenBlocks; import static gregtech.api.enums.Mods.OpenComputers; import static gregtech.api.enums.Mods.ProjectRedIntegration; @@ -1232,7 +1232,10 @@ public void loadRecipes() { .eut(480).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - getModItem(NEIOrePlugin.ID, "blockDimensionDisplay_Ow", 1, 0), + getModItem(Botania.ID, "tinyPlanetBlock", 1, 0), + getModItem(ExtraUtilities.ID, "greenscreen", 64, 3), + getModItem(ExtraUtilities.ID, "greenscreen", 64, 11), + getModItem(ExtraUtilities.ID, "greenscreen", 64, 13), getModItem(OpenComputers.ID, "hologram2", 1, 0, missing), createItemStack( ExtraUtilities.ID, From bd49a658afd7110b7e716fd2356bee486703538f Mon Sep 17 00:00:00 2001 From: EnderProyects Date: Wed, 26 Mar 2025 17:48:58 +0100 Subject: [PATCH 03/16] Update ScriptEnderIO.java --- src/main/java/com/dreammaster/scripts/ScriptEnderIO.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java b/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java index 9a2fe0334..5680f5f1d 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java +++ b/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java @@ -18,6 +18,7 @@ import static gregtech.api.enums.Mods.OpenBlocks; import static gregtech.api.enums.Mods.ProjectRedIllumination; import static gregtech.api.enums.Mods.ProjectRedIntegration; +import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Mods.ThaumicExploration; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; @@ -60,8 +61,11 @@ public String getScriptName() { public List getDependencies() { return Arrays.asList( EnderIO.ID, + Thaumcraft.ID, + ThaumicExploration.ID, AppliedEnergistics2.ID, Avaritia.ID, + Botania.ID, Backpack.ID, BartWorks.ID, BuildCraftFactory.ID, @@ -1902,6 +1906,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Shadow, 1L), getModItem(EnderIO.ID, "itemFrankenSkull", 1, 4, missing), getModItem(EnderIO.ID, "itemMaterial", 1, 9, missing), }); + TCHelper.refreshResearchPages("CrucsoulGTNH"); TCHelper.addResearchPage( "CrucsoulGTNH", new ResearchPage( From 21de5d90f1cb315070daf81e500bf6eddae7b0b6 Mon Sep 17 00:00:00 2001 From: EnderProyects Date: Wed, 26 Mar 2025 19:55:20 +0100 Subject: [PATCH 04/16] Update ScriptEnderIO.java --- .../dreammaster/scripts/ScriptEnderIO.java | 50 ++++++------------- 1 file changed, 16 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java b/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java index 5680f5f1d..a7f461772 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java +++ b/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java @@ -28,13 +28,11 @@ import java.util.Arrays; import java.util.List; -import java.util.Objects; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import com.dreammaster.gthandler.CustomItemList; -import com.dreammaster.thaumcraft.TCHelper; import fox.spiteful.avaritia.crafting.ExtremeCraftingManager; import gregtech.api.enums.GTValues; @@ -45,10 +43,6 @@ import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTUtility; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import thaumcraft.api.ThaumcraftApi; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.research.ResearchPage; public class ScriptEnderIO implements IScriptLoader { @@ -1884,34 +1878,22 @@ public void loadRecipes() { .itemOutputs(vibrantCapacitor.copy()).duration(5 * SECONDS).eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); // SPAWNER + /* + * ThaumcraftApi.addInfusionCraftingRecipe( "CrucsoulGTNH", getModItem(EnderIO.ID, "itemBrokenSpawner", 1, 0, + * missing), 8, new AspectList().add(Aspect.getAspect("exanimis"), 34).add(Aspect.getAspect("fames"), 18) + * .add(Aspect.getAspect("spiritus"), 62).add(Aspect.getAspect("mortuus"), 64) .add(Aspect.getAspect("telum"), + * 24).add(Aspect.getAspect("vinculum"), 46) .add(Aspect.getAspect("alienis"), 28), + * getModItem(ThaumicExploration.ID, "crucibleSouls", 1, 0, missing), new ItemStack[] { getModItem(Botania.ID, + * "cocoon", 1, 0, missing), getModItem(EnderIO.ID, "itemMaterial", 1, 9, missing), getModItem(EnderIO.ID, + * "itemMaterial", 1, 17, missing), GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Shadow, 1L), + * getModItem(EnderIO.ID, "itemFrankenSkull", 1, 4, missing), getModItem(EnderIO.ID, "itemMaterial", 1, 9, + * missing), getModItem(Botania.ID, "cocoon", 1, 0, missing), getModItem(EnderIO.ID, "itemMaterial", 1, 9, + * missing), getModItem(EnderIO.ID, "itemMaterial", 1, 16, missing), + * GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Shadow, 1L), getModItem(EnderIO.ID, + * "itemFrankenSkull", 1, 4, missing), getModItem(EnderIO.ID, "itemMaterial", 1, 9, missing), }); + * TCHelper.addResearchPage( "CrucsoulGTNH", new ResearchPage( Objects.requireNonNull( + * TCHelper.findInfusionRecipe( getModItem(EnderIO.ID, "itemBrokenSpawner", 1, 0, missing))))); + */ - ThaumcraftApi.addInfusionCraftingRecipe( - "CrucsoulGTNH", - getModItem(EnderIO.ID, "itemBrokenSpawner", 1, 0, missing), - 8, - new AspectList().add(Aspect.getAspect("exanimis"), 34).add(Aspect.getAspect("fames"), 18) - .add(Aspect.getAspect("spiritus"), 62).add(Aspect.getAspect("mortuus"), 64) - .add(Aspect.getAspect("telum"), 24).add(Aspect.getAspect("vinculum"), 46) - .add(Aspect.getAspect("alienis"), 28), - getModItem(ThaumicExploration.ID, "crucibleSouls", 1, 0, missing), - new ItemStack[] { getModItem(Botania.ID, "cocoon", 1, 0, missing), - getModItem(EnderIO.ID, "itemMaterial", 1, 9, missing), - getModItem(EnderIO.ID, "itemMaterial", 1, 17, missing), - GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Shadow, 1L), - getModItem(EnderIO.ID, "itemFrankenSkull", 1, 4, missing), - getModItem(EnderIO.ID, "itemMaterial", 1, 9, missing), - getModItem(Botania.ID, "cocoon", 1, 0, missing), - getModItem(EnderIO.ID, "itemMaterial", 1, 9, missing), - getModItem(EnderIO.ID, "itemMaterial", 1, 16, missing), - GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Shadow, 1L), - getModItem(EnderIO.ID, "itemFrankenSkull", 1, 4, missing), - getModItem(EnderIO.ID, "itemMaterial", 1, 9, missing), }); - TCHelper.refreshResearchPages("CrucsoulGTNH"); - TCHelper.addResearchPage( - "CrucsoulGTNH", - new ResearchPage( - Objects.requireNonNull( - TCHelper.findInfusionRecipe( - getModItem(EnderIO.ID, "itemBrokenSpawner", 1, 0, missing))))); } } From b79d7746115ee73e5339a274462fe46e7c25e558 Mon Sep 17 00:00:00 2001 From: EnderProyects Date: Wed, 26 Mar 2025 20:14:42 +0100 Subject: [PATCH 05/16] changed location of recipe --- .../dreammaster/scripts/ScriptEnderIO.java | 17 ---------- .../scripts/ScriptThaumicExploration.java | 33 +++++++++++++++++++ 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java b/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java index a7f461772..5314041f9 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java +++ b/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java @@ -1877,23 +1877,6 @@ public void loadRecipes() { GregtechItemList.Battery_RE_EV_Lithium.get(1)) .itemOutputs(vibrantCapacitor.copy()).duration(5 * SECONDS).eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); - // SPAWNER - /* - * ThaumcraftApi.addInfusionCraftingRecipe( "CrucsoulGTNH", getModItem(EnderIO.ID, "itemBrokenSpawner", 1, 0, - * missing), 8, new AspectList().add(Aspect.getAspect("exanimis"), 34).add(Aspect.getAspect("fames"), 18) - * .add(Aspect.getAspect("spiritus"), 62).add(Aspect.getAspect("mortuus"), 64) .add(Aspect.getAspect("telum"), - * 24).add(Aspect.getAspect("vinculum"), 46) .add(Aspect.getAspect("alienis"), 28), - * getModItem(ThaumicExploration.ID, "crucibleSouls", 1, 0, missing), new ItemStack[] { getModItem(Botania.ID, - * "cocoon", 1, 0, missing), getModItem(EnderIO.ID, "itemMaterial", 1, 9, missing), getModItem(EnderIO.ID, - * "itemMaterial", 1, 17, missing), GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Shadow, 1L), - * getModItem(EnderIO.ID, "itemFrankenSkull", 1, 4, missing), getModItem(EnderIO.ID, "itemMaterial", 1, 9, - * missing), getModItem(Botania.ID, "cocoon", 1, 0, missing), getModItem(EnderIO.ID, "itemMaterial", 1, 9, - * missing), getModItem(EnderIO.ID, "itemMaterial", 1, 16, missing), - * GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Shadow, 1L), getModItem(EnderIO.ID, - * "itemFrankenSkull", 1, 4, missing), getModItem(EnderIO.ID, "itemMaterial", 1, 9, missing), }); - * TCHelper.addResearchPage( "CrucsoulGTNH", new ResearchPage( Objects.requireNonNull( - * TCHelper.findInfusionRecipe( getModItem(EnderIO.ID, "itemBrokenSpawner", 1, 0, missing))))); - */ } } diff --git a/src/main/java/com/dreammaster/scripts/ScriptThaumicExploration.java b/src/main/java/com/dreammaster/scripts/ScriptThaumicExploration.java index b16347881..665ff2e80 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptThaumicExploration.java +++ b/src/main/java/com/dreammaster/scripts/ScriptThaumicExploration.java @@ -1,6 +1,8 @@ package com.dreammaster.scripts; import static gregtech.api.enums.Mods.BiomesOPlenty; +import static gregtech.api.enums.Mods.Botania; +import static gregtech.api.enums.Mods.EnderIO; import static gregtech.api.enums.Mods.ExtraUtilities; import static gregtech.api.enums.Mods.ForbiddenMagic; import static gregtech.api.enums.Mods.Minecraft; @@ -12,6 +14,7 @@ import java.util.Arrays; import java.util.List; +import java.util.Objects; import net.minecraft.item.ItemStack; @@ -1994,6 +1997,36 @@ public void loadRecipes() { TCHelper.findInfusionRecipe( getModItem(ThaumicExploration.ID, "crucibleSouls", 1, 0, missing)))); ThaumcraftApi.addWarpToResearch("CrucsoulGTNH", 4); + // SPAWNER + + ThaumcraftApi.addInfusionCraftingRecipe( + "CrucsoulGTNH", + getModItem(EnderIO.ID, "itemBrokenSpawner", 1, 0, missing), + 8, + new AspectList().add(Aspect.getAspect("exanimis"), 34).add(Aspect.getAspect("fames"), 18) + .add(Aspect.getAspect("spiritus"), 62).add(Aspect.getAspect("mortuus"), 64) + .add(Aspect.getAspect("telum"), 24).add(Aspect.getAspect("vinculum"), 46) + .add(Aspect.getAspect("alienis"), 28), + getModItem(ThaumicExploration.ID, "crucibleSouls", 1, 0, missing), + new ItemStack[] { getModItem(Botania.ID, "cocoon", 1, 0, missing), + getModItem(EnderIO.ID, "itemMaterial", 1, 9, missing), + getModItem(EnderIO.ID, "itemMaterial", 1, 17, missing), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Shadow, 1L), + getModItem(EnderIO.ID, "itemFrankenSkull", 1, 4, missing), + getModItem(EnderIO.ID, "itemMaterial", 1, 9, missing), + getModItem(Botania.ID, "cocoon", 1, 0, missing), + getModItem(EnderIO.ID, "itemMaterial", 1, 9, missing), + getModItem(EnderIO.ID, "itemMaterial", 1, 16, missing), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Shadow, 1L), + getModItem(EnderIO.ID, "itemFrankenSkull", 1, 4, missing), + getModItem(EnderIO.ID, "itemMaterial", 1, 9, missing), }); + TCHelper.addResearchPage( + "CrucsoulGTNH", + new ResearchPage( + Objects.requireNonNull( + TCHelper.findInfusionRecipe( + getModItem(EnderIO.ID, "itemBrokenSpawner", 1, 0, missing))))); + TCHelper.addResearchPrereq("TENTACLERING", "BraincureGTNH", true); TCHelper.setResearchAspects( "TENTACLERING", From d3876f166485be9b81785b631fd0fa54f5d897f9 Mon Sep 17 00:00:00 2001 From: EnderProyects Date: Wed, 26 Mar 2025 21:40:53 +0100 Subject: [PATCH 06/16] Update ScriptEnderIO.java --- .../java/com/dreammaster/scripts/ScriptEnderIO.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java b/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java index 5314041f9..d8d4ab6f9 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java +++ b/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java @@ -13,7 +13,9 @@ import static gregtech.api.enums.Mods.FloodLights; import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.GraviSuite; +import static gregtech.api.enums.Mods.HardcoreEnderExpansion; import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.MagicBees; import static gregtech.api.enums.Mods.Minecraft; import static gregtech.api.enums.Mods.OpenBlocks; import static gregtech.api.enums.Mods.ProjectRedIllumination; @@ -25,6 +27,7 @@ import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; import static gregtech.api.util.GTModHandler.getModItem; import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeConstants.UniversalChemical; import java.util.Arrays; import java.util.List; @@ -40,6 +43,7 @@ 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; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -1828,6 +1832,13 @@ public void loadRecipes() { getModItem(EnderIO.ID, "itemMaterial", 1, 17, missing), getModItem(EnderIO.ID, "itemMaterial", 1, 17, missing)) .outputChances(10000, 1000, 100, 10).duration(15 * SECONDS).eut(480).addTo(maceratorRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + GTModHandler.getModItem(HardcoreEnderExpansion.ID, "enderman_head", 1L, 0), + GTModHandler.getModItem(MagicBees.ID, "wax", 4L, 1)) + .itemOutputs(getModItem(EnderIO.ID, "blockEndermanSkull", 1, 0, missing)) + .fluidInputs(FluidRegistry.getFluidStack("endergoo", 1000)).duration(15 * SECONDS).eut(256) + .addTo(UniversalChemical); // Vibrant Capacitor Bank ItemStack vibrantCapacitor = createItemStack( From e10d17c7a7908d1638616715f1e3ec803faa8ed5 Mon Sep 17 00:00:00 2001 From: EnderProyects Date: Fri, 4 Apr 2025 03:12:58 +0200 Subject: [PATCH 07/16] add some things --- .../gthandler/recipes/AssemblerRecipes.java | 67 +++++++++++++++++++ .../recipes/ChemicalReactorRecipes.java | 12 ++++ .../recipes/SpaceAssemblerRecipes.java | 19 ++++++ .../scripts/ScriptHardcoreEnderExpansion.java | 7 ++ .../scripts/ScriptRandomThings.java | 9 +++ .../dreammaster/scripts/ScriptThaumcraft.java | 11 +++ 6 files changed, 125 insertions(+) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java index b488c5202..fdad43f2c 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java @@ -10492,6 +10492,73 @@ private void makeSolderingAlloyRecipes() { .itemOutputs(GTModHandler.getModItem(Botania.ID, "enderHand", 1L, 0)) .fluidInputs(MaterialsBotania.Terrasteel.getMolten(1296)).duration(12 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); + + // Botania seeds grass + + GTValues.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.grass, 16), + getModItem(Botania.ID, "grassSeeds", 1, 3, missing), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Botania.ID, "altGrass", 16, 0, missing)).duration(5 * SECONDS).eut(24) + .addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.grass, 16), + getModItem(Botania.ID, "grassSeeds", 1, 4, missing), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Botania.ID, "altGrass", 16, 1, missing)).duration(5 * SECONDS).eut(24) + .addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.grass, 16), + getModItem(Botania.ID, "grassSeeds", 1, 5, missing), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Botania.ID, "altGrass", 16, 2, missing)).duration(5 * SECONDS).eut(24) + .addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.grass, 16), + getModItem(Botania.ID, "grassSeeds", 1, 6, missing), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Botania.ID, "altGrass", 16, 3, missing)).duration(5 * SECONDS).eut(24) + .addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.grass, 16), + getModItem(Botania.ID, "grassSeeds", 1, 7, missing), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Botania.ID, "altGrass", 16, 4, missing)).duration(5 * SECONDS).eut(24) + .addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.grass, 16), + getModItem(Botania.ID, "grassSeeds", 1, 8, missing), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Botania.ID, "altGrass", 16, 5, missing)).duration(5 * SECONDS).eut(24) + .addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + getModItem(Botania.ID, "altGrass", 2, 0, missing), + getModItem(Botania.ID, "altGrass", 2, 1, missing), + getModItem(Botania.ID, "altGrass", 2, 2, missing), + getModItem(Botania.ID, "altGrass", 2, 3, missing), + getModItem(Botania.ID, "altGrass", 2, 4, missing), + getModItem(Botania.ID, "altGrass", 2, 5, missing), + getModItem(Botania.ID, "overgrowthSeed", 1, 0, missing), + getModItem(Botania.ID, "worldSeed", 1, 0, missing), + GTUtility.getIntegratedCircuit(10)) + .itemOutputs(getModItem(Botania.ID, "enchantedSoil", 12, 0, missing)).duration(50 * SECONDS) + .eut(240).addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + new ItemStack(Items.wheat, 16), + new ItemStack(Items.wheat_seeds, 1), + getModItem(Botania.ID, "fertilizer", 1, 0, missing), + GTUtility.getIntegratedCircuit(10)) + .itemOutputs(new ItemStack(Blocks.tallgrass, 16, 1)).duration(5 * SECONDS).eut(24) + .addTo(assemblerRecipes); + } } } diff --git a/src/main/java/com/dreammaster/gthandler/recipes/ChemicalReactorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/ChemicalReactorRecipes.java index b793bc9ef..1e1aef9c3 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/ChemicalReactorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/ChemicalReactorRecipes.java @@ -409,6 +409,18 @@ public void run() { } + if (Botania.isModLoaded()) { + + GTValues.RA.stdBuilder() + .itemInputs( + GTModHandler.getModItem(Botania.ID, "manaBottle", 1L, 0), + GTModHandler.getModItem(HardcoreEnderExpansion.ID, "essence", 1L, 0)) + .itemOutputs(GTModHandler.getModItem(Botania.ID, "manaResource", 1L, 15)) + .fluidInputs(FluidRegistry.getFluidStack("liquidair", 1000)).duration(1 * MINUTES) + .eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + + } + } public static void singleBlockOnly() { diff --git a/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java index b766d1a21..90d429d54 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java @@ -464,6 +464,25 @@ public void run() { .addTo(IGRecipeMaps.spaceAssemblerRecipes); } } + // Pseudo-Inversion Sigil Ritual + /* + * if (ExtraUtilities.isModLoaded()) { GTValues.RA.stdBuilder() .itemInputs( + * getModItem(UniversalSingularities.ID, "universal.vanilla.singularity", 1, 2), getModItem(Avaritia.ID, + * "Singularity", 1, 0), getModItem(UniversalSingularities.ID, "universal.general.singularity", 1, 24), + * getModItem(Avaritia.ID, "Singularity", 1, 3), getModItem(Avaritia.ID, "Resource", 64, 7), + * getModItem(Avaritia.ID, "Ultimate_Stew", 1, 0), getModItem(Avaritia.ID, "Cosmic_Meatballs", 1, 0), + * getModItem(StevesCarts2.ID, "CartModule", 1, 82), getModItem(ExtraUtilities.ID, "decorativeBlock1", 16, + * 12), getModItem(BiomesOPlenty.ID, "petals", 64, 0), getModItem(Witchery.ID, "ingredient", 64, 56), + * getModItem(Avaritia.ID, "Endest_Pearl", 16, 0), getModItem(EtFuturumRequiem.ID, "chorus_flower", 64, 0), + * getModItem(Witchery.ID, "cauldronbook", 1, 0), getModItem(AvaritiaAddons.ID, "CompressedChest", 4, 0), + * getModItem(ExtraUtilities.ID, "block_bedrockium", 16, 0)) .fluidInputs( new + * FluidStack(FluidRegistry.getFluid("ender"), 16000), new FluidStack(FluidRegistry.getFluid("endergoo"), + * 8000), new FluidStack(FluidRegistry.getFluid("radon"), 4000), new + * FluidStack(FluidRegistry.getFluid("potion.diablosauce.strong"), 2000)) .itemOutputs( new + * NBTItem(getModItem(ExtraUtilities.ID, "divisionSigil", 1, 0)) .setNBT("{stable:1b}")) + * .metadata(IGRecipeMaps.MODULE_TIER, 1).duration(10 * SECONDS).eut(TierEU.RECIPE_UV) + * .addTo(IGRecipeMaps.spaceAssemblerRecipes); } + */ } } } diff --git a/src/main/java/com/dreammaster/scripts/ScriptHardcoreEnderExpansion.java b/src/main/java/com/dreammaster/scripts/ScriptHardcoreEnderExpansion.java index c4729f1c4..ea378b414 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptHardcoreEnderExpansion.java +++ b/src/main/java/com/dreammaster/scripts/ScriptHardcoreEnderExpansion.java @@ -19,6 +19,7 @@ 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; @@ -785,6 +786,12 @@ private void addDecorativeBlocks() { ChiselHelper.addVariationFromStack( "HEEPersegrit", getModItem(HardcoreEnderExpansion.ID, "persegrit", 1, meta, missing)); + + // Death flower } + GTValues.RA.stdBuilder().itemInputs(getModItem(HardcoreEnderExpansion.ID, "death_flower", 1, 0, missing)) + .itemOutputs(getModItem(HardcoreEnderExpansion.ID, "death_flower", 1, 15, missing)).eut(480) + .duration(10 * MINUTES).addTo(chemicalDehydratorRecipes); + } } diff --git a/src/main/java/com/dreammaster/scripts/ScriptRandomThings.java b/src/main/java/com/dreammaster/scripts/ScriptRandomThings.java index fd7d9c69f..c11b65253 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptRandomThings.java +++ b/src/main/java/com/dreammaster/scripts/ScriptRandomThings.java @@ -4,7 +4,9 @@ import static gregtech.api.enums.Mods.EnderIO; import static gregtech.api.enums.Mods.ExtraUtilities; import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.HardcoreEnderExpansion; import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.MagicBees; import static gregtech.api.enums.Mods.Minecraft; import static gregtech.api.enums.Mods.ProjectRedIllumination; import static gregtech.api.enums.Mods.ProjectRedIntegration; @@ -271,6 +273,13 @@ public void loadRecipes() { .itemOutputs(getModItem(RandomThings.ID, "fertilizedDirt", 1, 0, missing)) .fluidInputs(FluidRegistry.getFluidStack("water", 1000)).duration(5 * SECONDS).eut(30) .addTo(UniversalChemical); + GTValues.RA.stdBuilder() + .itemInputs( + getModItem(HardcoreEnderExpansion.ID, "endoplasm", 1, 0, missing), + getModItem(MagicBees.ID, "wax", 1, 1, missing)) + .itemOutputs(getModItem(RandomThings.ID, "ingredient", 1, 3, missing)) + .fluidInputs(FluidRegistry.getFluidStack("cadaverine", 100)).duration(5 * SECONDS).eut(30) + .addTo(UniversalChemical); } } diff --git a/src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java b/src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java index a94889673..cd60d85bc 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java @@ -14,6 +14,7 @@ import static gregtech.api.enums.Mods.GalacticraftMars; import static gregtech.api.enums.Mods.IguanaTweaksTinkerConstruct; import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.MagicBees; import static gregtech.api.enums.Mods.MalisisDoors; import static gregtech.api.enums.Mods.Minecraft; import static gregtech.api.enums.Mods.Natura; @@ -34,6 +35,7 @@ import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes; 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; @@ -47,6 +49,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import com.dreammaster.chisel.ChiselHelper; import com.dreammaster.gthandler.CustomItemList; @@ -2500,6 +2503,14 @@ private void artifice() { GGMaterial.orundum.get(OrePrefixes.lens, 0)) .itemOutputs(getModItem(Thaumcraft.ID, "blockCosmeticSolid", 1, 7, missing)).duration(30 * SECONDS) .eut(120).addTo(laserEngraverRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + getModItem(Thaumcraft.ID, "blockStoneDevice", 0, 12, missing), + getModItem(Thaumcraft.ID, "ItemBathSalts", 1, 0, missing), + getModItem(MagicBees.ID, "wax", 1, 0, missing)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.mineralwater"), 4000)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("fluidpure"), 4000)).duration(50 * SECONDS).eut(48) + .addTo(mixerRecipes); TCHelper.removeArcaneRecipe(getModItem(Thaumcraft.ID, "ItemGoggles", 1, 0, missing)); TCHelper.removeArcaneRecipe(getModItem(Thaumcraft.ID, "ItemResource", 1, 15, missing)); From 9c110637793b22d8099039d92cccdef21b79b4be Mon Sep 17 00:00:00 2001 From: EnderProyects Date: Fri, 4 Apr 2025 03:23:33 +0200 Subject: [PATCH 08/16] Update AssemblerRecipes.java --- .../gthandler/recipes/AssemblerRecipes.java | 165 +++++++++--------- 1 file changed, 83 insertions(+), 82 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java index fdad43f2c..462a8938f 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java @@ -2418,6 +2418,89 @@ public void run() { } + if (Botania.isModLoaded()) { + // Hand of Ender + + GTValues.RA.stdBuilder() + .itemInputs( + GTModHandler.getModItem(Botania.ID, "enderEyeBlock", 1L, 0), + GTModHandler.getModItem(Witchery.ID, "witchhand", 1L, 0), + GTModHandler.getModItem(Botania.ID, "manaResource", 5L, 22), + GTModHandler.getModItem(Botania.ID, "manaBeacon", 1L, 5), + new ItemStack(Blocks.ender_chest, 1), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Obsidian, 2L), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(GTModHandler.getModItem(Botania.ID, "enderHand", 1L, 0)) + .fluidInputs(MaterialsBotania.Terrasteel.getMolten(1296)).duration(12 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); + + // Botania seeds grass + + GTValues.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.grass, 16), + getModItem(Botania.ID, "grassSeeds", 1, 3, missing), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Botania.ID, "altGrass", 16, 0, missing)).duration(5 * SECONDS).eut(24) + .addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.grass, 16), + getModItem(Botania.ID, "grassSeeds", 1, 4, missing), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Botania.ID, "altGrass", 16, 1, missing)).duration(5 * SECONDS).eut(24) + .addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.grass, 16), + getModItem(Botania.ID, "grassSeeds", 1, 5, missing), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Botania.ID, "altGrass", 16, 2, missing)).duration(5 * SECONDS).eut(24) + .addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.grass, 16), + getModItem(Botania.ID, "grassSeeds", 1, 6, missing), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Botania.ID, "altGrass", 16, 3, missing)).duration(5 * SECONDS).eut(24) + .addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.grass, 16), + getModItem(Botania.ID, "grassSeeds", 1, 7, missing), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Botania.ID, "altGrass", 16, 4, missing)).duration(5 * SECONDS).eut(24) + .addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.grass, 16), + getModItem(Botania.ID, "grassSeeds", 1, 8, missing), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Botania.ID, "altGrass", 16, 5, missing)).duration(5 * SECONDS).eut(24) + .addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + getModItem(Botania.ID, "altGrass", 2, 0, missing), + getModItem(Botania.ID, "altGrass", 2, 1, missing), + getModItem(Botania.ID, "altGrass", 2, 2, missing), + getModItem(Botania.ID, "altGrass", 2, 3, missing), + getModItem(Botania.ID, "altGrass", 2, 4, missing), + getModItem(Botania.ID, "altGrass", 2, 5, missing), + getModItem(Botania.ID, "overgrowthSeed", 1, 0, missing), + getModItem(Botania.ID, "worldSeed", 1, 0, missing), + GTUtility.getIntegratedCircuit(10)) + .itemOutputs(getModItem(Botania.ID, "enchantedSoil", 12, 0, missing)).duration(50 * SECONDS) + .eut(240).addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + new ItemStack(Items.wheat, 16), + new ItemStack(Items.wheat_seeds, 1), + getModItem(Botania.ID, "fertilizer", 1, 0, missing), + GTUtility.getIntegratedCircuit(10)) + .itemOutputs(new ItemStack(Blocks.tallgrass, 16, 1)).duration(5 * SECONDS).eut(24) + .addTo(assemblerRecipes); + } + // 16A Zpm to LuV transformer GTValues.RA.stdBuilder() .itemInputs( @@ -10477,88 +10560,6 @@ private void makeSolderingAlloyRecipes() { .itemOutputs(GTModHandler.getModItem(Computronics.ID, "computronics.dockingUpgrade", 1L, 0)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); - - // Hand of Ender - - GTValues.RA.stdBuilder() - .itemInputs( - GTModHandler.getModItem(Botania.ID, "enderEyeBlock", 1L, 0), - GTModHandler.getModItem(Witchery.ID, "witchhand", 1L, 0), - GTModHandler.getModItem(Botania.ID, "manaResource", 5L, 22), - GTModHandler.getModItem(Botania.ID, "manaBeacon", 1L, 5), - new ItemStack(Blocks.ender_chest, 1), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Obsidian, 2L), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(GTModHandler.getModItem(Botania.ID, "enderHand", 1L, 0)) - .fluidInputs(MaterialsBotania.Terrasteel.getMolten(1296)).duration(12 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); - - // Botania seeds grass - - GTValues.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.grass, 16), - getModItem(Botania.ID, "grassSeeds", 1, 3, missing), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Botania.ID, "altGrass", 16, 0, missing)).duration(5 * SECONDS).eut(24) - .addTo(assemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.grass, 16), - getModItem(Botania.ID, "grassSeeds", 1, 4, missing), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Botania.ID, "altGrass", 16, 1, missing)).duration(5 * SECONDS).eut(24) - .addTo(assemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.grass, 16), - getModItem(Botania.ID, "grassSeeds", 1, 5, missing), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Botania.ID, "altGrass", 16, 2, missing)).duration(5 * SECONDS).eut(24) - .addTo(assemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.grass, 16), - getModItem(Botania.ID, "grassSeeds", 1, 6, missing), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Botania.ID, "altGrass", 16, 3, missing)).duration(5 * SECONDS).eut(24) - .addTo(assemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.grass, 16), - getModItem(Botania.ID, "grassSeeds", 1, 7, missing), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Botania.ID, "altGrass", 16, 4, missing)).duration(5 * SECONDS).eut(24) - .addTo(assemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.grass, 16), - getModItem(Botania.ID, "grassSeeds", 1, 8, missing), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Botania.ID, "altGrass", 16, 5, missing)).duration(5 * SECONDS).eut(24) - .addTo(assemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - getModItem(Botania.ID, "altGrass", 2, 0, missing), - getModItem(Botania.ID, "altGrass", 2, 1, missing), - getModItem(Botania.ID, "altGrass", 2, 2, missing), - getModItem(Botania.ID, "altGrass", 2, 3, missing), - getModItem(Botania.ID, "altGrass", 2, 4, missing), - getModItem(Botania.ID, "altGrass", 2, 5, missing), - getModItem(Botania.ID, "overgrowthSeed", 1, 0, missing), - getModItem(Botania.ID, "worldSeed", 1, 0, missing), - GTUtility.getIntegratedCircuit(10)) - .itemOutputs(getModItem(Botania.ID, "enchantedSoil", 12, 0, missing)).duration(50 * SECONDS) - .eut(240).addTo(assemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - new ItemStack(Items.wheat, 16), - new ItemStack(Items.wheat_seeds, 1), - getModItem(Botania.ID, "fertilizer", 1, 0, missing), - GTUtility.getIntegratedCircuit(10)) - .itemOutputs(new ItemStack(Blocks.tallgrass, 16, 1)).duration(5 * SECONDS).eut(24) - .addTo(assemblerRecipes); - } } } From 7fc3386e7f49b3967913fdf01141cdfaf4bfef5f Mon Sep 17 00:00:00 2001 From: EnderProyects Date: Wed, 9 Apr 2025 17:20:32 +0200 Subject: [PATCH 09/16] update --- dependencies.gradle | 10 +++++----- gradle.properties | 2 +- settings.gradle | 2 +- .../gthandler/recipes/AssemblerRecipes.java | 1 + 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index d89e9fa7d..6ff252958 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,24 +1,24 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.211:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.227:dev") api("com.github.GTNewHorizons:Yamcl:0.7.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") - implementation("com.github.GTNewHorizons:GTNHLib:0.6.17:dev") + implementation("com.github.GTNewHorizons:GTNHLib:0.6.18:dev") compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.1:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Avaritia:1.61:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Avaritia:1.62:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:twilightforest:2.7.5:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.39:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.13-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.18-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.3.0:dev") { transitive = false } compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false } compileOnly rfg.deobf("curse.maven:witchery-69673:2234410") compileOnly("com.github.GTNewHorizons:Chisel:2.16.2-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Botania:1.12.6-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.5:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.8: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.8.1:dev") { transitive = false } diff --git a/gradle.properties b/gradle.properties index b0ecdf355..67fd676ca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ modId = dreamcraft modGroup = com.dreammaster # Whether to use modGroup as the maven publishing group. -# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods. +# When false, com.github.GTNewHorizons is used. useModGroupForPublishing = false # Updates your build.gradle and settings.gradle automatically whenever an update is available. diff --git a/settings.gradle b/settings.gradle index 40fb369ee..ff436f2c4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.37' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38' } diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java index 462a8938f..c87f84297 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java @@ -2419,6 +2419,7 @@ public void run() { } if (Botania.isModLoaded()) { + // Hand of Ender GTValues.RA.stdBuilder() From 82337929d4bfb3fbd4d0f63b76fa2a70ef1c2348 Mon Sep 17 00:00:00 2001 From: EnderProyects Date: Wed, 9 Apr 2025 17:32:52 +0200 Subject: [PATCH 10/16] Update AssemblerRecipes.java --- .../com/dreammaster/gthandler/recipes/AssemblerRecipes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java index 2415b1d50..67c075efb 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java @@ -2916,7 +2916,7 @@ public void run() { .itemOutputs(new ItemStack(Blocks.tallgrass, 16, 1)).duration(5 * SECONDS).eut(24) .addTo(assemblerRecipes); } - + // 16A Zpm to LuV transformer GTValues.RA.stdBuilder() .itemInputs( From cfc2038f01329469e2fab37a254d7c98d1af30be Mon Sep 17 00:00:00 2001 From: EnderProyects Date: Wed, 9 Apr 2025 18:33:15 +0200 Subject: [PATCH 11/16] autoclave go brrr add autoclave recipe for enderio crystals for bulk recipes --- .../gthandler/recipes/AssemblerRecipes.java | 5 +++-- .../dreammaster/scripts/ScriptEnderIO.java | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java index 67c075efb..29ba86909 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java @@ -19,6 +19,7 @@ import static gregtech.api.enums.Mods.Computronics; import static gregtech.api.enums.Mods.EnderIO; import static gregtech.api.enums.Mods.EnhancedLootBags; +import static gregtech.api.enums.Mods.EtFuturumRequiem; import static gregtech.api.enums.Mods.ExtraBees; import static gregtech.api.enums.Mods.ExtraUtilities; import static gregtech.api.enums.Mods.FloodLights; @@ -5012,7 +5013,7 @@ private void makeEnderIORecipes() { GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.bolt, 4), GTOreDictUnificator.get(OrePrefixes.foil, Materials.Manganese, 4), ItemList.Gravistar.get(1L), - GTModHandler.getModItem(EnderIO.ID, "itemFrankenSkull", 1L, 5), + GTModHandler.getModItem(EtFuturumRequiem.ID, "totem_of_undying", 1L, 0), GTOreDictUnificator.get(OrePrefixes.plate, Materials.StellarAlloy, 2), GTUtility.getIntegratedCircuit(1)) .itemOutputs(GTModHandler.getModItem(EnderIO.ID, "itemBasicCapacitor", 1L, 6)) @@ -5023,7 +5024,7 @@ private void makeEnderIORecipes() { .itemInputs( GTModHandler.getModItem(EnderIO.ID, "itemBasicCapacitor", 1L, 5), ItemList.Gravistar.get(1L), - GTModHandler.getModItem(EnderIO.ID, "itemFrankenSkull", 1L, 5), + GTModHandler.getModItem(EtFuturumRequiem.ID, "totem_of_undying", 1L, 0), GTOreDictUnificator.get(OrePrefixes.plate, Materials.StellarAlloy, 2)) .itemOutputs(GTModHandler.getModItem(EnderIO.ID, "itemBasicCapacitor", 1L, 6)) .fluidInputs(Materials.Neutronium.getMolten(1152)).duration(10 * SECONDS).eut(TierEU.RECIPE_ZPM) diff --git a/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java b/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java index d8d4ab6f9..39c12cfe2 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java +++ b/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java @@ -23,9 +23,11 @@ import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Mods.ThaumicExploration; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; +import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; 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.GTRecipeConstants.UniversalChemical; @@ -1889,5 +1891,22 @@ public void loadRecipes() { .itemOutputs(vibrantCapacitor.copy()).duration(5 * SECONDS).eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); + // Bulk crystals + + GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Diamond, 64)) + .itemOutputs(getModItem(EnderIO.ID, "itemMaterial", 64, 5, missing)) + .fluidInputs(Materials.PulsatingIron.getMolten(8192)).duration(2 * MINUTES).eut(TierEU.RECIPE_MV) + .addTo(autoclaveRecipes); + + GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Emerald, 64)) + .itemOutputs(getModItem(EnderIO.ID, "itemMaterial", 64, 6, missing)) + .fluidInputs(Materials.VibrantAlloy.getMolten(8192)).duration(2 * MINUTES).eut(TierEU.RECIPE_MV) + .addTo(autoclaveRecipes); + + GTValues.RA.stdBuilder().itemInputs(CustomItemList.ManyullynCrystal.get(16L)) + .itemOutputs(getModItem(EnderIO.ID, "itemMaterial", 16, 10, missing)) + .fluidInputs(Materials.Enderium.getMolten(2048)).duration(1 * MINUTES).eut(TierEU.RECIPE_HV) + .addTo(autoclaveRecipes); + } } From d3cfdd6a9320c0892f7ab2d909927e66fa7b7997 Mon Sep 17 00:00:00 2001 From: EnderProyects Date: Wed, 9 Apr 2025 19:04:39 +0200 Subject: [PATCH 12/16] Update ScriptAdvancedSolarPanel.java --- .../scripts/ScriptAdvancedSolarPanel.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/main/java/com/dreammaster/scripts/ScriptAdvancedSolarPanel.java b/src/main/java/com/dreammaster/scripts/ScriptAdvancedSolarPanel.java index 0314c61ad..ac0f8c019 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAdvancedSolarPanel.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAdvancedSolarPanel.java @@ -3,7 +3,10 @@ import static gregtech.api.enums.Mods.AdvancedSolarPanel; import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.enums.Mods.Minecraft; +import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; +import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes; +import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.util.GTModHandler.getModItem; import static gregtech.api.util.GTRecipeBuilder.MINUTES; import static gregtech.api.util.GTRecipeBuilder.SECONDS; @@ -15,6 +18,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.GTOreDictUnificator; public class ScriptAdvancedSolarPanel implements IScriptLoader { @@ -147,5 +151,37 @@ public void loadRecipes() { .itemOutputs(getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1, 4, missing)) .duration(1 * MINUTES + 20 * SECONDS).eut(122880).addTo(assemblerRecipes); + GTValues.RA.stdBuilder().itemInputs(getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1, 0, missing)) + .itemOutputs(getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 9, 9, missing)) + .duration(2 * SECONDS).eut(TierEU.RECIPE_LV).addTo(hammerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Sunnarium, 32L), + getModItem(IndustrialCraft2.ID, "itemPartIridium", 64, 0, missing)) + .itemOutputs(getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 8, 1, missing)) + .duration(40 * SECONDS).eut(TierEU.RECIPE_LuV).addTo(alloySmelterRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 8, 1, missing), + getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 64, 3, missing)) + .itemOutputs(getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 8, 4, missing)) + .duration(80 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(alloySmelterRecipes); + + GTValues.RA.stdBuilder().itemInputs(getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 32, 2, missing)) + .itemOutputs( + getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 64, 3, missing), + getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 64, 3, missing), + getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 64, 3, missing), + getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 64, 3, missing)) + .fluidInputs(Materials.Sunnarium.getMolten(4608L)).duration(2 * MINUTES).eut(TierEU.RECIPE_IV) + .addTo(autoclaveRecipes); + + GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Uranium, 64L)) + .itemOutputs(getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 64, 2, missing)) + .fluidInputs(Materials.Sunnarium.getMolten(9216L)).duration(1 * MINUTES).eut(TierEU.RECIPE_EV) + .addTo(autoclaveRecipes); + } } From d3fdaa7e97372ec70bf38369c65bbd307692fb19 Mon Sep 17 00:00:00 2001 From: EnderProyects Date: Wed, 9 Apr 2025 19:24:58 +0200 Subject: [PATCH 13/16] Update dependencies.gradle --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 6ff252958..327d1eac2 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -5,7 +5,7 @@ dependencies { api("com.github.GTNewHorizons:Yamcl:0.7.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") - implementation("com.github.GTNewHorizons:GTNHLib:0.6.18:dev") + implementation("com.github.GTNewHorizons:GTNHLib:0.6.19:dev") compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.1:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Avaritia:1.62:dev") { transitive = false } From 8c27ce9ddcc4d3c5e77d0453674353b160db3421 Mon Sep 17 00:00:00 2001 From: EnderProyects Date: Wed, 9 Apr 2025 21:29:50 +0200 Subject: [PATCH 14/16] update eu/t --- dependencies.gradle | 2 +- .../recipes/LaserEngraverRecipes.java | 11 +++++++++-- .../scripts/ScriptAdvancedSolarPanel.java | 19 +++++++++---------- .../dreammaster/scripts/ScriptEnderIO.java | 6 +++--- 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 327d1eac2..f957d79b5 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -7,7 +7,7 @@ dependencies { implementation("com.github.GTNewHorizons:GTNHLib:0.6.19:dev") - compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.1:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.2:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Avaritia:1.62:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:twilightforest:2.7.5:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.39:dev") { transitive = false } diff --git a/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java index 50b7fb853..fb85a09e9 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java @@ -22,6 +22,7 @@ import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsBotania; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; @@ -256,7 +257,10 @@ public void run() { .itemInputs( GTModHandler.getModItem(Botania.ID, "livingrock", 1L, 0), GTModHandler.getModItem(Botania.ID, "elfGlass", 1L, 0), - GTModHandler.getModItem(Botania.ID, "rainbowRod", 0L, 0)) + GTModHandler.getModItem(Botania.ID, "rainbowRod", 0L, 0), + GTUtility.copyAmount( + 0, + GTOreDictUnificator.get(OrePrefixes.lens, MaterialsBotania.BotaniaDragonstone, 1))) .itemOutputs(GTModHandler.getModItem(Botania.ID, "shimmerrock", 1L, 0)).duration(2 * SECONDS) .eut(TierEU.RECIPE_IV).addTo(laserEngraverRecipes); @@ -264,7 +268,10 @@ public void run() { .itemInputs( GTModHandler.getModItem(Botania.ID, "dreamwood", 1L, 1), GTModHandler.getModItem(Botania.ID, "elfGlass", 1L, 0), - GTModHandler.getModItem(Botania.ID, "rainbowRod", 0L, 0)) + GTModHandler.getModItem(Botania.ID, "rainbowRod", 0L, 0), + GTUtility.copyAmount( + 0, + GTOreDictUnificator.get(OrePrefixes.lens, MaterialsBotania.BotaniaDragonstone, 1))) .itemOutputs(GTModHandler.getModItem(Botania.ID, "shimmerwoodPlanks", 1L, 0)).duration(2 * SECONDS) .eut(TierEU.RECIPE_IV).addTo(laserEngraverRecipes); diff --git a/src/main/java/com/dreammaster/scripts/ScriptAdvancedSolarPanel.java b/src/main/java/com/dreammaster/scripts/ScriptAdvancedSolarPanel.java index ac0f8c019..ff6d1380b 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAdvancedSolarPanel.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAdvancedSolarPanel.java @@ -160,27 +160,26 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.plate, Materials.Sunnarium, 32L), getModItem(IndustrialCraft2.ID, "itemPartIridium", 64, 0, missing)) .itemOutputs(getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 8, 1, missing)) - .duration(40 * SECONDS).eut(TierEU.RECIPE_LuV).addTo(alloySmelterRecipes); + .duration(40 * SECONDS).eut(245760).addTo(alloySmelterRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 8, 1, missing), getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 64, 3, missing)) .itemOutputs(getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 8, 4, missing)) - .duration(80 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(alloySmelterRecipes); + .duration(80 * SECONDS).eut(983040).addTo(alloySmelterRecipes); - GTValues.RA.stdBuilder().itemInputs(getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 32, 2, missing)) - .itemOutputs( - getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 64, 3, missing), - getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 64, 3, missing), - getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 64, 3, missing), - getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 64, 3, missing)) - .fluidInputs(Materials.Sunnarium.getMolten(4608L)).duration(2 * MINUTES).eut(TierEU.RECIPE_IV) + GTValues.RA.stdBuilder() + .itemInputs( + getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 64, 2, missing), + getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 64, 2, missing)) + .itemOutputs(getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 16, 3, missing)) + .fluidInputs(Materials.Sunnarium.getMolten(2304L)).duration(2 * MINUTES).eut(122880) .addTo(autoclaveRecipes); GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Uranium, 64L)) .itemOutputs(getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 64, 2, missing)) - .fluidInputs(Materials.Sunnarium.getMolten(9216L)).duration(1 * MINUTES).eut(TierEU.RECIPE_EV) + .fluidInputs(Materials.Sunnarium.getMolten(9216L)).duration(2 * MINUTES).eut(122880) .addTo(autoclaveRecipes); } diff --git a/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java b/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java index 39c12cfe2..06dddc9d4 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java +++ b/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java @@ -1895,17 +1895,17 @@ public void loadRecipes() { GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Diamond, 64)) .itemOutputs(getModItem(EnderIO.ID, "itemMaterial", 64, 5, missing)) - .fluidInputs(Materials.PulsatingIron.getMolten(8192)).duration(2 * MINUTES).eut(TierEU.RECIPE_MV) + .fluidInputs(Materials.PulsatingIron.getMolten(8192)).duration(2 * MINUTES).eut(7680) .addTo(autoclaveRecipes); GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Emerald, 64)) .itemOutputs(getModItem(EnderIO.ID, "itemMaterial", 64, 6, missing)) - .fluidInputs(Materials.VibrantAlloy.getMolten(8192)).duration(2 * MINUTES).eut(TierEU.RECIPE_MV) + .fluidInputs(Materials.VibrantAlloy.getMolten(8192)).duration(2 * MINUTES).eut(7680) .addTo(autoclaveRecipes); GTValues.RA.stdBuilder().itemInputs(CustomItemList.ManyullynCrystal.get(16L)) .itemOutputs(getModItem(EnderIO.ID, "itemMaterial", 16, 10, missing)) - .fluidInputs(Materials.Enderium.getMolten(2048)).duration(1 * MINUTES).eut(TierEU.RECIPE_HV) + .fluidInputs(Materials.Enderium.getMolten(2048)).duration(1 * MINUTES).eut(4096) .addTo(autoclaveRecipes); } From 1bfa12889f76d10a31f0ca74697947df16a5d9c6 Mon Sep 17 00:00:00 2001 From: EnderProyects Date: Thu, 10 Apr 2025 00:28:44 +0200 Subject: [PATCH 15/16] change --- .../com/dreammaster/scripts/ScriptAdvancedSolarPanel.java | 4 ++-- src/main/java/com/dreammaster/scripts/ScriptEnderIO.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptAdvancedSolarPanel.java b/src/main/java/com/dreammaster/scripts/ScriptAdvancedSolarPanel.java index ff6d1380b..43a857729 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAdvancedSolarPanel.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAdvancedSolarPanel.java @@ -174,12 +174,12 @@ public void loadRecipes() { getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 64, 2, missing), getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 64, 2, missing)) .itemOutputs(getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 16, 3, missing)) - .fluidInputs(Materials.Sunnarium.getMolten(2304L)).duration(2 * MINUTES).eut(122880) + .fluidInputs(Materials.Sunnarium.getMolten(2304L)).duration(2 * MINUTES).eut(TierEU.RECIPE_ZPM) .addTo(autoclaveRecipes); GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Uranium, 64L)) .itemOutputs(getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 64, 2, missing)) - .fluidInputs(Materials.Sunnarium.getMolten(9216L)).duration(2 * MINUTES).eut(122880) + .fluidInputs(Materials.Sunnarium.getMolten(9216L)).duration(2 * MINUTES).eut(TierEU.RECIPE_ZPM) .addTo(autoclaveRecipes); } diff --git a/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java b/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java index 06dddc9d4..36f2568cd 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java +++ b/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java @@ -1895,12 +1895,12 @@ public void loadRecipes() { GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Diamond, 64)) .itemOutputs(getModItem(EnderIO.ID, "itemMaterial", 64, 5, missing)) - .fluidInputs(Materials.PulsatingIron.getMolten(8192)).duration(2 * MINUTES).eut(7680) + .fluidInputs(Materials.PulsatingIron.getMolten(8192)).duration(2 * MINUTES).eut(TierEU.RECIPE_IV) .addTo(autoclaveRecipes); GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.gem, Materials.Emerald, 64)) .itemOutputs(getModItem(EnderIO.ID, "itemMaterial", 64, 6, missing)) - .fluidInputs(Materials.VibrantAlloy.getMolten(8192)).duration(2 * MINUTES).eut(7680) + .fluidInputs(Materials.VibrantAlloy.getMolten(8192)).duration(2 * MINUTES).eut(TierEU.RECIPE_IV) .addTo(autoclaveRecipes); GTValues.RA.stdBuilder().itemInputs(CustomItemList.ManyullynCrystal.get(16L)) From 8b87398646164bb49508e55c257aaeddd1bd0673 Mon Sep 17 00:00:00 2001 From: EnderProyects Date: Wed, 23 Apr 2025 23:53:58 +0200 Subject: [PATCH 16/16] update deps --- dependencies.gradle | 6 +++--- .../java/com/dreammaster/scripts/ScriptBiomesOPlenty.java | 5 +++++ src/main/java/com/dreammaster/scripts/ScriptMinecraft.java | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index bab936771..8d49d9678 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,11 +1,11 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.242:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.251:dev") api("com.github.GTNewHorizons:Yamcl:0.7.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") - implementation("com.github.GTNewHorizons:GTNHLib:0.6.19:dev") + implementation("com.github.GTNewHorizons:GTNHLib:0.6.20:dev") compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.3:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Avaritia:1.62:dev") { transitive = false } @@ -14,7 +14,7 @@ dependencies { compileOnly("com.github.GTNewHorizons:twilightforest:2.7.5:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.41:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.20-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.21-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.3.0: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/scripts/ScriptBiomesOPlenty.java b/src/main/java/com/dreammaster/scripts/ScriptBiomesOPlenty.java index efbf7eb6e..f4e4f318c 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptBiomesOPlenty.java +++ b/src/main/java/com/dreammaster/scripts/ScriptBiomesOPlenty.java @@ -2,6 +2,7 @@ import static com.dreammaster.main.MainRegistry.Module_CustomFuels; import static gregtech.api.enums.Mods.BiomesOPlenty; +import static gregtech.api.enums.Mods.Botania; import static gregtech.api.enums.Mods.Botany; import static gregtech.api.enums.Mods.Chisel; import static gregtech.api.enums.Mods.Forestry; @@ -330,6 +331,10 @@ public void loadRecipes() { .itemInputs(getModItem(Railcraft.ID, "cube", 1, 0, missing), GTUtility.getIntegratedCircuit(11)) .itemOutputs(getModItem(BiomesOPlenty.ID, "misc", 1, 1, missing)).eut(30).duration(15 * SECONDS) .addTo(chemicalDehydratorRecipes); + GTValues.RA.stdBuilder() + .itemInputs(getModItem(Botania.ID, "manaResource", 1, 8, missing), GTUtility.getIntegratedCircuit(11)) + .itemOutputs(getModItem(BiomesOPlenty.ID, "misc", 1, 11, missing)).eut(30).duration(15 * SECONDS) + .addTo(chemicalDehydratorRecipes); GTValues.RA.stdBuilder().itemInputs(getModItem(BiomesOPlenty.ID, "misc", 9, 1, missing)) .itemOutputs(getModItem(BiomesOPlenty.ID, "ash", 1, 0, missing)).eut(30).duration(15 * SECONDS) .addTo(compressorRecipes); diff --git a/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java b/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java index ad59d2e7b..fdcdddf2b 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java @@ -23,6 +23,7 @@ import static gregtech.api.enums.Mods.PamsHarvestCraft; import static gregtech.api.enums.Mods.PamsHarvestTheNether; import static gregtech.api.enums.Mods.Railcraft; +import static gregtech.api.enums.Mods.StevesCarts2; import static gregtech.api.enums.Mods.TaintedMagic; import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Mods.ThaumicBases; @@ -46,7 +47,6 @@ import java.util.List; import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import com.dreammaster.gthandler.CustomItemList; @@ -5004,7 +5004,7 @@ private void craftingRecipes() { bits, new Object[] { "ABA", "ACA", "ADA", 'A', "plateObsidian", 'B', "plateDenseEnderium", 'C', GTModHandler.getModItem(EnderStorage.ID, "enderChest", 1L, 0), 'D', - new ItemStack(Items.ender_eye, 1) }); + GTModHandler.getModItem(StevesCarts2.ID, "ModuleComponents", 1L, 45) }); } }