Update to 1.21.5

Author: PointerRain

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.7-SNAPSHOT'
+    id 'fabric-loom' version '1.10-SNAPSHOT'
     id 'maven-publish'
 }
 
@@ -23,7 +23,7 @@ repositories {
         url = "https://maven.terraformersmc.com/"
     }
     // ClothConfig
-    maven { url "https://maven.shedaniel.me/" }
+    maven { url = "https://maven.shedaniel.me/" }
 }
 
 loom {
@@ -35,7 +35,6 @@ loom {
             sourceSet sourceSets.client
         }
     }
-
 }
 
 fabricApi {
@@ -60,10 +59,11 @@ dependencies {
 }
 
 processResources {
-    inputs.property "version", project.version
+    def projectVersion = project.version
+    inputs.property "version", projectVersion
 
     filesMatching("fabric.mod.json") {
-        expand "version": project.version
+        expand "version": projectVersion
     }
 }
 
@@ -82,8 +82,9 @@ java {
 }
 
 jar {
+    def archivesBaseName = project.base.archivesName
     from("LICENSE") {
-        rename { "${it}_${project.base.archivesName.get()}" }
+        rename { "${it}_${archivesBaseName.get()}" }
     }
 }
 

gradle.properties

@@ -4,16 +4,16 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.4
-yarn_mappings=1.21.4+build.8
+minecraft_version=1.21.5
+yarn_mappings=1.21.5+build.1
 loader_version=0.16.10
 
 # Mod Properties
-mod_version=1.1.2
+mod_version=1.2.0
 maven_group=com.scnamelink
 archives_base_name=sc-name-link
 
 # Dependencies
-fabric_version=0.115.1+1.21.4
-modmenu_version=11.0.2
-clothconfig_version=16.0.141
+fabric_version=0.119.5+1.21.5
+modmenu_version=13.0.3
+clothconfig_version=18.0.145

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/client/java/golden/scnamelink/NameLinkAPI.java

@@ -94,7 +94,7 @@ public static List<DisplayMapping> getMappings(String source) {
      * @throws URISyntaxException If the API URL is incorrectly formatted.
      */
     private static String loadJsonFromUrl(String source) throws IOException, URISyntaxException {
-        StringBuilder result = new StringBuilder(50000);
+        StringBuilder result = new StringBuilder();
         URL url = new URI(source).toURL();
         int retries = 0;
 
@@ -206,6 +206,7 @@ private static Type getDisplayMappingListType() {
      * - {@code "Success":} Data was successfully fetched from the API.<br>
      * - {@code "Fallback"}: Data was loaded from the cache.<br>
      * - {@code "Failure"}: Both API and cache loading failed.<br>
+     * - {@code "Disabled"}: The mod is disabled in the configuration.
      *
      * @return The current status as a string.
      */

src/client/java/golden/scnamelink/SpooncraftNameLinkClient.java

@@ -150,9 +150,13 @@ public static Text getStyledChat(Text message, boolean replaceName, boolean repl
 
             HoverEvent event = style.getHoverEvent();
             if (event != null) {
-                HoverEvent.EntityContent value = event.getValue(HoverEvent.Action.SHOW_ENTITY);
-                if (value != null && value.name.isPresent()) {
-                    newText = (MutableText) getStyledName(newText, value.uuid, String.valueOf(value.name), replaceName, replaceColour);
+
+                if (event.getAction() == HoverEvent.Action.SHOW_ENTITY) {
+                    HoverEvent.EntityContent entity = ((HoverEvent.ShowEntity) event).entity();
+
+                    newText = (MutableText) getStyledName(newText, entity.uuid,
+                                                          String.valueOf(entity.name),
+                                                          replaceName, replaceColour);
                     newText.setStyle(newText.getStyle().withHoverEvent(event));
                 }
             }

src/client/java/golden/scnamelink/mixin/client/HoverEventMixin.java

@@ -15,7 +15,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
 
@@ -34,14 +33,11 @@ public abstract class HoverEventMixin {
     @Nullable
     private List<Text> tooltip;
 
-    @Inject (method = "asTooltip", at = @At ("HEAD"))
+    @Inject (method = "asTooltip()Ljava/util/List;", at = @At ("HEAD"))
     public @Nullable List<Text> asTooltip(CallbackInfoReturnable<List<Text>> cir) {
         if (this.tooltip == null) {
             this.tooltip = new ArrayList<>();
-            Optional<Text> var10000 = this.name;
-            List<Text> var10001 = this.tooltip;
-            Objects.requireNonNull(var10001);
-            var10000.ifPresent(var10001::add);
+            this.name.ifPresent(this.tooltip::add);
             this.tooltip.add(Text.translatable("gui.entity_tooltip.type",
                                                this.entityType.getName()));
             if (this.entityType == EntityType.PLAYER && this.name.isPresent()) {

src/main/resources/fabric.mod.json

@@ -2,8 +2,8 @@
 	"schemaVersion": 1,
 	"id": "sc-name-link",
 	"version": "${version}",
-	"name": "Spooncraft Name Link",
-	"description": "Links nicknames and name colours with the Mumbo Jumbo Discord server.",
+	"name": "SCNicknamer",
+	"description": "Lightweight client-side nickname mod.",
 	"authors": [
 		"GoldenRedstone"
 	],