Add GUI for managing player presets plus more improvements

Author: KdGaming0

build.gradle

@@ -23,6 +23,9 @@ repositories {
         name = "Terraformers"
         url = "https://maven.terraformersmc.com/"
     }
+    maven {
+        url 'https://maven.wispforest.io/releases/'
+    }
 }
 
 dependencies {
@@ -36,6 +39,7 @@ dependencies {
     modImplementation include ("maven.modrinth:midnightlib:${project.midnightlib_version}")
 
     modImplementation("com.terraformersmc:modmenu:${project.modmenu_version}")
+    modImplementation "io.wispforest:owo-lib:${project.owo_version}"
 
     implementation 'com.google.code.gson:gson:2.10.1'
 }
@@ -51,12 +55,14 @@ processResources {
     inputs.property "version", project.version
     inputs.property "minecraft_version", project.minecraft_version
     inputs.property "loader_version", project.loader_version
+    inputs.property "owo_version", project.owo_version
     filteringCharset "UTF-8"
 
     filesMatching("fabric.mod.json") {
         expand "version": project.version,
                 "minecraft_version": project.minecraft_version,
-                "loader_version": project.loader_version
+                "loader_version": project.loader_version,
+                "owo_version" : project.owo_version
     }
 }
 

gradle.properties

@@ -6,11 +6,12 @@ minecraft_version=1.21.5
 yarn_mappings=1.21.5+build.1
 loader_version=0.16.14
 # Mod Properties
-mod_version=2.0.0
+mod_version=2.0.0+1.21.5
 maven_group=com.github
 archives_base_name=scaleme
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
 fabric_version=0.127.1+1.21.5
 midnightlib_version = 1.7.3+1.21.4-fabric
 modmenu_version = 14.0.0-rc.2
+owo_version=0.12.21+1.21.5

src/main/java/com/github/kd_gaming1/scaleme/client/command/PresetCommand.java

@@ -2,21 +2,18 @@
 
 import com.github.kd_gaming1.scaleme.client.data.PlayerPreset;
 import com.github.kd_gaming1.scaleme.client.util.PlayerPresetManager;
+import com.github.kd_gaming1.scaleme.client.util.PlayerUUIDResolver;
 import com.github.kd_gaming1.scaleme.config.ScaleMeConfig;
-import com.mojang.authlib.GameProfile;
-import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.FloatArgumentType;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.text.Text;
 
 import java.util.List;
 import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
 
 import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.*;
 
@@ -32,36 +29,14 @@ public static void register() {
                     .then(literal("add")
                             .then(argument("player", StringArgumentType.string())
                                     .then(argument("scale", FloatArgumentType.floatArg(0.1f, 10.0f))
-                                            .executes(ctx -> executeAdd(ctx, null))
-                                            .then(argument("category", StringArgumentType.string())
-                                                    .executes(ctx -> executeAdd(ctx, StringArgumentType.getString(ctx, "category")))))))
+                                            .executes(PresetCommand::executeAdd))))
 
                     .then(literal("remove")
                             .then(argument("player", StringArgumentType.string())
                                     .executes(PresetCommand::executeRemove)))
 
                     .then(literal("list")
                             .executes(ctx -> executeList(ctx, null))
-                            .then(argument("category", StringArgumentType.string())
-                                    .executes(ctx -> executeList(ctx, StringArgumentType.getString(ctx, "category")))))
-
-                    .then(literal("category")
-                            .then(literal("list")
-                                    .executes(PresetCommand::executeListCategories))
-                            .then(literal("rename")
-                                    .then(argument("old_name", StringArgumentType.string())
-                                            .then(argument("new_name", StringArgumentType.string())
-                                                    .executes(PresetCommand::executeRenameCategory))))
-                            .then(literal("remove")
-                                    .then(argument("category", StringArgumentType.string())
-                                            .executes(PresetCommand::executeRemoveCategory)))
-                            .then(literal("move")
-                                    .then(argument("player", StringArgumentType.string())
-                                            .then(argument("category", StringArgumentType.string())
-                                                    .executes(PresetCommand::executeMoveToCategory))))
-                            .then(literal("clear")
-                                    .then(argument("player", StringArgumentType.string())
-                                            .executes(PresetCommand::executeClearCategory))))
 
                     .then(literal("enable")
                             .then(argument("player", StringArgumentType.string())
@@ -84,12 +59,12 @@ public static void register() {
 
                     .then(literal("setown")
                             .then(argument("scale", FloatArgumentType.floatArg(0.1f, 10.0f))
-                                    .executes(PresetCommand::executeSetOwn)))
+                                    .executes(PresetCommand::executeSetOwn))))
             );
         });
     }
 
