Update to mc1.21.8

NotRyken · NotRyken · commit f8d14fa645c6 · 2025-11-10T19:14:55.000+08:00
diff --git a/common/src/main/java/dev/terminalmc/chatnotify/config/Config.java b/common/src/main/java/dev/terminalmc/chatnotify/config/Config.java
@@ -133,7 +133,7 @@ public enum SendMode {
      * The default {@link TextStyle} color for new {@link Notification} instances.
      */
     public int defaultColor;
-    public static final int defaultColorDefault = 0xffc400;
+    public static final int defaultColorDefault = 0xFFffc400;
 
     /**
      * The default {@link Sound} identifier for new {@link Notification} instances.
@@ -502,11 +502,11 @@ private void validateUserNotif() {
      */
     static int validateColor(int color) {
         if (color >= 0 && color <= 0xFFFFFF) {
-            // In RGB range; return value
-            return color;
+            // In RGB range; add to ARGB
+            return color | 0xFF000000;
         } else {
-            // Out of RGB range; mask to RGB
-            return color & 0xFFFFFF;
+            // Out of RGB range; return value
+            return color;
         }
     }
 
diff --git a/common/src/main/java/dev/terminalmc/chatnotify/config/TextStyle.java b/common/src/main/java/dev/terminalmc/chatnotify/config/TextStyle.java
@@ -36,10 +36,10 @@ public class TextStyle {
     public static final boolean doColorDefault = true;
 
     /**
-     * The text color, from {@link 0x000000} to {@link 0xffffff} inclusive.
+     * The text color, from {@link 0xFF000000} to {@link 0xFFffffff} inclusive.
      */
     public int color;
-    public static final int colorDefault = 0xffc400;
+    public static final int colorDefault = 0xFFffc400;
 
     // Format controls
 
diff --git a/common/src/main/java/dev/terminalmc/chatnotify/gui/toast/NotificationToast.java b/common/src/main/java/dev/terminalmc/chatnotify/gui/toast/NotificationToast.java
@@ -21,7 +21,7 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.toasts.Toast;
 import net.minecraft.client.gui.components.toasts.ToastManager;
-import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.FormattedCharSequence;
@@ -66,7 +66,14 @@ public void update(@NotNull ToastManager manager, long elapsedTime) {
     public void render(@NotNull GuiGraphics graphics, @NotNull Font font, long elapsedTime) {
         if (messageLines.size() <= 1) {
             // Message fits in a single line, render a single sprite
-            graphics.blitSprite(RenderType::guiTextured, BACKGROUND_SPRITE, 0, 0, WIDTH, height());
+            graphics.blitSprite(
+                    RenderPipelines.GUI_TEXTURED,
+                    BACKGROUND_SPRITE,
+                    0,
+                    0,
+                    WIDTH,
+                    height()
+            );
         } else {
             // Message requires multiple lines, stretch vertically by rendering
             // multiple sprites
@@ -133,7 +140,7 @@ private void renderBackgroundRow(
 
         // Left border
         graphics.blitSprite(
-                RenderType::guiTextured,
+                RenderPipelines.GUI_TEXTURED,
                 BACKGROUND_SPRITE,
                 WIDTH,
                 HEIGHT,
@@ -149,7 +156,7 @@ private void renderBackgroundRow(
         int offset = 64;
         for (int x = uWidth; x < width - uRemainder; x += offset) {
             graphics.blitSprite(
-                    RenderType::guiTextured,
+                    RenderPipelines.GUI_TEXTURED,
                     BACKGROUND_SPRITE,
                     WIDTH,
                     HEIGHT,
@@ -164,7 +171,7 @@ private void renderBackgroundRow(
 
         // Right border
         graphics.blitSprite(
-                RenderType::guiTextured,
+                RenderPipelines.GUI_TEXTURED,
                 BACKGROUND_SPRITE,
                 WIDTH,
                 HEIGHT,
diff --git a/common/src/main/java/dev/terminalmc/chatnotify/gui/widget/HorizontalList.java b/common/src/main/java/dev/terminalmc/chatnotify/gui/widget/HorizontalList.java
@@ -26,7 +26,7 @@
 import net.minecraft.client.gui.narration.NarratedElementType;
 import net.minecraft.client.gui.narration.NarrationElementOutput;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
@@ -246,7 +246,7 @@ protected void renderWidget(
      */
     protected void renderListBackground(GuiGraphics graphics) {
         graphics.blit(
-                RenderType::guiTextured,
+                RenderPipelines.GUI_TEXTURED,
                 MENU_LIST_BACKGROUND,
                 getX(),
                 getY(),
@@ -305,15 +305,15 @@ protected void renderScrollbar(@NotNull GuiGraphics graphics) {
             );
 
             graphics.blitSprite(
-                    RenderType::guiTextured,
+                    RenderPipelines.GUI_TEXTURED,
                     SCROLLER_BACKGROUND_SPRITE,
                     getX(),
                     y,
                     getWidth(),
                     SCROLLBAR_HEIGHT
             );
             graphics.blitSprite(
-                    RenderType::guiTextured,
+                    RenderPipelines.GUI_TEXTURED,
                     SCROLLER_SPRITE,
                     scrollerPos,
                     y,
@@ -335,7 +335,7 @@ protected boolean scrollbarVisible() {
      */
     protected void renderSeparators(GuiGraphics guiGraphics) {
         guiGraphics.blit(
-                RenderType::guiTextured,
+                RenderPipelines.GUI_TEXTURED,
                 LEFT_SEPARATOR,
                 getX() - 2,
                 getY() - 1,
@@ -347,7 +347,7 @@ protected void renderSeparators(GuiGraphics guiGraphics) {
                 32
         );
         guiGraphics.blit(
-                RenderType::guiTextured,
+                RenderPipelines.GUI_TEXTURED,
                 RIGHT_SEPARATOR,
                 getRight(),
                 getY() - 1,
@@ -359,7 +359,7 @@ protected void renderSeparators(GuiGraphics guiGraphics) {
                 32
         );
         guiGraphics.blit(
-                RenderType::guiTextured,
+                RenderPipelines.GUI_TEXTURED,
                 Screen.HEADER_SEPARATOR,
                 getX() - 1,
                 getY() - 2,
@@ -371,7 +371,7 @@ protected void renderSeparators(GuiGraphics guiGraphics) {
                 2
         );
         guiGraphics.blit(
-                RenderType::guiTextured,
+                RenderPipelines.GUI_TEXTURED,
                 Screen.FOOTER_SEPARATOR,
                 getX() - 1,
                 getBottom(),
diff --git a/common/src/main/java/dev/terminalmc/chatnotify/gui/widget/HsvColorPicker.java b/common/src/main/java/dev/terminalmc/chatnotify/gui/widget/HsvColorPicker.java
@@ -291,9 +291,9 @@ private void updateColorFromHexField(String s) {
                 updateSvCursor();
             }
             if (hsv[2] < 0.1)
-                hexField.setTextColor(0xFFFFFF); // Keep text visible
+                hexField.setTextColor(0xFFFFFFFF); // Keep text visible
             else
-                hexField.setTextColor(color);
+                hexField.setTextColor((0xFF << 24) | color);
         }
     }
 
@@ -480,14 +480,14 @@ protected void renderWidget(
                 newColorLabel,
                 newCFieldTextX,
                 newCFieldTextY,
-                0xFFFFFF
+                0xFFFFFFFF
         );
         graphics.drawString(
                 Minecraft.getInstance().font,
                 oldColorLabel,
                 oldCFieldTextX,
                 oldCFieldTextY,
-                0xFFFFFF
+                0xFFFFFFFF
         );
         hexField.renderWidget(graphics, mouseX, mouseY, delta);
         cancelButton.render(graphics, mouseX, mouseY, delta);
diff --git a/common/src/main/java/dev/terminalmc/chatnotify/gui/widget/field/MultiLineTextField.java b/common/src/main/java/dev/terminalmc/chatnotify/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,
+                0xFFE0E0E0,
+                true,
+                0xFFD0D0D0,
+                true,
+                true
+        );
         if (validator != null) {
             this.validators.add(validator);
         }
diff --git a/common/src/main/java/dev/terminalmc/chatnotify/gui/widget/field/TextField.java b/common/src/main/java/dev/terminalmc/chatnotify/gui/widget/field/TextField.java
@@ -52,10 +52,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;
 
diff --git a/common/src/main/java/dev/terminalmc/chatnotify/gui/widget/list/FilterList.java b/common/src/main/java/dev/terminalmc/chatnotify/gui/widget/list/FilterList.java
@@ -939,7 +939,7 @@ public NotifOptions(
                         Component.literal(Unicode.PAINT.str)
                                 .withColor(notif.textStyle.doColor
                                         ? notif.textStyle.color
-                                        : 0xffffff),
+                                        : 0xFFffffff),
                         (button) -> {
                             // Open color picker overlay widget
                             int cpHeight = HsvColorPicker.MIN_HEIGHT;
@@ -986,9 +986,9 @@ public NotifOptions(
                                     hsv
                             );
                             if (hsv[2] < 0.1)
-                                colorField.setTextColor(0xFFFFFF);
+                                colorField.setTextColor(0xFFFFFFFF);
                             else
-                                colorField.setTextColor(color);
+                                colorField.setTextColor((0xFF << 24) | color);
                             // Update status button color
                             colorEditButton.setMessage(colorEditButton.getMessage()
                                     .copy()
diff --git a/common/src/main/java/dev/terminalmc/chatnotify/gui/widget/list/root/DefaultList.java b/common/src/main/java/dev/terminalmc/chatnotify/gui/widget/list/root/DefaultList.java
@@ -155,9 +155,9 @@ private static class DefaultColor extends Entry {
                                 hsv
                         );
                         if (hsv[2] < 0.1)
-                            colorField.setTextColor(0xFFFFFF);
+                            colorField.setTextColor(0xFFFFFFFF);
                         else
-                            colorField.setTextColor(color);
+                            colorField.setTextColor((0xFF << 24) | color);
                     }
                 });
                 colorField.setValue(((TextColorAccessor) (Object) TextColor.fromRgb(Config.get().defaultColor)).chatnotify$formatValue());
diff --git a/common/src/main/java/dev/terminalmc/chatnotify/gui/widget/list/root/notif/FormatList.java b/common/src/main/java/dev/terminalmc/chatnotify/gui/widget/list/root/notif/FormatList.java
@@ -158,9 +158,9 @@ private static class ColorOptions extends Entry {
                                 hsv
                         );
                         if (hsv[2] < 0.1)
-                            colorField.setTextColor(0xFFFFFF);
+                            colorField.setTextColor(0xFFFFFFFF);
                         else
-                            colorField.setTextColor(color);
+                            colorField.setTextColor((0xFF << 24) | color);
                     }
                 });
                 colorField.setValue(((TextColorAccessor) (Object) TextColor.fromRgb(supplier.get())).chatnotify$formatValue());
diff --git a/common/src/main/java/dev/terminalmc/chatnotify/mixin/ClientPacketListenerMixin.java b/common/src/main/java/dev/terminalmc/chatnotify/mixin/ClientPacketListenerMixin.java
@@ -26,6 +26,7 @@
 import dev.terminalmc.chatnotify.util.text.MessageUtil;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.multiplayer.ClientPacketListener;
 import net.minecraft.client.multiplayer.PlayerInfo;
 import net.minecraft.network.chat.Component;
@@ -36,7 +37,6 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 /*
  * If an incoming message is the return of a message sent by the user,
@@ -212,10 +212,10 @@ private void getCommand(String command, CallbackInfo ci) {
     }
 
     @Inject(
-            method = "sendUnsignedCommand",
+            method = "sendUnattendedCommand",
             at = @At("HEAD")
     )
-    private void getUnsignedCommand(String command, CallbackInfoReturnable<Boolean> cir) {
+    private void getUnsignedCommand(String command, Screen screen, CallbackInfo ci) {
         chatnotify$storeCommand(command);
     }
 
diff --git a/common/src/main/java/dev/terminalmc/chatnotify/mixin/GuiGraphicsMixin.java b/common/src/main/java/dev/terminalmc/chatnotify/mixin/GuiGraphicsMixin.java
@@ -16,13 +16,14 @@
 
 package dev.terminalmc.chatnotify.mixin;
 
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.VertexConsumer;
+import dev.terminalmc.chatnotify.util.ColoredRectangleRenderStateHorizontal;
 import dev.terminalmc.chatnotify.util.inject.IGuiGraphics;
 import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.renderer.MultiBufferSource.BufferSource;
-import net.minecraft.client.renderer.RenderType;
-import org.joml.Matrix4f;
+import net.minecraft.client.gui.render.TextureSetup;
+import net.minecraft.client.gui.render.state.GuiRenderState;
+import net.minecraft.client.renderer.RenderPipelines;
+import org.joml.Matrix3x2f;
+import org.joml.Matrix3x2fStack;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -32,26 +33,36 @@ public abstract class GuiGraphicsMixin implements IGuiGraphics {
 
     @Shadow
     @Final
-    private BufferSource bufferSource;
+    private GuiRenderState guiRenderState;
 
     @Shadow
     @Final
-    private PoseStack pose;
+    private Matrix3x2fStack pose;
+
+    @Shadow
+    @Final
+    private GuiGraphics.ScissorStack scissorStack;
 
     @Override
     public void chatnotify$fillGradientHorizontal(
-            int x0,
-            int y0,
             int x1,
             int y1,
+            int x2,
+            int y2,
             int colorFrom,
             int colorTo
     ) {
-        VertexConsumer consumer = bufferSource.getBuffer(RenderType.gui());
-        Matrix4f matrix4f = pose.last().pose();
-        consumer.addVertex(matrix4f, (float) x0, (float) y0, 0F).setColor(colorFrom);
-        consumer.addVertex(matrix4f, (float) x0, (float) y1, 0F).setColor(colorFrom);
-        consumer.addVertex(matrix4f, (float) x1, (float) y1, 0F).setColor(colorTo);
-        consumer.addVertex(matrix4f, (float) x1, (float) y0, 0F).setColor(colorTo);
+        guiRenderState.submitGuiElement(new ColoredRectangleRenderStateHorizontal(
+                RenderPipelines.GUI,
+                TextureSetup.noTexture(),
+                new Matrix3x2f(pose),
+                x1,
+                y1,
+                x2,
+                y2,
+                colorFrom,
+                colorTo,
+                scissorStack.peek()
+        ));
     }
 }
diff --git a/common/src/main/java/dev/terminalmc/chatnotify/mixin/MultiLineEditBoxMixin.java b/common/src/main/java/dev/terminalmc/chatnotify/mixin/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) {
diff --git a/common/src/main/java/dev/terminalmc/chatnotify/util/ColoredRectangleRenderStateHorizontal.java b/common/src/main/java/dev/terminalmc/chatnotify/util/ColoredRectangleRenderStateHorizontal.java
diff --git a/common/src/main/resources/META-INF/accesstransformer.cfg b/common/src/main/resources/META-INF/accesstransformer.cfg
diff --git a/common/src/main/resources/chatnotify.accesswidener b/common/src/main/resources/chatnotify.accesswidener
diff --git a/gradle.properties b/gradle.properties
