diff --git a/build.gradle b/build.gradle index 87ac5ca..95cab75 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,5 @@ -// For those who want the bleeding edge -buildscript { - repositories { - mavenCentral() - maven { url = 'https://maven.minecraftforge.net' } - } - dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true - } -} - plugins { + id 'net.minecraftforge.gradle' version '[6.0,6.2)' id 'com.diffplug.spotless' version '5.14.3' } @@ -181,7 +171,7 @@ jar { task deobfJar(type: Jar) { from sourceSets.main.output - classifier = 'deobf' + archiveClassifier.set('deobf') manifest { attributes([ "Specification-Title": "${project.name}", diff --git a/gradle.properties b/gradle.properties index 9e4562e..0e8346d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,12 +1,12 @@ mod_version=1.0.0 -minecraft_version=1.19.4 -forge_version=45.0.50 -cyclopscore_version=1.18.2-309 -integrateddynamics_version=1.19.4-1.16.2-540 -integratedtunnels_version=1.19.4-1.8.18-195 +minecraft_version=1.20.1 +forge_version=47.0.1 +cyclopscore_version=1.18.4-340 +integrateddynamics_version=1.20.1-1.16.7-575 +integratedtunnels_version=1.20.1-1.8.20-214 release_type=release -commoncapabilities_version=1.19.4-2.9.0-92 +commoncapabilities_version=1.20.1-2.9.0-98 # Workaround for Spotless bug # https://github.com/diffplug/spotless/issues/834 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e750102..37aef8d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..a30364e --- /dev/null +++ b/settings.gradle @@ -0,0 +1,13 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven { + name = 'MinecraftForge' + url = 'https://maven.minecraftforge.net/' + } + } +} + +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' +} diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index be09e97..ff2ffd5 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[45,)" +loaderVersion="[47,)" issueTrackerURL="https://github.com/CyclopsMC/IntegratedTunnels-Compat/issues" displayURL="https://www.curseforge.com/minecraft/mc-mods/integrated-tunnels" license="MIT" @@ -15,7 +15,7 @@ Integrated Tunnels compatibility with other mods. [[dependencies.integratedtunnelscompat]] modId="cyclopscore" mandatory=true - versionRange="[1.18.2,)" + versionRange="[1.18.4,)" ordering="NONE" side="BOTH" [[dependencies.integratedtunnelscompat]] @@ -27,12 +27,12 @@ Integrated Tunnels compatibility with other mods. [[dependencies.integratedtunnelscompat]] modId="forge" mandatory=true - versionRange="[45.0.50,)" + versionRange="[47.0.1,)" ordering="NONE" side="BOTH" [[dependencies.integratedtunnelscompat]] modId="minecraft" mandatory=true - versionRange="[1.19.4,]" + versionRange="[1.20.1,]" ordering="NONE" side="BOTH" diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 90831be..d0c3888 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,8 +1,8 @@ { "pack": { "description": "integratedtunnelscompat resources", - "pack_format": 12, - "forge:resource_pack_format": 12, - "forge:data_pack_format": 10 + "pack_format": 15, + "forge:resource_pack_format": 15, + "forge:data_pack_format": 15 } }