Skip to content

Commit 0dcc3c1

Browse files
NotRykenNotRyken
committed
Update to mc1.21.3
1 parent 5ed4213 commit 0dcc3c1

File tree

13 files changed

+59
-41
lines changed

13 files changed

+59
-41
lines changed

‎common/build.gradle‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,24 @@ plugins {
33
id("net.neoforged.moddev")
44
}
55

6+
// Vanilla depends on ASM 9.3, MDG makes that a 'strict' version constraint,
7+
// but Mixin and MixinExtras needs newer ASM so we override that here.
8+
configurations.configureEach {
9+
resolutionStrategy.eachDependency { details ->
10+
if (details.requested.group == "org.ow2.asm") {
11+
details.useVersion(asm_version)
12+
details.because("Mixin requires new ASM")
13+
}
14+
}
15+
}
16+
617
dependencies {
18+
compileOnly "org.ow2.asm:asm:${asm_version}"
19+
compileOnly "org.ow2.asm:asm-analysis:${asm_version}"
20+
compileOnly "org.ow2.asm:asm-commons:${asm_version}"
21+
compileOnly "org.ow2.asm:asm-tree:${asm_version}"
22+
compileOnly "org.ow2.asm:asm-util:${asm_version}"
23+
724
compileOnly("org.spongepowered:mixin:${mixin_version}")
825
compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:${mixinextras_version}"))
926

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ public String lowerName() {
8181
}
8282
}
8383

84-
public static final boolean defaultLmbBundle = false;
85-
public boolean lmbBundle = defaultLmbBundle;
84+
public static final boolean defaultRmbBundle = false;
85+
public boolean rmbBundle = defaultRmbBundle;
8686

8787
// Sorting
8888
public static final String defaultSortMode = SortMode.CREATIVE.name;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,12 @@ else if (val > 100) return Optional.of(
100100
.setSaveConsumer(val -> options.extraSlotMode = val)
101101
.build());
102102

