diff options
4 files changed, 137 insertions, 54 deletions
diff --git a/build.gradle b/build.gradle index bab3a3d8dc..d1f370d683 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1673027205 +//version: 1674845916 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -144,6 +144,7 @@ propertyDefaultIfUnset("modrinthProjectId", "") propertyDefaultIfUnset("modrinthRelations", "") propertyDefaultIfUnset("curseForgeProjectId", "") propertyDefaultIfUnset("curseForgeRelations", "") +propertyDefaultIfUnset("minimizeShadowedDependencies", true) String javaSourceDir = "src/main/java/" String scalaSourceDir = "src/main/scala/" @@ -415,7 +416,9 @@ shadowJar { attributes(getManifestAttributes()) } - minimize() // This will only allow shading for actually used classes + if (minimizeShadowedDependencies.toBoolean()) { + minimize() // This will only allow shading for actually used classes + } configurations = [ project.configurations.shadowImplementation, project.configurations.shadowCompile @@ -558,7 +561,9 @@ task shadowDevJar(type: ShadowJar) { attributes(getManifestAttributes()) } - minimize() // This will only allow shading for actually used classes + if (minimizeShadowedDependencies.toBoolean()) { + minimize() // This will only allow shading for actually used classes + } configurations = [ project.configurations.shadowImplementation, project.configurations.shadowCompile @@ -813,7 +818,7 @@ task updateBuildScript { } } -if (!project.getGradle().startParameter.isOffline() && isNewBuildScriptVersionAvailable(projectDir.toString())) { +if (!project.getGradle().startParameter.isOffline() && !Boolean.getBoolean('DISABLE_BUILDSCRIPT_UPDATE_CHECK') && isNewBuildScriptVersionAvailable(projectDir.toString())) { if (autoUpdateBuildScript.toBoolean()) { performBuildScriptUpdate(projectDir.toString()) } else { diff --git a/dependencies.gradle b/dependencies.gradle index b4f477555e..fa80199a22 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.251-pre:dev") + compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.254:dev') compile('com.github.GTNewHorizons:ModularUI:1.0.38:dev') compile('com.github.GTNewHorizons:Yamcl:0.5.84:dev') compile('com.github.GTNewHorizons:NotEnoughItems:2.3.20-GTNH: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 3b7571ab33..a549952c1b 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 @@ -348,7 +348,7 @@ public class DreamCraftRecipeLoader { 128_000_000, 1, new Object[] { - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Nano, 1), + new Object[] {OrePrefixes.circuit.get(Materials.Optical), 1L}, GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SpaceTime, 8), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 8), getModItem("eternalsingularity", "eternal_singularity", 1L), @@ -1177,7 +1177,7 @@ public class DreamCraftRecipeLoader { new ItemStack[] { getItemContainer("Transformer_UMV_UIV").get(1), getItemContainer("Display").get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Nano, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Optical, 2), GT_OreDictUnificator.get( OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Draconium, 4), @@ -3097,12 +3097,12 @@ public class DreamCraftRecipeLoader { 128, 500000, 16, - new ItemStack[] { + new Object[] { CustomItemList.Machine_Multi_EMjunction.get(1), CustomItemList.eM_Computer_Bus.get(4), ItemList.Field_Generator_UV.get(4), ItemList.Sensor_UV.get(4), - getItemContainer("NanoCircuit").get(4), + new Object[] {OrePrefixes.circuit.get(Materials.Optical), 4L}, getItemContainer("MysteriousCrystalLens").get(4), GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Draconium, 4), }, @@ -3333,7 +3333,7 @@ public class DreamCraftRecipeLoader { getItemContainer("Hull_UIV").get(1L), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUIV, 2L), ItemList.Circuit_Chip_QPIC.get(4L), - getItemContainer("NanoCircuit").get(2), + new Object[] {OrePrefixes.circuit.get(Materials.Optical), 2L}, ItemList.UHV_Coil.get(8L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), @@ -3362,7 +3362,7 @@ public class DreamCraftRecipeLoader { getItemContainer("Hull_UIV").get(1L), GT_OreDictUnificator.get(OrePrefixes.spring, Materials.SuperconductorUIVBase, 8L), ItemList.Circuit_Chip_QPIC.get(4L), - getItemContainer("NanoCircuit").get(2), + new Object[] {OrePrefixes.circuit.get(Materials.Optical), 2L}, ItemList.UHV_Coil.get(8L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), @@ -3623,46 +3623,109 @@ public class DreamCraftRecipeLoader { 6000, 2000000); - // GTNH UIV, UMV, UXV Circuits + // Optical Assembly TT_recipeAdder.addResearchableAssemblylineRecipe( - ItemList.Circuit_Biomainframe.get(1L), - 192000, + ItemList.Circuit_OpticalProcessor.get(1L), + 192_000, + 256, + 2_000_000, + 16, + new Object[] { + ItemList.Circuit_Board_Optical.get(1L), + ItemList.Circuit_OpticalProcessor.get(2L), + ItemList.Circuit_Parts_InductorXSMD.get(16L), + ItemList.Circuit_Parts_CapacitorXSMD.get(20L), + ItemList.Circuit_Parts_ResistorXSMD.get(20L), + ItemList.Circuit_Chip_NOR.get(32L), + ItemList.Circuit_Chip_Ram.get(64L), + GT_ModHandler.getModItem( + "bartworks", "gt.bwMetaGeneratedwireFine", 24L, 10101), // Fine Lumiium Wire + new Object[] {OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L}, + }, + new FluidStack[] { + new FluidStack(solderUEV, 1440), + Materials.Radon.getPlasma(1440L), + Materials.SuperCoolant.getFluid(10_000L), + new FluidStack(FluidRegistry.getFluid("oganesson"), 500) + }, + ItemList.Circuit_OpticalAssembly.get(1L), + 20 * 20, + 2_000_000); + + // Optical Computer + TT_recipeAdder.addResearchableAssemblylineRecipe( + ItemList.Circuit_OpticalAssembly.get(1L), + 384_000, 512, - 2000000, + 4_000_000, 32, new Object[] { + ItemList.Circuit_Board_Optical.get(2L), + ItemList.Circuit_OpticalAssembly.get(2L), + ItemList.Circuit_Parts_TransistorXSMD.get(24L), + ItemList.Circuit_Parts_ResistorXSMD.get(24L), + ItemList.Circuit_Parts_CapacitorXSMD.get(24L), + ItemList.Circuit_Parts_DiodeXSMD.get(24L), + ItemList.Circuit_Chip_NOR.get(64L), + ItemList.Circuit_Chip_SoC2.get(32L), + GT_ModHandler.getModItem( + "bartworks", "gt.bwMetaGeneratedwireFine", 32L, 10101), // Fine Lumiium Wire + new Object[] {OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L}, + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 64), + }, + new FluidStack[] { + new FluidStack(solderUEV, 1440 * 2), + Materials.Radon.getPlasma(1440L * 2), + Materials.SuperCoolant.getFluid(10_000L * 2), + new FluidStack(FluidRegistry.getFluid("oganesson"), 500 * 2) + }, + ItemList.Circuit_OpticalComputer.get(1L), + 200 * 20, + 2_000_000); + + // Optical Mainframe + TT_recipeAdder.addResearchableAssemblylineRecipe( + ItemList.Circuit_OpticalComputer.get(1L), + 768_000, + 1024, + 8_000_000, + 64, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 8), - ItemList.Circuit_Biomainframe.get(2L), - ItemList.Circuit_Parts_CapacitorXSMD.get(32L), - ItemList.Circuit_Parts_ResistorXSMD.get(32L), + ItemList.Circuit_OpticalComputer.get(2L), + ItemList.Circuit_Parts_InductorXSMD.get(32L), ItemList.Circuit_Parts_TransistorXSMD.get(32L), + ItemList.Circuit_Parts_ResistorXSMD.get(32L), + ItemList.Circuit_Parts_CapacitorXSMD.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), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 64), + ItemList.Circuit_Chip_SoC2.get(64L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEV, 64), new Object[] {OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L}, + new Object[] {OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L}, + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 64), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 64) }, new FluidStack[] { - new FluidStack(solderUEV, 3744), - Materials.Naquadria.getMolten(4032L), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 20000) + new FluidStack(solderUEV, 1440 * 4), + Materials.Radon.getPlasma(1440L * 4), + Materials.SuperCoolant.getFluid(10_000L * 4), + new FluidStack(FluidRegistry.getFluid("oganesson"), 500 * 4) }, - getItemContainer("NanoCircuit").get(1L), - 8000, - 32_000_000); + ItemList.Circuit_OpticalMainframe.get(1L), + 300 * 20, + 8_000_000); + // GTNH UMV, UXV Circuits TT_recipeAdder.addResearchableAssemblylineRecipe( - getItemContainer("NanoCircuit").get(1L), + ItemList.Circuit_OpticalMainframe.get(1L), 384000, 1024, 4000000, 64, - new ItemStack[] { + new Object[] { ItemList.Circuit_Board_Bio_Ultra.get(1L), getItemContainer("PicoWafer").get(4L), - getItemContainer("NanoCircuit").get(2L), + new Object[] {OrePrefixes.circuit.get(Materials.Optical), 2L}, ItemList.Circuit_Parts_TransistorXSMD.get(48L), ItemList.Circuit_Parts_ResistorXSMD.get(48L), ItemList.Circuit_Parts_CapacitorXSMD.get(48L), @@ -3832,7 +3895,7 @@ public class DreamCraftRecipeLoader { 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), + new Object[] {OrePrefixes.circuit.get(Materials.Optical), 20L}, ItemList.Field_Generator_UEV.get(4), getModItem("eternalsingularity", "eternal_singularity", 4L), getModItem("miscutils", "MU-metaitem.01", 1L, 32105), @@ -4203,7 +4266,7 @@ public class DreamCraftRecipeLoader { 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 Object[] {OrePrefixes.circuit.get(Materials.Optical), 1L} }, new FluidStack[] { Materials.Infinity.getMolten(14400L), Materials.Void.getMolten(115200L), @@ -4645,6 +4708,38 @@ public class DreamCraftRecipeLoader { // region items + // Optically Compatible Memory + GT_Values.RA.addCircuitAssemblerRecipe( + new ItemStack[] { + GT_ModHandler.getModItem("OpenComputers", "item", 1L, 39), // Memory tier 3.5 + ItemList.Circuit_Chip_Optical.get(1L), + CustomItemList.DATApipe.get(4L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEV, 4L), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 8L), + GT_ModHandler.getModItem("supersolarpanel", "solarsplitter", 1L, 0) // Solar Light Splitter + }, + new FluidStack(solderUEV, 288), + ItemList.Optically_Compatible_Memory.get(2), + 20 * 20, + 1_966_080, + false); + + // Optical Processor + GT_Values.RA.addCircuitAssemblerRecipe( + new ItemStack[] { + ItemList.Optically_Perfected_CPU.get(1L), + ItemList.Optically_Compatible_Memory.get(2L), + ItemList.Circuit_Parts_CapacitorXSMD.get(16L), + ItemList.Circuit_Parts_DiodeXSMD.get(16L), + CustomItemList.DATApipe.get(4L), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.EnrichedHolmium, 16) + }, + new FluidStack(solderUEV, 288), + ItemList.Circuit_OpticalProcessor.get(1L), + 20 * 20, + 614400, + true); + // Parametrizer Memory Card GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { @@ -5342,7 +5437,7 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 6L), ItemList.Gravistar.get(8L), ItemList.Emitter_UEV.get(4L), - new Object[] {OrePrefixes.circuit.get(Materials.Nano), 4}, + new Object[] {OrePrefixes.circuit.get(Materials.Optical), 4L}, GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 64L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 64L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 64L), @@ -5476,7 +5571,7 @@ public class DreamCraftRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TranscendentMetal, 6L), ItemList.Electric_Motor_UIV.get(2L), ItemList.Electric_Piston_UIV.get(1L), - new Object[] {OrePrefixes.circuit.get(Materials.Nano), 2L}, + new Object[] {OrePrefixes.circuit.get(Materials.Optical), 2L}, new Object[] {OrePrefixes.circuit.get(Materials.Bio), 4L}, new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 8L}, GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 6L) @@ -5720,7 +5815,7 @@ public class DreamCraftRecipeLoader { ItemList.Electric_Motor_UMV.get(2L), ItemList.Electric_Piston_UMV.get(1L), new Object[] {OrePrefixes.circuit.get(Materials.Piko), 2L}, - new Object[] {OrePrefixes.circuit.get(Materials.Nano), 4L}, + new Object[] {OrePrefixes.circuit.get(Materials.Optical), 4L}, new Object[] {OrePrefixes.circuit.get(Materials.Bio), 8L}, GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 6L) }, @@ -6622,7 +6717,7 @@ public class DreamCraftRecipeLoader { new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 1L}, // UV new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 1L}, // UHV new Object[] {OrePrefixes.circuit.get(Materials.Bio), 1L}, // UEV - new Object[] {OrePrefixes.circuit.get(Materials.Nano), 1L}, // UIV + new Object[] {OrePrefixes.circuit.get(Materials.Optical), 1L}, // UIV new Object[] {OrePrefixes.circuit.get(Materials.Piko), 1L}, // UMV new Object[] {OrePrefixes.circuit.get(Materials.Quantum), 1L}, // UXV new Object[] {OrePrefixes.circuit.get(Materials.Quantum), 4L diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java index b3eea38c87..9961b04fcd 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java @@ -395,23 +395,6 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt * Setting available data processing */ public void outputAfterRecipe_EM() {} - - /** - * to add fluids into hatches - * - * @param mOutputFluids - */ - @Override - protected void addFluidOutputs(FluidStack[] mOutputFluids) { - int min = Math.min(mOutputFluids.length, mOutputHatches.size()); - for (int i = 0; i < min; ++i) { - if (mOutputHatches.get(i) != null - && mOutputFluids[i] != null - && GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(mOutputHatches.get(i))) { - mOutputHatches.get(i).fill(mOutputFluids[i], true); - } - } - } // endregion // region tooltip and scanner result |