From cdc17fdfe8cb1b10cc48faa20f1c1c31214cc326 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Sun, 26 Jun 2022 07:27:58 +0100 Subject: Stargate tweaks --- .../dreamcraft/DreamCraftRecipeLoader.java | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java index 8246a44a1e..926699b700 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java @@ -1294,35 +1294,35 @@ public class DreamCraftRecipeLoader { //Stargate Recipes if (Loader.isModLoaded("eternalsingularity") && Loader.isModLoaded("SGCraft")) { - TT_recipeAdder.addResearchableAssemblylineRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Infinity, 1L), - 32000000*12, 8192, 32000000, 64, new ItemStack[]{ - GT_ModHandler.getModItem("eternalsingularity", "eternal_singularity", 1L), + TT_recipeAdder.addResearchableAssemblylineRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 1L), + 32000000*12, 32768, 32000000, 64, new ItemStack[]{ + GT_ModHandler.getModItem("eternalsingularity", "eternal_singularity", 16L), ItemList.Sensor_UEV.get(16L), - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 16L), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 16L), GT_OreDictUnificator.get(OrePrefixes.block, Materials.CosmicNeutronium, 16L), - GT_OreDictUnificator.get(OrePrefixes.block, Materials.NaquadahAlloy, 64L), - GT_OreDictUnificator.get(OrePrefixes.block, Materials.NaquadahAlloy, 64L), - GT_OreDictUnificator.get(OrePrefixes.block, Materials.NaquadahAlloy, 64L), + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Quantum, 16L) }, new FluidStack[]{ Materials.Neutronium.getMolten(36864L), Materials.Tritanium.getMolten(36864L), - Materials.Longasssuperconductornameforuhvwire.getMolten(36864L), - Materials.Silver.getPlasma(36864L) + Materials.SuperconductorUEVBase.getMolten(36864L), + Materials.DimensionallyTranscendentExoticCatalyst.getFluid(36864L) }, getItemContainer("StargateShieldingFoil").get(1L), 72000, 500000000); TT_recipeAdder.addResearchableAssemblylineRecipe(getItemContainer("StargateShieldingFoil").get(1L), - 32000000*12, 8192, 32000000, 64, new ItemStack[]{ + 32000000*12, 32768, 32000000, 64, new ItemStack[]{ ItemList.Electric_Piston_UEV.get(16L), ItemList.Electric_Motor_UEV.get(64L), - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 16L), + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), GT_OreDictUnificator.get(OrePrefixes.block, Materials.NaquadahAlloy, 64L), GT_OreDictUnificator.get(OrePrefixes.block, Materials.NetherStar, 64L), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Ardite, 8L), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Ardite, 8L), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Ardite, 8L), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 8L), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 8L), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 8L), GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Ruby, 16L), GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Jasper, 16L), getItemContainer("QuantumCircuit").get(1L).splitStack(32) @@ -1330,13 +1330,13 @@ public class DreamCraftRecipeLoader { new FluidStack[]{ Materials.Neutronium.getMolten(9216L), Materials.Tritanium.getMolten(9216L), - Materials.Longasssuperconductornameforuhvwire.getMolten(9216L), - Materials.Silver.getPlasma(9216L) + Materials.SuperconductorUEVBase.getMolten(9216L), + Materials.DimensionallyTranscendentExoticCatalyst.getFluid(9216L) }, getItemContainer("StargateChevron").get(1L), 72000, 500000000); - TT_recipeAdder.addResearchableAssemblylineRecipe(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1L), - 32000000*12, 8192, 32000000, 64, new ItemStack[]{ + TT_recipeAdder.addResearchableAssemblylineRecipe(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 1L), + 32000000*12, 32768, 32000000, 64, new ItemStack[]{ GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 64L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 64L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.CosmicNeutronium, 64L), -- cgit From a2ca7e7717dcea274fbef6836ea9741c98c3fb21 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Sun, 26 Jun 2022 09:57:25 +0100 Subject: DTPF Recipe. --- .../dreamcraft/DreamCraftRecipeLoader.java | 93 +++++++++++++++++++++- 1 file changed, 91 insertions(+), 2 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java index 926699b700..26ca37c653 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java @@ -9,6 +9,7 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.Behaviou import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.Behaviour_Recycler; import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.GT_MetaTileEntity_EM_machine; import cpw.mods.fml.common.Loader; +import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -30,6 +31,7 @@ import gtPlusPlus.core.material.ALLOY; import java.lang.reflect.Method; import static com.github.technus.tectech.loader.recipe.BaseRecipeLoader.getOrDefault; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; /** * Created by Tec on 06.08.2017. @@ -1350,9 +1352,96 @@ public class DreamCraftRecipeLoader { }, getItemContainer("StargateFramePart").get(1L), 72000, 500000000); } - //endregion - Fluid oganesson = FluidRegistry.getFluid("oganesson"); + // Dimensionally Transcendent Plasma Forge (DTPF) + + if (Loader.isModLoaded("eternalsingularity")) { + + // DTPF Controller. + TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Casing_Dim_Bridge.get(1), + 32_000_000, 4096, 32_000_000, 1, new ItemStack[]{ + ItemList.Casing_Dim_Bridge.get(4), + GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 16L, 12730), + getItemContainer("Hatch_Energy_UIV").get(4L), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUEV, 6), + ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Reactor_Coolant_Sp_6.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Nano, 20), + ItemList.Field_Generator_UEV.get(4), + GT_ModHandler.getModItem("eternalsingularity", "eternal_singularity", 4L), + GT_ModHandler.getModItem("miscutils", "MU-metaitem.01", 1L, 32105), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 64L), + ItemList.Electric_Pump_UEV.get(4), + ItemList.ZPM3.get(1), + GT_ModHandler.getModItem("IC2", "blockMachine2", 1, 0) + }, + new FluidStack[]{ + new FluidStack(FluidRegistry.getFluid("oganesson"), 128000), + new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 36864*2), + new FluidStack(FluidRegistry.getFluid("molten.californium"), 36864), + }, + ItemList.Machine_Multi_PlasmaForge.get(1), 72000, 32_000_000); + + // Dimensional bridge. + TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Casing_Dim_Injector.get(1), + 8_000_000, 4096, 32_000_000, 1, new ItemStack[]{ + ItemList.Casing_Dim_Trans.get(1), + ItemList.MicroTransmitter_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 2), + GT_ModHandler.getModItem("Avaritia", "Singularity", 2L, 0), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 6), + GT_ModHandler.getModItem("dreamcraft", "item.PicoWafer", 2, 0), + ItemList.Field_Generator_UHV.get(1L) + }, + new FluidStack[]{ + new FluidStack(FluidRegistry.getFluid("oganesson"), 8000), + new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 1152*8), + Materials.EnrichedNaquadria.getFluid(1152L) + }, + ItemList.Casing_Dim_Bridge.get(1), 240*20, 32_000_000); + + // Dimensional injection casing. + TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Casing_Dim_Trans.get(1), + 2_000_000, 2048, 32_000_000, 1, new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 4), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Ledox, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.CallistoIce, 1), + ItemList.Reactor_Coolant_Sp_6.get(1L), + GT_ModHandler.getModItem("miscutils", "itemScrewLaurenium", 12, 0), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 2), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 2), + ItemList.Super_Chest_IV.get(1), + ItemList.Super_Tank_IV.get(1), + GT_ModHandler.getModItem("dreamcraft", "item.PicoWafer", 1, 0), + }, + new FluidStack[]{ + new FluidStack(FluidRegistry.getFluid("oganesson"), 1000), + new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 288), + Materials.EnrichedNaquadria.getFluid(288L) + }, + ItemList.Casing_Dim_Injector.get(1), 20*20, 32_000_000); + + // Dimensionally Transcendent Casing. + TT_recipeAdder.addResearchableAssemblylineRecipe(GT_ModHandler.getModItem("Avaritia", "Singularity", 1L, 0), + 2_000_000, 2048, 32_000_000, 1, new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 6), + GT_ModHandler.getModItem("miscutils", "itemScrewLaurenium", 12, 0), + ItemList.Reactor_Coolant_Sp_6.get(1L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 1), + }, + new FluidStack[]{ + new FluidStack(FluidRegistry.getFluid("oganesson"), 500), + new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 288), + Materials.EnrichedNaquadria.getFluid(288L) + }, + ItemList.Casing_Dim_Trans.get(1), 20*20, 32_000_000); + + + } + + Fluid oganesson = FluidRegistry.getFluid("oganesson"); //Deep Dark Portal TT_recipeAdder.addResearchableAssemblylineRecipe(GT_ModHandler.getModItem("dreamcraft", "item.HeavyDutyPlateTier8", 1, 0), 16777216, 2048, 2000000, 64, new Object[]{ -- cgit From 16b884d3f75ab84b271a2d7a3200d205ba4c1bd0 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Sat, 2 Jul 2022 14:14:11 +0100 Subject: Update recipes. --- .../compatibility/dreamcraft/DreamCraftRecipeLoader.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java index 26ca37c653..a106ec286b 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java @@ -1319,9 +1319,9 @@ public class DreamCraftRecipeLoader { 32000000*12, 32768, 32000000, 64, new ItemStack[]{ ItemList.Electric_Piston_UEV.get(16L), ItemList.Electric_Motor_UEV.get(64L), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 16L), GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), GT_OreDictUnificator.get(OrePrefixes.block, Materials.NaquadahAlloy, 64L), - GT_OreDictUnificator.get(OrePrefixes.block, Materials.NetherStar, 64L), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 8L), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 8L), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 8L), @@ -1381,6 +1381,7 @@ public class DreamCraftRecipeLoader { new FluidStack(FluidRegistry.getFluid("oganesson"), 128000), new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 36864*2), new FluidStack(FluidRegistry.getFluid("molten.californium"), 36864), + Materials.NaquadahEnriched.getMolten(36864L) }, ItemList.Machine_Multi_PlasmaForge.get(1), 72000, 32_000_000); @@ -1398,14 +1399,14 @@ public class DreamCraftRecipeLoader { new FluidStack[]{ new FluidStack(FluidRegistry.getFluid("oganesson"), 8000), new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 1152*8), - Materials.EnrichedNaquadria.getFluid(1152L) + Materials.NaquadahEnriched.getMolten(1296L) }, ItemList.Casing_Dim_Bridge.get(1), 240*20, 32_000_000); // Dimensional injection casing. TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Casing_Dim_Trans.get(1), 2_000_000, 2048, 32_000_000, 1, new ItemStack[]{ - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 4), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Ledox, 1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.CallistoIce, 1), ItemList.Reactor_Coolant_Sp_6.get(1L), @@ -1418,15 +1419,15 @@ public class DreamCraftRecipeLoader { }, new FluidStack[]{ new FluidStack(FluidRegistry.getFluid("oganesson"), 1000), - new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 288), - Materials.EnrichedNaquadria.getFluid(288L) + new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 576), + Materials.NaquadahEnriched.getMolten(288L) }, ItemList.Casing_Dim_Injector.get(1), 20*20, 32_000_000); // Dimensionally Transcendent Casing. TT_recipeAdder.addResearchableAssemblylineRecipe(GT_ModHandler.getModItem("Avaritia", "Singularity", 1L, 0), 2_000_000, 2048, 32_000_000, 1, new ItemStack[]{ - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 6), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 6), GT_ModHandler.getModItem("miscutils", "itemScrewLaurenium", 12, 0), ItemList.Reactor_Coolant_Sp_6.get(1L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 1), @@ -1434,7 +1435,7 @@ public class DreamCraftRecipeLoader { new FluidStack[]{ new FluidStack(FluidRegistry.getFluid("oganesson"), 500), new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 288), - Materials.EnrichedNaquadria.getFluid(288L) + Materials.NaquadahEnriched.getMolten(144L) }, ItemList.Casing_Dim_Trans.get(1), 20*20, 32_000_000); -- cgit From 448d95fa62d1b2f0ce1a4aaba35f620dfa87537a Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Sun, 3 Jul 2022 23:11:49 +0100 Subject: Update recipes. --- .../dreamcraft/DreamCraftRecipeLoader.java | 31 +++++++++++----------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java index a106ec286b..bdb2f0e9c6 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java @@ -1190,7 +1190,7 @@ public class DreamCraftRecipeLoader { Materials.Radon.getGas(2500L), }, ItemList.Circuit_Wetwaremainframe.get(1L), 2000, 300000); - //Bio Chips + // Bioware circuits. TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Circuit_Biowarecomputer.get(1L), 48000, 128, 500000, 8, new Object[]{ ItemList.Circuit_Board_Bio_Ultra.get(2L), @@ -1204,7 +1204,7 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.NiobiumTitanium, 32L), new Object[]{OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L}, }, new FluidStack[]{ - Materials.SolderingAlloy.getMolten(1440L), + new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 1440), Materials.BioMediumSterilized.getFluid(1440L), new FluidStack(FluidRegistry.getFluid("ic2coolant"), 10000) }, @@ -1225,7 +1225,7 @@ public class DreamCraftRecipeLoader { new Object[]{OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L}, GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 64) }, new FluidStack[]{ - Materials.SolderingAlloy.getMolten(2880L), + new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 2880), Materials.BioMediumSterilized.getFluid(2880L), new FluidStack(FluidRegistry.getFluid("ic2coolant"), 20000) }, ItemList.Circuit_Biomainframe.get(1L), 6000, 2000000); @@ -1247,7 +1247,7 @@ public class DreamCraftRecipeLoader { new Object[]{OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L}, GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 64) }, new FluidStack[]{ - Materials.SolderingAlloy.getMolten(3744L), + new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 3744), Materials.Naquadria.getMolten(4032L), new FluidStack(FluidRegistry.getFluid("ic2coolant"), 20000) }, getItemContainer("NanoCircuit").get(1L), 8000, 8000000); @@ -1268,7 +1268,7 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Neutronium, 16), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Lanthanum, 64) }, new FluidStack[]{ - Materials.SolderingAlloy.getMolten(3744L), + new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 3744), Materials.UUMatter.getFluid(8000L), Materials.Osmium.getMolten(1152L) }, getItemContainer("PikoCircuit").get(1L), 10000, 8000000); @@ -1285,10 +1285,10 @@ public class DreamCraftRecipeLoader { ItemList.Circuit_Chip_QPIC.get(64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.NiobiumTitanium, 64), GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Indium, 64), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Bedrockium, 8), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SpaceTime, 8), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Lanthanum, 64) }, new FluidStack[]{ - Materials.SolderingAlloy.getMolten(3744L), + new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 3744), Materials.UUMatter.getFluid(24000L), Materials.Osmium.getMolten(2304L) }, getItemContainer("QuantumCircuit").get(1L), 20000, 32000000); @@ -1309,9 +1309,9 @@ public class DreamCraftRecipeLoader { }, new FluidStack[]{ Materials.Neutronium.getMolten(36864L), - Materials.Tritanium.getMolten(36864L), + Materials.SpaceTime.getMolten(36864L), Materials.SuperconductorUEVBase.getMolten(36864L), - Materials.DimensionallyTranscendentExoticCatalyst.getFluid(36864L) + Materials.ExcitedDTEC.getMolten(36864L) }, getItemContainer("StargateShieldingFoil").get(1L), 72000, 500000000); @@ -1330,10 +1330,10 @@ public class DreamCraftRecipeLoader { getItemContainer("QuantumCircuit").get(1L).splitStack(32) }, new FluidStack[]{ - Materials.Neutronium.getMolten(9216L), - Materials.Tritanium.getMolten(9216L), - Materials.SuperconductorUEVBase.getMolten(9216L), - Materials.DimensionallyTranscendentExoticCatalyst.getFluid(9216L) + Materials.Neutronium.getMolten(36864L), + Materials.SpaceTime.getMolten(36864L), + Materials.SuperconductorUEVBase.getMolten(36864L), + Materials.ExcitedDTEC.getMolten(36864L) }, getItemContainer("StargateChevron").get(1L), 72000, 500000000); @@ -1346,7 +1346,8 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Osmiridium, 64L) }, new FluidStack[]{ - Materials.Neutronium.getMolten(73728L), + Materials.ExcitedDTEC.getMolten(73728L), + Materials.SpaceTime.getMolten(73728L), Materials.Tritanium.getMolten(73728L), Materials.Concrete.getMolten(73728L) }, @@ -1513,7 +1514,7 @@ public class DreamCraftRecipeLoader { ItemList.Circuit_Parts_DiodeASMD.get(64), GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 64), }, new FluidStack[]{ - Materials.SolderingAlloy.getMolten(4608), + new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 4608), Materials.Naquadria.getMolten(9216), new FluidStack(FluidRegistry.getFluid("ic2coolant"), 32000) }, ItemList.ZPM3.get(1), 4000, 1600000); -- cgit From c76a750b22936082166057d40e00b9e45d0ffd76 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Sun, 3 Jul 2022 23:29:47 +0100 Subject: Update recipes. --- .../dreamcraft/DreamCraftRecipeLoader.java | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'src/main/java/com') diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java index bdb2f0e9c6..5e1d0d8e08 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java @@ -206,6 +206,36 @@ public class DreamCraftRecipeLoader { Materials.DraconiumAwakened.getMolten(576), }, ItemList.Casing_Coil_Infinity.get(1), 60*20, 8000000); + // Hypogen Coil + TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Casing_Coil_Infinity.get(1), + 16_777_216*2, 2048*2, 8000000*4, 1, new Object[]{ + ItemList.Circuit_Biowarecomputer.get(1L), + GT_ModHandler.getModItem("miscutils", "itemFineWireHypogen", 64, 0), + GT_ModHandler.getModItem("miscutils", "itemScrewHypogen", 8, 0), + GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + }, new FluidStack[]{ + Materials.Infinity.getMolten(576), + }, ItemList.Casing_Coil_Hypogen.get(1), 60*20, 8000000*4); + + // Eternal coil + TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Casing_Coil_Hypogen.get(1), + 16_777_216*4, 2048*4, 8000000*16, 1, new Object[]{ + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Nano, 2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SpaceTime, 8), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 16), + GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), + }, new FluidStack[]{ + new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 576), + }, ItemList.Casing_Coil_Eternal.get(1), 60*20, 8_000_000*16); + + //Tesla Base GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 6), -- cgit From f62ed31e5cb662f7f0de84c6fbccb030482541c7 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Mon, 4 Jul 2022 01:43:22 +0100 Subject: Fixes --- .../tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java index 5e1d0d8e08..eb23a7fc5c 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java @@ -209,7 +209,7 @@ public class DreamCraftRecipeLoader { // Hypogen Coil TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Casing_Coil_Infinity.get(1), 16_777_216*2, 2048*2, 8000000*4, 1, new Object[]{ - ItemList.Circuit_Biowarecomputer.get(1L), + ItemList.Circuit_Biomainframe.get(1L), GT_ModHandler.getModItem("miscutils", "itemFineWireHypogen", 64, 0), GT_ModHandler.getModItem("miscutils", "itemScrewHypogen", 8, 0), GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), @@ -222,7 +222,7 @@ public class DreamCraftRecipeLoader { // Eternal coil TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Casing_Coil_Hypogen.get(1), 16_777_216*4, 2048*4, 8000000*16, 1, new Object[]{ - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Nano, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Nano, 1), GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SpaceTime, 8), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 16), GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), -- cgit From fba47aa2950d2e7c0369735e04ff69b050bab2d4 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Mon, 4 Jul 2022 01:45:24 +0100 Subject: Fixes --- .../technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/java/com') diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java index eb23a7fc5c..1dc7878304 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java @@ -225,6 +225,7 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Nano, 1), GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SpaceTime, 8), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 16), + GT_ModHandler.getModItem("eternalsingularity", "eternal_singularity", 4L), GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), -- cgit From bfd5ebb2d69dc234445fdb80f106af23d5b46f21 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Mon, 4 Jul 2022 01:58:25 +0100 Subject: Fix circuits --- .../tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java index 1dc7878304..938e4fe85b 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java @@ -197,7 +197,7 @@ public class DreamCraftRecipeLoader { // Infinity Coil TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Casing_Coil_AwakenedDraconium.get(1), 16777216, 2048, 8000000, 1, new Object[]{ - new Object[]{"circuitInfinite", 1}, + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Infinite, 1), GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Infinity, 8), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 16), GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), @@ -209,7 +209,7 @@ public class DreamCraftRecipeLoader { // Hypogen Coil TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Casing_Coil_Infinity.get(1), 16_777_216*2, 2048*2, 8000000*4, 1, new Object[]{ - ItemList.Circuit_Biomainframe.get(1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Bio, 1), GT_ModHandler.getModItem("miscutils", "itemFineWireHypogen", 64, 0), GT_ModHandler.getModItem("miscutils", "itemScrewHypogen", 8, 0), GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 64, 0), -- cgit From c1eb4d655ef401967cbaa4df327ef29afd9df774 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Mon, 4 Jul 2022 02:13:17 +0100 Subject: Soldering alloy -> Mutated solder --- .../dreamcraft/DreamCraftRecipeLoader.java | 51 ++++++++++++---------- 1 file changed, 29 insertions(+), 22 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java index 938e4fe85b..8389cc7f1a 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java @@ -126,7 +126,9 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 16), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 16), GT_OreDictUnificator.get(OrePrefixes.wireGt01, getOrDefault("SuperconductorIV", Materials.Superconductor), 1) - }, Materials.SolderingAlloy.getMolten(1296), CustomItemList.eM_Computer_Vent.get(1), 100, 1920); + }, Materials.SolderingAlloy.getMolten(1296), + CustomItemList.eM_Computer_Vent.get(1), 100, 1920); + //Advanced Computer Casing addAssemblerRecipeWithCleanroom(new ItemStack[]{ CustomItemList.eM_Computer_Casing.get(1), @@ -182,7 +184,7 @@ public class DreamCraftRecipeLoader { 16777216, 2048, 2000000, 4, new Object[]{ ItemList.OilDrill3.get(1), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 4), - new Object[]{"circuitInfinite", 4}, + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Infinite, 4), ItemList.Electric_Motor_UHV.get(4), ItemList.Electric_Pump_UHV.get(4), GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Neutronium, 4), @@ -190,13 +192,13 @@ public class DreamCraftRecipeLoader { ItemList.Field_Generator_UHV.get(3), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 12) }, new FluidStack[]{ - Materials.SolderingAlloy.getMolten(1296), + new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 1296), Materials.Neutronium.getMolten(576) }, ItemList.OilDrillInfinite.get(1), 6000, 2000000); // Infinity Coil TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Casing_Coil_AwakenedDraconium.get(1), - 16777216, 2048, 8000000, 1, new Object[]{ + 16_777_216, 2048, 8_000_000, 1, new Object[]{ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Infinite, 1), GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Infinity, 8), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 16), @@ -204,11 +206,11 @@ public class DreamCraftRecipeLoader { GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorFoil", 32, 0) }, new FluidStack[]{ Materials.DraconiumAwakened.getMolten(576), - }, ItemList.Casing_Coil_Infinity.get(1), 60*20, 8000000); + }, ItemList.Casing_Coil_Infinity.get(1), 60*20, 8_000_000); // Hypogen Coil TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Casing_Coil_Infinity.get(1), - 16_777_216*2, 2048*2, 8000000*4, 1, new Object[]{ + 16_777_216*2, 2048*2, 32_000_000, 1, new Object[]{ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Bio, 1), GT_ModHandler.getModItem("miscutils", "itemFineWireHypogen", 64, 0), GT_ModHandler.getModItem("miscutils", "itemScrewHypogen", 8, 0), @@ -221,7 +223,7 @@ public class DreamCraftRecipeLoader { // Eternal coil TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Casing_Coil_Hypogen.get(1), - 16_777_216*4, 2048*4, 8000000*16, 1, new Object[]{ + 16_777_216*4, 8_192, 128_000_000, 1, new Object[]{ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Nano, 1), GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SpaceTime, 8), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 16), @@ -814,7 +816,7 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.CosmicNeutronium, 64L), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 2L)}, new FluidStack[]{ Materials.Quantium.getMolten(2592), - Materials.SolderingAlloy.getMolten(5184), + new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 5184), Materials.Lubricant.getFluid(8000)}, ItemList.Electric_Motor_UEV.get(1L), 2000, 800000); //Pumps UHV-UEV @@ -841,8 +843,9 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 4L), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 2L)}, new FluidStack[]{ Materials.Quantium.getMolten(2592), - Materials.SolderingAlloy.getMolten(5184), - Materials.Lubricant.getFluid(8000)}, ItemList.Electric_Pump_UEV.get(1), 2000, 800000); + new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 5184), + Materials.Lubricant.getFluid(8000)}, + ItemList.Electric_Pump_UEV.get(1), 2000, 800000); //Conveyor Belt UHV-UEV TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Conveyor_Module_UV.get(1L), @@ -867,8 +870,9 @@ public class DreamCraftRecipeLoader { new Object[]{OrePrefixes.plate.get(Materials.AnySyntheticRubber), 64L}, new Object[]{OrePrefixes.plate.get(Materials.AnySyntheticRubber), 16L}}, new FluidStack[]{ Materials.Quantium.getMolten(2592), - Materials.SolderingAlloy.getMolten(5184), - Materials.Lubricant.getFluid(8000)}, ItemList.Conveyor_Module_UEV.get(1), 2000, 800000); + new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 5184), + Materials.Lubricant.getFluid(8000)}, + ItemList.Conveyor_Module_UEV.get(1), 2000, 800000); //Piston UHV-UEV TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Electric_Piston_UV.get(1L), @@ -896,8 +900,9 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Infinity, 4L), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 4L)}, new FluidStack[]{ Materials.Quantium.getMolten(2592), - Materials.SolderingAlloy.getMolten(5184), - Materials.Lubricant.getFluid(8000)}, ItemList.Electric_Piston_UEV.get(1), 2000, 800000); + new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 5184), + Materials.Lubricant.getFluid(8000)}, + ItemList.Electric_Piston_UEV.get(1), 2000, 800000); //Robot Arm UHV-UEV TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Robot_Arm_UV.get(1L), @@ -927,7 +932,7 @@ public class DreamCraftRecipeLoader { new Object[]{OrePrefixes.circuit.get(Materials.Superconductor), 8L}, GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 6L)}, new FluidStack[]{ Materials.Quantium.getMolten(2592), - Materials.SolderingAlloy.getMolten(9216), + new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 9216), Materials.Lubricant.getFluid(8000)}, ItemList.Robot_Arm_UEV.get(1L), 2000, 800000); //Emitter UHV-UEV @@ -960,7 +965,7 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.foil, Materials.InfinityCatalyst, 64L), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 7L)}, new FluidStack[]{ Materials.Quantium.getMolten(2592), - Materials.SolderingAlloy.getMolten(9216)}, + new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 9216)}, ItemList.Emitter_UEV.get(1L), 2000, 800000); //Sensor UHV-UEV @@ -993,7 +998,7 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.foil, Materials.InfinityCatalyst, 64L), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 7L)}, new FluidStack[]{ Materials.Quantium.getMolten(2592), - Materials.SolderingAlloy.getMolten(9216)}, + new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 9216)}, ItemList.Sensor_UEV.get(1L), 2000, 800000); //Fieldgen UHV and UEV @@ -1036,7 +1041,7 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 8L)}, new FluidStack[]{ Materials.Quantium.getMolten(2592), - Materials.SolderingAlloy.getMolten(9216)}, + new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 9216)}, ItemList.Field_Generator_UEV.get(1L), 4000, 800000); //UHV-UMV Energy Hatch & Dynamo @@ -1132,7 +1137,7 @@ public class DreamCraftRecipeLoader { ItemList.Electric_Pump_UEV.get(2L)}, new FluidStack[]{ new FluidStack(FluidRegistry.getFluid("ic2coolant"), 64000), - Materials.SolderingAlloy.getMolten(23040), + new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 20*144), Materials.UUMatter.getFluid(16000L)}, getItemContainer("Hatch_Energy_UIV").get(1L), 1000, 16000000); @@ -1152,7 +1157,7 @@ public class DreamCraftRecipeLoader { ItemList.Electric_Pump_UEV.get(2L)}, new FluidStack[]{ new FluidStack(FluidRegistry.getFluid("ic2coolant"), 64000), - Materials.SolderingAlloy.getMolten(23040), + new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 20*144), Materials.UUMatter.getFluid(16000L)}, getItemContainer("Hatch_Dynamo_UIV").get(1L), 1000, 16000000); @@ -1175,7 +1180,7 @@ public class DreamCraftRecipeLoader { ItemList.Electric_Pump_UEV.get(4L)}, new FluidStack[]{ new FluidStack(FluidRegistry.getFluid("ic2coolant"), 128000), - Materials.SolderingAlloy.getMolten(46080), + new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 40*144), Materials.UUMatter.getFluid(32000L)}, getItemContainer("Hatch_Energy_UMV").get(1L), 1000, 32000000); @@ -1198,7 +1203,7 @@ public class DreamCraftRecipeLoader { ItemList.Electric_Pump_UEV.get(4L)}, new FluidStack[]{ new FluidStack(FluidRegistry.getFluid("ic2coolant"), 128000), - Materials.SolderingAlloy.getMolten(46080), + new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 40*144), Materials.UUMatter.getFluid(32000L)}, getItemContainer("Hatch_Dynamo_UMV").get(1L), 1000, 32000000); @@ -2040,6 +2045,7 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8), }, Materials.SolderingAlloy.getMolten(72), CustomItemList.teslaCover.getWithDamage(1, 1), 320, 7680); + //Ender Fluid Link Cover GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Enderium, 4), @@ -2047,6 +2053,7 @@ public class DreamCraftRecipeLoader { ItemList.Emitter_LuV.get(1), ItemList.Electric_Pump_LuV.get(1), }, Materials.Chrome.getMolten(288), CustomItemList.enderLinkFluidCover.getWithDamage(1, 0), 320, 30720); + //Power Pass Upgrade Cover GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ CustomItemList.Machine_Multi_Transformer.get(1), -- cgit From b9b672431c1a50c792f6a1baa4b86cad3902e4cc Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Mon, 4 Jul 2022 04:01:30 +0100 Subject: Fix DTEC usage. --- .../dreamcraft/DreamCraftRecipeLoader.java | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java index 8389cc7f1a..218b06cbb8 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java @@ -1122,7 +1122,7 @@ public class DreamCraftRecipeLoader { getItemContainer("Hatch_Dynamo_UEV").get(1L), 1000, 8000000); TT_recipeAdder.addResearchableAssemblylineRecipe(getItemContainer("Hatch_Energy_UEV").get(1L), - 96000, 64, 200000, 8, new Object[]{ + 96_000, 64, 200_000, 8, new Object[]{ getItemContainer("Hull_UIV").get(1L), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUHV, 8L), ItemList.Circuit_Chip_QPIC.get(4L), @@ -1136,13 +1136,13 @@ public class DreamCraftRecipeLoader { ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Electric_Pump_UEV.get(2L)}, new FluidStack[]{ - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 64000), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 64_000), new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 20*144), - Materials.UUMatter.getFluid(16000L)}, - getItemContainer("Hatch_Energy_UIV").get(1L), 1000, 16000000); + Materials.UUMatter.getFluid(16_000L)}, + getItemContainer("Hatch_Energy_UIV").get(1L), 1000, 16_000_000); TT_recipeAdder.addResearchableAssemblylineRecipe(getItemContainer("Hatch_Dynamo_UEV").get(1L), - 192000, 128, 400000, 16, new Object[]{ + 192_000, 128, 400_000, 16, new Object[]{ getItemContainer("Hull_UIV").get(1L), GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Longasssuperconductornameforuhvwire, 32L), ItemList.Circuit_Chip_QPIC.get(4L), @@ -1156,10 +1156,10 @@ public class DreamCraftRecipeLoader { ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Electric_Pump_UEV.get(2L)}, new FluidStack[]{ - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 64000), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 64_000), new FluidStack(FluidRegistry.getFluid("molten.mutatedlivingsolder"), 20*144), - Materials.UUMatter.getFluid(16000L)}, - getItemContainer("Hatch_Dynamo_UIV").get(1L), 1000, 16000000); + Materials.UUMatter.getFluid(16_000L)}, + getItemContainer("Hatch_Dynamo_UIV").get(1L), 1000, 16_000_000); TT_recipeAdder.addResearchableAssemblylineRecipe(getItemContainer("Hatch_Energy_UIV").get(1L), 192000, 128, 400000, 16, new Object[]{ @@ -1336,18 +1336,18 @@ public class DreamCraftRecipeLoader { 32000000*12, 32768, 32000000, 64, new ItemStack[]{ GT_ModHandler.getModItem("eternalsingularity", "eternal_singularity", 16L), ItemList.Sensor_UEV.get(16L), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 16L), - GT_OreDictUnificator.get(OrePrefixes.block, Materials.CosmicNeutronium, 16L), + GT_OreDictUnificator.get(OrePrefixes.block, Materials.CosmicNeutronium, 64L), GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.block, Materials.SpaceTime, 16L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Quantum, 16L) }, new FluidStack[]{ - Materials.Neutronium.getMolten(36864L), + Materials.Neutronium.getMolten(4*36864L), Materials.SpaceTime.getMolten(36864L), Materials.SuperconductorUEVBase.getMolten(36864L), - Materials.ExcitedDTEC.getMolten(36864L) + Materials.ExcitedDTEC.getFluid(36864L) }, getItemContainer("StargateShieldingFoil").get(1L), 72000, 500000000); @@ -1369,7 +1369,7 @@ public class DreamCraftRecipeLoader { Materials.Neutronium.getMolten(36864L), Materials.SpaceTime.getMolten(36864L), Materials.SuperconductorUEVBase.getMolten(36864L), - Materials.ExcitedDTEC.getMolten(36864L) + Materials.ExcitedDTEC.getFluid(36864L) }, getItemContainer("StargateChevron").get(1L), 72000, 500000000); @@ -1382,7 +1382,7 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Osmiridium, 64L) }, new FluidStack[]{ - Materials.ExcitedDTEC.getMolten(73728L), + Materials.ExcitedDTEC.getFluid(73728L), Materials.SpaceTime.getMolten(73728L), Materials.Tritanium.getMolten(73728L), Materials.Concrete.getMolten(73728L) -- cgit From 8f080ec9ff829f0632bedf71dc4301851650e1f3 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Mon, 4 Jul 2022 04:22:50 +0100 Subject: Update recipes. --- .../dreamcraft/DreamCraftRecipeLoader.java | 53 +++++++++++++++------- 1 file changed, 36 insertions(+), 17 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java index 218b06cbb8..d7eb316aac 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java @@ -1333,15 +1333,22 @@ public class DreamCraftRecipeLoader { //Stargate Recipes if (Loader.isModLoaded("eternalsingularity") && Loader.isModLoaded("SGCraft")) { TT_recipeAdder.addResearchableAssemblylineRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 1L), - 32000000*12, 32768, 32000000, 64, new ItemStack[]{ - GT_ModHandler.getModItem("eternalsingularity", "eternal_singularity", 16L), - ItemList.Sensor_UEV.get(16L), + 2_000_000_000, 32768, 500_000_000, 64, new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.block, Materials.CosmicNeutronium, 64L), GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.block, Materials.SpaceTime, 16L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Quantum, 16L) + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Quantum, 16L), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 16L), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 16L), + + ItemList.Sensor_UEV.get(16L), + ItemList.Emitter_UEV.get(16L), + GT_ModHandler.getModItem("eternalsingularity", "eternal_singularity", 16L) + }, new FluidStack[]{ Materials.Neutronium.getMolten(4*36864L), @@ -1349,35 +1356,47 @@ public class DreamCraftRecipeLoader { Materials.SuperconductorUEVBase.getMolten(36864L), Materials.ExcitedDTEC.getFluid(36864L) }, - getItemContainer("StargateShieldingFoil").get(1L), 72000, 500000000); + getItemContainer("StargateShieldingFoil").get(1L), 72_000, 500_000_000); TT_recipeAdder.addResearchableAssemblylineRecipe(getItemContainer("StargateShieldingFoil").get(1L), - 32000000*12, 32768, 32000000, 64, new ItemStack[]{ - ItemList.Electric_Piston_UEV.get(16L), - ItemList.Electric_Motor_UEV.get(64L), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 16L), + 2_000_000_000, 32_768, 500_000_000, 64, new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 64L), GT_OreDictUnificator.get(OrePrefixes.block, Materials.NaquadahAlloy, 64L), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 8L), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 8L), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 8L), + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Neutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Neutronium, 64L), + + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 16L), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 16L), GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Ruby, 16L), GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Jasper, 16L), - getItemContainer("QuantumCircuit").get(1L).splitStack(32) + + GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Opal, 16L), + GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Sapphire, 16L), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 8L), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 8L), + + ItemList.Electric_Motor_UEV.get(64L), + ItemList.Electric_Piston_UEV.get(64L), + ItemList.Field_Generator_UEV.get(16L), + getItemContainer("QuantumCircuit").get(1L).splitStack(32), }, new FluidStack[]{ - Materials.Neutronium.getMolten(36864L), + Materials.Neutronium.getMolten(4L*36864L), Materials.SpaceTime.getMolten(36864L), Materials.SuperconductorUEVBase.getMolten(36864L), Materials.ExcitedDTEC.getFluid(36864L) }, - getItemContainer("StargateChevron").get(1L), 72000, 500000000); + getItemContainer("StargateChevron").get(1L), 72_000, 500_000_000); TT_recipeAdder.addResearchableAssemblylineRecipe(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 1L), - 32000000*12, 32768, 32000000, 64, new ItemStack[]{ + 2_000_000_000, 32_768, 500_000_000, 64, new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 64L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SpaceTime, 64L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 64L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.CosmicNeutronium, 64L), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 64L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Osmiridium, 64L) }, @@ -1387,7 +1406,7 @@ public class DreamCraftRecipeLoader { Materials.Tritanium.getMolten(73728L), Materials.Concrete.getMolten(73728L) }, - getItemContainer("StargateFramePart").get(1L), 72000, 500000000); + getItemContainer("StargateFramePart").get(1L), 72_000, 500_000_000); } // Dimensionally Transcendent Plasma Forge (DTPF) -- cgit From 3f16383af2ad72134481028f5401fda802b05234 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Tue, 5 Jul 2022 01:27:48 +0100 Subject: Fix circuits --- .../compatibility/dreamcraft/DreamCraftRecipeLoader.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftR