From fc6607a06af7f6e57cc3cfe81d5f417f2d3cae3c Mon Sep 17 00:00:00 2001 From: GDCloud Date: Tue, 31 Jan 2023 19:55:29 +0100 Subject: purge remaining nanos, more memory recipes --- .../dreamcraft/DreamCraftRecipeLoader.java | 28 ++++++++++++++++++++-- 1 file changed, 26 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 8df15c2f86..76ee23536e 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 @@ -3817,6 +3817,30 @@ public class DreamCraftRecipeLoader { 20 * 20, 1_966_080, false); + GT_Values.RA.addCircuitAssemblerRecipe( + new ItemStack[] { GT_ModHandler.getModItem("OpenComputers", "item", 4L, 39), // Memory tier 3.5 + ItemList.Circuit_Chip_Optical.get(1L), CustomItemList.DATApipe.get(16L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUIV, 4L), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 16L), + GT_ModHandler.getModItem("supersolarpanel", "solarsplitter", 4L, 0) // Solar Light Splitter + }, + new FluidStack(solderUEV, 576), + ItemList.Optically_Compatible_Memory.get(8), + 20 * 20, + 7_864_320, + false); + GT_Values.RA.addCircuitAssemblerRecipe( + new ItemStack[] { GT_ModHandler.getModItem("OpenComputers", "item", 16L, 39), // Memory tier 3.5 + ItemList.Circuit_Chip_Optical.get(1L), CustomItemList.DATApipe.get(64L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMV, 4L), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 32L), + GT_ModHandler.getModItem("supersolarpanel", "solarsplitter", 16L, 0) // Solar Light Splitter + }, + new FluidStack(solderUEV, 1152), + ItemList.Optically_Compatible_Memory.get(32), + 20 * 20, + 31_457_280, + false); // Optical Processor GT_Values.RA.addCircuitAssemblerRecipe( @@ -4625,7 +4649,7 @@ public class DreamCraftRecipeLoader { new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 1L), ItemList.Electric_Motor_UIV.get(1L), GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TranscendentMetal, 16L), - ItemList.Gravistar.get(32L), new Object[] { OrePrefixes.circuit.get(Materials.Nano), 4L }, + ItemList.Gravistar.get(32L), new Object[] { OrePrefixes.circuit.get(Materials.Optical), 4L }, getModItem("miscutils", "itemFoilArceusAlloy2B", 64, 0), getModItem("miscutils", "itemFoilLafiumCompound", 64, 0), getModItem("miscutils", "itemFoilCinobiteA243", 64, 0), @@ -4649,7 +4673,7 @@ public class DreamCraftRecipeLoader { new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 1L), ItemList.Electric_Motor_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 8L), - ItemList.Gravistar.get(32), new Object[] { OrePrefixes.circuit.get(Materials.Nano), 4L }, + ItemList.Gravistar.get(32), new Object[] { OrePrefixes.circuit.get(Materials.Optical), 4L }, getModItem("miscutils", "itemFoilArceusAlloy2B", 64, 0), getModItem("miscutils", "itemFoilLafiumCompound", 64, 0), getModItem("miscutils", "itemFoilCinobiteA243", 64, 0), -- cgit From d7908e21d5bc9b236d64ba5de40bd79286e440db Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Tue, 31 Jan 2023 20:02:15 +0100 Subject: bs --- build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index fe8a2e7be2..e2e8960ee9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1675110695 +//version: 1675173326 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -66,7 +66,7 @@ plugins { id 'com.diffplug.spotless' version '6.7.2' apply false id 'com.modrinth.minotaur' version '2.+' apply false id 'com.matthewprenger.cursegradle' version '1.4.0' apply false - id 'com.gtnewhorizons.retrofuturagradle' version '1.1.2' + id 'com.gtnewhorizons.retrofuturagradle' version '1.1.3' } boolean settingsupdated = verifySettingsGradle() settingsupdated = verifyGitAttributes() || settingsupdated @@ -743,6 +743,7 @@ idea { module { downloadJavadoc = true downloadSources = true + inheritOutputDirs = true } project { settings { -- cgit From 8a10c482318b7e84e5cbcc92806a01bc93b1aec5 Mon Sep 17 00:00:00 2001 From: GDCloud Date: Fri, 3 Feb 2023 23:04:06 +0100 Subject: bump dep --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 448666ef81..4999bebfe9 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1') - compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.41.264:dev") + compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.41.266:dev") compile('com.github.GTNewHorizons:ModularUI:1.0.52:dev') compile('com.github.GTNewHorizons:Yamcl:0.5.84:dev') compile('com.github.GTNewHorizons:NotEnoughItems:2.3.24-GTNH:dev') -- cgit From 624040710aa9be9c50a0ee64b17925d338e237e9 Mon Sep 17 00:00:00 2001 From: GDCloud Date: Fri, 3 Feb 2023 23:12:51 +0100 Subject: UEV Cap Battery --- .../dreamcraft/DreamCraftRecipeLoader.java | 25 +++++++++++++++++++++- 1 file changed, 24 insertions(+), 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 76ee23536e..4ce5475837 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 @@ -3140,6 +3140,7 @@ public class DreamCraftRecipeLoader { 500000); // Batteries + // Ultimate Battery TT_recipeAdder.addResearchableAssemblylineRecipe( ItemList.Energy_Cluster.get(1L), 12000, @@ -3160,7 +3161,7 @@ public class DreamCraftRecipeLoader { ItemList.ZPM2.get(1), 3000, 400000); - + // Really Ultimate Battery TT_recipeAdder.addResearchableAssemblylineRecipe( ItemList.ZPM2.get(1L), 24000, @@ -3182,6 +3183,28 @@ public class DreamCraftRecipeLoader { ItemList.ZPM3.get(1), 4000, 1600000); + // Extremely Ultimate Battery + TT_recipeAdder.addResearchableAssemblylineRecipe( + ItemList.ZPM3.get(1L), + 1200000, + 128, + 8000000, + 16, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.InfinityCatalyst, 32L), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.InfinityCatalyst, 32L), + new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, ItemList.ZPM3.get(8), + ItemList.Field_Generator_UEV.get(4), ItemList.Circuit_Wafer_PPIC.get(64), + ItemList.Circuit_Wafer_PPIC.get(64), ItemList.Circuit_Wafer_SoC2.get(64), + ItemList.Circuit_Parts_DiodeXSMD.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUEV, 64), }, + new FluidStack[] { new FluidStack(solderUEV, 9216), Materials.Quantium.getMolten(18_432), + Materials.Naquadria.getMolten(9_216 * 2), Materials.SuperCoolant.getFluid(64_000) }, + ItemList.ZPM4.get(1), + 250 * 20, + 6_400_000); if (Loader.isModLoaded(Reference.GTPLUSPLUS)) { // MK4 Computer -- cgit From 44250891a24c818112e3214f042c348cfb7750d8 Mon Sep 17 00:00:00 2001 From: GDCloud Date: Sun, 5 Feb 2023 00:17:54 +0100 Subject: 1-step ZPM Lapo --- .../dreamcraft/DreamCraftRecipeLoader.java | 26 ++++++++++++++++++++++ 1 file changed, 26 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 4ce5475837..d2b24e70a5 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 @@ -3140,6 +3140,32 @@ public class DreamCraftRecipeLoader { 500000); // Batteries + // Alternate Energy Module Recipe + TT_recipeAdder.addResearchableAssemblylineRecipe( + ItemList.Energy_LapotronicOrb2.get(1L), + 128000, + 64, + 2_000_000, + 16, + new Object[] { ItemList.Circuit_Board_Wetware_Extreme.get(1), + new Object[] { OrePrefixes.foil.get(Materials.Bedrockium), 64L }, + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 }, + ItemList.Circuit_Parts_Crystal_Chip_Master.get(64L), + ItemList.Circuit_Parts_Crystal_Chip_Master.get(64L), ItemList.Circuit_Chip_UHPIC.get(64L), + new ItemStack[] { ItemList.Circuit_Parts_DiodeASMD.get(64L), + ItemList.Circuit_Parts_DiodeXSMD.get(8L) }, + new ItemStack[] { ItemList.Circuit_Parts_CapacitorASMD.get(64L), + ItemList.Circuit_Parts_CapacitorXSMD.get(8L) }, + new ItemStack[] { ItemList.Circuit_Parts_ResistorASMD.get(64L), + ItemList.Circuit_Parts_ResistorXSMD.get(8L) }, + new ItemStack[] { ItemList.Circuit_Parts_TransistorASMD.get(64L), + ItemList.Circuit_Parts_TransistorXSMD.get(8L) }, + getModItem("miscutils", "itemFineWireHypogen", 48, 0) }, + new FluidStack[] { new FluidStack(solderUEV, 720) }, + ItemList.Energy_Module.get(1), + 50 * 20, + 320_000); + // Ultimate Battery TT_recipeAdder.addResearchableAssemblylineRecipe( ItemList.Energy_Cluster.get(1L), -- cgit From f685bc16d54b11ca96700a653ff42fbe86c0bb62 Mon Sep 17 00:00:00 2001 From: GDCloud Date: Sun, 5 Feb 2023 18:41:33 +0100 Subject: Number formatting --- .../tectech/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 d2b24e70a5..8598928433 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 @@ -3143,7 +3143,7 @@ public class DreamCraftRecipeLoader { // Alternate Energy Module Recipe TT_recipeAdder.addResearchableAssemblylineRecipe( ItemList.Energy_LapotronicOrb2.get(1L), - 128000, + 128_000, 64, 2_000_000, 16, @@ -3212,9 +3212,9 @@ public class DreamCraftRecipeLoader { // Extremely Ultimate Battery TT_recipeAdder.addResearchableAssemblylineRecipe( ItemList.ZPM3.get(1L), - 1200000, + 1_200_000, 128, - 8000000, + 8_000_000, 16, new Object[] { GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.InfinityCatalyst, 32L), GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.InfinityCatalyst, 32L), -- cgit