Skip to content

Commit 34bb378

Browse files
SiphalorSiphalor
committed
feat: Update to Minecraft 26.2 (rc 2)
1 parent 70112a1 commit 34bb378

12 files changed

Lines changed: 108 additions & 27 deletions

File tree

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
org.gradle.jvmargs=-Xmx1G
22

3-
minecraft.version.descriptor = 26.1.0
3+
minecraft.version.descriptor = 26.2.0
44

55
version = 1.16.2
66
version.type = release

‎gradle/mc-26.1.0/mc.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
amecs-key-mapping-descriptions = "1.0.1"
2+
amecs-key-mapping-descriptions = "1.0.2"
33
amecs-mouse-inputs = "1.0.1"
44
amecs-priority-key-mappings = "1.0.1"
55
coat = "1.1.2"

‎gradle/mc-26.2.0/gradle.properties‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
mc.version.title = 26.2
2+
mc.version.supported = 26.2-rc-2
3+
4+
fabric.loom = plain
5+
6+
fabric.api.key_mapping = fabric-key-mapping-api-v1
7+
8+
mixins.extra.client = \
9+
MixinClientCommonNetworkHandler,\
10+
StackedItemContentsAccessor,\
11+
gui.screen.MixinAbstractRecipeBookScreen,\
12+
item.BundleContentsAccessor
13+
14+
preprocessor.mc_version_number = 260200

‎gradle/mc-26.2.0/mc.versions.toml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
[versions]
2+
amecs-key-mapping-descriptions = "1.0.2"
3+
amecs-mouse-inputs = "1.0.1"
4+
amecs-priority-key-mappings = "1.0.1"
5+
coat = "1.1.3"
6+
fabric-api = "0.152.0+26.2"
7+
java = "25"
8+
minecraft = "26.2-rc-2"
9+
modmenu = "20.0.0-alpha.1"
10+
tweed = "0.9.0"
11+
12+
[libraries]
13+
amecs-key-mapping-descriptions = { group = "de.siphalor.amecs.amecs-key-mapping-descriptions", name = "amecs-key-mapping-descriptions-mc26.2.0", version.ref = "amecs-key-mapping-descriptions" }
14+
amecs-mouse-inputs = { group = "de.siphalor.amecs.amecs-mouse-inputs", name = "amecs-mouse-inputs-mc26.2.0", version.ref = "amecs-mouse-inputs" }
15+
amecs-priority-key-mappings = { group = "de.siphalor.amecs.amecs-priority-key-mappings", name = "amecs-priority-key-mappings-mc26.2.0", version.ref = "amecs-priority-key-mappings" }
16+
coat = { group = "de.siphalor.coat", name = "coat-mc26.2.0", version.ref = "coat" }
17+
minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" }
18+
modmenu = { group = "com.terraformersmc", name = "modmenu", version.ref = "modmenu" }
19+
tweed-bundle = { group = "de.siphalor.tweed5.minecraft", name = "tweed5-bundle", version.ref = "tweed" }
20+
tweed-bundle-pojoWeaving = { group = "de.siphalor.tweed5.minecraft", name = "tweed5-bundle-pojo-weaving", version.ref = "tweed" }
21+
tweed-coatBridge = { group = "de.siphalor.tweed5.minecraft.tweed5-coat-bridge", name = "tweed5-coat-bridge-mc26.2.0", version.ref = "tweed" }
22+
tweed-comment-loader = { group = "de.siphalor.tweed5.minecraft", name = "tweed5-comment-loader-extension", version.ref = "tweed" }
23+
tweed-fabricHelper = { group = "de.siphalor.tweed5.minecraft.tweed5-fabric-helper", name = "tweed5-fabric-helper-mc26.2.0", version.ref = "tweed" }
24+
tweed-serde-gson = { group = "de.siphalor.tweed5.minecraft", name = "tweed5-serde-gson", version.ref = "tweed" }
25+
tweed-serde-hjson = { group = "de.siphalor.tweed5.minecraft", name = "tweed5-serde-hjson", version.ref = "tweed" }
26+
27+
[bundles]
28+
config = [
29+
"coat",
30+
"tweed-bundle",
31+
"tweed-bundle-pojoWeaving",
32+
"tweed-coatBridge",
33+
"tweed-comment-loader",
34+
"tweed-fabricHelper",
35+
"tweed-serde-gson",
36+
"tweed-serde-hjson",
37+
]

