Skip to content

Commit 5e0e1f0

Browse files
NotRykenNotRyken
committed
Update to mc1.21.8
1 parent 673b0b8 commit 5e0e1f0

13 files changed

Lines changed: 196 additions & 79 deletions

File tree

‎changelog.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
- Added a workaround for a crash when attempting to operate on containerless modded slots
6464
- Increased warning display time to 5 seconds
6565
- Added automatic update information to server class policy config
66+
- Re-enabled support for ItemLocks on 1.21.6+
6667

6768
## 2.0.0-beta.15
6869

@@ -74,6 +75,7 @@ Note: this beta version includes networking changes, servers and clients must be
7475
## 2.0.0-beta.14
7576

7677
- Added support for configuring specific items to always be sorted to the start or end
78+
- Fixed a launch crash on NeoForge on 1.21.7+
7779

7880
## 2.0.0-beta.13
7981

@@ -84,6 +86,7 @@ Note: this beta version includes networking changes, servers and clients must be
8486
## 2.0.0-beta.12
8587

8688
- Fixed button status not saving when changed via editor screen
89+
- Added compatibility with Blur+ mod on 1.21.6+
8790

8891
## 2.0.0-beta.11
8992

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

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import dev.terminalmc.clientsort.client.config.Vec2i;
2626
import dev.terminalmc.clientsort.client.gui.widget.TriggerButton;
2727
import dev.terminalmc.clientsort.mixin.client.accessor.AbstractContainerScreenAccessor;
28+
import dev.terminalmc.clientsort.mixin.client.accessor.GuiGraphicsAccessor;
29+
import dev.terminalmc.clientsort.mixin.client.accessor.GuiRenderStateAccessor;
2830
import dev.terminalmc.clientsort.util.inject.ISlot;
2931
import net.minecraft.ChatFormatting;
3032
import net.minecraft.client.Minecraft;
@@ -59,8 +61,7 @@ public abstract class EditorScreen extends Screen {
5961
public final Set<Integer> ignoredSlots = new TreeSet<>();
6062

6163
/**
62-
* An element of {@link EditorScreen#buttons} which 'represents' the whole set of
63-
* buttons.
64+
* An element of {@link EditorScreen#buttons} which 'represents' the whole set of buttons.
6465
* <p>
6566
* This can be any element, and the specific choice is only relevant when repositioning via
6667
* mouse drag.
@@ -69,8 +70,8 @@ public abstract class EditorScreen extends Screen {
6970

7071
/**
7172
* The class name of either {@link EditorScreen#rep}'s {@link TriggerButton#container}, or
72-
* {@link EditorScreen#underlay}'s {@link AbstractContainerScreen#getMenu} if the former
73-
* is {@code null}.
73+
* {@link EditorScreen#underlay}'s {@link AbstractContainerScreen#getMenu} if the former is
74+
* {@code null}.
7475
* <p>
7576
* This value represents the lowest-level key on which a {@link ClassPolicy} can be created, and
7677
* may differ from {@link EditorScreen#rep}'s {@link TriggerButton#activePolicyKey}.
@@ -404,7 +405,15 @@ lowestPolicyKey, new ClassPolicy(
404405
*/
405406
@Override
406407
public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
408+
underlay.renderBackground(graphics, mouseX, mouseY, partialTick);
407409
underlay.render(graphics, mouseX, mouseY, partialTick);
410+
411+
// Workaround for other mods adding blur when rendering the underlay
412+
((GuiRenderStateAccessor) ((GuiGraphicsAccessor) graphics).clientsort$getGuiRenderState())
413+
.clientsort$setFirstStratumAfterBlur(Integer.MAX_VALUE);
414+
graphics.nextStratum();
415+
renderBlurredBackground(graphics);
416+
408417
super.render(graphics, mouseX, mouseY, partialTick);
409418

410419
// Render disabled-slot indicators
@@ -471,17 +480,34 @@ public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float
471480
}
472481
}
473482

