From 0f976874fc863cee2a02d099c37e66610eb1bb04 Mon Sep 17 00:00:00 2001 From: Maya <10861407+serenibyss@users.noreply.github.com> Date: Sun, 12 Jan 2025 13:14:00 -0700 Subject: [PATCH 01/34] Switch space assembler module tier to metadata (#1157) --- dependencies.gradle | 4 +- .../recipes/SpaceAssemblerRecipes.java | 71 ++++++++++--------- 2 files changed, 40 insertions(+), 35 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 03ef927ae..bbb44a162 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -10,7 +10,7 @@ dependencies { compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.0:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Avaritia:1.59:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:twilightforest:2.7.2:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.18:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.20:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.3-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.3.0:dev") { transitive = false } @@ -22,7 +22,7 @@ dependencies { 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.0:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.1-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.2-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.1:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.0-GTNH:dev") diff --git a/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java index 468944a93..a4eac5382 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java @@ -74,8 +74,8 @@ public void run() { GGMaterial.atomicSeparationCatalyst.getMolten(64 * 144), Materials.Tartarite.getMolten(64 * 144), Materials.Longasssuperconductornameforuvwire.getMolten(64 * 144)) - .itemOutputs(ItemList.Black_Hole_Opener.get(1)).specialValue(1).duration(120 * SECONDS) - .eut(TierEU.RECIPE_UHV).addTo(IGRecipeMaps.spaceAssemblerRecipes); + .itemOutputs(ItemList.Black_Hole_Opener.get(1)).metadata(IGRecipeMaps.MODULE_TIER, 1) + .duration(120 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(IGRecipeMaps.spaceAssemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( @@ -100,8 +100,8 @@ public void run() { Materials.Osmiridium.getMolten(64 * 144), Materials.Ledox.getMolten(64 * 144), Materials.CallistoIce.getMolten(64 * 144)) - .itemOutputs(ItemList.Black_Hole_Closer.get(1)).specialValue(1).duration(120 * SECONDS) - .eut(TierEU.RECIPE_UHV).addTo(IGRecipeMaps.spaceAssemblerRecipes); + .itemOutputs(ItemList.Black_Hole_Closer.get(1)).metadata(IGRecipeMaps.MODULE_TIER, 1) + .duration(120 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(IGRecipeMaps.spaceAssemblerRecipes); // Optically Perfected CPU GTValues.RA.stdBuilder() @@ -115,7 +115,7 @@ public void run() { GGMaterial.atomicSeparationCatalyst.get(OrePrefixes.screw, 4), GGMaterial.preciousMetalAlloy.get(OrePrefixes.screw, 4)) .fluidInputs(new FluidStack(solderUEV, 288)).itemOutputs(ItemList.Optically_Perfected_CPU.get(1L)) - .specialValue(1).duration(20 * SECONDS).eut(TierEU.RECIPE_UHV) + .metadata(IGRecipeMaps.MODULE_TIER, 1).duration(20 * SECONDS).eut(TierEU.RECIPE_UHV) .addTo(IGRecipeMaps.spaceAssemblerRecipes); GTValues.RA.stdBuilder() @@ -131,7 +131,7 @@ public void run() { // Enriched Naquadah Alloy screw GGMaterial.enrichedNaquadahAlloy.get(OrePrefixes.screw, 8)) .fluidInputs(new FluidStack(solderUEV, 576)).itemOutputs(ItemList.Optically_Perfected_CPU.get(4L)) - .specialValue(2).duration(20 * SECONDS).eut(TierEU.RECIPE_UEV) + .metadata(IGRecipeMaps.MODULE_TIER, 2).duration(20 * SECONDS).eut(TierEU.RECIPE_UEV) .addTo(IGRecipeMaps.spaceAssemblerRecipes); GTValues.RA.stdBuilder() @@ -147,7 +147,7 @@ public void run() { // Shirabon screw GGMaterial.shirabon.get(OrePrefixes.screw, 16)) .fluidInputs(new FluidStack(solderUEV, 1152)).itemOutputs(ItemList.Optically_Perfected_CPU.get(16L)) - .specialValue(2).duration(20 * SECONDS).eut(TierEU.RECIPE_UIV) + .metadata(IGRecipeMaps.MODULE_TIER, 2).duration(20 * SECONDS).eut(TierEU.RECIPE_UIV) .addTo(IGRecipeMaps.spaceAssemblerRecipes); // Alternate Energy Orb Cluster Recipe @@ -165,7 +165,7 @@ public void run() { ItemList.Circuit_Parts_TransistorASMD.get(8L), GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Platinum, 64)) .fluidInputs(new FluidStack(solderIndalloy, 720)).itemOutputs(ItemList.Energy_LapotronicOrb2.get(1)) - .specialValue(1).duration(50 * SECONDS).eut(TierEU.RECIPE_ZPM) + .metadata(IGRecipeMaps.MODULE_TIER, 1).duration(50 * SECONDS).eut(TierEU.RECIPE_ZPM) .addTo(IGRecipeMaps.spaceAssemblerRecipes); // Alternate Energy Module Recipe @@ -183,7 +183,7 @@ public void run() { ItemList.Circuit_Parts_TransistorXSMD.get(8L), GTOreDictUnificator.get("wireFineHypogen", 48)) .fluidInputs(new FluidStack(solderUEV, 720)).itemOutputs(ItemList.Energy_Module.get(1)) - .specialValue(1).duration(50 * SECONDS).eut(TierEU.RECIPE_UV) + .metadata(IGRecipeMaps.MODULE_TIER, 1).duration(50 * SECONDS).eut(TierEU.RECIPE_UV) .addTo(IGRecipeMaps.spaceAssemblerRecipes); // Advanced Radiation Proof Plate @@ -197,8 +197,9 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 16L), GTOreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 16L)) .fluidInputs(new FluidStack(solderIndalloy, (32 * 144)), Materials.Lead.getMolten(64 * 144L)) - .itemOutputs(new ItemStack(Loaders.advancedRadiationProtectionPlate, 4, 0)).specialValue(1) - .duration(50 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(IGRecipeMaps.spaceAssemblerRecipes); + .itemOutputs(new ItemStack(Loaders.advancedRadiationProtectionPlate, 4, 0)) + .metadata(IGRecipeMaps.MODULE_TIER, 1).duration(50 * SECONDS).eut(TierEU.RECIPE_ZPM) + .addTo(IGRecipeMaps.spaceAssemblerRecipes); // Alternate Energy Cluster Recipe GTValues.RA.stdBuilder() @@ -217,7 +218,7 @@ public void run() { ItemList.Circuit_Parts_TransistorXSMD.get(32L), GTOreDictUnificator.get(OrePrefixes.wireGt01, MaterialsUEVplus.SpaceTime, 12L)) .fluidInputs(new FluidStack(solderUEV, 1440)).itemOutputs(ItemList.Energy_Cluster.get(1)) - .specialValue(1).duration(50 * SECONDS).eut(TierEU.RECIPE_UHV) + .metadata(IGRecipeMaps.MODULE_TIER, 1).duration(50 * SECONDS).eut(TierEU.RECIPE_UHV) .addTo(IGRecipeMaps.spaceAssemblerRecipes); // Alternate Ultimate Battery Recipe @@ -243,8 +244,8 @@ public void run() { new FluidStack(solderUEV, 2880), MaterialsUEVplus.WhiteDwarfMatter.getMolten(576), MaterialsUEVplus.BlackDwarfMatter.getMolten(576)) - .itemOutputs(ItemList.ZPM2.get(1)).specialValue(2).duration(50 * SECONDS).eut(TierEU.RECIPE_UEV) - .addTo(IGRecipeMaps.spaceAssemblerRecipes); + .itemOutputs(ItemList.ZPM2.get(1)).metadata(IGRecipeMaps.MODULE_TIER, 2).duration(50 * SECONDS) + .eut(TierEU.RECIPE_UEV).addTo(IGRecipeMaps.spaceAssemblerRecipes); if (OpenComputers.isModLoaded() && SuperSolarPanels.isModLoaded()) { // Optically Compatible Memory @@ -256,8 +257,8 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 8L), getModItem(SuperSolarPanels.ID, "solarsplitter", 1L, 0)) // Solar Light Splitter .fluidInputs(new FluidStack(solderUEV, 288)) - .itemOutputs(ItemList.Optically_Compatible_Memory.get(2)).specialValue(1).duration(20 * SECONDS) - .eut(TierEU.RECIPE_UHV).addTo(IGRecipeMaps.spaceAssemblerRecipes); + .itemOutputs(ItemList.Optically_Compatible_Memory.get(2)).metadata(IGRecipeMaps.MODULE_TIER, 1) + .duration(20 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(IGRecipeMaps.spaceAssemblerRecipes); GTValues.RA.stdBuilder().itemInputs( getModItem(OpenComputers.ID, "item", 4L, 39), // Memory tier 3.5 @@ -267,8 +268,8 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 16L), getModItem(SuperSolarPanels.ID, "solarsplitter", 4L, 0)) // Solar Light Splitter .fluidInputs(new FluidStack(solderUEV, 576)) - .itemOutputs(ItemList.Optically_Compatible_Memory.get(8)).specialValue(2).duration(20 * SECONDS) - .eut(TierEU.RECIPE_UEV).addTo(IGRecipeMaps.spaceAssemblerRecipes); + .itemOutputs(ItemList.Optically_Compatible_Memory.get(8)).metadata(IGRecipeMaps.MODULE_TIER, 2) + .duration(20 * SECONDS).eut(TierEU.RECIPE_UEV).addTo(IGRecipeMaps.spaceAssemblerRecipes); GTValues.RA.stdBuilder().itemInputs( getModItem(OpenComputers.ID, "item", 16L, 39), // Memory tier 3.5 @@ -278,7 +279,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 32L), getModItem(SuperSolarPanels.ID, "solarsplitter", 16L, 0)) // Solar Light Splitter .fluidInputs(new FluidStack(solderUEV, 1152)) - .itemOutputs(ItemList.Optically_Compatible_Memory.get(32)).specialValue(2) + .itemOutputs(ItemList.Optically_Compatible_Memory.get(32)).metadata(IGRecipeMaps.MODULE_TIER, 2) .duration(20 * SECONDS).eut(TierEU.RECIPE_UIV).addTo(IGRecipeMaps.spaceAssemblerRecipes); // Advanced Stocking Input Hatch (ME) @@ -293,8 +294,8 @@ public void run() { // Hyper-Acceleration Card getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 4L, 56)) .fluidInputs(new FluidStack(solderUEV, 2304)) - .itemOutputs(ItemList.Hatch_Input_ME_Advanced.get(1)).specialValue(1).duration(15 * SECONDS) - .eut(TierEU.RECIPE_UHV).addTo(IGRecipeMaps.spaceAssemblerRecipes); + .itemOutputs(ItemList.Hatch_Input_ME_Advanced.get(1)).metadata(IGRecipeMaps.MODULE_TIER, 1) + .duration(15 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(IGRecipeMaps.spaceAssemblerRecipes); } if (OpenComputers.isModLoaded()) { @@ -308,8 +309,9 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 1L), GTOreDictUnificator.get(OrePrefixes.foil, Materials.VanadiumGallium, 64L)) .fluidInputs(new FluidStack(solderIndalloy, 1152)) - .itemOutputs(getModItem(OpenComputers.ID, "item", 64L, 39)).specialValue(1) - .duration(10 * SECONDS).eut(TierEU.RECIPE_UV).addTo(IGRecipeMaps.spaceAssemblerRecipes); + .itemOutputs(getModItem(OpenComputers.ID, "item", 64L, 39)) + .metadata(IGRecipeMaps.MODULE_TIER, 1).duration(10 * SECONDS).eut(TierEU.RECIPE_UV) + .addTo(IGRecipeMaps.spaceAssemblerRecipes); } if (AppliedEnergistics2.isModLoaded() && AE2FluidCraft.isModLoaded()) { @@ -325,7 +327,7 @@ public void run() { getModItem(AE2FluidCraft.ID, "part_fluid_pattern_terminal_ex", 1)) .fluidInputs(new FluidStack(solderUEV, 9216)) .itemOutputs(getModItem(AppliedEnergistics2.ID, "tile.BlockPatternOptimizationMatrix", 1)) - .specialValue(1).duration(5 * MINUTES).eut(TierEU.RECIPE_UHV) + .metadata(IGRecipeMaps.MODULE_TIER, 1).duration(5 * MINUTES).eut(TierEU.RECIPE_UHV) .addTo(IGRecipeMaps.spaceAssemblerRecipes); } @@ -353,8 +355,8 @@ public void run() { MaterialsUEVplus.Eternity.getNanite(4)) .fluidInputs(MaterialsUEVplus.Eternity.getMolten(36864)) .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemExtremeStorageCell.Universe", 1)) - .specialValue(3).nbtSensitive().duration(1 * MINUTES).eut(TierEU.RECIPE_UXV) - .addTo(IGRecipeMaps.spaceAssemblerRecipes); + .metadata(IGRecipeMaps.MODULE_TIER, 3).nbtSensitive().duration(1 * MINUTES) + .eut(TierEU.RECIPE_UXV).addTo(IGRecipeMaps.spaceAssemblerRecipes); // Digital Singularity ME Storage Cell GTValues.RA.stdBuilder() @@ -367,7 +369,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.block, Materials.CosmicNeutronium, 12L)) .fluidInputs(new FluidStack(solderUEV, 2304)) .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemExtremeStorageCell.Singularity", 1)) - .specialValue(1).duration(10 * SECONDS).eut(TierEU.RECIPE_UHV) + .metadata(IGRecipeMaps.MODULE_TIER, 1).duration(10 * SECONDS).eut(TierEU.RECIPE_UHV) .addTo(IGRecipeMaps.spaceAssemblerRecipes); } @@ -384,8 +386,9 @@ public void run() { MaterialsUEVplus.MagMatter.getNanite(4), MaterialsUEVplus.Eternity.getNanite(4)) .fluidInputs(MaterialsUEVplus.Eternity.getMolten(36864)) - .itemOutputs(getModItem(AE2FluidCraft.ID, "fluid_storage.Universe", 1)).specialValue(3) - .duration(1 * MINUTES).eut(TierEU.RECIPE_UXV).addTo(IGRecipeMaps.spaceAssemblerRecipes); + .itemOutputs(getModItem(AE2FluidCraft.ID, "fluid_storage.Universe", 1)) + .metadata(IGRecipeMaps.MODULE_TIER, 3).duration(1 * MINUTES).eut(TierEU.RECIPE_UXV) + .addTo(IGRecipeMaps.spaceAssemblerRecipes); // ME Fluid Digital Singularity Storage Cell GTValues.RA.stdBuilder() @@ -398,8 +401,9 @@ public void run() { getModItem(Avaritia.ID, "Resource", 4, 5), GTOreDictUnificator.get(OrePrefixes.block, Materials.CosmicNeutronium, 12L)) .fluidInputs(new FluidStack(solderUEV, 2304)) - .itemOutputs(getModItem(AE2FluidCraft.ID, "fluid_storage.singularity", 1, 0)).specialValue(1) - .duration(10 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(IGRecipeMaps.spaceAssemblerRecipes); + .itemOutputs(getModItem(AE2FluidCraft.ID, "fluid_storage.singularity", 1, 0)) + .metadata(IGRecipeMaps.MODULE_TIER, 1).duration(10 * SECONDS).eut(TierEU.RECIPE_UHV) + .addTo(IGRecipeMaps.spaceAssemblerRecipes); // ME Essentia Digital Singularity Storage Cell if (ThaumicEnergistics.isModLoaded()) { @@ -412,8 +416,9 @@ public void run() { getModItem(Avaritia.ID, "Resource", 4, 5), GTOreDictUnificator.get(OrePrefixes.block, Materials.CosmicNeutronium, 12L)) .fluidInputs(new FluidStack(solderUEV, 2304)) - .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 10)).specialValue(1) - .duration(10 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(IGRecipeMaps.spaceAssemblerRecipes); + .itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 10)) + .metadata(IGRecipeMaps.MODULE_TIER, 1).duration(10 * SECONDS).eut(TierEU.RECIPE_UHV) + .addTo(IGRecipeMaps.spaceAssemblerRecipes); } } } From d8e8c78f4ab201a39777b12a094aaaad946bead5 Mon Sep 17 00:00:00 2001 From: Yannick Marcotte-Gourde Date: Mon, 13 Jan 2025 01:05:47 -0500 Subject: [PATCH 02/34] Streamline smeltery melting recipes (#1159) --- .../dreammaster/scripts/ScriptCoreMod.java | 449 +---- .../scripts/ScriptTinkersConstruct.java | 1598 +++-------------- .../tinkersConstruct/MeltingRecipeAdder.java | 52 + .../tinkersConstruct/TConstructHelper.java | 6 + 4 files changed, 381 insertions(+), 1724 deletions(-) create mode 100644 src/main/java/com/dreammaster/tinkersConstruct/MeltingRecipeAdder.java diff --git a/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java b/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java index d3bbdec45..70cd57107 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java +++ b/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java @@ -41,6 +41,7 @@ import java.util.Arrays; import java.util.List; +import java.util.stream.Stream; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; @@ -50,6 +51,7 @@ import com.dreammaster.item.CustomPatterns; import com.dreammaster.item.NHItemList; import com.dreammaster.main.NHItems; +import com.dreammaster.tinkersConstruct.TConstructHelper; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.recipes.RecipeManagers; @@ -63,7 +65,6 @@ import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTUtility; import tconstruct.library.TConstructRegistry; -import tconstruct.library.crafting.Smeltery; public class ScriptCoreMod implements IScriptLoader { @@ -584,385 +585,73 @@ public void loadRecipes() { GTModHandler .addSmeltingRecipe(CustomItemList.UnfiredCokeOvenBrick.get(1L), CustomItemList.CokeOvenBrick.get(1L)); - - Smeltery.addMelting( - NHItemList.ShapeBolt.getIS(), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapeHoeHead.getIS(), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapeGear.getIS(), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapePlate.getIS(), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormAnvil.getIS(), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormPlate.getIS(), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormLeggings.getIS(), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormBaguette.getIS(), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormGear.getIS(), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormRotor.getIS(), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapeBottle.getIS(), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapeRotor.getIS(), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapeTurbineBlade.getIS(), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapeSmallGear.getIS(), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormBoots.getIS(), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapeLargePipe.getIS(), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormSmallGear.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormCasing.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapeWire.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormChestplate.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapeShovelHead.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormBread.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapeIngot.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormIngot.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapeFileHead.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapeRod.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapeHugePipe.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapeSwordBlade.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapeRing.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapeCasing.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormNuggets.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapeSmallPipe.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormName.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapeHammerHead.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapeTinyPipe.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormCylinder.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormBottle.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapeAxeHead.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapeSawBlade.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormBlock.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapeCell.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormArrowHead.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapeBoat.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormCoinage.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormBall.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapeBlock.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormHelmet.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapePickaxeHead.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormBuns.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.ShapeNormalPipe.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - CustomItemList.MarshmallowFormMold.get(1L), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormStick.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormStickLong.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormScrew.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormRing.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormBolt.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormRound.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormTurbineBlade.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormPipeTiny.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormPipeSmall.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormPipeMedium.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormPipeLarge.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - NHItemList.MoldFormPipeHuge.getIS(1), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); + TConstructHelper + .getMeltingAdder(GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, "aluminumbrass.molten", 72) + .add( + Stream.of( + NHItemList.ShapeBolt, + NHItemList.ShapeHoeHead, + NHItemList.ShapeGear, + NHItemList.ShapePlate, + NHItemList.MoldFormAnvil, + NHItemList.MoldFormPlate, + NHItemList.MoldFormLeggings, + NHItemList.MoldFormBaguette, + NHItemList.MoldFormGear, + NHItemList.MoldFormRotor, + NHItemList.ShapeBottle, + NHItemList.ShapeRotor, + NHItemList.ShapeTurbineBlade, + NHItemList.ShapeSmallGear, + NHItemList.MoldFormBoots, + NHItemList.ShapeLargePipe, + NHItemList.MoldFormSmallGear, + NHItemList.MoldFormCasing, + NHItemList.ShapeWire, + NHItemList.MoldFormChestplate, + NHItemList.ShapeShovelHead, + NHItemList.MoldFormBread, + NHItemList.ShapeIngot, + NHItemList.MoldFormIngot, + NHItemList.ShapeFileHead, + NHItemList.ShapeRod, + NHItemList.ShapeHugePipe, + NHItemList.ShapeSwordBlade, + NHItemList.ShapeRing, + NHItemList.ShapeCasing, + NHItemList.MoldFormNuggets, + NHItemList.ShapeSmallPipe, + NHItemList.MoldFormName, + NHItemList.ShapeHammerHead, + NHItemList.ShapeTinyPipe, + NHItemList.MoldFormCylinder, + NHItemList.MoldFormBottle, + NHItemList.ShapeAxeHead, + NHItemList.ShapeSawBlade, + NHItemList.MoldFormBlock, + NHItemList.ShapeCell, + NHItemList.MoldFormArrowHead, + NHItemList.ShapeBoat, + NHItemList.MoldFormCoinage, + NHItemList.MoldFormBall, + NHItemList.ShapeBlock, + NHItemList.MoldFormHelmet, + NHItemList.ShapePickaxeHead, + NHItemList.MoldFormBuns, + NHItemList.ShapeNormalPipe, + NHItemList.MoldFormStick, + NHItemList.MoldFormStickLong, + NHItemList.MoldFormScrew, + NHItemList.MoldFormRing, + NHItemList.MoldFormBolt, + NHItemList.MoldFormRound, + NHItemList.MoldFormTurbineBlade, + NHItemList.MoldFormPipeTiny, + NHItemList.MoldFormPipeSmall, + NHItemList.MoldFormPipeMedium, + NHItemList.MoldFormPipeLarge, + NHItemList.MoldFormPipeHuge).map(NHItemList::getIS)) + .add(CustomItemList.MarshmallowFormMold.get(1L)); GTValues.RA.stdBuilder().itemInputs(getModItem(Railcraft.ID, "machine.alpha", 1, 7, missing)) .itemOutputs(CustomItemList.CokeOvenBrick.get(4L)).duration(15 * SECONDS).eut(2) diff --git a/src/main/java/com/dreammaster/scripts/ScriptTinkersConstruct.java b/src/main/java/com/dreammaster/scripts/ScriptTinkersConstruct.java index 824f4461c..2c6dfad02 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptTinkersConstruct.java +++ b/src/main/java/com/dreammaster/scripts/ScriptTinkersConstruct.java @@ -1958,1404 +1958,322 @@ public void loadRecipes() { TConstructHelper.removeMeltingRecipe(getModItem(ExtraUtilities.ID, "cobblestone_compressed", 1, 14, missing)); TConstructHelper.removeMeltingRecipe(getModItem(ExtraUtilities.ID, "cobblestone_compressed", 1, 15, missing)); TConstructHelper.removeBasinRecipe(getModItem(IndustrialCraft2.ID, "blockMetal", 1, 5, missing)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1L), - GameRegistry.findBlock("gregtech", "gt.blockmachines"), - 1585, - 500, - FluidRegistry.getFluidStack("aluminum.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Aluminium, 1), - GameRegistry.findBlock("gregtech", "gt.blockmachines"), - 1585, - 500, - FluidRegistry.getFluidStack("aluminum.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Aluminium, 1L), - GameRegistry.findBlock("gregtech", "gt.blockmachines"), - 1585, - 500, - FluidRegistry.getFluidStack("aluminum.molten", 16)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Aluminium, 1L), - GameRegistry.findBlock("gregtech", "gt.blockmachines"), - 1585, - 500, - FluidRegistry.getFluidStack("aluminum.molten", 36)); + TConstructHelper + .getMeltingAdder( + GameRegistry.findBlock("gregtech", "gt.blockmachines"), + 1585, + 500, + "aluminum.molten", + 144) + .add( + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1L), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Aluminium, 1)) + .withAmount(16) + .add( + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Aluminium, 1L), + getModItem(TinkerConstruct.ID, "oreBerries", 1, 4, missing)) + .withAmount(36).add(GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Aluminium, 1L)); Smeltery.addMelting( GTOreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 1L), GameRegistry.findBlock("minecraft", "sand"), - 0, - 800, - FluidRegistry.getFluidStack("glass.molten", 1000)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "oreBerries", 1, 4, missing), - GameRegistry.findBlock("gregtech", "gt.blockmachines"), - 1585, - 500, - FluidRegistry.getFluidStack("aluminum.molten", 16)); - TConstructRegistry.getTableCasting().addCastingRecipe( - GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Copper, 1L), - FluidRegistry.getFluidStack("copper.molten", 16), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 27, missing), - false, - 20); - TConstructRegistry.getTableCasting().addCastingRecipe( - GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Tin, 1L), - FluidRegistry.getFluidStack("tin.molten", 16), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 27, missing), - false, - 20); - TConstructRegistry.getTableCasting().addCastingRecipe( - GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 1), - FluidRegistry.getFluidStack("iron.molten", 16), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 27, missing), - false, - 20); - TConstructRegistry.getTableCasting().addCastingRecipe( - GTOreDictUnificator.get(OrePrefixes.nugget, Materials.AnyBronze, 1L), - FluidRegistry.getFluidStack("bronze.molten", 16), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 27, missing), - false, - 20); - TConstructRegistry.getTableCasting().addCastingRecipe( - GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L), - FluidRegistry.getFluidStack("copper.molten", 144), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 0, missing), - false, - 100); - TConstructRegistry.getTableCasting().addCastingRecipe( - GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L), - FluidRegistry.getFluidStack("tin.molten", 144), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 0, missing), - false, - 100); - TConstructRegistry.getTableCasting().addCastingRecipe( - GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), - FluidRegistry.getFluidStack("bronze.molten", 144), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 0, missing), - false, - 100); - TConstructRegistry.getTableCasting().addCastingRecipe( - getModItem(TinkerConstruct.ID, "materials", 1, 14, missing), - FluidRegistry.getFluidStack("aluminumbrass.molten", 144), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 0, missing), - false, - 100); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 0, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 1, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 2, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 3, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 4, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 5, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 6, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 7, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 8, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 9, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 10, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 11, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 12, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 13, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 14, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 15, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 16, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 17, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 18, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 19, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 20, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 21, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 22, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 25, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 26, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 27, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "Cast", 1, 0, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "Cast", 1, 1, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "Cast", 1, 2, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - getModItem(TinkerConstruct.ID, "Cast", 1, 3, missing), - GameRegistry.findBlock("TConstruct", "MetalBlock"), - 7, - 500, - FluidRegistry.getFluidStack("aluminumbrass.molten", 72)); - Smeltery.addMelting( - new ItemStack(GregTechAPI.sBlockOres1, 1, 32), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Iron, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Iron, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Iron, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.AnyIron, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Iron, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.ore, Materials.BrownLimonite, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.BrownLimonite, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.BrownLimonite, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.BrownLimonite, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.BrownLimonite, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.BrownLimonite, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.ore, Materials.YellowLimonite, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.YellowLimonite, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.YellowLimonite, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.YellowLimonite, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.YellowLimonite, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.YellowLimonite, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.ore, Materials.BandedIron, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.BandedIron, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.BandedIron, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.BandedIron, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.BandedIron, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.BandedIron, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.ore, Materials.GraniticMineralSand, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.GraniticMineralSand, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.GraniticMineralSand, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.GraniticMineralSand, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.GraniticMineralSand, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.GraniticMineralSand, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.ore, Materials.Magnetite, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Magnetite, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Magnetite, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - new ItemStack(GregTechAPI.sBlockOres1, 1, 28706), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Magnetite, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Magnetite, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.ore, Materials.Pyrite, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Pyrite, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Pyrite, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Pyrite, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Pyrite, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Pyrite, 1L), - GameRegistry.findBlock("minecraft", "iron_ore"), - 0, - 700, - FluidRegistry.getFluidStack("iron.molten", 144)); - Smeltery.addMelting( - new ItemStack(GregTechAPI.sBlockOres1, 1, 35), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 3, - 600, - FluidRegistry.getFluidStack("copper.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Copper, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 3, - 600, - FluidRegistry.getFluidStack("copper.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Copper, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 3, - 600, - FluidRegistry.getFluidStack("copper.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Copper, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 3, - 600, - FluidRegistry.getFluidStack("copper.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Copper, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 3, - 600, - FluidRegistry.getFluidStack("copper.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Copper, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 3, - 600, - FluidRegistry.getFluidStack("copper.molten", 144)); - Smeltery.addMelting( - new ItemStack(GregTechAPI.sBlockOres1, 1, 871), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 3, - 600, - FluidRegistry.getFluidStack("copper.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Malachite, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 3, - 600, - FluidRegistry.getFluidStack("copper.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Malachite, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 3, - 600, - FluidRegistry.getFluidStack("copper.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Malachite, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 3, - 600, - FluidRegistry.getFluidStack("copper.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Malachite, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 3, - 600, - FluidRegistry.getFluidStack("copper.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Malachite, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 3, - 600, - FluidRegistry.getFluidStack("copper.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.ore, Materials.Tetrahedrite, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 3, - 600, - FluidRegistry.getFluidStack("copper.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Tetrahedrite, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 3, - 600, - FluidRegistry.getFluidStack("copper.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Tetrahedrite, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 3, - 600, - FluidRegistry.getFluidStack("copper.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Tetrahedrite, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 3, - 600, - FluidRegistry.getFluidStack("copper.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Tetrahedrite, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 3, - 600, - FluidRegistry.getFluidStack("copper.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Tetrahedrite, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 3, - 600, - FluidRegistry.getFluidStack("copper.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.ore, Materials.Chalcopyrite, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 3, - 600, - FluidRegistry.getFluidStack("copper.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Chalcopyrite, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 3, - 600, - FluidRegistry.getFluidStack("copper.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Chalcopyrite, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 3, - 600, - FluidRegistry.getFluidStack("copper.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Chalcopyrite, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 3, - 600, - FluidRegistry.getFluidStack("copper.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Chalcopyrite, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 3, - 600, - FluidRegistry.getFluidStack("copper.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Chalcopyrite, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 3, - 600, - FluidRegistry.getFluidStack("copper.molten", 144)); - Smeltery.addMelting( - new ItemStack(GregTechAPI.sBlockOres1, 1, 57), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 4, - 400, - FluidRegistry.getFluidStack("tin.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Tin, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 4, - 400, - FluidRegistry.getFluidStack("tin.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Tin, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 4, - 400, - FluidRegistry.getFluidStack("tin.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Tin, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 4, - 400, - FluidRegistry.getFluidStack("tin.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Tin, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 4, - 400, - FluidRegistry.getFluidStack("tin.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Tin, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 4, - 400, - FluidRegistry.getFluidStack("tin.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.ore, Materials.Cassiterite, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 4, - 600, - FluidRegistry.getFluidStack("tin.molten", 288)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Cassiterite, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 4, - 600, - FluidRegistry.getFluidStack("tin.molten", 288)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Cassiterite, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 4, - 600, - FluidRegistry.getFluidStack("tin.molten", 288)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Cassiterite, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 4, - 600, - FluidRegistry.getFluidStack("tin.molten", 288)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Cassiterite, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 4, - 600, - FluidRegistry.getFluidStack("tin.molten", 288)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Cassiterite, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 4, - 400, - FluidRegistry.getFluidStack("tin.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.ore, Materials.CassiteriteSand, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 4, - 600, - FluidRegistry.getFluidStack("tin.molten", 288)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.CassiteriteSand, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 4, - 600, - FluidRegistry.getFluidStack("tin.molten", 288)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.CassiteriteSand, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 4, - 600, - FluidRegistry.getFluidStack("tin.molten", 288)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.CassiteriteSand, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 4, - 600, - FluidRegistry.getFluidStack("tin.molten", 288)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.CassiteriteSand, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 4, - 600, - FluidRegistry.getFluidStack("tin.molten", 288)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.CassiteriteSand, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 4, - 600, - FluidRegistry.getFluidStack("tin.molten", 288)); - Smeltery.addMelting( - new ItemStack(GregTechAPI.sBlockOres1, 1, 86), - GameRegistry.findBlock("minecraft", "gold_ore"), - 0, - 600, - FluidRegistry.getFluidStack("gold.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Gold, 1L), - GameRegistry.findBlock("minecraft", "gold_ore"), - 0, - 600, - FluidRegistry.getFluidStack("gold.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Gold, 1L), - GameRegistry.findBlock("minecraft", "gold_ore"), - 0, - 600, - FluidRegistry.getFluidStack("gold.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Gold, 1L), - GameRegistry.findBlock("minecraft", "gold_ore"), - 0, - 600, - FluidRegistry.getFluidStack("gold.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Gold, 1L), - GameRegistry.findBlock("minecraft", "gold_ore"), - 0, - 600, - FluidRegistry.getFluidStack("gold.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Gold, 1L), - GameRegistry.findBlock("minecraft", "gold_ore"), - 0, - 600, - FluidRegistry.getFluidStack("gold.molten", 144)); - Smeltery.addMelting( - new ItemStack(GregTechAPI.sBlockOres1, 1, 19), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 5, - 400, - FluidRegistry.getFluidStack("aluminum.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Aluminium, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 5, - 400, - FluidRegistry.getFluidStack("aluminum.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Aluminium, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 5, - 400, - FluidRegistry.getFluidStack("aluminum.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Aluminium, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 5, - 400, - FluidRegistry.getFluidStack("aluminum.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Aluminium, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 5, - 400, - FluidRegistry.getFluidStack("aluminum.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Aluminium, 1L), - GameRegistry.findBlock("TConstruct", "SearedBrick"), - 5, - 400, - FluidRegistry.getFluidStack("aluminum.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.ore, Materials.Nickel, 1L), - GameRegistry.findBlock("gregtech", "gt.blockores"), - 34, - 400, - FluidRegistry.getFluidStack("nickel.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Nickel, 1L), - GameRegistry.findBlock("gregtech", "gt.blockores"), - 34, - 400, - FluidRegistry.getFluidStack("nickel.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Nickel, 1L), - GameRegistry.findBlock("gregtech", "gt.blockores"), - 34, - 400, - FluidRegistry.getFluidStack("nickel.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Nickel, 1L), - GameRegistry.findBlock("gregtech", "gt.blockores"), - 34, - 400, - FluidRegistry.getFluidStack("nickel.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Nickel, 1L), - GameRegistry.findBlock("gregtech", "gt.blockores"), - 34, - 400, - FluidRegistry.getFluidStack("nickel.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Nickel, 1L), - GameRegistry.findBlock("gregtech", "gt.blockores"), - 34, - 400, - FluidRegistry.getFluidStack("nickel.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.ore, Materials.Silver, 1L), - GameRegistry.findBlock("gregtech", "gt.blockores"), - 54, - 500, - FluidRegistry.getFluidStack("silver.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Silver, 1L), - GameRegistry.findBlock("gregtech", "gt.blockores"), - 54, - 500, - FluidRegistry.getFluidStack("silver.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Silver, 1L), - GameRegistry.findBlock("gregtech", "gt.blockores"), - 54, - 500, - FluidRegistry.getFluidStack("silver.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Silver, 1L), - GameRegistry.findBlock("gregtech", "gt.blockores"), - 54, - 500, - FluidRegistry.getFluidStack("silver.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Silver, 1L), - GameRegistry.findBlock("gregtech", "gt.blockores"), - 54, - 500, - FluidRegistry.getFluidStack("silver.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Silver, 1L), - GameRegistry.findBlock("gregtech", "gt.blockores"), - 54, - 500, - FluidRegistry.getFluidStack("silver.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.ore, Materials.Platinum, 1L), - GameRegistry.findBlock("gregtech", "gt.blockores"), - 85, - 800, - FluidRegistry.getFluidStack("platinum.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Platinum, 1L), - GameRegistry.findBlock("gregtech", "gt.blockores"), - 85, - 800, - FluidRegistry.getFluidStack("platinum.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Platinum, 1L), - GameRegistry.findBlock("gregtech", "gt.blockores"), - 85, - 800, - FluidRegistry.getFluidStack("platinum.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Platinum, 1L), - GameRegistry.findBlock("gregtech", "gt.blockores"), - 85, - 800, - FluidRegistry.getFluidStack("platinum.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Platinum, 1L), - GameRegistry.findBlock("gregtech", "gt.blockores"), - 85, - 800, - FluidRegistry.getFluidStack("platinum.molten", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Platinum, 1L), - GameRegistry.findBlock("gregtech", "gt.blockores"), - 85, - 800, - FluidRegistry.getFluidStack("platinum.molten", 144)); - Smeltery.addMelting( - new ItemStack(GregTechAPI.sBlockOres1, 1, 501), - GameRegistry.findBlock("minecraft", "emerald_ore"), - 0, - 800, - FluidRegistry.getFluidStack("emerald.liquid", 640)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Emerald, 1L), - GameRegistry.findBlock("minecraft", "emerald_ore"), - 0, - 800, - FluidRegistry.getFluidStack("emerald.liquid", 640)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Emerald, 1L), - GameRegistry.findBlock("minecraft", "emerald_ore"), - 0, - 800, - FluidRegistry.getFluidStack("emerald.liquid", 640)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Emerald, 1L), - GameRegistry.findBlock("minecraft", "emerald_ore"), - 0, - 800, - FluidRegistry.getFluidStack("emerald.liquid", 640)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Emerald, 1L), - GameRegistry.findBlock("minecraft", "emerald_ore"), - 0, - 800, - FluidRegistry.getFluidStack("emerald.liquid", 640)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Emerald, 1L), - GameRegistry.findBlock("minecraft", "emerald_ore"), - 0, - 800, - FluidRegistry.getFluidStack("emerald.liquid", 640)); - Smeltery.addMelting( - ItemList.Shape_Empty.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, + 0, 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( + FluidRegistry.getFluidStack("glass.molten", 1000)); + TConstructRegistry.getTableCasting().addCastingRecipe( + GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Copper, 1L), + FluidRegistry.getFluidStack("copper.molten", 16), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 27, missing), + false, + 20); + TConstructRegistry.getTableCasting().addCastingRecipe( + GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Tin, 1L), + FluidRegistry.getFluidStack("tin.molten", 16), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 27, missing), + false, + 20); + TConstructRegistry.getTableCasting().addCastingRecipe( + GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 1), + FluidRegistry.getFluidStack("iron.molten", 16), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 27, missing), + false, + 20); + TConstructRegistry.getTableCasting().addCastingRecipe( + GTOreDictUnificator.get(OrePrefixes.nugget, Materials.AnyBronze, 1L), + FluidRegistry.getFluidStack("bronze.molten", 16), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 27, missing), + false, + 20); + TConstructRegistry.getTableCasting().addCastingRecipe( + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L), + FluidRegistry.getFluidStack("copper.molten", 144), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 0, missing), + false, + 100); + TConstructRegistry.getTableCasting().addCastingRecipe( + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L), + FluidRegistry.getFluidStack("tin.molten", 144), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 0, missing), + false, + 100); + TConstructRegistry.getTableCasting().addCastingRecipe( + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), + FluidRegistry.getFluidStack("bronze.molten", 144), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 0, missing), + false, + 100); + TConstructRegistry.getTableCasting().addCastingRecipe( + getModItem(TinkerConstruct.ID, "materials", 1, 14, missing), + FluidRegistry.getFluidStack("aluminumbrass.molten", 144), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 0, missing), + false, + 100); + TConstructHelper + .getMeltingAdder(GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, "aluminumbrass.molten", 72) + .add( + getModItem(TinkerConstruct.ID, "metalPattern", 1, 0, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 1, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 2, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 3, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 4, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 5, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 6, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 7, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 8, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 9, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 10, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 11, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 12, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 13, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 14, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 15, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 16, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 17, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 18, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 19, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 20, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 21, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 22, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 25, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 26, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 27, missing), + getModItem(TinkerConstruct.ID, "Cast", 1, 0, missing), + getModItem(TinkerConstruct.ID, "Cast", 1, 1, missing), + getModItem(TinkerConstruct.ID, "Cast", 1, 2, missing), + getModItem(TinkerConstruct.ID, "Cast", 1, 3, missing)); + TConstructHelper.getMeltingAdder(GameRegistry.findBlock("minecraft", "iron_ore"), 0, 700, "iron.molten", 144) + .add( + new ItemStack(GregTechAPI.sBlockOres1, 1, 32), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Iron, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Iron, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Iron, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.AnyIron, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Iron, 1L), + GTOreDictUnificator.get(OrePrefixes.ore, Materials.BrownLimonite, 1L), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.BrownLimonite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.BrownLimonite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.BrownLimonite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.BrownLimonite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.BrownLimonite, 1L), + GTOreDictUnificator.get(OrePrefixes.ore, Materials.YellowLimonite, 1L), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.YellowLimonite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.YellowLimonite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.YellowLimonite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.YellowLimonite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.YellowLimonite, 1L), + GTOreDictUnificator.get(OrePrefixes.ore, Materials.BandedIron, 1L), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.BandedIron, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.BandedIron, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.BandedIron, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.BandedIron, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.BandedIron, 1L), + GTOreDictUnificator.get(OrePrefixes.ore, Materials.GraniticMineralSand, 1L), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.GraniticMineralSand, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.GraniticMineralSand, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.GraniticMineralSand, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.GraniticMineralSand, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.GraniticMineralSand, 1L), + GTOreDictUnificator.get(OrePrefixes.ore, Materials.Magnetite, 1L), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Magnetite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Magnetite, 1L), + new ItemStack(GregTechAPI.sBlockOres1, 1, 28706), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Magnetite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Magnetite, 1L), + GTOreDictUnificator.get(OrePrefixes.ore, Materials.Pyrite, 1L), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Pyrite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Pyrite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Pyrite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Pyrite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Pyrite, 1L)); + TConstructHelper + .getMeltingAdder(GameRegistry.findBlock("TConstruct", "SearedBrick"), 3, 600, "copper.molten", 144).add( + new ItemStack(GregTechAPI.sBlockOres1, 1, 35), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Copper, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Copper, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Copper, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Copper, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Copper, 1L), + new ItemStack(GregTechAPI.sBlockOres1, 1, 871), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Malachite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Malachite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Malachite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Malachite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Malachite, 1L), + GTOreDictUnificator.get(OrePrefixes.ore, Materials.Tetrahedrite, 1L), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Tetrahedrite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Tetrahedrite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Tetrahedrite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Tetrahedrite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Tetrahedrite, 1L), + GTOreDictUnificator.get(OrePrefixes.ore, Materials.Chalcopyrite, 1L), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Chalcopyrite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Chalcopyrite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Chalcopyrite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Chalcopyrite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Chalcopyrite, 1L)); + TConstructHelper.getMeltingAdder(GameRegistry.findBlock("TConstruct", "SearedBrick"), 4, 400, "tin.molten", 144) + .add( + new ItemStack(GregTechAPI.sBlockOres1, 1, 57), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Tin, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Tin, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Tin, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Tin, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Tin, 1L)); + TConstructHelper.getMeltingAdder(GameRegistry.findBlock("TConstruct", "SearedBrick"), 4, 600, "tin.molten", 288) + .add( + GTOreDictUnificator.get(OrePrefixes.ore, Materials.Cassiterite, 1L), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Cassiterite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Cassiterite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Cassiterite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Cassiterite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Cassiterite, 1L), + GTOreDictUnificator.get(OrePrefixes.ore, Materials.CassiteriteSand, 1L), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.CassiteriteSand, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.CassiteriteSand, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.CassiteriteSand, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.CassiteriteSand, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.CassiteriteSand, 1L)); + TConstructHelper.getMeltingAdder(GameRegistry.findBlock("minecraft", "gold_ore"), 0, 600, "gold.molten", 144) + .add( + new ItemStack(GregTechAPI.sBlockOres1, 1, 86), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Gold, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Gold, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Gold, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Gold, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Gold, 1L)); + TConstructHelper + .getMeltingAdder(GameRegistry.findBlock("TConstruct", "SearedBrick"), 5, 400, "aluminum.molten", 144) + .add( + new ItemStack(GregTechAPI.sBlockOres1, 1, 19), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Aluminium, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Aluminium, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Aluminium, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Aluminium, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Aluminium, 1L)); + TConstructHelper + .getMeltingAdder(GameRegistry.findBlock("gregtech", "gt.blockores"), 34, 400, "nickel.molten", 144).add( + GTOreDictUnificator.get(OrePrefixes.ore, Materials.Nickel, 1L), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Nickel, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Nickel, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Nickel, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Nickel, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Nickel, 1L)); + TConstructHelper + .getMeltingAdder(GameRegistry.findBlock("gregtech", "gt.blockores"), 54, 500, "silver.molten", 144).add( + GTOreDictUnificator.get(OrePrefixes.ore, Materials.Silver, 1L), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Silver, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Silver, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Silver, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Silver, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Silver, 1L)); + TConstructHelper + .getMeltingAdder(GameRegistry.findBlock("gregtech", "gt.blockores"), 85, 800, "platinum.molten", 144) + .add( + GTOreDictUnificator.get(OrePrefixes.ore, Materials.Platinum, 1L), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Platinum, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Platinum, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Platinum, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Platinum, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Platinum, 1L)); + TConstructHelper + .getMeltingAdder(GameRegistry.findBlock("minecraft", "emerald_ore"), 0, 800, "emerald.liquid", 640).add( + new ItemStack(GregTechAPI.sBlockOres1, 1, 501), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Emerald, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Emerald, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Emerald, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Emerald, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Emerald, 1L)); + TConstructHelper.getMeltingAdder(GameRegistry.findBlock("IC2", "blockMetal"), 5, 800, "steel.molten", 576).add( + ItemList.Shape_Empty.get(1L), ItemList.Shape_Mold_Plate.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Casing.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Gear.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Credit.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Bottle.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Ingot.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Ball.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Block.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Nugget.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Bun.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Bread.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Baguette.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Cylinder.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Anvil.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Name.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Arrow.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Gear_Small.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Rod.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Bolt.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Round.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Screw.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Ring.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Rod_Long.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Rotor.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Turbine_Blade.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Pipe_Tiny.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Pipe_Small.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Pipe_Medium.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Pipe_Large.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Mold_Pipe_Huge.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Plate.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Rod.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Bolt.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Ring.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Cell.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Ingot.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Wire.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Casing.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Pipe_Tiny.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Pipe_Small.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Pipe_Medium.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Pipe_Large.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Pipe_Huge.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Block.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Sword.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Pickaxe.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Shovel.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Axe.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Hoe.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Hammer.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_File.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Saw.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Gear.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Bottle.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Rotor.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Small_Gear.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( ItemList.Shape_Extruder_Turbine_Blade.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( NHItemList.ExtruderShapeBoat.getIS(1), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( CustomItemList.MarshmallowForm.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( CustomItemList.MoldChestplate.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( CustomItemList.MoldHelmet.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( CustomItemList.MoldLeggings.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( - CustomItemList.MoldBoots.get(1L), - GameRegistry.findBlock("IC2", "blockMetal"), - 5, - 800, - FluidRegistry.getFluidStack("steel.molten", 576)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Rubber, 1L), - GameRegistry.findBlock("TConstruct", "GlueBlock"), - 0, - 250, - FluidRegistry.getFluidStack("glue", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1L), - GameRegistry.findBlock("TConstruct", "GlueBlock"), - 0, - 300, - FluidRegistry.getFluidStack("glue", 144)); - Smeltery.addMelting( - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Rubber, 1L), - GameRegistry.findBlock("TConstruct", "GlueBlock"), - 0, - 350, - FluidRegistry.getFluidStack("glue", 144)); - Smeltery.addMelting( - getModItem(ElectroMagicTools.ID, "EMTItems", 1, 10, missing), - GameRegistry.findBlock("TConstruct", "GlueBlock"), - 0, - 400, - FluidRegistry.getFluidStack("glue", 576)); - Smeltery.addMelting( - getModItem(ElectroMagicTools.ID, "EMTItems", 1, 8, missing), - GameRegistry.findBlock("TConstruct", "GlueBlock"), - 0, - 200, - FluidRegistry.getFluidStack("glue", 288)); + CustomItemList.MoldBoots.get(1L)); + TConstructHelper.getMeltingAdder(GameRegistry.findBlock("TConstruct", "GlueBlock"), 0, 250, "glue", 144) + .add( + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Rubber, 1L), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1L), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Rubber, 1L)) + .withAmount(576).add(getModItem(ElectroMagicTools.ID, "EMTItems", 1, 10, missing)).withAmount(288) + .add(getModItem(ElectroMagicTools.ID, "EMTItems", 1, 8, missing)); Smeltery.addMelting( GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Cobalt, 1L), GameRegistry.findBlock("TConstruct", "GravelOre"), @@ -3392,18 +2310,10 @@ public void loadRecipes() { getModItem(Minecraft.ID, "cobblestone", 1, 0, missing), false, 245); - Smeltery.addMelting( - getModItem(Thaumcraft.ID, "blockCosmeticSolid", 1, 0, missing), - GameRegistry.findBlock("minecraft", "obsidian"), - 0, - 850, - FluidRegistry.getFluidStack("obsidian.molten", 288)); - Smeltery.addMelting( - getModItem(Thaumcraft.ID, "blockCosmeticSolid", 1, 1, missing), - GameRegistry.findBlock("minecraft", "obsidian"), - 0, - 850, - FluidRegistry.getFluidStack("obsidian.molten", 288)); + TConstructHelper + .getMeltingAdder(GameRegistry.findBlock("minecraft", "obsidian"), 0, 850, "obsidian.molten", 288).add( + getModItem(Thaumcraft.ID, "blockCosmeticSolid", 1, 0, missing), + getModItem(Thaumcraft.ID, "blockCosmeticSolid", 1, 1, missing)); TConstructRegistry.getBasinCasting().addCastingRecipe( getModItem(TinkerConstruct.ID, "MetalBlock", 1, 10, missing), FluidRegistry.getFluidStack("ender", 2250), diff --git a/src/main/java/com/dreammaster/tinkersConstruct/MeltingRecipeAdder.java b/src/main/java/com/dreammaster/tinkersConstruct/MeltingRecipeAdder.java new file mode 100644 index 000000000..6a795b828 --- /dev/null +++ b/src/main/java/com/dreammaster/tinkersConstruct/MeltingRecipeAdder.java @@ -0,0 +1,52 @@ +package com.dreammaster.tinkersConstruct; + +import java.util.Arrays; +import java.util.function.Consumer; +import java.util.stream.Stream; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; + +import tconstruct.library.crafting.Smeltery; + +public class MeltingRecipeAdder { + + private final Consumer addMelting; + private final Block renderBlock; + private final int renderBlockMeta; + private final int meltingTemperature; + private final String fluidName; + + MeltingRecipeAdder(Block renderBlock, int renderBlockMeta, int meltingTemperature, String fluidName, int amount) { + this.renderBlock = renderBlock; + this.renderBlockMeta = renderBlockMeta; + this.meltingTemperature = meltingTemperature; + this.fluidName = fluidName; + addMelting = itemStack -> Smeltery.addMelting( + itemStack, + renderBlock, + renderBlockMeta, + meltingTemperature, + FluidRegistry.getFluidStack(fluidName, amount)); + } + + public MeltingRecipeAdder withAmount(int newAmount) { + return new MeltingRecipeAdder(renderBlock, renderBlockMeta, meltingTemperature, fluidName, newAmount); + } + + public MeltingRecipeAdder add(ItemStack itemStack) { + addMelting.accept(itemStack); + return this; + } + + public MeltingRecipeAdder add(Stream itemStackStream) { + itemStackStream.forEach(addMelting); + return this; + } + + public MeltingRecipeAdder add(ItemStack... itemStacks) { + add(Arrays.stream(itemStacks)); + return this; + } +} diff --git a/src/main/java/com/dreammaster/tinkersConstruct/TConstructHelper.java b/src/main/java/com/dreammaster/tinkersConstruct/TConstructHelper.java index 08c8427b9..e7b5471c1 100644 --- a/src/main/java/com/dreammaster/tinkersConstruct/TConstructHelper.java +++ b/src/main/java/com/dreammaster/tinkersConstruct/TConstructHelper.java @@ -3,6 +3,7 @@ import java.lang.reflect.Field; import java.util.Map; +import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; @@ -35,6 +36,11 @@ public static void removeMeltingRecipe(ItemStack input) { Smeltery.getRenderIndex().remove(wrap); } + public static MeltingRecipeAdder getMeltingAdder(Block renderBlock, int renderBlockMeta, int meltingTemperature, + String fluidName, int amount) { + return new MeltingRecipeAdder(renderBlock, renderBlockMeta, meltingTemperature, fluidName, amount); + } + private static Map smelteryFuelList = null; @SuppressWarnings("unchecked") From f54574ddf97074d51b50b04905d87722a4c91480 Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Mon, 13 Jan 2025 14:19:29 +0100 Subject: [PATCH 03/34] More EFR recipe work (#1162) --- .../dreammaster/recipes/RecipeRemover.java | 7 ++++ .../com/dreammaster/scripts/ScriptEFR.java | 41 +++++++++++++++++++ .../scripts/ScriptExtraUtilities.java | 17 -------- 3 files changed, 48 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/dreammaster/recipes/RecipeRemover.java b/src/main/java/com/dreammaster/recipes/RecipeRemover.java index d05baedc3..e4913edc9 100644 --- a/src/main/java/com/dreammaster/recipes/RecipeRemover.java +++ b/src/main/java/com/dreammaster/recipes/RecipeRemover.java @@ -3257,6 +3257,13 @@ public static void run() { new Object[] { getModItem(Natura.ID, "barleyFood", 1, 6, missing), getModItem(Natura.ID, "barleyFood", 1, 6, missing) }, new Object[0]); + removeRecipeShapedDelayed( + getModItem(Minecraft.ID, "leather", 1, 0, missing), + new Object[] { getModItem(EtFuturumRequiem.ID, "rabbit_hide", 1, 0, missing), + getModItem(EtFuturumRequiem.ID, "rabbit_hide", 1, 0, missing) }, + new Object[] { getModItem(EtFuturumRequiem.ID, "rabbit_hide", 1, 0, missing), + getModItem(EtFuturumRequiem.ID, "rabbit_hide", 1, 0, missing) }, + new Object[0]); removeRecipeShapedDelayed(getModItem(OpenBlocks.ID, "paintBrush", 1, 0, missing)); removeRecipeShapedDelayed(getModItem(OpenBlocks.ID, "goldenEye", 1, wildcard, missing)); removeRecipeShapedDelayed(getModItem(Railcraft.ID, "cart.energy.batbox", 1, 0, missing)); diff --git a/src/main/java/com/dreammaster/scripts/ScriptEFR.java b/src/main/java/com/dreammaster/scripts/ScriptEFR.java index 0822740a5..8e5d34de0 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptEFR.java +++ b/src/main/java/com/dreammaster/scripts/ScriptEFR.java @@ -3,15 +3,23 @@ import static gregtech.api.enums.Mods.EtFuturumRequiem; import static gregtech.api.enums.Mods.ExtraUtilities; import static gregtech.api.enums.Mods.Minecraft; +import static gregtech.api.enums.Mods.PamsHarvestCraft; import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.util.GTModHandler.getModItem; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import java.util.Arrays; import java.util.List; import com.dreammaster.recipes.CustomItem; +import gregtech.api.enums.GTValues; +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; public class ScriptEFR implements IScriptLoader { @@ -65,5 +73,38 @@ public void loadRecipes() { createItemStack(Thaumcraft.ID, "blockWoodenDevice", 1, 8, "{color:" + i + "b}", missing), GTModHandler.getModItem(EtFuturumRequiem.ID, "banner", 1L, i)); } + + GTModHandler.addCraftingRecipe( + getModItem(EtFuturumRequiem.ID, "barrel", 1, 0, missing), + bits, + new Object[] { "hPs", "PCP", " P ", 'P', GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1L), + 'C', "chestWood" }); + GTValues.RA.stdBuilder() + .itemInputs( + getModItem(Minecraft.ID, "chest", 1L), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 2L)) + .itemOutputs(getModItem(EtFuturumRequiem.ID, "barrel", 1L)).duration(5 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); + + GTModHandler.addCraftingRecipe( + getModItem(EtFuturumRequiem.ID, "lantern", 1, 0, missing), + bits, + new Object[] { "IGI", "PCP", "III", 'I', "plateIron", 'G', "dustGlowstone", 'P', "paneGlassColorless", + 'C', getModItem(PamsHarvestCraft.ID, "pamcandleDeco1", 1, 0, missing) }); + + GTModHandler.addSmeltingRecipe( + getModItem(Minecraft.ID, "stone", 1, 0, missing), + getModItem(EtFuturumRequiem.ID, "smooth_stone", 1, 0, missing)); + + GTModHandler.addCraftingRecipe( + getModItem(EtFuturumRequiem.ID, "blast_furnace", 1, 0, missing), + bits, + new Object[] { "PPP", "PFP", "SSS", 'S', getModItem(EtFuturumRequiem.ID, "smooth_stone", 1, 0, missing), + 'F', getModItem(Minecraft.ID, "furnace", 1, 0, missing), 'P', "plateIron" }); + GTModHandler.addCraftingRecipe( + getModItem(Minecraft.ID, "leather", 1, 0, missing), + bits, + new Object[] { "SSS", "HHH", "SSS", 'S', getModItem(Minecraft.ID, "string", 1, 0, missing), 'H', + getModItem(EtFuturumRequiem.ID, "rabbit_hide", 1, 0, missing) }); } } diff --git a/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java b/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java index b0c9fecc8..359b02988 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java +++ b/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java @@ -688,17 +688,6 @@ public void loadRecipes() { addShapelessRecipe( getModItem(ExtraUtilities.ID, "unstableingot", 1, 0, missing), getModItem(ExtraUtilities.ID, "unstableingot", 1, 2, missing)); - addShapedRecipe( - getModItem(ExtraUtilities.ID, "chestFull", 1, 0, missing), - "craftingToolHardHammer", - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1L), - "craftingToolSaw", - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1L), - "chestWood", - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1L), - null, - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1L), - null); addShapedRecipe( getModItem(ExtraUtilities.ID, "chestMini", 1, 0, missing), "craftingToolHardHammer", @@ -1189,12 +1178,6 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 4L)) .itemOutputs(getModItem(ExtraUtilities.ID, "decorativeBlock2", 1, 11, missing)).duration(20 * SECONDS) .eut(30).addTo(assemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - getModItem(Minecraft.ID, "chest", 1, 0, missing), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 2L)) - .itemOutputs(getModItem(ExtraUtilities.ID, "chestFull", 1, 0, missing)).duration(5 * SECONDS).eut(30) - .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(Minecraft.ID, "flint", 1, 0, missing), From 6e0f67178f423073e15425fb1e2dbfbe5b226443 Mon Sep 17 00:00:00 2001 From: Maya <10861407+serenibyss@users.noreply.github.com> Date: Mon, 13 Jan 2025 06:30:37 -0700 Subject: [PATCH 04/34] Retier CRIB, proxy, adv stocking hatch (#1144) Co-authored-by: boubou19 --- .../gthandler/recipes/AssemblerRecipes.java | 6 -- .../recipes/AssemblingLineRecipes.java | 30 +------- .../recipes/SpaceAssemblerRecipes.java | 73 +++++++++++++++---- 3 files changed, 61 insertions(+), 48 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java index 9d5f11733..019941fb0 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java @@ -1716,12 +1716,6 @@ public void run() { .fluidInputs(Materials.Polybenzimidazole.getMolten(2304L)).duration(30 * SECONDS).eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); - // crafting input slave - GTValues.RA.stdBuilder() - .itemInputs(ItemList.Hatch_CraftingInput_Bus_ME_ItemOnly.get(1L), ItemList.Sensor_UV.get(1L)) - .itemOutputs(ItemList.Hatch_CraftingInput_Bus_Slave.get(1)).duration(10 * SECONDS) - .eut(TierEU.RECIPE_LuV).addTo(assemblerRecipes); - // Gear Box Casings GTValues.RA.stdBuilder() .itemInputs( diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java index 0d8d8fdfb..423c11a21 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java @@ -2,7 +2,6 @@ import static bartworks.system.material.WerkstoffLoader.Californium; import static gregtech.api.enums.GTValues.L; -import static gregtech.api.enums.Mods.AE2FluidCraft; import static gregtech.api.enums.Mods.AppliedEnergistics2; import static gregtech.api.enums.Mods.Avaritia; import static gregtech.api.enums.Mods.Computronics; @@ -15,7 +14,6 @@ import static gregtech.api.enums.Mods.SuperSolarPanels; import static gregtech.api.util.GTModHandler.getModItem; import static gregtech.api.util.GTRecipeBuilder.HOURS; -import static gregtech.api.util.GTRecipeBuilder.INGOTS; import static gregtech.api.util.GTRecipeBuilder.MINUTES; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.WILDCARD; @@ -200,29 +198,6 @@ public void run() { .itemOutputs(ItemList.Hatch_Input_Bus_ME_Advanced.get(1L)).eut(TierEU.RECIPE_LuV).duration(15 * SECONDS) .addTo(AssemblyLine); - TTRecipeAdder.addResearchableAssemblylineRecipe( - ItemList.Hatch_CraftingInput_Bus_ME_ItemOnly.get(1L), - 2000 * 60 * 8, - 2000, - 3000000, - 2, - new ItemStack[] { ItemList.Hatch_Input_Bus_ME.get(1L), ItemList.Hatch_Input_Multi_2x2_UEV.get(1L), - // 16384k storage component - GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 8, 60), - // 16384k fluid storage component - GTModHandler.getModItem(AE2FluidCraft.ID, "fluid_part", 8, 7), - // ME Controller - GTModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockController", 1, WILDCARD), - // Dual Interface - GTModHandler.getModItem(AE2FluidCraft.ID, "part_fluid_interface", 1, WILDCARD), - // Pattern capacity card - GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 3, 54) }, - new FluidStack[] { FluidRegistry.getFluidStack("molten.spacetime", 16 * INGOTS), - FluidRegistry.getFluidStack("molten.mutatedlivingsolder", 2000), }, - ItemList.Hatch_CraftingInput_Bus_ME.get(1L), - 30 * SECONDS, - (int) TierEU.RECIPE_UIV); - // Cloud Computation Client Hatch TTRecipeAdder.addResearchableAssemblylineRecipe( dataIn_Hatch.get(1), @@ -1011,10 +986,11 @@ public void run() { (int) TierEU.RECIPE_UMV); } - GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Hatch_Input_Bus_ME_Advanced.get(1L)) + GTValues.RA.stdBuilder() + .metadata(RESEARCH_ITEM, GTModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockInterface", 1L)) .metadata(SCANNING, new Scanning(1 * MINUTES + 40 * SECONDS, TierEU.RECIPE_EV)) .itemInputs( - ItemList.Hatch_Input_Bus_ME_Advanced.get(1L), + ItemList.Hatch_Input_Bus_ME.get(1L), // 4096k Me Storage Component GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 59), // ME Controller diff --git a/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java index a4eac5382..49c448557 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java @@ -1,6 +1,7 @@ package com.dreammaster.gthandler.recipes; import static gregtech.api.enums.Mods.AE2FluidCraft; +import static gregtech.api.enums.Mods.AE2Stuff; import static gregtech.api.enums.Mods.AppliedEnergistics2; import static gregtech.api.enums.Mods.Avaritia; import static gregtech.api.enums.Mods.EternalSingularity; @@ -13,6 +14,7 @@ import static gregtech.api.util.GTModHandler.getModItem; import static gregtech.api.util.GTRecipeBuilder.MINUTES; import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.WILDCARD; import static kekztech.common.Blocks.tfftStorageField; import net.minecraft.item.ItemStack; @@ -281,21 +283,6 @@ public void run() { .fluidInputs(new FluidStack(solderUEV, 1152)) .itemOutputs(ItemList.Optically_Compatible_Memory.get(32)).metadata(IGRecipeMaps.MODULE_TIER, 2) .duration(20 * SECONDS).eut(TierEU.RECIPE_UIV).addTo(IGRecipeMaps.spaceAssemblerRecipes); - - // Advanced Stocking Input Hatch (ME) - GTValues.RA.stdBuilder() - .itemInputs( - ItemList.Hatch_Input_Multi_2x2_UEV.get(4L), - getModItem(AE2FluidCraft.ID, "fluid_interface", 1L), - ItemList.Optically_Compatible_Memory.get(2), - ItemList.Electric_Pump_UEV.get(1L), - // 16384k Me Fluid Storage Component - getModItem(AE2FluidCraft.ID, "fluid_part", 4, 7), - // Hyper-Acceleration Card - getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 4L, 56)) - .fluidInputs(new FluidStack(solderUEV, 2304)) - .itemOutputs(ItemList.Hatch_Input_ME_Advanced.get(1)).metadata(IGRecipeMaps.MODULE_TIER, 1) - .duration(15 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(IGRecipeMaps.spaceAssemblerRecipes); } if (OpenComputers.isModLoaded()) { @@ -329,6 +316,62 @@ public void run() { .itemOutputs(getModItem(AppliedEnergistics2.ID, "tile.BlockPatternOptimizationMatrix", 1)) .metadata(IGRecipeMaps.MODULE_TIER, 1).duration(5 * MINUTES).eut(TierEU.RECIPE_UHV) .addTo(IGRecipeMaps.spaceAssemblerRecipes); + + // Advanced Stocking Input Hatch (ME) + GTValues.RA.stdBuilder() + .itemInputs( + ItemList.Hatch_Input_Multi_2x2_UHV.get(4L), + getModItem(AE2FluidCraft.ID, "fluid_interface", 1L), + ItemList.Circuit_Chip_BioCPU.get(1), + ItemList.Electric_Pump_UHV.get(1L), + // 16384k Me Fluid Storage Component + getModItem(AE2FluidCraft.ID, "fluid_part", 4, 7), + // Hyper-Acceleration Card + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 4L, 56)) + .fluidInputs(new FluidStack(solderUEV, 2304)) + .itemOutputs(ItemList.Hatch_Input_ME_Advanced.get(1)).metadata(IGRecipeMaps.MODULE_TIER, 1) + .duration(15 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(IGRecipeMaps.spaceAssemblerRecipes); + + // Crafting Input Buffer (ME) + GTValues.RA.stdBuilder() + .itemInputs( + ItemList.Hatch_CraftingInput_Bus_ME_ItemOnly.get(1), + ItemList.Hatch_Input_Multi_2x2_UEV.get(1), + // 16384k storage component + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 8, 60), + // 16384k Me Fluid Storage Component + getModItem(AE2FluidCraft.ID, "fluid_part", 8, 7), + // ME Controller + getModItem(AppliedEnergistics2.ID, "tile.BlockController", 1, WILDCARD), + // Dual Interface + getModItem(AE2FluidCraft.ID, "part_fluid_interface", 1, WILDCARD), + // Pattern capacity card + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 3, 54)) + .fluidInputs(new FluidStack(solderUEV, 2304), Materials.Grade7PurifiedWater.getFluid(4000)) + .itemOutputs(ItemList.Hatch_CraftingInput_Bus_ME.get(1)).metadata(IGRecipeMaps.MODULE_TIER, 1) + .duration(15 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(IGRecipeMaps.spaceAssemblerRecipes); + + if (AE2Stuff.isModLoaded()) { + // Crafting Input Proxy + GTValues.RA.stdBuilder().itemInputs( + ItemList.Hatch_CraftingInput_Bus_ME.get(1), + // 64 Core Co-Processing Unit + getModItem(AppliedEnergistics2.ID, "tile.BlockAdvancedCraftingUnit", 1, 0), + // 16384k storage component + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 8, 60), + // 16384k Me Fluid Storage Component + getModItem(AE2FluidCraft.ID, "fluid_part", 8, 7), + // Wireless Connector + getModItem(AE2Stuff.ID, "Wireless", 2, 0), + ItemList.Sensor_UEV.get(1), + ItemList.EnergisedTesseract.get(1)) + .fluidInputs( + new FluidStack(solderUEV, 2304), + MaterialsUEVplus.DimensionallyShiftedSuperfluid.getFluid(4000)) + .itemOutputs(ItemList.Hatch_CraftingInput_Bus_Slave.get(1)) + .metadata(IGRecipeMaps.MODULE_TIER, 2).duration(15 * SECONDS).eut(TierEU.RECIPE_UIV) + .addTo(IGRecipeMaps.spaceAssemblerRecipes); + } } if (AppliedEnergistics2.isModLoaded()) { From 0b077817ede50a4b324fe8c9584caf2bf6f0665f Mon Sep 17 00:00:00 2001 From: Julia <78276563+Vlamonster@users.noreply.github.com> Date: Tue, 14 Jan 2025 07:53:24 +0100 Subject: [PATCH 05/34] Order DTPF Recipes by Catalyst Tier (#1158) Co-authored-by: Julia Dijkstra Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../gthandler/recipes/DTPFRecipes.java | 1569 +++++++++-------- 1 file changed, 805 insertions(+), 764 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/DTPFRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/DTPFRecipes.java index 733c85102..c7af7dd0a 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/DTPFRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/DTPFRecipes.java @@ -38,6 +38,7 @@ public class DTPFRecipes implements Runnable { @Override public void run() { // Dimensionally transcendent plasma forge recipes. + // Ordered so that recipes using higher tier catalysts are prioritized. { // Coils @@ -51,43 +52,33 @@ public void run() { // ------------------------------------------------------------------------------------------ { - // Neutronium Smelting. + // Neutronium long base_quantity = 512L; long tier_up_multiplier = 2L; + long tier_1_quantity = 144L * base_quantity; + long tier_2_quantity = tier_1_quantity * tier_up_multiplier; + long tier_3_quantity = tier_2_quantity * tier_up_multiplier; + long tier_4_quantity = tier_3_quantity * tier_up_multiplier; + DTPFCalculator neutronium = new DTPFCalculator().setBaseParallel(base_quantity) .setCustomEBFinputItem(CustomItemList.RawNeutronium.get(1L)) .calculateGenericEBFBasedRecipe(Materials.Neutronium); - long tier_1_quantity = 144L * base_quantity; - - GTValues.RA.stdBuilder() - .fluidInputs( - MaterialsUEVplus.ExcitedDTCC.getFluid(neutronium.getCatalystAmount(0)), - Materials.Iron.getMolten(tier_1_quantity)) - .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue - .getFluid(neutronium.getResidueAmount(0)), - Materials.Neutronium.getMolten(tier_1_quantity)) - .duration(neutronium.getDuration(0)).eut(neutronium.getEUt(0)) - .metadata(COIL_HEAT, awakened_heat).addTo(plasmaForgeRecipes); - - long tier_2_quantity = 144L * base_quantity * tier_up_multiplier; - + // Tier 4 GTValues.RA.stdBuilder() .fluidInputs( - MaterialsUEVplus.ExcitedDTPC.getFluid(neutronium.getCatalystAmount(1)), - Materials.Iron.getMolten(tier_2_quantity)) + MaterialsUEVplus.ExcitedDTEC.getFluid(neutronium.getCatalystAmount(3)), + Materials.Iron.getMolten(tier_4_quantity)) .fluidOutputs( MaterialsUEVplus.DimensionallyTranscendentResidue - .getFluid(neutronium.getResidueAmount(1)), - Materials.Neutronium.getMolten(tier_2_quantity)) - .duration(neutronium.getDuration(1)).eut(neutronium.getEUt(1)) - .metadata(COIL_HEAT, infinity_heat).addTo(plasmaForgeRecipes); - - long tier_3_quantity = 144L * base_quantity * tier_up_multiplier * tier_up_multiplier; + .getFluid(neutronium.getResidueAmount(3)), + Materials.Neutronium.getMolten(tier_4_quantity)) + .duration(neutronium.getDuration(3)).eut(neutronium.getEUt(3)).metadata(COIL_HEAT, eternal_heat) + .addTo(plasmaForgeRecipes); + // Tier 3 GTValues.RA.stdBuilder() .fluidInputs( MaterialsUEVplus.ExcitedDTRC.getFluid(neutronium.getCatalystAmount(2)), @@ -99,72 +90,119 @@ public void run() { .duration(neutronium.getDuration(2)).eut(neutronium.getEUt(2)).metadata(COIL_HEAT, hypogen_heat) .addTo(plasmaForgeRecipes); - long tier_4_quantity = 144L * base_quantity - * tier_up_multiplier - * tier_up_multiplier - * tier_up_multiplier; + // Tier 2 + GTValues.RA.stdBuilder() + .fluidInputs( + MaterialsUEVplus.ExcitedDTPC.getFluid(neutronium.getCatalystAmount(1)), + Materials.Iron.getMolten(tier_2_quantity)) + .fluidOutputs( + MaterialsUEVplus.DimensionallyTranscendentResidue + .getFluid(neutronium.getResidueAmount(1)), + Materials.Neutronium.getMolten(tier_2_quantity)) + .duration(neutronium.getDuration(1)).eut(neutronium.getEUt(1)) + .metadata(COIL_HEAT, infinity_heat).addTo(plasmaForgeRecipes); + // Tier 1 GTValues.RA.stdBuilder() .fluidInputs( - MaterialsUEVplus.ExcitedDTEC.getFluid(neutronium.getCatalystAmount(3)), - Materials.Iron.getMolten(tier_4_quantity)) + MaterialsUEVplus.ExcitedDTCC.getFluid(neutronium.getCatalystAmount(0)), + Materials.Iron.getMolten(tier_1_quantity)) .fluidOutputs( MaterialsUEVplus.DimensionallyTranscendentResidue - .getFluid(neutronium.getResidueAmount(3)), - Materials.Neutronium.getMolten(tier_4_quantity)) - .duration(neutronium.getDuration(3)).eut(neutronium.getEUt(3)).metadata(COIL_HEAT, eternal_heat) - .addTo(plasmaForgeRecipes); + .getFluid(neutronium.getResidueAmount(0)), + Materials.Neutronium.getMolten(tier_1_quantity)) + .duration(neutronium.getDuration(0)).eut(neutronium.getEUt(0)) + .metadata(COIL_HEAT, awakened_heat).addTo(plasmaForgeRecipes); } { - // Cosmic Neutronium Smelting. + // Cosmic Neutronium long base_quantity = 512L; long tier_up_multiplier = 2L; - DTPFCalculator cosmic_neutronium_bee = new DTPFCalculator().setBaseParallel(base_quantity) - .setCatalystDiscount(15).setProcessingTimeDiscount(50) + long tier_1_quantity = 144L * base_quantity; + long tier_2_quantity = tier_1_quantity * tier_up_multiplier; + long tier_3_quantity = tier_2_quantity * tier_up_multiplier; + long tier_4_quantity = tier_3_quantity * tier_up_multiplier; + + DTPFCalculator cosmic_neutronium = new DTPFCalculator().setBaseParallel(base_quantity) .calculateGenericEBFBasedRecipe(Materials.CosmicNeutronium); - int base_time = 4200; + // Tier 4 - Normal + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(4)) + .fluidInputs( + MaterialsUEVplus.ExcitedDTEC.getFluid(cosmic_neutronium.getCatalystAmount(3)), + Materials.Copper.getMolten(tier_4_quantity)) + .fluidOutputs( + MaterialsUEVplus.DimensionallyTranscendentResidue + .getFluid(cosmic_neutronium.getResidueAmount(3)), + Materials.CosmicNeutronium.getMolten(tier_4_quantity)) + .duration(cosmic_neutronium.getDuration(3)).eut(cosmic_neutronium.getEUt(3)) + .metadata(COIL_HEAT, eternal_heat).addTo(plasmaForgeRecipes); + + // Tier 3 - Normal + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(4)) + .fluidInputs( + MaterialsUEVplus.ExcitedDTRC.getFluid(cosmic_neutronium.getCatalystAmount(2)), + Materials.Copper.getMolten(tier_3_quantity)) + .fluidOutputs( + MaterialsUEVplus.DimensionallyTranscendentResidue + .getFluid(cosmic_neutronium.getResidueAmount(2)), + Materials.CosmicNeutronium.getMolten(tier_3_quantity)) + .duration(cosmic_neutronium.getDuration(2)).eut(cosmic_neutronium.getEUt(2)) + .metadata(COIL_HEAT, hypogen_heat).addTo(plasmaForgeRecipes); - long tier_1_quantity = 144L * base_quantity; - // Bee Recipes + // Tier 2 - Normal + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(4)) + .fluidInputs( + MaterialsUEVplus.ExcitedDTPC.getFluid(cosmic_neutronium.getCatalystAmount(1)), + Materials.Copper.getMolten(tier_2_quantity)) + .fluidOutputs( + MaterialsUEVplus.DimensionallyTranscendentResidue + .getFluid(cosmic_neutronium.getResidueAmount(1)), + Materials.CosmicNeutronium.getMolten(tier_2_quantity)) + .duration(cosmic_neutronium.getDuration(1)).eut(cosmic_neutronium.getEUt(1)) + .metadata(COIL_HEAT, infinity_heat).addTo(plasmaForgeRecipes); - if (Forestry.isModLoaded()) { + // Tier 1 - Normal + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(4)) + .fluidInputs( + MaterialsUEVplus.ExcitedDTCC.getFluid(cosmic_neutronium.getCatalystAmount(0)), + Materials.Copper.getMolten(tier_1_quantity)) + .fluidOutputs( + MaterialsUEVplus.DimensionallyTranscendentResidue + .getFluid(cosmic_neutronium.getResidueAmount(0)), + Materials.CosmicNeutronium.getMolten(tier_1_quantity)) + .duration(cosmic_neutronium.getDuration(0)).eut(cosmic_neutronium.getEUt(0)) + .metadata(COIL_HEAT, awakened_heat).addTo(plasmaForgeRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - GTBees.combs.getStackForType(CombType.COSMICNEUTRONIUM), - GTUtility.getIntegratedCircuit(1)) - .fluidInputs( - MaterialsUEVplus.ExcitedDTCC.getFluid(cosmic_neutronium_bee.getCatalystAmount(0)), - Materials.Copper.getMolten(tier_1_quantity)) - .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue - .getFluid(cosmic_neutronium_bee.getResidueAmount(0)), - Materials.CosmicNeutronium.getMolten(tier_1_quantity)) - .duration(cosmic_neutronium_bee.getDuration(0)).eut(cosmic_neutronium_bee.getEUt(0)) - .metadata(COIL_HEAT, awakened_heat).addTo(plasmaForgeRecipes); + if (Forestry.isModLoaded()) { + long tier_1_bee_quantity = 144L * base_quantity; + long tier_2_bee_quantity = tier_1_bee_quantity * tier_up_multiplier; + long tier_3_bee_quantity = tier_2_bee_quantity * tier_up_multiplier; + long tier_4_bee_quantity = tier_3_bee_quantity * tier_up_multiplier; - long tier_2_bee_quantity = 144L * base_quantity * tier_up_multiplier; + DTPFCalculator cosmic_neutronium_bee = new DTPFCalculator().setBaseParallel(base_quantity) + .setCatalystDiscount(15).setProcessingTimeDiscount(50) + .calculateGenericEBFBasedRecipe(Materials.CosmicNeutronium); + // Tier 4 - Combs GTValues.RA.stdBuilder() .itemInputs( GTBees.combs.getStackForType(CombType.COSMICNEUTRONIUM), GTUtility.getIntegratedCircuit(1)) .fluidInputs( - MaterialsUEVplus.ExcitedDTPC.getFluid(cosmic_neutronium_bee.getCatalystAmount(1)), - Materials.Copper.getMolten(tier_2_bee_quantity)) + MaterialsUEVplus.ExcitedDTEC.getFluid(cosmic_neutronium_bee.getCatalystAmount(3)), + Materials.Copper.getMolten(tier_4_bee_quantity)) .fluidOutputs( MaterialsUEVplus.DimensionallyTranscendentResidue - .getFluid(cosmic_neutronium_bee.getResidueAmount(1)), - Materials.CosmicNeutronium.getMolten(tier_2_bee_quantity)) - .duration(cosmic_neutronium_bee.getDuration(1)).eut(cosmic_neutronium_bee.getEUt(1)) - .metadata(COIL_HEAT, infinity_heat).addTo(plasmaForgeRecipes); - - long tier_3_bee_quantity = 144L * base_quantity * tier_up_multiplier * tier_up_multiplier; + .getFluid(cosmic_neutronium_bee.getResidueAmount(3)), + Materials.CosmicNeutronium.getMolten(tier_4_bee_quantity)) + .duration(cosmic_neutronium_bee.getDuration(3)).eut(cosmic_neutronium_bee.getEUt(3)) + .metadata(COIL_HEAT, eternal_heat).addTo(plasmaForgeRecipes); + // Tier 3 - Combs GTValues.RA.stdBuilder() .itemInputs( GTBees.combs.getStackForType(CombType.COSMICNEUTRONIUM), @@ -179,96 +217,90 @@ public void run() { .duration(cosmic_neutronium_bee.getDuration(2)).eut(cosmic_neutronium_bee.getEUt(2)) .metadata(COIL_HEAT, hypogen_heat).addTo(plasmaForgeRecipes); - long tier_4_bee_quantity = 144L * base_quantity - * tier_up_multiplier - * tier_up_multiplier - * tier_up_multiplier; + // Tier 2 - Combs + GTValues.RA.stdBuilder() + .itemInputs( + GTBees.combs.getStackForType(CombType.COSMICNEUTRONIUM), + GTUtility.getIntegratedCircuit(1)) + .fluidInputs( + MaterialsUEVplus.ExcitedDTPC.getFluid(cosmic_neutronium_bee.getCatalystAmount(1)), + Materials.Copper.getMolten(tier_2_bee_quantity)) + .fluidOutputs( + MaterialsUEVplus.DimensionallyTranscendentResidue + .getFluid(cosmic_neutronium_bee.getResidueAmount(1)), + Materials.CosmicNeutronium.getMolten(tier_2_bee_quantity)) + .duration(cosmic_neutronium_bee.getDuration(1)).eut(cosmic_neutronium_bee.getEUt(1)) + .metadata(COIL_HEAT, infinity_heat).addTo(plasmaForgeRecipes); + // Tier 1 - Combs GTValues.RA.stdBuilder() .itemInputs( GTBees.combs.getStackForType(CombType.COSMICNEUTRONIUM), GTUtility.getIntegratedCircuit(1)) .fluidInputs( - MaterialsUEVplus.ExcitedDTEC.getFluid(cosmic_neutronium_bee.getCatalystAmount(3)), - Materials.Copper.getMolten(tier_4_bee_quantity)) + MaterialsUEVplus.ExcitedDTCC.getFluid(cosmic_neutronium_bee.getCatalystAmount(0)), + Materials.Copper.getMolten(tier_1_quantity)) .fluidOutputs( MaterialsUEVplus.DimensionallyTranscendentResidue - .getFluid(cosmic_neutronium_bee.getResidueAmount(3)), - Materials.CosmicNeutronium.getMolten(tier_4_bee_quantity)) - .duration(cosmic_neutronium_bee.getDuration(3)).eut(cosmic_neutronium_bee.getEUt(3)) - .metadata(COIL_HEAT, eternal_heat).addTo(plasmaForgeRecipes); + .getFluid(cosmic_neutronium_bee.getResidueAmount(0)), + Materials.CosmicNeutronium.getMolten(tier_1_quantity)) + .duration(cosmic_neutronium_bee.getDuration(0)).eut(cosmic_neutronium_bee.getEUt(0)) + .metadata(COIL_HEAT, awakened_heat).addTo(plasmaForgeRecipes); } - // normal ones + } - DTPFCalculator cosmic_neutronium = new DTPFCalculator().setBaseParallel(base_quantity) - .calculateGenericEBFBasedRecipe(Materials.CosmicNeutronium); + { + // Bedrockium - GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(4)) - .fluidInputs( - MaterialsUEVplus.ExcitedDTCC.getFluid(cosmic_neutronium.getCatalystAmount(0)), - Materials.Copper.getMolten(tier_1_quantity)) - .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue - .getFluid(cosmic_neutronium.getResidueAmount(0)), - Materials.CosmicNeutronium.getMolten(tier_1_quantity)) - .duration(cosmic_neutronium.getDuration(0)).eut(cosmic_neutronium.getEUt(0)) - .metadata(COIL_HEAT, awakened_heat).addTo(plasmaForgeRecipes); + long base_quantity = 2048L; + long tier_up_multiplier = 2L; - long tier_2_quantity = 144L * base_quantity * tier_up_multiplier; + long tier_1_quantity = 144L * base_quantity; + long tier_2_quantity = tier_1_quantity * tier_up_multiplier; + long tier_3_quantity = tier_2_quantity * tier_up_multiplier; + long tier_4_quantity = tier_3_quantity * tier_up_multiplier; - GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(4)) + DTPFCalculator bedrockium = new DTPFCalculator().setBaseParallel(base_quantity) + .calculateGenericEBFBasedRecipe(Materials.Bedrockium); + + // Tier 4 + GTValues.RA.stdBuilder() .fluidInputs( - MaterialsUEVplus.ExcitedDTPC.getFluid(cosmic_neutronium.getCatalystAmount(1)), - Materials.Copper.getMolten(tier_2_quantity)) + MaterialsUEVplus.ExcitedDTEC.getFluid(bedrockium.getCatalystAmount(3)), + Materials.Steel.getMolten(tier_4_quantity)) .fluidOutputs( MaterialsUEVplus.DimensionallyTranscendentResidue - .getFluid(cosmic_neutronium.getResidueAmount(1)), - Materials.CosmicNeutronium.getMolten(tier_2_quantity)) - .duration(cosmic_neutronium.getDuration(1)).eut(cosmic_neutronium.getEUt(1)) - .metadata(COIL_HEAT, infinity_heat).addTo(plasmaForgeRecipes); - - long tier_3_quantity = 144L * base_quantity * tier_up_multiplier * tier_up_multiplier; + .getFluid(bedrockium.getResidueAmount(3)), + Materials.Bedrockium.getMolten(tier_4_quantity)) + .duration(bedrockium.getDuration(3)).eut(bedrockium.getEUt(3)).metadata(COIL_HEAT, eternal_heat) + .addTo(plasmaForgeRecipes); - GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(4)) + // Tier 3 + GTValues.RA.stdBuilder() .fluidInputs( - MaterialsUEVplus.ExcitedDTRC.getFluid(cosmic_neutronium.getCatalystAmount(2)), - Materials.Copper.getMolten(tier_3_quantity)) + MaterialsUEVplus.ExcitedDTRC.getFluid(bedrockium.getCatalystAmount(2)), + Materials.Steel.getMolten(tier_3_quantity)) .fluidOutputs( MaterialsUEVplus.DimensionallyTranscendentResidue - .getFluid(cosmic_neutronium.getResidueAmount(2)), - Materials.CosmicNeutronium.getMolten(tier_3_quantity)) - .duration(cosmic_neutronium.getDuration(2)).eut(cosmic_neutronium.getEUt(2)) - .metadata(COIL_HEAT, hypogen_heat).addTo(plasmaForgeRecipes); - - long tier_4_quantity = 144L * base_quantity - * tier_up_multiplier - * tier_up_multiplier - * tier_up_multiplier; + .getFluid(bedrockium.getResidueAmount(2)), + Materials.Bedrockium.getMolten(tier_3_quantity)) + .duration(bedrockium.getDuration(2)).eut(bedrockium.getEUt(2)).metadata(COIL_HEAT, hypogen_heat) + .addTo(plasmaForgeRecipes); - GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(4)) + // Tier 2 + GTValues.RA.stdBuilder() .fluidInputs( - MaterialsUEVplus.ExcitedDTEC.getFluid(cosmic_neutronium.getCatalystAmount(3)), - Materials.Copper.getMolten(tier_4_quantity)) + MaterialsUEVplus.ExcitedDTPC.getFluid(bedrockium.getCatalystAmount(1)), + Materials.Steel.getMolten(tier_2_quantity)) .fluidOutputs( MaterialsUEVplus.DimensionallyTranscendentResidue - .getFluid(cosmic_neutronium.getResidueAmount(3)), - Materials.CosmicNeutronium.getMolten(tier_4_quantity)) - .duration(cosmic_neutronium.getDuration(3)).eut(cosmic_neutronium.getEUt(3)) - .metadata(COIL_HEAT, eternal_heat).addTo(plasmaForgeRecipes); - } - - { - // Bedrockium. - - long base_quantity = 2048L; - long tier_up_multiplier = 2L; - - DTPFCalculator bedrockium = new DTPFCalculator().setBaseParallel(base_quantity) - .calculateGenericEBFBasedRecipe(Materials.Bedrockium); - - long tier_1_quantity = 144L * base_quantity; + .getFluid(bedrockium.getResidueAmount(1)), + Materials.Bedrockium.getMolten(tier_2_quantity)) + .duration(bedrockium.getDuration(1)).eut(bedrockium.getEUt(1)) + .metadata(COIL_HEAT, infinity_heat).addTo(plasmaForgeRecipes); + // Tier 1 GTValues.RA.stdBuilder() .fluidInputs( MaterialsUEVplus.ExcitedDTCC.getFluid(bedrockium.getCatalystAmount(0)), @@ -279,99 +311,64 @@ public void run() { Materials.Bedrockium.getMolten(tier_1_quantity)) .duration(bedrockium.getDuration(0)).eut(bedrockium.getEUt(0)) .metadata(COIL_HEAT, awakened_heat).addTo(plasmaForgeRecipes); + } - long tier_2_quantity = tier_1_quantity * tier_up_multiplier; + { + // Hypogen - GTValues.RA.stdBuilder() + // V4 + GTValues.RA.stdBuilder().itemInputs(GregtechItemList.Compressed_Fusion_Reactor.get(0)) .fluidInputs( - MaterialsUEVplus.ExcitedDTPC.getFluid(bedrockium.getCatalystAmount(1)), - Materials.Steel.getMolten(tier_2_quantity)) + Materials.Neutronium.getMolten(5760L * 2), + new FluidStack(MaterialsAlloy.QUANTUM.getFluid(), 5760), + Materials.Infinity.getMolten(1440L), + MaterialsUEVplus.ExcitedDTSC.getFluid(1000)) .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue - .getFluid(bedrockium.getResidueAmount(1)), - Materials.Bedrockium.getMolten(tier_2_quantity)) - .duration(bedrockium.getDuration(1)).eut(bedrockium.getEUt(1)) - .metadata(COIL_HEAT, infinity_heat).addTo(plasmaForgeRecipes); - - long tier_3_quantity = tier_2_quantity * tier_up_multiplier; + new FluidStack(MaterialsElements.STANDALONE.HYPOGEN.getFluid(), 5760 * 2), + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(2000L)) + .duration(1 * MINUTES + 15 * SECONDS).eut(2_000_000_000).metadata(COIL_HEAT, eternal_heat) + .addTo(plasmaForgeRecipes); - GTValues.RA.stdBuilder() + // V3 + GTValues.RA.stdBuilder().itemInputs(GregtechItemList.Compressed_Fusion_Reactor.get(0)) .fluidInputs( - MaterialsUEVplus.ExcitedDTRC.getFluid(bedrockium.getCatalystAmount(2)), - Materials.Steel.getMolten(tier_3_quantity)) + Materials.Neutronium.getMolten(5760L), + new FluidStack(MaterialsAlloy.QUANTUM.getFluid(), 5760), + Materials.Infinity.getMolten(1440L), + MaterialsUEVplus.ExcitedDTEC.getFluid(1000)) .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue - .getFluid(bedrockium.getResidueAmount(2)), - Materials.Bedrockium.getMolten(tier_3_quantity)) - .duration(bedrockium.getDuration(2)).eut(bedrockium.getEUt(2)).metadata(COIL_HEAT, hypogen_heat) + new FluidStack(MaterialsElements.STANDALONE.HYPOGEN.getFluid(), 5760), + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(1000L)) + .duration(1 * MINUTES + 15 * SECONDS).eut(1_600_000_000).metadata(COIL_HEAT, eternal_heat) .addTo(plasmaForgeRecipes); - long tier_4_quantity = tier_3_quantity * tier_up_multiplier; - + // V2 GTValues.RA.stdBuilder() .fluidInputs( - MaterialsUEVplus.ExcitedDTEC.getFluid(bedrockium.getCatalystAmount(3)), - Materials.Steel.getMolten(tier_4_quantity)) + Materials.Neutronium.getMolten(5760L), + new FluidStack(MaterialsAlloy.QUANTUM.getFluid(), 5760), + Materials.Infinity.getMolten(1440L), + MaterialsUEVplus.ExcitedDTRC.getFluid(1000)) .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue - .getFluid(bedrockium.getResidueAmount(3)), - Materials.Bedrockium.getMolten(tier_4_quantity)) - .duration(bedrockium.getDuration(3)).eut(bedrockium.getEUt(3)).metadata(COIL_HEAT, eternal_heat) + new FluidStack(MaterialsElements.STANDALONE.HYPOGEN.getFluid(), 2880), + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(1000L / 2)) + .duration(1 * MINUTES + 15 * SECONDS).eut(1_200_000_000).metadata(COIL_HEAT, hypogen_heat) .addTo(plasmaForgeRecipes); - } - - // Hypogen v1 - GTValues.RA.stdBuilder() - .fluidInputs( - new FluidStack(MaterialsElements.STANDALONE.HYPOGEN.getFluid(), 144), - Materials.Neutronium.getMolten(5760L), - new FluidStack(MaterialsAlloy.QUANTUM.getFluid(), 5760), - Materials.Infinity.getMolten(1440L), - MaterialsUEVplus.ExcitedDTPC.getFluid(1000)) - .fluidOutputs( - new FluidStack(MaterialsElements.STANDALONE.HYPOGEN.getFluid(), 1584), - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(1000L / 4)) - .duration(1 * MINUTES + 15 * SECONDS).eut(800_000_000).metadata(COIL_HEAT, infinity_heat) - .addTo(plasmaForgeRecipes); - // Hypogen v2 - GTValues.RA.stdBuilder() - .fluidInputs( - Materials.Neutronium.getMolten(5760L), - new FluidStack(MaterialsAlloy.QUANTUM.getFluid(), 5760), - Materials.Infinity.getMolten(1440L), - MaterialsUEVplus.ExcitedDTRC.getFluid(1000)) - .fluidOutputs( - new FluidStack(MaterialsElements.STANDALONE.HYPOGEN.getFluid(), 2880), - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(1000L / 2)) - .duration(1 * MINUTES + 15 * SECONDS).eut(1_200_000_000).metadata(COIL_HEAT, hypogen_heat) - .addTo(plasmaForgeRecipes); - - // Hypogen v3 - GTValues.RA.stdBuilder().itemInputs(GregtechItemList.Compressed_Fusion_Reactor.get(0)) - .fluidInputs( - Materials.Neutronium.getMolten(5760L), - new FluidStack(MaterialsAlloy.QUANTUM.getFluid(), 5760), - Materials.Infinity.getMolten(1440L), - MaterialsUEVplus.ExcitedDTEC.getFluid(1000)) - .fluidOutputs( - new FluidStack(MaterialsElements.STANDALONE.HYPOGEN.getFluid(), 5760), - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(1000L)) - .duration(1 * MINUTES + 15 * SECONDS).eut(1_600_000_000).metadata(COIL_HEAT, eternal_heat) - .addTo(plasmaForgeRecipes); - - // Hypogen v4 - GTValues.RA.stdBuilder().itemInputs(GregtechItemList.Compressed_Fusion_Reactor.get(0)) - .fluidInputs( - Materials.Neutronium.getMolten(5760L * 2), - new FluidStack(MaterialsAlloy.QUANTUM.getFluid(), 5760), - Materials.Infinity.getMolten(1440L), - MaterialsUEVplus.ExcitedDTSC.getFluid(1000)) - .fluidOutputs( - new FluidStack(MaterialsElements.STANDALONE.HYPOGEN.getFluid(), 5760 * 2), - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(2000L)) - .duration(1 * MINUTES + 15 * SECONDS).eut(2_000_000_000).metadata(COIL_HEAT, eternal_heat) - .addTo(plasmaForgeRecipes); + // V1 + GTValues.RA.stdBuilder() + .fluidInputs( + new FluidStack(MaterialsElements.STANDALONE.HYPOGEN.getFluid(), 144), + Materials.Neutronium.getMolten(5760L), + new FluidStack(MaterialsAlloy.QUANTUM.getFluid(), 5760), + Materials.Infinity.getMolten(1440L), + MaterialsUEVplus.ExcitedDTPC.getFluid(1000)) + .fluidOutputs( + new FluidStack(MaterialsElements.STANDALONE.HYPOGEN.getFluid(), 1584), + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(1000L / 4)) + .duration(1 * MINUTES + 15 * SECONDS).eut(800_000_000).metadata(COIL_HEAT, infinity_heat) + .addTo(plasmaForgeRecipes); + } { // Chromatic Glass @@ -379,23 +376,39 @@ public void run() { long base_quantity = 256L; long tier_up_multiplier = 2L; + long tier_1_quantity = 144L * base_quantity; + long tier_2_quantity = tier_1_quantity * tier_up_multiplier; + long tier_3_quantity = tier_2_quantity * tier_up_multiplier; + long tier_4_quantity = tier_3_quantity * tier_up_multiplier; + DTPFCalculator chromatic_glass = new DTPFCalculator().setBaseParallel(base_quantity) .calculateNonEBFRecipe(1_966_080, 6_000); - long tier_1_quantity = 144L * base_quantity; + // Tier 4 + GTValues.RA.stdBuilder() + .fluidInputs( + MaterialsUEVplus.ExcitedDTEC.getFluid(chromatic_glass.getCatalystAmount(3)), + Materials.Glass.getMolten(tier_4_quantity)) + .fluidOutputs( + MaterialsUEVplus.DimensionallyTranscendentResidue + .getFluid(chromatic_glass.getResidueAmount(3)), + new FluidStack(FluidRegistry.getFluid("molten.chromaticglass"), (int) tier_4_quantity)) + .duration(chromatic_glass.getDuration(3)).eut(chromatic_glass.getEUt(3)) + .metadata(COIL_HEAT, eternal_heat).addTo(plasmaForgeRecipes); + // Tier 3 GTValues.RA.stdBuilder() .fluidInputs( - MaterialsUEVplus.ExcitedDTCC.getFluid(chromatic_glass.getCatalystAmount(0)), - Materials.Glass.getMolten(tier_1_quantity)) + MaterialsUEVplus.ExcitedDTRC.getFluid(chromatic_glass.getCatalystAmount(2)), + Materials.Glass.getMolten(tier_3_quantity)) .fluidOutputs( MaterialsUEVplus.DimensionallyTranscendentResidue - .getFluid(chromatic_glass.getResidueAmount(0)), - new FluidStack(FluidRegistry.getFluid("molten.chromaticglass"), (int) tier_1_quantity)) - .duration(chromatic_glass.getDuration(0)).eut(chromatic_glass.getEUt(0)) - .metadata(COIL_HEAT, awakened_heat).addTo(plasmaForgeRecipes); + .getFluid(chromatic_glass.getResidueAmount(2)), + new FluidStack(FluidRegistry.getFluid("molten.chromaticglass"), (int) tier_3_quantity)) + .duration(chromatic_glass.getDuration(2)).eut(chromatic_glass.getEUt(2)) + .metadata(COIL_HEAT, hypogen_heat).addTo(plasmaForgeRecipes); - long tier_2_quantity = tier_1_quantity * tier_up_multiplier; + // Tier 2 GTValues.RA.stdBuilder() .fluidInputs( MaterialsUEVplus.ExcitedDTPC.getFluid(chromatic_glass.getCatalystAmount(1)), @@ -407,340 +420,91 @@ public void run() { .duration(chromatic_glass.getDuration(1)).eut(chromatic_glass.getEUt(1)) .metadata(COIL_HEAT, infinity_heat).addTo(plasmaForgeRecipes); - long tier_3_quantity = tier_2_quantity * tier_up_multiplier; - GTValues.RA.stdBuilder() - .fluidInputs( - MaterialsUEVplus.ExcitedDTRC.getFluid(chromatic_glass.getCatalystAmount(2)), - Materials.Glass.getMolten(tier_3_quantity)) - .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue - .getFluid(chromatic_glass.getResidueAmount(2)), - new FluidStack(FluidRegistry.getFluid("molten.chromaticglass"), (int) tier_3_quantity)) - .duration(chromatic_glass.getDuration(2)).eut(chromatic_glass.getEUt(2)) - .metadata(COIL_HEAT, hypogen_heat).addTo(plasmaForgeRecipes); - - long tier_4_quantity = tier_3_quantity * tier_up_multiplier; + // Tier 1 GTValues.RA.stdBuilder() .fluidInputs( - MaterialsUEVplus.ExcitedDTEC.getFluid(chromatic_glass.getCatalystAmount(3)), - Materials.Glass.getMolten(tier_4_quantity)) + MaterialsUEVplus.ExcitedDTCC.getFluid(chromatic_glass.getCatalystAmount(0)), + Materials.Glass.getMolten(tier_1_quantity)) .fluidOutputs( MaterialsUEVplus.DimensionallyTranscendentResidue - .getFluid(chromatic_glass.getResidueAmount(3)), - new FluidStack(FluidRegistry.getFluid("molten.chromaticglass"), (int) tier_4_quantity)) - .duration(chromatic_glass.getDuration(3)).eut(chromatic_glass.getEUt(3)) - .metadata(COIL_HEAT, eternal_heat).addTo(plasmaForgeRecipes); + .getFluid(chromatic_glass.getResidueAmount(0)), + new FluidStack(FluidRegistry.getFluid("molten.chromaticglass"), (int) tier_1_quantity)) + .duration(chromatic_glass.getDuration(0)).eut(chromatic_glass.getEUt(0)) + .metadata(COIL_HEAT, awakened_heat).addTo(plasmaForgeRecipes); } - // SpaceTime v1 - GTValues.RA.stdBuilder().itemInputs(ItemList.EnergisedTesseract.get(1)) - .fluidInputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(10000L), - Materials.Infinity.getMolten(2304L), - new FluidStack(MaterialsElements.STANDALONE.HYPOGEN.getFluid(), 1152)) - .fluidOutputs(MaterialsUEVplus.SpaceTime.getMolten(144L)).duration(40 * SECONDS).eut(1_000_000_000) - .metadata(COIL_HEAT, hypogen_heat).addTo(plasmaForgeRecipes); - - // Spacetime v2 - GTValues.RA.stdBuilder() - .itemInputs(ItemList.EnergisedTesseract.get(1), GregtechItemList.Compressed_Fusion_Reactor.get(0)) - .fluidInputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(5000L), - Materials.Infinity.getMolten(1152L)) - .fluidOutputs(MaterialsUEVplus.SpaceTime.getMolten(576L)).duration(20 * SECONDS).eut(2_000_000_000) - .metadata(COIL_HEAT, eternal_heat).addTo(plasmaForgeRecipes); - - // Raw Tesseract recipe - // 16 Vertices, 24 faces and 32 edges. - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.stick, Materials.CosmicNeutronium, 8L), - MaterialsAlloy.OCTIRON.getRod(8), - GGMaterial.tairitsu.get(OrePrefixes.stick, 8), - GTOreDictUnificator.get(OrePrefixes.stick, Materials.Sunnarium, 8L), - MaterialsAlloy.ABYSSAL.getPlate(24), - MaterialsAlloy.BOTMIUM.getScrew(16), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 1L)) - .itemOutputs(ItemList.Tesseract.get(4)).fluidInputs(MaterialsUEVplus.ExcitedDTRC.getFluid(1000)) - .fluidOutputs(MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(1000 / 2)) - .duration(40 * SECONDS).eut(32_000_000).metadata(COIL_HEAT, infinity_heat) - .addTo(plasmaForgeRecipes); - - // Raw Tesseract v2 - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.stick, Materials.CosmicNeutronium, 12L), - GGMaterial.tairitsu.get(OrePrefixes.stick, 12), - GTOreDictUnificator.get(OrePrefixes.stick, MaterialsUEVplus.TranscendentMetal, 8L), - MaterialsAlloy.BOTMIUM.getPlate(24), - MaterialsAlloy.ARCANITE.getScrew(16), - GTModHandler.getModItem(SuperSolarPanels.ID, "enderquantumcomponent", 1L)) - .itemOutputs(ItemList.Tesseract.get(8)).fluidInputs(MaterialsUEVplus.ExcitedDTEC.getFluid(1000)) - .fluidOutputs(MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(1000)) - .duration(40 * SECONDS).eut(128_000_000).metadata(COIL_HEAT, eternal_heat) - .addTo(plasmaForgeRecipes); - - // Raw Tesseract v3 - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.stick, MaterialsUEVplus.TranscendentMetal, 32L), - MaterialsAlloy.BLACK_TITANIUM.getPlate(24), - MaterialsAlloy.ZERON_100.getScrew(16), - GregtechItemList.Laser_Lens_Special.get(1)) - .itemOutputs(ItemList.Tesseract.get(16)).fluidInputs(MaterialsUEVplus.ExcitedDTSC.getFluid(1000)) - .fluidOutputs(MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(2000)) - .duration(40 * SECONDS).eut(512_000_000).metadata(COIL_HEAT, eternal_heat) - .addTo(plasmaForgeRecipes); - - // Transcendent metal - - long total_EU_per_ingot = 113_246_208_000L + 629_145_600L; - long recipe_time = 180 * 20; - DTPFCalculator transcendent_metal = new DTPFCalculator().setBaseParallel(360).setLowestCatalystTier(4) - .setScalingFactor(8).setHighestCatalystTier(4) - .calculateNonEBFRecipe(total_EU_per_ingot / recipe_time, recipe_time); - - GTValues.RA.stdBuilder() - .itemInputs(ItemList.Tesseract.get(32), GTOreDictUnificator.get("blockCosmicNeutronium", 40)) - .itemOutputs( - MaterialsUEVplus.TranscendentMetal.getBlocks(40), - MaterialsUEVplus.TranscendentMetal.getDust(24)) - .fluidInputs( - MaterialsAlloy.TITANSTEEL.getFluidStack(144 * 40 * 9), - Materials.CallistoIce.getMolten(144 * 20 * 9), - Materials.Ledox.getMolten(144 * 20 * 9), - Materials.Tungsten.getMolten(144 * 40 * 9), - MaterialsUEVplus.ExcitedDTSC.getFluid(transcendent_metal.getCatalystAmount(4))) - .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue - .getFluid(transcendent_metal.getResidueAmount(4)), - MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN.getFluidStack(144 * 20 * 9)) - .duration(transcendent_metal.getDuration(4)).eut(transcendent_metal.getEUt(4)) - .metadata(COIL_HEAT, eternal_heat).addTo(plasmaForgeRecipes); - - // Quantum + Astral Titanium - - // Based on quantum abs recipe - long total_EU_per_quantum_ingot = (long) (9_437_184_000L * 0.9); - // Laser engraver recipe - long total_EU_per_astral_dust = 4_718_592_000L; - // Astral titanium ebf - long total_EU_per_astral_ingot_ebf = 22_118_400_000L; - // Astral titanium freezer - long total_EU_per_astral_ingot_freezer = 1_639_710_720L; - // 2 astral titanium blocks per 320 quantum ingots - float astral_ingots_per_quantum_ingot = 18 / 320f; - // Based on quantum abs including coil discount - long recipe_time_per_quantum_ingot = (long) (600 * 20 / 10 * 0.9); - long total_EUt = (long) (total_EU_per_quantum_ingot + astral_ingots_per_quantum_ingot - * (total_EU_per_astral_dust + total_EU_per_astral_ingot_ebf + total_EU_per_astral_ingot_freezer)) - / recipe_time_per_quantum_ingot; - DTPFCalculator quantum = new DTPFCalculator().setBaseParallel(320).setLowestCatalystTier(3) - .setHighestCatalystTier(4).setEUtDivisor(1.12f) - .calculateNonEBFRecipe(total_EUt, recipe_time_per_quantum_ingot); - GTValues.RA.stdBuilder().itemInputs( - CI.getEnergyCore(9, 0), - BlockList.Quantinum.getIS(2), - // Quantum Anomaly - GregtechItemList.Laser_Lens_Special.get(2)) - .itemOutputs(MaterialsElements.STANDALONE.ASTRAL_TITANIUM.getBlock(2)) - .fluidInputs( - MaterialsAlloy.BLACK_TITANIUM.getFluidStack(144 * 320 * 7 / 10), - Materials.Americium.getMolten(144 * 320 / 10), - Materials.Bismuth.getMolten(144 * 320 / 10), - MaterialsElements.STANDALONE.HYPOGEN.getFluidStack(144 * 320 / 10), - Materials.Titanium.getPlasma(144 * 9 * 2 * 2), - MaterialsUEVplus.ExcitedDTEC.getFluid(quantum.getCatalystAmount(3))) - .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(quantum.getResidueAmount(3)), - MaterialsAlloy.QUANTUM.getFluidStack(144 * 320)) - .duration(quantum.getDuration(3)).eut(quantum.getEUt(3)).metadata(COIL_HEAT, eternal_heat) - .addTo(plasmaForgeRecipes); - - // Quantum + Astral Titanium v2 - GTValues.RA.stdBuilder().itemInputs( - CI.getEnergyCore(9, 0), - BlockList.Quantinum.getIS(4), - // Quantum Anomaly - GregtechItemList.Laser_Lens_Special.get(3)) - .itemOutputs(MaterialsElements.STANDALONE.ASTRAL_TITANIUM.getBlock(4)) - .fluidInputs( - MaterialsAlloy.BLACK_TITANIUM.getFluidStack(144 * 640 * 7 / 10), - Materials.Americium.getMolten(144 * 640 / 10), - Materials.Bismuth.getMolten(144 * 640 / 10), - MaterialsElements.STANDALONE.HYPOGEN.getFluidStack(144 * 640 / 10), - Materials.Titanium.getPlasma(144 * 9 * 4 * 2), - MaterialsUEVplus.ExcitedDTSC.getFluid(quantum.getCatalystAmount(4))) - .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(quantum.getResidueAmount(4)), - MaterialsAlloy.QUANTUM.getFluidStack(144 * 640)) - .duration(quantum.getDuration(4)).eut(quantum.getEUt(4)).metadata(COIL_HEAT, eternal_heat) - .addTo(plasmaForgeRecipes); - - // Timepiece - GTValues.RA.stdBuilder() - .itemInputs( - GregtechItemList.SpaceTimeBendingCore.get(0), - GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.DarkIron, 1L), - Materials.Dilithium.getGems(32), - MaterialsUEVplus.Universium.getNanite(1)) - .itemOutputs(ItemList.Timepiece.get(3)) - .fluidInputs( - MaterialsUEVplus.Time.getMolten(18432L * 8), - MaterialsUEVplus.ExcitedDTSC.getFluid(100000L)) - .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(100000L * 2), - MaterialsUEVplus.Space.getMolten(18432L * 8)) - .duration(80 * SECONDS).eut(TierEU.RECIPE_MAX).metadata(COIL_HEAT, 13500).addTo(plasmaForgeRecipes); - - // Time to Space - GTValues.RA.stdBuilder().itemInputs( - // Spacetime Continuum Ripper - GregtechItemList.SpaceTimeContinuumRipper.get(0), - ItemList.EnergisedTesseract.get(2), - // Quantum Anomaly - GregtechItemList.Laser_Lens_Special.get(16)).itemOutputs(ItemList.Tesseract.get(1)) - .fluidInputs( - MaterialsUEVplus.Time.getMolten(9216L * 64), - MaterialsUEVplus.SpaceTime.getMolten(9216L * 16), - MaterialsUEVplus.ExcitedDTSC.getFluid(1000L)) - .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(1000L * 2), - MaterialsUEVplus.Space.getMolten(9216L * 64)) - .duration(10 * SECONDS).eut(TierEU.RECIPE_MAX).metadata(COIL_HEAT, 13500).addTo(plasmaForgeRecipes); - - // Space to Time - GTValues.RA.stdBuilder().itemInputs( - // Spacetime Continuum Ripper - GregtechItemList.SpaceTimeContinuumRipper.get(0), - ItemList.EnergisedTesseract.get(2), - ItemList.Timepiece.get(16)).itemOutputs(ItemList.Tesseract.get(1)) - .fluidInputs( - MaterialsUEVplus.Space.getMolten(9216L * 64), - MaterialsUEVplus.SpaceTime.getMolten(9216L * 16), - MaterialsUEVplus.ExcitedDTSC.getFluid(1000L)) - .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(1000L * 2), - MaterialsUEVplus.Time.getMolten(9216L * 64)) - .duration(10 * SECONDS).eut(TierEU.RECIPE_MAX).metadata(COIL_HEAT, 13500).addTo(plasmaForgeRecipes); - - if (Avaritia.isModLoaded()) { - // Plasma forge infinity Smelting. - - long base_time = 10_000; - long base_quantity = 64L; - - DTPFCalculator infinity_bee = new DTPFCalculator().setBaseParallel(base_quantity) - .setLowestCatalystTier(2).setHighestCatalystTier(4).setCatalystDiscount(15) - .setProcessingTimeDiscount(50).setEUtDivisor(2).calculateNonEBFRecipe(32_000_000, base_time); - - // Bee comb catalyst recipes for infinity - if (Forestry.isModLoaded()) { - GTValues.RA.stdBuilder() - .itemInputs( - GTModHandler.getModItem(Avaritia.ID, "Resource", 4L, 5), - GTBees.combs.getStackForType(CombType.INFINITY), - GTUtility.getIntegratedCircuit(3)) - .fluidInputs(MaterialsUEVplus.ExcitedDTSC.getFluid(infinity_bee.getCatalystAmount(4))) - .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue - .getFluid(infinity_bee.getResidueAmount(4)), - Materials.Infinity.getMolten(256L * 144L)) - .duration(infinity_bee.getDuration(4)).eut(infinity_bee.getEUt(4)) - .metadata(COIL_HEAT, eternal_heat).addTo(plasmaForgeRecipes); - - GTValues.RA.stdBuilder() - .itemInputs( - GTModHandler.getModItem(Avaritia.ID, "Resource", 2L, 5), - GTBees.combs.getStackForType(CombType.INFINITY), - GTUtility.getIntegratedCircuit(3)) - .fluidInputs(MaterialsUEVplus.ExcitedDTEC.getFluid(infinity_bee.getCatalystAmount(3))) - .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue - .getFluid(infinity_bee.getResidueAmount(3)), - Materials.Infinity.getMolten(128L * 144L)) - .duration(infinity_bee.getDuration(3)).eut(infinity_bee.getEUt(3)) - .metadata(COIL_HEAT, eternal_heat).addTo(plasmaForgeRecipes); - - GTValues.RA.stdBuilder() - .itemInputs( - GTModHandler.getModItem(Avaritia.ID, "Resource", 1L, 5), - GTBees.combs.getStackForType(CombType.INFINITY), - GTUtility.getIntegratedCircuit(2)) - .fluidInputs(MaterialsUEVplus.ExcitedDTRC.getFluid(infinity_bee.getCatalystAmount(2))) - .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue - .getFluid(infinity_bee.getResidueAmount(2)), - Materials.Infinity.getMolten(64L * 144L)) - .duration(infinity_bee.getDuration(2)).eut(infinity_bee.getEUt(2)) - .metadata(COIL_HEAT, hypogen_heat).addTo(plasmaForgeRecipes); - - GTValues.RA.stdBuilder() - .itemInputs( - GTModHandler.getModItem(Avaritia.ID, "Resource", 1L, 5), - GTBees.combs.getStackForType(CombType.INFINITY), - GTUtility.getIntegratedCircuit(3)) - .fluidInputs(MaterialsUEVplus.ExcitedDTRC.getFluid(infinity_bee.getCatalystAmount(2) / 64)) - .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue - .getFluid(infinity_bee.getResidueAmount(2) / 64), - Materials.Infinity.getMolten(144L)) - .duration(infinity_bee.getDuration(2) / 128).eut(infinity_bee.getEUt(2) / 64) - .metadata(COIL_HEAT, awakened_heat).addTo(plasmaForgeRecipes); - } - // normal recipes - - DTPFCalculator infinity = new DTPFCalculator().setBaseParallel(base_quantity).setLowestCatalystTier(2) - .setHighestCatalystTier(4).setEUtDivisor(2).calculateNonEBFRecipe(32_000_000, base_time); + { + // Spacetime + // V2 GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(Avaritia.ID, "Resource", 1L, 5), - GTUtility.getIntegratedCircuit(4)) - .fluidInputs(MaterialsUEVplus.ExcitedDTRC.getFluid(infinity.getCatalystAmount(2) / 64)) - .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue - .getFluid(infinity.getResidueAmount(2) / 64), - Materials.Infinity.getMolten(144L)) - .duration(infinity.getDuration(2) / 128).eut(infinity.getEUt(2) / 64) - .metadata(COIL_HEAT, awakened_heat).addTo(plasmaForgeRecipes); + ItemList.EnergisedTesseract.get(1), + GregtechItemList.Compressed_Fusion_Reactor.get(0)) + .fluidInputs( + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(5000L), + Materials.Infinity.getMolten(1152L)) + .fluidOutputs(MaterialsUEVplus.SpaceTime.getMolten(576L)).duration(20 * SECONDS) + .eut(2_000_000_000).metadata(COIL_HEAT, eternal_heat).addTo(plasmaForgeRecipes); + + // V1 + GTValues.RA.stdBuilder().itemInputs(ItemList.EnergisedTesseract.get(1)) + .fluidInputs( + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(10000L), + Materials.Infinity.getMolten(2304L), + new FluidStack(MaterialsElements.STANDALONE.HYPOGEN.getFluid(), 1152)) + .fluidOutputs(MaterialsUEVplus.SpaceTime.getMolten(144L)).duration(40 * SECONDS) + .eut(1_000_000_000).metadata(COIL_HEAT, hypogen_heat).addTo(plasmaForgeRecipes); + } + { + // Raw Tesseract + // 16 Vertices, 24 faces and 32 edges. + + // V3 GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(Avaritia.ID, "Resource", 1L, 5), - GTUtility.getIntegratedCircuit(1)) - .fluidInputs(MaterialsUEVplus.ExcitedDTRC.getFluid(infinity.getCatalystAmount(2))) - .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue - .getFluid(infinity.getResidueAmount(2)), - Materials.Infinity.getMolten(64L * 144L)) - .duration(infinity.getDuration(2)).eut(infinity.getEUt(2)).metadata(COIL_HEAT, hypogen_heat) + GTOreDictUnificator.get(OrePrefixes.stick, MaterialsUEVplus.TranscendentMetal, 32L), + MaterialsAlloy.BLACK_TITANIUM.getPlate(24), + MaterialsAlloy.ZERON_100.getScrew(16), + GregtechItemList.Laser_Lens_Special.get(1)) + .itemOutputs(ItemList.Tesseract.get(16)) + .fluidInputs(MaterialsUEVplus.ExcitedDTSC.getFluid(1000)) + .fluidOutputs(MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(2000)) + .duration(40 * SECONDS).eut(512_000_000).metadata(COIL_HEAT, eternal_heat) .addTo(plasmaForgeRecipes); + // V2 GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(Avaritia.ID, "Resource", 2L, 5), - GTUtility.getIntegratedCircuit(4)) - .fluidInputs(MaterialsUEVplus.ExcitedDTEC.getFluid(infinity.getCatalystAmount(3))) - .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue - .getFluid(infinity.getResidueAmount(3)), - Materials.Infinity.getMolten(128L * 144L)) - .duration(infinity.getDuration(3)).eut(infinity.getEUt(3)).metadata(COIL_HEAT, eternal_heat) + GTOreDictUnificator.get(OrePrefixes.stick, Materials.CosmicNeutronium, 12L), + GGMaterial.tairitsu.get(OrePrefixes.stick, 12), + GTOreDictUnificator.get(OrePrefixes.stick, MaterialsUEVplus.TranscendentMetal, 8L), + MaterialsAlloy.BOTMIUM.getPlate(24), + MaterialsAlloy.ARCANITE.getScrew(16), + GTModHandler.getModItem(SuperSolarPanels.ID, "enderquantumcomponent", 1L)) + .itemOutputs(ItemList.Tesseract.get(8)).fluidInputs(MaterialsUEVplus.ExcitedDTEC.getFluid(1000)) + .fluidOutputs(MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(1000)) + .duration(40 * SECONDS).eut(128_000_000).metadata(COIL_HEAT, eternal_heat) .addTo(plasmaForgeRecipes); + // V1 GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(Avaritia.ID, "Resource", 4L, 5), - GTUtility.getIntegratedCircuit(4)) - .fluidInputs(MaterialsUEVplus.ExcitedDTSC.getFluid(infinity.getCatalystAmount(4))) - .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue - .getFluid(infinity.getResidueAmount(4)), - Materials.Infinity.getMolten(256L * 144L)) - .duration(infinity.getDuration(4)).eut(infinity.getEUt(4)).metadata(COIL_HEAT, eternal_heat) + GTOreDictUnificator.get(OrePrefixes.stick, Materials.CosmicNeutronium, 8L), + MaterialsAlloy.OCTIRON.getRod(8), + GGMaterial.tairitsu.get(OrePrefixes.stick, 8), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.Sunnarium, 8L), + MaterialsAlloy.ABYSSAL.getPlate(24), + MaterialsAlloy.BOTMIUM.getScrew(16), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 1L)) + .itemOutputs(ItemList.Tesseract.get(4)).fluidInputs(MaterialsUEVplus.ExcitedDTRC.getFluid(1000)) + .fluidOutputs(MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(1000 / 2)) + .duration(40 * SECONDS).eut(32_000_000).metadata(COIL_HEAT, infinity_heat) .addTo(plasmaForgeRecipes); + } + if (Avaritia.isModLoaded()) { if (GalacticraftAmunRa.isModLoaded()) { // Dark Matter GTValues.RA.stdBuilder() @@ -758,65 +522,170 @@ public void run() { .fluidOutputs(MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(1797693L)) .eut(TierEU.RECIPE_UMV).metadata(COIL_HEAT, hypogen_heat).addTo(plasmaForgeRecipes); } - } - // Quantum anomaly - GTValues.RA.stdBuilder() - .itemInputs( - GregtechItemList.Laser_Lens_Special.get(1), - new ItemStack(Particle.getBaseParticle(Particle.GRAVITON).getItem(), 4), - CustomItemList.MysteriousCrystalLens.get(0), - ItemRefer.HiC_T5.get(0)) - .fluidInputs(MaterialsUEVplus.ExcitedDTEC.getFluid(92), Materials.Tritanium.getMolten(144)) - .itemOutputs(GregtechItemList.Laser_Lens_Special.get(4)).duration(5 * SECONDS) - .fluidOutputs(MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(92)) - .eut((int) TierEU.RECIPE_UIV).metadata(COIL_HEAT, eternal_heat).addTo(plasmaForgeRecipes); + { + // Infinity + + long base_time = 10_000; + long base_quantity = 64L; + + DTPFCalculator infinity = new DTPFCalculator().setBaseParallel(base_quantity) + .setLowestCatalystTier(2).setHighestCatalystTier(4).setEUtDivisor(2) + .calculateNonEBFRecipe(32_000_000, base_time); + + // Tier 5 + GTValues.RA.stdBuilder() + .itemInputs( + GTModHandler.getModItem(Avaritia.ID, "Resource", 4L, 5), + GTUtility.getIntegratedCircuit(4)) + .fluidInputs(MaterialsUEVplus.ExcitedDTSC.getFluid(infinity.getCatalystAmount(4))) + .fluidOutputs( + MaterialsUEVplus.DimensionallyTranscendentResidue + .getFluid(infinity.getResidueAmount(4)), + Materials.Infinity.getMolten(256L * 144L)) + .duration(infinity.getDuration(4)).eut(infinity.getEUt(4)).metadata(COIL_HEAT, eternal_heat) + .addTo(plasmaForgeRecipes); + + // Tier 4 + GTValues.RA.stdBuilder() + .itemInputs( + GTModHandler.getModItem(Avaritia.ID, "Resource", 2L, 5), + GTUtility.getIntegratedCircuit(4)) + .fluidInputs(MaterialsUEVplus.ExcitedDTEC.getFluid(infinity.getCatalystAmount(3))) + .fluidOutputs( + MaterialsUEVplus.DimensionallyTranscendentResidue + .getFluid(infinity.getResidueAmount(3)), + Materials.Infinity.getMolten(128L * 144L)) + .duration(infinity.getDuration(3)).eut(infinity.getEUt(3)).metadata(COIL_HEAT, eternal_heat) + .addTo(plasmaForgeRecipes); + + // Tier 3 + GTValues.RA.stdBuilder() + .itemInputs( + GTModHandler.getModItem(Avaritia.ID, "Resource", 1L, 5), + GTUtility.getIntegratedCircuit(4)) + .fluidInputs(MaterialsUEVplus.ExcitedDTRC.getFluid(infinity.getCatalystAmount(2) / 64)) + .fluidOutputs( + MaterialsUEVplus.DimensionallyTranscendentResidue + .getFluid(infinity.getResidueAmount(2) / 64), + Materials.Infinity.getMolten(144L)) + .duration(infinity.getDuration(2) / 128).eut(infinity.getEUt(2) / 64) + .metadata(COIL_HEAT, awakened_heat).addTo(plasmaForgeRecipes); + + // Tier 3.5 + GTValues.RA.stdBuilder() + .itemInputs( + GTModHandler.getModItem(Avaritia.ID, "Resource", 1L, 5), + GTUtility.getIntegratedCircuit(1)) + .fluidInputs(MaterialsUEVplus.ExcitedDTRC.getFluid(infinity.getCatalystAmount(2))) + .fluidOutputs( + MaterialsUEVplus.DimensionallyTranscendentResidue + .getFluid(infinity.getResidueAmount(2)), + Materials.Infinity.getMolten(64L * 144L)) + .duration(infinity.getDuration(2)).eut(infinity.getEUt(2)).metadata(COIL_HEAT, hypogen_heat) + .addTo(plasmaForgeRecipes); + + if (Forestry.isModLoaded()) { + DTPFCalculator infinity_bee = new DTPFCalculator().setBaseParallel(base_quantity) + .setLowestCatalystTier(2).setHighestCatalystTier(4).setCatalystDiscount(15) + .setProcessingTimeDiscount(50).setEUtDivisor(2) + .calculateNonEBFRecipe(32_000_000, base_time); + + // Tier 5 - Combs + GTValues.RA.stdBuilder() + .itemInputs( + GTModHandler.getModItem(Avaritia.ID, "Resource", 4L, 5), + GTBees.combs.getStackForType(CombType.INFINITY), + GTUtility.getIntegratedCircuit(3)) + .fluidInputs(MaterialsUEVplus.ExcitedDTSC.getFluid(infinity_bee.getCatalystAmount(4))) + .fluidOutputs( + MaterialsUEVplus.DimensionallyTranscendentResidue + .getFluid(infinity_bee.getResidueAmount(4)), + Materials.Infinity.getMolten(256L * 144L)) + .duration(infinity_bee.getDuration(4)).eut(infinity_bee.getEUt(4)) + .metadata(COIL_HEAT, eternal_heat).addTo(plasmaForgeRecipes); + + // Tier 4 - Combs + GTValues.RA.stdBuilder() + .itemInputs( + GTModHandler.getModItem(Avaritia.ID, "Resource", 2L, 5), + GTBees.combs.getStackForType(CombType.INFINITY), + GTUtility.getIntegratedCircuit(3)) + .fluidInputs(MaterialsUEVplus.ExcitedDTEC.getFluid(infinity_bee.getCatalystAmount(3))) + .fluidOutputs( + MaterialsUEVplus.DimensionallyTranscendentResidue + .getFluid(infinity_bee.getResidueAmount(3)), + Materials.Infinity.getMolten(128L * 144L)) + .duration(infinity_bee.getDuration(3)).eut(infinity_bee.getEUt(3)) + .metadata(COIL_HEAT, eternal_heat).addTo(plasmaForgeRecipes); + + // Tier 3.5 - Combs + GTValues.RA.stdBuilder() + .itemInputs( + GTModHandler.getModItem(Avaritia.ID, "Resource", 1L, 5), + GTBees.combs.getStackForType(CombType.INFINITY), + GTUtility.getIntegratedCircuit(2)) + .fluidInputs(MaterialsUEVplus.ExcitedDTRC.getFluid(infinity_bee.getCatalystAmount(2))) + .fluidOutputs( + MaterialsUEVplus.DimensionallyTranscendentResidue + .getFluid(infinity_bee.getResidueAmount(2)), + Materials.Infinity.getMolten(64L * 144L)) + .duration(infinity_bee.getDuration(2)).eut(infinity_bee.getEUt(2)) + .metadata(COIL_HEAT, hypogen_heat).addTo(plasmaForgeRecipes); + + // Tier 3 - Combs + GTValues.RA.stdBuilder() + .itemInputs( + GTModHandler.getModItem(Avaritia.ID, "Resource", 1L, 5), + GTBees.combs.getStackForType(CombType.INFINITY), + GTUtility.getIntegratedCircuit(3)) + .fluidInputs( + MaterialsUEVplus.ExcitedDTRC.getFluid(infinity_bee.getCatalystAmount(2) / 64)) + .fluidOutputs( + MaterialsUEVplus.DimensionallyTranscendentResidue + .getFluid(infinity_bee.getResidueAmount(2) / 64), + Materials.Infinity.getMolten(144L)) + .duration(infinity_bee.getDuration(2) / 128).eut(infinity_bee.getEUt(2) / 64) + .metadata(COIL_HEAT, awakened_heat).addTo(plasmaForgeRecipes); + } + + } + + } - // LuV Superconductor { + // LuV Superconductor long base_quantity = 8190L; long tier_up_multiplier = 2L; + long tier_1_quantity = 144L * base_quantity; + long tier_2_quantity = tier_1_quantity * tier_up_multiplier; + long tier_3_quantity = tier_2_quantity * tier_up_multiplier; + long tier_4_quantity = tier_3_quantity * tier_up_multiplier; + DTPFCalculator baseLuV = new DTPFCalculator().setBaseParallel(base_quantity) .calculateGenericEBFBasedRecipe( Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid); - long tier_1_quantity = 144L * base_quantity; - GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(6)) - .fluidInputs( - Materials.Indium.getMolten(4L * tier_1_quantity / 30), - Materials.Tin.getMolten(2L * tier_1_quantity / 30), - Materials.Barium.getMolten(2L * tier_1_quantity / 30), - Materials.Titanium.getMolten(tier_1_quantity / 30), - Materials.Copper.getMolten(7L * tier_1_quantity / 30), - Materials.Oxygen.getPlasma(14_000L / 32 * tier_1_quantity / 30 / 144), - MaterialsUEVplus.ExcitedDTCC.getFluid(baseLuV.getCatalystAmount(0))) - .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseLuV.getResidueAmount(0)), - Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid - .getMolten(tier_1_quantity)) - .duration(baseLuV.getDuration(0)).eut(baseLuV.getEUt(0)).metadata(COIL_HEAT, awakened_heat) - .addTo(plasmaForgeRecipes); - - long tier_2_quantity = 144L * base_quantity * tier_up_multiplier; + // Tier 4 GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(6)) .fluidInputs( - Materials.Indium.getMolten(4L * tier_2_quantity / 30), - Materials.Tin.getMolten(2L * tier_2_quantity / 30), - Materials.Barium.getMolten(2L * tier_2_quantity / 30), - Materials.Titanium.getMolten(tier_2_quantity / 30), - Materials.Copper.getMolten(7L * tier_2_quantity / 30), - Materials.Oxygen.getPlasma(14_000L / 32 * tier_2_quantity / 30 / 144), - MaterialsUEVplus.ExcitedDTPC.getFluid(baseLuV.getCatalystAmount(1))) + Materials.Indium.getMolten(4L * tier_4_quantity / 30), + Materials.Tin.getMolten(2L * tier_4_quantity / 30), + Materials.Barium.getMolten(2L * tier_4_quantity / 30), + Materials.Titanium.getMolten(tier_4_quantity / 30), + Materials.Copper.getMolten(7L * tier_4_quantity / 30), + Materials.Oxygen.getPlasma(14_000L / 32 * tier_4_quantity / 30 / 144), + MaterialsUEVplus.ExcitedDTEC.getFluid(baseLuV.getCatalystAmount(3))) .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseLuV.getResidueAmount(1)), + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseLuV.getResidueAmount(3)), Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid - .getMolten(tier_2_quantity)) - .duration(baseLuV.getDuration(1)).eut(baseLuV.getEUt(1)).metadata(COIL_HEAT, infinity_heat) + .getMolten(tier_4_quantity)) + .duration(baseLuV.getDuration(3)).eut(baseLuV.getEUt(3)).metadata(COIL_HEAT, eternal_heat) .addTo(plasmaForgeRecipes); - long tier_3_quantity = 144L * base_quantity * tier_up_multiplier * tier_up_multiplier; + // Tier 3 GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(6)) .fluidInputs( Materials.Indium.getMolten(4L * tier_3_quantity / 30), @@ -833,65 +702,70 @@ public void run() { .duration(baseLuV.getDuration(2)).eut(baseLuV.getEUt(2)).metadata(COIL_HEAT, hypogen_heat) .addTo(plasmaForgeRecipes); - long tier_4_quantity = 144L * base_quantity - * tier_up_multiplier - * tier_up_multiplier - * tier_up_multiplier; + // Tier 2 GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(6)) .fluidInputs( - Materials.Indium.getMolten(4L * tier_4_quantity / 30), - Materials.Tin.getMolten(2L * tier_4_quantity / 30), - Materials.Barium.getMolten(2L * tier_4_quantity / 30), - Materials.Titanium.getMolten(tier_4_quantity / 30), - Materials.Copper.getMolten(7L * tier_4_quantity / 30), - Materials.Oxygen.getPlasma(14_000L / 32 * tier_4_quantity / 30 / 144), - MaterialsUEVplus.ExcitedDTEC.getFluid(baseLuV.getCatalystAmount(3))) + Materials.Indium.getMolten(4L * tier_2_quantity / 30), + Materials.Tin.getMolten(2L * tier_2_quantity / 30), + Materials.Barium.getMolten(2L * tier_2_quantity / 30), + Materials.Titanium.getMolten(tier_2_quantity / 30), + Materials.Copper.getMolten(7L * tier_2_quantity / 30), + Materials.Oxygen.getPlasma(14_000L / 32 * tier_2_quantity / 30 / 144), + MaterialsUEVplus.ExcitedDTPC.getFluid(baseLuV.getCatalystAmount(1))) .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseLuV.getResidueAmount(3)), + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseLuV.getResidueAmount(1)), Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid - .getMolten(tier_4_quantity)) - .duration(baseLuV.getDuration(3)).eut(baseLuV.getEUt(3)).metadata(COIL_HEAT, eternal_heat) + .getMolten(tier_2_quantity)) + .duration(baseLuV.getDuration(1)).eut(baseLuV.getEUt(1)).metadata(COIL_HEAT, infinity_heat) + .addTo(plasmaForgeRecipes); + + // Tier 1 + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(6)) + .fluidInputs( + Materials.Indium.getMolten(4L * tier_1_quantity / 30), + Materials.Tin.getMolten(2L * tier_1_quantity / 30), + Materials.Barium.getMolten(2L * tier_1_quantity / 30), + Materials.Titanium.getMolten(tier_1_quantity / 30), + Materials.Copper.getMolten(7L * tier_1_quantity / 30), + Materials.Oxygen.getPlasma(14_000L / 32 * tier_1_quantity / 30 / 144), + MaterialsUEVplus.ExcitedDTCC.getFluid(baseLuV.getCatalystAmount(0))) + .fluidOutputs( + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseLuV.getResidueAmount(0)), + Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid + .getMolten(tier_1_quantity)) + .duration(baseLuV.getDuration(0)).eut(baseLuV.getEUt(0)).metadata(COIL_HEAT, awakened_heat) .addTo(plasmaForgeRecipes); } - // ZPM Superconductor { + // ZPM Superconductor long base_quantity = 4095L; long tier_up_multiplier = 2L; + long tier_1_quantity = 144L * base_quantity; + long tier_2_quantity = tier_1_quantity * tier_up_multiplier; + long tier_3_quantity = tier_2_quantity * tier_up_multiplier; + long tier_4_quantity = tier_3_quantity * tier_up_multiplier; + DTPFCalculator baseZPM = new DTPFCalculator().setBaseParallel(base_quantity) .calculateGenericEBFBasedRecipe(Materials.Tetranaquadahdiindiumhexaplatiumosminid); - long tier_1_quantity = 144L * base_quantity; - GTValues.RA.stdBuilder() - .fluidInputs( - Materials.Palladium.getMolten(6L * tier_1_quantity / 13), - Materials.Indium.getMolten(2L * tier_1_quantity / 13), - Materials.Osmium.getMolten(tier_1_quantity / 13), - Materials.Naquadah.getMolten(4L * tier_1_quantity / 13), - MaterialsUEVplus.ExcitedDTCC.getFluid(baseZPM.getCatalystAmount(0))) - .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseZPM.getResidueAmount(0)), - Materials.Tetranaquadahdiindiumhexaplatiumosminid.getMolten(tier_1_quantity)) - .duration(baseZPM.getDuration(0)).eut(baseZPM.getEUt(0)).metadata(COIL_HEAT, awakened_heat) - .addTo(plasmaForgeRecipes); - - long tier_2_quantity = 144L * base_quantity * tier_up_multiplier; + // Tier 4 GTValues.RA.stdBuilder() .fluidInputs( - Materials.Palladium.getMolten(6L * tier_2_quantity / 13), - Materials.Indium.getMolten(2L * tier_2_quantity / 13), - Materials.Osmium.getMolten(tier_2_quantity / 13), - Materials.Naquadah.getMolten(4L * tier_2_quantity / 13), - MaterialsUEVplus.ExcitedDTPC.getFluid(baseZPM.getCatalystAmount(1))) + Materials.Palladium.getMolten(6L * tier_4_quantity / 13), + Materials.Indium.getMolten(2L * tier_4_quantity / 13), + Materials.Osmium.getMolten(tier_4_quantity / 13), + Materials.Naquadah.getMolten(4L * tier_4_quantity / 13), + MaterialsUEVplus.ExcitedDTEC.getFluid(baseZPM.getCatalystAmount(3))) .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseZPM.getResidueAmount(1)), - Materials.Tetranaquadahdiindiumhexaplatiumosminid.getMolten(tier_2_quantity)) - .duration(baseZPM.getDuration(1)).eut(baseZPM.getEUt(1)).metadata(COIL_HEAT, infinity_heat) + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseZPM.getResidueAmount(3)), + Materials.Tetranaquadahdiindiumhexaplatiumosminid.getMolten(tier_4_quantity)) + .duration(baseZPM.getDuration(3)).eut(baseZPM.getEUt(3)).metadata(COIL_HEAT, eternal_heat) .addTo(plasmaForgeRecipes); - long tier_3_quantity = 144L * base_quantity * tier_up_multiplier * tier_up_multiplier; + // Tier 3 GTValues.RA.stdBuilder() .fluidInputs( Materials.Palladium.getMolten(6L * tier_3_quantity / 13), @@ -905,62 +779,64 @@ public void run() { .duration(baseZPM.getDuration(2)).eut(baseZPM.getEUt(2)).metadata(COIL_HEAT, hypogen_heat) .addTo(plasmaForgeRecipes); - long tier_4_quantity = 144L * base_quantity - * tier_up_multiplier - * tier_up_multiplier - * tier_up_multiplier; + // Tier 2 GTValues.RA.stdBuilder() .fluidInputs( - Materials.Palladium.getMolten(6L * tier_4_quantity / 13), - Materials.Indium.getMolten(2L * tier_4_quantity / 13), - Materials.Osmium.getMolten(tier_4_quantity / 13), - Materials.Naquadah.getMolten(4L * tier_4_quantity / 13), - MaterialsUEVplus.ExcitedDTEC.getFluid(baseZPM.getCatalystAmount(3))) + Materials.Palladium.getMolten(6L * tier_2_quantity / 13), + Materials.Indium.getMolten(2L * tier_2_quantity / 13), + Materials.Osmium.getMolten(tier_2_quantity / 13), + Materials.Naquadah.getMolten(4L * tier_2_quantity / 13), + MaterialsUEVplus.ExcitedDTPC.getFluid(baseZPM.getCatalystAmount(1))) .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseZPM.getResidueAmount(3)), - Materials.Tetranaquadahdiindiumhexaplatiumosminid.getMolten(tier_4_quantity)) - .duration(baseZPM.getDuration(3)).eut(baseZPM.getEUt(3)).metadata(COIL_HEAT, eternal_heat) + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseZPM.getResidueAmount(1)), + Materials.Tetranaquadahdiindiumhexaplatiumosminid.getMolten(tier_2_quantity)) + .duration(baseZPM.getDuration(1)).eut(baseZPM.getEUt(1)).metadata(COIL_HEAT, infinity_heat) .addTo(plasmaForgeRecipes); - } - // UV Superconductor. + // Tier 1 + GTValues.RA.stdBuilder() + .fluidInputs( + Materials.Palladium.getMolten(6L * tier_1_quantity / 13), + Materials.Indium.getMolten(2L * tier_1_quantity / 13), + Materials.Osmium.getMolten(tier_1_quantity / 13), + Materials.Naquadah.getMolten(4L * tier_1_quantity / 13), + MaterialsUEVplus.ExcitedDTCC.getFluid(baseZPM.getCatalystAmount(0))) + .fluidOutputs( + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseZPM.getResidueAmount(0)), + Materials.Tetranaquadahdiindiumhexaplatiumosminid.getMolten(tier_1_quantity)) + .duration(baseZPM.getDuration(0)).eut(baseZPM.getEUt(0)).metadata(COIL_HEAT, awakened_heat) + .addTo(plasmaForgeRecipes); + } { + // UV Superconductor + long base_quantity = 2043L; long tier_up_multiplier = 2L; + long tier_1_quantity = 144L * base_quantity; + long tier_2_quantity = tier_1_quantity * tier_up_multiplier; + long tier_3_quantity = tier_2_quantity * tier_up_multiplier; + long tier_4_quantity = tier_3_quantity * tier_up_multiplier; + DTPFCalculator baseUV = new DTPFCalculator().setBaseParallel(base_quantity) .calculateGenericEBFBasedRecipe(Materials.Longasssuperconductornameforuvwire); - long tier_1_quantity = 144L * base_quantity; - GTValues.RA.stdBuilder() - .fluidInputs( - Materials.Samarium.getMolten(tier_1_quantity / 9), - Materials.Europium.getMolten(tier_1_quantity / 9), - Materials.Osmiridium.getMolten(3L * tier_1_quantity / 9), - Materials.Naquadria.getMolten(4L * tier_1_quantity / 9), - MaterialsUEVplus.ExcitedDTCC.getFluid(baseUV.getCatalystAmount(0))) - .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUV.getResidueAmount(0)), - Materials.Longasssuperconductornameforuvwire.getMolten(tier_1_quantity)) - .duration(baseUV.getDuration(0)).eut(baseUV.getEUt(0)).metadata(COIL_HEAT, awakened_heat) - .addTo(plasmaForgeRecipes); - - long tier_2_quantity = 144L * base_quantity * tier_up_multiplier; + // Tier 4 GTValues.RA.stdBuilder() .fluidInputs( - Materials.Samarium.getMolten(tier_2_quantity / 9), - Materials.Europium.getMolten(tier_2_quantity / 9), - Materials.Osmiridium.getMolten(3L * tier_2_quantity / 9), - Materials.Naquadria.getMolten(4L * tier_2_quantity / 9), - MaterialsUEVplus.ExcitedDTPC.getFluid(baseUV.getCatalystAmount(1))) + Materials.Samarium.getMolten(tier_4_quantity / 9), + Materials.Europium.getMolten(tier_4_quantity / 9), + Materials.Osmiridium.getMolten(3L * tier_4_quantity / 9), + Materials.Naquadria.getMolten(4L * tier_4_quantity / 9), + MaterialsUEVplus.ExcitedDTEC.getFluid(baseUV.getCatalystAmount(3))) .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUV.getResidueAmount(1)), - Materials.Longasssuperconductornameforuvwire.getMolten(tier_2_quantity)) - .duration(baseUV.getDuration(1)).eut(baseUV.getEUt(1)).metadata(COIL_HEAT, infinity_heat) + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUV.getResidueAmount(3)), + Materials.Longasssuperconductornameforuvwire.getMolten(tier_4_quantity)) + .duration(baseUV.getDuration(3)).eut(baseUV.getEUt(3)).metadata(COIL_HEAT, eternal_heat) .addTo(plasmaForgeRecipes); - long tier_3_quantity = 144L * base_quantity * tier_up_multiplier * tier_up_multiplier; + // Tier 3 GTValues.RA.stdBuilder() .fluidInputs( Materials.Samarium.getMolten(tier_3_quantity / 9), @@ -974,240 +850,405 @@ public void run() { .duration(baseUV.getDuration(2)).eut(baseUV.getEUt(2)).metadata(COIL_HEAT, hypogen_heat) .addTo(plasmaForgeRecipes); - long tier_4_quantity = 144L * base_quantity - * tier_up_multiplier - * tier_up_multiplier - * tier_up_multiplier; + // Tier 2 GTValues.RA.stdBuilder() .fluidInputs( - Materials.Samarium.getMolten(tier_4_quantity / 9), - Materials.Europium.getMolten(tier_4_quantity / 9), - Materials.Osmiridium.getMolten(3L * tier_4_quantity / 9), - Materials.Naquadria.getMolten(4L * tier_4_quantity / 9), - MaterialsUEVplus.ExcitedDTEC.getFluid(baseUV.getCatalystAmount(3))) + Materials.Samarium.getMolten(tier_2_quantity / 9), + Materials.Europium.getMolten(tier_2_quantity / 9), + Materials.Osmiridium.getMolten(3L * tier_2_quantity / 9), + Materials.Naquadria.getMolten(4L * tier_2_quantity / 9), + MaterialsUEVplus.ExcitedDTPC.getFluid(baseUV.getCatalystAmount(1))) + .fluidOutputs( + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUV.getResidueAmount(1)), + Materials.Longasssuperconductornameforuvwire.getMolten(tier_2_quantity)) + .duration(baseUV.getDuration(1)).eut(baseUV.getEUt(1)).metadata(COIL_HEAT, infinity_heat) + .addTo(plasmaForgeRecipes); + + // Tier 1 + GTValues.RA.stdBuilder() + .fluidInputs( + Materials.Samarium.getMolten(tier_1_quantity / 9), + Materials.Europium.getMolten(tier_1_quantity / 9), + Materials.Osmiridium.getMolten(3L * tier_1_quantity / 9), + Materials.Naquadria.getMolten(4L * tier_1_quantity / 9), + MaterialsUEVplus.ExcitedDTCC.getFluid(baseUV.getCatalystAmount(0))) .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUV.getResidueAmount(3)), - Materials.Longasssuperconductornameforuvwire.getMolten(tier_4_quantity)) - .duration(baseUV.getDuration(3)).eut(baseUV.getEUt(3)).metadata(COIL_HEAT, eternal_heat) + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUV.getResidueAmount(0)), + Materials.Longasssuperconductornameforuvwire.getMolten(tier_1_quantity)) + .duration(baseUV.getDuration(0)).eut(baseUV.getEUt(0)).metadata(COIL_HEAT, awakened_heat) .addTo(plasmaForgeRecipes); } - // UHV Superconductor. - { + // UHV Superconductor + long base_quantity = 1008L; long tier_up_multiplier = 2L; + long tier_2_quantity = 144L * base_quantity; + long tier_3_quantity = tier_2_quantity * tier_up_multiplier; + long tier_4_quantity = tier_3_quantity * tier_up_multiplier; + long tier_5_quantity = tier_4_quantity * tier_up_multiplier; + DTPFCalculator baseUHV = new DTPFCalculator().setBaseParallel(base_quantity).setLowestCatalystTier(1) .setHighestCatalystTier(4) .calculateGenericEBFBasedRecipe(Materials.Longasssuperconductornameforuhvwire); - long tier_1_quantity = 144L * base_quantity; + // Tier 5 GTValues.RA.stdBuilder() .fluidInputs( - Materials.Draconium.getMolten(6L * tier_1_quantity / 24), - Materials.Americium.getMolten(6L * tier_1_quantity / 24), - Materials.CosmicNeutronium.getMolten(7L * tier_1_quantity / 24), - Materials.Tritanium.getMolten(5L * tier_1_quantity / 24), - MaterialsUEVplus.ExcitedDTPC.getFluid(baseUHV.getCatalystAmount(1))) + Materials.Draconium.getMolten(6L * tier_5_quantity / 24), + Materials.Americium.getMolten(6L * tier_5_quantity / 24), + Materials.CosmicNeutronium.getMolten(7L * tier_5_quantity / 24), + Materials.Tritanium.getMolten(5L * tier_5_quantity / 24), + MaterialsUEVplus.ExcitedDTSC.getFluid(baseUHV.getCatalystAmount(4))) .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUHV.getResidueAmount(1)), - Materials.Longasssuperconductornameforuhvwire.getMolten(tier_1_quantity)) - .duration(baseUHV.getDuration(1)).eut(baseUHV.getEUt(1)).metadata(COIL_HEAT, infinity_heat) + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUHV.getResidueAmount(4)), + Materials.Longasssuperconductornameforuhvwire.getMolten(tier_5_quantity)) + .duration(baseUHV.getDuration(4)).eut(baseUHV.getEUt(4)).metadata(COIL_HEAT, eternal_heat) .addTo(plasmaForgeRecipes); - long tier_2_quantity = 144L * base_quantity * tier_up_multiplier; + // Tier 4 GTValues.RA.stdBuilder() .fluidInputs( - Materials.Draconium.getMolten(6L * tier_2_quantity / 24), - Materials.Americium.getMolten(6L * tier_2_quantity / 24), - Materials.CosmicNeutronium.getMolten(7L * tier_2_quantity / 24), - Materials.Tritanium.getMolten(5L * tier_2_quantity / 24), - MaterialsUEVplus.ExcitedDTRC.getFluid(baseUHV.getCatalystAmount(2))) + Materials.Draconium.getMolten(6L * tier_4_quantity / 24), + Materials.Americium.getMolten(6L * tier_4_quantity / 24), + Materials.CosmicNeutronium.getMolten(7L * tier_4_quantity / 24), + Materials.Tritanium.getMolten(5L * tier_4_quantity / 24), + MaterialsUEVplus.ExcitedDTEC.getFluid(baseUHV.getCatalystAmount(3))) .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUHV.getResidueAmount(2)), - Materials.Longasssuperconductornameforuhvwire.getMolten(tier_2_quantity)) - .duration(baseUHV.getDuration(2)).eut(baseUHV.getEUt(2)).metadata(COIL_HEAT, hypogen_heat) + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUHV.getResidueAmount(3)), + Materials.Longasssuperconductornameforuhvwire.getMolten(tier_4_quantity)) + .duration(baseUHV.getDuration(3)).eut(baseUHV.getEUt(3)).metadata(COIL_HEAT, eternal_heat) .addTo(plasmaForgeRecipes); - long tier_3_quantity = 144L * base_quantity * tier_up_multiplier * tier_up_multiplier; + // Tier 3 GTValues.RA.stdBuilder() .fluidInputs( Materials.Draconium.getMolten(6L * tier_3_quantity / 24), Materials.Americium.getMolten(6L * tier_3_quantity / 24), Materials.CosmicNeutronium.getMolten(7L * tier_3_quantity / 24), Materials.Tritanium.getMolten(5L * tier_3_quantity / 24), - MaterialsUEVplus.ExcitedDTEC.getFluid(baseUHV.getCatalystAmount(3))) + MaterialsUEVplus.ExcitedDTRC.getFluid(baseUHV.getCatalystAmount(2))) .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUHV.getResidueAmount(3)), + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUHV.getResidueAmount(2)), Materials.Longasssuperconductornameforuhvwire.getMolten(tier_3_quantity)) - .duration(baseUHV.getDuration(3)).eut(baseUHV.getEUt(3)).metadata(COIL_HEAT, eternal_heat) + .duration(baseUHV.getDuration(2)).eut(baseUHV.getEUt(2)).metadata(COIL_HEAT, hypogen_heat) .addTo(plasmaForgeRecipes); - long tier_4_quantity = 144L * base_quantity * (long) Math.pow(tier_up_multiplier, 3); + // Tier 2 GTValues.RA.stdBuilder() .fluidInputs( - Materials.Draconium.getMolten(6L * tier_4_quantity / 24), - Materials.Americium.getMolten(6L * tier_4_quantity / 24), - Materials.CosmicNeutronium.getMolten(7L * tier_4_quantity / 24), - Materials.Tritanium.getMolten(5L * tier_4_quantity / 24), - MaterialsUEVplus.ExcitedDTSC.getFluid(baseUHV.getCatalystAmount(4))) + Materials.Draconium.getMolten(6L * tier_2_quantity / 24), + Materials.Americium.getMolten(6L * tier_2_quantity / 24), + Materials.CosmicNeutronium.getMolten(7L * tier_2_quantity / 24), + Materials.Tritanium.getMolten(5L * tier_2_quantity / 24), + MaterialsUEVplus.ExcitedDTPC.getFluid(baseUHV.getCatalystAmount(1))) .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUHV.getResidueAmount(4)), - Materials.Longasssuperconductornameforuhvwire.getMolten(tier_4_quantity)) - .duration(baseUHV.getDuration(4)).eut(baseUHV.getEUt(4)).metadata(COIL_HEAT, eternal_heat) + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUHV.getResidueAmount(1)), + Materials.Longasssuperconductornameforuhvwire.getMolten(tier_2_quantity)) + .duration(baseUHV.getDuration(1)).eut(baseUHV.getEUt(1)).metadata(COIL_HEAT, infinity_heat) .addTo(plasmaForgeRecipes); } - // UEV Superconductors. { + // UEV Superconductor + long base_quantity = 504L; long tier_up_multiplier = 2L; + long tier_3_quantity = 144L * base_quantity; + long tier_4_quantity = tier_3_quantity * tier_up_multiplier; + long tier_5_quantity = tier_4_quantity * tier_up_multiplier; + DTPFCalculator baseUEV = new DTPFCalculator().setBaseParallel(base_quantity).setLowestCatalystTier(2) .setHighestCatalystTier(4).calculateGenericEBFBasedRecipe(Materials.SuperconductorUEVBase); - long tier_1_quantity = 144L * base_quantity; - + // Tier 5 GTValues.RA.stdBuilder().fluidInputs( - new FluidStack(FluidRegistry.getFluid("molten.advancednitinol"), (int) tier_1_quantity / 12), - new FluidStack(FluidRegistry.getFluid("molten.celestialtungsten"), (int) tier_1_quantity / 12), - Materials.DraconiumAwakened.getMolten(5L * tier_1_quantity / 12), - Materials.Infinity.getMolten(5L * tier_1_quantity / 12), - Materials.Iron.getPlasma(tier_1_quantity / 12), - MaterialsUEVplus.ExcitedDTRC.getFluid(baseUEV.getCatalystAmount(2))) + new FluidStack(FluidRegistry.getFluid("molten.advancednitinol"), (int) tier_5_quantity / 12), + new FluidStack(FluidRegistry.getFluid("molten.celestialtungsten"), (int) tier_5_quantity / 12), + Materials.DraconiumAwakened.getMolten(5L * tier_5_quantity / 12), + Materials.Infinity.getMolten(5L * tier_5_quantity / 12), + Materials.Iron.getPlasma(tier_5_quantity / 12), + MaterialsUEVplus.ExcitedDTSC.getFluid(baseUEV.getCatalystAmount(4))) .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUEV.getResidueAmount(2)), - Materials.SuperconductorUEVBase.getMolten(tier_1_quantity)) - .duration(baseUEV.getDuration(2)).eut(baseUEV.getEUt(2)).metadata(COIL_HEAT, hypogen_heat) + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUEV.getResidueAmount(4)), + Materials.SuperconductorUEVBase.getMolten(tier_5_quantity)) + .duration(baseUEV.getDuration(4)).eut(baseUEV.getEUt(4)).metadata(COIL_HEAT, eternal_heat) .addTo(plasmaForgeRecipes); - long tier_2_quantity = 144L * base_quantity * tier_up_multiplier; - + // Tier 4 GTValues.RA.stdBuilder().fluidInputs( - new FluidStack(FluidRegistry.getFluid("molten.advancednitinol"), (int) tier_2_quantity / 12), - new FluidStack(FluidRegistry.getFluid("molten.celestialtungsten"), (int) tier_2_quantity / 12), - Materials.DraconiumAwakened.getMolten(5L * tier_2_quantity / 12), - Materials.Infinity.getMolten(5L * tier_2_quantity / 12), - Materials.Iron.getPlasma(tier_2_quantity / 12), + new FluidStack(FluidRegistry.getFluid("molten.advancednitinol"), (int) tier_4_quantity / 12), + new FluidStack(FluidRegistry.getFluid("molten.celestialtungsten"), (int) tier_4_quantity / 12), + Materials.DraconiumAwakened.getMolten(5L * tier_4_quantity / 12), + Materials.Infinity.getMolten(5L * tier_4_quantity / 12), + Materials.Iron.getPlasma(tier_4_quantity / 12), MaterialsUEVplus.ExcitedDTEC.getFluid(baseUEV.getCatalystAmount(3))) .fluidOutputs( MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUEV.getResidueAmount(3)), - Materials.SuperconductorUEVBase.getMolten(tier_2_quantity)) + Materials.SuperconductorUEVBase.getMolten(tier_4_quantity)) .duration(baseUEV.getDuration(3)).eut(baseUEV.getEUt(3)).metadata(COIL_HEAT, eternal_heat) .addTo(plasmaForgeRecipes); - long tier_3_quantity = 144L * base_quantity * tier_up_multiplier * tier_up_multiplier; - + // Tier 3 GTValues.RA.stdBuilder().fluidInputs( new FluidStack(FluidRegistry.getFluid("molten.advancednitinol"), (int) tier_3_quantity / 12), new FluidStack(FluidRegistry.getFluid("molten.celestialtungsten"), (int) tier_3_quantity / 12), Materials.DraconiumAwakened.getMolten(5L * tier_3_quantity / 12), Materials.Infinity.getMolten(5L * tier_3_quantity / 12), Materials.Iron.getPlasma(tier_3_quantity / 12), - MaterialsUEVplus.ExcitedDTSC.getFluid(baseUEV.getCatalystAmount(4))) + MaterialsUEVplus.ExcitedDTRC.getFluid(baseUEV.getCatalystAmount(2))) .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUEV.getResidueAmount(4)), + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUEV.getResidueAmount(2)), Materials.SuperconductorUEVBase.getMolten(tier_3_quantity)) - .duration(baseUEV.getDuration(4)).eut(baseUEV.getEUt(4)).metadata(COIL_HEAT, eternal_heat) + .duration(baseUEV.getDuration(2)).eut(baseUEV.getEUt(2)).metadata(COIL_HEAT, hypogen_heat) .addTo(plasmaForgeRecipes); } - // UIV Superconductors. { + // UIV Superconductor long base_quantity = 250L; long tier_up_multiplier = 2L; + long tier_3_quantity = 144L * base_quantity; + long tier_4_quantity = tier_3_quantity * tier_up_multiplier; + long tier_5_quantity = tier_4_quantity * tier_up_multiplier; + DTPFCalculator baseUIV = new DTPFCalculator().setBaseParallel(base_quantity).setLowestCatalystTier(2) .setHighestCatalystTier(4).calculateGenericEBFBasedRecipe(Materials.SuperconductorUIVBase); - long tier_1_quantity = 144L * base_quantity; - + // Tier 5 GTValues.RA.stdBuilder().fluidInputs( - Materials.RadoxPolymer.getMolten(4L * tier_1_quantity / 25), - MaterialsUEVplus.TranscendentMetal.getMolten(10L * tier_1_quantity / 25), - new FluidStack(FluidRegistry.getFluid("molten.rhugnor"), (int) tier_1_quantity * 6 / 25), - new FluidStack(FluidRegistry.getFluid("molten.chromaticglass"), (int) tier_1_quantity * 5 / 25), - Materials.Bismuth.getPlasma(tier_1_quantity / 25), - MaterialsUEVplus.ExcitedDTRC.getFluid(baseUIV.getCatalystAmount(2))) + Materials.RadoxPolymer.getMolten(4L * tier_5_quantity / 25), + MaterialsUEVplus.TranscendentMetal.getMolten(10L * tier_5_quantity / 25), + new FluidStack(FluidRegistry.getFluid("molten.rhugnor"), (int) tier_5_quantity * 6 / 25), + new FluidStack(FluidRegistry.getFluid("molten.chromaticglass"), (int) tier_5_quantity * 5 / 25), + Materials.Bismuth.getPlasma(tier_5_quantity / 25), + MaterialsUEVplus.ExcitedDTSC.getFluid(baseUIV.getCatalystAmount(4))) .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUIV.getResidueAmount(2)), - Materials.SuperconductorUIVBase.getMolten(tier_1_quantity)) - .duration(baseUIV.getDuration(2)).eut(baseUIV.getEUt(2)).metadata(COIL_HEAT, hypogen_heat) + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUIV.getResidueAmount(4)), + Materials.SuperconductorUIVBase.getMolten(tier_5_quantity)) + .duration(baseUIV.getDuration(4)).eut(baseUIV.getEUt(4)).metadata(COIL_HEAT, eternal_heat) .addTo(plasmaForgeRecipes); - long tier_2_quantity = 144L * base_quantity * tier_up_multiplier; - + // Tier 4 GTValues.RA.stdBuilder().fluidInputs( - Materials.RadoxPolymer.getMolten(4L * tier_2_quantity / 25), - MaterialsUEVplus.TranscendentMetal.getMolten(10L * tier_2_quantity / 25), - new FluidStack(FluidRegistry.getFluid("molten.rhugnor"), (int) tier_2_quantity * 6 / 25), - new FluidStack(FluidRegistry.getFluid("molten.chromaticglass"), (int) tier_2_quantity * 5 / 25), - Materials.Bismuth.getPlasma(tier_2_quantity / 25), + Materials.RadoxPolymer.getMolten(4L * tier_4_quantity / 25), + MaterialsUEVplus.TranscendentMetal.getMolten(10L * tier_4_quantity / 25), + new FluidStack(FluidRegistry.getFluid("molten.rhugnor"), (int) tier_4_quantity * 6 / 25), + new FluidStack(FluidRegistry.getFluid("molten.chromaticglass"), (int) tier_4_quantity * 5 / 25), + Materials.Bismuth.getPlasma(tier_4_quantity / 25), MaterialsUEVplus.ExcitedDTEC.getFluid(baseUIV.getCatalystAmount(3))) .fluidOutputs( MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUIV.getResidueAmount(3)), - Materials.SuperconductorUIVBase.getMolten(tier_2_quantity)) + Materials.SuperconductorUIVBase.getMolten(tier_4_quantity)) .duration(baseUIV.getDuration(3)).eut(baseUIV.getEUt(3)).metadata(COIL_HEAT, eternal_heat) .addTo(plasmaForgeRecipes); - long tier_3_quantity = 144L * base_quantity * tier_up_multiplier * tier_up_multiplier; - + // Tier 3 GTValues.RA.stdBuilder().fluidInputs( Materials.RadoxPolymer.getMolten(4L * tier_3_quantity / 25), MaterialsUEVplus.TranscendentMetal.getMolten(10L * tier_3_quantity / 25), new FluidStack(FluidRegistry.getFluid("molten.rhugnor"), (int) tier_3_quantity * 6 / 25), new FluidStack(FluidRegistry.getFluid("molten.chromaticglass"), (int) tier_3_quantity * 5 / 25), Materials.Bismuth.getPlasma(tier_3_quantity / 25), - MaterialsUEVplus.ExcitedDTSC.getFluid(baseUIV.getCatalystAmount(4))) + MaterialsUEVplus.ExcitedDTRC.getFluid(baseUIV.getCatalystAmount(2))) .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUIV.getResidueAmount(4)), + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUIV.getResidueAmount(2)), Materials.SuperconductorUIVBase.getMolten(tier_3_quantity)) - .duration(baseUIV.getDuration(4)).eut(baseUIV.getEUt(4)).metadata(COIL_HEAT, eternal_heat) + .duration(baseUIV.getDuration(2)).eut(baseUIV.getEUt(2)).metadata(COIL_HEAT, hypogen_heat) .addTo(plasmaForgeRecipes); } - // UMV Superconductors. { + // UMV Superconductor long base_quantity = 243L; long tier_up_multiplier = 2L; + long tier_4_quantity = 144L * base_quantity; + long tier_5_quantity = tier_4_quantity * tier_up_multiplier; + DTPFCalculator baseUMV = new DTPFCalculator().setBaseParallel(base_quantity).setLowestCatalystTier(3) .setHighestCatalystTier(4).calculateGenericEBFBasedRecipe(Materials.SuperconductorUMVBase); - long tier_1_quantity = 144L * base_quantity; + // Tier 5 GTValues.RA.stdBuilder().fluidInputs( - MaterialsUEVplus.SpaceTime.getMolten(6L * tier_1_quantity / 27), - new FluidStack(FluidRegistry.getFluid("molten.orundum"), (int) tier_1_quantity * 3 / 27), - new FluidStack(FluidRegistry.getFluid("molten.hypogen"), (int) tier_1_quantity * 11 / 27), - new FluidStack(FluidRegistry.getFluid("molten.titansteel"), (int) tier_1_quantity * 5 / 27), - new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), (int) tier_1_quantity * 2 / 27), - Materials.Oxygen.getPlasma(tier_1_quantity / 27), - MaterialsUEVplus.ExcitedDTEC.getFluid(baseUMV.getCatalystAmount(3))) + MaterialsUEVplus.SpaceTime.getMolten(6L * tier_5_quantity / 27), + new FluidStack(FluidRegistry.getFluid("molten.orundum"), (int) tier_5_quantity * 3 / 27), + new FluidStack(FluidRegistry.getFluid("molten.hypogen"), (int) tier_5_quantity * 11 / 27), + new FluidStack(FluidRegistry.getFluid("molten.titansteel"), (int) tier_5_quantity * 5 / 27), + new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), (int) tier_5_quantity * 2 / 27), + Materials.Oxygen.getPlasma(tier_5_quantity / 27), + MaterialsUEVplus.ExcitedDTSC.getFluid(baseUMV.getCatalystAmount(4))) .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUMV.getResidueAmount(3)), - Materials.SuperconductorUMVBase.getMolten(tier_1_quantity)) - .duration(baseUMV.getDuration(3)).eut(baseUMV.getEUt(3)).metadata(COIL_HEAT, eternal_heat) + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUMV.getResidueAmount(4)), + Materials.SuperconductorUMVBase.getMolten(tier_5_quantity)) + .duration(baseUMV.getDuration(4)).eut(baseUMV.getEUt(4)).metadata(COIL_HEAT, eternal_heat) .addTo(plasmaForgeRecipes); - long tier_2_quantity = 144L * base_quantity * tier_up_multiplier; - + // Tier 4 GTValues.RA.stdBuilder().fluidInputs( - MaterialsUEVplus.SpaceTime.getMolten(6L * tier_2_quantity / 27), - new FluidStack(FluidRegistry.getFluid("molten.orundum"), (int) tier_2_quantity * 3 / 27), - new FluidStack(FluidRegistry.getFluid("molten.hypogen"), (int) tier_2_quantity * 11 / 27), - new FluidStack(FluidRegistry.getFluid("molten.titansteel"), (int) tier_2_quantity * 5 / 27), - new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), (int) tier_2_quantity * 2 / 27), - Materials.Oxygen.getPlasma(tier_2_quantity / 27), - MaterialsUEVplus.ExcitedDTSC.getFluid(baseUMV.getCatalystAmount(4))) + MaterialsUEVplus.SpaceTime.getMolten(6L * tier_4_quantity / 27), + new FluidStack(FluidRegistry.getFluid("molten.orundum"), (int) tier_4_quantity * 3 / 27), + new FluidStack(FluidRegistry.getFluid("molten.hypogen"), (int) tier_4_quantity * 11 / 27), + new FluidStack(FluidRegistry.getFluid("molten.titansteel"), (int) tier_4_quantity * 5 / 27), + new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), (int) tier_4_quantity * 2 / 27), + Materials.Oxygen.getPlasma(tier_4_quantity / 27), + MaterialsUEVplus.ExcitedDTEC.getFluid(baseUMV.getCatalystAmount(3))) .fluidOutputs( - MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUMV.getResidueAmount(4)), - Materials.SuperconductorUMVBase.getMolten(tier_2_quantity)) - .duration(baseUMV.getDuration(4)).eut(baseUMV.getEUt(4)).metadata(COIL_HEAT, eternal_heat) + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(baseUMV.getResidueAmount(3)), + Materials.SuperconductorUMVBase.getMolten(tier_4_quantity)) + .duration(baseUMV.getDuration(3)).eut(baseUMV.getEUt(3)).metadata(COIL_HEAT, eternal_heat) .addTo(plasmaForgeRecipes); } + + // Transcendent metal + long total_EU_per_ingot = 113_246_208_000L + 629_145_600L; + long recipe_time = 180 * 20; + + DTPFCalculator transcendent_metal = new DTPFCalculator().setBaseParallel(360).setLowestCatalystTier(4) + .setScalingFactor(8).setHighestCatalystTier(4) + .calculateNonEBFRecipe(total_EU_per_ingot / recipe_time, recipe_time); + + GTValues.RA.stdBuilder() + .itemInputs(ItemList.Tesseract.get(32), GTOreDictUnificator.get("blockCosmicNeutronium", 40)) + .itemOutputs( + MaterialsUEVplus.TranscendentMetal.getBlocks(40), + MaterialsUEVplus.TranscendentMetal.getDust(24)) + .fluidInputs( + MaterialsAlloy.TITANSTEEL.getFluidStack(144 * 40 * 9), + Materials.CallistoIce.getMolten(144 * 20 * 9), + Materials.Ledox.getMolten(144 * 20 * 9), + Materials.Tungsten.getMolten(144 * 40 * 9), + MaterialsUEVplus.ExcitedDTSC.getFluid(transcendent_metal.getCatalystAmount(4))) + .fluidOutputs( + MaterialsUEVplus.DimensionallyTranscendentResidue + .getFluid(transcendent_metal.getResidueAmount(4)), + MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN.getFluidStack(144 * 20 * 9)) + .duration(transcendent_metal.getDuration(4)).eut(transcendent_metal.getEUt(4)) + .metadata(COIL_HEAT, eternal_heat).addTo(plasmaForgeRecipes); + + // Quantum + Astral Titanium + + // Based on quantum abs recipe + long total_EU_per_quantum_ingot = (long) (9_437_184_000L * 0.9); + // Laser engraver recipe + long total_EU_per_astral_dust = 4_718_592_000L; + // Astral titanium ebf + long total_EU_per_astral_ingot_ebf = 22_118_400_000L; + // Astral titanium freezer + long total_EU_per_astral_ingot_freezer = 1_639_710_720L; + // 2 astral titanium blocks per 320 quantum ingots + float astral_ingots_per_quantum_ingot = 18 / 320f; + // Based on quantum abs including coil discount + long recipe_time_per_quantum_ingot = (long) (600 * 20 / 10 * 0.9); + long total_EUt = (long) (total_EU_per_quantum_ingot + astral_ingots_per_quantum_ingot + * (total_EU_per_astral_dust + total_EU_per_astral_ingot_ebf + total_EU_per_astral_ingot_freezer)) + / recipe_time_per_quantum_ingot; + DTPFCalculator quantum = new DTPFCalculator().setBaseParallel(320).setLowestCatalystTier(3) + .setHighestCatalystTier(4).setEUtDivisor(1.12f) + .calculateNonEBFRecipe(total_EUt, recipe_time_per_quantum_ingot); + GTValues.RA.stdBuilder().itemInputs( + CI.getEnergyCore(9, 0), + BlockList.Quantinum.getIS(2), + // Quantum Anomaly + GregtechItemList.Laser_Lens_Special.get(2)) + .itemOutputs(MaterialsElements.STANDALONE.ASTRAL_TITANIUM.getBlock(2)) + .fluidInputs( + MaterialsAlloy.BLACK_TITANIUM.getFluidStack(144 * 320 * 7 / 10), + Materials.Americium.getMolten(144 * 320 / 10), + Materials.Bismuth.getMolten(144 * 320 / 10), + MaterialsElements.STANDALONE.HYPOGEN.getFluidStack(144 * 320 / 10), + Materials.Titanium.getPlasma(144 * 9 * 2 * 2), + MaterialsUEVplus.ExcitedDTEC.getFluid(quantum.getCatalystAmount(3))) + .fluidOutputs( + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(quantum.getResidueAmount(3)), + MaterialsAlloy.QUANTUM.getFluidStack(144 * 320)) + .duration(quantum.getDuration(3)).eut(quantum.getEUt(3)).metadata(COIL_HEAT, eternal_heat) + .addTo(plasmaForgeRecipes); + + // Quantum + Astral Titanium v2 + GTValues.RA.stdBuilder().itemInputs( + CI.getEnergyCore(9, 0), + BlockList.Quantinum.getIS(4), + // Quantum Anomaly + GregtechItemList.Laser_Lens_Special.get(3)) + .itemOutputs(MaterialsElements.STANDALONE.ASTRAL_TITANIUM.getBlock(4)) + .fluidInputs( + MaterialsAlloy.BLACK_TITANIUM.getFluidStack(144 * 640 * 7 / 10), + Materials.Americium.getMolten(144 * 640 / 10), + Materials.Bismuth.getMolten(144 * 640 / 10), + MaterialsElements.STANDALONE.HYPOGEN.getFluidStack(144 * 640 / 10), + Materials.Titanium.getPlasma(144 * 9 * 4 * 2), + MaterialsUEVplus.ExcitedDTSC.getFluid(quantum.getCatalystAmount(4))) + .fluidOutputs( + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(quantum.getResidueAmount(4)), + MaterialsAlloy.QUANTUM.getFluidStack(144 * 640)) + .duration(quantum.getDuration(4)).eut(quantum.getEUt(4)).metadata(COIL_HEAT, eternal_heat) + .addTo(plasmaForgeRecipes); + + // Timepiece + GTValues.RA.stdBuilder() + .itemInputs( + GregtechItemList.SpaceTimeBendingCore.get(0), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.DarkIron, 1L), + Materials.Dilithium.getGems(32), + MaterialsUEVplus.Universium.getNanite(1)) + .itemOutputs(ItemList.Timepiece.get(3)) + .fluidInputs( + MaterialsUEVplus.Time.getMolten(18432L * 8), + MaterialsUEVplus.ExcitedDTSC.getFluid(100000L)) + .fluidOutputs( + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(100000L * 2), + MaterialsUEVplus.Space.getMolten(18432L * 8)) + .duration(80 * SECONDS).eut(TierEU.RECIPE_MAX).metadata(COIL_HEAT, 13500).addTo(plasmaForgeRecipes); + + // Time to Space + GTValues.RA.stdBuilder().itemInputs( + // Spacetime Continuum Ripper + GregtechItemList.SpaceTimeContinuumRipper.get(0), + ItemList.EnergisedTesseract.get(2), + // Quantum Anomaly + GregtechItemList.Laser_Lens_Special.get(16)).itemOutputs(ItemList.Tesseract.get(1)) + .fluidInputs( + MaterialsUEVplus.Time.getMolten(9216L * 64), + MaterialsUEVplus.SpaceTime.getMolten(9216L * 16), + MaterialsUEVplus.ExcitedDTSC.getFluid(1000L)) + .fluidOutputs( + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(1000L * 2), + MaterialsUEVplus.Space.getMolten(9216L * 64)) + .duration(10 * SECONDS).eut(TierEU.RECIPE_MAX).metadata(COIL_HEAT, 13500).addTo(plasmaForgeRecipes); + + // Space to Time + GTValues.RA.stdBuilder().itemInputs( + // Spacetime Continuum Ripper + GregtechItemList.SpaceTimeContinuumRipper.get(0), + ItemList.EnergisedTesseract.get(2), + ItemList.Timepiece.get(16)).itemOutputs(ItemList.Tesseract.get(1)) + .fluidInputs( + MaterialsUEVplus.Space.getMolten(9216L * 64), + MaterialsUEVplus.SpaceTime.getMolten(9216L * 16), + MaterialsUEVplus.ExcitedDTSC.getFluid(1000L)) + .fluidOutputs( + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(1000L * 2), + MaterialsUEVplus.Time.getMolten(9216L * 64)) + .duration(10 * SECONDS).eut(TierEU.RECIPE_MAX).metadata(COIL_HEAT, 13500).addTo(plasmaForgeRecipes); + + // Quantum anomaly + GTValues.RA.stdBuilder() + .itemInputs( + GregtechItemList.Laser_Lens_Special.get(1), + new ItemStack(Particle.getBaseParticle(Particle.GRAVITON).getItem(), 4), + CustomItemList.MysteriousCrystalLens.get(0), + ItemRefer.HiC_T5.get(0)) + .fluidInputs(MaterialsUEVplus.ExcitedDTEC.getFluid(92), Materials.Tritanium.getMolten(144)) + .itemOutputs(GregtechItemList.Laser_Lens_Special.get(4)).duration(5 * SECONDS) + .fluidOutputs(MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(92)) + .eut((int) TierEU.RECIPE_UIV).metadata(COIL_HEAT, eternal_heat).addTo(plasmaForgeRecipes); } } } From c79533b1ff58199697df2521fbf95b85c5c4a3df Mon Sep 17 00:00:00 2001 From: Mary <33456283+FourIsTheNumber@users.noreply.github.com> Date: Tue, 14 Jan 2025 03:05:27 -0500 Subject: [PATCH 06/34] Convert solar panel recipes (#1161) Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../gthandler/recipes/AssemblerRecipes.java | 192 +++++++++++------- .../recipes/AssemblingLineRecipes.java | 3 +- .../scripts/ScriptAdvancedSolarPanel.java | 16 +- .../scripts/ScriptSuperSolarPanels.java | 8 +- 4 files changed, 129 insertions(+), 90 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java index 019941fb0..61fe1a08f 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java @@ -9506,102 +9506,142 @@ private void makeSolderingAlloyRecipes() { // --- Advanced Solar Panel if (AdvancedSolarPanel.isModLoaded()) { - + // Conversion recipes to gt solars GTValues.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LV.get(1L), - ItemList.Cover_SolarPanel_LV.get(1L), - ItemList.Robot_Arm_LV.get(1L), - ItemList.Battery_RE_LV_Lithium.get(1L), - GTUtility.getIntegratedCircuit(2)) - .itemOutputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 0)) - .fluidInputs(tMat.getMolten(288L * tMultiplier / 2L)).duration(40 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); + .itemInputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 0)) + .itemOutputs(ItemList.Machine_LV_SolarPanel.get(1L)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); GTValues.RA.stdBuilder() - .itemInputs( - ItemList.Hull_MV.get(1L), - ItemList.Cover_SolarPanel_MV.get(1L), - ItemList.Robot_Arm_MV.get(1L), - ItemList.Battery_RE_MV_Lithium.get(1L), - GTUtility.getIntegratedCircuit(2)) - .itemOutputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 1)) - .fluidInputs(tMat.getMolten(576L * tMultiplier / 2L)).duration(50 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + .itemInputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 1)) + .itemOutputs(ItemList.Machine_MV_SolarPanel.get(1L)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); GTValues.RA.stdBuilder() - .itemInputs( - ItemList.Hull_HV.get(1L), - ItemList.Cover_SolarPanel_HV.get(1L), - ItemList.Robot_Arm_HV.get(1L), - ItemList.Battery_RE_HV_Lithium.get(1L), - GTUtility.getIntegratedCircuit(2)) - .itemOutputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 2)) - .fluidInputs(tMat.getMolten(864L * tMultiplier / 2L)).duration(60 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(assemblerRecipes); + .itemInputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 2)) + .itemOutputs(ItemList.Machine_HV_SolarPanel.get(1L)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); GTValues.RA.stdBuilder() - .itemInputs( - ItemList.Hull_EV.get(1L), - ItemList.Cover_SolarPanel_EV.get(1L), - ItemList.Robot_Arm_EV.get(1L), - ItemList.BatteryHull_EV_Full.get(1L), - GTUtility.getIntegratedCircuit(2)) - .itemOutputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 3)) - .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2L)).duration(1 * MINUTES + 10 * SECONDS) - .eut(TierEU.RECIPE_IV).addTo(assemblerRecipes); - + .itemInputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 3)) + .itemOutputs(ItemList.Machine_EV_SolarPanel.get(1L)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); } // --- Super Solar Panel if (SuperSolarPanels.isModLoaded()) { - + // Conversion recipes to gt solars GTValues.RA.stdBuilder() - .itemInputs( - ItemList.Hull_IV.get(1L), - ItemList.Cover_SolarPanel_IV.get(1L), - ItemList.Robot_Arm_IV.get(1L), - ItemList.BatteryHull_IV_Full.get(1L), - GTUtility.getIntegratedCircuit(2)) - .itemOutputs(GTModHandler.getModItem(SuperSolarPanels.ID, "SpectralSolarPanel", 1L, 0)) - .fluidInputs(tMat.getMolten(1440 * tMultiplier / 2L)).duration(1 * MINUTES + 20 * SECONDS) - .eut(TierEU.RECIPE_LuV).addTo(assemblerRecipes); + .itemInputs(GTModHandler.getModItem(SuperSolarPanels.ID, "SpectralSolarPanel", 1L, 0)) + .itemOutputs(ItemList.Machine_IV_SolarPanel.get(1L)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); GTValues.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LuV.get(1L), - ItemList.Cover_SolarPanel_LuV.get(1L), - ItemList.Robot_Arm_LuV.get(1L), - ItemList.BatteryHull_LuV_Full.get(1L), - GTUtility.getIntegratedCircuit(2)) - .itemOutputs(GTModHandler.getModItem(SuperSolarPanels.ID, "SingularSolarPanel", 1L, 0)) - .fluidInputs(tMat.getMolten(1728 * tMultiplier / 2L)).duration(1 * MINUTES + 30 * SECONDS) - .eut(TierEU.RECIPE_ZPM).addTo(assemblerRecipes); + .itemInputs(GTModHandler.getModItem(SuperSolarPanels.ID, "SingularSolarPanel", 1L, 0)) + .itemOutputs(ItemList.Machine_LuV_SolarPanel.get(1L)).duration(1 * SECONDS) + .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() - .itemInputs( - ItemList.Hull_ZPM.get(1L), - ItemList.Cover_SolarPanel_ZPM.get(1L), - ItemList.Robot_Arm_ZPM.get(1L), - ItemList.BatteryHull_ZPM_Full.get(1L), - GTUtility.getIntegratedCircuit(2)) - .itemOutputs(GTModHandler.getModItem(SuperSolarPanels.ID, "AdminSolarPanel", 1L, 0)) - .fluidInputs(tMat.getMolten(2016 * tMultiplier / 2L)).duration(1 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_UV).addTo(assemblerRecipes); + .itemInputs(GTModHandler.getModItem(SuperSolarPanels.ID, "AdminSolarPanel", 1L, 0)) + .itemOutputs(ItemList.Machine_ZPM_SolarPanel.get(1L)).duration(1 * SECONDS) + .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() - .itemInputs( - ItemList.Hull_UV.get(1L), - ItemList.Cover_SolarPanel_UV.get(1L), - ItemList.Robot_Arm_UV.get(1L), - ItemList.BatteryHull_UV_Full.get(1L), - GTUtility.getIntegratedCircuit(2)) - .itemOutputs(GTModHandler.getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", 1L, 0)) - .fluidInputs(tMat.getMolten(2304 * tMultiplier / 2L)).duration(1 * MINUTES + 50 * SECONDS) - .eut(TierEU.RECIPE_UHV).addTo(assemblerRecipes); - + .itemInputs(GTModHandler.getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", 1L, 0)) + .itemOutputs(ItemList.Machine_UV_SolarPanel.get(1L)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); } + // GT solars + + GTValues.RA.stdBuilder() + .itemInputs( + ItemList.Hull_LV.get(1L), + ItemList.Cover_SolarPanel_LV.get(1L), + ItemList.Robot_Arm_LV.get(1L), + ItemList.Battery_RE_LV_Lithium.get(1L), + GTUtility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Machine_LV_SolarPanel.get(1L)) + .fluidInputs(tMat.getMolten(288L * tMultiplier / 2L)).duration(40 * SECONDS).eut(TierEU.RECIPE_MV) + .addTo(assemblerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + ItemList.Hull_MV.get(1L), + ItemList.Cover_SolarPanel_MV.get(1L), + ItemList.Robot_Arm_MV.get(1L), + ItemList.Battery_RE_MV_Lithium.get(1L), + GTUtility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Machine_MV_SolarPanel.get(1L)) + .fluidInputs(tMat.getMolten(576L * tMultiplier / 2L)).duration(50 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(assemblerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + ItemList.Hull_HV.get(1L), + ItemList.Cover_SolarPanel_HV.get(1L), + ItemList.Robot_Arm_HV.get(1L), + ItemList.Battery_RE_HV_Lithium.get(1L), + GTUtility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Machine_HV_SolarPanel.get(1L)) + .fluidInputs(tMat.getMolten(864L * tMultiplier / 2L)).duration(60 * SECONDS).eut(TierEU.RECIPE_EV) + .addTo(assemblerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + ItemList.Hull_EV.get(1L), + ItemList.Cover_SolarPanel_EV.get(1L), + ItemList.Robot_Arm_EV.get(1L), + ItemList.BatteryHull_EV_Full.get(1L), + GTUtility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Machine_EV_SolarPanel.get(1L)) + .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2L)).duration(1 * MINUTES + 10 * SECONDS) + .eut(TierEU.RECIPE_IV).addTo(assemblerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + ItemList.Hull_IV.get(1L), + ItemList.Cover_SolarPanel_IV.get(1L), + ItemList.Robot_Arm_IV.get(1L), + ItemList.BatteryHull_IV_Full.get(1L), + GTUtility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Machine_IV_SolarPanel.get(1L)) + .fluidInputs(tMat.getMolten(1440 * tMultiplier / 2L)).duration(1 * MINUTES + 20 * SECONDS) + .eut(TierEU.RECIPE_LuV).addTo(assemblerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + ItemList.Hull_LuV.get(1L), + ItemList.Cover_SolarPanel_LuV.get(1L), + ItemList.Robot_Arm_LuV.get(1L), + ItemList.BatteryHull_LuV_Full.get(1L), + GTUtility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Machine_LuV_SolarPanel.get(1L)) + .fluidInputs(tMat.getMolten(1728 * tMultiplier / 2L)).duration(1 * MINUTES + 30 * SECONDS) + .eut(TierEU.RECIPE_ZPM).addTo(assemblerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + ItemList.Hull_ZPM.get(1L), + ItemList.Cover_SolarPanel_ZPM.get(1L), + ItemList.Robot_Arm_ZPM.get(1L), + ItemList.BatteryHull_ZPM_Full.get(1L), + GTUtility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Machine_ZPM_SolarPanel.get(1L)) + .fluidInputs(tMat.getMolten(2016 * tMultiplier / 2L)).duration(1 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_UV).addTo(assemblerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs( + ItemList.Hull_UV.get(1L), + ItemList.Cover_SolarPanel_UV.get(1L), + ItemList.Robot_Arm_UV.get(1L), + ItemList.BatteryHull_UV_Full.get(1L), + GTUtility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Machine_UV_SolarPanel.get(1L)) + .fluidInputs(tMat.getMolten(2304 * tMultiplier / 2L)).duration(1 * MINUTES + 50 * SECONDS) + .eut(TierEU.RECIPE_UHV).addTo(assemblerRecipes); + // solar 1EU GTValues.RA.stdBuilder() diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java index 423c11a21..f7d031576 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java @@ -11,7 +11,6 @@ import static gregtech.api.enums.Mods.GraviSuite; import static gregtech.api.enums.Mods.OpenComputers; import static gregtech.api.enums.Mods.SGCraft; -import static gregtech.api.enums.Mods.SuperSolarPanels; import static gregtech.api.util.GTModHandler.getModItem; import static gregtech.api.util.GTRecipeBuilder.HOURS; import static gregtech.api.util.GTRecipeBuilder.MINUTES; @@ -500,7 +499,7 @@ public void run() { // Dyson Swarm Controller TTRecipeAdder.addResearchableAssemblylineRecipe( - GTModHandler.getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", 1), + ItemList.Machine_UV_SolarPanel.get(1), 192_000, 512, (int) TierEU.RECIPE_UEV, diff --git a/src/main/java/com/dreammaster/scripts/ScriptAdvancedSolarPanel.java b/src/main/java/com/dreammaster/scripts/ScriptAdvancedSolarPanel.java index bd7274567..0314c61ad 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAdvancedSolarPanel.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAdvancedSolarPanel.java @@ -37,7 +37,7 @@ public void loadRecipes() { addShapedRecipe( getModItem(AdvancedSolarPanel.ID, "advanced_solar_helmet", 1, 0, missing), "craftingToolWrench", - getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1, 0, missing), + ItemList.Machine_LV_SolarPanel.get(1), "craftingToolScrewdriver", "circuitAdvanced", getModItem(IndustrialCraft2.ID, "itemArmorNanoHelmet", 1, wildcard, missing), @@ -48,7 +48,7 @@ public void loadRecipes() { addShapedRecipe( getModItem(AdvancedSolarPanel.ID, "hybrid_solar_helmet", 1, 0, missing), "craftingToolWrench", - getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1, 1, missing), + ItemList.Machine_MV_SolarPanel.get(1), "craftingToolScrewdriver", "circuitMaster", getModItem(IndustrialCraft2.ID, "itemArmorQuantumHelmet", 1, wildcard, missing), @@ -61,9 +61,9 @@ public void loadRecipes() { "craftingToolWrench", "circuitUltimate", "craftingToolScrewdriver", - "craftingSolarPanelHV", + ItemList.Machine_HV_SolarPanel.get(1), getModItem(AdvancedSolarPanel.ID, "hybrid_solar_helmet", 1, wildcard, missing), - "craftingSolarPanelHV", + ItemList.Machine_HV_SolarPanel.get(1), "cableGt04VanadiumGallium", ItemList.Transformer_IV_EV.get(1L), "cableGt04VanadiumGallium"); @@ -92,7 +92,7 @@ public void loadRecipes() { addShapedRecipe( ItemList.Cover_SolarPanel_LV.get(1L), "craftingToolCrowbar", - getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1, 0, missing), + ItemList.Machine_LV_SolarPanel.get(1), "craftingToolScrewdriver", "craftingToolWrench", "craftingToolHardHammer", @@ -100,7 +100,7 @@ public void loadRecipes() { addShapedRecipe( ItemList.Cover_SolarPanel_MV.get(1L), "craftingToolCrowbar", - getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1, 1, missing), + ItemList.Machine_MV_SolarPanel.get(1), "craftingToolScrewdriver", "craftingToolWrench", "craftingToolHardHammer", @@ -108,7 +108,7 @@ public void loadRecipes() { addShapedRecipe( ItemList.Cover_SolarPanel_HV.get(1L), "craftingToolCrowbar", - getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1, 2, missing), + ItemList.Machine_HV_SolarPanel.get(1), "craftingToolScrewdriver", "craftingToolWrench", "craftingToolHardHammer", @@ -116,7 +116,7 @@ public void loadRecipes() { addShapedRecipe( ItemList.Cover_SolarPanel_EV.get(1L), "craftingToolCrowbar", - getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1, 3, missing), + ItemList.Machine_EV_SolarPanel.get(1), "craftingToolScrewdriver", "craftingToolWrench", "craftingToolHardHammer", diff --git a/src/main/java/com/dreammaster/scripts/ScriptSuperSolarPanels.java b/src/main/java/com/dreammaster/scripts/ScriptSuperSolarPanels.java index 13e61752e..b2dd52dda 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptSuperSolarPanels.java +++ b/src/main/java/com/dreammaster/scripts/ScriptSuperSolarPanels.java @@ -34,7 +34,7 @@ public void loadRecipes() { addShapedRecipe( ItemList.Cover_SolarPanel_IV.get(1L), "craftingToolCrowbar", - getModItem(SuperSolarPanels.ID, "SpectralSolarPanel", 1, 0, missing), + ItemList.Machine_IV_SolarPanel.get(1), "craftingToolScrewdriver", "craftingToolWrench", "craftingToolHardHammer", @@ -42,7 +42,7 @@ public void loadRecipes() { addShapedRecipe( ItemList.Cover_SolarPanel_LuV.get(1L), "craftingToolCrowbar", - getModItem(SuperSolarPanels.ID, "SingularSolarPanel", 1, 0, missing), + ItemList.Machine_LuV_SolarPanel.get(1), "craftingToolScrewdriver", "craftingToolWrench", "craftingToolHardHammer", @@ -50,7 +50,7 @@ public void loadRecipes() { addShapedRecipe( ItemList.Cover_SolarPanel_ZPM.get(1L), "craftingToolCrowbar", - getModItem(SuperSolarPanels.ID, "AdminSolarPanel", 1, 0, missing), + ItemList.Machine_ZPM_SolarPanel.get(1), "craftingToolScrewdriver", "craftingToolWrench", "craftingToolHardHammer", @@ -58,7 +58,7 @@ public void loadRecipes() { addShapedRecipe( ItemList.Cover_SolarPanel_UV.get(1L), "craftingToolCrowbar", - getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", 1, 0, missing), + ItemList.Machine_UV_SolarPanel.get(1), "craftingToolScrewdriver", "craftingToolWrench", "craftingToolHardHammer", From 8aac7d2dfd3af40ad05e806da0416307324e3bec Mon Sep 17 00:00:00 2001 From: Maya <10861407+serenibyss@users.noreply.github.com> Date: Tue, 14 Jan 2025 02:07:19 -0600 Subject: [PATCH 07/34] update --- dependencies.gradle | 4 ++-- settings.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index bbb44a162..964e90c3d 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.67:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.70:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") @@ -10,7 +10,7 @@ dependencies { compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.0:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Avaritia:1.59:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:twilightforest:2.7.2:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.20:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.21:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.3-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.3.0:dev") { transitive = false } diff --git a/settings.gradle b/settings.gradle index 0147a9944..7a562ea19 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.31' } From 5cd8d8ce0c542f26cd85e22a39005a16e8f9d138 Mon Sep 17 00:00:00 2001 From: miozune Date: Wed, 15 Jan 2025 01:40:36 +0900 Subject: [PATCH 08/34] Migrate to new way of specifying QFT catalyst (#1163) Co-authored-by: Martin Robertz Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- dependencies.gradle | 4 ++-- .../com/dreammaster/scripts/ScriptGregtechPlusPlus.java | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 964e90c3d..e64423b70 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.70:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.72:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") @@ -10,7 +10,7 @@ dependencies { compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.0:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Avaritia:1.59:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:twilightforest:2.7.2:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.21:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.22:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.3-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.3.0:dev") { transitive = false } diff --git a/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java b/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java index 68ff65dd7..88901771c 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java +++ b/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java @@ -9,6 +9,7 @@ import static gregtech.api.enums.Mods.RemoteIO; import static gregtech.api.util.GTModHandler.getModItem; import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeConstants.QFT_CATALYST; import static gregtech.api.util.GTRecipeConstants.QFT_FOCUS_TIER; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.quantumForceTransformerRecipes; @@ -30,9 +31,9 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.item.chemistry.GenericChem; import gtPlusPlus.core.material.MaterialsAlloy; -import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.forestry.bees.items.FRItemRegistry; public class ScriptGregtechPlusPlus implements IScriptLoader { @@ -95,11 +96,11 @@ public void loadRecipes() { GTValues.RA.stdBuilder() .itemInputs( getModItem(EternalSingularity.ID, "combined_singularity", 1, 15, missing), - ItemList.EnergisedTesseract.get(1), - ItemUtils.getSimpleStack(GenericChem.TemporalHarmonyCatalyst, 0)) + ItemList.EnergisedTesseract.get(1)) .itemOutputs(GTOreDictUnificator.get("dustShirabon", 64), ItemList.Timepiece.get(1)) .fluidInputs(MaterialsUEVplus.PrimordialMatter.getFluid(1152)) .fluidOutputs(MaterialsUEVplus.Eternity.getMolten(9216), MaterialsUEVplus.Time.getMolten(18432)) + .metadata(QFT_CATALYST, GTUtility.copyAmount(0, GenericChem.TemporalHarmonyCatalyst)) .metadata(QFT_FOCUS_TIER, 4).duration(20 * SECONDS).eut(TierEU.RECIPE_UMV) .addTo(quantumForceTransformerRecipes); addForestryRecipes(); From 623800a1a3660a0427f45c28bb925140d4797c69 Mon Sep 17 00:00:00 2001 From: Noc <95299389+Nockyx@users.noreply.github.com> Date: Wed, 15 Jan 2025 03:58:57 -0300 Subject: [PATCH 09/34] Add Chromatic Glass Crystal (#1149) Co-authored-by: Martin Robertz Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../com/dreammaster/gthandler/CustomItemList.java | 3 +++ .../dreammaster/gthandler/GT_Loader_Items.java | 3 +++ .../gthandler/recipes/ForgeHammerRecipes.java | 8 ++++++++ .../gthandler/recipes/MaceratorRecipes.java | 13 +++++++++++++ .../java/com/dreammaster/item/NHItemList.java | 3 +++ .../resources/assets/dreamcraft/lang/en_US.lang | 3 +++ .../textures/items/itemChromaticGem.png | Bin 0 -> 350 bytes .../textures/items/itemChromaticGemExquisite.png | Bin 0 -> 651 bytes .../textures/items/itemChromaticGemFlawless.png | Bin 0 -> 514 bytes 9 files changed, 33 insertions(+) create mode 100644 src/main/resources/assets/dreamcraft/textures/items/itemChromaticGem.png create mode 100644 src/main/resources/assets/dreamcraft/textures/items/itemChromaticGemExquisite.png create mode 100644 src/main/resources/assets/dreamcraft/textures/items/itemChromaticGemFlawless.png diff --git a/src/main/java/com/dreammaster/gthandler/CustomItemList.java b/src/main/java/com/dreammaster/gthandler/CustomItemList.java index 64956252c..7d9bbb3ed 100644 --- a/src/main/java/com/dreammaster/gthandler/CustomItemList.java +++ b/src/main/java/com/dreammaster/gthandler/CustomItemList.java @@ -385,6 +385,9 @@ public enum CustomItemList implements IItemContainer { BioBall, PotassiumHydroxideDust, ChromaticLens, + ChromaticGem, + ChromaticGemFlawless, + ChromaticGemExquisite, RadoxPolymerLens, NanoCircuitOrigin, ChevronOrigin, diff --git a/src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java b/src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java index 96ecf4e51..62c390dda 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java +++ b/src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java @@ -427,6 +427,9 @@ private void registerItems() { CustomItemList.PotassiumHydroxideDust.set(NHItemList.PotassiumHydroxideDust.getIS()); CustomItemList.RadoxPolymerLens.set(NHItemList.RadoxPolymerLens.getIS()); CustomItemList.ChromaticLens.set(NHItemList.ChromaticLens.getIS()); + CustomItemList.ChromaticGem.set(NHItemList.ChromaticGem.getIS()); + CustomItemList.ChromaticGemFlawless.set(NHItemList.ChromaticGemFlawless.getIS()); + CustomItemList.ChromaticGemExquisite.set(NHItemList.ChromaticGemExquisite.getIS()); CustomItemList.NanoCircuitOrigin.set(NHItemList.NanoCircuitOrigin.getIS()); CustomItemList.ChevronOrigin.set(NHItemList.ChevronOrigin.getIS()); CustomItemList.FramePartOrigin.set(NHItemList.FramePartOrigin.getIS()); diff --git a/src/main/java/com/dreammaster/gthandler/recipes/ForgeHammerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/ForgeHammerRecipes.java index bc02614a7..ef07d229f 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/ForgeHammerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/ForgeHammerRecipes.java @@ -30,6 +30,14 @@ public void run() { .itemOutputs(ItemList.GalliumArsenideCrystalSmallPart.get(4L)).duration(2 * SECONDS + 10 * TICKS).eut(4) .addTo(hammerRecipes); + GTValues.RA.stdBuilder().itemInputs(CustomItemList.ChromaticGemExquisite.get(1)) + .itemOutputs(CustomItemList.ChromaticGemFlawless.get(2)).duration(2 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(hammerRecipes); + + GTValues.RA.stdBuilder().itemInputs(CustomItemList.ChromaticGemFlawless.get(1)) + .itemOutputs(CustomItemList.ChromaticGem.get(2)).duration(2 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(hammerRecipes); + if (TinkerConstruct.isModLoaded()) { GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "Smeltery", 1L, 2)) .itemOutputs(GTModHandler.getModItem(TinkerConstruct.ID, "materials", 3L, 2)).duration(1 * SECONDS) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java index 403a43804..ffc412df5 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java @@ -28,6 +28,7 @@ import gregtech.api.enums.TierEU; import gregtech.api.util.GTModHandler; import gregtech.api.util.GTOreDictUnificator; +import gtPlusPlus.core.material.MaterialsElements; public class MaceratorRecipes implements Runnable { @@ -92,6 +93,18 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 1L)) .outputChances(10000, 2500, 2000, 1500).duration(10 * SECONDS).eut(8).addTo(maceratorRecipes); + GTValues.RA.stdBuilder().itemInputs(CustomItemList.ChromaticGemExquisite.get(1)) + .itemOutputs(MaterialsElements.STANDALONE.CHRONOMATIC_GLASS.getDust(8)).duration(16 * SECONDS) + .eut(TierEU.RECIPE_UV).addTo(maceratorRecipes); + + GTValues.RA.stdBuilder().itemInputs(CustomItemList.ChromaticGemFlawless.get(1)) + .itemOutputs(MaterialsElements.STANDALONE.CHRONOMATIC_GLASS.getDust(4)).duration(8 * SECONDS) + .eut(TierEU.RECIPE_UV).addTo(maceratorRecipes); + + GTValues.RA.stdBuilder().itemInputs(CustomItemList.ChromaticGem.get(1)) + .itemOutputs(MaterialsElements.STANDALONE.CHRONOMATIC_GLASS.getDust(2)).duration(4 * SECONDS) + .eut(TierEU.RECIPE_UV).addTo(maceratorRecipes); + if (OpenPrinters.isModLoaded()) { // Open Printers diff --git a/src/main/java/com/dreammaster/item/NHItemList.java b/src/main/java/com/dreammaster/item/NHItemList.java index bf95c2575..f868e6ad7 100644 --- a/src/main/java/com/dreammaster/item/NHItemList.java +++ b/src/main/java/com/dreammaster/item/NHItemList.java @@ -554,6 +554,9 @@ public enum NHItemList { CircuitMAX(new ModSimpleBaseItem("CircuitMAX", ModTabList.ModCircuitsTab)), RadoxPolymerLens(new ModSimpleBaseItem("RadoxPolymerLens", ModTabList.ModSpaceTab)), ChromaticLens(new ModSimpleBaseItem("ChromaticLens", ModTabList.ModSpaceTab)), + ChromaticGem(new ModSimpleBaseItem("ChromaticGem", ModTabList.ModSpaceTab)), + ChromaticGemFlawless(new ModSimpleBaseItem("ChromaticGemFlawless", ModTabList.ModSpaceTab)), + ChromaticGemExquisite(new ModSimpleBaseItem("ChromaticGemExquisite", ModTabList.ModSpaceTab)), NanoCircuitOrigin(new ModSimpleBaseItem("OriginNanoCircuit", ModTabList.ModSpaceTab)), GatePlateOrigin(new ModSimpleBaseItem("OriginGatePlate", ModTabList.ModSpaceTab)), ChevronOrigin(new ModSimpleBaseItem("OriginChevron", ModTabList.ModSpaceTab)), diff --git a/src/main/resources/assets/dreamcraft/lang/en_US.lang b/src/main/resources/assets/dreamcraft/lang/en_US.lang index 662fd5daf..9edcc9452 100644 --- a/src/main/resources/assets/dreamcraft/lang/en_US.lang +++ b/src/main/resources/assets/dreamcraft/lang/en_US.lang @@ -611,6 +611,9 @@ item.CircuitUXV.name=Any UXV Circuit item.CircuitMAX.name=Any MAX Circuit item.RadoxPolymerLens.name=Radox Polymer Lens item.ChromaticLens.name=Chromatic Lens +item.ChromaticGem.name=Chromatic Crystal +item.ChromaticGemFlawless.name=Flawless Chromatic Crystal +item.ChromaticGemExquisite.name=Exquisite Chromatic Crystal item.Origin.tooltip=The first conquering item.Origin.version=(2.1.0.0) item.OriginNanoCircuit.name=Nano Circuit of Split Origin diff --git a/src/main/resources/assets/dreamcraft/textures/items/itemChromaticGem.png b/src/main/resources/assets/dreamcraft/textures/items/itemChromaticGem.png new file mode 100644 index 0000000000000000000000000000000000000000..bc8bc46fb778245bd6656558382a2c33ff9dadc2 GIT binary patch literal 350 zcmV-k0iphhP)1vQ4x*3|aDl8a8QH)}kT-Kb^N`;3bza_|nA-wwpl>h($07*qoM6N<$g2~#M!vFvP literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/dreamcraft/textures/items/itemChromaticGemExquisite.png b/src/main/resources/assets/dreamcraft/textures/items/itemChromaticGemExquisite.png new file mode 100644 index 0000000000000000000000000000000000000000..c2ad6560441741fec5a3d28a3b00527455be5b80 GIT binary patch literal 651 zcmV;60(AX}P)r#!?%OvbEb=L2#HUitwL zdayV)Xb;W>UBTCliBq^z2v&e4QPGV?JWz#}{8RT}738fbLi z2S9OH=ul+NyAw-|18t7@fT_N;+IEROWptg002ovPDHLkV1lp@I*R}R literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/dreamcraft/textures/items/itemChromaticGemFlawless.png b/src/main/resources/assets/dreamcraft/textures/items/itemChromaticGemFlawless.png new file mode 100644 index 0000000000000000000000000000000000000000..bd3a6c978c55819e0f4d61ecba68defd9df16d29 GIT binary patch literal 514 zcmV+d0{#7oP)CWn+AvcAhk^R?R9YOr80g^cuJICmpY+`5cD zlLJ5nUCJ$sOQToG-?_=k+p;>%gc8`cjV>&h$_~0!oH0y80#H59b768Xlz5OJv%97= z;|yx@;$Zl0Ul5N8#7L57AJf#oeEe3=)Puh~0<#Dz~znGn1S*O|FPV;)ztW zf;&BdlpR#irQ(bckNts7GZ1pXl}n=yLw7ryjDuyXJ6xz*;! zPoL~&Eo$J4Wo@HrkhaD#jk7%cl%W^M0emf;VD@^3saG}bt=!fk1^_!-4URhdlv`O^ zu8VWhL3jn)Z3jP4B%jx4e0~4-EdVUoOWMO1ht$68F%pYm$vI>IB4xpoO=|Tw++Qt( z4k>bp>vM}5z@v(%KA3g Date: Wed, 15 Jan 2025 11:46:09 +0100 Subject: [PATCH 10/34] update --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index e64423b70..b933bd928 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.72:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.73:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") From d0e832e6d5df84a80b00c79a33058fe700b1ebbb Mon Sep 17 00:00:00 2001 From: Noc <95299389+Nockyx@users.noreply.github.com> Date: Thu, 16 Jan 2025 01:26:11 -0300 Subject: [PATCH 11/34] Add Assembler Recipes to GTPP Bee Frames (#1165) --- .../scripts/ScriptGregtechPlusPlus.java | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java b/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java index 88901771c..df82bd9b2 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java +++ b/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java @@ -7,6 +7,7 @@ import static gregtech.api.enums.Mods.IronTanks; import static gregtech.api.enums.Mods.Minecraft; import static gregtech.api.enums.Mods.RemoteIO; +import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.util.GTModHandler.getModItem; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeConstants.QFT_CATALYST; @@ -30,6 +31,7 @@ import gregtech.api.enums.Mods; 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.core.item.chemistry.GenericChem; @@ -108,6 +110,83 @@ public void loadRecipes() { @Optional.Method(modid = Mods.Names.FORESTRY) private void addForestryRecipes() { + + // Arborist Frame + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.WoodSealed, 4), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.WoodSealed, 4), + GTModHandler.getModItem(Minecraft.ID, "paper", 1, 0, missing), + GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) + .fluidInputs(Materials.Redstone.getMolten(576)) + .itemOutputs(new ItemStack(FRItemRegistry.hiveFrameArborist)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + + // Stabilization Frame + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Osmiridium, 4), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.Osmiridium, 4), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 1), + GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) + .fluidInputs(Materials.Redstone.getMolten(576)) + .itemOutputs(new ItemStack(FRItemRegistry.hiveFrameStalilize)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + + // Slowing Frame + GTValues.RA.stdBuilder() + .itemInputs( + MaterialsAlloy.TUMBAGA.getLongRod(4), + MaterialsAlloy.TUMBAGA.getRod(4), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 1), + GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) + .fluidInputs(Materials.Redstone.getMolten(576)) + .itemOutputs(new ItemStack(FRItemRegistry.hiveFrameSlow, 1, 0)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + + // Decaying Frame + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.WroughtIron, 4), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 4), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.WroughtIron, 1), + GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) + .fluidInputs(Materials.Redstone.getMolten(576)) + .itemOutputs(new ItemStack(FRItemRegistry.hiveFrameDecay)).duration(30 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(assemblerRecipes); + + // Working Frame + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.BlueSteel, 4), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.BlueSteel, 4), + GTOreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1), + GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) + .fluidInputs(Materials.Redstone.getMolten(576)).itemOutputs(new ItemStack(FRItemRegistry.hiveFrameBusy)) + .duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + + // Mutagenic Frame + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Uranium235, 4), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.Plutonium241, 4), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.Plutonium241, 1), + GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) + .fluidInputs(Materials.Redstone.getMolten(576)) + .itemOutputs(new ItemStack(FRItemRegistry.hiveFrameMutagenic)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + + // Accelerated Frame + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Electrum, 4), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 4), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 1), + GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1, 0, missing)) + .fluidInputs(Materials.Redstone.getMolten(576)) + .itemOutputs(new ItemStack(FRItemRegistry.hiveFrameAccelerated)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + addShapelessRecipe(CustomItemList.CoinBeesI.get(16L), new ItemStack(FRItemRegistry.hiveFrameVoid)); RecipeManagers.carpenterManager.addRecipe( 60, From 1ef0549153e83b0621600ee34147e156ddb7d6d7 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Thu, 16 Jan 2025 13:08:26 +0100 Subject: [PATCH 12/34] update --- dependencies.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index b933bd928..5018f5d95 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,28 +1,28 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.73:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.75:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") - implementation("com.github.GTNewHorizons:GTNHLib:0.6.1:dev") + implementation("com.github.GTNewHorizons:GTNHLib:0.6.2:dev") compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.0:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Avaritia:1.59:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:twilightforest:2.7.2:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:twilightforest:2.7.3:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.22:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.3-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.4-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.1-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Botania:1.12.3-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Chisel:2.16.2-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Botania:1.12.5-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.0: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.0:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.2-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.3-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.1:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.0-GTNH:dev") From b975609f516c47af20e968f692d7ff03f2302ab3 Mon Sep 17 00:00:00 2001 From: StaffiX <32968022+StaffiX@users.noreply.github.com> Date: Thu, 16 Jan 2025 17:47:19 +0100 Subject: [PATCH 13/34] Remove iridium plate recipe from double ingot (#1166) Co-authored-by: Martin Robertz Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../com/dreammaster/scripts/ScriptIndustrialCraft.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java b/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java index b79eeaddc..4499f5e72 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java @@ -979,14 +979,6 @@ public void loadRecipes() { "ingotIridium", null, null); - addShapedRecipe( - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L), - "craftingToolHardHammer", - null, - null, - GTOreDictUnificator.get(OrePrefixes.ingotDouble, Materials.Iridium, 1L), - null, - null); addShapedRecipe( createItemStack( From 6d576a6a70a093d0977a3945025111595a41316c Mon Sep 17 00:00:00 2001 From: SarcasticMax Date: Fri, 17 Jan 2025 15:47:10 +1100 Subject: [PATCH 14/34] Remove map recipe from crafting and recipe removal logic (#1168) --- .../java/com/dreammaster/recipes/RecipeRemover.java | 1 - .../java/com/dreammaster/scripts/ScriptMinecraft.java | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/src/main/java/com/dreammaster/recipes/RecipeRemover.java b/src/main/java/com/dreammaster/recipes/RecipeRemover.java index e4913edc9..ed83cea00 100644 --- a/src/main/java/com/dreammaster/recipes/RecipeRemover.java +++ b/src/main/java/com/dreammaster/recipes/RecipeRemover.java @@ -1813,7 +1813,6 @@ public static void run() { removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "painting", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "flint_and_steel", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "dragon_egg", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "map", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "wooden_door", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "iron_door", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "skull", 1, 1, missing)); diff --git a/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java b/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java index 6f6704c49..10a388510 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java @@ -4278,17 +4278,6 @@ private void craftingRecipes() { null, "craftingToolScrewdriver", null); - addShapedRecipe( - getModItem(Minecraft.ID, "map", 1, 0, missing), - "paperEmpty", - "paperEmpty", - "paperEmpty", - "paperEmpty", - getModItem(Minecraft.ID, "compass", 1, 0, missing), - "paperEmpty", - "paperEmpty", - "paperEmpty", - "paperEmpty"); addShapelessRecipe( getModItem(Minecraft.ID, "dye", 3, 15, missing), getModItem(Minecraft.ID, "bone", 1, 0, missing), From db0f6f280c1222cf5a3d430241e84664f653bf86 Mon Sep 17 00:00:00 2001 From: paulzzh <28055560+paulzzh@users.noreply.github.com> Date: Sun, 19 Jan 2025 14:38:30 +0800 Subject: [PATCH 15/34] Enhanced the confirmation for exiting the game (#1160) Co-authored-by: Martin Robertz Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../early/MixinMinecraft_ConfirmExit.java | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/dreammaster/mixin/mixins/early/MixinMinecraft_ConfirmExit.java b/src/main/java/com/dreammaster/mixin/mixins/early/MixinMinecraft_ConfirmExit.java index b979e0f61..af4b3cb09 100644 --- a/src/main/java/com/dreammaster/mixin/mixins/early/MixinMinecraft_ConfirmExit.java +++ b/src/main/java/com/dreammaster/mixin/mixins/early/MixinMinecraft_ConfirmExit.java @@ -10,16 +10,18 @@ import net.minecraft.util.StatCollector; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import com.dreammaster.client.util.IconLoader; import com.dreammaster.coremod.DreamCoreMod; import com.dreammaster.lib.Refstrings; -import com.llamalad7.mixinextras.injector.ModifyExpressionValue; @Mixin(Minecraft.class) -public class MixinMinecraft_ConfirmExit { +public abstract class MixinMinecraft_ConfirmExit { @Unique private boolean dreamcraft$isCloseRequested; @@ -27,19 +29,16 @@ public class MixinMinecraft_ConfirmExit { @Unique private boolean dreamcraft$waitingDialogQuit; - @ModifyExpressionValue( - method = "runGameLoop", - at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/Display;isCloseRequested()Z", remap = false)) - private boolean dreamcraft$confirmGameShutdown(boolean isCloseRequested) { - if (!DreamCoreMod.showConfirmExitWindow) { - return isCloseRequested; - } - if (this.dreamcraft$isCloseRequested) { - return true; + @Shadow + public abstract void shutdown(); + + @Inject(method = "shutdown", at = @At(value = "HEAD"), cancellable = true) + private void dreamcraft$confirmGameShutdown(CallbackInfo ci) { + if (!DreamCoreMod.showConfirmExitWindow || this.dreamcraft$isCloseRequested) { + return; } - if (dreamcraft$waitingDialogQuit) return false; - if (isCloseRequested) { - dreamcraft$waitingDialogQuit = true; + if (!this.dreamcraft$waitingDialogQuit) { + this.dreamcraft$waitingDialogQuit = true; new Thread(() -> { final JFrame frame = new JFrame(); frame.setAlwaysOnTop(true); @@ -60,12 +59,11 @@ public class MixinMinecraft_ConfirmExit { imageIcon); if (result == JOptionPane.YES_OPTION) { this.dreamcraft$isCloseRequested = true; + this.shutdown(); } - dreamcraft$waitingDialogQuit = false; + this.dreamcraft$waitingDialogQuit = false; }).start(); - return false; } - return false; + ci.cancel(); } - } From 069d4a78dc3ac1d01256a152bfa6eb2ff2bcf0d0 Mon Sep 17 00:00:00 2001 From: StaffiX <32968022+StaffiX@users.noreply.github.com> Date: Sun, 19 Jan 2025 19:06:10 +0100 Subject: [PATCH 16/34] Make superchest recipes plate usage consistent (#1169) Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../gthandler/GT_CraftingRecipeLoader.java | 16 ++++++++-------- .../gthandler/recipes/AssemblerRecipes.java | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java index 4af8a0c5d..e884bee1d 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java +++ b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java @@ -262,38 +262,38 @@ public void run() { bits, new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_LV, 'G', OrePrefixes.plate.get(Materials.PulsatingIron), 'D', OrePrefixes.circuit.get(Materials.LV), 'P', - OrePrefixes.plateDense.get(Materials.Iron) }); + OrePrefixes.plateTriple.get(Materials.Iron) }); GTModHandler.addCraftingRecipe( ItemList.Super_Chest_MV.get(1L), bits, new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_MV, 'G', OrePrefixes.plate.get(Materials.VibrantAlloy), 'D', OrePrefixes.circuit.get(Materials.MV), 'P', - OrePrefixes.plateDense.get(Materials.Steel) }); + OrePrefixes.plateTriple.get(Materials.Steel) }); GTModHandler.addCraftingRecipe( ItemList.Super_Chest_HV.get(1L), bits, new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_HV, 'G', ItemList.Field_Generator_LV, 'D', OrePrefixes.circuit.get(Materials.HV), 'P', - OrePrefixes.plateQuintuple.get(Materials.Aluminium) }); + OrePrefixes.plateTriple.get(Materials.Aluminium) }); GTModHandler.addCraftingRecipe( ItemList.Super_Chest_EV.get(1L), bits, new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_EV, 'G', ItemList.Field_Generator_MV, 'D', OrePrefixes.circuit.get(Materials.EV), 'P', - OrePrefixes.plateQuintuple.get(Materials.StainlessSteel) }); + OrePrefixes.plateTriple.get(Materials.StainlessSteel) }); GTModHandler.addCraftingRecipe( ItemList.Super_Chest_IV.get(1L), bits, new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_IV, 'G', ItemList.Field_Generator_HV, 'D', OrePrefixes.circuit.get(Materials.IV), 'P', - OrePrefixes.plateQuadruple.get(Materials.Titanium) }); + OrePrefixes.plateTriple.get(Materials.Titanium) }); GTModHandler.addCraftingRecipe( ItemList.Quantum_Chest_LV.get(1L), bits, new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_LuV, 'G', ItemList.Field_Generator_EV, 'D', OrePrefixes.circuit.get(Materials.LuV), 'P', - OrePrefixes.plateQuadruple.get(Materials.TungstenSteel) }); + OrePrefixes.plateTriple.get(Materials.TungstenSteel) }); GTModHandler.addCraftingRecipe( ItemList.Quantum_Chest_MV.get(1L), bits, @@ -311,13 +311,13 @@ public void run() { bits, new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_UHV, 'G', ItemList.Field_Generator_ZPM, 'D', OrePrefixes.circuit.get(Materials.UHV), 'P', - OrePrefixes.plateDouble.get(Materials.Europium) }); + OrePrefixes.plateTriple.get(Materials.Europium) }); GTModHandler.addCraftingRecipe( ItemList.Quantum_Chest_IV.get(1L), bits, new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_UEV, 'G', ItemList.Field_Generator_UV, 'D', OrePrefixes.circuit.get(Materials.UEV), 'P', - OrePrefixes.plate.get(Materials.Americium) }); + OrePrefixes.plateTriple.get(Materials.Americium) }); // Hermetic casings GTModHandler.addCraftingRecipe( diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java index 61fe1a08f..2753d4f06 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java @@ -2013,7 +2013,7 @@ public void run() { GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.circuit.get(Materials.IV), 4), - GTOreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Titanium, 3), + GTOreDictUnificator.get(OrePrefixes.plateTriple, Materials.Titanium, 3), ItemList.Field_Generator_HV.get(1), ItemList.Automation_ChestBuffer_IV.get(1)) .itemOutputs(ItemList.Super_Chest_IV.get(1L)).duration(5 * SECONDS).eut(TierEU.RECIPE_HV) @@ -2053,7 +2053,7 @@ public void run() { GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.circuit.get(Materials.UEV), 4), - Materials.Americium.getPlates(3), + GTOreDictUnificator.get(OrePrefixes.plateTriple.get(Materials.Americium), 3), ItemList.Field_Generator_UV.get(1), ItemList.Automation_ChestBuffer_UEV.get(1L)) .itemOutputs(ItemList.Quantum_Chest_IV.get(1)).duration(5 * SECONDS).eut(TierEU.RECIPE_HV) From 2cca932d10d5c8e2309e0372093e27c5b6dc95b1 Mon Sep 17 00:00:00 2001 From: Maya <10861407+serenibyss@users.noreply.github.com> Date: Sun, 19 Jan 2025 12:48:44 -0700 Subject: [PATCH 17/34] New ae2 content recipes (#1167) --- .../gthandler/recipes/AssemblerRecipes.java | 6 ++++ .../scripts/ScriptAppliedEnergistics2.java | 34 +++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java index 2753d4f06..d1e3e54c8 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java @@ -4859,6 +4859,12 @@ private void makeAE2Recipes() { GTUtility.getIntegratedCircuit(2)) .itemOutputs(getModItem(AE2Stuff.ID, "Wireless", 1)).duration(5 * SECONDS).eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); + + // Wireless Hub + GTValues.RA.stdBuilder() + .itemInputs(getModItem(AE2Stuff.ID, "Wireless", 8, 0, missing), ItemList.Emitter_LuV.get(1)) + .itemOutputs(getModItem(AE2Stuff.ID, "Wireless", 1, 17, missing)).duration(10 * SECONDS) + .eut(TierEU.RECIPE_IV).addTo(assemblerRecipes); } if (TinkerConstruct.isModLoaded()) { diff --git a/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java b/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java index 7777b11cd..d3e62d33a 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java @@ -1853,6 +1853,40 @@ public void loadRecipes() { "plateNetherQuartz", "gemNetherQuartz", "craftingToolFile"); + // Creative Energy Anchor + addShapedRecipe( + getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 690, missing), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 120, missing), // Cable Anchor + getModItem(AppliedEnergistics2.ID, "tile.BlockCreativeEnergyCell", 1, 0, missing), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 140, missing)); // Quartz Fiber + // Fake Crafting Card + addShapedRecipe( + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 66, missing), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 28, missing), // Advanced Card + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 24, missing), // Engineering Proc. + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 22, missing), // Logic Proc. + ItemList.Cover_Crafting.get(1)); + // Superliminal Acceleration Card + addShapedRecipe( + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 67, missing), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 28, missing), // Advanced Card + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 24, missing), // Engineering Proc. + GTOreDictUnificator.get(OrePrefixes.gem, Materials.Dilithium, 1), + ItemList.AcceleratorUV.get(1)); + // Overflow Void Card + addShapedRecipe( + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 68, missing), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 25, missing), // Basic Card + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 23, missing), // Calculation Proc. + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 23, missing), // Calculation Proc. + getModItem(AppliedEnergistics2.ID, "item.ItemVoidStorageCell", 1, 0, missing)); + // Equal Distribution Card + addShapedRecipe( + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 69, missing), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 28, missing), // Advanced Card + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 24, missing), // Engineering Proc. + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 22, missing), // Logic Proc. + ItemList.Automation_ItemDistributor_EV.get(1)); GTValues.RA.stdBuilder() .itemInputs( From 10392124daa465db2b97c4ebdf4271a5e06c8e0d Mon Sep 17 00:00:00 2001 From: Maya <10861407+serenibyss@users.noreply.github.com> Date: Sun, 19 Jan 2025 12:53:47 -0700 Subject: [PATCH 18/34] Use quadruple plate over triple for super chests (#1170) --- .../gthandler/GT_CraftingRecipeLoader.java | 20 +++++++++---------- .../gthandler/recipes/AssemblerRecipes.java | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java index e884bee1d..a40197fb3 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java +++ b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java @@ -262,62 +262,62 @@ public void run() { bits, new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_LV, 'G', OrePrefixes.plate.get(Materials.PulsatingIron), 'D', OrePrefixes.circuit.get(Materials.LV), 'P', - OrePrefixes.plateTriple.get(Materials.Iron) }); + OrePrefixes.plateQuadruple.get(Materials.Iron) }); GTModHandler.addCraftingRecipe( ItemList.Super_Chest_MV.get(1L), bits, new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_MV, 'G', OrePrefixes.plate.get(Materials.VibrantAlloy), 'D', OrePrefixes.circuit.get(Materials.MV), 'P', - OrePrefixes.plateTriple.get(Materials.Steel) }); + OrePrefixes.plateQuadruple.get(Materials.Steel) }); GTModHandler.addCraftingRecipe( ItemList.Super_Chest_HV.get(1L), bits, new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_HV, 'G', ItemList.Field_Generator_LV, 'D', OrePrefixes.circuit.get(Materials.HV), 'P', - OrePrefixes.plateTriple.get(Materials.Aluminium) }); + OrePrefixes.plateQuadruple.get(Materials.Aluminium) }); GTModHandler.addCraftingRecipe( ItemList.Super_Chest_EV.get(1L), bits, new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_EV, 'G', ItemList.Field_Generator_MV, 'D', OrePrefixes.circuit.get(Materials.EV), 'P', - OrePrefixes.plateTriple.get(Materials.StainlessSteel) }); + OrePrefixes.plateQuadruple.get(Materials.StainlessSteel) }); GTModHandler.addCraftingRecipe( ItemList.Super_Chest_IV.get(1L), bits, new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_IV, 'G', ItemList.Field_Generator_HV, 'D', OrePrefixes.circuit.get(Materials.IV), 'P', - OrePrefixes.plateTriple.get(Materials.Titanium) }); + OrePrefixes.plateQuadruple.get(Materials.Titanium) }); GTModHandler.addCraftingRecipe( ItemList.Quantum_Chest_LV.get(1L), bits, new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_LuV, 'G', ItemList.Field_Generator_EV, 'D', OrePrefixes.circuit.get(Materials.LuV), 'P', - OrePrefixes.plateTriple.get(Materials.TungstenSteel) }); + OrePrefixes.plateQuadruple.get(Materials.TungstenSteel) }); GTModHandler.addCraftingRecipe( ItemList.Quantum_Chest_MV.get(1L), bits, new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_ZPM, 'G', ItemList.Field_Generator_IV, 'D', OrePrefixes.circuit.get(Materials.ZPM), 'P', - OrePrefixes.plateTriple.get(Materials.HSSG) }); + OrePrefixes.plateQuadruple.get(Materials.HSSG) }); GTModHandler.addCraftingRecipe( ItemList.Quantum_Chest_HV.get(1L), bits, new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_UV, 'G', ItemList.Field_Generator_LuV, 'D', OrePrefixes.circuit.get(Materials.UV), 'P', - OrePrefixes.plateTriple.get(Materials.HSSS) }); + OrePrefixes.plateQuadruple.get(Materials.HSSS) }); GTModHandler.addCraftingRecipe( ItemList.Quantum_Chest_EV.get(1L), bits, new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_UHV, 'G', ItemList.Field_Generator_ZPM, 'D', OrePrefixes.circuit.get(Materials.UHV), 'P', - OrePrefixes.plateTriple.get(Materials.Europium) }); + OrePrefixes.plateQuadruple.get(Materials.Europium) }); GTModHandler.addCraftingRecipe( ItemList.Quantum_Chest_IV.get(1L), bits, new Object[] { "DPD", "PMP", "DGD", 'M', ItemList.Automation_ChestBuffer_UEV, 'G', ItemList.Field_Generator_UV, 'D', OrePrefixes.circuit.get(Materials.UEV), 'P', - OrePrefixes.plateTriple.get(Materials.Americium) }); + OrePrefixes.plateQuadruple.get(Materials.Americium) }); // Hermetic casings GTModHandler.addCraftingRecipe( diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java index d1e3e54c8..200b73d89 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java @@ -2013,7 +2013,7 @@ public void run() { GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.circuit.get(Materials.IV), 4), - GTOreDictUnificator.get(OrePrefixes.plateTriple, Materials.Titanium, 3), + GTOreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Titanium, 3), ItemList.Field_Generator_HV.get(1), ItemList.Automation_ChestBuffer_IV.get(1)) .itemOutputs(ItemList.Super_Chest_IV.get(1L)).duration(5 * SECONDS).eut(TierEU.RECIPE_HV) @@ -2053,7 +2053,7 @@ public void run() { GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.circuit.get(Materials.UEV), 4), - GTOreDictUnificator.get(OrePrefixes.plateTriple.get(Materials.Americium), 3), + GTOreDictUnificator.get(OrePrefixes.plateQuadruple.get(Materials.Americium), 3), ItemList.Field_Generator_UV.get(1), ItemList.Automation_ChestBuffer_UEV.get(1L)) .itemOutputs(ItemList.Quantum_Chest_IV.get(1)).duration(5 * SECONDS).eut(TierEU.RECIPE_HV) From 1db9dc1f0c2930d0e0c2cec5b35d5a757bcb6468 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sun, 19 Jan 2025 21:04:37 +0100 Subject: [PATCH 19/34] update --- dependencies.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 5018f5d95..f80db5d27 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,16 +1,16 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.75:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.83:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") - implementation("com.github.GTNewHorizons:GTNHLib:0.6.2:dev") + implementation("com.github.GTNewHorizons:GTNHLib:0.6.3:dev") compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.0:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Avaritia:1.59:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:twilightforest:2.7.3:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.22:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:twilightforest:2.7.4:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.26:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.4-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.3.0:dev") { transitive = false } @@ -18,7 +18,7 @@ dependencies { 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.5-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.0:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.3: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.0:dev") { transitive = false } From ffa80c1300150d7a17e05f61718b556ada71dc65 Mon Sep 17 00:00:00 2001 From: Ruling-0 <47913168+Ruling-0@users.noreply.github.com> Date: Mon, 20 Jan 2025 15:18:05 -0600 Subject: [PATCH 20/34] Make the dust > dye recipes shaped (#1171) --- .../dreammaster/scripts/ScriptGregtech.java | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptGregtech.java b/src/main/java/com/dreammaster/scripts/ScriptGregtech.java index 50cc4b673..1293421ad 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptGregtech.java +++ b/src/main/java/com/dreammaster/scripts/ScriptGregtech.java @@ -575,22 +575,22 @@ public void loadRecipes() { getModItem(BiomesOPlenty.ID, "moss", 1, 0, missing), getModItem(BiomesOPlenty.ID, "moss", 1, 0, missing), getModItem(BiomesOPlenty.ID, "moss", 1, 0, missing)); - addShapelessRecipe(ItemList.Color_03.get(1L), "dyeBrown"); - addShapelessRecipe(ItemList.Color_07.get(1L), "dyeLightGray"); - addShapelessRecipe(ItemList.Color_11.get(1L), "dyeYellow"); - addShapelessRecipe(ItemList.Color_15.get(1L), "dyeWhite"); - addShapelessRecipe(ItemList.Color_04.get(1L), "dyeBlue"); - addShapelessRecipe(ItemList.Color_08.get(1L), "dyeGray"); - addShapelessRecipe(ItemList.Color_10.get(1L), "dyeLime"); - addShapelessRecipe(ItemList.Color_14.get(1L), "dyeOrange"); - addShapelessRecipe(ItemList.Color_01.get(1L), "dyeRed"); - addShapelessRecipe(ItemList.Color_05.get(1L), "dyePurple"); - addShapelessRecipe(ItemList.Color_09.get(1L), "dyePink"); - addShapelessRecipe(ItemList.Color_13.get(1L), "dyeMagenta"); - addShapelessRecipe(ItemList.Color_00.get(1L), "dyeBlack"); - addShapelessRecipe(ItemList.Color_02.get(1L), "dyeGreen"); - addShapelessRecipe(ItemList.Color_06.get(1L), "dyeCyan"); - addShapelessRecipe(ItemList.Color_12.get(1L), "dyeLightBlue"); + addShapedRecipe(ItemList.Color_03.get(1L), null, null, null, "dyeBrown", null, null, null, null, null); + addShapedRecipe(ItemList.Color_07.get(1L), null, null, null, "dyeLightGray", null, null, null, null, null); + addShapedRecipe(ItemList.Color_11.get(1L), null, null, null, "dyeYellow", null, null, null, null, null); + addShapedRecipe(ItemList.Color_15.get(1L), null, null, null, "dyeWhite", null, null, null, null, null); + addShapedRecipe(ItemList.Color_04.get(1L), null, null, null, "dyeBlue", null, null, null, null, null); + addShapedRecipe(ItemList.Color_08.get(1L), null, null, null, "dyeGray", null, null, null, null, null); + addShapedRecipe(ItemList.Color_10.get(1L), null, null, null, "dyeLime", null, null, null, null, null); + addShapedRecipe(ItemList.Color_14.get(1L), null, null, null, "dyeOrange", null, null, null, null, null); + addShapedRecipe(ItemList.Color_01.get(1L), null, null, null, "dyeRed", null, null, null, null, null); + addShapedRecipe(ItemList.Color_05.get(1L), null, null, null, "dyePurple", null, null, null, null, null); + addShapedRecipe(ItemList.Color_09.get(1L), null, null, null, "dyePink", null, null, null, null, null); + addShapedRecipe(ItemList.Color_13.get(1L), null, null, null, "dyeMagenta", null, null, null, null, null); + addShapedRecipe(ItemList.Color_00.get(1L), null, null, null, "dyeBlack", null, null, null, null, null); + addShapedRecipe(ItemList.Color_02.get(1L), null, null, null, "dyeGreen", null, null, null, null, null); + addShapedRecipe(ItemList.Color_06.get(1L), null, null, null, "dyeCyan", null, null, null, null, null); + addShapedRecipe(ItemList.Color_12.get(1L), null, null, null, "dyeLightBlue", null, null, null, null, null); addShapelessRecipe( getModItem(StructureLib.ID, "item.structurelib.constructableTrigger", 1, 0, missing), "dyeBlue", From 48a92f16e2043fd6e38acd68af71e6865be6cf80 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Tue, 21 Jan 2025 17:43:46 +0100 Subject: [PATCH 21/34] update --- dependencies.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index f80db5d27..87546dbf1 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.83:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.87:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") @@ -10,7 +10,7 @@ dependencies { compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.0:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Avaritia:1.59:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:twilightforest:2.7.4:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.26:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.27:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.4-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.3.0:dev") { transitive = false } @@ -18,7 +18,7 @@ dependencies { 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.5-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.3:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.4: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.0:dev") { transitive = false } From c949ef1c664afa1653cd92db98cb2b6d857ccee7 Mon Sep 17 00:00:00 2001 From: Mary <33456283+FourIsTheNumber@users.noreply.github.com> Date: Tue, 21 Jan 2025 15:39:46 -0500 Subject: [PATCH 22/34] Fix duplicate solar conversion (#1176) --- .../gthandler/recipes/AssemblerRecipes.java | 95 +++++++++---------- 1 file changed, 47 insertions(+), 48 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java index 200b73d89..3e3d52210 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java @@ -98,6 +98,53 @@ public void run() { makeElectricMachinePartRecipes(); makeCircuitPartRecipes(); + // --- Advanced Solar Panel + if (AdvancedSolarPanel.isModLoaded()) { + // Conversion recipes to gt solars + GTValues.RA.stdBuilder() + .itemInputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 0)) + .itemOutputs(ItemList.Machine_LV_SolarPanel.get(1L)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 1)) + .itemOutputs(ItemList.Machine_MV_SolarPanel.get(1L)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 2)) + .itemOutputs(ItemList.Machine_HV_SolarPanel.get(1L)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 3)) + .itemOutputs(ItemList.Machine_EV_SolarPanel.get(1L)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); + } + + // --- Super Solar Panel + if (SuperSolarPanels.isModLoaded()) { + // Conversion recipes to gt solars + GTValues.RA.stdBuilder() + .itemInputs(GTModHandler.getModItem(SuperSolarPanels.ID, "SpectralSolarPanel", 1L, 0)) + .itemOutputs(ItemList.Machine_IV_SolarPanel.get(1L)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs(GTModHandler.getModItem(SuperSolarPanels.ID, "SingularSolarPanel", 1L, 0)) + .itemOutputs(ItemList.Machine_LuV_SolarPanel.get(1L)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); + + GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(SuperSolarPanels.ID, "AdminSolarPanel", 1L, 0)) + .itemOutputs(ItemList.Machine_ZPM_SolarPanel.get(1L)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); + + GTValues.RA.stdBuilder() + .itemInputs(GTModHandler.getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", 1L, 0)) + .itemOutputs(ItemList.Machine_UV_SolarPanel.get(1L)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); + } + GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 8), @@ -9510,54 +9557,6 @@ private void makeSolderingAlloyRecipes() { } - // --- Advanced Solar Panel - if (AdvancedSolarPanel.isModLoaded()) { - // Conversion recipes to gt solars - GTValues.RA.stdBuilder() - .itemInputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 0)) - .itemOutputs(ItemList.Machine_LV_SolarPanel.get(1L)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(assemblerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 1)) - .itemOutputs(ItemList.Machine_MV_SolarPanel.get(1L)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(assemblerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 2)) - .itemOutputs(ItemList.Machine_HV_SolarPanel.get(1L)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(assemblerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 3)) - .itemOutputs(ItemList.Machine_EV_SolarPanel.get(1L)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(assemblerRecipes); - } - - // --- Super Solar Panel - if (SuperSolarPanels.isModLoaded()) { - // Conversion recipes to gt solars - GTValues.RA.stdBuilder() - .itemInputs(GTModHandler.getModItem(SuperSolarPanels.ID, "SpectralSolarPanel", 1L, 0)) - .itemOutputs(ItemList.Machine_IV_SolarPanel.get(1L)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(assemblerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(GTModHandler.getModItem(SuperSolarPanels.ID, "SingularSolarPanel", 1L, 0)) - .itemOutputs(ItemList.Machine_LuV_SolarPanel.get(1L)).duration(1 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(GTModHandler.getModItem(SuperSolarPanels.ID, "AdminSolarPanel", 1L, 0)) - .itemOutputs(ItemList.Machine_ZPM_SolarPanel.get(1L)).duration(1 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(GTModHandler.getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", 1L, 0)) - .itemOutputs(ItemList.Machine_UV_SolarPanel.get(1L)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(assemblerRecipes); - } - // GT solars GTValues.RA.stdBuilder() From 3b5b2c2032cd721bb58affbc286a046c4a01dbe4 Mon Sep 17 00:00:00 2001 From: Guillaume Mercier Date: Tue, 21 Jan 2025 15:46:20 -0500 Subject: [PATCH 23/34] Replace direct references to IC2 item casings with calls to GTOreDictUnificator (#1175) Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../gthandler/GT_CraftingRecipeLoader.java | 3 +- .../dreammaster/scripts/ScriptEnderIO.java | 2 +- .../dreammaster/scripts/ScriptForestry.java | 120 +++++++++--------- .../scripts/ScriptStevesCarts.java | 6 +- 4 files changed, 66 insertions(+), 65 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java index a40197fb3..89f4a8fb0 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java +++ b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java @@ -532,7 +532,8 @@ public void run() { GTModHandler.addCraftingRecipe( ItemList.Circuit_Good.get(1, o), new Object[] { "PAP", "CBC", "DCD", 'D', ItemList.Circuit_Parts_Diode.get(1, o), 'C', - Ic2Items.electronicCircuit, 'A', ItemList.IC2_Item_Casing_Steel.get(1, o), 'P', + Ic2Items.electronicCircuit, 'A', + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Steel, 1), 'P', GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Copper, 1), 'B', ItemList.Circuit_Board_Phenolic_Good.get(1, o) }); GTModHandler.addCraftingRecipe( diff --git a/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java b/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java index 64675ad41..58d3403d5 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java +++ b/src/main/java/com/dreammaster/scripts/ScriptEnderIO.java @@ -1762,7 +1762,7 @@ public void loadRecipes() { getModItem(EnderIO.ID, "itemMachinePart", 1, 0, missing), getModItem(EnderIO.ID, "itemFrankenSkull", 1, 1, missing), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 1), - ItemList.IC2_Item_Casing_Steel.get(2L)) + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Steel, 2L)) .itemOutputs(getModItem(EnderIO.ID, "blockCrafter", 1, 0, missing)).duration(10 * SECONDS).eut(64) .addTo(assemblerRecipes); GTValues.RA.stdBuilder() diff --git a/src/main/java/com/dreammaster/scripts/ScriptForestry.java b/src/main/java/com/dreammaster/scripts/ScriptForestry.java index 4aa9e3cab..0faeacda2 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptForestry.java +++ b/src/main/java/com/dreammaster/scripts/ScriptForestry.java @@ -2972,19 +2972,19 @@ private void recipes1() { 'a', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Diamond, 1L), 'b', - ItemList.IC2_Item_Casing_Tin.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Tin, 1L), 'c', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Diamond, 1L), 'd', - ItemList.IC2_Item_Casing_Tin.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Tin, 1L), 'e', "circuitBasic", 'f', - ItemList.IC2_Item_Casing_Tin.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Tin, 1L), 'g', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Diamond, 1L), 'h', - ItemList.IC2_Item_Casing_Tin.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Tin, 1L), 'i', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Diamond, 1L)); RecipeManagers.carpenterManager.addRecipe( @@ -2998,19 +2998,19 @@ private void recipes1() { 'a', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Diamond, 1L), 'b', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'c', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Diamond, 1L), 'd', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'e', "circuitBasic", 'f', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'g', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Diamond, 1L), 'h', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'i', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Diamond, 1L)); RecipeManagers.carpenterManager.addRecipe( @@ -3024,19 +3024,19 @@ private void recipes1() { 'a', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Diamond, 1L), 'b', - ItemList.IC2_Item_Casing_Bronze.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Bronze, 1L), 'c', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Diamond, 1L), 'd', - ItemList.IC2_Item_Casing_Bronze.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Bronze, 1L), 'e', "circuitBasic", 'f', - ItemList.IC2_Item_Casing_Bronze.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Bronze, 1L), 'g', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Diamond, 1L), 'h', - ItemList.IC2_Item_Casing_Bronze.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Bronze, 1L), 'i', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Diamond, 1L)); RecipeManagers.carpenterManager.addRecipe( @@ -3050,19 +3050,19 @@ private void recipes1() { 'a', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'b', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'c', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'd', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'e', getModItem(Forestry.ID, "thermionicTubes", 1, 10, missing), 'f', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'g', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'h', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'i', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L)); RecipeManagers.carpenterManager.addRecipe( @@ -3076,19 +3076,19 @@ private void recipes1() { 'a', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'b', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'c', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'd', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'e', getModItem(Forestry.ID, "thermionicTubes", 1, 10, missing), 'f', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'g', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'h', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'i', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L)); RecipeManagers.carpenterManager.addRecipe( @@ -3102,19 +3102,19 @@ private void recipes1() { 'a', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'b', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'c', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'd', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'e', getModItem(Forestry.ID, "thermionicTubes", 1, 10, missing), 'f', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'g', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'h', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'i', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L)); RecipeManagers.carpenterManager.addRecipe( @@ -3128,19 +3128,19 @@ private void recipes1() { 'a', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'b', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'c', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'd', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'e', getModItem(Forestry.ID, "thermionicTubes", 1, 10, missing), 'f', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'g', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'h', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'i', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L)); RecipeManagers.carpenterManager.addRecipe( @@ -3154,19 +3154,19 @@ private void recipes1() { 'a', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'b', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'c', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'd', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'e', getModItem(Forestry.ID, "thermionicTubes", 1, 10, missing), 'f', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'g', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'h', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'i', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L)); RecipeManagers.carpenterManager.addRecipe( @@ -3180,19 +3180,19 @@ private void recipes1() { 'a', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'b', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'c', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'd', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'e', getModItem(Forestry.ID, "thermionicTubes", 1, 10, missing), 'f', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'g', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'h', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'i', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L)); RecipeManagers.carpenterManager.addRecipe( @@ -3206,19 +3206,19 @@ private void recipes1() { 'a', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'b', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'c', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'd', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'e', getModItem(Forestry.ID, "thermionicTubes", 1, 10, missing), 'f', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'g', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'h', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'i', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L)); RecipeManagers.carpenterManager.addRecipe( @@ -3232,19 +3232,19 @@ private void recipes1() { 'a', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'b', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'c', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'd', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'e', getModItem(Forestry.ID, "thermionicTubes", 1, 10, missing), 'f', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'g', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'h', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'i', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L)); RecipeManagers.carpenterManager.addRecipe( @@ -3258,19 +3258,19 @@ private void recipes1() { 'a', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'b', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'c', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'd', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'e', getModItem(Forestry.ID, "thermionicTubes", 1, 10, missing), 'f', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'g', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'h', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'i', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L)); RecipeManagers.carpenterManager.addRecipe( @@ -3284,19 +3284,19 @@ private void recipes1() { 'a', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'b', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'c', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'd', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'e', getModItem(Forestry.ID, "thermionicTubes", 1, 10, missing), 'f', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'g', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'h', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'i', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L)); RecipeManagers.carpenterManager.addRecipe( @@ -3310,19 +3310,19 @@ private void recipes1() { 'a', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'b', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'c', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'd', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'e', getModItem(Forestry.ID, "thermionicTubes", 1, 10, missing), 'f', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'g', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'h', - ItemList.IC2_Item_Casing_Copper.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Copper, 1L), 'i', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L)); RecipeManagers.carpenterManager.addRecipe( @@ -5232,19 +5232,19 @@ private void recipes2() { 'a', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 1L), 'b', - ItemList.IC2_Item_Casing_Bronze.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Bronze, 1L), 'c', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 1L), 'd', - ItemList.IC2_Item_Casing_Bronze.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Bronze, 1L), 'e', GTOreDictUnificator.get(OrePrefixes.ring, Materials.Steel, 1L), 'f', - ItemList.IC2_Item_Casing_Bronze.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Bronze, 1L), 'g', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 1L), 'h', - ItemList.IC2_Item_Casing_Bronze.get(1L), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Bronze, 1L), 'i', GTOreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 1L)); RecipeManagers.carpenterManager.addRecipe( diff --git a/src/main/java/com/dreammaster/scripts/ScriptStevesCarts.java b/src/main/java/com/dreammaster/scripts/ScriptStevesCarts.java index b8c43d264..d3ca68abc 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptStevesCarts.java +++ b/src/main/java/com/dreammaster/scripts/ScriptStevesCarts.java @@ -1931,15 +1931,15 @@ public void loadRecipes() { .itemOutputs(getModItem(StevesCarts2.ID, "ModuleComponents", 4, 31, missing)) .fluidInputs(FluidRegistry.getFluidStack("lubricant", 2)).duration(2 * SECONDS + 10 * TICKS).eut(30) .addTo(cutterRecipes); - GTValues.RA.stdBuilder().itemInputs(ItemList.IC2_Item_Casing_Iron.get(1L)) + GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Iron, 1L)) .itemOutputs(getModItem(StevesCarts2.ID, "ModuleComponents", 4, 34, missing)) .fluidInputs(FluidRegistry.getFluidStack("water", 8)).duration(10 * SECONDS).eut(30) .addTo(cutterRecipes); - GTValues.RA.stdBuilder().itemInputs(ItemList.IC2_Item_Casing_Iron.get(1L)) + GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Iron, 1L)) .itemOutputs(getModItem(StevesCarts2.ID, "ModuleComponents", 4, 34, missing)) .fluidInputs(FluidRegistry.getFluidStack("ic2distilledwater", 6)).duration(10 * SECONDS).eut(30) .addTo(cutterRecipes); - GTValues.RA.stdBuilder().itemInputs(ItemList.IC2_Item_Casing_Iron.get(1L)) + GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Iron, 1L)) .itemOutputs(getModItem(StevesCarts2.ID, "ModuleComponents", 4, 34, missing)) .fluidInputs(FluidRegistry.getFluidStack("lubricant", 2)).duration(5 * SECONDS).eut(30) .addTo(cutterRecipes); From 91f2f9a11b076d1760073d932bf118b27a88b81b Mon Sep 17 00:00:00 2001 From: EnderProyects <45178400+EnderProyects@users.noreply.github.com> Date: Wed, 22 Jan 2025 07:36:08 +0100 Subject: [PATCH 24/34] Fix loop between Optical Processor and Tier 3.5 Memory (#1174) Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java index 49c448557..b766d1a21 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java @@ -293,7 +293,7 @@ public void run() { ItemList.Circuit_Chip_Ram.get(64), ItemList.Circuit_Chip_SoC.get(64), ItemList.Circuit_Chip_NAND.get(64), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 1L), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 2L), GTOreDictUnificator.get(OrePrefixes.foil, Materials.VanadiumGallium, 64L)) .fluidInputs(new FluidStack(solderIndalloy, 1152)) .itemOutputs(getModItem(OpenComputers.ID, "item", 64L, 39)) From 5e882a581d18db2e2e35e4388d3c648344e890e2 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Wed, 22 Jan 2025 18:37:37 +0100 Subject: [PATCH 25/34] update --- dependencies.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 87546dbf1..776592e15 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.87:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.89:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") @@ -12,7 +12,7 @@ dependencies { compileOnly("com.github.GTNewHorizons:twilightforest:2.7.4:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.27:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.4-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.7-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") From cf55e8527e6564129aa9ab4e57a72a4e3b979cfc Mon Sep 17 00:00:00 2001 From: EnderProyects <45178400+EnderProyects@users.noreply.github.com> Date: Thu, 23 Jan 2025 02:03:11 +0100 Subject: [PATCH 26/34] Magnet Dislocator recipe (#1178) --- .../dreammaster/scripts/ScriptDraconicEvolution.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/com/dreammaster/scripts/ScriptDraconicEvolution.java b/src/main/java/com/dreammaster/scripts/ScriptDraconicEvolution.java index c5167d81b..6f2a83818 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptDraconicEvolution.java +++ b/src/main/java/com/dreammaster/scripts/ScriptDraconicEvolution.java @@ -13,6 +13,7 @@ import static gregtech.api.enums.Mods.ProjectRedIntegration; import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.enums.Mods.TinkerConstruct; import static gregtech.api.enums.Mods.TinkersGregworks; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; @@ -22,6 +23,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.core.recipe.common.CI.bits; import java.util.Arrays; import java.util.List; @@ -38,6 +40,7 @@ import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GTModHandler; import gregtech.api.util.GTOreDictUnificator; import tconstruct.tools.TinkerTools; @@ -1246,5 +1249,13 @@ public void loadRecipes() { .itemOutputs(getModItem(DraconicEvolution.ID, "safetyMatch", 1, 0, missing)) .duration(3 * SECONDS + 4 * TICKS).eut(16).addTo(packagerRecipes); + GTModHandler.addCraftingRecipe( + getModItem(DraconicEvolution.ID, "dislocatorInhibitor", 1, 0, missing), + bits, + new Object[] { "PSP", "BMB", "PSP", 'P', "plateSteelMagnetic", 'S', + getModItem(TinkerConstruct.ID, "heavyPlate", 1, 6, missing), 'B', + getModItem(EnderIO.ID, "blockDarkIronBars", 1, 0, missing), 'M', + getModItem(DraconicEvolution.ID, "magnet", 1, 0, missing) }); + } } From 5dd24e04d82e3577e149e20c2078df9c7f2493c3 Mon Sep 17 00:00:00 2001 From: EnderProyects <45178400+EnderProyects@users.noreply.github.com> Date: Thu, 23 Jan 2025 05:46:08 +0100 Subject: [PATCH 27/34] Batch of Efr recipes (#1177) Co-authored-by: Martin Robertz Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../com/dreammaster/scripts/ScriptEFR.java | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/src/main/java/com/dreammaster/scripts/ScriptEFR.java b/src/main/java/com/dreammaster/scripts/ScriptEFR.java index 8e5d34de0..4b4fd4bb2 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptEFR.java +++ b/src/main/java/com/dreammaster/scripts/ScriptEFR.java @@ -1,20 +1,31 @@ package com.dreammaster.scripts; +import static gregtech.api.enums.Mods.AdventureBackpack; +import static gregtech.api.enums.Mods.AppliedEnergistics2; +import static gregtech.api.enums.Mods.DraconicEvolution; import static gregtech.api.enums.Mods.EtFuturumRequiem; import static gregtech.api.enums.Mods.ExtraUtilities; +import static gregtech.api.enums.Mods.HardcoreEnderExpansion; import static gregtech.api.enums.Mods.Minecraft; import static gregtech.api.enums.Mods.PamsHarvestCraft; import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.enums.Mods.TinkerConstruct; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; +import static gregtech.api.recipe.RecipeMaps.compressorRecipes; +import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; import static gregtech.api.util.GTModHandler.getModItem; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import java.util.Arrays; import java.util.List; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import com.dreammaster.recipes.CustomItem; import gregtech.api.enums.GTValues; +import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; @@ -96,15 +107,71 @@ public void loadRecipes() { getModItem(Minecraft.ID, "stone", 1, 0, missing), getModItem(EtFuturumRequiem.ID, "smooth_stone", 1, 0, missing)); + GTModHandler.addSmeltingRecipe( + getModItem(Minecraft.ID, "quartz_block", 1, 0, missing), + getModItem(EtFuturumRequiem.ID, "smooth_quartz", 1, 0, missing)); + GTModHandler.addCraftingRecipe( getModItem(EtFuturumRequiem.ID, "blast_furnace", 1, 0, missing), bits, new Object[] { "PPP", "PFP", "SSS", 'S', getModItem(EtFuturumRequiem.ID, "smooth_stone", 1, 0, missing), 'F', getModItem(Minecraft.ID, "furnace", 1, 0, missing), 'P', "plateIron" }); + GTModHandler.addCraftingRecipe( getModItem(Minecraft.ID, "leather", 1, 0, missing), bits, new Object[] { "SSS", "HHH", "SSS", 'S', getModItem(Minecraft.ID, "string", 1, 0, missing), 'H', getModItem(EtFuturumRequiem.ID, "rabbit_hide", 1, 0, missing) }); + GTModHandler.addCraftingRecipe( + getModItem(EtFuturumRequiem.ID, "soul_lantern", 1, 0, missing), + bits, + new Object[] { "IGI", "PCP", "III", 'I', "plateIron", 'G', "dustInfusedWater", 'P', + "paneGlassColorless", 'C', getModItem(EtFuturumRequiem.ID, "soul_torch", 1, 0, missing) }); + + GTModHandler.addCraftingRecipe( + getModItem(EtFuturumRequiem.ID, "target", 1, 0, missing), + bits, + new Object[] { "WTR", "CHD", "RTW", 'W', "blockWoolWhite", 'R', "blockWoolRed", 'T', "dustRedstone", + 'C', GTModHandler.getModItem(Minecraft.ID, "comparator", 1, 0), 'H', + GTModHandler.getModItem(Minecraft.ID, "hay_block", 1, 0), 'D', + GTModHandler.getModItem(ExtraUtilities.ID, "budoff", 1, 0) }); + + GTModHandler.addCraftingRecipe( + getModItem(EtFuturumRequiem.ID, "smoker", 1, 0, missing), + bits, + new Object[] { "PhP", "PFP", "SCS", 'P', "plateIron", 'F', + getModItem(Minecraft.ID, "furnace", 1, 0, missing), 'S', + getModItem(EtFuturumRequiem.ID, "smooth_stone", 1, 0, missing), 'C', + getModItem(AdventureBackpack.ID, "blockCampFire", 1, 0, missing) }); + + GTModHandler.addCraftingRecipe( + getModItem(EtFuturumRequiem.ID, "end_crystal", 1, 0, missing), + bits, + new Object[] { "VGV", "VSV", "VQV", 'V', + getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzLamp", 1, 0, missing), 'G', + getModItem(HardcoreEnderExpansion.ID, "living_matter", 1, 0, missing), 'S', + getModItem(DraconicEvolution.ID, "wyvernCore", 1, 0, missing), 'Q', + ItemList.QuantumEye.get(1), }); + + GTModHandler.addCraftingRecipe( + getModItem(EtFuturumRequiem.ID, "smithing_table", 1, 0, missing), + bits, + new Object[] { "TT ", "GG ", "GG ", 'T', + GTModHandler.getModItem(TinkerConstruct.ID, "CraftingSlab", 1, 5), 'G', + GTModHandler.getModItem(Thaumcraft.ID, "blockWoodenDevice", 1, 6), }); + + GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "magma_cream", 4, 0, missing)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("lava"), 1000)) + .itemOutputs(getModItem(EtFuturumRequiem.ID, "magma", 1, 0, missing)).duration(10 * SECONDS).eut(2) + .addTo(compressorRecipes); + + GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "dye", 9, 15, missing)) + .itemOutputs(getModItem(EtFuturumRequiem.ID, "bone", 1, 0, missing)).duration(8 * SECONDS).eut(2) + .addTo(compressorRecipes); + + GTValues.RA.stdBuilder().itemInputs(getModItem(EtFuturumRequiem.ID, "magma", 1, 0, missing)) + .itemOutputs(getModItem(Minecraft.ID, "magma_cream", 4, 0, missing)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("lava"), 1000)).duration(10 * SECONDS).eut(48) + .addTo(fluidExtractionRecipes); } } From 6d9bd31b7a51c00504b27ea0446dd975200678b2 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Thu, 23 Jan 2025 09:20:06 +0100 Subject: [PATCH 28/34] update --- dependencies.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 776592e15..178b061f3 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.89:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.91:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") @@ -10,7 +10,7 @@ dependencies { compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.0:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Avaritia:1.59:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:twilightforest:2.7.4:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.27:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.28:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.7-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.3.0:dev") { transitive = false } @@ -18,11 +18,11 @@ dependencies { 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.5-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.4:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.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.8.0:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.3-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.4-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.1:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.0-GTNH:dev") From 50867b4dc45a18c7878c4dcf4000b30821f8f898 Mon Sep 17 00:00:00 2001 From: EnderProyects <45178400+EnderProyects@users.noreply.github.com> Date: Fri, 24 Jan 2025 08:03:25 +0100 Subject: [PATCH 29/34] Bunch of QoL recipes from an old issue (#1180) --- .../recipes/FluidExtractorRecipes.java | 9 ++++ .../scripts/ScriptBiomesOPlenty.java | 6 +++ .../scripts/ScriptTinkersConstruct.java | 46 +++++++++++++++++++ 3 files changed, 61 insertions(+) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/FluidExtractorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/FluidExtractorRecipes.java index 3d8f9c82d..3f20f627b 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/FluidExtractorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/FluidExtractorRecipes.java @@ -1,6 +1,7 @@ package com.dreammaster.gthandler.recipes; import static gregtech.api.enums.Mods.OpenBlocks; +import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Mods.TinkerConstruct; import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; import static gregtech.api.util.GTRecipeBuilder.SECONDS; @@ -53,6 +54,14 @@ public void run() { .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ender"), 2250)).duration(10 * SECONDS).eut(48) .addTo(fluidExtractionRecipes); + GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "materials", 1L, 2)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("stone.seared"), 18)).duration(10 * SECONDS) + .eut(48).addTo(fluidExtractionRecipes); + + GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(Thaumcraft.ID, "blockTaint", 1L, 2)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("blood"), 45)).duration(50 * SECONDS).eut(48) + .addTo(fluidExtractionRecipes); + GTValues.RA.stdBuilder().itemInputs(new ItemStack(Items.slime_ball, 1, 0)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("glue"), 144)).duration(5 * SECONDS).eut(16) .addTo(fluidExtractionRecipes); diff --git a/src/main/java/com/dreammaster/scripts/ScriptBiomesOPlenty.java b/src/main/java/com/dreammaster/scripts/ScriptBiomesOPlenty.java index 43a388f5f..cbe3dd932 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptBiomesOPlenty.java +++ b/src/main/java/com/dreammaster/scripts/ScriptBiomesOPlenty.java @@ -22,6 +22,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; @@ -29,6 +30,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; +import com.dreammaster.item.NHItemList; + import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -306,6 +309,9 @@ public void loadRecipes() { GTValues.RA.stdBuilder().itemInputs(getModItem(BiomesOPlenty.ID, "jarEmpty", 1L)) .itemOutputs(getModItem(BiomesOPlenty.ID, "jarFilled", 1L)).fluidInputs(Materials.Honey.getFluid(1000L)) .duration(2 * SECONDS).eut(1).addTo(fluidCannerRecipes); + GTValues.RA.stdBuilder().itemInputs(NHItemList.MushroomPowder.getIS(1), GTUtility.getIntegratedCircuit(16)) + .itemOutputs(getModItem(BiomesOPlenty.ID, "food", 1, 1, missing)).eut(30).duration(2 * MINUTES) + .addTo(chemicalDehydratorRecipes); } } diff --git a/src/main/java/com/dreammaster/scripts/ScriptTinkersConstruct.java b/src/main/java/com/dreammaster/scripts/ScriptTinkersConstruct.java index 2c6dfad02..9fb1c57ca 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptTinkersConstruct.java +++ b/src/main/java/com/dreammaster/scripts/ScriptTinkersConstruct.java @@ -22,10 +22,15 @@ import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Mods.TinkerConstruct; import static gregtech.api.enums.Mods.TinkersMechworks; +import static gregtech.api.enums.Mods.WitchingGadgets; import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; +import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; import static gregtech.api.util.GTModHandler.getModItem; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; import java.util.Arrays; import java.util.List; @@ -34,6 +39,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import com.dreammaster.gthandler.CustomItemList; @@ -49,6 +55,7 @@ import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.util.GTModHandler; import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTUtility; @@ -2503,6 +2510,45 @@ public void loadRecipes() { GTUtility.getIntegratedCircuit(6)) .itemOutputs(getModItem(TinkerConstruct.ID, "decoration.stoneladder", 4, 0, missing)) .duration(3 * SECONDS).eut(30).addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + getModItem(TinkerConstruct.ID, "strangeFood", 1, 1, missing), + GTUtility.getIntegratedCircuit(16)) + .itemOutputs(getModItem(TinkerConstruct.ID, "jerky", 1, 7, missing)).eut(30).duration(2 * MINUTES) + .addTo(chemicalDehydratorRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + getModItem(TinkerConstruct.ID, "strangeFood", 1, 0, missing), + GTUtility.getIntegratedCircuit(16)) + .itemOutputs(getModItem(TinkerConstruct.ID, "jerky", 1, 6, missing)).eut(30).duration(2 * MINUTES) + .addTo(chemicalDehydratorRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + getModItem(PamsHarvestCraft.ID, "muttonrawItem", 1, 0, missing), + GTUtility.getIntegratedCircuit(16)) + .itemOutputs(getModItem(TinkerConstruct.ID, "jerky", 1, 3, missing)).eut(30).duration(2 * MINUTES) + .addTo(chemicalDehydratorRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + getModItem(Thaumcraft.ID, "ItemZombieBrain", 1, 0, missing), + GTUtility.getIntegratedCircuit(16)) + .itemOutputs(getModItem(WitchingGadgets.ID, "item.WG_MagicFood", 1, 2, missing)).eut(30) + .duration(2 * MINUTES).addTo(chemicalDehydratorRecipes); + + GTValues.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Ball.get(0L)) + .itemOutputs(getModItem(TinkerConstruct.ID, "strangeFood", 1, 1, missing)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("blood"), 160)).duration(20 * TICKS) + .eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); + + GTValues.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Block.get(0L)) + .itemOutputs(getModItem(TinkerConstruct.ID, "MetalBlock", 1, 10, missing)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("ender"), 2250)).duration(20 * TICKS) + .eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); + + GTValues.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Block.get(0L)) + .itemOutputs(getModItem(TinkerConstruct.ID, "Smeltery", 1, 4, missing)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("stone.seared"), 360)).duration(20 * TICKS) + .eut(TierEU.RECIPE_MV).addTo(fluidSolidifierRecipes); registerManualIcons(); } From c4d774051e580632a149b5c3697e8a7d191a148e Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Fri, 24 Jan 2025 19:39:58 +0100 Subject: [PATCH 30/34] update --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 178b061f3..a719e00ed 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.91:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.93:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") From fbf57882bdebaa913396d468e0a3b407cd90afc7 Mon Sep 17 00:00:00 2001 From: EnderProyects <45178400+EnderProyects@users.noreply.github.com> Date: Sat, 25 Jan 2025 16:48:22 +0100 Subject: [PATCH 31/34] Asgardandelion 2.0 (#1179) Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../scripts/ScriptAvaritiaAddons.java | 59 ++++++++++--------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptAvaritiaAddons.java b/src/main/java/com/dreammaster/scripts/ScriptAvaritiaAddons.java index e0c11f252..6e8fae314 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAvaritiaAddons.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAvaritiaAddons.java @@ -3,7 +3,9 @@ import static gregtech.api.enums.Mods.AppliedEnergistics2; import static gregtech.api.enums.Mods.Avaritia; import static gregtech.api.enums.Mods.AvaritiaAddons; +import static gregtech.api.enums.Mods.Botania; import static gregtech.api.enums.Mods.EternalSingularity; +import static gregtech.api.enums.Mods.ForbiddenMagic; import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.IronChests; import static gregtech.api.enums.Mods.UniversalSingularities; @@ -38,7 +40,6 @@ import gregtech.api.util.GTUtility; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import vazkii.botania.common.lib.LibBlockNames; public class ScriptAvaritiaAddons implements IScriptLoader { @@ -132,47 +133,49 @@ public void loadRecipes() { // Asgardandelion ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe( ItemBlockSpecialFlower.ofType("asgardandelion"), - "R0D0G0E0M", - "000iii000", - "d0i876i0n", - "00iAZai00", - "T0i5B4i0r", - "010iii010", + "RXDXGXEXM", + "X009i900X", + "d0957490n", + "X0iAZai0X", + "T098B690r", + "X109i901X", "t1102011H", - "001121100", - "e0K131S0m", + "X0112110X", + "eXK131SXm", 'R', - ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ARCANE_ROSE), + getModItem(Botania.ID, "corporeaSpark", 1, 1), 'D', - ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DANDELIFEON), + getModItem(Botania.ID, "rune", 1, 10), 'G', - ItemBlockSpecialFlower.ofType("beegonia"), + getModItem(Botania.ID, "rune", 1, 9), 'E', - ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ENTROPINNYUM), + getModItem(Botania.ID, "rune", 1, 11), 'M', - ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MUNCHDEW), + getModItem(ForbiddenMagic.ID, "WandCores", 1, 11), 'd', - ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DAYBLOOM), + getModItem(Botania.ID, "rune", 1, 12), 'n', - ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_NIGHTSHADE), + getModItem(Botania.ID, "rune", 1, 13), 'T', - ItemBlockSpecialFlower.ofType("soarleander"), + getModItem(Botania.ID, "rune", 1, 14), 'r', - ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_RAFFLOWSIA), + getModItem(Botania.ID, "rune", 1, 15), 't', - ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_THERMALILY), + getModItem(Botania.ID, "rune", 1, 3), 'H', - ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HYDROANGEAS), + getModItem(Botania.ID, "rune", 1, 6), 'e', - ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ENDOFLAME), + getModItem(ForbiddenMagic.ID, "WandCores", 1, 7), 'K', - ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_KEKIMURUS), + getModItem(Botania.ID, "rune", 1, 5), + 'X', + getModItem(Botania.ID, "bifrostPermPane", 1, 0), '3', new ItemStack(ModItems.blackLotus, 1, 1), 'S', - ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SPECTROLUS), + getModItem(Botania.ID, "rune", 1, 4), 'm', - ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_NARSLIMMUS), + getModItem(Botania.ID, "lightRelay", 1, 1), 'Z', new ItemStack(LudicrousBlocks.infinitato), '1', @@ -192,11 +195,13 @@ public void loadRecipes() { '5', "plateLivingrock", '6', - "plateElvenElementium", + getModItem(ForbiddenMagic.ID, "WandCaps", 1, 5), '7', - "plateManasteel", + getModItem(ForbiddenMagic.ID, "WandCaps", 1, 3), '8', - "plateTerrasteel"); + getModItem(ForbiddenMagic.ID, "WandCaps", 1, 2), + '9', + "nuggetInfinity"); // Infinity Egg (Witchery) if (Config.witch) { From 427e4d6dab708334c558b0ebdb67a598526b8279 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 25 Jan 2025 20:12:31 +0100 Subject: [PATCH 32/34] update --- dependencies.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index a719e00ed..3411aab4d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,18 +1,18 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.93:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.97:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") - implementation("com.github.GTNewHorizons:GTNHLib:0.6.3:dev") + implementation("com.github.GTNewHorizons:GTNHLib:0.6.5:dev") compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.0:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Avaritia:1.59:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:twilightforest:2.7.4:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.28:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.29:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.7-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.8-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") From 84d8933ceb9169f46d9f7cd1051f9ac26dd8317e Mon Sep 17 00:00:00 2001 From: Yannick Marcotte-Gourde Date: Sun, 26 Jan 2025 00:11:13 -0500 Subject: [PATCH 33/34] Replace Aluminum Gravel Ore with Zinc Gravel Ore, and deal with the consequences (#1181) Co-authored-by: Martin Robertz --- .../gthandler/GT_Loader_Materials.java | 6 +- .../recipes/AlloySmelterRecipes.java | 12 - .../recipes/FluidExtractorRecipes.java | 4 - .../recipes/FluidSolidifierRecipes.java | 5 +- .../gthandler/recipes/MixerRecipes.java | 10 +- .../recipes/NeutroniumCompressorRecipes.java | 12 +- .../com/dreammaster/main/MainRegistry.java | 10 + .../java/com/dreammaster/main/NHItems.java | 3 + .../dreammaster/scripts/ScriptAvaritia.java | 2 +- .../dreammaster/scripts/ScriptCoreMod.java | 13 +- .../dreammaster/scripts/ScriptMechworks.java | 2 +- .../scripts/ScriptTinkersConstruct.java | 339 ++++++++---------- .../tinkersConstruct/SmelteryFluidTypes.java | 40 +++ .../tinkersConstruct/TConstructHelper.java | 10 + .../tinkersConstruct/TiCoLoader.java | 148 ++++++++ .../worldgen/ZincGravelOre.java | 46 +++ .../worldgen/ZincGravelOreItem.java | 16 + .../worldgen/ZincGravelWorldgen.java | 53 +++ src/main/resources/META-INF/dreamcraft_at.cfg | 2 + .../assets/dreamcraft/lang/en_US.lang | 6 +- .../textures/blocks/ore_zinc_gravel.png | Bin 0 -> 552 bytes .../dreamcraft/tinker/manuals/smeltery.xml | 2 +- 22 files changed, 505 insertions(+), 236 deletions(-) create mode 100644 src/main/java/com/dreammaster/tinkersConstruct/SmelteryFluidTypes.java create mode 100644 src/main/java/com/dreammaster/tinkersConstruct/worldgen/ZincGravelOre.java create mode 100644 src/main/java/com/dreammaster/tinkersConstruct/worldgen/ZincGravelOreItem.java create mode 100644 src/main/java/com/dreammaster/tinkersConstruct/worldgen/ZincGravelWorldgen.java create mode 100644 src/main/resources/META-INF/dreamcraft_at.cfg create mode 100644 src/main/resources/assets/dreamcraft/textures/blocks/ore_zinc_gravel.png diff --git a/src/main/java/com/dreammaster/gthandler/GT_Loader_Materials.java b/src/main/java/com/dreammaster/gthandler/GT_Loader_Materials.java index 175169314..682540468 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_Loader_Materials.java +++ b/src/main/java/com/dreammaster/gthandler/GT_Loader_Materials.java @@ -15,9 +15,9 @@ private void registerMaterialRecipes() { GTModHandler.addShapelessCraftingRecipe( GTOreDictUnificator.get(OrePrefixes.dust, Materials.Alumite, 8), GTModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { OrePrefixes.dust.get(Materials.Aluminium), OrePrefixes.dust.get(Materials.Aluminium), - OrePrefixes.dust.get(Materials.Aluminium), OrePrefixes.dust.get(Materials.Aluminium), - OrePrefixes.dust.get(Materials.Aluminium), OrePrefixes.dust.get(Materials.Steel), + new Object[] { OrePrefixes.dust.get(Materials.Zinc), OrePrefixes.dust.get(Materials.Zinc), + OrePrefixes.dust.get(Materials.Zinc), OrePrefixes.dust.get(Materials.Zinc), + OrePrefixes.dust.get(Materials.Zinc), OrePrefixes.dust.get(Materials.Steel), OrePrefixes.dust.get(Materials.Steel), OrePrefixes.dust.get(Materials.Obsidian), OrePrefixes.dust.get(Materials.Obsidian) }); diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AlloySmelterRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AlloySmelterRecipes.java index 46d52e5e8..e3344b31c 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AlloySmelterRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AlloySmelterRecipes.java @@ -3,7 +3,6 @@ import static com.dreammaster.scripts.IScriptLoader.wildcard; import static gregtech.api.enums.Mods.EnderIO; import static gregtech.api.enums.Mods.IndustrialCraft2; -import static gregtech.api.enums.Mods.TinkerConstruct; import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes; import static gregtech.api.util.GTRecipeBuilder.SECONDS; @@ -226,17 +225,6 @@ public void run() { } } - - if (TinkerConstruct.isModLoaded()) { - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 3L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1L)) - .itemOutputs(GTModHandler.getModItem(TinkerConstruct.ID, "materials", 4L, 14)).duration(5 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(alloySmelterRecipes); - - } - } } diff --git a/src/main/java/com/dreammaster/gthandler/recipes/FluidExtractorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/FluidExtractorRecipes.java index 3f20f627b..c2bc9b0d2 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/FluidExtractorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/FluidExtractorRecipes.java @@ -42,10 +42,6 @@ public void run() { if (TinkerConstruct.isModLoaded()) { - GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "materials", 1L, 14)) - .fluidOutputs(FluidRegistry.getFluidStack("aluminumbrass.molten", 144)) - .duration(1 * SECONDS + 4 * TICKS).eut(48).addTo(fluidExtractionRecipes); - GTValues.RA.stdBuilder().itemInputs(new ItemStack(Items.ender_pearl, 1, 0)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ender"), 250)).duration(5 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(fluidExtractionRecipes); diff --git a/src/main/java/com/dreammaster/gthandler/recipes/FluidSolidifierRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/FluidSolidifierRecipes.java index 54ad5fc01..7e2a4a0ed 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/FluidSolidifierRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/FluidSolidifierRecipes.java @@ -15,6 +15,7 @@ import com.dreammaster.gthandler.CustomItemList; import com.dreammaster.gthandler.GT_CustomLoader; import com.dreammaster.item.NHItemList; +import com.dreammaster.tinkersConstruct.SmelteryFluidTypes; import bartworks.common.loaders.ItemRegistry; import gregtech.api.enums.GTValues; @@ -131,8 +132,8 @@ public void run() { GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(1)) .itemOutputs(GTModHandler.getModItem(TinkerConstruct.ID, "blankPattern", 1L, 1)) - .fluidInputs(FluidRegistry.getFluidStack("aluminumbrass.molten", 144)).duration(20 * TICKS).eut(48) - .addTo(fluidSolidifierRecipes); + .fluidInputs(FluidRegistry.getFluidStack(SmelteryFluidTypes.getMoltenPatternFluidName(), 144)) + .duration(20 * TICKS).eut(48).addTo(fluidSolidifierRecipes); GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.gravel, 1, 0)) .itemOutputs(GTModHandler.getModItem(TinkerConstruct.ID, "SpeedBlock", 1, 0)) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java index 488176ab0..b904ed20f 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java @@ -671,7 +671,7 @@ public void run() { GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 2L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 5L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 5L), GTOreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 2L), GTUtility.getIntegratedCircuit(2)) .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Alumite, 9)).duration(10 * SECONDS) @@ -1059,14 +1059,6 @@ public void run() { if (TinkerConstruct.isModLoaded() && Natura.isModLoaded()) { - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 3L), - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1L), - GTUtility.getIntegratedCircuit(2)) - .itemOutputs(GTModHandler.getModItem(TinkerConstruct.ID, "materials", 4L, 42)) - .duration(10 * SECONDS).eut(8).addTo(mixerRecipes); - GTValues.RA.stdBuilder() .itemInputs( GTModHandler.getModItem(TinkerConstruct.ID, "slime.gel", 1L, 2), diff --git a/src/main/java/com/dreammaster/gthandler/recipes/NeutroniumCompressorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/NeutroniumCompressorRecipes.java index 26664cdc4..ac7934ca4 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/NeutroniumCompressorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/NeutroniumCompressorRecipes.java @@ -241,6 +241,10 @@ public void run() { GTUtility.copyAmountUnsafe(62, GTOreDictUnificator.get(OrePrefixes.block, Materials.Europium, 1))) .itemOutputs(getModItem(UniversalSingularities.ID, "universal.general.singularity", 1, 30)) .duration(3 * SECONDS).eut(TierEU.RECIPE_HV).addTo(neutroniumCompressorRecipes); + GTValues.RA.stdBuilder().itemInputsUnsafe( + GTUtility.copyAmountUnsafe(1824, GTOreDictUnificator.get(OrePrefixes.block, Materials.RoseGold, 1))) + .itemOutputs(getModItem(UniversalSingularities.ID, "universal.general.singularity", 1, 32)) + .duration(3 * SECONDS).eut(TierEU.RECIPE_HV).addTo(neutroniumCompressorRecipes); if (DraconicEvolution.isModLoaded()) { GTValues.RA.stdBuilder() .itemInputsUnsafe( @@ -335,14 +339,6 @@ public void run() { .duration(3 * SECONDS).eut(TierEU.RECIPE_HV).addTo(neutroniumCompressorRecipes); } if (TinkerConstruct.isModLoaded()) { - GTValues.RA.stdBuilder() - .itemInputsUnsafe( - GTUtility.copyAmountUnsafe( - 1824, - GTOreDictUnificator.get(OrePrefixes.block, Materials.AluminiumBrass, 1))) - .itemOutputs( - getModItem(UniversalSingularities.ID, "universal.tinkersConstruct.singularity", 1, 0)) - .duration(3 * SECONDS).eut(TierEU.RECIPE_HV).addTo(neutroniumCompressorRecipes); GTValues.RA.stdBuilder() .itemInputsUnsafe( GTUtility.copyAmountUnsafe( diff --git a/src/main/java/com/dreammaster/main/MainRegistry.java b/src/main/java/com/dreammaster/main/MainRegistry.java index ee91bbe69..d2a85dd65 100644 --- a/src/main/java/com/dreammaster/main/MainRegistry.java +++ b/src/main/java/com/dreammaster/main/MainRegistry.java @@ -75,6 +75,7 @@ import com.dreammaster.recipes.RecipeRemover; import com.dreammaster.scripts.ScriptLoader; import com.dreammaster.thaumcraft.TCLoader; +import com.dreammaster.tinkersConstruct.SmelteryFluidTypes; import com.dreammaster.tinkersConstruct.TiCoLoader; import com.dreammaster.witchery.WitcheryPlugin; @@ -311,6 +312,11 @@ public void PreLoad(FMLPreInitializationEvent PreEvent) { Logger.warn("=================================================="); MinecraftForge.EVENT_BUS.register(new OvenGlove.EventHandler()); + + if (TinkerConstruct.isModLoaded()) { + TiCoLoader.doPreInitialization(); + GregTechAPI.sAfterGTPreload.add(SmelteryFluidTypes::registerGregtechFluidTypes); + } } private static boolean RegisterNonEnumItems() { @@ -366,6 +372,10 @@ public void load(FMLInitializationEvent event) { } VillagerRegistry.instance().registerVillageTradeHandler(2, new NHTradeHandler()); + + if (TinkerConstruct.isModLoaded()) { + TiCoLoader.doInitialization(); + } } public static Block _mBlockBabyChest = new BlockBabyChest(); diff --git a/src/main/java/com/dreammaster/main/NHItems.java b/src/main/java/com/dreammaster/main/NHItems.java index a12f500aa..7c1810458 100644 --- a/src/main/java/com/dreammaster/main/NHItems.java +++ b/src/main/java/com/dreammaster/main/NHItems.java @@ -1,5 +1,7 @@ package com.dreammaster.main; +import net.minecraft.block.Block; + import com.dreammaster.baubles.OvenGlove; import com.dreammaster.baubles.WitherProtectionRing; import com.dreammaster.item.WoodenBrickForm; @@ -11,4 +13,5 @@ public class NHItems { public static final Placeable OVEN_GLOVE = Placeable.make(); public static final Placeable WITHER_PROTECTION_RING = Placeable.make(); public static final Placeable WOODEN_BRICK_FORM = Placeable.make(); + public static Block ZINC_GRAVEL_ORE; } diff --git a/src/main/java/com/dreammaster/scripts/ScriptAvaritia.java b/src/main/java/com/dreammaster/scripts/ScriptAvaritia.java index 7faa7904d..13cd51bec 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAvaritia.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAvaritia.java @@ -366,7 +366,7 @@ public void loadRecipes() { 'e', getModItem(UniversalSingularities.ID, "universal.projectRed.singularity", 1, 0, missing), 'f', - getModItem(UniversalSingularities.ID, "universal.tinkersConstruct.singularity", 1, 0, missing), + getModItem(UniversalSingularities.ID, "universal.general.singularity", 1, 32, missing), 'g', getModItem(UniversalSingularities.ID, "universal.tinkersConstruct.singularity", 1, 1, missing), 'h', diff --git a/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java b/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java index 70cd57107..a77897933 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java +++ b/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java @@ -1,5 +1,6 @@ package com.dreammaster.scripts; +import static com.dreammaster.tinkersConstruct.SmelteryFluidTypes.getMoltenPatternFluidTypeName; import static gregtech.api.enums.Mods.AdvancedSolarPanel; import static gregtech.api.enums.Mods.AppliedEnergistics2; import static gregtech.api.enums.Mods.BartWorks; @@ -51,9 +52,9 @@ import com.dreammaster.item.CustomPatterns; import com.dreammaster.item.NHItemList; import com.dreammaster.main.NHItems; +import com.dreammaster.tinkersConstruct.SmelteryFluidTypes; import com.dreammaster.tinkersConstruct.TConstructHelper; -import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.recipes.RecipeManagers; import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; @@ -65,6 +66,7 @@ import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTUtility; import tconstruct.library.TConstructRegistry; +import tconstruct.library.crafting.FluidType; public class ScriptCoreMod implements IScriptLoader { @@ -450,7 +452,7 @@ public void loadRecipes() { null, getModItem(OpenBlocks.ID, "filledbucket", 1, 0, missing)); addShapedRecipe( - getModItem(TinkerConstruct.ID, "materials", 1, 40, missing), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1L), getModItem(OpenBlocks.ID, "filledbucket", 1, 0, missing), getModItem(OpenBlocks.ID, "filledbucket", 1, 0, missing), getModItem(OpenBlocks.ID, "filledbucket", 1, 0, missing), @@ -585,8 +587,7 @@ public void loadRecipes() { GTModHandler .addSmeltingRecipe(CustomItemList.UnfiredCokeOvenBrick.get(1L), CustomItemList.CokeOvenBrick.get(1L)); - TConstructHelper - .getMeltingAdder(GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, "aluminumbrass.molten", 72) + TConstructHelper.getMeltingAdder(FluidType.getFluidType(getMoltenPatternFluidTypeName()), 150, 72) .add( Stream.of( NHItemList.ShapeBolt, @@ -709,13 +710,13 @@ public void loadRecipes() { 100); TConstructRegistry.getTableCasting().addCastingRecipe( new ItemStack(CustomPatterns.BowFletchingCast, 1), - FluidRegistry.getFluidStack("aluminumbrass.molten", 144), + FluidRegistry.getFluidStack(SmelteryFluidTypes.getMoltenPatternFluidName(), 144), getModItem(TinkerConstruct.ID, "fletching", 1, wildcard, missing), true, 100); TConstructRegistry.getTableCasting().addCastingRecipe( new ItemStack(CustomPatterns.BowStringCast, 1), - FluidRegistry.getFluidStack("aluminumbrass.molten", 144), + FluidRegistry.getFluidStack(SmelteryFluidTypes.getMoltenPatternFluidName(), 144), getModItem(TinkerConstruct.ID, "bowstring", 1, wildcard, missing), true, 100); diff --git a/src/main/java/com/dreammaster/scripts/ScriptMechworks.java b/src/main/java/com/dreammaster/scripts/ScriptMechworks.java index 118a8d952..122491f5d 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptMechworks.java +++ b/src/main/java/com/dreammaster/scripts/ScriptMechworks.java @@ -128,7 +128,7 @@ public void loadRecipes() { .itemOutputs(getModItem(TinkersMechworks.ID, "SignalTerminal", 1, 0, missing)) .fluidInputs(FluidRegistry.getFluidStack("molten.glass", 288)).duration(15 * SECONDS).eut(30) .addTo(assemblerRecipes); - GTValues.RA.stdBuilder().itemInputs(getModItem(TinkerConstruct.ID, "materials", 1, 14, missing)) + GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Brass, 1)) .itemOutputs(getModItem(TinkersMechworks.ID, "LengthWire", 2, 0, missing)) .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(wiremillRecipes); diff --git a/src/main/java/com/dreammaster/scripts/ScriptTinkersConstruct.java b/src/main/java/com/dreammaster/scripts/ScriptTinkersConstruct.java index 9fb1c57ca..6347f5d5d 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptTinkersConstruct.java +++ b/src/main/java/com/dreammaster/scripts/ScriptTinkersConstruct.java @@ -2,6 +2,7 @@ import static com.dreammaster.scripts.GameRegistryProxy.shapedRecipes; import static com.dreammaster.scripts.GameRegistryProxy.shapelessRecipes; +import static com.dreammaster.tinkersConstruct.SmelteryFluidTypes.getMoltenPatternFluidTypeName; import static gregtech.api.enums.Mods.Backpack; import static gregtech.api.enums.Mods.BloodArsenal; import static gregtech.api.enums.Mods.BuildCraftCore; @@ -60,8 +61,10 @@ import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTUtility; import mantle.lib.client.MantleClientRegistry; +import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.DryingRackRecipes; +import tconstruct.library.crafting.FluidType; import tconstruct.library.crafting.Smeltery; public class ScriptTinkersConstruct implements IScriptLoader { @@ -1674,28 +1677,6 @@ public void loadRecipes() { getModItem(Minecraft.ID, "stone", 1, 0, missing), getModItem(Railcraft.ID, "detector", 1, 4, missing), getModItem(Minecraft.ID, "stone", 1, 0, missing)); - addShapedRecipe( - getModItem(TinkerConstruct.ID, "materials", 1, 40, missing), - null, - null, - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1L), - null, - null, - null, - null, - null, - null); - addShapedRecipe( - GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1L), - null, - null, - getModItem(TinkerConstruct.ID, "materials", 1, 40, missing), - null, - null, - null, - null, - null, - null); // Obsidian Stick conversions addShapedRecipe( getModItem(TinkerConstruct.ID, "toolRod", 2, 6, missing), @@ -1949,6 +1930,7 @@ public void loadRecipes() { TConstructHelper.removeBasinRecipe(getModItem(BloodArsenal.ID, "blood_infused_iron_block", 1, 0, missing)); TConstructHelper.removeMeltingRecipe(getModItem(Minecraft.ID, "sand", 1, 0, missing)); TConstructHelper.removeSmelterAlloyMix(FluidRegistry.getFluidStack("alumite.molten", 32)); + TConstructHelper.removeSmelterAlloyMix(FluidRegistry.getFluidStack("aluminumbrass.molten", 32)); TConstructHelper.removeMeltingRecipe(getModItem(TinkerConstruct.ID, "CraftedSoil", 1, 1, missing)); TConstructHelper.removeTableRecipe(getModItem(Minecraft.ID, "golden_apple", 1, 0, missing)); TConstructHelper.removeTableRecipe(getModItem(TinkerConstruct.ID, "gearCast", 1, 0, missing)); @@ -2028,154 +2010,139 @@ public void loadRecipes() { getModItem(TinkerConstruct.ID, "metalPattern", 1, 0, missing), false, 100); - TConstructRegistry.getTableCasting().addCastingRecipe( - getModItem(TinkerConstruct.ID, "materials", 1, 14, missing), - FluidRegistry.getFluidStack("aluminumbrass.molten", 144), + TConstructHelper.getMeltingAdder(FluidType.getFluidType(getMoltenPatternFluidTypeName()), 150, 72).add( getModItem(TinkerConstruct.ID, "metalPattern", 1, 0, missing), - false, - 100); - TConstructHelper - .getMeltingAdder(GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, "aluminumbrass.molten", 72) - .add( - getModItem(TinkerConstruct.ID, "metalPattern", 1, 0, missing), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 1, missing), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 2, missing), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 3, missing), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 4, missing), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 5, missing), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 6, missing), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 7, missing), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 8, missing), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 9, missing), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 10, missing), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 11, missing), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 12, missing), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 13, missing), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 14, missing), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 15, missing), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 16, missing), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 17, missing), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 18, missing), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 19, missing), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 20, missing), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 21, missing), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 22, missing), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 25, missing), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 26, missing), - getModItem(TinkerConstruct.ID, "metalPattern", 1, 27, missing), - getModItem(TinkerConstruct.ID, "Cast", 1, 0, missing), - getModItem(TinkerConstruct.ID, "Cast", 1, 1, missing), - getModItem(TinkerConstruct.ID, "Cast", 1, 2, missing), - getModItem(TinkerConstruct.ID, "Cast", 1, 3, missing)); - TConstructHelper.getMeltingAdder(GameRegistry.findBlock("minecraft", "iron_ore"), 0, 700, "iron.molten", 144) - .add( - new ItemStack(GregTechAPI.sBlockOres1, 1, 32), - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Iron, 1L), - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Iron, 1L), - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Iron, 1L), - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.AnyIron, 1L), - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Iron, 1L), - GTOreDictUnificator.get(OrePrefixes.ore, Materials.BrownLimonite, 1L), - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.BrownLimonite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.BrownLimonite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.BrownLimonite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.BrownLimonite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.BrownLimonite, 1L), - GTOreDictUnificator.get(OrePrefixes.ore, Materials.YellowLimonite, 1L), - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.YellowLimonite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.YellowLimonite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.YellowLimonite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.YellowLimonite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.YellowLimonite, 1L), - GTOreDictUnificator.get(OrePrefixes.ore, Materials.BandedIron, 1L), - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.BandedIron, 1L), - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.BandedIron, 1L), - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.BandedIron, 1L), - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.BandedIron, 1L), - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.BandedIron, 1L), - GTOreDictUnificator.get(OrePrefixes.ore, Materials.GraniticMineralSand, 1L), - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.GraniticMineralSand, 1L), - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.GraniticMineralSand, 1L), - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.GraniticMineralSand, 1L), - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.GraniticMineralSand, 1L), - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.GraniticMineralSand, 1L), - GTOreDictUnificator.get(OrePrefixes.ore, Materials.Magnetite, 1L), - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Magnetite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Magnetite, 1L), - new ItemStack(GregTechAPI.sBlockOres1, 1, 28706), - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Magnetite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Magnetite, 1L), - GTOreDictUnificator.get(OrePrefixes.ore, Materials.Pyrite, 1L), - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Pyrite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Pyrite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Pyrite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Pyrite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Pyrite, 1L)); - TConstructHelper - .getMeltingAdder(GameRegistry.findBlock("TConstruct", "SearedBrick"), 3, 600, "copper.molten", 144).add( - new ItemStack(GregTechAPI.sBlockOres1, 1, 35), - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Copper, 1L), - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Copper, 1L), - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Copper, 1L), - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Copper, 1L), - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Copper, 1L), - new ItemStack(GregTechAPI.sBlockOres1, 1, 871), - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Malachite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Malachite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Malachite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Malachite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Malachite, 1L), - GTOreDictUnificator.get(OrePrefixes.ore, Materials.Tetrahedrite, 1L), - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Tetrahedrite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Tetrahedrite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Tetrahedrite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Tetrahedrite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Tetrahedrite, 1L), - GTOreDictUnificator.get(OrePrefixes.ore, Materials.Chalcopyrite, 1L), - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Chalcopyrite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Chalcopyrite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Chalcopyrite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Chalcopyrite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Chalcopyrite, 1L)); - TConstructHelper.getMeltingAdder(GameRegistry.findBlock("TConstruct", "SearedBrick"), 4, 400, "tin.molten", 144) - .add( - new ItemStack(GregTechAPI.sBlockOres1, 1, 57), - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Tin, 1L), - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Tin, 1L), - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Tin, 1L), - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Tin, 1L), - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Tin, 1L)); - TConstructHelper.getMeltingAdder(GameRegistry.findBlock("TConstruct", "SearedBrick"), 4, 600, "tin.molten", 288) - .add( - GTOreDictUnificator.get(OrePrefixes.ore, Materials.Cassiterite, 1L), - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Cassiterite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Cassiterite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Cassiterite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Cassiterite, 1L), - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Cassiterite, 1L), - GTOreDictUnificator.get(OrePrefixes.ore, Materials.CassiteriteSand, 1L), - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.CassiteriteSand, 1L), - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.CassiteriteSand, 1L), - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.CassiteriteSand, 1L), - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.CassiteriteSand, 1L), - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.CassiteriteSand, 1L)); - TConstructHelper.getMeltingAdder(GameRegistry.findBlock("minecraft", "gold_ore"), 0, 600, "gold.molten", 144) - .add( - new ItemStack(GregTechAPI.sBlockOres1, 1, 86), - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Gold, 1L), - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Gold, 1L), - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Gold, 1L), - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Gold, 1L), - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Gold, 1L)); - TConstructHelper - .getMeltingAdder(GameRegistry.findBlock("TConstruct", "SearedBrick"), 5, 400, "aluminum.molten", 144) - .add( - new ItemStack(GregTechAPI.sBlockOres1, 1, 19), - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Aluminium, 1L), - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Aluminium, 1L), - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Aluminium, 1L), - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Aluminium, 1L), - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Aluminium, 1L)); + getModItem(TinkerConstruct.ID, "metalPattern", 1, 1, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 2, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 3, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 4, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 5, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 6, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 7, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 8, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 9, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 10, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 11, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 12, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 13, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 14, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 15, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 16, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 17, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 18, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 19, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 20, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 21, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 22, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 25, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 26, missing), + getModItem(TinkerConstruct.ID, "metalPattern", 1, 27, missing), + getModItem(TinkerConstruct.ID, "Cast", 1, 0, missing), + getModItem(TinkerConstruct.ID, "Cast", 1, 1, missing), + getModItem(TinkerConstruct.ID, "Cast", 1, 2, missing), + getModItem(TinkerConstruct.ID, "Cast", 1, 3, missing)); + TConstructHelper.getMeltingAdder(FluidType.getFluidType("Iron"), 100, 144).add( + new ItemStack(GregTechAPI.sBlockOres1, 1, 32), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Iron, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Iron, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Iron, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.AnyIron, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Iron, 1L), + GTOreDictUnificator.get(OrePrefixes.ore, Materials.BrownLimonite, 1L), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.BrownLimonite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.BrownLimonite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.BrownLimonite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.BrownLimonite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.BrownLimonite, 1L), + GTOreDictUnificator.get(OrePrefixes.ore, Materials.YellowLimonite, 1L), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.YellowLimonite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.YellowLimonite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.YellowLimonite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.YellowLimonite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.YellowLimonite, 1L), + GTOreDictUnificator.get(OrePrefixes.ore, Materials.BandedIron, 1L), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.BandedIron, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.BandedIron, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.BandedIron, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.BandedIron, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.BandedIron, 1L), + GTOreDictUnificator.get(OrePrefixes.ore, Materials.GraniticMineralSand, 1L), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.GraniticMineralSand, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.GraniticMineralSand, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.GraniticMineralSand, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.GraniticMineralSand, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.GraniticMineralSand, 1L), + GTOreDictUnificator.get(OrePrefixes.ore, Materials.Magnetite, 1L), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Magnetite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Magnetite, 1L), + new ItemStack(GregTechAPI.sBlockOres1, 1, 28706), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Magnetite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Magnetite, 1L), + GTOreDictUnificator.get(OrePrefixes.ore, Materials.Pyrite, 1L), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Pyrite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Pyrite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Pyrite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Pyrite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Pyrite, 1L)); + TConstructHelper.getMeltingAdder(FluidType.getFluidType("Copper"), 50, 144).add( + new ItemStack(GregTechAPI.sBlockOres1, 1, 35), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Copper, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Copper, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Copper, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Copper, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Copper, 1L), + new ItemStack(GregTechAPI.sBlockOres1, 1, 871), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Malachite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Malachite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Malachite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Malachite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Malachite, 1L), + GTOreDictUnificator.get(OrePrefixes.ore, Materials.Tetrahedrite, 1L), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Tetrahedrite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Tetrahedrite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Tetrahedrite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Tetrahedrite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Tetrahedrite, 1L), + GTOreDictUnificator.get(OrePrefixes.ore, Materials.Chalcopyrite, 1L), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Chalcopyrite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Chalcopyrite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Chalcopyrite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Chalcopyrite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Chalcopyrite, 1L)); + TConstructHelper.getMeltingAdder(FluidType.getFluidType("Tin"), 0, 144).add( + new ItemStack(GregTechAPI.sBlockOres1, 1, 57), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Tin, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Tin, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Tin, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Tin, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Tin, 1L)); + TConstructHelper.getMeltingAdder(FluidType.getFluidType("Tin"), 200, 288).add( + GTOreDictUnificator.get(OrePrefixes.ore, Materials.Cassiterite, 1L), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Cassiterite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Cassiterite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Cassiterite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Cassiterite, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Cassiterite, 1L), + GTOreDictUnificator.get(OrePrefixes.ore, Materials.CassiteriteSand, 1L), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.CassiteriteSand, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.CassiteriteSand, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.CassiteriteSand, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.CassiteriteSand, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.CassiteriteSand, 1L)); + TConstructHelper.getMeltingAdder(FluidType.getFluidType("Gold"), 200, 144).add( + new ItemStack(GregTechAPI.sBlockOres1, 1, 86), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Gold, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Gold, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Gold, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Gold, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Gold, 1L)); + TConstructHelper.getMeltingAdder(FluidType.getFluidType("Aluminum"), 50, 144).add( + new ItemStack(GregTechAPI.sBlockOres1, 1, 19), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Aluminium, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Aluminium, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Aluminium, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Aluminium, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Aluminium, 1L)); TConstructHelper .getMeltingAdder(GameRegistry.findBlock("gregtech", "gt.blockores"), 34, 400, "nickel.molten", 144).add( GTOreDictUnificator.get(OrePrefixes.ore, Materials.Nickel, 1L), @@ -2201,15 +2168,14 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Platinum, 1L), GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Platinum, 1L), GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Platinum, 1L)); - TConstructHelper - .getMeltingAdder(GameRegistry.findBlock("minecraft", "emerald_ore"), 0, 800, "emerald.liquid", 640).add( - new ItemStack(GregTechAPI.sBlockOres1, 1, 501), - GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Emerald, 1L), - GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Emerald, 1L), - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Emerald, 1L), - GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Emerald, 1L), - GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Emerald, 1L)); - TConstructHelper.getMeltingAdder(GameRegistry.findBlock("IC2", "blockMetal"), 5, 800, "steel.molten", 576).add( + TConstructHelper.getMeltingAdder(FluidType.getFluidType("Emerald"), 225, 640).add( + new ItemStack(GregTechAPI.sBlockOres1, 1, 501), + GTOreDictUnificator.get(OrePrefixes.rawOre, Materials.Emerald, 1L), + GTOreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Emerald, 1L), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Emerald, 1L), + GTOreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Emerald, 1L), + GTOreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Emerald, 1L)); + TConstructHelper.getMeltingAdder(FluidType.getFluidType("Steel"), 100, 576).add( ItemList.Shape_Empty.get(1L), ItemList.Shape_Mold_Plate.get(1L), ItemList.Shape_Mold_Casing.get(1L), @@ -2274,7 +2240,7 @@ public void loadRecipes() { CustomItemList.MoldHelmet.get(1L), CustomItemList.MoldLeggings.get(1L), CustomItemList.MoldBoots.get(1L)); - TConstructHelper.getMeltingAdder(GameRegistry.findBlock("TConstruct", "GlueBlock"), 0, 250, "glue", 144) + TConstructHelper.getMeltingAdder(FluidType.getFluidType("Glue"), 125, 144) .add( GTOreDictUnificator.get(OrePrefixes.dust, Materials.Rubber, 1L), GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1L), @@ -2317,10 +2283,9 @@ public void loadRecipes() { getModItem(Minecraft.ID, "cobblestone", 1, 0, missing), false, 245); - TConstructHelper - .getMeltingAdder(GameRegistry.findBlock("minecraft", "obsidian"), 0, 850, "obsidian.molten", 288).add( - getModItem(Thaumcraft.ID, "blockCosmeticSolid", 1, 0, missing), - getModItem(Thaumcraft.ID, "blockCosmeticSolid", 1, 1, missing)); + TConstructHelper.getMeltingAdder(FluidType.getFluidType("Obsidian"), 100, 288).add( + getModItem(Thaumcraft.ID, "blockCosmeticSolid", 1, 0, missing), + getModItem(Thaumcraft.ID, "blockCosmeticSolid", 1, 1, missing)); TConstructRegistry.getBasinCasting().addCastingRecipe( getModItem(TinkerConstruct.ID, "MetalBlock", 1, 10, missing), FluidRegistry.getFluidStack("ender", 2250), @@ -2436,10 +2401,10 @@ public void loadRecipes() { false, 400); Smeltery.addAlloyMixing( - FluidRegistry.getFluidStack("alumite.molten", 32), - FluidRegistry.getFluidStack("aluminum.molten", 80), - FluidRegistry.getFluidStack("steel.molten", 32), - FluidRegistry.getFluidStack("obsidian.molten", 32)); + FluidRegistry.getFluidStack("alumite.molten", TConstruct.nuggetLiquidValue * 2), + FluidRegistry.getFluidStack("molten.zinc", TConstruct.nuggetLiquidValue * 5), + FluidRegistry.getFluidStack("steel.molten", TConstruct.nuggetLiquidValue * 2), + FluidRegistry.getFluidStack("obsidian.molten", TConstruct.nuggetLiquidValue * 2)); Smeltery.addSmelteryFuel(FluidRegistry.getFluid("ic2hotcoolant"), 900, 55); Smeltery.addSmelteryFuel(FluidRegistry.getFluid("ic2pahoehoelava"), 3000, 90); DryingRackRecipes.addDryingRecipe( diff --git a/src/main/java/com/dreammaster/tinkersConstruct/SmelteryFluidTypes.java b/src/main/java/com/dreammaster/tinkersConstruct/SmelteryFluidTypes.java new file mode 100644 index 000000000..a754108ea --- /dev/null +++ b/src/main/java/com/dreammaster/tinkersConstruct/SmelteryFluidTypes.java @@ -0,0 +1,40 @@ +package com.dreammaster.tinkersConstruct; + +import javax.annotation.Nonnull; + +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +import tconstruct.TConstruct; +import tconstruct.library.crafting.FluidType; +import tconstruct.library.crafting.Smeltery; +import tconstruct.smeltery.TinkerSmeltery; +import tconstruct.world.TinkerWorld; + +public class SmelteryFluidTypes { + + public static void registerGregtechFluidTypes() { + // Zinc looks the same as TiCo Aluminium when melting but results in GT Zinc instead of TiCo Aluminium + Fluid moltenZinc = FluidRegistry.getFluid("molten.zinc"); + Fluid moltenBrass = FluidRegistry.getFluid(getMoltenPatternFluidName()); + FluidType.registerFluidType("Zinc", TinkerWorld.metalBlock, 6, 350, moltenZinc, false); + FluidType + .registerFluidType(getMoltenPatternFluidTypeName(), TinkerWorld.metalBlock, 7, 350, moltenBrass, false); + Smeltery.addAlloyMixing( + new FluidStack(moltenBrass, TConstruct.nuggetLiquidValue * 3), + new FluidStack(TinkerSmeltery.moltenCopperFluid, TConstruct.nuggetLiquidValue * 3), + new FluidStack(moltenZinc, TConstruct.nuggetLiquidValue * 1)); // Brass + } + + @Nonnull + public static String getMoltenPatternFluidTypeName() { + return "Brass"; + } + + @Nonnull + public static String getMoltenPatternFluidName() { + return "molten.brass"; + } + +} diff --git a/src/main/java/com/dreammaster/tinkersConstruct/TConstructHelper.java b/src/main/java/com/dreammaster/tinkersConstruct/TConstructHelper.java index e7b5471c1..922852615 100644 --- a/src/main/java/com/dreammaster/tinkersConstruct/TConstructHelper.java +++ b/src/main/java/com/dreammaster/tinkersConstruct/TConstructHelper.java @@ -11,6 +11,7 @@ import gregtech.api.util.GTUtility; import mantle.utils.ItemMetaWrapper; import tconstruct.library.TConstructRegistry; +import tconstruct.library.crafting.FluidType; import tconstruct.library.crafting.Smeltery; public class TConstructHelper { @@ -41,6 +42,15 @@ public static MeltingRecipeAdder getMeltingAdder(Block renderBlock, int renderBl return new MeltingRecipeAdder(renderBlock, renderBlockMeta, meltingTemperature, fluidName, amount); } + public static MeltingRecipeAdder getMeltingAdder(FluidType fluidType, int temperatureDifference, int amount) { + return new MeltingRecipeAdder( + fluidType.renderBlock, + fluidType.renderMeta, + fluidType.baseTemperature + temperatureDifference, + fluidType.fluid.getName(), + amount); + } + private static Map smelteryFuelList = null; @SuppressWarnings("unchecked") diff --git a/src/main/java/com/dreammaster/tinkersConstruct/TiCoLoader.java b/src/main/java/com/dreammaster/tinkersConstruct/TiCoLoader.java index 3f6b662ec..dcfe26b2e 100644 --- a/src/main/java/com/dreammaster/tinkersConstruct/TiCoLoader.java +++ b/src/main/java/com/dreammaster/tinkersConstruct/TiCoLoader.java @@ -1,13 +1,59 @@ package com.dreammaster.tinkersConstruct; +import static com.dreammaster.scripts.IScriptLoader.missing; import static gregtech.api.enums.Mods.TinkerConstruct; +import static gregtech.api.enums.Mods.UniversalSingularities; +import static gregtech.api.util.GTModHandler.getModItem; +import net.minecraft.block.Block; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.oredict.OreDictionary; + +import com.dreammaster.main.NHItems; import com.dreammaster.mantle.BookLoader; +import com.dreammaster.tinkersConstruct.worldgen.ZincGravelOre; +import com.dreammaster.tinkersConstruct.worldgen.ZincGravelOreItem; +import com.dreammaster.tinkersConstruct.worldgen.ZincGravelWorldgen; +import com.gtnewhorizons.postea.api.BlockReplacementManager; +import com.gtnewhorizons.postea.api.ItemStackReplacementManager; +import com.gtnewhorizons.postea.api.TileEntityReplacementManager; +import com.gtnewhorizons.postea.utility.BlockConversionInfo; + +import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GTOreDictUnificator; public class TiCoLoader { + public static void doPreInitialization() { + registerZincGravelOre(); + } + + private static void registerZincGravelOre() { + NHItems.ZINC_GRAVEL_ORE = new ZincGravelOre().setBlockName("block.ore.gravel.zinc"); + NHItems.ZINC_GRAVEL_ORE.setHarvestLevel("shovel", 1, 0); + GameRegistry.registerBlock(NHItems.ZINC_GRAVEL_ORE, ZincGravelOreItem.class, "ZincGravelOre"); + OreDictionary.registerOre("oreZinc", new ItemStack(NHItems.ZINC_GRAVEL_ORE, 1, 0)); + } + + public static void doInitialization() { + registerZincGravelOreWorldGen(); + } + + private static void registerZincGravelOreWorldGen() { + MinecraftForge.TERRAIN_GEN_BUS.register(new ZincGravelWorldgen()); + } + public static void doPostInitialization() { addTiCoManuals(); + registerAluminumBrassPosteaTransformers(); + registerGravelOrePosteaTransformers(); } private static void addTiCoManuals() { @@ -22,4 +68,106 @@ private static void addTiCoManual(String bookName, String unlocalizedName, Strin BookLoader.of(unlocalizedName, TinkerConstruct.ID, "/assets/dreamcraft/tinker/manuals/" + bookName + ".xml") .setTooltip(tooltip).setItemImage(itemImage).makeTranslatable().addToBookDataStore(); } + + private static void registerAluminumBrassPosteaTransformers() { + convertAluminumBrassBlock(); + convertAluminumBrassItems(); + convertMoltenAluminumBrassInSmeltery(); + convertAluminumBrassSingularity(); + } + + private static void convertAluminumBrassBlock() { + String targetBlock = "TConstruct:MetalBlock"; + ItemStack brassBlock = GTOreDictUnificator.get(OrePrefixes.block, Materials.Brass, 1L); + int brassBlockId = Item.getIdFromItem(brassBlock.getItem()); + int brassBlockMeta = Items.feather.getDamage(brassBlock); + BlockReplacementManager.addBlockReplacement(targetBlock, (blockConversionInfoOld, world) -> { + if (blockConversionInfoOld.metadata == 7) { + BlockConversionInfo blockConversionInfoNew = new BlockConversionInfo(); + blockConversionInfoNew.blockID = brassBlockId; + blockConversionInfoNew.metadata = brassBlockMeta; + return blockConversionInfoNew; + } + return null; + }); + ItemStackReplacementManager.addItemReplacement(targetBlock, tag -> { + if (tag.getShort("Damage") == 7) { + tag.setShort("id", (short) brassBlockId); + tag.setShort("Damage", (short) brassBlockMeta); + return tag; + } + return tag; + }); + } + + private static void convertAluminumBrassItems() { + ItemStack brassIngot = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Brass, 1L); + ItemStack brassNugget = GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Brass, 1L); + ItemStack brassDust = GTOreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 1L); + ItemStackReplacementManager.addItemReplacement("TConstruct:materials", tag -> { + switch (tag.getShort("Damage")) { + case 14: + tag.setShort("id", (short) Item.getIdFromItem(brassIngot.getItem())); + tag.setShort("Damage", (short) Items.feather.getDamage(brassIngot)); + break; + case 24: + tag.setShort("id", (short) Item.getIdFromItem(brassNugget.getItem())); + tag.setShort("Damage", (short) Items.feather.getDamage(brassNugget)); + break; + case 42: + tag.setShort("id", (short) Item.getIdFromItem(brassDust.getItem())); + tag.setShort("Damage", (short) Items.feather.getDamage(brassDust)); + break; + } + return tag; + }); + } + + private static void convertMoltenAluminumBrassInSmeltery() { + TileEntityReplacementManager.tileEntityTransformer("TConstruct.Smeltery", (tags, world) -> { + NBTTagList liquidTag = tags.getTagList("Liquids", 10); + for (int i = 0; i < liquidTag.tagCount(); i++) { + NBTTagCompound nbt = liquidTag.getCompoundTagAt(i); + if ("aluminumbrass.molten".equals(nbt.getString("FluidName"))) { + nbt.setString("FluidName", SmelteryFluidTypes.getMoltenPatternFluidName()); + } + } + return null; + }); + } + + private static void convertAluminumBrassSingularity() { + ItemStack roseGoldSingularity = getModItem( + UniversalSingularities.ID, + "universal.general.singularity", + 1, + 32, + missing); + ItemStackReplacementManager + .addItemReplacement("universalsingularities:universal.tinkersConstruct.singularity", tag -> { + if (tag.getShort("Damage") == 0) { + tag.setShort("id", (short) Item.getIdFromItem(roseGoldSingularity.getItem())); + tag.setShort("Damage", (short) roseGoldSingularity.getItemDamage()); + return tag; + } + return tag; + }); + } + + private static void registerGravelOrePosteaTransformers() { + String targetBlock = "TConstruct:GravelOre"; + int zincGravelOreId = Block.getIdFromBlock(NHItems.ZINC_GRAVEL_ORE); + BlockReplacementManager.addBlockReplacement(targetBlock, (blockConversionInfoOld, world) -> { + BlockConversionInfo blockConversionInfoNew = new BlockConversionInfo(); + blockConversionInfoNew.blockID = zincGravelOreId; + blockConversionInfoNew.metadata = 0; + return blockConversionInfoNew; + }); + ItemStackReplacementManager.addItemReplacement(targetBlock, tag -> { + tag.setShort("id", (short) zincGravelOreId); + tag.setShort("Damage", (short) 0); + return tag; + }); + } + } diff --git a/src/main/java/com/dreammaster/tinkersConstruct/worldgen/ZincGravelOre.java b/src/main/java/com/dreammaster/tinkersConstruct/worldgen/ZincGravelOre.java new file mode 100644 index 000000000..351b700f1 --- /dev/null +++ b/src/main/java/com/dreammaster/tinkersConstruct/worldgen/ZincGravelOre.java @@ -0,0 +1,46 @@ +package com.dreammaster.tinkersConstruct.worldgen; + +import java.util.List; + +import net.minecraft.block.BlockSand; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class ZincGravelOre extends BlockSand { + + public IIcon icon; + + public ZincGravelOre() { + this.blockMaterial = Material.craftedSnow; + this.setCreativeTab(CreativeTabs.tabBlock); + this.setStepSound(soundTypeGravel); + } + + @Override + public void registerBlockIcons(IIconRegister iconRegister) { + this.icon = iconRegister.registerIcon("dreamcraft:ore_zinc_gravel"); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) { + return this.icon; + } + + public float getBlockHardness(World world, int x, int y, int z) { + return 3f; + } + + @Override + public void getSubBlocks(Item id, CreativeTabs tab, List list) { + list.add(new ItemStack(this, 1, 0)); + } +} diff --git a/src/main/java/com/dreammaster/tinkersConstruct/worldgen/ZincGravelOreItem.java b/src/main/java/com/dreammaster/tinkersConstruct/worldgen/ZincGravelOreItem.java new file mode 100644 index 000000000..6ce1ccb0d --- /dev/null +++ b/src/main/java/com/dreammaster/tinkersConstruct/worldgen/ZincGravelOreItem.java @@ -0,0 +1,16 @@ +package com.dreammaster.tinkersConstruct.worldgen; + +import net.minecraft.block.Block; + +import mantle.blocks.abstracts.MultiItemBlock; + +public class ZincGravelOreItem extends MultiItemBlock { + + public static final String[] blockTypes = { "zinc" }; + + public ZincGravelOreItem(Block b) { + super(b, "block.ore.gravel", blockTypes); + setMaxDamage(0); + setHasSubtypes(false); + } +} diff --git a/src/main/java/com/dreammaster/tinkersConstruct/worldgen/ZincGravelWorldgen.java b/src/main/java/com/dreammaster/tinkersConstruct/worldgen/ZincGravelWorldgen.java new file mode 100644 index 000000000..77e12c3c3 --- /dev/null +++ b/src/main/java/com/dreammaster/tinkersConstruct/worldgen/ZincGravelWorldgen.java @@ -0,0 +1,53 @@ +package com.dreammaster.tinkersConstruct.worldgen; + +import static net.minecraft.world.biome.BiomeGenBase.extremeHills; +import static net.minecraft.world.biome.BiomeGenBase.extremeHillsEdge; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.SAND; + +import java.util.Random; + +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate; + +import com.dreammaster.main.NHItems; +import com.google.common.collect.ImmutableCollection; +import com.google.common.collect.ImmutableList; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import tconstruct.util.config.PHConstruct; +import tconstruct.world.gen.SurfaceOreGen; + +public class ZincGravelWorldgen { + + private final SurfaceOreGen zincSurface = new SurfaceOreGen(NHItems.ZINC_GRAVEL_ORE, 0, 12, true); + + private static final ImmutableCollection EXTRA_ORE_BIOMES = ImmutableList + .of(extremeHills, extremeHillsEdge); + private static final int ZINC_ORE_GRAVEL_RARITY = 150; + + @SubscribeEvent + public void onDecorateEvent(Decorate e) { + // Trigger just before sand pass one--which comes just after vanilla ore + // generation. + if (e.type != SAND) return; + + BiomeGenBase biome = e.world.getWorldChunkManager().getBiomeGenAt(e.chunkX, e.chunkZ); + int iterations = EXTRA_ORE_BIOMES.contains(biome) ? 2 : 1; + for (int i = 0; i < iterations; i++) { + generateSurfaceOres(e.rand, e.chunkX, e.chunkZ, e.world); + } + } + + private void generateSurfaceOres(Random random, int xChunk, int zChunk, World world) { + if (random == null) return; + + int xPos, yPos, zPos; + if (random.nextInt(ZINC_ORE_GRAVEL_RARITY) == 0) { + xPos = xChunk + random.nextInt(16); + yPos = 64 + PHConstruct.seaLevel; + zPos = zChunk + random.nextInt(16); + zincSurface.generate(world, random, xPos, yPos, zPos); + } + } +} diff --git a/src/main/resources/META-INF/dreamcraft_at.cfg b/src/main/resources/META-INF/dreamcraft_at.cfg new file mode 100644 index 000000000..ec33472d3 --- /dev/null +++ b/src/main/resources/META-INF/dreamcraft_at.cfg @@ -0,0 +1,2 @@ +# Blocks +public-f net.minecraft.block.Block field_149764_J diff --git a/src/main/resources/assets/dreamcraft/lang/en_US.lang b/src/main/resources/assets/dreamcraft/lang/en_US.lang index 9edcc9452..f8dd75b36 100644 --- a/src/main/resources/assets/dreamcraft/lang/en_US.lang +++ b/src/main/resources/assets/dreamcraft/lang/en_US.lang @@ -1717,9 +1717,9 @@ item.tconstruct.manual.smeltery.construction2=Larger Smelteries will hold more m item.tconstruct.manual.smeltery.figure1a=Figure 1a item.tconstruct.manual.smeltery.alloys=Alloys are made when two or more metals are mixed in precise proportions. Currently known alloys are: item.tconstruct.manual.smeltery.bronze=Bronze, made from Copper(3) and Tin(1) -item.tconstruct.manual.smeltery.aluminium=Aluminum Brass, made from Aluminum(3) and Copper(1) +item.tconstruct.manual.smeltery.brass=Brass, made from Copper(3) and Zinc(1) item.tconstruct.manual.smeltery.manyullyn=Manyullyn, made from Cobalt(2) and Ardite(2) -item.tconstruct.manual.smeltery.alumite=Alumite, made from Aluminum(5), Iron(2), and Obsidian(2) +item.tconstruct.manual.smeltery.alumite=Obzinite, made from Zinc(5), Steel(2), and Obsidian(2) item.tconstruct.manual.smeltery.pigiron=Pig Iron, made from Iron(1), Blood(1), and Emeralds(1) item.tconstruct.manual.smeltery.liquids=There exist a few liquids that are gained through strange means. Currently known liquids are: item.tconstruct.manual.smeltery.blood=Blood, damaging entities in the Smeltery @@ -1744,6 +1744,8 @@ item.tconstruct.manual.weaponry.projectiles=Projectiles\nFor these projectiles g item.tconstruct.manual.weaponry.part_materials=\n\nValid Shaft Materials:\n* Stick\n* Sugarcane\n* Bone\n* Blaze Rod\n\nValid Fletching Materials:\n* Leaves\n* Slimeleaves\n* Feathers\n* Slime item.tconstruct.manual.weaponry.bolts=\n\nBolts:\nCrafting bolts is a delicate process. First you need a core in the form of a tool rod.\nTake this tool rod to a smeltery and put it into a Casting Table. Pour some metal onto it to coat the tip with a more damaging material.\nAfter this process, add a fletching and your bolts are ready to be used.\n\nSince the bolts consist of a harder core and tip they carry more weight than regular arrows, making them perfect to fight armored targets. +block.ore.gravel.zinc.name=Zinc Gravel Ore + dreamcraft.mobsinfocompat.limitedropcount=Drops only %s times per person dreamcraft.gui.quitmessage=Are you sure you want to exit the game? diff --git a/src/main/resources/assets/dreamcraft/textures/blocks/ore_zinc_gravel.png b/src/main/resources/assets/dreamcraft/textures/blocks/ore_zinc_gravel.png new file mode 100644 index 0000000000000000000000000000000000000000..1595d67f0d7f184674a119b52bd8ca5bd03a21fc GIT binary patch literal 552 zcmV+@0@wYCP)OvDxe{?zVYF<_>u zTrNvKpVzeP9zXxO6#BZ_kMEM&jLF$aRxeP*f|)a5tle(Qd_E8TFvwluG^+uu4%6vW zY*7nyCP1UnSfpF}tozE_C2@cUgMmyYlTdPEVbronzeingot - item.tconstruct.manual.smeltery.aluminium + item.tconstruct.manual.smeltery.brass alubrassingot From 9231f8880d3f873c1bc8f186019cf01d82ef3d09 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sun, 26 Jan 2025 09:27:45 +0100 Subject: [PATCH 34/34] update --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 3411aab4d..e095fde0c 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.97:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.99:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev")