Update to mc1.21.7

Author: NotRyken

common/src/main/java/dev/terminalmc/commandkeys/gui/widget/field/MultiLineTextField.java

@@ -45,8 +45,8 @@
 public class MultiLineTextField extends MultiLineEditBox {
 
     public static final long CLICK_CHAIN_TIME = 250L;
-    public static final int TEXT_COLOR_DEFAULT = 0xE0E0E0;
-    public static final int TEXT_COLOR_ERROR = 0xFF5555;
+    public static final int TEXT_COLOR_DEFAULT = 0xFFE0E0E0;
+    public static final int TEXT_COLOR_ERROR = 0xFFFF5555;
 
     // Validation
     public final List<TextField.@NotNull Validator> validators = new ArrayList<>();
@@ -100,7 +100,20 @@ public MultiLineTextField(
             Component message,
             @Nullable TextField.Validator validator
     ) {
-        super(font, x, y, width, height, placeholder, message);
+        super(
+                font,
+                x,
+                y,
+                width,
+                height,
+                placeholder,
+                message,
+                TEXT_COLOR_DEFAULT,
+                true,
+                0xFFD0D0D0,
+                true,
+                true
+        );
         if (validator != null) {
             this.validators.add(validator);
         }

common/src/main/java/dev/terminalmc/commandkeys/gui/widget/field/TextField.java

@@ -45,10 +45,10 @@
 public class TextField extends EditBox {
 
     public static final long CLICK_CHAIN_TIME = 250L;
-    public static final int TEXT_COLOR_DEFAULT = 0xE0E0E0;
-    public static final int TEXT_COLOR_ERROR = 0xFF5555;
-    public static final int TEXT_COLOR_HINT = 0x555555;
-    public static final int TEXT_COLOR_PREVIEW = 0xAAAAAA;
+    public static final int TEXT_COLOR_DEFAULT = 0xFFE0E0E0;
+    public static final int TEXT_COLOR_ERROR = 0xFFFF5555;
+    public static final int TEXT_COLOR_HINT = 0xFF555555;
+    public static final int TEXT_COLOR_PREVIEW = 0xFFAAAAAA;
 
     private final Font font;
 

common/src/main/java/dev/terminalmc/commandkeys/gui/widget/list/MacroOptionList.java

@@ -535,9 +535,9 @@ private static class MessageOptions extends Entry {
                             if (delay < 0)
                                 throw new NumberFormatException();
                             msg.delayTicks = delay;
-                            delayField.setTextColor(16777215);
+                            delayField.setTextColor(TextField.TEXT_COLOR_DEFAULT);
                         } catch (NumberFormatException ignored) {
-                            delayField.setTextColor(16711680);
+                            delayField.setTextColor(TextField.TEXT_COLOR_ERROR);
                         }
                     });
                     delayField.setValue(String.valueOf(msg.delayTicks));

common/src/main/java/dev/terminalmc/commandkeys/gui/widget/list/MainOptionList.java

@@ -578,9 +578,9 @@ private static class Ratelimit extends Entry {
                         if (space < 1)
                             throw new NumberFormatException();
                         Config.get().setRatelimitTicks(space);
-                        ticksField.setTextColor(16777215);
+                        ticksField.setTextColor(TextField.TEXT_COLOR_DEFAULT);
                     } catch (NumberFormatException ignored) {
-                        ticksField.setTextColor(16711680);
+                        ticksField.setTextColor(TextField.TEXT_COLOR_ERROR);
                     }
                 });
                 ticksField.setValue(String.valueOf(Config.get().getRatelimitTicks()));
@@ -649,9 +649,9 @@ private static class LengthLimit extends Entry {
                         if (space < 1)
                             throw new NumberFormatException();
                         Config.get().setLengthLimitLength(space);
-                        lengthField.setTextColor(16777215);
+                        lengthField.setTextColor(TextField.TEXT_COLOR_DEFAULT);
                     } catch (NumberFormatException ignored) {
-                        lengthField.setTextColor(16711680);
+                        lengthField.setTextColor(TextField.TEXT_COLOR_ERROR);
                     }
                 });
                 lengthField.setValue(String.valueOf(Config.get().getLengthLimitLength()));

common/src/main/java/dev/terminalmc/commandkeys/mixin/gui/MultiLineEditBoxMixin.java

@@ -32,8 +32,8 @@ public class MultiLineEditBoxMixin {
     @ModifyExpressionValue(
             method = "renderContents",
             at = @At(
-                    value = "CONSTANT",
-                    args = "intValue=-2039584"
+                    value = "FIELD",
+                    target = "Lnet/minecraft/client/gui/components/MultiLineEditBox;textColor:I"
             )
     )
     private int modifyColor(int original) {

common/src/main/resources/META-INF/accesstransformer.cfg

@@ -1 +1,2 @@
 # https://docs.neoforged.net/docs/advanced/accesstransformers
+public net.minecraft.client.gui.components.MultiLineEditBox <init>(Lnet/minecraft/client/gui/Font;IIIILnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;IZIZZ)V

common/src/main/resources/commandkeys.accesswidener

@@ -1,2 +1,3 @@
 accessWidener v2 named
 # https://fabricmc.net/wiki/tutorial:accesswideners
+accessible method net/minecraft/client/gui/components/MultiLineEditBox <init> (Lnet/minecraft/client/gui/Font;IIIILnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;IZIZZ)V

gradle.properties

@@ -43,9 +43,9 @@ mod_curseforge_slug=commandkeys
 # Subproject Build Compatibility
 #  -> Comment out or unset to disable publishing of a subproject.
 mod_loaders_fabric=fabric
-mc_versions_fabric=1.21.4,1.21.5
+mc_versions_fabric=1.21.6,1.21.7,1.21.8
 mod_loaders_neoforge=neoforge
-mc_versions_neoforge=1.21.4,1.21.5
+mc_versions_neoforge=1.21.7,1.21.8
 
 # Links
 homepage_url=https://modrinth.com/mod/65UyswbY
@@ -64,19 +64,19 @@ java_versions_fabric=>=21
 java_versions_neoforge=[21,)
 
 # Minecraft
-minecraft_version=1.21.4
-minecraft_versions_fabric=>1.21.3
-minecraft_versions_neoforge=[1.21.4,)
+minecraft_version=1.21.7
+minecraft_versions_fabric=>1.21.5
+minecraft_versions_neoforge=[1.21.7,)
 
 # Parchment https://parchmentmc.org/docs/getting-started#choose-a-version
-parchment_minecraft_version=1.21.4
-parchment_version=2025.03.23
+parchment_minecraft_version=1.21.5
+parchment_version=2025.06.15
 
 # Fabric https://fabricmc.net/develop
 #  -> See also 'mixinextras_jij_fabric'
 fabric_loader_version=0.16.14
 fabric_loader_versions=>=0.16.1
-fabric_api_version=0.119.3+1.21.4
+fabric_api_version=0.128.1+1.21.7
 fabric_api_versions=*
 # Entry Points
 fabric_entrypoints_main=
@@ -86,10 +86,10 @@ fabric_entrypoints_modmenu=dev.terminalmc.commandkeys.compat.modmenu.ModMenuImpl
 
 # NeoForge https://projects.neoforged.net/neoforged/neoforge
 #  -> See also 'mixinextras_jij_neoforge'
-neoforge_version=21.4.141
-neoforge_versions=[21.4.0-beta,)
+neoforge_version=21.7.1-beta
+neoforge_versions=[21.7.0-beta,)
 # NeoForm https://projects.neoforged.net/neoforged/neoform
-neoform_version=1.21.4-20241203.161809
+neoform_version=1.21.7-20250630.141722
 
 # Dependency Version Extensions
 #  -> Intended for addon mods to show which version they were compiled against.