From 727bb24dae57d7a5e5695e296b5c6560742129b8 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Fri, 6 Sep 2024 23:17:18 +0200 Subject: [PATCH 1/6] update --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 5a9ebe177..d0b57e2ac 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -16,7 +16,7 @@ dependencies { compileOnly rfg.deobf("curse.maven:witchery-69673:2234410") compileOnly("com.github.GTNewHorizons:Chisel:2.15.2-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Botania:1.11.5-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.3:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.5:dev") { transitive = false } compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384") compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false } compileOnly("com.github.GTNewHorizons:amunra:0.6.0:dev") { transitive = false } From 8bdd6970f975b0117007a48d2bf7c7f714920808 Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Sat, 7 Sep 2024 16:31:23 +0100 Subject: [PATCH 2/6] More full amp recipe fixes (#978) --- .../gthandler/GT_Loader_Machines.java | 5 +- .../recipes/AssemblingLineRecipes.java | 52 +++++++++---------- .../recipes/LaserEngraverRecipes.java | 2 +- .../gthandler/recipes/MixerRecipes.java | 9 ++-- 4 files changed, 36 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java b/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java index 901e0096a..c3d1957d1 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java +++ b/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java @@ -1,6 +1,7 @@ package com.dreammaster.gthandler; import static com.dreammaster.gthandler.enums.MetaTileEntityIDs.*; +import static gregtech.api.enums.GTValues.VP; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.slicerRecipes; import static gregtech.api.util.GTRecipeBuilder.SECONDS; @@ -1187,10 +1188,10 @@ public void recipes() { for (int aTier = 10; aTier < 15; aTier++) { GTValues.RA.stdBuilder().itemInputs(flInputs[aTier - 10]).itemOutputs(inHatches[aTier - 10]) .fluidInputs(Materials.RadoxPolymer.getMolten((long) (2.25 * Math.pow(2, (aTier - 9))))) - .duration(24 * SECONDS).eut((int) (30 * Math.pow(4, (aTier - 1)))).addTo(assemblerRecipes); + .duration(24 * SECONDS).eut(VP[aTier]).addTo(assemblerRecipes); GTValues.RA.stdBuilder().itemInputs(flInputs2[aTier - 10]).itemOutputs(outHatches[aTier - 10]) .fluidInputs(Materials.RadoxPolymer.getMolten((long) (2.25 * Math.pow(2, (aTier - 9))))) - .duration(24 * SECONDS).eut((int) (30 * Math.pow(4, (aTier - 1)))).addTo(assemblerRecipes); + .duration(24 * SECONDS).eut(VP[aTier]).addTo(assemblerRecipes); } } diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java index 9792203c0..9e211f0be 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java @@ -341,7 +341,7 @@ public void run() { GTModHandler.getModItem(OpenComputers.ID, "item", 1, 91), 192_000, 512, - 8_000_000, + (int) TierEU.RECIPE_UEV, 16, new Object[] { ItemList.Cover_SolarPanel_LuV.get(4), GTModHandler.getModItem(GalaxySpace.ID, "item.DysonSwarmParts", 8, 3), @@ -358,7 +358,7 @@ public void run() { ItemList.Circuit_Chip_QPIC.get(1), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UHV, 32, new ItemStack[] { GTUtility.copyAmount(4, ItemRegistry.energyDistributor[9]), ItemList.Circuit_Chip_QPIC.get(64), @@ -376,7 +376,7 @@ public void run() { GTModHandler.getModItem(GalaxySpace.ID, "item.DysonSwarmParts", 1, 3), 192000, 512, - 2000000, + (int) TierEU.RECIPE_UHV, 32, new ItemStack[] { GTModHandler.getModItem(GalaxySpace.ID, "item.DysonSwarmParts", 64, 3), ItemRefer.Advanced_Radiation_Protection_Plate.get(64), ItemList.Reactor_Coolant_Sp_6.get(1), @@ -396,7 +396,7 @@ public void run() { ItemList.Quantum_Chest_IV.get(1), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UHV, 32, new ItemStack[] { ItemList.Hull_UIV.get(4), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UMV, 4), @@ -414,7 +414,7 @@ public void run() { new ItemStack(Blocks.dropper), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UHV, 32, new ItemStack[] { ItemList.Hull_UIV.get(4), ItemList.Conveyor_Module_UIV.get(32), ItemList.Robot_Arm_UIV.get(32), ItemList.Electric_Piston_UIV.get(32), @@ -432,7 +432,7 @@ public void run() { ItemList.PolarizerUEV.get(1), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UHV, 32, new ItemStack[] { ItemList.Hull_UIV.get(4), GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUEV, 16), @@ -450,7 +450,7 @@ public void run() { tectech.thing.CustomItemList.Machine_Multi_Computer.get(1), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UHV, 32, new ItemStack[] { ItemList.Hull_UIV.get(4), GTModHandler.getModItem(OpenComputers.ID, "item", 4, 103), @@ -467,7 +467,7 @@ public void run() { tectech.thing.CustomItemList.tM_TeslaPrimary_6.get(1), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UHV, 32, new ItemStack[] { ItemList.Circuit_Chip_QPIC.get(4), CustomItemList.MicaInsulatorFoil.get(64), CustomItemList.MicaInsulatorFoil.get(64), CustomItemList.MicaInsulatorFoil.get(64), @@ -485,7 +485,7 @@ public void run() { tectech.thing.CustomItemList.tM_TeslaSecondary.get(1), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UHV, 32, new ItemStack[] { ItemList.Circuit_Chip_QPIC.get(4), CustomItemList.MicaInsulatorFoil.get(64), CustomItemList.MicaInsulatorFoil.get(64), CustomItemList.MicaInsulatorFoil.get(64), @@ -503,7 +503,7 @@ public void run() { tectech.thing.CustomItemList.tM_TeslaToroid.get(1), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UHV, 32, new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 4), GTOreDictUnificator.get(OrePrefixes.foil, Materials.Neutronium, 8), @@ -519,7 +519,7 @@ public void run() { GTModHandler.getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", 1), 192_000, 512, - 8_000_000, + (int) TierEU.RECIPE_UEV, 16, new ItemStack[] { ItemList.Hull_UIV.get(4), CustomItemList.IrradiantReinforcedBedrockiumPlate.get(4), @@ -541,7 +541,7 @@ public void run() { ItemList.Circuit_Biomainframe.get(1L), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UHV, 32, new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 8), ItemList.Circuit_Biomainframe.get(2L), ItemList.Circuit_Parts_CapacitorASMD.get(32L), @@ -563,7 +563,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.foil, Materials.Infinity, 1L), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UHV, 32, new ItemStack[] { GTModHandler.getModItem(EternalSingularity.ID, "eternal_singularity", 1L), ItemList.Sensor_UV.get(16L), @@ -584,7 +584,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 1L), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UHV, 32, new ItemStack[] { ItemList.Electric_Piston_UV.get(16L), ItemList.Electric_Motor_UV.get(64L), GTOreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 16L), @@ -607,7 +607,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 1L), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UHV, 32, new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 64L), GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 64L), @@ -625,7 +625,7 @@ public void run() { com.dreammaster.item.ItemList.NanoCircuitOrigin.getIS(1), 192000 * 2, 512 * 2, - 2_000_000 * 2, + 4_000_000, 32 * 2, new Object[] { ItemList.Circuit_Board_Bio_Ultra.get(1L), com.dreammaster.item.ItemList.PicoWafer.getIS(4), @@ -647,7 +647,7 @@ public void run() { com.dreammaster.item.ItemList.PikoCircuitPolychrome.getIS(1), 192000 * 4, 512 * 4, - 2_000_000 * 4, + (int) TierEU.RECIPE_UEV, 32 * 4, new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 16), com.dreammaster.item.ItemList.PikoCircuitPolychrome.getIS(2), @@ -668,7 +668,7 @@ public void run() { com.dreammaster.item.ItemList.GatePlateOrigin.getIS(1), 32_000_000 * 12, 8192, - 32_000_000, + (int) TierEU.RECIPE_UIV, 64, new ItemStack[] { GTModHandler.getModItem(EternalSingularity.ID, "eternal_singularity", 1L), ItemList.Sensor_UEV.get(16L), @@ -689,7 +689,7 @@ public void run() { com.dreammaster.item.ItemList.ChevronOrigin.getIS(1), 32_000_000 * 12, 8192, - 32_000_000, + (int) TierEU.RECIPE_UIV, 64, new ItemStack[] { ItemList.Electric_Piston_UEV.get(16L), ItemList.Electric_Motor_UEV.get(64L), GTOreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 16L), @@ -712,7 +712,7 @@ public void run() { com.dreammaster.item.ItemList.FramePartOrigin.getIS(1), 32_000_000 * 12, 8192, - 32_000_000, + (int) TierEU.RECIPE_UIV, 64, new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 64L), GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 64L), @@ -730,7 +730,7 @@ public void run() { ItemList.Circuit_Wafer_NPIC.get(1L), 192_000, 512, - 2_000_000, + (int) TierEU.RECIPE_UEV, 32, new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 8), ItemList.Circuit_Biomainframe.get(2L), ItemList.Circuit_Parts_CapacitorXSMD.get(32L), @@ -774,7 +774,7 @@ public void run() { com.dreammaster.item.ItemList.PikoCircuitDimensional.getIS(1), 720_000, 2_048, - 8_000_000, + (int) TierEU.RECIPE_UEV, 128, new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 16), com.dreammaster.item.ItemList.PikoCircuitDimensional.getIS(2), @@ -795,7 +795,7 @@ public void run() { com.dreammaster.item.ItemList.GatePlatePolychrome.getIS(1), 2_000_000_000, 32_768, - 500_000_000, + (int) TierEU.RECIPE_UXV, 64, new ItemStack[] { ItemList.Casing_Dim_Bridge.get(64), GTOreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), @@ -821,7 +821,7 @@ public void run() { com.dreammaster.item.ItemList.ChevronPolychrome.getIS(1), 2_000_000_000, 32_768, - 500_000_000, + (int) TierEU.RECIPE_UXV, 64, new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), GTOreDictUnificator.get(OrePrefixes.block, Materials.NaquadahAlloy, 64L), @@ -849,7 +849,7 @@ public void run() { com.dreammaster.item.ItemList.FramePartPolychrome.getIS(1), 2_000_000_000, 32_768, - 500_000_000, + (int) TierEU.RECIPE_UXV, 64, new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 64L), GTOreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.SpaceTime, 64L), @@ -1432,7 +1432,7 @@ public void run() { CustomItemList.PikoCircuit.get(1L), 720000, 2048, - 8000000, + (int) TierEU.RECIPE_UEV, 128, new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 16), CustomItemList.PikoCircuit.get(2L), ItemList.Circuit_Parts_CapacitorXSMD.get(64L), diff --git a/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java index 52df0d875..14bf7e293 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java @@ -36,7 +36,7 @@ public void run() { GTValues.RA.stdBuilder().itemInputs(ItemList.Tesseract.get(1), GregtechItemList.Laser_Lens_Special.get(0)) .itemOutputs(ItemList.EnergisedTesseract.get(1)) .fluidOutputs(MaterialsUEVplus.ExcitedDTEC.getFluid(100)).requiresCleanRoom().duration(30 * SECONDS) - .eut(32_000_000).noOptimize().addTo(laserEngraverRecipes); + .eut(TierEU.RECIPE_UIV).noOptimize().addTo(laserEngraverRecipes); // Mysterious crystal upgrading diff --git a/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java index 497819a3b..02be58bbc 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java @@ -640,7 +640,8 @@ public void run() { GTUtility.getIntegratedCircuit(2)) .itemOutputs( GTOreDictUnificator.getDust(Materials.NaquadahAlloy, 4L * OrePrefixes.dust.mMaterialAmount)) - .duration((int) (400L * OrePrefixes.dust.mMaterialAmount / 3628800L)).eut(8000).addTo(mixerRecipes); + .duration((int) (400L * OrePrefixes.dust.mMaterialAmount / 3628800L)).eut(TierEU.RECIPE_IV) + .addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( @@ -652,7 +653,8 @@ public void run() { GTOreDictUnificator .getDust(Materials.YttriumBariumCuprate, 13L * OrePrefixes.dust.mMaterialAmount)) .fluidInputs(Materials.Oxygen.getGas(7000)) - .duration((int) (600L * OrePrefixes.dust.mMaterialAmount / 3628800L)).eut(2000).addTo(mixerRecipes); + .duration((int) (600L * OrePrefixes.dust.mMaterialAmount / 3628800L)).eut(TierEU.RECIPE_EV) + .addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( @@ -662,7 +664,8 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 1L), GTUtility.getIntegratedCircuit(3)) .itemOutputs(GTOreDictUnificator.getDust(Materials.Duralumin, 9L * OrePrefixes.dust.mMaterialAmount)) - .duration((int) (900L * OrePrefixes.dust.mMaterialAmount / 3628800L)).eut(2000).addTo(mixerRecipes); + .duration((int) (900L * OrePrefixes.dust.mMaterialAmount / 3628800L)).eut(TierEU.RECIPE_EV) + .addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( From 1de9108f567086ebc7f32f8e15a63097622b1671 Mon Sep 17 00:00:00 2001 From: MCTBL <30978504+MCTBL@users.noreply.github.com> Date: Sat, 7 Sep 2024 23:35:58 +0800 Subject: [PATCH 3/6] add recipe for new provider and code refactor (#977) Co-authored-by: Martin Robertz --- .../scripts/ScriptThaumicEnergistics.java | 619 +++++++----------- 1 file changed, 238 insertions(+), 381 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptThaumicEnergistics.java b/src/main/java/com/dreammaster/scripts/ScriptThaumicEnergistics.java index bec35227a..749426107 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptThaumicEnergistics.java +++ b/src/main/java/com/dreammaster/scripts/ScriptThaumicEnergistics.java @@ -20,7 +20,7 @@ import java.util.List; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import com.dreammaster.gthandler.CustomItemList; import com.dreammaster.thaumcraft.TCHelper; @@ -62,6 +62,39 @@ public List getDependencies() { @Override public void loadRecipes() { + + final ItemStack PrimalCharm = getModItem(Thaumcraft.ID, "ItemResource", 1, 15, missing); + + final ItemStack EssentialComponent1K = getModItem(ThaumicEnergistics.ID, "storage.component", 1, 0, missing); + final ItemStack EssentialComponent4K = getModItem(ThaumicEnergistics.ID, "storage.component", 1, 1, missing); + final ItemStack EssentialComponent16K = getModItem(ThaumicEnergistics.ID, "storage.component", 1, 2, missing); + final ItemStack EssentialComponent64K = getModItem(ThaumicEnergistics.ID, "storage.component", 1, 3, missing); + final ItemStack EssentialComponent256K = getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing); + final ItemStack EssentialComponent1024K = getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing); + final ItemStack EssentialComponent4096K = getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing); + final ItemStack EssentialComponent16384K = getModItem( + ThaumicEnergistics.ID, + "storage.component", + 1, + 8, + missing); + + final ItemStack EssentialCellCreative = getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 4, missing); + + final ItemStack DiffusionCore = getModItem(ThaumicEnergistics.ID, "material", 1, 0, missing); + final ItemStack CoalescenceCore = getModItem(ThaumicEnergistics.ID, "material", 1, 1, missing); + final ItemStack IronGear = getModItem(ThaumicEnergistics.ID, "material", 1, 2, missing); + + final ItemStack CraftingUnit = getModItem(AppliedEnergistics2.ID, "tile.BlockCraftingUnit", 1, missing); + final ItemStack LogicProcessor = getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 22, missing); + final ItemStack CalcProcessor = getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 23, missing); + final ItemStack EngProcessor = getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 24, missing); + + final ItemStack InfusionIntercepter = getModItem("thaumicinsurgence", "infusionIntercepter", 1, 0); + + final FluidStack[] solders = new FluidStack[] { Materials.Lead.getMolten(288), Materials.Tin.getMolten(144), + Materials.SolderingAlloy.getMolten(72) }; + // Creates ItemStack for CEC craft input ItemStack[] CECInfusionItems = { ItemList.Field_Generator_UIV.get(1), getModItem(TaintedMagic.ID, "ItemFocusEldritch", 1), @@ -80,7 +113,7 @@ public void loadRecipes() { // ItemStacks for in/out ItemStack SingularityDrive = getModItem(EternalSingularity.ID, "eternal_singularity", 1); // Creative Essentia Cell - ItemStack CEC = getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 4); + ItemStack CEC = EssentialCellCreative; ThaumcraftApi.addInfusionCraftingRecipe( "thaumicenergistics.TESTORAGE", @@ -98,273 +131,97 @@ public void loadRecipes() { .itemOutputs(getModItem(ThaumicEnergistics.ID, "wireless.essentia.terminal", 1, 0, missing)) .duration(30 * SECONDS).eut(120).addTo(assemblerRecipes); - // 1k Essentia Storage Component - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 2), - getModItem(Thaumcraft.ID, "ItemResource", 2, 14, missing), - CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), - ItemList.Circuit_Board_Coated.get(1L), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 0, missing)) - .fluidInputs(FluidRegistry.getFluidStack("molten.solderingalloy", 72)).duration(10 * SECONDS).eut(30) - .addTo(circuitAssemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 2), - getModItem(Thaumcraft.ID, "ItemResource", 2, 14, missing), - CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), - ItemList.Circuit_Board_Coated.get(1L), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 0, missing)) - .fluidInputs(FluidRegistry.getFluidStack("molten.tin", 144)).duration(10 * SECONDS).eut(30) - .addTo(circuitAssemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 2), - getModItem(Thaumcraft.ID, "ItemResource", 2, 14, missing), - CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), - ItemList.Circuit_Board_Coated.get(1L), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 0, missing)) - .fluidInputs(FluidRegistry.getFluidStack("molten.lead", 288)).duration(10 * SECONDS).eut(30) - .addTo(circuitAssemblerRecipes); - - // 4k Essentia Storage Component - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 4), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 16), - CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), - ItemList.Circuit_Board_Coated_Basic.get(1L), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 1, missing)) - .fluidInputs(FluidRegistry.getFluidStack("molten.solderingalloy", 72)).duration(10 * SECONDS).eut(30) - .addTo(circuitAssemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 4), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 16), - CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), - ItemList.Circuit_Board_Coated_Basic.get(1L), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 1, missing)) - .fluidInputs(FluidRegistry.getFluidStack("molten.tin", 144)).duration(10 * SECONDS).eut(30) - .addTo(circuitAssemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 4), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 16), - CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), - ItemList.Circuit_Board_Coated_Basic.get(1L), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 1, missing)) - .fluidInputs(FluidRegistry.getFluidStack("molten.lead", 288)).duration(10 * SECONDS).eut(30) - .addTo(circuitAssemblerRecipes); - - // 16k Essentia Storage Component - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 4), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 16), - CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), - ItemList.Circuit_Board_Phenolic_Good.get(1L), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 2, missing)) - .fluidInputs(FluidRegistry.getFluidStack("molten.solderingalloy", 72)).duration(10 * SECONDS).eut(120) - .addTo(circuitAssemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 4), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 16), - CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), - ItemList.Circuit_Board_Phenolic_Good.get(1L), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 2, missing)) - .fluidInputs(FluidRegistry.getFluidStack("molten.tin", 144)).duration(10 * SECONDS).eut(120) - .addTo(circuitAssemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 4), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 16), - CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), - ItemList.Circuit_Board_Phenolic_Good.get(1L), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 2, missing)) - .fluidInputs(FluidRegistry.getFluidStack("molten.lead", 288)).duration(10 * SECONDS).eut(120) - .addTo(circuitAssemblerRecipes); - - // 64k Essentia Storage Component - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 4), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 16), - CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), - ItemList.Circuit_Board_Epoxy_Advanced.get(1L), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 3, missing)) - .fluidInputs(FluidRegistry.getFluidStack("molten.solderingalloy", 72)).duration(10 * SECONDS).eut(480) - .addTo(circuitAssemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 4), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 16), - CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), - ItemList.Circuit_Board_Epoxy_Advanced.get(1L), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 3, missing)) - .fluidInputs(FluidRegistry.getFluidStack("molten.tin", 144)).duration(10 * SECONDS).eut(480) - .addTo(circuitAssemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 4), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 16), - CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), - ItemList.Circuit_Board_Epoxy_Advanced.get(1L), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 3, missing)) - .fluidInputs(FluidRegistry.getFluidStack("molten.lead", 288)).duration(10 * SECONDS).eut(480) - .addTo(circuitAssemblerRecipes); - - // 256k Essentia Storage Component - - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 4), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 16), - CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), - ItemList.Circuit_Board_Fiberglass_Advanced.get(1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing)) - .fluidInputs(Materials.Lead.getMolten(288)).requiresCleanRoom().duration(10 * SECONDS).eut(1920) - .addTo(circuitAssemblerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 4), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 16), - CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), - ItemList.Circuit_Board_Fiberglass_Advanced.get(1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing)) - .fluidInputs(Materials.Tin.getMolten(144)).requiresCleanRoom().duration(10 * SECONDS).eut(1920) - .addTo(circuitAssemblerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 4), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 16), - CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), - ItemList.Circuit_Board_Fiberglass_Advanced.get(1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing)) - .fluidInputs(Materials.SolderingAlloy.getMolten(72)).requiresCleanRoom().duration(10 * SECONDS) - .eut(1920).addTo(circuitAssemblerRecipes); - - // 1024k Essentia Storage Component - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 4), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 16), - CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), - ItemList.Circuit_Board_Multifiberglass_Elite.get(1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing)) - .fluidInputs(Materials.Lead.getMolten(288)).requiresCleanRoom().duration(10 * SECONDS).eut(7680) - .addTo(circuitAssemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 4), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 16), - CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), - ItemList.Circuit_Board_Multifiberglass_Elite.get(1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing)) - .fluidInputs(Materials.Tin.getMolten(144)).requiresCleanRoom().duration(10 * SECONDS).eut(7680) - .addTo(circuitAssemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 4), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 16), - CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), - ItemList.Circuit_Board_Multifiberglass_Elite.get(1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing)) - .fluidInputs(Materials.SolderingAlloy.getMolten(72)).requiresCleanRoom().duration(10 * SECONDS) - .eut(7680).addTo(circuitAssemblerRecipes); - - // 4096k Essentia Storage Component - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 4), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 16), - CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), - ItemList.Circuit_Board_Wetware_Extreme.get(1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing)) - .fluidInputs(Materials.Lead.getMolten(288)).requiresCleanRoom().duration(10 * SECONDS).eut(30720) - .addTo(circuitAssemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 4), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 16), - CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), - ItemList.Circuit_Board_Wetware_Extreme.get(1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing)) - .fluidInputs(Materials.Tin.getMolten(144)).requiresCleanRoom().duration(10 * SECONDS).eut(30720) - .addTo(circuitAssemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 4), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 16), - CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), - ItemList.Circuit_Board_Wetware_Extreme.get(1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing)) - .fluidInputs(Materials.SolderingAlloy.getMolten(72)).requiresCleanRoom().duration(10 * SECONDS) - .eut(30720).addTo(circuitAssemblerRecipes); - - // 16384k Essentia Storage Component - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 4), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 16), - CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), - ItemList.Circuit_Board_Bio_Ultra.get(1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 8, missing)) - .fluidInputs(Materials.Lead.getMolten(288)).requiresCleanRoom().duration(10 * SECONDS) - .eut(TierEU.RECIPE_UV).addTo(circuitAssemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 4), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 16), - CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), - ItemList.Circuit_Board_Bio_Ultra.get(1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 8, missing)) - .fluidInputs(Materials.Tin.getMolten(144)).requiresCleanRoom().duration(10 * SECONDS) - .eut(TierEU.RECIPE_UV).addTo(circuitAssemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 4), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 16), - CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), - ItemList.Circuit_Board_Bio_Ultra.get(1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 8, missing)) - .fluidInputs(Materials.SolderingAlloy.getMolten(72)).requiresCleanRoom().duration(10 * SECONDS) - .eut(TierEU.RECIPE_UV).addTo(circuitAssemblerRecipes); + for (FluidStack solder : solders) { + // 1k Essentia Storage Component + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 2), + getModItem(Thaumcraft.ID, "ItemResource", 2, 14, missing), + CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), + ItemList.Circuit_Board_Coated.get(1L), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(EssentialComponent1K).fluidInputs(solder).duration(10 * SECONDS).eut(30) + .addTo(circuitAssemblerRecipes); + // 4k Essentia Storage Component + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 4), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 16), + CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), + ItemList.Circuit_Board_Coated_Basic.get(1L), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(EssentialComponent4K).fluidInputs(solder).duration(10 * SECONDS).eut(30) + .addTo(circuitAssemblerRecipes); + // 16k Essentia Storage Component + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 4), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 16), + CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), + ItemList.Circuit_Board_Phenolic_Good.get(1L), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(EssentialComponent16K).fluidInputs(solder).duration(10 * SECONDS).eut(120) + .addTo(circuitAssemblerRecipes); + // 64k Essentia Storage Component + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 4), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 16), + CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), + ItemList.Circuit_Board_Epoxy_Advanced.get(1L), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(EssentialComponent64K).fluidInputs(solder).duration(10 * SECONDS).eut(480) + .addTo(circuitAssemblerRecipes); + // 256k Essentia Storage Component + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 4), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 16), + CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), + ItemList.Circuit_Board_Fiberglass_Advanced.get(1), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(EssentialComponent256K).fluidInputs(solder).requiresCleanRoom().duration(10 * SECONDS) + .eut(1920).addTo(circuitAssemblerRecipes); + // 1024k Essentia Storage Component + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 4), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 16), + CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), + ItemList.Circuit_Board_Multifiberglass_Elite.get(1), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(EssentialComponent1024K).fluidInputs(solder).requiresCleanRoom().duration(10 * SECONDS) + .eut(7680).addTo(circuitAssemblerRecipes); + // 4096k Essentia Storage Component + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 4), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 16), + CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), + ItemList.Circuit_Board_Wetware_Extreme.get(1), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(EssentialComponent4096K).fluidInputs(solder).requiresCleanRoom().duration(10 * SECONDS) + .eut(30720).addTo(circuitAssemblerRecipes); + // 16384k Essentia Storage Component + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 4), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 16), + CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), + ItemList.Circuit_Board_Bio_Ultra.get(1), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(EssentialComponent16384K).fluidInputs(solder).requiresCleanRoom() + .duration(10 * SECONDS).eut(TierEU.RECIPE_UV).addTo(circuitAssemblerRecipes); + } TCHelper.removeInfusionRecipe( getModItem(ThaumicEnergistics.ID, "thaumicenergistics.block.essentia.provider", 1, 0, missing)); - TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "material", 1, 2, missing)); + TCHelper.removeArcaneRecipe(IronGear); TCHelper.removeArcaneRecipe( getModItem(ThaumicEnergistics.ID, "thaumicenergistics.block.gear.box", 1, 0, missing)); TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "part.base", 1, 5, missing)); - TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "material", 1, 0, missing)); - TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "material", 1, 1, missing)); + TCHelper.removeArcaneRecipe(DiffusionCore); + TCHelper.removeArcaneRecipe(CoalescenceCore); TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "part.base", 1, 4, missing)); TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "part.base", 4, 1, missing)); TCHelper.removeArcaneRecipe( @@ -381,14 +238,14 @@ public void loadRecipes() { getModItem(ThaumicEnergistics.ID, "thaumicenergistics.block.distillation.encoder", 1, 0, missing)); TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "focus.aewrench", 1, 0, missing)); TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "golem.wifi.backpack", 1, 0, missing)); - TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 0, missing)); - TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 1, missing)); - TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 2, missing)); - TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 3, missing)); - TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing)); - TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing)); - TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing)); - TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "storage.component", 1, 8, missing)); + TCHelper.removeArcaneRecipe(EssentialComponent1K); + TCHelper.removeArcaneRecipe(EssentialComponent4K); + TCHelper.removeArcaneRecipe(EssentialComponent16K); + TCHelper.removeArcaneRecipe(EssentialComponent64K); + TCHelper.removeArcaneRecipe(EssentialComponent256K); + TCHelper.removeArcaneRecipe(EssentialComponent1024K); + TCHelper.removeArcaneRecipe(EssentialComponent4096K); + TCHelper.removeArcaneRecipe(EssentialComponent16384K); TCHelper.removeArcaneRecipe(getModItem(ThaumicEnergistics.ID, "part.base", 1, 6, missing)); TCHelper.removeCrucibleRecipe( @@ -406,6 +263,13 @@ public void loadRecipes() { getModItem(ThaumicEnergistics.ID, "thaumicenergistics.block.knowledge.inscriber", 1, 0, missing)); TCHelper.removeInfusionRecipe( getModItem(ThaumicEnergistics.ID, "thaumicenergistics.block.infusion.provider", 1, 0, missing)); + TCHelper.removeInfusionRecipe( + getModItem( + ThaumicEnergistics.ID, + "thaumicenergistics.block.advanced.infusion.provider", + 1, + 0, + missing)); ThaumcraftApi.addInfusionCraftingRecipe( "thaumicenergistics.TEESSPROV", getModItem(ThaumicEnergistics.ID, "thaumicenergistics.block.essentia.provider", 1, 0, missing), @@ -417,12 +281,10 @@ public void loadRecipes() { getModItem(AppliedEnergistics2.ID, "tile.BlockInterface", 1, 0, missing), new ItemStack[] { getModItem(Thaumcraft.ID, "blockTube", 1, 3, missing), getModItem(Thaumcraft.ID, "blockCrystal", 1, 2, missing), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L), - getModItem(ThaumicEnergistics.ID, "material", 1, 0, missing), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L), DiffusionCore, getModItem(Thaumcraft.ID, "ItemResource", 1, 14, missing), getModItem(Thaumcraft.ID, "blockTube", 1, 3, missing), - getModItem(Thaumcraft.ID, "ItemResource", 1, 14, missing), - getModItem(ThaumicEnergistics.ID, "material", 1, 1, missing), + getModItem(Thaumcraft.ID, "ItemResource", 1, 14, missing), CoalescenceCore, GTOreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L), getModItem(Thaumcraft.ID, "blockCrystal", 1, 2, missing), }); TCHelper.setResearchAspects( @@ -434,7 +296,7 @@ public void loadRecipes() { TCHelper.setResearchComplexity("thaumicenergistics.TEESSPROV", 3); ThaumcraftApi.addArcaneCraftingRecipe( "thaumicenergistics.TEIRONGEARBOX", - getModItem(ThaumicEnergistics.ID, "material", 1, 2, missing), + IronGear, new AspectList().add(Aspect.getAspect("terra"), 10).add(Aspect.getAspect("ignis"), 5) .add(Aspect.getAspect("ordo"), 5), "abc", @@ -505,15 +367,15 @@ public void loadRecipes() { 'c', GTOreDictUnificator.get(OrePrefixes.plate, Materials.InfusedEarth, 1L), 'd', - getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 24, missing), + EngProcessor, 'e', getModItem(Thaumcraft.ID, "blockTable", 1, 15, missing), 'f', - getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 23, missing), + CalcProcessor, 'g', GTOreDictUnificator.get(OrePrefixes.plate, Materials.InfusedEarth, 1L), 'h', - getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 22, missing), + LogicProcessor, 'i', GTOreDictUnificator.get(OrePrefixes.plate, Materials.InfusedEarth, 1L)); TCHelper.setResearchAspects( @@ -529,7 +391,7 @@ public void loadRecipes() { TCHelper.setResearchComplexity("thaumicenergistics.TECERTUSDUPE", 2); ThaumcraftApi.addArcaneCraftingRecipe( "thaumicenergistics.TECORES", - getModItem(ThaumicEnergistics.ID, "material", 1, 0, missing), + DiffusionCore, new AspectList().add(Aspect.getAspect("aqua"), 20).add(Aspect.getAspect("perditio"), 20), "abc", "def", @@ -554,7 +416,7 @@ public void loadRecipes() { getModItem(Thaumcraft.ID, "ItemResource", 1, 3, missing)); ThaumcraftApi.addArcaneCraftingRecipe( "thaumicenergistics.TECORES", - getModItem(ThaumicEnergistics.ID, "material", 1, 1, missing), + CoalescenceCore, new AspectList().add(Aspect.getAspect("aqua"), 20).add(Aspect.getAspect("ordo"), 20), "abc", "def", @@ -599,17 +461,17 @@ public void loadRecipes() { "def", "ghi", 'a', - getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 23, missing), + CalcProcessor, 'b', getModItem(Thaumcraft.ID, "ItemResource", 1, 8, missing), 'c', - getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 22, missing), + LogicProcessor, 'd', - getModItem(ThaumicEnergistics.ID, "material", 1, 0, missing), + DiffusionCore, 'e', getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 380, missing), 'f', - getModItem(ThaumicEnergistics.ID, "material", 1, 1, missing), + CoalescenceCore, 'g', "plateInfusedWater", 'h', @@ -690,13 +552,13 @@ public void loadRecipes() { 'd', "screwInfusedFire", 'e', - getModItem(ThaumicEnergistics.ID, "material", 1, 0, missing), + DiffusionCore, 'f', "screwInfusedFire", 'g', "plateInfusedOrder", 'h', - getModItem(ThaumicEnergistics.ID, "material", 1, 1, missing), + CoalescenceCore, 'i', "plateInfusedOrder"); TCHelper.addResearchPage( @@ -724,11 +586,11 @@ public void loadRecipes() { 'c', "plateInfusedOrder", 'd', - getModItem(ThaumicEnergistics.ID, "material", 1, 0, missing), + DiffusionCore, 'e', getModItem(AppliedEnergistics2.ID, "tile.BlockVibrationChamber", 1, 0, missing), 'f', - getModItem(ThaumicEnergistics.ID, "material", 1, 0, missing), + DiffusionCore, 'g', "plateInfusedEntropy", 'h', @@ -752,7 +614,7 @@ public void loadRecipes() { 'a', getModItem(Thaumcraft.ID, "blockCosmeticOpaque", 1, 2, missing), 'b', - getModItem(ThaumicEnergistics.ID, "material", 1, 0, missing), + DiffusionCore, 'c', getModItem(Thaumcraft.ID, "blockCosmeticOpaque", 1, 2, missing), 'd', @@ -790,7 +652,7 @@ public void loadRecipes() { 'g', getModItem(Thaumcraft.ID, "blockCosmeticOpaque", 1, 2, missing), 'h', - getModItem(ThaumicEnergistics.ID, "material", 1, 1, missing), + CoalescenceCore, 'i', getModItem(Thaumcraft.ID, "blockCosmeticOpaque", 1, 2, missing)); ThaumcraftApi.addArcaneCraftingRecipe( @@ -808,11 +670,11 @@ public void loadRecipes() { 'c', getModItem(Thaumcraft.ID, "blockJar", 1, 0, missing), 'd', - getModItem(ThaumicEnergistics.ID, "material", 1, 0, missing), + DiffusionCore, 'e', getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 220, missing), 'f', - getModItem(ThaumicEnergistics.ID, "material", 1, 1, missing), + CoalescenceCore, 'g', getModItem(Thaumcraft.ID, "blockTube", 1, 3, missing), 'h', @@ -840,15 +702,15 @@ public void loadRecipes() { 'c', "plateInfusedFire", 'd', - getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 22, missing), + LogicProcessor, 'e', getModItem(AE2Stuff.ID, "Encoder", 1, 0, missing), 'f', - getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 22, missing), + LogicProcessor, 'g', "plateInfusedOrder", 'h', - getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 24, missing), + EngProcessor, 'i', "plateInfusedOrder"); TCHelper.setResearchAspects( @@ -932,7 +794,7 @@ public void loadRecipes() { new ResearchPage("thaumicenergistics.research_page.TESTORAGE.2")); ThaumcraftApi.addArcaneCraftingRecipe( "thaumicenergistics.TESTORAGE", - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 0, missing), + EssentialComponent1K, new AspectList().add(Aspect.getAspect("ordo"), 10).add(Aspect.getAspect("ignis"), 10) .add(Aspect.getAspect("aqua"), 10), "abc", @@ -958,12 +820,10 @@ public void loadRecipes() { "circuitPrimitive"); TCHelper.addResearchPage( "thaumicenergistics.TESTORAGE", - new ResearchPage( - TCHelper.findArcaneRecipe( - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 0, missing)))); + new ResearchPage(TCHelper.findArcaneRecipe(EssentialComponent1K))); ThaumcraftApi.addArcaneCraftingRecipe( "thaumicenergistics.TESTORAGE", - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 1, missing), + EssentialComponent4K, new AspectList().add(Aspect.getAspect("ordo"), 20).add(Aspect.getAspect("ignis"), 20) .add(Aspect.getAspect("aqua"), 20), "abc", @@ -972,29 +832,27 @@ public void loadRecipes() { 'a', "circuitBasic", 'b', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 0, missing), + EssentialComponent1K, 'c', "circuitBasic", 'd', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 0, missing), + EssentialComponent1K, 'e', CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), 'f', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 0, missing), + EssentialComponent1K, 'g', "circuitBasic", 'h', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 0, missing), + EssentialComponent1K, 'i', "circuitBasic"); TCHelper.addResearchPage( "thaumicenergistics.TESTORAGE", - new ResearchPage( - TCHelper.findArcaneRecipe( - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 1, missing)))); + new ResearchPage(TCHelper.findArcaneRecipe(EssentialComponent4K))); ThaumcraftApi.addArcaneCraftingRecipe( "thaumicenergistics.TESTORAGE", - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 2, missing), + EssentialComponent16K, new AspectList().add(Aspect.getAspect("ordo"), 30).add(Aspect.getAspect("ignis"), 30) .add(Aspect.getAspect("aqua"), 30), "abc", @@ -1003,29 +861,27 @@ public void loadRecipes() { 'a', "circuitGood", 'b', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 1, missing), + EssentialComponent4K, 'c', "circuitGood", 'd', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 1, missing), + EssentialComponent4K, 'e', CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), 'f', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 1, missing), + EssentialComponent4K, 'g', "circuitGood", 'h', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 1, missing), + EssentialComponent4K, 'i', "circuitGood"); TCHelper.addResearchPage( "thaumicenergistics.TESTORAGE", - new ResearchPage( - TCHelper.findArcaneRecipe( - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 2, missing)))); + new ResearchPage(TCHelper.findArcaneRecipe(EssentialComponent16K))); ThaumcraftApi.addArcaneCraftingRecipe( "thaumicenergistics.TESTORAGE", - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 3, missing), + EssentialComponent64K, new AspectList().add(Aspect.getAspect("ordo"), 40).add(Aspect.getAspect("ignis"), 40) .add(Aspect.getAspect("aqua"), 40), "abc", @@ -1034,29 +890,27 @@ public void loadRecipes() { 'a', "circuitAdvanced", 'b', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 2, missing), + EssentialComponent16K, 'c', "circuitAdvanced", 'd', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 2, missing), + EssentialComponent16K, 'e', CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), 'f', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 2, missing), + EssentialComponent16K, 'g', "circuitAdvanced", 'h', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 2, missing), + EssentialComponent16K, 'i', "circuitAdvanced"); TCHelper.addResearchPage( "thaumicenergistics.TESTORAGE", - new ResearchPage( - TCHelper.findArcaneRecipe( - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 3, missing)))); + new ResearchPage(TCHelper.findArcaneRecipe(EssentialComponent64K))); ThaumcraftApi.addArcaneCraftingRecipe( "thaumicenergistics.TESTORAGE", - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing), + EssentialComponent256K, new AspectList().add(Aspect.getAspect("ordo"), 50).add(Aspect.getAspect("ignis"), 50) .add(Aspect.getAspect("aqua"), 50), "abc", @@ -1065,29 +919,27 @@ public void loadRecipes() { 'a', "circuitData", 'b', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 3, missing), + EssentialComponent64K, 'c', "circuitData", 'd', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 3, missing), + EssentialComponent64K, 'e', CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), 'f', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 3, missing), + EssentialComponent64K, 'g', "circuitData", 'h', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 3, missing), + EssentialComponent64K, 'i', "circuitData"); TCHelper.addResearchPage( "thaumicenergistics.TESTORAGE", - new ResearchPage( - TCHelper.findArcaneRecipe( - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing)))); + new ResearchPage(TCHelper.findArcaneRecipe(EssentialComponent256K))); ThaumcraftApi.addArcaneCraftingRecipe( "thaumicenergistics.TESTORAGE", - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing), + EssentialComponent1024K, new AspectList().add(Aspect.getAspect("ordo"), 60).add(Aspect.getAspect("ignis"), 60) .add(Aspect.getAspect("aqua"), 60), "abc", @@ -1096,29 +948,27 @@ public void loadRecipes() { 'a', "circuitElite", 'b', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing), + EssentialComponent256K, 'c', "circuitElite", 'd', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing), + EssentialComponent256K, 'e', CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), 'f', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing), + EssentialComponent256K, 'g', "circuitElite", 'h', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing), + EssentialComponent256K, 'i', "circuitElite"); TCHelper.addResearchPage( "thaumicenergistics.TESTORAGE", - new ResearchPage( - TCHelper.findArcaneRecipe( - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing)))); + new ResearchPage(TCHelper.findArcaneRecipe(EssentialComponent1024K))); ThaumcraftApi.addArcaneCraftingRecipe( "thaumicenergistics.TESTORAGE", - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing), + EssentialComponent4096K, new AspectList().add(Aspect.getAspect("ordo"), 70).add(Aspect.getAspect("ignis"), 70) .add(Aspect.getAspect("aqua"), 70), "abc", @@ -1127,29 +977,27 @@ public void loadRecipes() { 'a', "circuitMaster", 'b', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing), + EssentialComponent1024K, 'c', "circuitMaster", 'd', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing), + EssentialComponent1024K, 'e', CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), 'f', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing), + EssentialComponent1024K, 'g', "circuitMaster", 'h', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing), + EssentialComponent1024K, 'i', "circuitMaster"); TCHelper.addResearchPage( "thaumicenergistics.TESTORAGE", - new ResearchPage( - TCHelper.findArcaneRecipe( - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing)))); + new ResearchPage(TCHelper.findArcaneRecipe(EssentialComponent4096K))); ThaumcraftApi.addArcaneCraftingRecipe( "thaumicenergistics.TESTORAGE", - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 8, missing), + EssentialComponent16384K, new AspectList().add(Aspect.getAspect("ordo"), 80).add(Aspect.getAspect("ignis"), 80) .add(Aspect.getAspect("aqua"), 80), "abc", @@ -1158,26 +1006,24 @@ public void loadRecipes() { 'a', "circuitSuperconductor", 'b', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing), + EssentialComponent4096K, 'c', "circuitSuperconductor", 'd', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing), + EssentialComponent4096K, 'e', CustomItemList.EngineeringProcessorEssentiaPulsatingCore.get(1L), 'f', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing), + EssentialComponent4096K, 'g', "circuitSuperconductor", 'h', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing), + EssentialComponent4096K, 'i', "circuitSuperconductor"); TCHelper.addResearchPage( "thaumicenergistics.TESTORAGE", - new ResearchPage( - TCHelper.findArcaneRecipe( - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 8, missing)))); + new ResearchPage(TCHelper.findArcaneRecipe(EssentialComponent16384K))); ThaumcraftApi.addArcaneCraftingRecipe( "thaumicenergistics.TESTORAGE", getModItem(ThaumicEnergistics.ID, "storage.casing", 1, 0, missing), @@ -1225,7 +1071,7 @@ public void loadRecipes() { 'd', "plateInfusedEarth", 'e', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 0, missing), + EssentialComponent1K, 'f', "plateInfusedEarth", 'g', @@ -1240,7 +1086,7 @@ public void loadRecipes() { new AspectList().add(Aspect.getAspect("ordo"), 5).add(Aspect.getAspect("terra"), 5) .add(Aspect.getAspect("aqua"), 5), getModItem(ThaumicEnergistics.ID, "storage.casing", 1, 0, missing), - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 0, missing)); + EssentialComponent1K); TCHelper.addResearchPage( "thaumicenergistics.TESTORAGE", new ResearchPage( @@ -1263,7 +1109,7 @@ public void loadRecipes() { 'd', "plateInfusedEarth", 'e', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 1, missing), + EssentialComponent4K, 'f', "plateInfusedEarth", 'g', @@ -1278,7 +1124,7 @@ public void loadRecipes() { new AspectList().add(Aspect.getAspect("ordo"), 15).add(Aspect.getAspect("terra"), 15) .add(Aspect.getAspect("aqua"), 15), getModItem(ThaumicEnergistics.ID, "storage.casing", 1, 0, missing), - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 1, missing)); + EssentialComponent4K); TCHelper.addResearchPage( "thaumicenergistics.TESTORAGE", new ResearchPage( @@ -1301,7 +1147,7 @@ public void loadRecipes() { 'd', "plateInfusedEarth", 'e', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 2, missing), + EssentialComponent16K, 'f', "plateInfusedEarth", 'g', @@ -1316,7 +1162,7 @@ public void loadRecipes() { new AspectList().add(Aspect.getAspect("ordo"), 25).add(Aspect.getAspect("terra"), 25) .add(Aspect.getAspect("aqua"), 25), getModItem(ThaumicEnergistics.ID, "storage.casing", 1, 0, missing), - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 2, missing)); + EssentialComponent16K); TCHelper.addResearchPage( "thaumicenergistics.TESTORAGE", new ResearchPage( @@ -1339,7 +1185,7 @@ public void loadRecipes() { 'd', "plateInfusedEarth", 'e', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 3, missing), + EssentialComponent64K, 'f', "plateInfusedEarth", 'g', @@ -1354,7 +1200,7 @@ public void loadRecipes() { new AspectList().add(Aspect.getAspect("ordo"), 35).add(Aspect.getAspect("terra"), 35) .add(Aspect.getAspect("aqua"), 35), getModItem(ThaumicEnergistics.ID, "storage.casing", 1, 0, missing), - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 3, missing)); + EssentialComponent64K); TCHelper.addResearchPage( "thaumicenergistics.TESTORAGE", new ResearchPage( @@ -1377,7 +1223,7 @@ public void loadRecipes() { 'd', "plateInfusedEarth", 'e', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing), + EssentialComponent256K, 'f', "plateInfusedEarth", 'g', @@ -1392,7 +1238,7 @@ public void loadRecipes() { new AspectList().add(Aspect.getAspect("ordo"), 45).add(Aspect.getAspect("terra"), 45) .add(Aspect.getAspect("aqua"), 45), getModItem(ThaumicEnergistics.ID, "storage.casing", 1, 0, missing), - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 5, missing)); + EssentialComponent256K); TCHelper.addResearchPage( "thaumicenergistics.TESTORAGE", new ResearchPage( @@ -1415,7 +1261,7 @@ public void loadRecipes() { 'd', "plateInfusedEarth", 'e', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing), + EssentialComponent1024K, 'f', "plateInfusedEarth", 'g', @@ -1430,7 +1276,7 @@ public void loadRecipes() { new AspectList().add(Aspect.getAspect("ordo"), 55).add(Aspect.getAspect("terra"), 55) .add(Aspect.getAspect("aqua"), 55), getModItem(ThaumicEnergistics.ID, "storage.casing", 1, 0, missing), - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 6, missing)); + EssentialComponent1024K); TCHelper.addResearchPage( "thaumicenergistics.TESTORAGE", new ResearchPage( @@ -1453,7 +1299,7 @@ public void loadRecipes() { 'd', "plateInfusedEarth", 'e', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing), + EssentialComponent4096K, 'f', "plateInfusedEarth", 'g', @@ -1468,7 +1314,7 @@ public void loadRecipes() { new AspectList().add(Aspect.getAspect("ordo"), 65).add(Aspect.getAspect("terra"), 65) .add(Aspect.getAspect("aqua"), 65), getModItem(ThaumicEnergistics.ID, "storage.casing", 1, 0, missing), - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 7, missing)); + EssentialComponent4096K); TCHelper.addResearchPage( "thaumicenergistics.TESTORAGE", new ResearchPage( @@ -1491,7 +1337,7 @@ public void loadRecipes() { 'd', "plateInfusedEarth", 'e', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 8, missing), + EssentialComponent16384K, 'f', "plateInfusedEarth", 'g', @@ -1506,7 +1352,7 @@ public void loadRecipes() { new AspectList().add(Aspect.getAspect("ordo"), 75).add(Aspect.getAspect("terra"), 75) .add(Aspect.getAspect("aqua"), 75), getModItem(ThaumicEnergistics.ID, "storage.casing", 1, 0, missing), - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 8, missing)); + EssentialComponent16384K); TCHelper.addResearchPage( "thaumicenergistics.TESTORAGE", new ResearchPage( @@ -1532,7 +1378,7 @@ public void loadRecipes() { 'c', "circuitInfinite", 'd', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 8, missing), + EssentialComponent16384K, 'e', getModItem(ThaumicEnergistics.ID, "storage.casing", 1, 0, missing)); // ME Digital Singularity @@ -1554,7 +1400,7 @@ public void loadRecipes() { 'c', getModItem(Thaumcraft.ID, "blockEssentiaReservoir", 1, 0, missing), 'd', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 8, missing), + EssentialComponent16384K, 'e', "blockInfinity", 'f', @@ -1571,7 +1417,7 @@ public void loadRecipes() { 'a', "craftingToolScrewdriver", 'b', - getModItem(ThaumicEnergistics.ID, "storage.component", 1, 0, missing), + EssentialComponent1K, 'c', "craftingToolWrench", 'd', @@ -1583,7 +1429,7 @@ public void loadRecipes() { 'g', "plateInfusedOrder", 'h', - getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 22, missing), + LogicProcessor, 'i', "plateInfusedOrder"); TCHelper.addResearchPage( @@ -1700,7 +1546,7 @@ public void loadRecipes() { 'g', "plateInfusedOrder", 'h', - getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 23, missing), + CalcProcessor, 'i', "plateInfusedOrder"); ThaumcraftApi.addArcaneCraftingRecipe( @@ -1746,12 +1592,10 @@ public void loadRecipes() { getModItem(ThaumicEnergistics.ID, "thaumicenergistics.block.essentia.provider", 1, 0, missing), new ItemStack[] { getModItem(Thaumcraft.ID, "blockMirror", 1, 6, missing), getModItem(Thaumcraft.ID, "blockCrystal", 1, 0, missing), - getModItem(ThaumicEnergistics.ID, "part.base", 1, 0, missing), - getModItem(ThaumicEnergistics.ID, "material", 1, 0, missing), + getModItem(ThaumicEnergistics.ID, "part.base", 1, 0, missing), DiffusionCore, getModItem(Thaumcraft.ID, "ItemResource", 1, 14, missing), getModItem(Thaumcraft.ID, "blockMirror", 1, 6, missing), - getModItem(Thaumcraft.ID, "ItemResource", 1, 14, missing), - getModItem(ThaumicEnergistics.ID, "material", 1, 1, missing), + getModItem(Thaumcraft.ID, "ItemResource", 1, 14, missing), CoalescenceCore, getModItem(ThaumicEnergistics.ID, "part.base", 1, 3, missing), getModItem(Thaumcraft.ID, "blockCrystal", 1, 0, missing), }); TCHelper.setResearchAspects( @@ -1761,6 +1605,18 @@ public void loadRecipes() { .add(Aspect.getAspect("praecantatio"), 9).add(Aspect.getAspect("alienis"), 6) .add(Aspect.getAspect("spiritus"), 3)); TCHelper.setResearchComplexity("thaumicenergistics.TEINFPROV", 3); + + ThaumcraftApi.addInfusionCraftingRecipe( + "thaumicenergistics.TEADVINFPROV", + getModItem(ThaumicEnergistics.ID, "thaumicenergistics.block.advanced.infusion.provider", 1, 0, missing), + 30, + new AspectList().add(Aspect.MECHANISM, 64).add(Aspect.MAGIC, 64).add(Aspect.EXCHANGE, 64) + .add(Aspect.MIND, 64).add(Aspect.GREED, 64), + getModItem(ThaumicEnergistics.ID, "thaumicenergistics.block.infusion.provider", 1, 0, missing), + new ItemStack[] { InfusionIntercepter, PrimalCharm, DiffusionCore, EssentialComponent64K, DiffusionCore, + PrimalCharm, CraftingUnit, PrimalCharm, EngProcessor, EssentialComponent64K, EngProcessor, + PrimalCharm }); + TCHelper.refreshResearchPages("thaumicenergistics.TEESSPROV"); TCHelper.refreshResearchPages("thaumicenergistics.TEIRONGEARBOX"); TCHelper.refreshResearchPages("thaumicenergistics.TEARCANETERM"); @@ -1778,5 +1634,6 @@ public void loadRecipes() { TCHelper.refreshResearchPages("thaumicenergistics.TEARCANEASSEMBLER"); TCHelper.refreshResearchPages("thaumicenergistics.TEKNOWLEDGEINSCRIBER"); TCHelper.refreshResearchPages("thaumicenergistics.TEINFPROV"); + TCHelper.refreshResearchPages("thaumicenergistics.TEADVINFPROV"); } } From e555c91a273d1dd2cbfcbb131c77f50164c90851 Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Sat, 7 Sep 2024 16:57:49 +0100 Subject: [PATCH 4/6] maybe last full amp fix (#979) --- .../dreammaster/gthandler/recipes/AssemblingLineRecipes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java index 9e211f0be..0a4a2222c 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java @@ -1425,7 +1425,7 @@ public void run() { Materials.Osmium.getMolten(1152L) }, com.dreammaster.item.ItemList.PikoCircuit.getIS(1), 10000, - 128_000_000); + (int) TierEU.RECIPE_UMV); // Quantum Circuit TTRecipeAdder.addResearchableAssemblylineRecipe( From 39be4bf993bfd1080e5671eeee1e1f8a76f5bb91 Mon Sep 17 00:00:00 2001 From: StaffiX <32968022+StaffiX@users.noreply.github.com> Date: Sat, 7 Sep 2024 18:27:22 +0200 Subject: [PATCH 5/6] Add superheated steam recipe to fluid heater (#975) Co-authored-by: Martin Robertz --- .../gthandler/recipes/FluidHeaterRecipes.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/FluidHeaterRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/FluidHeaterRecipes.java index 742e742f6..8545bb708 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/FluidHeaterRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/FluidHeaterRecipes.java @@ -1,7 +1,20 @@ package com.dreammaster.gthandler.recipes; +import static gregtech.api.recipe.RecipeMaps.fluidHeaterRecipes; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; + +import gregtech.api.enums.GTValues; +import gregtech.api.enums.TierEU; +import gtPlusPlus.core.util.minecraft.FluidUtils; + public class FluidHeaterRecipes implements Runnable { @Override - public void run() {} + public void run() { + + GTValues.RA.stdBuilder().fluidInputs(FluidUtils.getSteam(3840)) + .fluidOutputs(FluidUtils.getSuperHeatedSteam(3840)).duration(5 * SECONDS).eut(TierEU.RECIPE_LuV) + .noOptimize().addTo(fluidHeaterRecipes); + + } } From c2e6c0f8a75b31acbb7dc2b9c3c809b3ceaa32f3 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 7 Sep 2024 18:29:03 +0200 Subject: [PATCH 6/6] update --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index d0b57e2ac..b20e4ab23 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.68:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.76:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev")