Skip to content

Commit 04a5aa8

Browse files
NotRykenNotRyken
committed
Update to mc1.21.10
1 parent feb0407 commit 04a5aa8

File tree

21 files changed

+166
-186
lines changed

21 files changed

+166
-186
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;
@@ -32,8 +31,6 @@
3231
import net.minecraft.resources.ResourceLocation;
3332
import org.jetbrains.annotations.Nullable;
3433

35-
import static dev.terminalmc.clientsort.client.config.Config.options;
36-
3734
public class ClientSort {
3835

3936
public static final String MOD_ID = dev.terminalmc.clientsort.ClientSort.MOD_ID;
@@ -85,9 +82,6 @@ public static void afterConfigSaved(Config config) {
8582
// Update sorting item sets
8683
updateItemSets(options);
8784
}
88-
// Isolate keybinds
89-
if (options().isolateKeybinds)
90-
KeybindManager.isolateKeybinds();
9185
}
9286

9387
public static void updateItemTags(Config.Options options) {
@@ -116,11 +110,6 @@ public static void updateItemSets(Config.Options options) {
116110
}
117111
}
118112

119-
public static void afterGameStart() {
120-
if (options().isolateKeybinds)
121-
KeybindManager.isolateKeybinds();
122-
}
123-
124113
public static void setOverlayMessage(
125114
AbstractContainerScreen<?> screen,
126115
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
@@ -209,11 +209,6 @@ public enum ExtraSlotScope {
209209
public static final boolean allowSoundOverlapDefault = true;
210210
public boolean allowSoundOverlap = allowSoundOverlapDefault;
211211

212-
// Keybind options
213-
214-
public static final boolean isolateKeybindsDefault = true;
215-
public boolean isolateKeybinds = isolateKeybindsDefault;
216-
217212
// Button options
218213

219214
public static final boolean showButtonsDefault = true;

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
import net.minecraft.client.gui.screens.Screen;
3535
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
3636
import net.minecraft.client.gui.screens.inventory.InventoryScreen;
37+
import net.minecraft.client.input.MouseButtonEvent;
38+
import net.minecraft.client.input.MouseButtonInfo;
3739
import net.minecraft.client.player.LocalPlayer;
3840
import net.minecraft.network.chat.Component;
3941
import net.minecraft.world.Container;
@@ -292,7 +294,11 @@ private static void generateSimpleButton(
292294
() -> {
293295
if (Minecraft.getInstance().screen == screen
294296
&& !KeybindManager.CANCEL_AUTO_KEY.isDown()) {
295-
button.onPress();
297+
button.onPress(new MouseButtonEvent(
298+
button.getX(),
299+
button.getY(),
300+
new MouseButtonInfo(0, 0)
301+
));
296302
}
297303
}
298304
);
@@ -396,7 +402,11 @@ private static void generateDirectionalButton(
396402
() -> {
397403
if (Minecraft.getInstance().screen == screen
398404
&& !KeybindManager.CANCEL_AUTO_KEY.isDown()) {
399-
button.onPress();
405+
button.onPress(new MouseButtonEvent(
406+
button.getX(),
407+
button.getY(),
408+
new MouseButtonInfo(0, 0)
409+
));
400410
}
401411
}
402412
);

‎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
@@ -404,15 +404,6 @@ else if (val > Config.Options.SOUND_VOLUME_MAX)
404404

405405
ConfigCategory keybinds = builder.getOrCreateCategory(localized("option", "keybinds"));
406406

407-
keybinds.addEntry(eb.startBooleanToggle(
408-
localized("option", "isolateKeybinds"),
409-
options.isolateKeybinds
410-
)
411-
.setTooltip(localized("option", "isolateKeybinds.tooltip"))
412-
.setDefaultValue(Config.Options.isolateKeybindsDefault)
413-
.setSaveConsumer(val -> options.isolateKeybinds = val)
414-
.build());
415-
416407
keybinds.addEntry((eb.startKeyCodeField(
417408
localized("key", "edit"),
418409
((KeyMappingAccessor) KeybindManager.EDIT_KEY).clientsort$getKey()

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

Lines changed: 17 additions & 24 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;
@@ -175,9 +176,6 @@ private boolean reloadButtonsAndIgnoredSlots() {
175176
private void rebuildGui() {
176177
clearWidgets();
177178

178-
StringWidget titleWidget = new StringWidget(0, 2, width, font.lineHeight, title, font);
179-
addRenderableWidget(titleWidget);
180-
181179
int numButtons = 12;
182180
int x = 2;
183181
int movingY = height - 21 * numButtons;
@@ -457,6 +455,7 @@ public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float
457455
renderBlurredBackground(graphics);
458456

459457
super.render(graphics, mouseX, mouseY, partialTick);
458+
graphics.drawCenteredString(font, title, width / 2, 2, 0xFFFFFFFF);
460459

461460
// Render disabled-slot indicators
462461
for (Slot slot : underlay.getMenu().slots) {
@@ -593,9 +592,9 @@ public void saveAndClose() {
593592
* Allows pressing the arrow keys to reposition the set of buttons.
594593
*/
595594
@Override
596-
public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
597-
int distance = Screen.hasShiftDown() ? 6 : 1;
598-
@Nullable Vec2i movement = switch (keyCode) {
595+
public boolean keyPressed(KeyEvent event) {
596+
int distance = event.hasShiftDown() ? 6 : 1;
597+
@Nullable Vec2i movement = switch (event.key()) {
599598
case InputConstants.KEY_LEFT -> new Vec2i(-distance, 0);
600599
case InputConstants.KEY_RIGHT -> new Vec2i(distance, 0);
601600
case InputConstants.KEY_UP -> new Vec2i(0, -distance);
@@ -610,29 +609,29 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
610609
repositionButtons(rep, before);
611610
return true;
612611
}
613-
return super.keyPressed(keyCode, scanCode, modifiers);
612+
return super.keyPressed(event);
614613
}
615614

616615
/**
617616
* Allows dragging the selected widget to reposition it.
618617
*/
619618
@Override
620-
public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
621-
if (super.mouseClicked(mouseX, mouseY, mouseButton)) {
619+
public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
620+
if (super.mouseClicked(event, doubleClick)) {
622621
dragging = false;
623622
return true;
624623
} else {
625624
for (TriggerButton cb : buttons) {
626-
if (cb.isMouseOver(mouseX, mouseY)) {
627-
cb.mouseClicked(mouseX, mouseY, mouseButton);
625+
if (cb.isMouseOver(event.x(), event.y())) {
626+
cb.mouseClicked(event, doubleClick);
628627
rep = cb;
629628
dragging = true;
630629
return true;
631630
}
632631
}
633632
for (Slot slot : underlay.getMenu().slots) {
634633
if (((AbstractContainerScreenAccessor) underlay)
635-
.clientsort$isHovering(slot, mouseX, mouseY)) {
634+
.clientsort$isHovering(slot, event.x(), event.y())) {
636635
Object object = getObj(slot, underlay.getMenu());
637636
if (object != null && object.getClass().getName().equals(lowestPolicyKey)) {
638637
int slotId = ((ISlot) slot).clientsort$getIndexInContainer();
@@ -651,31 +650,25 @@ public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
651650
* Allows dragging the selected widget to reposition it.
652651
*/
653652
@Override
654-
public boolean mouseDragged(
655-
double mouseX,
656-
double mouseY,
657-
int button,
658-
double dragX,
659-
double dragY
660-
) {
653+
public boolean mouseDragged(MouseButtonEvent event, double dragX, double dragY) {
661654
if (dragging) {
662655
Vec2i before = rep.offset;
663-
if (rep.mouseDragged(mouseX, mouseY, button, dragX, dragY)) {
656+
if (rep.mouseDragged(event, dragX, dragY)) {
664657
// Move the other buttons to match the rep's movement
665658
repositionButtons(rep, before);
666659
return true;
667660
}
668661
}
669-
return super.mouseDragged(mouseX, mouseY, button, dragX, dragY);
662+
return super.mouseDragged(event, dragX, dragY);
670663
}
671664

672665
/**
673666
* Allows dragging the selected widget to reposition it.
674667
*/
675668
@Override
676-
public boolean mouseReleased(double mouseX, double mouseY, int mouseButton) {
669+
public boolean mouseReleased(MouseButtonEvent event) {
677670
dragging = false;
678-
return super.mouseReleased(mouseX, mouseY, mouseButton);
671+
return super.mouseReleased(event);
679672
}
680673

681674
/**

‎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;
@@ -67,11 +67,11 @@ public SortButton(
6767
policy != null && policy.showSortButton(),
6868
(button) -> {
6969
SortOrder sortOrder = options().sortOrder;
70-
if (Screen.hasShiftDown()) {
70+
if (KeybindManager.hasShiftDown()) {
7171
sortOrder = options().shiftSortOrder;
72-
} else if (Screen.hasControlDown()) {
72+
} else if (KeybindManager.hasControlDown()) {
7373
sortOrder = options().ctrlSortOrder;
74-
} else if (Screen.hasAltDown()) {
74+
} else if (KeybindManager.hasAltDown()) {
7575
sortOrder = options().altSortOrder;
7676
}
7777

‎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;
@@ -111,12 +111,12 @@ protected TriggerButton(
111111
}
112112

113113
@Override
114-
public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
115-
if (isMouseOver(mouseX, mouseY)) {
116-
boolean rightClick = mouseButton == InputConstants.MOUSE_BUTTON_RIGHT;
114+
public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
115+
if (isMouseOver(event.x(), event.y())) {
116+
boolean rightClick = event.button() == InputConstants.MOUSE_BUTTON_RIGHT;
117117
if (Minecraft.getInstance().screen instanceof EditorScreen) {
118118
if (rightClick) {
119-
if (Screen.hasShiftDown()) {
119+
if (event.hasShiftDown()) {
120120
operationAllowed = !operationAllowed;
121121
} else {
122122
active = !active;
@@ -128,7 +128,7 @@ public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
128128
return true;
129129
}
130130
}
131-
return super.mouseClicked(mouseX, mouseY, mouseButton);
131+
return super.mouseClicked(event, doubleClick);
132132
}
133133

134134
/**
@@ -208,19 +208,19 @@ public void renderWidget(
208208
}
209209

210210
@Override
211-
protected void onDrag(double mouseX, double mouseY, double dragX, double dragY) {
211+
protected void onDrag(MouseButtonEvent event, double dragX, double dragY) {
212212
if (Minecraft.getInstance().screen instanceof EditorScreen) {
213213
AbstractContainerScreenAccessor acs = (AbstractContainerScreenAccessor) screen;
214-
int newX = Math.clamp((int) mouseX - HALF_WIDTH, 0, screen.width - WIDTH);
215-
int newY = Math.clamp((int) mouseY - HALF_HEIGHT, 0, screen.height - HEIGHT);
214+
int newX = Math.clamp((int) event.x() - HALF_WIDTH, 0, screen.width - WIDTH);
215+
int newY = Math.clamp((int) event.y() - HALF_HEIGHT, 0, screen.height - HEIGHT);
216216

217217
offset = new Vec2i(
218218
newX - (acs.clientsort$getLeftPos() + acs.clientsort$getImageWidth()),
219219
newY - (acs.clientsort$getTopPos()
220220
+ Math.clamp(referenceSlot.y, 0, screen.height))
221221
);
222222
} else {
223-
super.onDrag(mouseX, mouseY, dragX, dragY);
223+
super.onDrag(event, dragX, dragY);
224224
}
225225
}
226226

0 commit comments

Comments
 (0)