‎src/main/java/de/siphalor/mousewheelie/client/MWClient.java‎

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555
import net.minecraft.client.KeyMapping;
5656
import net.minecraft.client.Minecraft;
57-
//- import net.minecraft.client.gui.screens.Screen;
57+
import net.minecraft.client.gui.screens.Screen;
5858
import net.minecraft.core.BlockPos;
5959
import net.minecraft.core.component.DataComponents;
6060
import net.minecraft.network.chat.Component;
@@ -251,20 +251,21 @@ public static boolean isOnLocalServer() {
251251
public static boolean triggerScroll(double mouseX, double mouseY, double scrollY) {
252252
double scrollAmount = scrollY * CLIENT.options.mouseWheelSensitivity().get();
253253
ScrollAction result;
254-
if (CLIENT.screen instanceof ISpecialScrollableScreen) {
255-
result = ((ISpecialScrollableScreen) CLIENT.screen).mouseWheelie_onMouseScrolledSpecial(mouseX, mouseY, scrollAmount);
254+
Screen openScreen = getOpenScreen();
255+
if (openScreen instanceof ISpecialScrollableScreen) {
256+
result = ((ISpecialScrollableScreen) openScreen).mouseWheelie_onMouseScrolledSpecial(mouseX, mouseY, scrollAmount);
256257
if (result.cancelsCustomActions()) {
257258
return result.cancelsAllActions();
258259
}
259260
}
260-
if (CLIENT.screen instanceof IContainerScreen) {
261-
result = ((IContainerScreen) CLIENT.screen).mouseWheelie_onMouseScroll(mouseX, mouseY, scrollY);
261+
if (openScreen instanceof IContainerScreen) {
262+
result = ((IContainerScreen) openScreen).mouseWheelie_onMouseScroll(mouseX, mouseY, scrollY);
262263
if (result.cancelsCustomActions()) {
263264
return result.cancelsAllActions();
264265
}
265266
}
266-
if (CLIENT.screen instanceof IScrollableRecipeBook) {
267-
result = ((IScrollableRecipeBook) CLIENT.screen).mouseWheelie_onMouseScrollRecipeBook(mouseX, mouseY, scrollY);
267+
if (openScreen instanceof IScrollableRecipeBook) {
268+
result = ((IScrollableRecipeBook) openScreen).mouseWheelie_onMouseScrollRecipeBook(mouseX, mouseY, scrollY);
268269
if (result.cancelsCustomActions()) {
269270
return result.cancelsAllActions();
270271
}
@@ -390,4 +391,20 @@ public Component asText(SortMode sortMode) {
390391
})
391392
.build());
392393
}
394+
395+
public static Screen getOpenScreen() {
396+
//# if MC_VERSION_NUMBER >= 260200
397+
return CLIENT.gui.screen();
398+
//# else
399+
//- return CLIENT.screen;
400+
//# end
401+
}
402+
403+
public static void openScreen(Screen screen) {
404+
//# if MC_VERSION_NUMBER >= 260200
405+
CLIENT.gui.setScreen(screen);
406+
//# else
407+
//- CLIENT.setScreen(screen);
408+
//# end
409+
}
393410
}

‎src/main/java/de/siphalor/mousewheelie/client/config/MWServerRequiredTweedExtension.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
import lombok.RequiredArgsConstructor;
4040
import org.jetbrains.annotations.NotNull;
4141

42-
import net.minecraft.client.resources.language.I18n;
42+
//- import net.minecraft.client.resources.language.I18n;
43+
import net.minecraft.locale.Language;
4344

4445
/**
4546
* Custom Tweed extension that adds an informational message
@@ -114,10 +115,14 @@ public ConfigEntryValidator process(ConfigEntryValidator inner, ValidatorMiddlew
114115
if (!innerDescription.isBlank()) {
115116
innerDescription += "\n\n";
116117
}
117-
if (I18n.exists(MESSAGE_KEY)) {
118-
return innerDescription + (I18n.get(MESSAGE_KEY));
119-
}
120-
return innerDescription + englishMessage;
118+
//# if MC_VERSION_NUMBER >= 260200
119+
return innerDescription + Language.getInstance().getOrDefault(MESSAGE_KEY, englishMessage);
120+
//# else
121+
//- if (I18n.exists(MESSAGE_KEY)) {
122+
//- return innerDescription + (I18n.get(MESSAGE_KEY));
123+
//- }
124+
//- return innerDescription + englishMessage;
125+
//# end
121126
}
122127
};
123128
}

‎src/main/java/de/siphalor/mousewheelie/client/inventory/SlotRefiller.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
//- import de.siphalor.mousewheelie.MWConfig;
2121
import de.siphalor.mousewheelie.MouseWheelie;
22+
import de.siphalor.mousewheelie.client.MWClient;
2223
import de.siphalor.mousewheelie.client.inventory.view.InventoryView;
2324
import de.siphalor.mousewheelie.client.inventory.view.InventoryViewEntry;
2425
import de.siphalor.mousewheelie.client.inventory.view.InventoryViewLocation;
@@ -77,7 +78,7 @@ private SlotRefiller() {}
7778
* @return whether a refill has been scheduled
7879
*/
7980
public static boolean scheduleRefillChecked(InteractionHand hand, Inventory inventory, ItemStack oldStack, ItemStack newStack) {
80-
if (Minecraft.getInstance().screen != null) {
81+
if (MWClient.getOpenScreen() != null) {
8182
return false;
8283
}
8384

‎src/main/java/de/siphalor/mousewheelie/client/keybinding/OpenConfigScreenKeybinding.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
import de.siphalor.amecs.priority_key_mappings.api.AmecsPriorityKeyMapping;
2222
import de.siphalor.mousewheelie.client.MWClient;
2323

24-
import net.minecraft.client.Minecraft;
24+
//- import net.minecraft.client.Minecraft;
25+
import net.minecraft.client.gui.screens.Screen;
2526
import net.minecraft.client.gui.screens.TitleScreen;
2627
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
2728

@@ -36,9 +37,9 @@ public OpenConfigScreenKeybinding(String name, InputConstants.Key key, Category
3637

3738
@Override
3839
public boolean onPressedPriority() {
39-
Minecraft minecraftClient = Minecraft.getInstance();
40-
if (minecraftClient.screen == null || minecraftClient.screen instanceof AbstractContainerScreen || minecraftClient.screen instanceof TitleScreen) {
41-
minecraftClient.setScreen(MWClient.createConfigScreen());
40+
Screen openScreen = MWClient.getOpenScreen();
41+
if (openScreen == null || openScreen instanceof AbstractContainerScreen || openScreen instanceof TitleScreen) {
42+
MWClient.openScreen(MWClient.createConfigScreen());
4243
return true;
4344
}
4445
return false;

‎src/main/java/de/siphalor/mousewheelie/client/keybinding/PickToolKeyBinding.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import com.mojang.blaze3d.platform.InputConstants;
2121
import de.siphalor.amecs.priority_key_mappings.api.AmecsPriorityKeyMapping;
22+
import de.siphalor.mousewheelie.client.MWClient;
2223
import de.siphalor.mousewheelie.client.inventory.ToolPicker;
2324

2425
import net.minecraft.client.Minecraft;
@@ -37,7 +38,7 @@ public PickToolKeyBinding(String name, InputConstants.Key key, Category category
3738

3839
@Override
3940
public boolean onPressedPriority() {
40-
if (Minecraft.getInstance().screen != null) return false;
41+
if (MWClient.getOpenScreen() != null) return false;
4142
Player playerEntity = Minecraft.getInstance().player;
4243
if (playerEntity != null) {
4344
HitResult hitResult = playerEntity.pick(4.5D, 0.0F, false);

‎src/main/java/de/siphalor/mousewheelie/client/keybinding/SortKeyBinding.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919

2020
import com.mojang.blaze3d.platform.InputConstants;
2121
import de.siphalor.amecs.priority_key_mappings.api.AmecsPriorityKeyMapping;
22+
import de.siphalor.mousewheelie.client.MWClient;
2223
import de.siphalor.mousewheelie.client.util.inject.IContainerScreen;
2324

24-
import net.minecraft.client.Minecraft;
25+
//- import net.minecraft.client.Minecraft;
2526
import net.minecraft.client.gui.screens.Screen;
2627

2728
public class SortKeyBinding extends MWBaseKeyMapping implements AmecsPriorityKeyMapping {
@@ -35,7 +36,7 @@ public SortKeyBinding(String name, InputConstants.Key key, Category category) {
3536

3637
@Override
3738
public boolean onPressedPriority() {
38-
Screen currentScreen = Minecraft.getInstance().screen;
39+
Screen currentScreen = MWClient.getOpenScreen();
3940
if (currentScreen instanceof IContainerScreen)
4041
return ((IContainerScreen) currentScreen).mouseWheelie_triggerSort();
4142
return false;

0 commit comments

Comments
 (0)