diff options
| -rw-r--r-- | build.gradle | 27 | ||||
| -rw-r--r-- | dependencies.gradle | 10 | ||||
| -rw-r--r-- | src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java | 39 |
3 files changed, 45 insertions, 31 deletions
diff --git a/build.gradle b/build.gradle index 6243482331..3fa171e0dd 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1683056771 +//version: 1683705740 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -69,10 +69,10 @@ plugins { id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version id 'com.modrinth.minotaur' version '2.+' apply false id 'com.matthewprenger.cursegradle' version '1.4.0' apply false - id 'com.gtnewhorizons.retrofuturagradle' version '1.3.7' + id 'com.gtnewhorizons.retrofuturagradle' version '1.3.11' } -print("You might want to check out './gradlew :faq' if your build fails.") +print("You might want to check out './gradlew :faq' if your build fails.\n") boolean settingsupdated = verifySettingsGradle() settingsupdated = verifyGitAttributes() || settingsupdated @@ -222,6 +222,8 @@ if (enableModernJavaSyntax.toBoolean()) { dependencies { annotationProcessor 'com.github.bsideup.jabel:jabel-javac-plugin:1.0.0' + // workaround for https://github.com/bsideup/jabel/issues/174 + annotationProcessor 'net.java.dev.jna:jna-platform:5.13.0' compileOnly('com.github.bsideup.jabel:jabel-javac-plugin:1.0.0') { transitive = false // We only care about the 1 annotation class } @@ -567,9 +569,10 @@ repositories { def mixinProviderGroup = "io.github.legacymoddingmc" def mixinProviderModule = "unimixins" -def mixinProviderVersion = "0.1.6" +def mixinProviderVersion = "0.1.7.1" def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}" def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev" +ext.mixinProviderSpec = mixinProviderSpec dependencies { if (usesMixins.toBoolean()) { @@ -820,6 +823,18 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { } this.classpath(project.java17DependenciesCfg) } + + public void setup(Project project) { + super.setup(project) + if (project.usesMixins.toBoolean()) { + this.extraJvmArgs.addAll(project.provider(() -> { + def mixinCfg = project.configurations.detachedConfiguration(project.dependencies.create(project.mixinProviderSpec)) + mixinCfg.canBeConsumed = false + mixinCfg.transitive = false + enableHotswap ? ["-javaagent:" + mixinCfg.singleFile.absolutePath] : [] + })) + } + } } def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Distribution.CLIENT, "runClient") @@ -1264,7 +1279,9 @@ tasks.register('faq') { print("If your build fails to fetch dependencies, they might have been deleted and replaced by newer " + "versions.\nCheck if the versions you try to fetch are still on the distributing sites.\n" + "The links can be found in repositories.gradle and build.gradle:repositories, " + - "not build.gradle:buildscript.repositories - this one is for gradle plugin metadata.") + "not build.gradle:buildscript.repositories - this one is for gradle plugin metadata.\n\n" + + "If your build fails to recognize the syntax of new Java versions, enable Jabel in your " + + "gradle.properties. See how it's done in GTNH ExampleMod/gradle.properties.") } } diff --git a/dependencies.gradle b/dependencies.gradle index edf7c1004f..9a1b62a01d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -16,4 +16,14 @@ dependencies { compileOnly('curse.maven:cofh-lib-220333:2388748') {transitive=false} compileOnly('curse.maven:computercraft-67504:2269339') {transitive=false} compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive=false} + compileOnly("curse.maven:extra-utilities-225561:2264384") {transitive = false} + + // for testing EOH recipes + //runtimeOnlyNonPublishable("TGregworks:TGregworks:1.7.10-GTNH-1.0.23:deobf") + //runtimeOnlyNonPublishable('com.github.GTNewHorizons:TinkersConstruct:1.9.31-GTNH:dev') + //runtimeOnlyNonPublishable('com.github.GTNewHorizons:NewHorizonsCoreMod:2.1.18:dev') + //runtimeOnlyNonPublishable('com.github.GTNewHorizons:GoodGenerator:0.6.2:dev') { + // exclude group: "com.github.GTNewHorizons", module: "TecTech" + //} + //runtimeOnlyNonPublishable("curse.maven:extra-utilities-225561:2264384") {transitive = false} } diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java index 4b395f8f71..d3cd23d749 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java @@ -34,6 +34,7 @@ import net.minecraftforge.fluids.FluidStack; import com.github.technus.tectech.recipe.TT_recipeAdder; import com.github.technus.tectech.thing.CustomItemList; +import com.rwtema.extrautils.ExtraUtils; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; @@ -54,10 +55,9 @@ public class ResearchStationAssemblyLine implements Runnable { itemPartsUIVAsslineRecipes(); itemPartsUMVAsslineRecipes(); itemPartsUXVAsslineRecipes(); - addWirelessEnergyRecipes(); - if (TinkersGregworks.isModLoaded()) { + if (TinkersGregworks.isModLoaded() && GoodGenerator.isModLoaded() && ExtraUtilities.isModLoaded()) { addEOHRecipes(); } @@ -2586,14 +2586,18 @@ public class ResearchStationAssemblyLine implements Runnable { } private void addEOHRecipes() { - Fluid solderUEV = FluidRegistry.getFluid("molten.mutatedlivingsolder") != null ? FluidRegistry.getFluid("molten.mutatedlivingsolder") : FluidRegistry.getFluid("molten.solderingalloy"); - - ItemStack largeShirabonPlate = TinkersGregworks.isModLoaded() - ? TGregUtils.newItemStack(Materials.get("Shirabon"), PartTypes.LargePlate, 1) - : GT_OreDictUnificator.get("plateDenseShirabon", 1); + ItemStack largeShirabonPlate = TGregUtils.newItemStack(Materials.get("Shirabon"), PartTypes.LargePlate, 1); + ItemStack largeInfinityPlate = TGregUtils.newItemStack(Materials.Infinity, PartTypes.LargePlate, 1); + ItemStack largeBedrockiumPlate = getModItem( + TinkerConstruct.ID, + "heavyPlate", + 1, + ExtraUtils.tcon_bedrock_material_id); + ItemStack largeCosmicNeutroniumPlate = TGregUtils + .newItemStack(Materials.CosmicNeutronium, PartTypes.LargePlate, 1); final FluidStack[] specialFluid = new FluidStack[] { MaterialsUEVplus.SpaceTime.getMolten(1_440), MaterialsUEVplus.SpaceTime.getMolten(1_440), MaterialsUEVplus.SpaceTime.getMolten(1_440), @@ -2666,16 +2670,7 @@ public class ResearchStationAssemblyLine implements Runnable { getModItem(Avaritia.ID, "Resource_Block", 64, 0), GT_OreDictUnificator.get(OrePrefixes.block, Materials.Neutronium, 64), GT_OreDictUnificator.get(OrePrefixes.nanite, Materials.Neutronium, 48), - - // Large Bedrockium Plate - getModItem(TinkerConstruct.ID, "heavyPlate", 1, 315), - // Large Cosmic Neutronium Plate - getModItem(TinkerConstruct.ID, "heavyPlate", 1, 1671), - // Large Shirabon Plate - largeShirabonPlate, - // Large Infinity Plate - getModItem(TinkerConstruct.ID, "heavyPlate", 1, 1669), - + largeBedrockiumPlate, largeCosmicNeutroniumPlate, largeShirabonPlate, largeInfinityPlate, // UV Solar panel getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", 1, 0), ItemList.Quantum_Chest_IV.get(1), @@ -3158,16 +3153,8 @@ public class ResearchStationAssemblyLine implements Runnable { getModItem(Avaritia.ID, "Resource_Block", 64, 0), GT_OreDictUnificator.get(OrePrefixes.block, Materials.Neutronium, 64), GT_OreDictUnificator.get(OrePrefixes.nanite, Materials.Neutronium, 48), - // Large Bedrockium Plate - getModItem(TinkerConstruct.ID, "heavyPlate", 1, 315), - // Large Cosmic Neutronium Plate - getModItem(TinkerConstruct.ID, "heavyPlate", 1, 1671), - // Large Shirabon Plate - largeShirabonPlate, - // Large Infinity Plate - getModItem(TinkerConstruct.ID, "heavyPlate", 1, 1669), - + largeBedrockiumPlate, largeCosmicNeutroniumPlate, largeShirabonPlate, largeInfinityPlate, // UV Solar panel getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", 1, 0), // Ultimate Time Anomaly. |