Update to mc1.21.8

Author: NotRyken

changelog.md

@@ -92,6 +92,7 @@ Note: this version includes networking changes, servers and clients must be upgr
 - Added a workaround for a crash when attempting to operate on containerless modded slots
 - Increased warning display time to 5 seconds
 - Added automatic update information to server class policy config
+- Re-enabled support for ItemLocks on 1.21.6+
 
 ## 2.0.0-beta.15
 
@@ -103,6 +104,7 @@ Note: this beta version includes networking changes, servers and clients must be
 ## 2.0.0-beta.14
 
 - Added support for configuring specific items to always be sorted to the start or end
+- Fixed a launch crash on NeoForge on 1.21.7+
 
 ## 2.0.0-beta.13
 
@@ -113,6 +115,7 @@ Note: this beta version includes networking changes, servers and clients must be
 ## 2.0.0-beta.12
 
 - Fixed button status not saving when changed via editor screen
+- Added compatibility with Blur+ mod on 1.21.6+
 
 ## 2.0.0-beta.11
 

common/src/main/java/dev/terminalmc/clientsort/client/gui/screen/edit/EditorScreen.java

@@ -22,6 +22,8 @@
 import dev.terminalmc.clientsort.client.config.*;
 import dev.terminalmc.clientsort.client.gui.widget.TriggerButton;
 import dev.terminalmc.clientsort.mixin.client.accessor.AbstractContainerScreenAccessor;
+import dev.terminalmc.clientsort.mixin.client.accessor.GuiGraphicsAccessor;
+import dev.terminalmc.clientsort.mixin.client.accessor.GuiRenderStateAccessor;
 import dev.terminalmc.clientsort.util.inject.ISlot;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
@@ -60,8 +62,7 @@ public abstract class EditorScreen extends Screen {
     public final Set<Integer> ignoredSlots = new TreeSet<>();
 
     /**
-     * An element of {@link EditorScreen#buttons} which 'represents' the whole set of
-     * buttons.
+     * An element of {@link EditorScreen#buttons} which 'represents' the whole set of buttons.
      * <p>
      * This can be any element, and the specific choice is only relevant when repositioning via
      * mouse drag.
@@ -70,8 +71,8 @@ public abstract class EditorScreen extends Screen {
 
     /**
      * The class name of either {@link EditorScreen#rep}'s {@link TriggerButton#container}, or
-     * {@link EditorScreen#underlay}'s {@link AbstractContainerScreen#getMenu} if the former
-     * is {@code null}.
+     * {@link EditorScreen#underlay}'s {@link AbstractContainerScreen#getMenu} if the former is
+     * {@code null}.
      * <p>
      * This value represents the lowest-level key on which a {@link ClassPolicy} can be created, and
      * may differ from {@link EditorScreen#rep}'s {@link TriggerButton#activePolicyKey}.
@@ -446,7 +447,15 @@ lowestPolicyKey, new ClassPolicy(
      */
     @Override
     public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
+        underlay.renderBackground(graphics, mouseX, mouseY, partialTick);
         underlay.render(graphics, mouseX, mouseY, partialTick);
+
+        // Workaround for other mods adding blur when rendering the underlay
+        ((GuiRenderStateAccessor) ((GuiGraphicsAccessor) graphics).clientsort$getGuiRenderState())
+                .clientsort$setFirstStratumAfterBlur(Integer.MAX_VALUE);
+        graphics.nextStratum();
+        renderBlurredBackground(graphics);
+
         super.render(graphics, mouseX, mouseY, partialTick);
 
         // Render disabled-slot indicators
@@ -513,17 +522,34 @@ public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float
         }
     }
 
+    /**
+     * Removes the call to {@link Screen#renderBlurredBackground}, since we add a call in
+     * {@link EditorScreen#render} and the method can only be called once.
+     */
+    @Override
+    public void renderBackground(
+            @NotNull GuiGraphics graphics,
+            int mouseX,
+            int mouseY,
+            float partialTick
+    ) {
+        if (Minecraft.getInstance().level == null) {
+            renderPanorama(graphics, partialTick);
+        }
+        renderMenuBackground(graphics);
+    }
+
     /**
      * Modifies the background blur to be constant irrespective of the configured value.
      * <p>
      * Minimal blur is used to prevent the editable widgets disappearing under underlay items on a
      * higher render layer, while still keeping the underlay detail discernible.
      */
     @Override
