diff options
3 files changed, 133 insertions, 21 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/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..86f30e55c4 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 @@ -3623,6 +3623,98 @@ public class DreamCraftRecipeLoader { 6000, 2000000); + // Optical Assembly + TT_recipeAdder.addResearchableAssemblylineRecipe( + 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, + 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_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_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, 1440 * 4), + Materials.Radon.getPlasma(1440L * 4), + Materials.SuperCoolant.getFluid(10_000L * 4), + new FluidStack(FluidRegistry.getFluid("oganesson"), 500 * 4) + }, + ItemList.Circuit_OpticalMainframe.get(1L), + 300 * 20, + 8_000_000); + // GTNH UIV, UMV, UXV Circuits TT_recipeAdder.addResearchableAssemblylineRecipe( ItemList.Circuit_Biomainframe.get(1L), @@ -4645,6 +4737,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), + 10 * 20, + 7_864_320, + 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[] { 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 |