[FF]: Port to 1.20.1

Crystal-Nest · Jul 4, 2023 · ab83775 · ab83775
1 parent 4452fef
commit ab83775
Show file tree

Hide file tree

Showing 15 changed files with 81 additions and 242 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,35 @@ and this project adheres to [Forge Semantic Versioning](https://docs.minecraftfo
 ## [Unreleased]
 - Nothing new.
 
+## [1.20.1-3.2.0.0] - 2023/07/04
+- Port to 1.20.1
+- Add Data Driven Fires, see [#4](https://github.com/Nyphet/soul-fire-d/issues/4) and the related [Wiki page](https://github.com/Nyphet/soul-fire-d/wiki/Data-Driven-Fires).
+- Added new configuration options for enchantments, see [#25](https://github.com/Nyphet/soul-fire-d/issues/25).
+
+## [1.19.4-3.2.0.0] - 2023/07/04
+- Add Data Driven Fires, see [#4](https://github.com/Nyphet/soul-fire-d/issues/4) and the related [Wiki page](https://github.com/Nyphet/soul-fire-d/wiki/Data-Driven-Fires).
+- Added new configuration options for enchantments, see [#25](https://github.com/Nyphet/soul-fire-d/issues/25).
+- This version should be final, unless bugfixes.
+
+## [1.19.3-3.2.0.0] - 2023/07/04
+- Add Data Driven Fires, see [#4](https://github.com/Nyphet/soul-fire-d/issues/4) and the related [Wiki page](https://github.com/Nyphet/soul-fire-d/wiki/Data-Driven-Fires).
+- Added new configuration options for enchantments, see [#25](https://github.com/Nyphet/soul-fire-d/issues/25).
+- This version should be final, unless bugfixes.
+
+## [1.19.2-3.2.0.0] - 2023/07/04
+- Add Data Driven Fires, see [#4](https://github.com/Nyphet/soul-fire-d/issues/4) and the related [Wiki page](https://github.com/Nyphet/soul-fire-d/wiki/Data-Driven-Fires).
+- Added new configuration options for enchantments, see [#25](https://github.com/Nyphet/soul-fire-d/issues/25).
+- This version should be final, unless bugfixes.
+
+## [1.18.2-3.2.0.0] - 2023/07/04
+- Add Data Driven Fires, see [#4](https://github.com/Nyphet/soul-fire-d/issues/4) and the related [Wiki page](https://github.com/Nyphet/soul-fire-d/wiki/Data-Driven-Fires).
+- Added new configuration options for enchantments, see [#25](https://github.com/Nyphet/soul-fire-d/issues/25).
+
+## [1.16.5-3.2.0.0] - 2023/07/04
+- Add Data Driven Fires, see [#4](https://github.com/Nyphet/soul-fire-d/issues/4) and the related [Wiki page](https://github.com/Nyphet/soul-fire-d/wiki/Data-Driven-Fires).
+- Added new configuration options for enchantments, see [#25](https://github.com/Nyphet/soul-fire-d/issues/25).
+- Fabric only: added a new server lifecycle event for datapack syncing, backport of the same Fabric API event of later versions.
+
 ## [1.19.4-3.1.0.0] - 2023/03/18
 - Ported to 1.19.4
 - Changed in-game mod picture.
@@ -236,15 +265,20 @@ So now *this* is the FINAL version. 1.16.5 will not receive further updates.
 
 [Unreleased]: https://github.com/Nyphet/soul-fire-d
 
+[1.20.1-3.2.0.0]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.20.1-3.2.0.0
+
+[1.19.4-3.2.0.0]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.19.4-3.2.0.0
 [1.19.4-3.1.0.0]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.19.4-3.1.0.0
 
+[1.19.3-3.2.0.0]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.19.3-3.2.0.0
 [1.19.3-3.1.0.0]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.19.3-3.1.0.0
 [1.19.3-3.0.1.0]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.19.3-3.0.1.0
 [1.19.3-3.0.0.1]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.19.3-3.0.0.1
 [1.19.3-3.0.0.0]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.19.3-3.0.0.0
 [1.19.3-2.0.0.1]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.19.3-2.0.0.1
 [1.19.3-2.0.0.0]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.19.3-2.0.0.0
 
+[1.19.2-3.2.0.0]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.19.2-3.2.0.0
 [1.19.2-3.1.0.0-final]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.19.2-3.1.0.0-final
 [1.19.2-3.0.1.0]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.19.2-3.0.1.0
 [1.19.2-3.0.0.1]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.19.2-3.0.0.1
@@ -266,6 +300,7 @@ So now *this* is the FINAL version. 1.16.5 will not receive further updates.
 [1.19-1.0.0.1]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.19-1.0.0.1
 [1.19-1.0.0.0]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.19-1.0.0.0
 
+[1.18.2-3.2.0.0]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.18.2-3.2.0.0
 [1.18.2-3.1.0.0]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.18.2-3.1.0.0
 [1.18.2-3.0.1.0]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.18.2-3.0.1.0
 [1.18.2-3.0.0.1]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.18.2-3.0.0.1
@@ -277,6 +312,7 @@ So now *this* is the FINAL version. 1.16.5 will not receive further updates.
 [1.18.2-1.0.0.1]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.18.2-1.0.0.1
 [1.18.2-1.0.0.0]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.18.2-1.0.0.0
 
+[1.16.5-3.2.0.0]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.16.5-3.2.0.0
 [1.16.5-3.1.0.0]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.16.5-3.1.0.0
 [1.16.5-3.0.1.0]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.16.5-3.0.1.0
 [1.16.5-3.0.0.1]: https://github.com/Nyphet/soul-fire-d/releases/tag/v1.16.5-3.0.0.1

diff --git a/fabric/gradle.properties b/fabric/gradle.properties
@@ -5,9 +5,9 @@ org.gradle.daemon = false
 
 # Fabric Properties
   # check these on https://fabricmc.net/develop
-  minecraft_version = 1.19.4
-  yarn_mappings = 1.19.4+build.2
-  loader_version = 0.14.14
+  minecraft_version = 1.20.1
+  yarn_mappings = 1.20.1+build.9
+  loader_version = 0.14.21
   loader = Fabric
 
 # Mod Properties
@@ -19,8 +19,8 @@ org.gradle.daemon = false
   modid_kebab = soul-fire-d
 
 # Dependencies
-  fabric_version = 0.85.0+1.19.4
-  forgeconfigapiport_version = 6.0.1
+  fabric_version = 0.85.0+1.20.1
+  forgeconfigapiport_version = 8.0.0
 
 # Miscellaneous
   github_user = Nyphet

diff --git a/fabric/gradlew b/fabric/gradlew
@@ -85,9 +85,6 @@ done
 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"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# 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"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

diff --git a/...src/main/java/crystalspider/soulfired/api/enchantment/FireTypedFireAspectEnchantment.java b/...src/main/java/crystalspider/soulfired/api/enchantment/FireTypedFireAspectEnchantment.java
@@ -75,9 +75,10 @@ public final class FireTypedFireAspectEnchantment extends FireAspectEnchantment
   }
 
   @Override
+  @SuppressWarnings("resource")
   public void onTargetDamaged(LivingEntity attacker, Entity target, int level) {
     if (!wasLastHitByProjectile(target)) {
-      if (!attacker.world.isClient) {
+      if (!attacker.getWorld().isClient) {
         target.setOnFireFor(level * 4);
       }
       ((FireTypeChanger) target).setFireType(FireManager.ensure(fireType));

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -1,14 +1,10 @@
 buildscript {
-  repositories {
-    maven { url = "https://maven.minecraftforge.net" }
-    mavenCentral()
-  }
   dependencies {
     classpath "org.spongepowered:mixingradle:0.7.+"
   }
 }
 plugins {
-  id 'net.minecraftforge.gradle' version '5.1.+'
+  id 'net.minecraftforge.gradle' version '[6.0,6.2)'
   id "com.modrinth.minotaur" version "2.+"
   id "com.matthewprenger.cursegradle" version "1.4.+"
   id "com.github.breadmoirai.github-release" version "2.4.+"
@@ -101,7 +97,7 @@ mixin {
   config "soulfired.mixins.json"
 }
 
-def resourceTarget = "META-INF/mods.toml"
+def resourceTargets = ["META-INF/mods.toml", 'pack.mcmeta']
 def intoTargets = ["$rootDir/bin/main/"]
 def replaceProperties = [
   modid: modid,
@@ -119,15 +115,15 @@ processResources {
   inputs.properties replaceProperties
   replaceProperties.put "project", project
 
-  filesMatching(resourceTarget) {
+  filesMatching(resourceTargets) {
     expand replaceProperties
   }
 
   intoTargets.each { target ->
     if (file(target).exists()) {
       copy {
         from(sourceSets.main.resources) {
-          include resourceTarget
+          include resourceTargets
           expand replaceProperties
         }
         into target

diff --git a/forge/gradle.properties b/forge/gradle.properties
@@ -4,8 +4,8 @@ org.gradle.jvmargs = -Xmx3G
 org.gradle.daemon = false
 
 # Forge Properties
-  minecraft_version = 1.19.4
-  loader_version = 45
+  minecraft_version = 1.20.1
+  loader_version = 47
   loader = Forge
 
 # Mod Properties
@@ -17,7 +17,7 @@ org.gradle.daemon = false
   modid_kebab = soul-fire-d
 
 # Dependencies
-  forge_subversion = .0.9
+  forge_subversion = .0.43
 
 # Miscellaneous
   github_user = Nyphet

diff --git a/forge/gradle/wrapper/gradle-wrapper.jar b/forge/gradle/wrapper/gradle-wrapper.jar
diff --git a/forge/gradle/wrapper/gradle-wrapper.properties b/forge/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/forge/gradlew b/forge/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/forge/gradlew.bat b/forge/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/forge/settings.gradle b/forge/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'
 }
diff --git a/forge/src/main/java/crystalspider/soulfired/api/compat/Ensorcellation.java b/forge/src/main/java/crystalspider/soulfired/api/compat/Ensorcellation.java
@@ -12,7 +12,7 @@ public final class Ensorcellation {
   private Ensorcellation() {}
 
   /**
-   * TODO: Ensorcellation for 1.19.4 is not available yet.
+   * TODO: Ensorcellation for 1.20.1 is not available yet.
    * Returns whether the given {@link Enchantment} is is an Ensorcellation enchantment incompatible with any {@link FireTypedFireAspectEnchantment}.
    * 
    * @param enchantment

diff --git a/...src/main/java/crystalspider/soulfired/api/enchantment/FireTypedFireAspectEnchantment.java b/...src/main/java/crystalspider/soulfired/api/enchantment/FireTypedFireAspectEnchantment.java
@@ -77,9 +77,10 @@ public final class FireTypedFireAspectEnchantment extends FireAspectEnchantment
   }
 
   @Override
+  @SuppressWarnings("resource")
   public void doPostAttack(LivingEntity attacker, Entity target, int level) {
     if (!wasLastHitByProjectile(target)) {
-      if (!attacker.level.isClientSide) {
+      if (!attacker.level().isClientSide) {
         target.setSecondsOnFire(level * 4);
       }
       ((FireTypeChanger) target).setFireType(FireManager.ensure(fireType));