From 3bab8408662cb164beb7b13ab58cd2d653d201c0 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 20 Aug 2022 00:11:07 +0200 Subject: bump dep file (cherry picked from commit 9f3f21de12bc6846779f95e9adcfeca22a891c71) --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 9e2ff3e98a..dae1731f82 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { shadowImplementation('com.github.GTNewHorizons:AVRcore:master-SNAPSHOT') - compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.00:dev') + compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.02-pre:dev') compile('com.github.GTNewHorizons:Yamcl:0.5.82:dev') compile('com.github.GTNewHorizons:NotEnoughItems:2.2.22:dev') compile('com.github.GTNewHorizons:CodeChickenLib:1.1.5.3:dev') -- cgit 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(+) 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(-) 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 0d80b622d83f0c17cb49bd149246e10ef42948a7 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 20 Aug 2022 11:51:53 +0200 Subject: Update dependencies.gradle --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index dae1731f82..00870aa896 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { shadowImplementation('com.github.GTNewHorizons:AVRcore:master-SNAPSHOT') - compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.02-pre:dev') + compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.05:dev') compile('com.github.GTNewHorizons:Yamcl:0.5.82:dev') compile('com.github.GTNewHorizons:NotEnoughItems:2.2.22:dev') compile('com.github.GTNewHorizons:CodeChickenLib:1.1.5.3:dev') -- cgit