483+
/**
484+
* Removes the call to {@link Screen#renderBlurredBackground}, since we add a call in
485+
* {@link EditorScreen#render} and the method can only be called once.
486+
*/
487+
@Override
488+
public void renderBackground(
489+
@NotNull GuiGraphics graphics,
490+
int mouseX,
491+
int mouseY,
492+
float partialTick
493+
) {
494+
if (Minecraft.getInstance().level == null) {
495+
renderPanorama(graphics, partialTick);
496+
}
497+
renderMenuBackground(graphics);
498+
}
499+
474500
/**
475501
* Modifies the background blur to be constant irrespective of the configured value.
476502
* <p>
477503
* Minimal blur is used to prevent the editable widgets disappearing under underlay items on a
478504
* higher render layer, while still keeping the underlay detail discernible.
479505
*/
480506
@Override
481-
protected void renderBlurredBackground() {
507+
protected void renderBlurredBackground(@NotNull GuiGraphics graphics) {
482508
int original = Minecraft.getInstance().options.menuBackgroundBlurriness().get();
483509
Minecraft.getInstance().options.menuBackgroundBlurriness().set(1);
484-
super.renderBlurredBackground();
510+
super.renderBlurredBackground(graphics);
485511
Minecraft.getInstance().options.menuBackgroundBlurriness().set(original);
486512
}
487513

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

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import dev.terminalmc.clientsort.client.config.Config;
2020
import dev.terminalmc.clientsort.client.gui.TriggerButtonManager;
2121
import dev.terminalmc.clientsort.client.gui.widget.TriggerButton;
22+
import dev.terminalmc.clientsort.mixin.client.accessor.GuiGraphicsAccessor;
23+
import dev.terminalmc.clientsort.mixin.client.accessor.GuiRenderStateAccessor;
2224
import net.minecraft.ChatFormatting;
2325
import net.minecraft.client.Minecraft;
2426
import net.minecraft.client.gui.GuiGraphics;
@@ -99,7 +101,15 @@ private void rebuildGui() {
99101

100102
@Override
101103
public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
104+
underlay.renderBackground(graphics, mouseX, mouseY, partialTick);
102105
underlay.render(graphics, mouseX, mouseY, partialTick);
106+
107+
// Workaround for other mods adding blur when rendering the underlay
108+
((GuiRenderStateAccessor) ((GuiGraphicsAccessor) graphics).clientsort$getGuiRenderState())
109+
.clientsort$setFirstStratumAfterBlur(Integer.MAX_VALUE);
110+
graphics.nextStratum();
111+
renderBlurredBackground(graphics);
112+
103113
super.render(graphics, mouseX, mouseY, partialTick);
104114

105115
if (options().showButtons) {
@@ -109,12 +119,29 @@ public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float
109119
}
110120
}
111121

122+
/**
123+
* Removes the call to {@link Screen#renderBlurredBackground}, since we add a call in
124+
* {@link SelectorScreen#render} and the method can only be called once.
125+
*/
126+
@Override
127+
public void renderBackground(
128+
@NotNull GuiGraphics graphics,
129+
int mouseX,
130+
int mouseY,
131+
float partialTick
132+
) {
133+
if (Minecraft.getInstance().level == null) {
134+
renderPanorama(graphics, partialTick);
135+
}
136+
renderMenuBackground(graphics);
137+
}
138+
112139
@Override
113-
protected void renderBlurredBackground() {
140+
protected void renderBlurredBackground(@NotNull GuiGraphics graphics) {
114141
// Heavy blur, we want the widgets to really stand out
115142
int original = Minecraft.getInstance().options.menuBackgroundBlurriness().get();
116143
Minecraft.getInstance().options.menuBackgroundBlurriness().set(6);
117-
super.renderBlurredBackground();
144+
super.renderBlurredBackground(graphics);
118145
Minecraft.getInstance().options.menuBackgroundBlurriness().set(original);
119146
}
120147

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import dev.terminalmc.clientsort.client.gui.screen.edit.EditorScreen;
2525
import dev.terminalmc.clientsort.client.gui.screen.edit.PlayerEditorScreen;
2626
import dev.terminalmc.clientsort.mixin.client.accessor.AbstractContainerScreenAccessor;
27+
import dev.terminalmc.clientsort.mixin.client.accessor.AbstractWidgetAccessor;
2728
import net.minecraft.ChatFormatting;
2829
import net.minecraft.client.Minecraft;
2930
import net.minecraft.client.gui.ComponentPath;
@@ -34,7 +35,7 @@
3435
import net.minecraft.client.gui.navigation.FocusNavigationEvent;
3536
import net.minecraft.client.gui.screens.Screen;
3637
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
37-
import net.minecraft.client.renderer.RenderType;
38+
import net.minecraft.client.renderer.RenderPipelines;
3839
import net.minecraft.network.chat.CommonComponents;
3940
import net.minecraft.network.chat.Component;
4041
import net.minecraft.resources.ResourceLocation;
@@ -173,7 +174,7 @@ public void renderWidget(
173174

174175
// Draw texture
175176
ResourceLocation texture = sprites.get(isActive(), isHoveredOrFocused());
176-
graphics.blitSprite(RenderType::guiTextured, texture, getX(), getY(), width, height);
177+
graphics.blitSprite(RenderPipelines.GUI_TEXTURED, texture, getX(), getY(), width, height);
177178

178179
// Draw policy state indicator
179180
if (!operationAllowed) {
@@ -182,7 +183,8 @@ public void renderWidget(
182183

183184
// Refresh tooltip
184185
if (isMouseOver(mouseX, mouseY)) {
185-
if (Minecraft.getInstance().screen instanceof EditorScreen && getTooltip() == null) {
186+
if (Minecraft.getInstance().screen instanceof EditorScreen
187+
&& ((AbstractWidgetAccessor) this).clientsort$getTooltip().get() == null) {
186188
Component visibilityStatus = localized(
187189
"editor", active ? "enabled" : "disabled")
188190
.withStyle(active

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -276,10 +276,9 @@ private void afterRender(
276276
return;
277277

278278
if (ClientSort.overlayMessage != null) {
279-
graphics.pose().pushPose();
280-
graphics.pose().translate(0.0F, 0.0F, 1000F);
279+
graphics.pose().pushMatrix();
281280
ClientSort.overlayMessage.renderWidget(graphics, mouseX, mouseY, partialTick);
282-
graphics.pose().popPose();
281+
graphics.pose().popMatrix();
283282
}
284283

285284
if (!debug())
@@ -289,9 +288,8 @@ private void afterRender(
289288
ContainerScreenHelper.of((AbstractContainerScreen<?>) (Object) this);
290289

291290
float scale = 0.7F;
292-
graphics.pose().pushPose();
293-
graphics.pose().translate(0.0F, 0.0F, 1000F);
294-
graphics.pose().scale(scale, scale, 0.0F);
291+
graphics.pose().pushMatrix();
292+
graphics.pose().scale(scale, scale);
295293

296294
for (Slot slot : menu.slots) {
297295
int slotId = ((ISlot) slot).clientsort$getIndexInMenu();
@@ -346,6 +344,6 @@ private void afterRender(
346344
);
347345
}
348346

349-
graphics.pose().popPose();
347+
graphics.pose().popMatrix();
350348
}
351349
}

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*
2+
* Copyright 2025 TerminalMC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package dev.terminalmc.clientsort.mixin.client.accessor;
18+
19+
import net.minecraft.client.gui.components.AbstractWidget;
20+
import net.minecraft.client.gui.components.WidgetTooltipHolder;
21+
import org.spongepowered.asm.mixin.Mixin;
22+
import org.spongepowered.asm.mixin.gen.Accessor;
23+
24+
@Mixin(AbstractWidget.class)
25+
public interface AbstractWidgetAccessor {
26+
27+
@Accessor("tooltip")
28+
WidgetTooltipHolder clientsort$getTooltip();
29+
}

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*
2+
* Copyright 2025 TerminalMC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package dev.terminalmc.clientsort.mixin.client.accessor;
18+
19+
import net.minecraft.client.gui.GuiGraphics;
20+
import net.minecraft.client.gui.render.state.GuiRenderState;
21+
import org.spongepowered.asm.mixin.Mixin;
22+
import org.spongepowered.asm.mixin.gen.Accessor;
23+
24+
@Mixin(GuiGraphics.class)
25+
public interface GuiGraphicsAccessor {
26+
27+
@Accessor("guiRenderState")
28+
GuiRenderState clientsort$getGuiRenderState();
29+
}

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*
2+
* Copyright 2025 TerminalMC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package dev.terminalmc.clientsort.mixin.client.accessor;
18+
19+
import net.minecraft.client.gui.render.state.GuiRenderState;
20+
import org.spongepowered.asm.mixin.Mixin;
21+
import org.spongepowered.asm.mixin.gen.Accessor;
22+
23+
@Mixin(GuiRenderState.class)
24+
public interface GuiRenderStateAccessor {
25+
26+
@Accessor("firstStratumAfterBlur")
27+
void clientsort$setFirstStratumAfterBlur(int firstStratumAfterBlur);
28+
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
"client.MinecraftMixin",
1717
"client.ScreenMixin",
1818
"client.accessor.AbstractContainerScreenAccessor",
19+
"client.accessor.AbstractWidgetAccessor",
1920
"client.accessor.CreativeModeTabsAccessor",
21+
"client.accessor.GuiGraphicsAccessor",
22+
"client.accessor.GuiRenderStateAccessor",
2023
"client.accessor.KeyMappingAccessor",
2124
"client.accessor.ScreenAccessor",
2225
"client.compat.emi.ReloadWorkerMixin",

0 commit comments

Comments
 (0)