From 0d64612fcddc8ba5f777001fa7bf4c4b15dec5a0 Mon Sep 17 00:00:00 2001 From: bombcar Date: Mon, 8 Jan 2024 09:34:09 -0600 Subject: [PATCH 1/2] add required hard dependency on cofhlib --- dependencies.gradle | 10 +++++----- src/main/java/crazypants/enderio/EnderIO.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 139c441ad7..6c2f21dc25 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,11 +1,11 @@ // Add your dependencies here dependencies { - api('com.github.GTNewHorizons:EnderCore:0.3.0:dev') - implementation('com.github.GTNewHorizons:ForestryMC:4.7.1:dev') - implementation('com.github.GTNewHorizons:NotEnoughItems:2.4.13-GTNH:dev') - implementation("com.github.GTNewHorizons:GTNHLib:0.0.13:dev") - api('com.github.GTNewHorizons:BuildCraft:7.1.38:dev') + api('com.github.GTNewHorizons:EnderCore:0.3.0:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:ForestryMC:4.7.1:dev') + compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.4.13-GTNH:dev') + compileOnly("com.github.GTNewHorizons:GTNHLib:0.0.13:dev") + compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.38:dev') api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748 shadowImplementation('cglib:cglib-nodep:3.3.0') diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 4890cfcb4b..7668c638fb 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -186,7 +186,7 @@ modid = MODID, name = MOD_NAME, version = VERSION, - dependencies = "after:endercore;after:MineFactoryReloaded;after:Forestry;after:Waila@[1.5.8,);after:Thaumcraft;after:appliedenergistics2@[rv2-beta-8,);after:chisel", + dependencies = "required-after:CoFHLib@(1.0.3B3,);after:endercore;after:MineFactoryReloaded;after:Forestry;after:Waila@[1.5.8,);after:Thaumcraft;after:appliedenergistics2@[rv2-beta-8,);after:chisel", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO") public class EnderIO { From ae61e572f53be4f34d9d4cf1a7be4bb1fd44838e Mon Sep 17 00:00:00 2001 From: bombcar Date: Mon, 8 Jan 2024 09:40:45 -0600 Subject: [PATCH 2/2] update bs, dependencies, and settings.gradle --- build.gradle | 33 ++++++++++++++------------------- dependencies.gradle | 12 ++++++------ settings.gradle | 9 ++++----- 3 files changed, 24 insertions(+), 30 deletions(-) diff --git a/build.gradle b/build.gradle index 50c3291c86..952a3c59be 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1702141377 +//version: 1704650211 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -31,8 +31,7 @@ buildscript { maven { // GTNH RetroFuturaGradle and ASM Fork name "GTNH Maven" - url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" - allowInsecureProtocol = true + url "https://nexus.gtnewhorizons.com/repository/public/" } mavenLocal() } @@ -49,12 +48,12 @@ plugins { id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version, unused, available for addon.gradle id 'com.github.johnrengelman.shadow' version '8.1.1' apply false id 'com.palantir.git-version' version '3.0.0' apply false - id 'de.undercouch.download' version '5.4.0' + id 'de.undercouch.download' version '5.5.0' id 'com.github.gmazzo.buildconfig' version '3.1.0' apply false // Unused, available for addon.gradle 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.26' + id 'com.gtnewhorizons.retrofuturagradle' version '1.3.27' } print("You might want to check out './gradlew :faq' if your build fails.\n") @@ -118,7 +117,7 @@ propertyDefaultIfUnset("forceEnableMixins", false) propertyDefaultIfUnset("channel", "stable") propertyDefaultIfUnset("mappingsVersion", "12") propertyDefaultIfUnset("usesMavenPublishing", true) -propertyDefaultIfUnset("mavenPublishUrl", "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases") +propertyDefaultIfUnset("mavenPublishUrl", "https://nexus.gtnewhorizons.com/repository/releases/") propertyDefaultIfUnset("modrinthProjectId", "") propertyDefaultIfUnset("modrinthRelations", "") propertyDefaultIfUnset("curseForgeProjectId", "") @@ -573,13 +572,15 @@ afterEvaluate { repositories { maven { - name 'Overmind forge repo mirror' - url 'https://gregtech.overminddl1.com/' + name = "GTNH Maven" + url = "https://nexus.gtnewhorizons.com/repository/public/" + // Links for convenience: + // Simple HTML browsing: https://nexus.gtnewhorizons.com/service/rest/repository/browse/releases/ + // Rich web UI browsing: https://nexus.gtnewhorizons.com/#browse/browse:releases } maven { - name = "GTNH Maven" - url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" - allowInsecureProtocol = true + name 'Overmind forge repo mirror' + url 'https://gregtech.overminddl1.com/' } maven { name 'sonatype' @@ -960,8 +961,7 @@ if (usesShadowedDependencies.toBoolean()) { configurations.runtimeElements.outgoing.artifact(tasks.named("shadowJar", ShadowJar)) configurations.apiElements.outgoing.artifact(tasks.named("shadowJar", ShadowJar)) tasks.named("jar", Jar) { - enabled = false - finalizedBy(tasks.shadowJar) + archiveClassifier.set('dev-preshadow') } tasks.named("reobfJar", ReobfuscatedJar) { inputJar.set(tasks.named("shadowJar", ShadowJar).flatMap({it.archiveFile})) @@ -970,11 +970,6 @@ if (usesShadowedDependencies.toBoolean()) { javaComponent.withVariantsFromConfiguration(configurations.shadowRuntimeElements) { skip() } - for (runTask in ["runClient", "runServer", "runClient17", "runServer17"]) { - tasks.named(runTask).configure { - dependsOn("shadowJar") - } - } } ext.publishableDevJar = usesShadowedDependencies.toBoolean() ? tasks.shadowJar : tasks.jar ext.publishableObfJar = tasks.reobfJar @@ -1178,7 +1173,7 @@ publishing { if (usesMavenPublishing.toBoolean() && System.getenv("MAVEN_USER") != null) { maven { url = mavenPublishUrl - allowInsecureProtocol = mavenPublishUrl.startsWith("http://") // Mostly for the GTNH maven + allowInsecureProtocol = mavenPublishUrl.startsWith("http://") credentials { username = System.getenv("MAVEN_USER") ?: "NONE" password = System.getenv("MAVEN_PASSWORD") ?: "NONE" diff --git a/dependencies.gradle b/dependencies.gradle index 6c2f21dc25..f229063a91 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,21 +2,21 @@ dependencies { api('com.github.GTNewHorizons:EnderCore:0.3.0:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:ForestryMC:4.7.1:dev') - compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.4.13-GTNH:dev') + compileOnly('com.github.GTNewHorizons:ForestryMC:4.8.0:dev') + compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.5.0-GTNH:dev') compileOnly("com.github.GTNewHorizons:GTNHLib:0.0.13:dev") compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.38:dev') api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748 shadowImplementation('cglib:cglib-nodep:3.3.0') compileOnly('com.github.GTNewHorizons:waila:1.6.5:api') {transitive = false} - compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-304-GTNH:api') {transitive = false} + compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-306-GTNH:api') {transitive = false} compileOnly('com.github.GTNewHorizons:Baubles:1.0.3:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.06:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.23:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:Railcraft:9.15.3:api') {transitive = false} compileOnly('com.github.GTNewHorizons:StorageDrawers:1.12.2-GTNH:api') {transitive = false} - compileOnly('com.github.GTNewHorizons:Chisel:2.12.3-GTNH:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.0-GTNH:api') {transitive = false} + compileOnly('com.github.GTNewHorizons:Chisel:2.13.2-GTNH:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.3-GTNH:api') {transitive = false} compileOnly('curse.maven:minefactory-reloaded-66672:2366150') // https://www.curseforge.com/minecraft/mc-mods/minefactory-reloaded/files/2366150 compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') compileOnly('curse.maven:ee3-65509:2305023') // https://www.curseforge.com/minecraft/mc-mods/ee3/files/2305023 diff --git a/settings.gradle b/settings.gradle index 01ea5f121a..8a66026e3d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,10 +4,9 @@ pluginManagement { maven { // RetroFuturaGradle name "GTNH Maven" - url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" - allowInsecureProtocol = true + url "https://nexus.gtnewhorizons.com/repository/public/" mavenContent { - includeGroup("com.gtnewhorizons.retrofuturagradle") + includeGroupByRegex("com\\.gtnewhorizons\\..+") } } gradlePluginPortal() @@ -17,8 +16,8 @@ pluginManagement { } plugins { - id 'com.diffplug.blowdryerSetup' version '1.6.0' - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0' // Provides java toolchains + id 'com.diffplug.blowdryerSetup' version '1.7.1' + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0' // Provides java toolchains } blowdryerSetup {