From 22d2731c8ba4ce31ad406ceef50a7bf60efd8e7a Mon Sep 17 00:00:00 2001
From: soir20 <71418127+soir20@users.noreply.github.com>
Date: Fri, 10 May 2024 22:15:58 -0400
Subject: [PATCH] Update to 1.20.6

---
 build.gradle                                        |  2 +-
 forge/build.gradle                                  |  7 +++++++
 .../animationplugin/forge/EntrypointForge.java      |  3 +--
 gradle.properties                                   | 13 ++++++-------
 gradle/wrapper/gradle-wrapper.properties            |  2 +-
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0db474a..d5a5864 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.2-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
 }
 
 architectury {
diff --git a/forge/build.gradle b/forge/build.gradle
index 43afe78..ccb846f 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -1,3 +1,5 @@
+import net.fabricmc.loom.api.mappings.layered.MappingsNamespace
+
 plugins {
     id "com.github.johnrengelman.shadow" version "7.1.2"
     id "com.matthewprenger.cursegradle" version "1.4.0"
@@ -44,6 +46,11 @@ shadowJar {
 }
 
 remapJar {
+
+    // In 1.20.6+, Forge applies remapping at runtime, so we need to disable
+    // remapping in the output jar.
+    sourceNamespace = MappingsNamespace.INTERMEDIARY.toString()
+
     inputFile.set shadowJar.archiveFile
     dependsOn shadowJar
     archiveClassifier.set "forge"
diff --git a/forge/src/main/java/io/github/moremcmeta/animationplugin/forge/EntrypointForge.java b/forge/src/main/java/io/github/moremcmeta/animationplugin/forge/EntrypointForge.java
index b6078bc..8ced3e8 100644
--- a/forge/src/main/java/io/github/moremcmeta/animationplugin/forge/EntrypointForge.java
+++ b/forge/src/main/java/io/github/moremcmeta/animationplugin/forge/EntrypointForge.java
@@ -21,7 +21,6 @@
 import net.minecraftforge.fml.IExtensionPoint;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.network.NetworkConstants;
 
 /**
  * Mod entrypoint on Forge.
@@ -41,7 +40,7 @@ public EntrypointForge() {
         ModLoadingContext.get().registerExtensionPoint(
                 IExtensionPoint.DisplayTest.class,
                 ()-> new IExtensionPoint.DisplayTest(
-                        () -> NetworkConstants.IGNORESERVERONLY,
+                        () -> IExtensionPoint.DisplayTest.IGNORESERVERONLY,
                         (remoteVersion, isServer)-> true
                 )
         );
diff --git a/gradle.properties b/gradle.properties
index 07ed7ec..a196816 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,20 +17,19 @@
 
 org.gradle.jvmargs=-Xmx2048M
 
-minecraft_version = 1.20.1
+minecraft_version = 1.20.6
 enabled_platforms = fabric,forge
 
-java_version = 17
+java_version = 21
 junit_version = 4.11
 lwjglVersion = 3.2.2
 
 archives_base_name = animation-plugin
-mod_version = 1.0.0
 maven_group = io.github.moremcmeta
 
 # MoreMcmeta version to use for development. If you are not developing a
 # default plugin, use a stable release version instead.
-moremcmeta_version = 1.20.1-4.x-1.20-SNAPSHOT
+moremcmeta_version = 1.20.6-4.x-1.20-SNAPSHOT
 
 # Minimum MoreMcmeta version that users can install. This should be at
 # least 4.0.0 for the corresponding Minecraft version if this plugin is
@@ -38,8 +37,8 @@ moremcmeta_version = 1.20.1-4.x-1.20-SNAPSHOT
 moremcmeta_min_version = *
 
 # Fabric loader and API versions to use for development
-fabric_loader_version = 0.14.18
-fabric_api_version = 0.83.0+1.20.1
+fabric_loader_version = 0.15.11
+fabric_api_version = 0.97.8+1.20.6
 
 # Forge version to use for development
-forge_version = 1.20.1-47.0.1
\ No newline at end of file
+forge_version = 1.20.6-50.0.8
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 59bc51a..17655d0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists