Skip to content

Commit 4fec69e

Browse files
NotRykenNotRyken
committed
Update to mc1.21.10
1 parent 367e437 commit 4fec69e

File tree

20 files changed

+153
-183
lines changed

20 files changed

+153
-183
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;
@@ -83,9 +80,6 @@ public static void afterConfigSaved(Config config) {
8380
// Update sorting item sets
8481
updateItemSets(options);
8582
}
86-
// Isolate keybinds
87-
if (options().isolateKeybinds)
88-
KeybindManager.isolateKeybinds();
8983
}
9084

9185
public static void updateItemTags(Config.Options options) {
@@ -114,11 +108,6 @@ public static void updateItemSets(Config.Options options) {
114108
}
115109
}
116110

117-
public static void afterGameStart() {
118-
if (options().isolateKeybinds)
119-
KeybindManager.isolateKeybinds();
120-
}
121-
122111
public static void setOverlayMessage(
123112
AbstractContainerScreen<?> screen,
124113
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
@@ -210,11 +210,6 @@ public enum ExtraSlotScope {
210210
public static final boolean allowSoundOverlapDefault = true;
211211
public boolean allowSoundOverlap = allowSoundOverlapDefault;
212212

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

220215
public static final boolean showButtonsDefault = true;

‎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
@@ -32,11 +32,12 @@
3232
import net.minecraft.client.Minecraft;
3333
import net.minecraft.client.gui.GuiGraphics;
3434
import net.minecraft.client.gui.components.Button;
35-
import net.minecraft.client.gui.components.StringWidget;
3635
import net.minecraft.client.gui.components.Tooltip;
3736
import net.minecraft.client.gui.screens.ConfirmScreen;
3837
import net.minecraft.client.gui.screens.Screen;
3938
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
39+
import net.minecraft.client.input.KeyEvent;
40+
import net.minecraft.client.input.MouseButtonEvent;
4041
import net.minecraft.network.chat.CommonComponents;
4142
import net.minecraft.network.chat.Component;
4243
import net.minecraft.world.SimpleContainer;
@@ -172,9 +173,6 @@ private boolean reloadButtonsAndIgnoredSlots() {
172173
private void rebuildGui() {
173174
clearWidgets();
174175

175-
StringWidget titleWidget = new StringWidget(0, 2, width, font.lineHeight, title, font);
176-
addRenderableWidget(titleWidget);
177-
178176
int numButtons = 11;
179177
int x = 2;
180178
int movingY = height - 21 * numButtons;
@@ -415,6 +413,7 @@ public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float
415413
renderBlurredBackground(graphics);
416414

417415
super.render(graphics, mouseX, mouseY, partialTick);
416+
graphics.drawCenteredString(font, title, width / 2, 2, 0xFFFFFFFF);
418417

419418
// Render disabled-slot indicators
420419
for (Slot slot : underlay.getMenu().slots) {
@@ -551,9 +550,9 @@ public void saveAndClose() {
551550
* Allows pressing the arrow keys to reposition the set of buttons.
552551
*/
553552
@Override
554-
public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
555-
int distance = Screen.hasShiftDown() ? 6 : 1;
556-
@Nullable Vec2i movement = switch (keyCode) {
553+
public boolean keyPressed(KeyEvent event) {
554+
int distance = event.hasShiftDown() ? 6 : 1;
555+
@Nullable Vec2i movement = switch (event.key()) {
557556
case InputConstants.KEY_LEFT -> new Vec2i(-distance, 0);
558557
case InputConstants.KEY_RIGHT -> new Vec2i(distance, 0);
559558
case InputConstants.KEY_UP -> new Vec2i(0, -distance);
@@ -568,29 +567,29 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
568567
repositionButtons(rep, before);
569568
return true;
570569
}
571-
return super.keyPressed(keyCode, scanCode, modifiers);
570+
return super.keyPressed(event);
572571
}
573572

574573
/**
575574
* Allows dragging the selected widget to reposition it.
576575
*/
577576
@Override
578-
public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
579-
if (super.mouseClicked(mouseX, mouseY, mouseButton)) {
577+
public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
578+
if (super.mouseClicked(event, doubleClick)) {
580579
dragging = false;
581580
return true;
582581
} else {
583582
for (TriggerButton cb : buttons) {
584-
if (cb.isMouseOver(mouseX, mouseY)) {
585-
cb.mouseClicked(mouseX, mouseY, mouseButton);
583+
if (cb.isMouseOver(event.x(), event.y())) {
584+
cb.mouseClicked(event, doubleClick);
586585
rep = cb;
587586
dragging = true;
588587
return true;
589588
}
590589
}
591590
for (Slot slot : underlay.getMenu().slots) {
592591
if (((AbstractContainerScreenAccessor) underlay)
593-
.clientsort$isHovering(slot, mouseX, mouseY)) {
592+
.clientsort$isHovering(slot, event.x(), event.y())) {
594593
Object object = getObj(slot, underlay.getMenu());
595594
if (object != null && object.getClass().getName().equals(lowestPolicyKey)) {
596595
int slotId = ((ISlot) slot).clientsort$getIndexInContainer();
@@ -609,31 +608,25 @@ public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
609608
* Allows dragging the selected widget to reposition it.
610609
*/
611610
@Override
612-
public boolean mouseDragged(
613-
double mouseX,
614-
double mouseY,
615-
int button,
616-
double dragX,
617-
double dragY
618-
) {
611+
public boolean mouseDragged(MouseButtonEvent event, double dragX, double dragY) {
619612
if (dragging) {
620613
Vec2i before = rep.offset;
621-
if (rep.mouseDragged(mouseX, mouseY, button, dragX, dragY)) {
614+
if (rep.mouseDragged(event, dragX, dragY)) {
622615
// Move the other buttons to match the rep's movement
623616
repositionButtons(rep, before);
624617
return true;
625618
}
626619
}
627-
return super.mouseDragged(mouseX, mouseY, button, dragX, dragY);
620+
return super.mouseDragged(event, dragX, dragY);
628621
}
629622

630623
/**
631624
* Allows dragging the selected widget to reposition it.
632625
*/
633626
@Override
634-
public boolean mouseReleased(double mouseX, double mouseY, int mouseButton) {
627+
public boolean mouseReleased(MouseButtonEvent event) {
635628
dragging = false;
636-
return super.mouseReleased(mouseX, mouseY, mouseButton);
629+
return super.mouseReleased(event);
637630
}
638631

639632
/**

‎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
@@ -24,8 +24,8 @@
2424
import dev.terminalmc.clientsort.client.config.Vec2i;
2525
import dev.terminalmc.clientsort.client.inventory.operator.SingleUseOperator;
2626
import dev.terminalmc.clientsort.client.order.SortOrder;
27+
import dev.terminalmc.clientsort.client.util.KeybindManager;
2728
import net.minecraft.client.gui.components.WidgetSprites;
28-
import net.minecraft.client.gui.screens.Screen;
2929
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
3030
import net.minecraft.network.chat.Component;
3131
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
@@ -33,8 +33,8 @@
3333
import net.minecraft.client.gui.components.Tooltip;
3434
import net.minecraft.client.gui.components.WidgetSprites;
3535
import net.minecraft.client.gui.navigation.FocusNavigationEvent;
36-
import net.minecraft.client.gui.screens.Screen;
3736
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
37+
import net.minecraft.client.input.MouseButtonEvent;
3838
import net.minecraft.client.renderer.RenderPipelines;
3939
import net.minecraft.network.chat.CommonComponents;
4040
import net.minecraft.network.chat.Component;
@@ -110,12 +110,12 @@ protected TriggerButton(
110110
}
111111

112112
@Override
113-
public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
114-
if (isMouseOver(mouseX, mouseY)) {
115-
boolean rightClick = mouseButton == InputConstants.MOUSE_BUTTON_RIGHT;
113+
public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
114+
if (isMouseOver(event.x(), event.y())) {
115+
boolean rightClick = event.button() == InputConstants.MOUSE_BUTTON_RIGHT;
116116
if (Minecraft.getInstance().screen instanceof EditorScreen) {
117117
if (rightClick) {
118-
if (Screen.hasShiftDown()) {
118+
if (event.hasShiftDown()) {
119119
operationAllowed = !operationAllowed;
120120
} else {
121121
active = !active;
@@ -127,7 +127,7 @@ public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
127127
return true;
128128
}
129129
}
130-
return super.mouseClicked(mouseX, mouseY, mouseButton);
130+
return super.mouseClicked(event, doubleClick);
131131
}
132132

133133
/**
@@ -207,19 +207,19 @@ public void renderWidget(
207207
}
208208

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

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

0 commit comments

Comments
 (0)