103-
general.addEntry(eb.startBooleanToggle(localized("option", "lmbBundle"),
104-
options.lmbBundle)
105-
.setTooltip(localized("option", "lmbBundle.tooltip"))
106-
.setDefaultValue(Config.Options.defaultLmbBundle)
103+
general.addEntry(eb.startBooleanToggle(localized("option", "rmbBundle"),
104+
options.rmbBundle)
105+
.setTooltip(localized("option", "rmbBundle.tooltip"))
106+
.setDefaultValue(Config.Options.defaultRmbBundle)
107107
.setSaveConsumer(val -> {
108-
options.lmbBundle = val;
108+
options.rmbBundle = val;
109109
if (val) CreativeSearchOrder.tryRefreshItemSearchPositionLookup();
110110
})
111111
.build());

‎common/src/main/java/dev/terminalmc/clientsort/inventory/ContainerScreenHelper.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import dev.terminalmc.clientsort.util.inject.ISlot;
2424
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
2525
import net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen;
26-
import net.minecraft.client.gui.screens.inventory.EffectRenderingInventoryScreen;
2726
import net.minecraft.world.entity.player.Inventory;
2827
import net.minecraft.world.inventory.ClickType;
2928
import net.minecraft.world.inventory.Slot;
@@ -63,7 +62,7 @@ public int getScope(Slot slot, boolean preferSmallerScopes) {
6362
if (slot.container == null || ((ISlot) slot).mouseWheelie_getIndexInInv() >= slot.container.getContainerSize() || !slot.mayPlace(ItemStack.EMPTY)) {
6463
return INVALID_SCOPE;
6564
}
66-
if (screen instanceof EffectRenderingInventoryScreen) {
65+
if (screen instanceof AbstractContainerScreen) {
6766
if (slot.container instanceof Inventory) {
6867
Config.Options options = Config.get().options;
6968
if (isHotbarSlot(slot)) {

‎common/src/main/java/dev/terminalmc/clientsort/inventory/sort/InventorySorter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ protected void sortOnClient(int[] sortedIds) {
206206

207207
// swap the current stack with the target stack
208208
if (
209-
Config.get().options.lmbBundle
209+
!Config.get().options.rmbBundle
210210
&& (
211211
(backingStacks[id] instanceof BundleItem && !(carriedItem instanceof AirItem))
212212
|| (carriedItem instanceof BundleItem && !(backingStacks[id] instanceof AirItem))

‎common/src/main/java/dev/terminalmc/clientsort/mixin/MixinClientPacketListener.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import net.minecraft.network.Connection;
2727
import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
2828
import net.minecraft.network.protocol.game.ClientboundLoginPacket;
29-
import net.minecraft.network.protocol.game.ClientboundSetCarriedItemPacket;
29+
import net.minecraft.network.protocol.game.ClientboundSetCursorItemPacket;
3030
import org.spongepowered.asm.mixin.Mixin;
3131
import org.spongepowered.asm.mixin.injection.At;
3232
import org.spongepowered.asm.mixin.injection.Inject;
@@ -43,8 +43,8 @@ private void onLogin(ClientboundLoginPacket packet, CallbackInfo ci) {
4343
ClientSort.searchOrderUpdated = false;
4444
}
4545

46-
@Inject(method = "handleSetCarriedItem", at = @At("HEAD"))
47-
public void onHeldItemChangeBegin(ClientboundSetCarriedItemPacket packet, CallbackInfo ci) {
46+
@Inject(method = "handleSetCursorItem", at = @At("HEAD"))
47+
public void onHeldItemChangeBegin(ClientboundSetCursorItemPacket packet, CallbackInfo ci) {
4848
InteractionManager.triggerSend(InteractionManager.TriggerType.HELD_ITEM_CHANGE);
4949
}
5050

‎common/src/main/resources/assets/clientsort/lang/en_us.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"option.clientsort.interactionRate.tooltip": "Reduce to sort faster, increase if you are experiencing packet rate issues",
1414
"option.clientsort.hotbarMode": "Hotbar Mode",
1515
"option.clientsort.extraSlotMode": "Extra Slot Mode",
16-
"option.clientsort.lmbBundle": "Bundles use Left Click",
17-
"option.clientsort.lmbBundle.tooltip": "In 1.21.2+, bundles use left-click to load, which breaks sorting. If playing on a 1.21.2+ server, enable this option.",
16+
"option.clientsort.rmbBundle": "Bundles use Right Click",
17+
"option.clientsort.rmbBundle.tooltip": "Before 1.21.2, bundles used right-click to load, which breaks sorting. If playing on a 1.21.1 or earlier server, enable this option.",
1818

1919
"option.clientsort.sorting": "Sorting",
2020
"option.clientsort.sortMode": "Sort Mode",

‎common/src/main/resources/assets/clientsort/lang/ru_ru.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"option.clientsort.interactionRate.tooltip": "Уменьшите, чтобы ускорить сортировку, увеличьте, если у вас возникли проблемы со скоростью передачи пакетов",
1414
"option.clientsort.hotbarMode": "Режим горячей панели",
1515
"option.clientsort.extraSlotMode": "Extra Slot Mode",
16-
"option.clientsort.lmbBundle": "Bundles use Right Click",
17-
"option.clientsort.lmbBundle.tooltip": "In 1.21.2+, bundles use right-click to load and unload, which breaks sorting. If playing on a 1.21.2+ server, enable this option.",
16+
"option.clientsort.rmbBundle": "Bundles use Right Click",
17+
"option.clientsort.rmbBundle.tooltip": "In 1.21.2+, bundles use right-click to load and unload, which breaks sorting. If playing on a 1.21.2+ server, enable this option.",
1818

1919
"option.clientsort.sorting": "Сортировка",
2020
"option.clientsort.sortMode": "Режим сортировки",

‎common/src/main/resources/assets/clientsort/lang/uk_ua.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"option.clientsort.interactionRate.tooltip": "Зменшіть для швидшого сортування, збільшіть якщо виникають проблеми з частотою пакетів",
1414
"option.clientsort.hotbarMode": "Режим панелі швидкого доступу",
1515
"option.clientsort.extraSlotMode": "Extra Slot Mode",
16-
"option.clientsort.lmbBundle": "Bundles use Left Click",
17-
"option.clientsort.lmbBundle.tooltip": "In 1.21.2+, bundles use left-click to load, which breaks sorting. If playing on a 1.21.2+ server, enable this option.",
16+
"option.clientsort.rmbBundle": "Bundles use Right Click",
17+
"option.clientsort.rmbBundle.tooltip": "Before 1.21.2, bundles used right-click to load, which breaks sorting. If playing on a 1.21.1 or earlier server, enable this option.",
1818

1919
"option.clientsort.sorting": "Сортування",
2020
"option.clientsort.sortMode": "Режим сортування",

‎common/src/main/resources/assets/clientsort/lang/zh_cn.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"option.clientsort.interactionRate.tooltip": "降低值可更快整理, 若遇到发包速率问题, 请将该值增加",
1414
"option.clientsort.hotbarMode": "快捷栏模式",
1515
"option.clientsort.extraSlotMode": "Extra Slot Mode",
16-
"option.clientsort.lmbBundle": "Bundles use Right Click",
17-
"option.clientsort.lmbBundle.tooltip": "In 1.21.2+, bundles use right-click to load and unload, which breaks sorting. If playing on a 1.21.2+ server, enable this option.",
16+
"option.clientsort.rmbBundle": "Bundles use Right Click",
17+
"option.clientsort.rmbBundle.tooltip": "In 1.21.2+, bundles use right-click to load and unload, which breaks sorting. If playing on a 1.21.2+ server, enable this option.",
1818

1919
"option.clientsort.sorting": "整理",
2020
"option.clientsort.sortMode": "整理模式",

0 commit comments

Comments
 (0)