diff --git a/build.gradle b/build.gradle index 577b826..31d011c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,20 +1,27 @@ plugins { + id 'eclipse' + id 'idea' id 'maven-publish' - id 'net.minecraftforge.gradle' version '5.1.+' + id 'net.minecraftforge.gradle' version '[6.0,6.2)' id 'com.matthewprenger.cursegradle' version '1.4.0' id 'com.modrinth.minotaur' version "2.+" } version = "${version}" group = "com.nopoisonregen.main" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = "NMPR-${mc_version}" +base { + archivesName = "NMPR-${mc_version}" +} // Mojang ships Java 16 to end users in 1.17+ instead of Java 8 in 1.16 or lower, so your mod should target Java 16. java.toolchain.languageVersion = JavaLanguageVersion.of(17) -println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch')) +println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}" minecraft { - mappings channel: "${mcp_channel}", version: "${mcp_mappings}" + mappings channel: "${mapping_channel}", version: "${mapping_version}" + + copyIdeResources = true + // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') diff --git a/changelog.md b/changelog.md index e69de29..8ec6271 100644 --- a/changelog.md +++ b/changelog.md @@ -0,0 +1 @@ +* Initial update to 1.20 \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 2a4a1fe..d277cdc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,10 +4,10 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false # Base info -mc_version=1.19.4 -forge_version=45.1.0 -mcp_channel=official -mcp_mappings=1.19.4 +mc_version=1.20 +forge_version=46.0.14 +mapping_channel=official +mapping_version=1.20 #Publishing mod_name=NMPR diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e583..943f0cb 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..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.5.1-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/gradlew b/gradlew index a69d9cb..65dcd68 100644 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/gradlew.bat b/gradlew.bat index f127cfd..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% diff --git a/settings.gradle b/settings.gradle index 3703f36..291d399 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,13 @@ pluginManagement { repositories { gradlePluginPortal() - maven { url = 'https://maven.minecraftforge.net/' } + maven { + name = 'MinecraftForge' + url = 'https://maven.minecraftforge.net/' + } } +} + +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' } \ No newline at end of file diff --git a/src/main/java/com/nopoisonregen/Main.java b/src/main/java/com/nopoisonregen/Main.java index 16ca6d4..2f47713 100644 --- a/src/main/java/com/nopoisonregen/Main.java +++ b/src/main/java/com/nopoisonregen/Main.java @@ -40,7 +40,7 @@ public void isEffectApplicable(MobEffectEvent.Applicable event) { MobEffectInstance effectInstance = event.getEffectInstance(); MobEffect applicableEffect = effectInstance.getEffect(); LivingEntity livingEntity = event.getEntity(); - Level level = livingEntity.level; + Level level = livingEntity.level(); if (!level.isClientSide && !cancelableEffectMap.isEmpty()) { for (Map.Entry entry : cancelableEffectMap.entrySet()) { MobEffect effect1 = entry.getKey(); @@ -77,7 +77,7 @@ public void isEffectApplicable(MobEffectEvent.Applicable event) { @SubscribeEvent public void onLivingTick(LivingEvent.LivingTickEvent event) { LivingEntity livingEntity = event.getEntity(); - Level level = livingEntity.level; + Level level = livingEntity.level(); if (!level.isClientSide && level.getGameTime() % 20 == 0 && !cancelableEffectMap.isEmpty()) { for (Map.Entry entry : cancelableEffectMap.entrySet()) { MobEffect effect1 = entry.getKey(); diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 44c2894..2c2ab71 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="[46,)" license="GNU LGPL V3.0" [[mods]] @@ -14,6 +14,6 @@ This mod makes it so that the potion effects poison and regenration cancel each [[dependencies.nopoisonregen]] modId="minecraft" mandatory=true -versionRange="[1.19.4,1.20)" +versionRange="[1.20,1.21)" ordering="NONE" side="BOTH" diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 9ce3a36..a9f182e 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,8 +1,8 @@ { "pack": { - "description": "NPRM resources", - "pack_format": 13, - "forge:client_resources_pack_format": 13, - "forge:server_data_pack_format": 12 + "description": { + "text": "NPRM resources" + }, + "pack_format": 15 } }