simplify /hypercube:colors

Author: homchom

src/main/java/io/github/homchom/recode/mod/commands/impl/text/ColorsCommand.java

@@ -6,71 +6,41 @@
 import io.github.homchom.recode.mod.commands.arguments.ArgBuilder;
 import io.github.homchom.recode.mod.config.Config;
 import io.github.homchom.recode.mod.features.commands.ColorsMenu;
+import io.github.homchom.recode.multiplayer.LocalPlayerFunctions;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.client.Minecraft;
 import net.minecraft.commands.CommandBuildContext;
-import net.minecraft.network.chat.*;
 
 public class ColorsCommand extends Command {
-
-    private final Minecraft mc = Minecraft.getInstance();
-
     @Override
     public void register(Minecraft mc, CommandDispatcher<FabricClientCommandSource> cd, CommandBuildContext context) {
         cd.register(ArgBuilder.literal("colors").executes((ctx) -> {
             if (Config.getBoolean("colorReplacePicker")) {
-                showColorPalette(1);
+                LocalPlayerFunctions.sendCommand("hypercube:colors");
             } else {
                 ColorsMenu colorsGui = new ColorsMenu();
                 colorsGui.scheduleOpenGui(colorsGui, "");
-                //showColorPalette(1);
             }
             return 1;
         })
                 .then(ArgBuilder.argument("Saturation(%)", IntegerArgumentType.integer(0, 100)).executes((ctx) -> {
-                    float saturation = (float) IntegerArgumentType.getInteger(ctx, "Saturation(%)");
-                    showColorPalette(saturation / 100f);
+                    int saturation = IntegerArgumentType.getInteger(ctx, "Saturation(%)");
+                    LocalPlayerFunctions.sendCommand("hypercube:colors " + saturation);
                     return 1;
                 })));
     }
 
     @Override
     public String getDescription() {
-        return "[blue]/colors [saturation][reset]\n"
-            + "\n"
-            + "Shows the color picker menu.\n"
-            + "When Saturation value is specified, it will show you the old color picker in chat.";
+        return """
+                [blue]/colors [saturation][reset]
+
+                Shows the color picker menu.
+                When Saturation value is specified, it will show you the old color picker in chat.""";
     }
 
     @Override
     public String getName() {
         return "/colors";
     }
-
-    private void showColorPalette(float saturation) {
-        int maxColors = Config.getInteger("colorMaxRender");
-        int lines = Config.getInteger("colorLines");
-
-        for (int j = 0; j < lines; j++) {
-            Component base = Component.literal("");
-            float b = 1f - ((1f / lines) * j);
-            for (int i = 0; i < maxColors; i++) {
-                float index = (360 / maxColors) * i;
-
-                java.awt.Color color = java.awt.Color.getHSBColor(index / 360, saturation, b);
-                String colorName = "#" + Integer.toHexString(color.getRGB()).substring(2);
-
-                Style colorStyle = Style.EMPTY.withColor(TextColor.fromRgb(color.getRGB()));
-                MutableComponent extra = Component.literal("|");
-                MutableComponent hover = Component.literal(colorName);
-                hover.append("\n§7Click to copy!");
-                extra.setStyle(colorStyle);
-                hover.setStyle(colorStyle);
-                extra.withStyle((style) -> style.withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/color hex " + colorName)));
-                extra.withStyle((style) -> style.withHoverEvent(HoverEvent.Action.SHOW_TEXT.deserializeFromLegacy(hover)));
-                base.getSiblings().add(extra);
-            }
-            mc.player.displayClientMessage(base, false);
-        }
-    }
 }

src/main/java/io/github/homchom/recode/mod/config/impl/CommandsGroup.java

@@ -13,28 +13,22 @@ public CommandsGroup(String name) {
 
     @Override
     public void initialize() {
-        // Non sub-grouped
+        // top-level
         this.register(new BooleanSetting("dfCommands", true));
         this.register(new BooleanSetting("errorSound", true));
+        this.register(new BooleanSetting("colorReplacePicker", false));
 
-        // Auto /msg
+        // auto /msg
         ConfigSubGroup autoMessage = new ConfigSubGroup("automsg");
         autoMessage.register(new BooleanSetting("automsg", false));
         autoMessage.register(new BooleanSetting("automsg_timeout", true));
         autoMessage.register(new LongSetting("automsg_timeoutNumber", 300000L));
         this.register(autoMessage);
 
-        // Heads
+        // heads
         ConfigSubGroup heads = new ConfigSubGroup("heads");
         heads.register(new BooleanSetting("headsEnabled", false));
         heads.register(new IntegerSetting("headMenuMaxRender", 1000));
         this.register(heads);
-
-        // Colors
-        ConfigSubGroup colors = new ConfigSubGroup("colors");
-        colors.register(new IntegerSetting("colorMaxRender", 158));
-        colors.register(new IntegerSetting("colorLines", 5));
-        colors.register(new BooleanSetting("colorReplacePicker", false));
-        this.register(colors);
     }
 }

src/main/java/io/github/homchom/recode/multiplayer/LocalPlayerFunctions.kt

@@ -1,3 +1,5 @@
+@file:JvmName("LocalPlayerFunctions")
+
 package io.github.homchom.recode.multiplayer
 
 import io.github.homchom.recode.RecodeDispatcher

src/main/resources/assets/recode/lang/en_us.json

@@ -110,14 +110,8 @@
     "config.recode.option.headMenuMaxRender": "Maximum Heads in /heads",
     "config.recode.option.headMenuMaxRender.tooltip": "Amount of heads to display in the /heads menu.",
 
-    "config.recode.subcategory.commands_colors": "/colors Command",
-    "config.recode.subcategory.commands_colors.tooltip": "Settings that apply to the /colors command.",
-    "config.recode.option.colorMaxRender": "Maximum Columns",
-    "config.recode.option.colorMaxRender.tooltip": "Amount of color bars to display in one color line.",
-    "config.recode.option.colorLines": "Maximum Rows",
-    "config.recode.option.colorLines.tooltip": "Amount of rows to show in /color.",
     "config.recode.option.colorReplacePicker": "Replace Color Picker",
-    "config.recode.option.colorReplacePicker.tooltip": "Replaces the color picker with\na color menu equivalent of \"/colors 100\".",
+    "config.recode.option.colorReplacePicker.tooltip": "Replaces the color picker with\nDiamondFire's built-in command\".",
 
     "config.recode.subcategory.keybinds_flightspeed": "Flight Speed Keybind Values",
     "config.recode.subcategory.keybinds_flightspeed.tooltip": "Values used for the Flight Speed keybinds found\nin the \"Options -> Controls -> Recode\" menu.",