Skip to content

Commit 8bd3c73

Browse files
NotRykenNotRyken
committed
Update to mc1.21.10
1 parent 44910a5 commit 8bd3c73

File tree

21 files changed

+162
-185
lines changed

21 files changed

+162
-185
lines changed

‎common/src/main/java/dev/terminalmc/clientsort/client/ClientSort.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import dev.terminalmc.clientsort.client.config.Config;
2020
import dev.terminalmc.clientsort.client.interaction.InteractionManager;
2121
import dev.terminalmc.clientsort.client.order.SortOrder;
22-
import dev.terminalmc.clientsort.client.util.KeybindManager;
2322
import dev.terminalmc.clientsort.client.util.PolicyManager;
2423
import dev.terminalmc.clientsort.client.util.TaskManager;
2524
import dev.terminalmc.clientsort.mixin.client.accessor.AbstractContainerScreenAccessor;
@@ -35,8 +34,6 @@
3534
import java.util.concurrent.ArrayBlockingQueue;
3635
import java.util.concurrent.BlockingQueue;
3736

38-
import static dev.terminalmc.clientsort.client.config.Config.options;
39-
4037
public class ClientSort {
4138

4239
public static final String MOD_ID = dev.terminalmc.clientsort.ClientSort.MOD_ID;
@@ -89,9 +86,6 @@ public static void afterConfigSaved(Config config) {
8986
// Update sorting item sets
9087
updateItemSets(options);
9188
}
92-
// Isolate keybinds
93-
if (options().isolateKeybinds)
94-
KeybindManager.isolateKeybinds();
9589
}
9690

9791
public static void updateItemTags(Config.Options options) {
@@ -120,11 +114,6 @@ public static void updateItemSets(Config.Options options) {
120114
}
121115
}
122116

123-
public static void afterGameStart() {
124-
if (options().isolateKeybinds)
125-
KeybindManager.isolateKeybinds();
126-
}
127-
128117
public static void setOverlayMessage(
129118
AbstractContainerScreen<?> screen,
130119
Component message,

‎common/src/main/java/dev/terminalmc/clientsort/client/config/Config.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,6 @@ public enum ExtraSlotScope {
223223
public static final boolean allowSoundOverlapDefault = true;
224224
public boolean allowSoundOverlap = allowSoundOverlapDefault;
225225

226-
// Keybind options
227-
228-
public static final boolean isolateKeybindsDefault = true;
229-
public boolean isolateKeybinds = isolateKeybindsDefault;
230-
231226
// Button options
232227

233228
public static final boolean showButtonsDefault = true;

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
package dev.terminalmc.clientsort.client.gui;
1919

20+
import com.mojang.blaze3d.platform.InputConstants;
2021
import dev.terminalmc.clientsort.client.ClientSort;
2122
import dev.terminalmc.clientsort.client.config.ClassPolicy;
2223
import dev.terminalmc.clientsort.client.config.Operation;
@@ -35,6 +36,8 @@
3536
import net.minecraft.client.gui.screens.Screen;
3637
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
3738
import net.minecraft.client.gui.screens.inventory.InventoryScreen;
39+
import net.minecraft.client.input.MouseButtonEvent;
40+
import net.minecraft.client.input.MouseButtonInfo;
3841
import net.minecraft.client.player.LocalPlayer;
3942
import net.minecraft.network.chat.Component;
4043
import net.minecraft.world.Container;
@@ -310,7 +313,11 @@ private static void generateSimpleButton(
310313
&& !KeybindManager.isDown(KeybindManager.CANCEL_AUTO_KEY)
311314
&& (isPlayerInv ? playerButtons : containerButtons)
312315
.contains(button)) {
313-
button.onPress();
316+
button.onPress(new MouseButtonEvent(
317+
button.getX(),
318+
button.getY(),
319+
new MouseButtonInfo(InputConstants.MOUSE_BUTTON_LEFT, 0)
320+
));
314321
}
315322
}
316323
);
@@ -430,7 +437,11 @@ private static void generateDirectionalButton(
430437
&& !KeybindManager.isDown(KeybindManager.CANCEL_AUTO_KEY)
431438
&& (isPlayerInv ? playerButtons : containerButtons)
432439
.contains(button)) {
433-
button.onPress();
440+
button.onPress(new MouseButtonEvent(
441+
button.getX(),
442+
button.getY(),
443+
new MouseButtonInfo(InputConstants.MOUSE_BUTTON_LEFT, 0)
444+
));
434445
}
435446
}
436447
);

