From 6156e8fafd318d3657ad6603f7e095574df3cc65 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Wed, 2 Feb 2022 03:37:16 +0000 Subject: [PATCH 1/3] Bump GT5 version, fix 484L ASMD overflow. --- dependencies.gradle | 2 +- .../dreamcraft/DreamCraftRecipeLoader.java | 98 ++++++++++++++++--- 2 files changed, 83 insertions(+), 17 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 507b95cf0..0aada7c20 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -3,7 +3,7 @@ dependencies { shadowImplementation("com.github.GTNewHorizons:AVRcore:master-SNAPSHOT") - compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.40.18:dev") + compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.40.26:dev") compile("com.github.GTNewHorizons:Yamcl:0.5.82:dev") compile("com.github.GTNewHorizons:NotEnoughItems:2.1.22-GTNH:dev") compile("com.github.GTNewHorizons:CodeChickenLib:1.1.5.1:dev") 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 5abd11a86..848933d4d 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 @@ -1152,7 +1152,7 @@ public void run() { Materials.UUMatter.getFluid(32000L)}, getItemContainer("Hatch_Dynamo_UMV").get(1L), 1000, 32000000); - //UHV Circuit + //UHV Circuit ASMD TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Circuit_Wetwaresupercomputer.get(1L), 24000, 64, 50000, 4, new Object[]{ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 2), @@ -1171,7 +1171,27 @@ public void run() { Materials.Radon.getGas(2500L), }, ItemList.Circuit_Wetwaremainframe.get(1L), 2000, 300000); - //Bio Chips + //UHV Circuit xSMD + TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Circuit_Wetwaresupercomputer.get(1L), + 24000, 64, 50000, 4, new Object[]{ + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 2), + ItemList.Circuit_Wetwaresupercomputer.get(2L), + ItemList.ZPM_Coil.get(16L), + ItemList.Circuit_Parts_CapacitorXSMD.get(4L), + ItemList.Circuit_Parts_ResistorXSMD.get(4L), + ItemList.Circuit_Parts_TransistorXSMD.get(4L), + ItemList.Circuit_Parts_DiodeXSMD.get(4L), + ItemList.Circuit_Chip_Ram.get(48L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 64L), + new Object[]{OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L}, + }, new FluidStack[]{ + Materials.SolderingAlloy.getMolten(2880L), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 10000), + Materials.Radon.getGas(2500L), + }, ItemList.Circuit_Wetwaremainframe.get(1L), 2000, 300000); + + + //Bio Chips ASMD TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Circuit_Biowarecomputer.get(1L), 48000, 128, 500000, 8, new Object[]{ ItemList.Circuit_Board_Bio_Ultra.get(2L), @@ -1191,6 +1211,28 @@ public void run() { }, ItemList.Circuit_Biowaresupercomputer.get(1L), 4000, 500000); + + //Bio Chips xSMD + TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Circuit_Biowarecomputer.get(1L), + 48000, 128, 500000, 8, new Object[]{ + ItemList.Circuit_Board_Bio_Ultra.get(2L), + ItemList.Circuit_Biowarecomputer.get(2L), + ItemList.Circuit_Parts_TransistorXSMD.get(4L), + ItemList.Circuit_Parts_ResistorXSMD.get(4L), + ItemList.Circuit_Parts_CapacitorXSMD.get(4L), + ItemList.Circuit_Parts_DiodeXSMD.get(4L), + ItemList.Circuit_Chip_NOR.get(32L), + ItemList.Circuit_Chip_Ram.get(64L), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.NiobiumTitanium, 32L), + new Object[]{OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L}, + }, new FluidStack[]{ + Materials.SolderingAlloy.getMolten(1440L), + Materials.BioMediumSterilized.getFluid(1440L), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 10000) + }, + ItemList.Circuit_Biowaresupercomputer.get(1L), 4000, 500000); + + // Bio ASMD TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Circuit_Biowaresupercomputer.get(1L), 96000, 256, 1000000, 16, new Object[]{ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 4L), @@ -1210,15 +1252,37 @@ public void run() { new FluidStack(FluidRegistry.getFluid("ic2coolant"), 20000) }, ItemList.Circuit_Biomainframe.get(1L), 6000, 2000000); - //GTNH UIV, UMV, UXV Circuits + + // Bio xSMD + TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Circuit_Biowaresupercomputer.get(1L), + 96000, 256, 1000000, 16, new Object[]{ + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 4L), + ItemList.Circuit_Biowaresupercomputer.get(2L), + ItemList.UV_Coil.get(16L), + ItemList.Circuit_Parts_CapacitorXSMD.get(6L), + ItemList.Circuit_Parts_ResistorXSMD.get(6L), + ItemList.Circuit_Parts_TransistorXSMD.get(6L), + ItemList.Circuit_Parts_DiodeXSMD.get(6L), + ItemList.Circuit_Chip_Ram.get(64L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 64), + new Object[]{OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L}, + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 64) + }, new FluidStack[]{ + Materials.SolderingAlloy.getMolten(2880L), + Materials.BioMediumSterilized.getFluid(2880L), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 20000) + }, ItemList.Circuit_Biomainframe.get(1L), 6000, 2000000); + + + // GTNH UIV, UMV, UXV Circuits TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Circuit_Biomainframe.get(1L), 192000, 512, 2000000, 32, new Object[]{ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 8), ItemList.Circuit_Biomainframe.get(2L), - ItemList.Circuit_Parts_CapacitorASMD.get(32L), - ItemList.Circuit_Parts_ResistorASMD.get(32L), - ItemList.Circuit_Parts_TransistorASMD.get(32L), - ItemList.Circuit_Parts_DiodeASMD.get(32L), + ItemList.Circuit_Parts_CapacitorXSMD.get(32L), + ItemList.Circuit_Parts_ResistorXSMD.get(32L), + ItemList.Circuit_Parts_TransistorXSMD.get(32L), + ItemList.Circuit_Parts_DiodeXSMD.get(32L), ItemList.Circuit_Chip_Ram.get(64L), ItemList.Circuit_Chip_NPIC.get(64L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Draconium, 64), @@ -1232,15 +1296,15 @@ public void run() { }, getItemContainer("NanoCircuit").get(1L), 8000, 8000000); - TT_recipeAdder.addResearchableAssemblylineRecipe(getItemContainer("PicoWafer").get(1), + TT_recipeAdder.addResearchableAssemblylineRecipe(getItemContainer("NanoCircuit").get(1L), 384000, 1024, 4000000, 64, new ItemStack[]{ ItemList.Circuit_Board_Bio_Ultra.get(1L), getItemContainer("PicoWafer").get(4L), getItemContainer("NanoCircuit").get(2L), - ItemList.Circuit_Parts_TransistorASMD.get(484L), - ItemList.Circuit_Parts_ResistorASMD.get(48L), - ItemList.Circuit_Parts_CapacitorASMD.get(48L), - ItemList.Circuit_Parts_DiodeASMD.get(48L), + ItemList.Circuit_Parts_TransistorXSMD.get(48L), + ItemList.Circuit_Parts_ResistorXSMD.get(48L), + ItemList.Circuit_Parts_CapacitorXSMD.get(48L), + ItemList.Circuit_Parts_DiodeXSMD.get(48L), ItemList.Circuit_Chip_PPIC.get(64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.NiobiumTitanium, 16), GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Osmium, 32), @@ -1252,14 +1316,15 @@ public void run() { Materials.Osmium.getMolten(1152L) }, getItemContainer("PikoCircuit").get(1L), 10000, 8000000); + TT_recipeAdder.addResearchableAssemblylineRecipe(getItemContainer("PikoCircuit").get(1L), 720000, 2048, 8000000, 128, new ItemStack[]{ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 16), getItemContainer("PikoCircuit").get(2L), - ItemList.Circuit_Parts_CapacitorASMD.get(64L), - ItemList.Circuit_Parts_DiodeASMD.get(64L), - ItemList.Circuit_Parts_TransistorASMD.get(64L), - ItemList.Circuit_Parts_ResistorASMD.get(64L), + ItemList.Circuit_Parts_CapacitorXSMD.get(64L), + ItemList.Circuit_Parts_DiodeXSMD.get(64L), + ItemList.Circuit_Parts_TransistorXSMD.get(64L), + ItemList.Circuit_Parts_ResistorXSMD.get(64L), ItemList.Circuit_Chip_QPIC.get(64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.NiobiumTitanium, 64), GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Indium, 64), @@ -1271,6 +1336,7 @@ public void run() { Materials.Osmium.getMolten(2304L) }, getItemContainer("QuantumCircuit").get(1L), 20000, 32000000); + //Stargate Recipes if (Loader.isModLoaded("eternalsingularity") && Loader.isModLoaded("SGCraft")) { TT_recipeAdder.addResearchableAssemblylineRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Infinity, 1L), From d4a28ad1446e22500d9f71294637db7c1c3e2795 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Wed, 2 Feb 2022 03:41:43 +0000 Subject: [PATCH 2/3] Bump GT5 version, fix 484L ASMD overflow and add bio/wetware xSMD support. --- .../compatibility/dreamcraft/DreamCraftRecipeLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 848933d4d..461004a0c 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 @@ -1316,7 +1316,7 @@ public void run() { Materials.Osmium.getMolten(1152L) }, getItemContainer("PikoCircuit").get(1L), 10000, 8000000); - + TT_recipeAdder.addResearchableAssemblylineRecipe(getItemContainer("PikoCircuit").get(1L), 720000, 2048, 8000000, 128, new ItemStack[]{ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 16), From 727af88d22197c0f540d489fde313c2ad3222dd9 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Wed, 9 Feb 2022 11:47:00 +0100 Subject: [PATCH 3/3] use xsmd components in researches (just temp) --- .../compatibility/dreamcraft/DreamCraftRecipeLoader.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 461004a0c..9a2ec930e 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 @@ -1172,7 +1172,7 @@ public void run() { }, ItemList.Circuit_Wetwaremainframe.get(1L), 2000, 300000); //UHV Circuit xSMD - TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Circuit_Wetwaresupercomputer.get(1L), + TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Circuit_Parts_TransistorXSMD.get(1L), 24000, 64, 50000, 4, new Object[]{ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 2), ItemList.Circuit_Wetwaresupercomputer.get(2L), @@ -1213,7 +1213,7 @@ public void run() { //Bio Chips xSMD - TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Circuit_Biowarecomputer.get(1L), + TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Circuit_Parts_ResistorXSMD.get(1L), 48000, 128, 500000, 8, new Object[]{ ItemList.Circuit_Board_Bio_Ultra.get(2L), ItemList.Circuit_Biowarecomputer.get(2L), @@ -1254,7 +1254,7 @@ public void run() { // Bio xSMD - TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Circuit_Biowaresupercomputer.get(1L), + TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Circuit_Parts_CapacitorXSMD.get(1L), 96000, 256, 1000000, 16, new Object[]{ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 4L), ItemList.Circuit_Biowaresupercomputer.get(2L),