Update to 1.20.6

CommunityRadarGG · Jun 28, 2024 · 726dd69 · 726dd69
1 parent f2c5ee5
commit 726dd69
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
       - name: Grant execute permission for gradlew

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -48,7 +48,7 @@ dependencies {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
     withSourcesJar()
     // withJavadocJar()
@@ -67,7 +67,7 @@ tasks {
 
     withType<JavaCompile> {
         options.encoding = Charsets.UTF_8.name()
-        options.release.set(17)
+        options.release.set(21)
     }
 
     withType<Javadoc> {

diff --git a/gradle.properties b/gradle.properties
@@ -18,14 +18,14 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.20.4
-yarn_mappings=1.20.4+build.3
+minecraft_version=1.20.6
+yarn_mappings=1.20.6+build.3
 loader_version=0.15.11
 
 # Mod Properties
-mod_version=1.0.1-SNAPSHOT+1.20.4
+mod_version=0.1.0+1.20.6
 maven_group=io.github.communityradargg.fabric
 archives_base_name=communityradar-fabric
 
 # Dependencies
-fabric_version=0.97.1+1.20.4
+fabric_version=0.100.4+1.20.6
diff --git a/src/main/java/io/github/communityradargg/fabric/mixin/ChatHudMixin.java b/src/main/java/io/github/communityradargg/fabric/mixin/ChatHudMixin.java
@@ -43,7 +43,7 @@ public abstract class ChatHudMixin {
      * @param text The original chat message text to modify.
      * @return Returns the modified local variable.
      */
-    @ModifyVariable(method = "addMessage(Lnet/minecraft/text/Text;Lnet/minecraft/network/message/MessageSignatureData;ILnet/minecraft/client/gui/hud/MessageIndicator;Z)V", at = @At(value = "HEAD"), index = 1, argsOnly = true)
+    @ModifyVariable(method = "addMessage(Lnet/minecraft/text/Text;Lnet/minecraft/network/message/MessageSignatureData;Lnet/minecraft/client/gui/hud/MessageIndicator;)V", at = @At(value = "HEAD"), index = 1, argsOnly = true)
     private Text modifyChatMessages(final Text text) {
         if (!Utils.isOnGrieferGames()) {
             return text;

diff --git a/src/main/java/io/github/communityradargg/fabric/mixin/PlayerEntityRendererMixin.java b/src/main/java/io/github/communityradargg/fabric/mixin/PlayerEntityRendererMixin.java
@@ -36,7 +36,7 @@ public abstract class PlayerEntityRendererMixin {
      * @param abstractClientPlayerEntity The needed local variable of the player entity.
      * @return Returns the modified local variable.
      */
-    @ModifyVariable(method = "renderLabelIfPresent(Lnet/minecraft/client/network/AbstractClientPlayerEntity;Lnet/minecraft/text/Text;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V", at = @At(value = "HEAD"), index = 2, argsOnly = true)
+    @ModifyVariable(method = "renderLabelIfPresent(Lnet/minecraft/client/network/AbstractClientPlayerEntity;Lnet/minecraft/text/Text;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IF)V", at = @At(value = "HEAD"), index = 2, argsOnly = true)
     private Text modifyPlayerNameTag(final Text text, final @Local(index = 1, argsOnly = true) AbstractClientPlayerEntity abstractClientPlayerEntity) {
         if (!Utils.isOnGrieferGames()) {
             return text;

diff --git a/src/main/java/io/github/communityradargg/fabric/radarlistmanager/RadarList.java b/src/main/java/io/github/communityradargg/fabric/radarlistmanager/RadarList.java
@@ -26,7 +26,7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.net.URL;
+import java.net.URI;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -185,7 +185,7 @@ public void saveList() {
      * Loads a public list.
      */
     private void loadPublicList() {
-        try (final BufferedReader reader = new BufferedReader(new InputStreamReader(new URL(this.url).openStream()))) {
+        try (final BufferedReader reader = new BufferedReader(new InputStreamReader(URI.create(url).toURL().openStream()))) {
             final List<RadarListEntry> players = RadarListManager.getGson()
                     .fromJson(reader, new TypeToken<List<RadarListEntry>>() {}.getType());
             players.forEach(this::loadRadarListEntry);

diff --git a/src/main/resources/communityradar.mixins.json b/src/main/resources/communityradar.mixins.json
@@ -1,7 +1,7 @@
 {
     "required": true,
     "package": "io.github.communityradargg.fabric.mixin",
-    "compatibilityLevel": "JAVA_17",
+    "compatibilityLevel": "JAVA_21",
     "injectors": {
         "defaultRequire": 1
     },

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -25,8 +25,8 @@
 	],
 	"depends": {
 		"fabricloader": ">=0.15.11",
-		"minecraft": "~1.20.4",
-		"java": ">=17",
+		"minecraft": "~1.20.6",
+		"java": ">=21",
 		"fabric-api": "*"
 	}
 }