Move GameProfile validation into a kotlin utils file for cleaner code

CaelTheColher · CaelTheColher · commit ebe0a18b9cd3 · 2025-07-27T16:52:00.000-03:00
diff --git a/common/src/main/java/me/cael/capes/mixins/MixinPlayerListEntry.java b/common/src/main/java/me/cael/capes/mixins/MixinPlayerListEntry.java
@@ -1,27 +1,20 @@
 package me.cael.capes.mixins;
 
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParser;
-import com.google.gson.JsonSyntaxException;
 import com.mojang.authlib.GameProfile;
-import com.mojang.authlib.properties.Property;
 import me.cael.capes.CapeConfig;
 import me.cael.capes.Capes;
 import me.cael.capes.handler.PlayerHandler;
+import me.cael.capes.util.UtilsKt;
 import net.minecraft.client.network.PlayerListEntry;
 import net.minecraft.client.util.SkinTextures;
 import net.minecraft.util.Identifier;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-import java.util.Optional;
 import java.util.function.Supplier;
 
 @Mixin(PlayerListEntry.class)
@@ -30,14 +23,14 @@ public abstract class MixinPlayerListEntry {
 
     @Inject(method = "texturesSupplier", at = @At("HEAD"))
     private static void loadTextures(GameProfile profile, CallbackInfoReturnable<Supplier<SkinTextures>> cir) {
-        if (capes$isValidProfile(profile)) {
+        if (UtilsKt.isValidProfile(profile)) {
             PlayerHandler.Companion.onLoadTexture(profile);
         }
     }
 
     @Inject(method = "getSkinTextures", at = @At("TAIL"), cancellable = true)
     private void getCapeTexture(CallbackInfoReturnable<SkinTextures> cir) {
-        if (!capes$isValidProfile(profile)) return;
+        if (!UtilsKt.isValidProfile(profile)) return;
         PlayerHandler handler = PlayerHandler.Companion.fromProfile(profile);
         if (handler.getHasCape()) {
             CapeConfig config = Capes.INSTANCE.getCONFIG();
@@ -52,25 +45,4 @@ private void getCapeTexture(CallbackInfoReturnable<SkinTextures> cir) {
         }
     }
 
-    @Unique
-    private static boolean capes$isValidProfile(GameProfile profile) {
-        Optional<Property> property = profile.getProperties().get("textures").stream().findFirst();
-        if (property.isEmpty()) return false;
-
-        String textures = property.get().value();
-        String json = new String(Base64.getDecoder().decode(textures), StandardCharsets.UTF_8);
-        JsonElement root;
-        try {
-            root = JsonParser.parseString(json);
-        } catch (JsonSyntaxException e) {
-            return false;
-        }
-        if (!root.isJsonObject()) return false;
-        JsonElement element = root.getAsJsonObject().get("profileName");
-        if (element == null || element.isJsonNull()) return false;
-
-        String profileName = element.getAsString();
-        return profile.getId().version() == 4 || (profile.getId().version() == 2 && profile.getName().equals(profileName));
-    }
-
 }
diff --git a/common/src/main/kotlin/me/cael/capes/util/Utils.kt b/common/src/main/kotlin/me/cael/capes/util/Utils.kt
@@ -0,0 +1,16 @@
+package me.cael.capes.util
+
+import com.google.gson.JsonParser
+import com.mojang.authlib.GameProfile
+import java.nio.charset.StandardCharsets
+import java.util.*
+
+fun GameProfile.isValidProfile(): Boolean {
+    val profileName = runCatching {
+        val textures = this.properties.get("textures").stream().findFirst().get().value
+        val json = String(Base64.getDecoder().decode(textures), StandardCharsets.UTF_8)
+        JsonParser.parseString(json).asJsonObject.get("profileName").asString
+    }.getOrNull() ?: return false
+
+    return this.id.version() == 4 || (this.id.version() == 2 && this.name == profileName)
+}
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ neoforge_yarn_mappings=1.21+build.4
 enabled_platforms=fabric
 
 archives_base_name=capes
-mod_version=1.5.8+1.21.8
+mod_version=1.5.9+1.21.8
 maven_group=me.capes
 
 fabric_loader_version=0.16.14