-    protected void renderBlurredBackground() {
+    protected void renderBlurredBackground(@NotNull GuiGraphics graphics) {
         int original = Minecraft.getInstance().options.menuBackgroundBlurriness().get();
         Minecraft.getInstance().options.menuBackgroundBlurriness().set(1);
-        super.renderBlurredBackground();
+        super.renderBlurredBackground(graphics);
         Minecraft.getInstance().options.menuBackgroundBlurriness().set(original);
     }
 

common/src/main/java/dev/terminalmc/clientsort/client/gui/screen/edit/SelectorScreen.java

@@ -19,6 +19,8 @@
 import dev.terminalmc.clientsort.client.config.Config;
 import dev.terminalmc.clientsort.client.gui.TriggerButtonManager;
 import dev.terminalmc.clientsort.client.gui.widget.TriggerButton;
+import dev.terminalmc.clientsort.mixin.client.accessor.GuiGraphicsAccessor;
+import dev.terminalmc.clientsort.mixin.client.accessor.GuiRenderStateAccessor;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
@@ -99,7 +101,15 @@ private void rebuildGui() {
 
     @Override
     public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
+        underlay.renderBackground(graphics, mouseX, mouseY, partialTick);
         underlay.render(graphics, mouseX, mouseY, partialTick);
+
+        // Workaround for other mods adding blur when rendering the underlay
+        ((GuiRenderStateAccessor) ((GuiGraphicsAccessor) graphics).clientsort$getGuiRenderState())
+                .clientsort$setFirstStratumAfterBlur(Integer.MAX_VALUE);
+        graphics.nextStratum();
+        renderBlurredBackground(graphics);
+
         super.render(graphics, mouseX, mouseY, partialTick);
 
         if (options().showButtons) {
@@ -109,12 +119,29 @@ public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float
         }
     }
 
+    /**
+     * Removes the call to {@link Screen#renderBlurredBackground}, since we add a call in
+     * {@link SelectorScreen#render} and the method can only be called once.
+     */
+    @Override
+    public void renderBackground(
+            @NotNull GuiGraphics graphics,
+            int mouseX,
+            int mouseY,
+            float partialTick
+    ) {
+        if (Minecraft.getInstance().level == null) {
+            renderPanorama(graphics, partialTick);
+        }
+        renderMenuBackground(graphics);
+    }
+
     @Override
-    protected void renderBlurredBackground() {
+    protected void renderBlurredBackground(@NotNull GuiGraphics graphics) {
         // Heavy blur, we want the widgets to really stand out
         int original = Minecraft.getInstance().options.menuBackgroundBlurriness().get();
         Minecraft.getInstance().options.menuBackgroundBlurriness().set(6);
-        super.renderBlurredBackground();
+        super.renderBlurredBackground(graphics);
         Minecraft.getInstance().options.menuBackgroundBlurriness().set(original);
     }
 

common/src/main/java/dev/terminalmc/clientsort/client/gui/widget/TriggerButton.java

@@ -25,6 +25,7 @@
 import dev.terminalmc.clientsort.client.gui.screen.edit.EditorScreen;
 import dev.terminalmc.clientsort.client.gui.screen.edit.PlayerEditorScreen;
 import dev.terminalmc.clientsort.mixin.client.accessor.AbstractContainerScreenAccessor;
+import dev.terminalmc.clientsort.mixin.client.accessor.AbstractWidgetAccessor;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ComponentPath;
@@ -35,7 +36,7 @@
 import net.minecraft.client.gui.navigation.FocusNavigationEvent;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
-import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
@@ -173,7 +174,7 @@ public void renderWidget(
 
         // Draw texture
         ResourceLocation texture = sprites.get(isActive(), isHoveredOrFocused());
-        graphics.blitSprite(RenderType::guiTextured, texture, getX(), getY(), width, height);
+        graphics.blitSprite(RenderPipelines.GUI_TEXTURED, texture, getX(), getY(), width, height);
 
         // Draw policy state indicator
         if (!operationAllowed) {
@@ -182,7 +183,8 @@ public void renderWidget(
 
         // Refresh tooltip
         if (isMouseOver(mouseX, mouseY)) {
-            if (Minecraft.getInstance().screen instanceof EditorScreen && getTooltip() == null) {
+            if (Minecraft.getInstance().screen instanceof EditorScreen
+                    && ((AbstractWidgetAccessor) this).clientsort$getTooltip().get() == null) {
                 Component visibilityStatus = localized(
                         "editor", active ? "enabled" : "disabled")
                         .withStyle(active

common/src/main/java/dev/terminalmc/clientsort/mixin/client/AbstractContainerScreenMixin.java

@@ -276,10 +276,9 @@ private void afterRender(
             return;
 
         if (ClientSort.overlayMessage != null) {
-            graphics.pose().pushPose();
-            graphics.pose().translate(0.0F, 0.0F, 1000F);
+            graphics.pose().pushMatrix();
             ClientSort.overlayMessage.renderWidget(graphics, mouseX, mouseY, partialTick);
-            graphics.pose().popPose();
+            graphics.pose().popMatrix();
         }
 
         if (!debug())
@@ -289,9 +288,8 @@ private void afterRender(
                 ContainerScreenHelper.of((AbstractContainerScreen<?>) (Object) this);
 
         float scale = 0.7F;
-        graphics.pose().pushPose();
-        graphics.pose().translate(0.0F, 0.0F, 1000F);
-        graphics.pose().scale(scale, scale, 0.0F);
+        graphics.pose().pushMatrix();
+        graphics.pose().scale(scale, scale);
 
         for (Slot slot : menu.slots) {
             int slotId = ((ISlot) slot).clientsort$getIndexInMenu();
@@ -346,6 +344,6 @@ private void afterRender(
             );
         }
 
-        graphics.pose().popPose();
+        graphics.pose().popMatrix();
     }
 }

common/src/main/java/dev/terminalmc/clientsort/mixin/client/accessor/AbstractWidgetAccessor.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2025 TerminalMC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dev.terminalmc.clientsort.mixin.client.accessor;
+
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.components.WidgetTooltipHolder;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(AbstractWidget.class)
+public interface AbstractWidgetAccessor {
+
+    @Accessor("tooltip")
+    WidgetTooltipHolder clientsort$getTooltip();
+}

common/src/main/java/dev/terminalmc/clientsort/mixin/client/accessor/GuiGraphicsAccessor.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2025 TerminalMC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dev.terminalmc.clientsort.mixin.client.accessor;
+
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.render.state.GuiRenderState;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(GuiGraphics.class)
+public interface GuiGraphicsAccessor {
+
+    @Accessor("guiRenderState")
+    GuiRenderState clientsort$getGuiRenderState();
+}

common/src/main/java/dev/terminalmc/clientsort/mixin/client/accessor/GuiRenderStateAccessor.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2025 TerminalMC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dev.terminalmc.clientsort.mixin.client.accessor;
+
+import net.minecraft.client.gui.render.state.GuiRenderState;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(GuiRenderState.class)
+public interface GuiRenderStateAccessor {
+
+    @Accessor("firstStratumAfterBlur")
+    void clientsort$setFirstStratumAfterBlur(int firstStratumAfterBlur);
+}

common/src/main/resources/clientsort.mixins.json

@@ -16,7 +16,10 @@
     "client.MinecraftMixin",
     "client.ScreenMixin",
     "client.accessor.AbstractContainerScreenAccessor",
+    "client.accessor.AbstractWidgetAccessor",
     "client.accessor.CreativeModeTabsAccessor",
+    "client.accessor.GuiGraphicsAccessor",
+    "client.accessor.GuiRenderStateAccessor",
     "client.accessor.KeyMappingAccessor",
     "client.accessor.ScreenAccessor",
     "client.compat.emi.ReloadWorkerMixin",