‎common/src/main/java/dev/terminalmc/clientsort/client/gui/screen/config/ClothScreenProvider.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -447,15 +447,6 @@ else if (val > Config.Options.SOUND_VOLUME_MAX)
447447

448448
ConfigCategory keybinds = builder.getOrCreateCategory(localized("option", "keybinds"));
449449

450-
keybinds.addEntry(eb.startBooleanToggle(
451-
localized("option", "isolateKeybinds"),
452-
options.isolateKeybinds
453-
)
454-
.setTooltip(localized("option", "isolateKeybinds.tooltip"))
455-
.setDefaultValue(Config.Options.isolateKeybindsDefault)
456-
.setSaveConsumer(val -> options.isolateKeybinds = val)
457-
.build());
458-
459450
keybinds.addEntry((eb.startKeyCodeField(
460451
localized("key", "edit"),
461452
((KeyMappingAccessor) KeybindManager.EDIT_KEY).clientsort$getKey()

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

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,12 @@
3030
import net.minecraft.client.gui.GuiGraphics;
3131
import net.minecraft.client.gui.components.Button;
3232
import net.minecraft.client.gui.components.CycleButton;
33-
import net.minecraft.client.gui.components.StringWidget;
3433
import net.minecraft.client.gui.components.Tooltip;
3534
import net.minecraft.client.gui.screens.ConfirmScreen;
3635
import net.minecraft.client.gui.screens.Screen;
3736
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
37+
import net.minecraft.client.input.KeyEvent;
38+
import net.minecraft.client.input.MouseButtonEvent;
3839
import net.minecraft.network.chat.CommonComponents;
3940
import net.minecraft.network.chat.Component;
4041
import net.minecraft.world.SimpleContainer;
@@ -186,8 +187,6 @@ private void rebuildGui() {
186187
clearWidgets();
187188

188189
Minecraft mc = Minecraft.getInstance();
189-
StringWidget titleWidget = new StringWidget(0, 2, width, font.lineHeight, title, font);
190-
addRenderableWidget(titleWidget);
191190

192191
int numButtons = 14;
193192
int x = 2;
@@ -579,6 +578,7 @@ public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float
579578
renderBlurredBackground(graphics);
580579

581580
super.render(graphics, mouseX, mouseY, partialTick);
581+
graphics.drawCenteredString(font, title, width / 2, 2, 0xFFFFFFFF);
582582

583583
// Render disabled-slot indicators
584584
for (Slot slot : underlay.getMenu().slots) {
@@ -721,9 +721,9 @@ public void saveAndClose() {
721721
* Allows pressing the arrow keys to reposition the set of buttons.
722722
*/
723723
@Override
724-
public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
725-
int distance = Screen.hasShiftDown() ? 6 : 1;
726-
@Nullable Vec2i movement = switch (keyCode) {
724+
public boolean keyPressed(KeyEvent event) {
725+
int distance = event.hasShiftDown() ? 6 : 1;
726+
@Nullable Vec2i movement = switch (event.key()) {
727727
case InputConstants.KEY_LEFT -> new Vec2i(-distance, 0);
728728
case InputConstants.KEY_RIGHT -> new Vec2i(distance, 0);
729729
case InputConstants.KEY_UP -> new Vec2i(0, -distance);
@@ -738,29 +738,29 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
738738
repositionButtons(rep, before);
739739
return true;
740740
}
741-
return super.keyPressed(keyCode, scanCode, modifiers);
741+
return super.keyPressed(event);
742742
}
743743

744744
/**
745745
* Allows dragging the selected widget to reposition it.
746746
*/
747747
@Override
748-
public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
749-
if (super.mouseClicked(mouseX, mouseY, mouseButton)) {
748+
public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
749+
if (super.mouseClicked(event, doubleClick)) {
750750
dragging = false;
751751
return true;
752752
} else {
753753
for (TriggerButton cb : buttons) {
754-
if (cb.isMouseOver(mouseX, mouseY)) {
755-
cb.mouseClicked(mouseX, mouseY, mouseButton);
754+
if (cb.isMouseOver(event.x(), event.y())) {
755+
cb.mouseClicked(event, doubleClick);
756756
rep = cb;
757757
dragging = true;
758758
return true;
759759
}
760760
}
761761
for (Slot slot : underlay.getMenu().slots) {
762762
if (((AbstractContainerScreenAccessor) underlay)
763-
.clientsort$isHovering(slot, mouseX, mouseY)) {
763+
.clientsort$isHovering(slot, event.x(), event.y())) {
764764
Object object = getObj(slot, underlay.getMenu());
765765
if (object != null && object.getClass().getName().equals(
766766
lowestPolicyClassName)) {
@@ -780,31 +780,25 @@ public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
780780
* Allows dragging the selected widget to reposition it.
781781
*/
782782
@Override
783-
public boolean mouseDragged(
784-
double mouseX,
785-
double mouseY,
786-
int button,
787-
double dragX,
788-
double dragY
789-
) {
783+
public boolean mouseDragged(MouseButtonEvent event, double dragX, double dragY) {
790784
if (dragging) {
791785
Vec2i before = rep.offset;
792-
if (rep.mouseDragged(mouseX, mouseY, button, dragX, dragY)) {
786+
if (rep.mouseDragged(event, dragX, dragY)) {
793787
// Move the other buttons to match the rep's movement
794788
repositionButtons(rep, before);
795789
return true;
796790
}
797791
}
798-
return super.mouseDragged(mouseX, mouseY, button, dragX, dragY);
792+
return super.mouseDragged(event, dragX, dragY);
799793
}
800794

801795
/**
802796
* Allows dragging the selected widget to reposition it.
803797
*/
804798
@Override
805-
public boolean mouseReleased(double mouseX, double mouseY, int mouseButton) {
799+
public boolean mouseReleased(MouseButtonEvent event) {
806800
dragging = false;
807-
return super.mouseReleased(mouseX, mouseY, mouseButton);
801+
return super.mouseReleased(event);
808802
}
809803

810804
/**

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import net.minecraft.client.gui.GuiGraphics;
2727
import net.minecraft.client.gui.components.Button;
2828
import net.minecraft.client.gui.components.CycleButton;
29-
import net.minecraft.client.gui.components.StringWidget;
3029
import net.minecraft.client.gui.screens.Screen;
3130
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
31+
import net.minecraft.client.input.MouseButtonEvent;
3232
import net.minecraft.network.chat.CommonComponents;
3333
import org.jetbrains.annotations.NotNull;
3434

@@ -71,9 +71,6 @@ private void reloadButtons() {
7171
private void rebuildGui() {
7272
clearWidgets();
7373

74-
StringWidget titleWidget = new StringWidget(0, 2, width, font.lineHeight, title, font);
75-
addRenderableWidget(titleWidget);
76-
7774
CycleButton<Boolean> toggleButton =
7875
CycleButton.booleanBuilder(
7976
localized("editor", "enabled").withStyle(ChatFormatting.GREEN),
@@ -111,6 +108,7 @@ public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float
111108
renderBlurredBackground(graphics);
112109

113110
super.render(graphics, mouseX, mouseY, partialTick);
111+
graphics.drawCenteredString(font, title, width / 2, 2, 0xFFFFFFFF);
114112

115113
if (options().showButtons) {
116114
for (TriggerButton cb : buttons) {
@@ -157,12 +155,12 @@ public void onClose() {
157155
}
158156

159157
@Override
160-
public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
161-
if (super.mouseClicked(mouseX, mouseY, mouseButton)) {
158+
public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
159+
if (super.mouseClicked(event, doubleClick)) {
162160
return true;
163161
} else {
164162
for (TriggerButton cb : buttons) {
165-
if (cb.isMouseOver(mouseX, mouseY)) {
163+
if (cb.isMouseOver(event.x(), event.y())) {
166164
cb.playDownSound(Minecraft.getInstance().getSoundManager());
167165
onClose();
168166
cb.openEditScreen();

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import dev.terminalmc.clientsort.client.config.*;
2222
import dev.terminalmc.clientsort.client.inventory.operator.SingleUseOperator;
2323
import dev.terminalmc.clientsort.client.order.SortOrder;
24+
import dev.terminalmc.clientsort.client.util.KeybindManager;
2425
import net.minecraft.client.gui.components.WidgetSprites;
25-
import net.minecraft.client.gui.screens.Screen;
2626
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
2727
import net.minecraft.network.chat.Component;
2828
import net.minecraft.resources.ResourceLocation;
@@ -70,11 +70,11 @@ public SortButton(
7070
policy != null && policy.showSortButton(),
7171
(button) -> {
7272
SortOrder sortOrder = options().sortOrder;
73-
if (Screen.hasShiftDown()) {
73+
if (KeybindManager.hasShiftDown()) {
7474
sortOrder = options().shiftSortOrder;
75-
} else if (Screen.hasControlDown()) {
75+
} else if (KeybindManager.hasControlDown()) {
7676
sortOrder = options().ctrlSortOrder;
77-
} else if (Screen.hasAltDown()) {
77+
} else if (KeybindManager.hasAltDown()) {
7878
sortOrder = options().altSortOrder;
7979
}
8080

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
import net.minecraft.client.gui.components.Tooltip;
3535
import net.minecraft.client.gui.components.WidgetSprites;
3636
import net.minecraft.client.gui.navigation.FocusNavigationEvent;
37-
import net.minecraft.client.gui.screens.Screen;
3837
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
38+
import net.minecraft.client.input.MouseButtonEvent;
3939
import net.minecraft.client.renderer.RenderPipelines;
4040
import net.minecraft.network.chat.CommonComponents;
4141
import net.minecraft.network.chat.Component;
@@ -118,12 +118,12 @@ protected TriggerButton(
118118
}
119119

120120
@Override
121-
public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
122-
if (isMouseOver(mouseX, mouseY)) {
123-
boolean rightClick = mouseButton == InputConstants.MOUSE_BUTTON_RIGHT;
121+
public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
122+
if (isMouseOver(event.x(), event.y())) {
123+
boolean rightClick = event.button() == InputConstants.MOUSE_BUTTON_RIGHT;
124124
if (Minecraft.getInstance().screen instanceof EditorScreen) {
125125
if (rightClick) {
126-
if (Screen.hasShiftDown()) {
126+
if (event.hasShiftDown()) {
127127
operationAllowed = !operationAllowed;
128128
} else {
129129
active = !active;
@@ -135,7 +135,7 @@ public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
135135
return true;
136136
}
137137
}
138-
return super.mouseClicked(mouseX, mouseY, mouseButton);
138+
return super.mouseClicked(event, doubleClick);
139139
}
140140

141141
/**
@@ -214,19 +214,19 @@ public void renderWidget(
214214
}
215215

216216
@Override
217-
protected void onDrag(double mouseX, double mouseY, double dragX, double dragY) {
217+
protected void onDrag(MouseButtonEvent event, double dragX, double dragY) {
218218
if (Minecraft.getInstance().screen instanceof EditorScreen) {
219219
AbstractContainerScreenAccessor acs = (AbstractContainerScreenAccessor) screen;
220-
int newX = Math.clamp((int) mouseX - HALF_WIDTH, 0, screen.width - WIDTH);
221-
int newY = Math.clamp((int) mouseY - HALF_HEIGHT, 0, screen.height - HEIGHT);
220+
int newX = Math.clamp((int) event.x() - HALF_WIDTH, 0, screen.width - WIDTH);
221+
int newY = Math.clamp((int) event.y() - HALF_HEIGHT, 0, screen.height - HEIGHT);
222222

223223
offset = new Vec2i(
224224
newX - getAnchorSideX(acs),
225225
newY - (acs.clientsort$getTopPos()
226226
+ Math.clamp(referenceSlot.y, 0, screen.height))
227227
);
228228
} else {
229-
super.onDrag(mouseX, mouseY, dragX, dragY);
229+
super.onDrag(event, dragX, dragY);
230230
}
231231
}
232232

0 commit comments

Comments
 (0)