-    private static int executeAdd(CommandContext<FabricClientCommandSource> ctx, String category) throws CommandSyntaxException {
+    private static int executeAdd(CommandContext<FabricClientCommandSource> ctx) throws CommandSyntaxException {
         String playerName = StringArgumentType.getString(ctx, "player");
         float scale = FloatArgumentType.getFloat(ctx, "scale");
 
@@ -106,11 +81,10 @@ private static int executeAdd(CommandContext<FabricClientCommandSource> ctx, Str
             return 0;
         }
 
-        PlayerPreset preset = new PlayerPreset(uuidString, playerName, scale, category);
+        PlayerPreset preset = new PlayerPreset(uuidString, playerName, scale);
         PlayerPresetManager.addOrUpdatePreset(preset);
 
-        String categoryText = category != null && !category.trim().isEmpty() ? " in category '" + category + "'" : "";
-        sendSuccess(ctx, "Added preset for '" + playerName + "' with scale " + scale + categoryText + ".");
+        sendSuccess(ctx, "Added preset for '" + playerName + "' with scale " + scale + ".");
         return 1;
     }
 
@@ -147,15 +121,10 @@ private static int executeList(CommandContext<FabricClientCommandSource> ctx, St
         int count = 0;
 
         for (PlayerPreset preset : presets) {
-            if (categoryFilter != null && !categoryFilter.equalsIgnoreCase(preset.category)) {
-                continue;
-            }
-
             String status = preset.enabled ? "§a✓" : "§c✗";
-            String category = preset.category != null ? " §8[" + preset.category + "]" : " §8[no category]";
             String name = preset.getEffectiveDisplayName();
 
-            sendInfo(ctx, String.format("  %s §f%s§r: §6%.2f%s", status, name, preset.scale, category));
+            sendInfo(ctx, String.format("  %s §f%s§r: §6%.2f%s", status, name, preset.scale));
             count++;
         }
 
@@ -235,7 +204,6 @@ private static int executeInfo(CommandContext<FabricClientCommandSource> ctx) th
         sendInfo(ctx, "  UUID: " + preset.identifier);
         sendInfo(ctx, "  Friendly Name: " + (preset.friendlyName != null ? preset.friendlyName : "None"));
         sendInfo(ctx, "  Scale: " + preset.scale);
-        sendInfo(ctx, "  Category: " + (preset.category != null ? preset.category : "None"));
         sendInfo(ctx, "  Enabled: " + (preset.enabled ? "Yes" : "No"));
 
         return 1;
@@ -267,163 +235,9 @@ private static int executeSetOwn(CommandContext<FabricClientCommandSource> ctx)
         return 1;
     }
 
-    private static int executeListCategories(CommandContext<FabricClientCommandSource> ctx) {
-        List<PlayerPreset> presets = PlayerPresetManager.getAllPresets();
-
-        if (presets.isEmpty()) {
-            sendInfo(ctx, "No presets found.");
-            return 1;
-        }
-
-        // Collect unique categories and count presets in each
-        java.util.Map<String, Integer> categoryCount = new java.util.HashMap<>();
-        int uncategorized = 0;
-
-        for (PlayerPreset preset : presets) {
-            if (preset.category != null && !preset.category.trim().isEmpty()) {
-                categoryCount.merge(preset.category, 1, Integer::sum);
-            } else {
-                uncategorized++;
-            }
-        }
-
-        sendInfo(ctx, "Categories:");
-
-        if (uncategorized > 0) {
-            sendInfo(ctx, "  §7(no category): " + uncategorized + " presets");
-        }
-
-        categoryCount.entrySet().stream()
-                .sorted(java.util.Map.Entry.comparingByKey())
-                .forEach(entry -> {
-                    sendInfo(ctx, "  §e" + entry.getKey() + "§r: " + entry.getValue() + " presets");
-                });
-
-        return 1;
-    }
-
-    private static int executeRenameCategory(CommandContext<FabricClientCommandSource> ctx) throws CommandSyntaxException {
-        String oldName = StringArgumentType.getString(ctx, "old_name");
-        String newName = StringArgumentType.getString(ctx, "new_name");
-
-        List<PlayerPreset> presets = PlayerPresetManager.getAllPresets();
-        int renamed = 0;
-
-        for (PlayerPreset preset : presets) {
-            if (oldName.equalsIgnoreCase(preset.category)) {
-                preset.category = newName;
-                PlayerPresetManager.addOrUpdatePreset(preset);
-                renamed++;
-            }
-        }
-
-        if (renamed > 0) {
-            sendSuccess(ctx, "Renamed category '" + oldName + "' to '" + newName + "' (" + renamed + " presets updated).");
-            return 1;
-        } else {
-            sendError(ctx, "No presets found in category '" + oldName + "'.");
-            return 0;
-        }
-    }
-
-    private static int executeRemoveCategory(CommandContext<FabricClientCommandSource> ctx) throws CommandSyntaxException {
-        String categoryName = StringArgumentType.getString(ctx, "category");
-
-        List<PlayerPreset> presets = PlayerPresetManager.getAllPresets();
-        int cleared = 0;
-
-        for (PlayerPreset preset : presets) {
-            if (categoryName.equalsIgnoreCase(preset.category)) {
-                preset.category = null;
-                PlayerPresetManager.addOrUpdatePreset(preset);
-                cleared++;
-            }
-        }
-
-        if (cleared > 0) {
-            sendSuccess(ctx, "Removed category '" + categoryName + "' from " + cleared + " presets.");
-            return 1;
-        } else {
-            sendError(ctx, "No presets found in category '" + categoryName + "'.");
-            return 0;
-        }
-    }
-
-    private static int executeMoveToCategory(CommandContext<FabricClientCommandSource> ctx) throws CommandSyntaxException {
-        String playerName = StringArgumentType.getString(ctx, "player");
-        String newCategory = StringArgumentType.getString(ctx, "category");
-
-        UUID playerUUID = resolvePlayerUUID(playerName);
-        if (playerUUID == null) {
-            sendError(ctx, "Player '" + playerName + "' not found.");
-            return 0;
-        }
-
-        String uuidString = playerUUID.toString();
-        PlayerPreset preset = PlayerPresetManager.getPreset(uuidString);
-
-        if (preset == null) {
-            sendError(ctx, "No preset found for '" + playerName + "'.");
-            return 0;
-        }
-
-        String oldCategory = preset.category != null ? preset.category : "(no category)";
-        preset.category = newCategory;
-        PlayerPresetManager.addOrUpdatePreset(preset);
-
-        sendSuccess(ctx, "Moved '" + playerName + "' from '" + oldCategory + "' to '" + newCategory + "'.");
-        return 1;
-    }
-
-    private static int executeClearCategory(CommandContext<FabricClientCommandSource> ctx) throws CommandSyntaxException {
-        String playerName = StringArgumentType.getString(ctx, "player");
-
-        UUID playerUUID = resolvePlayerUUID(playerName);
-        if (playerUUID == null) {
-            sendError(ctx, "Player '" + playerName + "' not found.");
-            return 0;
-        }
-
-        String uuidString = playerUUID.toString();
-        PlayerPreset preset = PlayerPresetManager.getPreset(uuidString);
-
-        if (preset == null) {
-            sendError(ctx, "No preset found for '" + playerName + "'.");
-            return 0;
-        }
-
-        String oldCategory = preset.category != null ? preset.category : "(no category)";
-        preset.category = null;
-        PlayerPresetManager.addOrUpdatePreset(preset);
-
-        sendSuccess(ctx, "Removed '" + playerName + "' from category '" + oldCategory + "'.");
-        return 1;
-    }
-
-    // This works for players who have been seen in the current session.
+    // Resolves a player's UUID from their username.
     private static UUID resolvePlayerUUID(String playerName) {
-        MinecraftClient client = MinecraftClient.getInstance();
-
-        // Check if it's the current player
-        if (client.player != null && playerName.equalsIgnoreCase(client.player.getName().getString())) {
-            return client.player.getUuid();
-        }
-
-        // Check player list cache
-        if (client.getNetworkHandler() != null) {
-            return client.getNetworkHandler().getPlayerList().stream()
-                    .filter(entry -> entry.getProfile().getName().equalsIgnoreCase(playerName))
-                    .map(entry -> entry.getProfile().getId())
-                    .findFirst()
-                    .orElse(null);
-        }
-
-        // If not found in current session, try to parse as UUID
-        try {
-            return UUID.fromString(playerName);
-        } catch (IllegalArgumentException e) {
-            return null;
-        }
+        return PlayerUUIDResolver.resolvePlayerUUID(playerName);
     }
 
     /**

src/main/java/com/github/kd_gaming1/scaleme/client/data/PlayerPreset.java

@@ -1,7 +1,10 @@
 package com.github.kd_gaming1.scaleme.client.data;
 
+import com.github.kd_gaming1.scaleme.client.util.PlayerUUIDResolver;
 import com.google.gson.annotations.SerializedName;
 
+import java.util.UUID;
+
 /**
  * Represents a preset for scaling a player.
  */
@@ -18,14 +21,17 @@ public class PlayerPreset {
     @SerializedName("enabled")
     public boolean enabled = true;
 
-    @SerializedName("category")
-    public String category;
 
-    public PlayerPreset(String identifier, String friendlyName, float scale, String category) {
+    public PlayerPreset(String identifier, String friendlyName, float scale) {
         this.identifier = identifier;
         this.friendlyName = friendlyName;
         this.scale = scale;
-        this.category = category;
+    }
+
+    public PlayerPreset copy() {
+        PlayerPreset copy = new PlayerPreset(this.identifier, this.friendlyName, this.scale);
+        copy.enabled = this.enabled;
+        return copy;
     }
 
     /** Checks if this preset matches the given identifier. */
@@ -43,4 +49,26 @@ public boolean isUUID() {
         // Simple check for UUID format
         return identifier != null && identifier.matches("^[0-9a-fA-F\\-]{36}$");
     }
+
+    /** Enhanced matching that works with both UUIDs and usernames. */
+    public boolean matchesPlayer(UUID playerUUID, String playerName) {
+        if (!enabled) return false;
+
+        // Direct UUID match
+        if (isUUID()) {
+            try {
+                return UUID.fromString(identifier).equals(playerUUID);
+            } catch (IllegalArgumentException e) {
+                return false;
+            }
+        }
+
+        // Username match (case insensitive)
+        return playerName != null && identifier.equalsIgnoreCase(playerName);
+    }
+
+    /** Resolves this preset to a UUID if possible using the standard resolver. */
+    public UUID resolveToUUID() {
+        return PlayerUUIDResolver.resolvePlayerUUID(this.identifier);
+    }
 }