From ca6c469e130eee604aa69f0e48ed594a3102e58b Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 20 Aug 2022 00:28:38 +0200 Subject: first draft for adding Schematics to TT Reaseach Table --- .../dreamcraft/DreamCraftRecipeLoader.java | 80 ++++++++++++++++++++++ 1 file changed, 80 insertions(+) (limited to 'src/main/java') 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 40e81c5706..75f1ee9e9f 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 @@ -1410,6 +1410,86 @@ public class DreamCraftRecipeLoader { Materials.Void.getMolten(2880L), Materials.DraconiumAwakened.getMolten(1440), }, GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 5001), 1500, 8_000_000); + if (Loader.isModLoaded("DraconicEvolution")) { + // DE Schematics Cores Tier 1 + TT_recipeAdder.addResearchableAssemblylineRecipe( + GT_ModHandler.getModItem("EMT", "EMTItems", 1, 16), + 500_000, + 1024, + 1_000_000, + 4, + new Object[] { + GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 1, 0), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Ichorium, 1L), + new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 1}, + }, + new FluidStack[] { + Materials.Sunnarium.getMolten(14400L), Materials.Void.getMolten(28800L), + }, + GT_ModHandler.getModItem("EMT", "EMTItems", 1, 16), + 12000, + 500_000); + + // DE Schematics Cores Tier 2 + TT_recipeAdder.addResearchableAssemblylineRecipe( + GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 1, 0), + 5_000_000, + 2048, + 4_000_000, + 8, + new Object[] { + GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 4, 0), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 1L), + new Object[] {OrePrefixes.circuit.get(Materials.Bio), 1}, + }, + new FluidStack[] { + Materials.Neutronium.getMolten(14400L), Materials.Void.getMolten(57600L), + }, + GT_ModHandler.getModItem("EMT", "EMTItems", 1, 17), + 24000, + 2_000_000); + + // DE Schematics Cores Tier 3 + TT_recipeAdder.addResearchableAssemblylineRecipe( + GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 1, 0), + 50_000_000, + 4096, + 16_000_000, + 16, + new Object[] { + GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 4, 0), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 1L), + new Object[] {OrePrefixes.circuit.get(Materials.Nano), 1}, + }, + new FluidStack[] { + Materials.Infinity.getMolten(14400L), Materials.Void.getMolten(115200L), + }, + GT_ModHandler.getModItem("EMT", "EMTItems", 1, 18), + 36000, + 8_000_000); + // DE Schematics Cores Tier 4 + TT_recipeAdder.addResearchableAssemblylineRecipe( + GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 1, 0), + 500_000_000, + 8192, + 64_000_000, + 64, + new Object[] { + GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 8, 0), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 4L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 1L), + new Object[] {OrePrefixes.circuit.get(Materials.Piko), 1}, + }, + new FluidStack[] { + Materials.SpaceTime.getMolten(14400L), Materials.Void.getMolten(230400L), + }, + GT_ModHandler.getModItem("EMT", "EMTItems", 1, 18), + 72000, + 32_000_000); + } } //region singleblocks -- cgit From 81ef6d40e66cb99fd271090f4dcfc54ad0ed5520 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 20 Aug 2022 00:49:40 +0200 Subject: fix derp --- .../tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java') 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 75f1ee9e9f..779730e3a4 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 @@ -1413,7 +1413,7 @@ public class DreamCraftRecipeLoader { if (Loader.isModLoaded("DraconicEvolution")) { // DE Schematics Cores Tier 1 TT_recipeAdder.addResearchableAssemblylineRecipe( - GT_ModHandler.getModItem("EMT", "EMTItems", 1, 16), + GT_ModHandler.getModItem("EMT", "EMT_GTBLOCK_CASEING", 1, 9), 500_000, 1024, 1_000_000, @@ -1486,7 +1486,7 @@ public class DreamCraftRecipeLoader { new FluidStack[] { Materials.SpaceTime.getMolten(14400L), Materials.Void.getMolten(230400L), }, - GT_ModHandler.getModItem("EMT", "EMTItems", 1, 18), + GT_ModHandler.getModItem("EMT", "EMTItems", 1, 19), 72000, 32_000_000); } -- cgit From ac434d80c2fa04e7bc715984f394ccc3e3672c9f Mon Sep 17 00:00:00 2001 From: GitHub GTNH Actions <> Date: Sat, 20 Aug 2022 09:54:59 +0000 Subject: spotlessApply --- .../dreamcraft/DreamCraftRecipeLoader.java | 98 ++++++++++++---------- 1 file changed, 53 insertions(+), 45 deletions(-) (limited to 'src/main/java') 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 bf66ec7dc0..037779ee42 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 @@ -3463,25 +3463,34 @@ public class DreamCraftRecipeLoader { 2000000); // Draconic Evolution Fusion Crafter Controller - if (Loader.isModLoaded("AWWayofTime")&&Loader.isModLoaded("EMT")){ - TT_recipeAdder.addResearchableAssemblylineRecipe(GT_ModHandler.getModItem("EMT", "EMT_GTBLOCK_CASEING", 1, 8), - 16_777_216, 1024, 2_000_000, 8, new Object[]{ - GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 10783), - GT_ModHandler.getModItem("EMT", "EMT_GTBLOCK_CASEING", 1, 8), - GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsBotania.GaiaSpirit, 1L), - ItemList.Casing_Coil_AwakenedDraconium.get(8L), - ItemList.Electric_Motor_UHV.get(8L), - ItemList.Robot_Arm_UHV.get(4L), - new Object[]{OrePrefixes.circuit.get(Materials.Infinite), 4}, - ItemList.Gravistar.get(4, new Object(){}), - GT_ModHandler.getModItem("Thaumcraft", "ItemEldritchObject", 1, 3), - GT_ModHandler.getModItem("AWWayofTime", "bloodMagicBaseItems", 8, 29), - GT_ModHandler.getModItem("AWWayofTime", "bloodMagicBaseItems", 8, 28), - }, new FluidStack[]{ - new FluidStack(solderIndalloy, 2880), - Materials.Void.getMolten(2880L), - Materials.DraconiumAwakened.getMolten(1440), - }, GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 5001), 1500, 8_000_000); + if (Loader.isModLoaded("AWWayofTime") && Loader.isModLoaded("EMT")) { + TT_recipeAdder.addResearchableAssemblylineRecipe( + GT_ModHandler.getModItem("EMT", "EMT_GTBLOCK_CASEING", 1, 8), + 16_777_216, + 1024, + 2_000_000, + 8, + new Object[] { + GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 10783), + GT_ModHandler.getModItem("EMT", "EMT_GTBLOCK_CASEING", 1, 8), + GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsBotania.GaiaSpirit, 1L), + ItemList.Casing_Coil_AwakenedDraconium.get(8L), + ItemList.Electric_Motor_UHV.get(8L), + ItemList.Robot_Arm_UHV.get(4L), + new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 4}, + ItemList.Gravistar.get(4, new Object() {}), + GT_ModHandler.getModItem("Thaumcraft", "ItemEldritchObject", 1, 3), + GT_ModHandler.getModItem("AWWayofTime", "bloodMagicBaseItems", 8, 29), + GT_ModHandler.getModItem("AWWayofTime", "bloodMagicBaseItems", 8, 28), + }, + new FluidStack[] { + new FluidStack(solderIndalloy, 2880), + Materials.Void.getMolten(2880L), + Materials.DraconiumAwakened.getMolten(1440), + }, + GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 5001), + 1500, + 8_000_000); if (Loader.isModLoaded("DraconicEvolution")) { // DE Schematics Cores Tier 1 TT_recipeAdder.addResearchableAssemblylineRecipe( @@ -3491,13 +3500,13 @@ public class DreamCraftRecipeLoader { 1_000_000, 4, new Object[] { - GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 1, 0), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Ichorium, 1L), - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 1}, + GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 1, 0), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Ichorium, 1L), + new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 1}, }, new FluidStack[] { - Materials.Sunnarium.getMolten(14400L), Materials.Void.getMolten(28800L), + Materials.Sunnarium.getMolten(14400L), Materials.Void.getMolten(28800L), }, GT_ModHandler.getModItem("EMT", "EMTItems", 1, 16), 12000, @@ -3511,13 +3520,13 @@ public class DreamCraftRecipeLoader { 4_000_000, 8, new Object[] { - GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 4, 0), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 1L), - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 1}, + GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 4, 0), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 1L), + new Object[] {OrePrefixes.circuit.get(Materials.Bio), 1}, }, new FluidStack[] { - Materials.Neutronium.getMolten(14400L), Materials.Void.getMolten(57600L), + Materials.Neutronium.getMolten(14400L), Materials.Void.getMolten(57600L), }, GT_ModHandler.getModItem("EMT", "EMTItems", 1, 17), 24000, @@ -3531,13 +3540,13 @@ public class DreamCraftRecipeLoader { 16_000_000, 16, new Object[] { - GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 4, 0), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 1L), - new Object[] {OrePrefixes.circuit.get(Materials.Nano), 1}, + GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 4, 0), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 1L), + new Object[] {OrePrefixes.circuit.get(Materials.Nano), 1}, }, new FluidStack[] { - Materials.Infinity.getMolten(14400L), Materials.Void.getMolten(115200L), + Materials.Infinity.getMolten(14400L), Materials.Void.getMolten(115200L), }, GT_ModHandler.getModItem("EMT", "EMTItems", 1, 18), 36000, @@ -3550,26 +3559,25 @@ public class DreamCraftRecipeLoader { 64_000_000, 64, new Object[] { - GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 8, 0), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 4L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 1L), - new Object[] {OrePrefixes.circuit.get(Materials.Piko), 1}, + GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 8, 0), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 4L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 1L), + new Object[] {OrePrefixes.circuit.get(Materials.Piko), 1}, }, new FluidStack[] { - Materials.SpaceTime.getMolten(14400L), Materials.Void.getMolten(230400L), + Materials.SpaceTime.getMolten(14400L), Materials.Void.getMolten(230400L), }, GT_ModHandler.getModItem("EMT", "EMTItems", 1, 19), 72000, 32_000_000); } - } + } - //region singleblocks + // region singleblocks - //Tesla Transceiver LV 1A - GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ - ItemList.Battery_Buffer_1by1_LV.get(1), - CustomItemList.teslaCover.getWithDamage(1, 0)}, + // Tesla Transceiver LV 1A + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] {ItemList.Battery_Buffer_1by1_LV.get(1), CustomItemList.teslaCover.getWithDamage(1, 0)}, Materials.Lead.getMolten(576), CustomItemList.Machine_TeslaCoil_1by1_LV.get(1), 400, -- cgit From 731ca874189c2f53da0db433390801f9cb30ce95 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 20 Aug 2022 14:09:45 +0200 Subject: buff schematics --- .../dreamcraft/DreamCraftRecipeLoader.java | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/main/java') 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 037779ee42..0dd87967f0 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 @@ -3495,8 +3495,8 @@ public class DreamCraftRecipeLoader { // DE Schematics Cores Tier 1 TT_recipeAdder.addResearchableAssemblylineRecipe( GT_ModHandler.getModItem("EMT", "EMT_GTBLOCK_CASEING", 1, 9), - 500_000, - 1024, + 5_000_000, + 512, 1_000_000, 4, new Object[] { @@ -3509,14 +3509,14 @@ public class DreamCraftRecipeLoader { Materials.Sunnarium.getMolten(14400L), Materials.Void.getMolten(28800L), }, GT_ModHandler.getModItem("EMT", "EMTItems", 1, 16), - 12000, + 6000, 500_000); // DE Schematics Cores Tier 2 TT_recipeAdder.addResearchableAssemblylineRecipe( GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 1, 0), - 5_000_000, - 2048, + 10_000_000, + 1024, 4_000_000, 8, new Object[] { @@ -3529,14 +3529,14 @@ public class DreamCraftRecipeLoader { Materials.Neutronium.getMolten(14400L), Materials.Void.getMolten(57600L), }, GT_ModHandler.getModItem("EMT", "EMTItems", 1, 17), - 24000, + 12000, 2_000_000); // DE Schematics Cores Tier 3 TT_recipeAdder.addResearchableAssemblylineRecipe( GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 1, 0), - 50_000_000, - 4096, + 20_000_000, + 2048, 16_000_000, 16, new Object[] { @@ -3549,13 +3549,13 @@ public class DreamCraftRecipeLoader { Materials.Infinity.getMolten(14400L), Materials.Void.getMolten(115200L), }, GT_ModHandler.getModItem("EMT", "EMTItems", 1, 18), - 36000, + 24000, 8_000_000); // DE Schematics Cores Tier 4 TT_recipeAdder.addResearchableAssemblylineRecipe( GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 1, 0), - 500_000_000, - 8192, + 40_000_000, + 4096, 64_000_000, 64, new Object[] { @@ -3568,7 +3568,7 @@ public class DreamCraftRecipeLoader { Materials.SpaceTime.getMolten(14400L), Materials.Void.getMolten(230400L), }, GT_ModHandler.getModItem("EMT", "EMTItems", 1, 19), - 72000, + 36000, 32_000_000); } } -- cgit