From 080ea22d6de3e28ae1c1890e31b9f3fc3f2f0d0f Mon Sep 17 00:00:00 2001 From: Exterminate Date: Wed, 16 Sep 2026 14:01:50 +1000 Subject: [PATCH 1/5] update vfp to the new 5.0 update --- fabric-26.2/build.gradle | 2 +- .../kurrycat/mpkmod/compatibility/fabric_26_2/MPKMod.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fabric-26.2/build.gradle b/fabric-26.2/build.gradle index da2a168c..56811c61 100644 --- a/fabric-26.2/build.gradle +++ b/fabric-26.2/build.gradle @@ -22,7 +22,7 @@ dependencies { implementation include("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}") - compileOnly "com.viaversion:viafabricplus-api:4.5.4" + compileOnly "com.viaversion:viafabricplus-api:5.0.1" compileOnly "com.terraformersmc:modmenu:20.0.0-beta.2" implementation "com.github.MPKMod.MPKNetworkAPI:common:${project.networkApiVersion}" diff --git a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/MPKMod.java b/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/MPKMod.java index c71b082b..079891c6 100644 --- a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/MPKMod.java +++ b/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/MPKMod.java @@ -2,7 +2,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.viaversion.viafabricplus.ViaFabricPlus; -import com.viaversion.viafabricplus.api.ViaFabricPlusBase; +import com.viaversion.viafabricplus.api.ViaFabricPlusAPI; import io.github.kurrycat.mpkmod.compatibility.API; import io.github.kurrycat.mpkmod.compatibility.MCClasses.KeyBinding; import io.github.kurrycat.mpkmod.compatibility.fabric_26_2.network.DataCustomPayload; @@ -55,9 +55,9 @@ public void onInitialize() { if (!FabricLoader.getInstance().isModLoaded("viafabricplus")) return; - ViaFabricPlusBase platform = ViaFabricPlus.getImpl(); + ViaFabricPlusAPI platform = ViaFabricPlus.api(); - platform.registerOnChangeProtocolVersionCallback((oldVersion, newVersion) -> { + platform.addChangeProtocolVersionListener((oldVersion, newVersion) -> { String newVersionName = newVersion.getName(); io.github.kurrycat.mpkmod.compatibility.MCClasses.Minecraft.vfpVersion = ( From b91190ad18cfda9097e2886de078951b17c92bd0 Mon Sep 17 00:00:00 2001 From: Exterminate Date: Wed, 16 Sep 2026 15:32:00 +1000 Subject: [PATCH 2/5] 26.3 compatibility --- .../MCClasses/InputConstants.java | 330 +++++++++--------- {fabric-26.2 => fabric-26.3}/.gitignore | 0 {fabric-26.2 => fabric-26.3}/build.gradle | 4 +- .../gradle.properties | 6 +- .../fabric_26_3}/EventHandler.java | 7 +- .../fabric_26_3}/FunctionCompatibility.java | 14 +- .../fabric_26_3}/MPKGuiScreen.java | 4 +- .../compatibility/fabric_26_3}/MPKMod.java | 9 +- .../fabric_26_3}/MPKModMenu.java | 2 +- .../mixin/KeyMappingAccessor.java | 2 +- .../mixin/KeyboardHandlerMixin.java | 4 +- .../mixin/LevelRendererMixin.java | 4 +- .../fabric_26_3}/mixin/MinecraftMixin.java | 4 +- .../fabric_26_3}/mixin/MouseHandlerMixin.java | 10 +- .../mixin/ToggleSprintKeyMixin.java | 2 +- .../network/DataCustomPayload.java | 2 +- .../resources/assets/mpkmod/lang/en_us.json | 0 .../resources/assets/mpkmod/lang/pl_pl.json | 0 .../src/main/resources/fabric.mod.json | 8 +- .../src/main/resources/mpkmod.classtweaker | 0 .../src/main/resources/mpkmod.mixins.json | 2 +- gradle.properties | 2 +- settings.gradle.kts | 2 +- 23 files changed, 208 insertions(+), 210 deletions(-) rename {fabric-26.2 => fabric-26.3}/.gitignore (100%) rename {fabric-26.2 => fabric-26.3}/build.gradle (90%) rename {fabric-26.2 => fabric-26.3}/gradle.properties (73%) rename {fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2 => fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3}/EventHandler.java (97%) rename {fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2 => fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3}/FunctionCompatibility.java (97%) rename {fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2 => fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3}/MPKGuiScreen.java (95%) rename {fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2 => fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3}/MPKMod.java (94%) rename {fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2 => fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3}/MPKModMenu.java (84%) rename {fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2 => fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3}/mixin/KeyMappingAccessor.java (82%) rename {fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2 => fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3}/mixin/KeyboardHandlerMixin.java (83%) rename {fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2 => fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3}/mixin/LevelRendererMixin.java (88%) rename {fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2 => fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3}/mixin/MinecraftMixin.java (77%) rename {fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2 => fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3}/mixin/MouseHandlerMixin.java (75%) rename {fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2 => fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3}/mixin/ToggleSprintKeyMixin.java (92%) rename {fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2 => fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3}/network/DataCustomPayload.java (95%) rename {fabric-26.2 => fabric-26.3}/src/main/resources/assets/mpkmod/lang/en_us.json (100%) rename {fabric-26.2 => fabric-26.3}/src/main/resources/assets/mpkmod/lang/pl_pl.json (100%) rename {fabric-26.2 => fabric-26.3}/src/main/resources/fabric.mod.json (78%) rename {fabric-26.2 => fabric-26.3}/src/main/resources/mpkmod.classtweaker (100%) rename {fabric-26.2 => fabric-26.3}/src/main/resources/mpkmod.mixins.json (97%) diff --git a/common/src/main/java/io/github/kurrycat/mpkmod/compatibility/MCClasses/InputConstants.java b/common/src/main/java/io/github/kurrycat/mpkmod/compatibility/MCClasses/InputConstants.java index 9b704d27..17a9b6da 100644 --- a/common/src/main/java/io/github/kurrycat/mpkmod/compatibility/MCClasses/InputConstants.java +++ b/common/src/main/java/io/github/kurrycat/mpkmod/compatibility/MCClasses/InputConstants.java @@ -2,131 +2,173 @@ @SuppressWarnings("unused") public class InputConstants { - public static final int KEY_0 = 48; - public static final int KEY_1 = 49; - public static final int KEY_2 = 50; - public static final int KEY_3 = 51; - public static final int KEY_4 = 52; - public static final int KEY_5 = 53; - public static final int KEY_6 = 54; - public static final int KEY_7 = 55; - public static final int KEY_8 = 56; - public static final int KEY_9 = 57; - public static final int KEY_A = 65; - public static final int KEY_B = 66; - public static final int KEY_C = 67; - public static final int KEY_D = 68; - public static final int KEY_E = 69; - public static final int KEY_F = 70; - public static final int KEY_G = 71; - public static final int KEY_H = 72; - public static final int KEY_I = 73; - public static final int KEY_J = 74; - public static final int KEY_K = 75; - public static final int KEY_L = 76; - public static final int KEY_M = 77; - public static final int KEY_N = 78; - public static final int KEY_O = 79; - public static final int KEY_P = 80; - public static final int KEY_Q = 81; - public static final int KEY_R = 82; - public static final int KEY_S = 83; - public static final int KEY_T = 84; - public static final int KEY_U = 85; - public static final int KEY_V = 86; - public static final int KEY_W = 87; - public static final int KEY_X = 88; - public static final int KEY_Y = 89; - public static final int KEY_Z = 90; - public static final int KEY_F1 = 290; - public static final int KEY_F2 = 291; - public static final int KEY_F3 = 292; - public static final int KEY_F4 = 293; - public static final int KEY_F5 = 294; - public static final int KEY_F6 = 295; - public static final int KEY_F7 = 296; - public static final int KEY_F8 = 297; - public static final int KEY_F9 = 298; - public static final int KEY_F10 = 299; - public static final int KEY_F11 = 300; - public static final int KEY_F12 = 301; - public static final int KEY_F13 = 302; - public static final int KEY_F14 = 303; - public static final int KEY_F15 = 304; - public static final int KEY_F16 = 305; - public static final int KEY_F17 = 306; - public static final int KEY_F18 = 307; - public static final int KEY_F19 = 308; - public static final int KEY_F20 = 309; - public static final int KEY_F21 = 310; - public static final int KEY_F22 = 311; - public static final int KEY_F23 = 312; - public static final int KEY_F24 = 313; - public static final int KEY_F25 = 314; - public static final int KEY_NUMLOCK = 282; - public static final int KEY_NUMPAD0 = 320; - public static final int KEY_NUMPAD1 = 321; - public static final int KEY_NUMPAD2 = 322; - public static final int KEY_NUMPAD3 = 323; - public static final int KEY_NUMPAD4 = 324; - public static final int KEY_NUMPAD5 = 325; - public static final int KEY_NUMPAD6 = 326; - public static final int KEY_NUMPAD7 = 327; - public static final int KEY_NUMPAD8 = 328; - public static final int KEY_NUMPAD9 = 329; - public static final int KEY_NUMPADCOMMA = 330; - public static final int KEY_NUMPADENTER = 335; - public static final int KEY_NUMPADEQUALS = 336; - public static final int KEY_DOWN = 264; - public static final int KEY_LEFT = 263; - public static final int KEY_RIGHT = 262; - public static final int KEY_UP = 265; - public static final int KEY_ADD = 334; - public static final int KEY_APOSTROPHE = 39; - public static final int KEY_BACKSLASH = 92; - public static final int KEY_COMMA = 44; - public static final int KEY_EQUALS = 61; - public static final int KEY_GRAVE = 96; - public static final int KEY_LBRACKET = 91; + public static final int KEY_0 = 39; + public static final int KEY_1 = 30; + public static final int KEY_2 = 31; + public static final int KEY_3 = 32; + public static final int KEY_4 = 33; + public static final int KEY_5 = 34; + public static final int KEY_6 = 35; + public static final int KEY_7 = 36; + public static final int KEY_8 = 37; + public static final int KEY_9 = 38; + public static final int KEY_A = 4; + public static final int KEY_B = 5; + public static final int KEY_C = 6; + public static final int KEY_D = 7; + public static final int KEY_E = 8; + public static final int KEY_F = 9; + public static final int KEY_G = 10; + public static final int KEY_H = 11; + public static final int KEY_I = 12; + public static final int KEY_J = 13; + public static final int KEY_K = 14; + public static final int KEY_L = 15; + public static final int KEY_M = 16; + public static final int KEY_N = 17; + public static final int KEY_O = 18; + public static final int KEY_P = 19; + public static final int KEY_Q = 20; + public static final int KEY_R = 21; + public static final int KEY_S = 22; + public static final int KEY_T = 23; + public static final int KEY_U = 24; + public static final int KEY_V = 25; + public static final int KEY_W = 26; + public static final int KEY_X = 27; + public static final int KEY_Y = 28; + public static final int KEY_Z = 29; + public static final int KEY_F1 = 58; + public static final int KEY_F2 = 59; + public static final int KEY_F3 = 60; + public static final int KEY_F4 = 61; + public static final int KEY_F5 = 62; + public static final int KEY_F6 = 63; + public static final int KEY_F7 = 64; + public static final int KEY_F8 = 65; + public static final int KEY_F9 = 66; + public static final int KEY_F10 = 67; + public static final int KEY_F11 = 68; + public static final int KEY_F12 = 69; + public static final int KEY_F13 = 104; + public static final int KEY_F14 = 105; + public static final int KEY_F15 = 106; + public static final int KEY_F16 = 107; + public static final int KEY_F17 = 108; + public static final int KEY_F18 = 109; + public static final int KEY_F19 = 110; + public static final int KEY_F20 = 111; + public static final int KEY_F21 = 112; + public static final int KEY_F22 = 113; + public static final int KEY_F23 = 114; + public static final int KEY_F24 = 115; + public static final int KEY_NUMLOCK = 83; + public static final int KEY_NUMPAD0 = 98; + public static final int KEY_NUMPAD1 = 89; + public static final int KEY_NUMPAD2 = 90; + public static final int KEY_NUMPAD3 = 91; + public static final int KEY_NUMPAD4 = 92; + public static final int KEY_NUMPAD5 = 93; + public static final int KEY_NUMPAD6 = 94; + public static final int KEY_NUMPAD7 = 95; + public static final int KEY_NUMPAD8 = 96; + public static final int KEY_NUMPAD9 = 97; + public static final int KEY_NUMPADCOMMA = 220; + public static final int KEY_NUMPADENTER = 88; + public static final int KEY_NUMPADEQUALS = 103; + public static final int KEY_DOWN = 81; + public static final int KEY_LEFT = 80; + public static final int KEY_RIGHT = 79; + public static final int KEY_UP = 82; + public static final int KEY_ADD = 87; + public static final int KEY_APOSTROPHE = 52; + public static final int KEY_BACKSLASH = 49; + public static final int KEY_COMMA = 54; + public static final int KEY_EQUALS = 46; + public static final int KEY_GRAVE = 53; + public static final int KEY_LBRACKET = 47; public static final int KEY_MINUS = 45; - public static final int KEY_MULTIPLY = 332; - public static final int KEY_PERIOD = 46; - public static final int KEY_RBRACKET = 93; - public static final int KEY_SEMICOLON = 59; - public static final int KEY_SLASH = 47; - public static final int KEY_SPACE = 32; - public static final int KEY_TAB = 258; - public static final int KEY_LALT = 342; - public static final int KEY_LCONTROL = 341; - public static final int KEY_LSHIFT = 340; - public static final int KEY_LWIN = 343; - public static final int KEY_RALT = 346; - public static final int KEY_RCONTROL = 345; - public static final int KEY_RSHIFT = 344; - public static final int KEY_RWIN = 347; - public static final int KEY_RETURN = 257; - public static final int KEY_ESCAPE = 256; - public static final int KEY_BACKSPACE = 259; - public static final int KEY_DELETE = 261; - public static final int KEY_END = 269; - public static final int KEY_HOME = 268; - public static final int KEY_INSERT = 260; - public static final int KEY_PAGEDOWN = 267; - public static final int KEY_PAGEUP = 266; - public static final int KEY_CAPSLOCK = 280; - public static final int KEY_PAUSE = 284; - public static final int KEY_SCROLLLOCK = 281; - public static final int KEY_PRINTSCREEN = 283; - /*public static final int PRESS = 1; + public static final int KEY_MULTIPLY = 85; + public static final int KEY_PERIOD = 55; + public static final int KEY_RBRACKET = 48; + public static final int KEY_SEMICOLON = 51; + public static final int KEY_SLASH = 56; + public static final int KEY_SPACE = 44; + public static final int KEY_TAB = 43; + public static final int KEY_LALT = 226; + public static final int KEY_LCONTROL = 224; + public static final int KEY_LSHIFT = 225; + public static final int KEY_LGUI = 227; + public static final int KEY_RALT = 230; + public static final int KEY_RCONTROL = 228; + public static final int KEY_RSHIFT = 229; + public static final int KEY_RGUI = 231; + public static final int KEY_RETURN = 40; + public static final int KEY_ESCAPE = 41; + public static final int KEY_BACKSPACE = 42; + public static final int KEY_DELETE = 76; + public static final int KEY_END = 77; + public static final int KEY_HOME = 74; + public static final int KEY_INSERT = 73; + public static final int KEY_PAGEDOWN = 78; + public static final int KEY_PAGEUP = 75; + public static final int KEY_CAPSLOCK = 57; + public static final int KEY_PAUSE = 72; + public static final int KEY_SCROLLLOCK = 71; + public static final int KEY_PRINTSCREEN = 70; + public static final int PRESS = 1; public static final int RELEASE = 0; - public static final int REPEAT = 2; - public static final int MOUSE_BUTTON_LEFT = 0; + public static final int REPEAT = -1; + public static final int MOUSE_BUTTON_LEFT = 1; public static final int MOUSE_BUTTON_MIDDLE = 2; - public static final int MOUSE_BUTTON_RIGHT = 1; - public static final int MOD_CONTROL = 2; - public static final int CURSOR = 208897; - public static final int CURSOR_DISABLED = 212995; - public static final int CURSOR_NORMAL = 212993;*/ + public static final int MOUSE_BUTTON_RIGHT = 3; + public static final int MOUSE_BUTTON_4 = 4; + public static final int MOUSE_BUTTON_5 = 5; + public static final int MOUSE_BUTTON_6 = 6; + public static final int MOUSE_BUTTON_7 = 7; + public static final int MOUSE_BUTTON_8 = 8; + public static final int MOD_SHIFT = 3; + public static final int MOD_CONTROL = 192; + public static final int MOD_ALT = 768; + public static final int MOD_SUPER = 3072; + public static final int MOD_CAPS_LOCK = 8192; + public static final int MOD_NUM_LOCK = 4096; + public static final int KEYCODE_A = 97; + public static final int KEYCODE_B = 98; + public static final int KEYCODE_C = 99; + public static final int KEYCODE_E = 101; + public static final int KEYCODE_F = 102; + public static final int KEYCODE_L = 108; + public static final int KEYCODE_M = 109; + public static final int KEYCODE_O = 111; + public static final int KEYCODE_R = 114; + public static final int KEYCODE_U = 117; + public static final int KEYCODE_V = 118; + public static final int KEYCODE_W = 119; + public static final int KEYCODE_X = 120; + public static final int KEYCODE_Y = 121; + public static final int KEYCODE_Z = 122; + public static final int KEYCODE_RETURN = 13; + public static final int KEYCODE_NUMPADENTER = 1073741912; + public static final int KEYCODE_PAGEUP = 1073741899; + public static final int KEYCODE_PAGEDOWN = 1073741902; + public static final int KEYCODE_BACKSPACE = 8; + public static final int KEYCODE_UP = 1073741906; + public static final int KEYCODE_DOWN = 1073741905; + public static final int KEYCODE_FORWARD = 1073741906; + public static final int KEYCODE_BACKWARD = 1073741905; + public static final int KEYCODE_LEFT = 1073741904; + public static final int KEYCODE_RIGHT = 1073741903; + public static final int KEYCODE_NUMPAD9 = 1073741921; + public static final int KEYCODE_NUMPAD3 = 1073741915; + public static final int KEYCODE_DELETE = 127; + public static final int KEYCODE_HOME = 1073741898; + public static final int KEYCODE_END = 1073741901; + public static final int KEYCODE_F5 = 1073741886; + public static final int KEYCODE_TAB = 9; + public static final int KEYCODE_LCONTROL = 1073742048; + public static final int KEYCODE_RCONTROL = 1073742052; + public static final int KEYCODE_SPACE = 32; public static boolean isHoldingShift(int modifiers) { return (modifiers & 1) == 1; @@ -303,50 +345,20 @@ public static int convert(int lwjglKey) { return KEY_F17; case 0x69: return KEY_F18; - /*case 0x70: - return KEY_KANA;*/ /* (Japanese keyboard) */ case 0x71: return KEY_F19; /* Extended Function keys - (Mac) */ - /*case 0x79: - return KEY_CONVERT;*/ /* (Japanese keyboard) */ - /*case 0x7B: - return KEY_NOCONVERT;*/ /* (Japanese keyboard) */ - /*case 0x7D: - return KEY_YEN;*/ /* (Japanese keyboard) */ case 0x8D: return KEY_NUMPADEQUALS; /* = on numeric keypad (NEC PC98) */ - /*case 0x90: - return KEY_CIRCUMFLEX;*/ /* (Japanese keyboard) */ - /*case 0x91: - return KEY_AT;*/ /* (NEC PC98) */ - /*case 0x92: - return KEY_COLON;*/ /* (NEC PC98) */ - /*case 0x93: - return KEY_UNDERLINE;*/ /* (NEC PC98) */ - /*case 0x94: - return KEY_KANJI;*/ /* (Japanese keyboard) */ - /*case 0x95: - return KEY_STOP;*/ /* (NEC PC98) */ - /*case 0x96: - return KEY_AX;*/ /* (Japan AX) */ - /*case 0x97: - return KEY_UNLABELED;*/ /* (J3100) */ case 0x9C: return KEY_NUMPADENTER; /* Enter on numeric keypad */ case 0x9D: return KEY_RCONTROL; - /*case 0xA7: - return KEY_SECTION;*/ /* Section symbol (Mac) */ case 0xB3: return KEY_NUMPADCOMMA; /* , on numeric keypad (NEC PC98) */ case 0xB5: return KEY_SLASH; /* / on numeric keypad */ - /* case 0xB7: - return KEY_SYSRQ;*/ case 0xB8: return KEY_RALT; /* right Alt */ - /*case 0xC4: - return KEY_FUNCTION;*/ /* Function (Mac) */ case 0xC5: return KEY_PAUSE; /* Pause */ case 0xC7: @@ -369,20 +381,6 @@ public static int convert(int lwjglKey) { return KEY_INSERT; /* Insert on arrow keypad */ case 0xD3: return KEY_DELETE; /* Delete on arrow keypad */ - /*case 0xDA: - return KEY_CLEAR;*/ /* Clear key (Mac) */ - case 0xDB: - return KEY_LWIN; /* Left Windows/Option key */ - - case 0xDC: - return KEY_RWIN; /* Right Windows/Option key */ - - /*case 0xDD: - return KEY_APPS;*/ /* AppMenu key */ - /*case 0xDE: - return KEY_POWER;*/ - /*case 0xDF: - return KEY_SLEEP;*/ } return key; } diff --git a/fabric-26.2/.gitignore b/fabric-26.3/.gitignore similarity index 100% rename from fabric-26.2/.gitignore rename to fabric-26.3/.gitignore diff --git a/fabric-26.2/build.gradle b/fabric-26.3/build.gradle similarity index 90% rename from fabric-26.2/build.gradle rename to fabric-26.3/build.gradle index 56811c61..bcbc7711 100644 --- a/fabric-26.2/build.gradle +++ b/fabric-26.3/build.gradle @@ -22,8 +22,8 @@ dependencies { implementation include("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}") - compileOnly "com.viaversion:viafabricplus-api:5.0.1" - compileOnly "com.terraformersmc:modmenu:20.0.0-beta.2" + compileOnly "com.viaversion:viafabricplus-api:5.0.1" // TODO: Update + compileOnly "com.terraformersmc:modmenu:21.0.0-beta.1" // TODO: Update implementation "com.github.MPKMod.MPKNetworkAPI:common:${project.networkApiVersion}" } diff --git a/fabric-26.2/gradle.properties b/fabric-26.3/gradle.properties similarity index 73% rename from fabric-26.2/gradle.properties rename to fabric-26.3/gradle.properties index 848dea03..47b08425 100644 --- a/fabric-26.2/gradle.properties +++ b/fabric-26.3/gradle.properties @@ -4,10 +4,10 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=26.2 -loader_version=0.19.3 +minecraft_version=26.3 +loader_version=0.19.5 # Fabric API -fabric_version=0.152.1+26.2 +fabric_version=0.160.5+26.3 jdkVersion=25 diff --git a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/EventHandler.java b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/EventHandler.java similarity index 97% rename from fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/EventHandler.java rename to fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/EventHandler.java index b22eae4d..b8877596 100644 --- a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/EventHandler.java +++ b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/EventHandler.java @@ -1,10 +1,10 @@ -package io.github.kurrycat.mpkmod.compatibility.fabric_26_2; +package io.github.kurrycat.mpkmod.compatibility.fabric_26_3; import com.mojang.blaze3d.platform.InputConstants; import com.mojang.blaze3d.vertex.PoseStack; import io.github.kurrycat.mpkmod.compatibility.API; import io.github.kurrycat.mpkmod.compatibility.MCClasses.Player; -import io.github.kurrycat.mpkmod.compatibility.fabric_26_2.mixin.KeyMappingAccessor; +import io.github.kurrycat.mpkmod.compatibility.fabric_26_3.mixin.KeyMappingAccessor; import io.github.kurrycat.mpkmod.ticks.ButtonMS; import io.github.kurrycat.mpkmod.ticks.ButtonMSList; import io.github.kurrycat.mpkmod.util.BoundingBox3D; @@ -18,7 +18,6 @@ import net.minecraft.client.input.KeyEvent; import net.minecraft.client.input.MouseButtonInfo; import net.minecraft.client.multiplayer.ClientPacketListener; -import net.minecraft.client.player.LocalPlayer; import net.minecraft.util.Util; import net.minecraft.world.entity.Entity; import net.minecraft.world.phys.AABB; @@ -37,7 +36,7 @@ public void onKey(KeyEvent input, int action) { Options options = Minecraft.getInstance().options; long eventNanos = Util.getNanos(); - InputConstants.Key inputKey = InputConstants.getKey(new KeyEvent(input.key(), input.scancode(), input.modifiers())); + InputConstants.Key inputKey = InputConstants.getKey(new KeyEvent(input.key(), input.keycode(), input.modifiers())); int[] keys = { ((KeyMappingAccessor) options.keyUp).getKey().getValue(), diff --git a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/FunctionCompatibility.java b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/FunctionCompatibility.java similarity index 97% rename from fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/FunctionCompatibility.java rename to fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/FunctionCompatibility.java index 71e32e57..14fb9be4 100644 --- a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/FunctionCompatibility.java +++ b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/FunctionCompatibility.java @@ -1,10 +1,10 @@ -package io.github.kurrycat.mpkmod.compatibility.fabric_26_2; +package io.github.kurrycat.mpkmod.compatibility.fabric_26_3; -import com.mojang.blaze3d.pipeline.RenderPipeline; import com.mojang.blaze3d.vertex.VertexConsumer; +import com.mojang.renderpearl.api.pipeline.RenderPipeline; import io.github.kurrycat.mpkmod.compatibility.MCClasses.*; -import io.github.kurrycat.mpkmod.compatibility.fabric_26_2.mixin.KeyMappingAccessor; -import io.github.kurrycat.mpkmod.compatibility.fabric_26_2.network.DataCustomPayload; +import io.github.kurrycat.mpkmod.compatibility.fabric_26_3.mixin.KeyMappingAccessor; +import io.github.kurrycat.mpkmod.compatibility.fabric_26_3.network.DataCustomPayload; import io.github.kurrycat.mpkmod.gui.MPKGuiScreen; import io.github.kurrycat.mpkmod.util.BoundingBox3D; import io.github.kurrycat.mpkmod.util.Debug; @@ -264,7 +264,7 @@ public void displayGuiScreen(MPKGuiScreen screen) { net.minecraft.client.Minecraft.getInstance().gui.setScreen( screen == null ? null - : new io.github.kurrycat.mpkmod.compatibility.fabric_26_2.MPKGuiScreen(screen)); + : new io.github.kurrycat.mpkmod.compatibility.fabric_26_3.MPKGuiScreen(screen)); } public String getCurrentGuiScreen() { @@ -272,8 +272,8 @@ public String getCurrentGuiScreen() { if (curr == null) return null; - else if (curr instanceof io.github.kurrycat.mpkmod.compatibility.fabric_26_2.MPKGuiScreen) { - String id = ((io.github.kurrycat.mpkmod.compatibility.fabric_26_2.MPKGuiScreen) curr).eventReceiver.getID(); + else if (curr instanceof io.github.kurrycat.mpkmod.compatibility.fabric_26_3.MPKGuiScreen) { + String id = ((io.github.kurrycat.mpkmod.compatibility.fabric_26_3.MPKGuiScreen) curr).eventReceiver.getID(); if (id == null) id = "unknown"; diff --git a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/MPKGuiScreen.java b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/MPKGuiScreen.java similarity index 95% rename from fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/MPKGuiScreen.java rename to fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/MPKGuiScreen.java index 6d78c30c..6f519684 100644 --- a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/MPKGuiScreen.java +++ b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/MPKGuiScreen.java @@ -1,4 +1,4 @@ -package io.github.kurrycat.mpkmod.compatibility.fabric_26_2; +package io.github.kurrycat.mpkmod.compatibility.fabric_26_3; import io.github.kurrycat.mpkmod.compatibility.API; import io.github.kurrycat.mpkmod.compatibility.MCClasses.Profiler; @@ -75,7 +75,7 @@ public boolean mouseDragged(MouseButtonEvent click, double offsetX, double offse @Override public boolean keyPressed(KeyEvent input) { - eventReceiver.onKeyEvent(input.key(), input.scancode(), input.modifiers(), false); + eventReceiver.onKeyEvent(input.key(), input.keycode(), input.modifiers(), false); return super.keyPressed(input); } diff --git a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/MPKMod.java b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/MPKMod.java similarity index 94% rename from fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/MPKMod.java rename to fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/MPKMod.java index 079891c6..09a45d09 100644 --- a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/MPKMod.java +++ b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/MPKMod.java @@ -1,11 +1,12 @@ -package io.github.kurrycat.mpkmod.compatibility.fabric_26_2; +package io.github.kurrycat.mpkmod.compatibility.fabric_26_3; +import com.mojang.blaze3d.platform.InputConstants; import com.mojang.blaze3d.vertex.PoseStack; import com.viaversion.viafabricplus.ViaFabricPlus; import com.viaversion.viafabricplus.api.ViaFabricPlusAPI; import io.github.kurrycat.mpkmod.compatibility.API; import io.github.kurrycat.mpkmod.compatibility.MCClasses.KeyBinding; -import io.github.kurrycat.mpkmod.compatibility.fabric_26_2.network.DataCustomPayload; +import io.github.kurrycat.mpkmod.compatibility.fabric_26_3.network.DataCustomPayload; import io.github.kurrycat.mpknetapi.common.network.packet.MPKPacket; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; @@ -36,7 +37,7 @@ public void onInitialize() { // However, some things (like resources) may still be uninitialized. API.LOGGER.info("Loading " + API.NAME + " " + API.VERSION); API.preInit(getClass()); - registerKeybindingsFromGUIs(); + //registerKeybindingsFromGUIs(); HudElementRegistry.attachElementBefore(VanillaHudElements.PLAYER_LIST, Identifier.fromNamespaceAndPath(API.MODID, "hud_layer"), eventHandler::onInGameOverlayRender); ClientTickEvents.START_CLIENT_TICK.register(eventHandler::onClientTickStart); @@ -81,7 +82,7 @@ private void registerKeybindingsFromGUIs() { public void registerKeyBinding(String id) { net.minecraft.client.KeyMapping keyBinding = new net.minecraft.client.KeyMapping( API.MODID + ".key." + id + ".desc", - -1, + InputConstants.UNKNOWN.getValue(), KEYBINDING_CATEGORY ); diff --git a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/MPKModMenu.java b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/MPKModMenu.java similarity index 84% rename from fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/MPKModMenu.java rename to fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/MPKModMenu.java index 1f00dfd0..37051797 100644 --- a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/MPKModMenu.java +++ b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/MPKModMenu.java @@ -1,4 +1,4 @@ -package io.github.kurrycat.mpkmod.compatibility.fabric_26_2; +package io.github.kurrycat.mpkmod.compatibility.fabric_26_3; import com.terraformersmc.modmenu.api.ConfigScreenFactory; import com.terraformersmc.modmenu.api.ModMenuApi; diff --git a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/mixin/KeyMappingAccessor.java b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/mixin/KeyMappingAccessor.java similarity index 82% rename from fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/mixin/KeyMappingAccessor.java rename to fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/mixin/KeyMappingAccessor.java index 09e7b43d..3a67e2c3 100644 --- a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/mixin/KeyMappingAccessor.java +++ b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/mixin/KeyMappingAccessor.java @@ -1,4 +1,4 @@ -package io.github.kurrycat.mpkmod.compatibility.fabric_26_2.mixin; +package io.github.kurrycat.mpkmod.compatibility.fabric_26_3.mixin; import com.mojang.blaze3d.platform.InputConstants; import net.minecraft.client.KeyMapping; diff --git a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/mixin/KeyboardHandlerMixin.java b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/mixin/KeyboardHandlerMixin.java similarity index 83% rename from fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/mixin/KeyboardHandlerMixin.java rename to fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/mixin/KeyboardHandlerMixin.java index bcedbe21..6844ee45 100644 --- a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/mixin/KeyboardHandlerMixin.java +++ b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/mixin/KeyboardHandlerMixin.java @@ -1,6 +1,6 @@ -package io.github.kurrycat.mpkmod.compatibility.fabric_26_2.mixin; +package io.github.kurrycat.mpkmod.compatibility.fabric_26_3.mixin; -import io.github.kurrycat.mpkmod.compatibility.fabric_26_2.MPKMod; +import io.github.kurrycat.mpkmod.compatibility.fabric_26_3.MPKMod; import net.minecraft.client.KeyboardHandler; import net.minecraft.client.input.KeyEvent; import org.spongepowered.asm.mixin.Mixin; diff --git a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/mixin/LevelRendererMixin.java b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/mixin/LevelRendererMixin.java similarity index 88% rename from fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/mixin/LevelRendererMixin.java rename to fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/mixin/LevelRendererMixin.java index 7c355245..bc782d98 100644 --- a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/mixin/LevelRendererMixin.java +++ b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/mixin/LevelRendererMixin.java @@ -1,7 +1,7 @@ -package io.github.kurrycat.mpkmod.compatibility.fabric_26_2.mixin; +package io.github.kurrycat.mpkmod.compatibility.fabric_26_3.mixin; import com.mojang.blaze3d.vertex.PoseStack; -import io.github.kurrycat.mpkmod.compatibility.fabric_26_2.MPKMod; +import io.github.kurrycat.mpkmod.compatibility.fabric_26_3.MPKMod; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.SubmitNodeCollector; diff --git a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/mixin/MinecraftMixin.java b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/mixin/MinecraftMixin.java similarity index 77% rename from fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/mixin/MinecraftMixin.java rename to fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/mixin/MinecraftMixin.java index f82a0830..fc12984d 100644 --- a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/mixin/MinecraftMixin.java +++ b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/mixin/MinecraftMixin.java @@ -1,6 +1,6 @@ -package io.github.kurrycat.mpkmod.compatibility.fabric_26_2.mixin; +package io.github.kurrycat.mpkmod.compatibility.fabric_26_3.mixin; -import io.github.kurrycat.mpkmod.compatibility.fabric_26_2.MPKMod; +import io.github.kurrycat.mpkmod.compatibility.fabric_26_3.MPKMod; import net.minecraft.client.Minecraft; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/mixin/MouseHandlerMixin.java b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/mixin/MouseHandlerMixin.java similarity index 75% rename from fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/mixin/MouseHandlerMixin.java rename to fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/mixin/MouseHandlerMixin.java index eb446857..1d8269ba 100644 --- a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/mixin/MouseHandlerMixin.java +++ b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/mixin/MouseHandlerMixin.java @@ -1,6 +1,6 @@ -package io.github.kurrycat.mpkmod.compatibility.fabric_26_2.mixin; +package io.github.kurrycat.mpkmod.compatibility.fabric_26_3.mixin; -import io.github.kurrycat.mpkmod.compatibility.fabric_26_2.MPKMod; +import io.github.kurrycat.mpkmod.compatibility.fabric_26_3.MPKMod; import net.minecraft.client.Minecraft; import net.minecraft.client.MouseHandler; import net.minecraft.client.input.MouseButtonInfo; @@ -22,9 +22,9 @@ public class MouseHandlerMixin { private double ypos; @Inject(method = "onMove", at = @At(value = "TAIL")) - private void onCursorPos(long window, double x, double y, CallbackInfo ci) { - if (window == Minecraft.getInstance().getWindow().handle()) { - MPKMod.INSTANCE.eventHandler.onMouseMove(x, y, accumulatedDX, -accumulatedDY); + private void onCursorPos(long handle, double xpos, double ypos, double xrel, double yrel, CallbackInfo ci) { + if (handle == Minecraft.getInstance().getWindow().handle()) { + MPKMod.INSTANCE.eventHandler.onMouseMove(xpos, ypos, accumulatedDX, -accumulatedDY); } } diff --git a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/mixin/ToggleSprintKeyMixin.java b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/mixin/ToggleSprintKeyMixin.java similarity index 92% rename from fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/mixin/ToggleSprintKeyMixin.java rename to fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/mixin/ToggleSprintKeyMixin.java index b7ba9963..2f96b4f7 100644 --- a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/mixin/ToggleSprintKeyMixin.java +++ b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/mixin/ToggleSprintKeyMixin.java @@ -1,4 +1,4 @@ -package io.github.kurrycat.mpkmod.compatibility.fabric_26_2.mixin; +package io.github.kurrycat.mpkmod.compatibility.fabric_26_3.mixin; import io.github.kurrycat.mpkmod.compatibility.MCClasses.Minecraft; import net.minecraft.client.KeyMapping; diff --git a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/network/DataCustomPayload.java b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/network/DataCustomPayload.java similarity index 95% rename from fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/network/DataCustomPayload.java rename to fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/network/DataCustomPayload.java index ca6f84fc..d7a01a36 100644 --- a/fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/network/DataCustomPayload.java +++ b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/network/DataCustomPayload.java @@ -1,4 +1,4 @@ -package io.github.kurrycat.mpkmod.compatibility.fabric_26_2.network; +package io.github.kurrycat.mpkmod.compatibility.fabric_26_3.network; import io.github.kurrycat.mpknetapi.common.MPKNetworking; import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; diff --git a/fabric-26.2/src/main/resources/assets/mpkmod/lang/en_us.json b/fabric-26.3/src/main/resources/assets/mpkmod/lang/en_us.json similarity index 100% rename from fabric-26.2/src/main/resources/assets/mpkmod/lang/en_us.json rename to fabric-26.3/src/main/resources/assets/mpkmod/lang/en_us.json diff --git a/fabric-26.2/src/main/resources/assets/mpkmod/lang/pl_pl.json b/fabric-26.3/src/main/resources/assets/mpkmod/lang/pl_pl.json similarity index 100% rename from fabric-26.2/src/main/resources/assets/mpkmod/lang/pl_pl.json rename to fabric-26.3/src/main/resources/assets/mpkmod/lang/pl_pl.json diff --git a/fabric-26.2/src/main/resources/fabric.mod.json b/fabric-26.3/src/main/resources/fabric.mod.json similarity index 78% rename from fabric-26.2/src/main/resources/fabric.mod.json rename to fabric-26.3/src/main/resources/fabric.mod.json index 0b278320..b8d4ad65 100644 --- a/fabric-26.2/src/main/resources/fabric.mod.json +++ b/fabric-26.3/src/main/resources/fabric.mod.json @@ -19,10 +19,10 @@ "environment": "client", "entrypoints": { "main": [ - "io.github.kurrycat.mpkmod.compatibility.fabric_26_2.MPKMod" + "io.github.kurrycat.mpkmod.compatibility.fabric_26_3.MPKMod" ], "modmenu": [ - "io.github.kurrycat.mpkmod.compatibility.fabric_26_2.MPKModMenu" + "io.github.kurrycat.mpkmod.compatibility.fabric_26_3.MPKModMenu" ] }, "mixins": [ @@ -30,9 +30,9 @@ ], "accessWidener" : "mpkmod.classtweaker", "depends": { - "fabricloader": ">=0.19.3", + "fabricloader": ">=0.19.5", "fabric-api": "*", - "minecraft": ">=26.2", + "minecraft": ">=26.3", "java": ">=25" }, "suggests": {} diff --git a/fabric-26.2/src/main/resources/mpkmod.classtweaker b/fabric-26.3/src/main/resources/mpkmod.classtweaker similarity index 100% rename from fabric-26.2/src/main/resources/mpkmod.classtweaker rename to fabric-26.3/src/main/resources/mpkmod.classtweaker diff --git a/fabric-26.2/src/main/resources/mpkmod.mixins.json b/fabric-26.3/src/main/resources/mpkmod.mixins.json similarity index 97% rename from fabric-26.2/src/main/resources/mpkmod.mixins.json rename to fabric-26.3/src/main/resources/mpkmod.mixins.json index 53ed12cf..701caf13 100644 --- a/fabric-26.2/src/main/resources/mpkmod.mixins.json +++ b/fabric-26.3/src/main/resources/mpkmod.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "io.github.kurrycat.mpkmod.compatibility.fabric_26_2.mixin", + "package": "io.github.kurrycat.mpkmod.compatibility.fabric_26_3.mixin", "compatibilityLevel": "JAVA_25", "mixins": [ ], diff --git a/gradle.properties b/gradle.properties index a5ee6d78..cb892fa6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ $group=io.github.kurrycat.mpkmod $jitpackGroup=com.github.mpkmod -$version=2.3.3 +$version=2.3.4 $apiVersion=1.0 $modBaseName=mpkmod $commonBaseName=mpkmod-common diff --git a/settings.gradle.kts b/settings.gradle.kts index c1a09156..f7b82df8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -26,5 +26,5 @@ include("common") if (System.getenv("JITPACK") == null) { include("forge-1.8.9") include("forge-1.12.2") - include("fabric-26.2") + include("fabric-26.3") } \ No newline at end of file From c35c311694c0d46226f573dc3b43e379904cf2dc Mon Sep 17 00:00:00 2001 From: Exterminate Date: Wed, 16 Sep 2026 15:34:18 +1000 Subject: [PATCH 3/5] Fix settings loading --- .../io/github/kurrycat/mpkmod/settings/Settings.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/io/github/kurrycat/mpkmod/settings/Settings.java b/common/src/main/java/io/github/kurrycat/mpkmod/settings/Settings.java index e66b365d..3a112a69 100644 --- a/common/src/main/java/io/github/kurrycat/mpkmod/settings/Settings.java +++ b/common/src/main/java/io/github/kurrycat/mpkmod/settings/Settings.java @@ -79,7 +79,15 @@ public static void saveSettings() { public static void loadSettings() { ArrayNode settings = Serializer.deserialize(JSONConfig.optionsFile, ArrayNode.class); - if (settings == null) return; + if (settings == null) { + if (JSONConfig.optionsFile.exists()) { + JSONConfig.optionsFile.delete(); + } else { + saveSettings(); + } + + return; + } for (Setting setting : SETTINGS_LIST) { for (int i = 0; i < settings.size(); i++) { From 04effe974db45cb322da582b788d2886a61b5712 Mon Sep 17 00:00:00 2001 From: Exterminate Date: Wed, 16 Sep 2026 15:34:40 +1000 Subject: [PATCH 4/5] also save --- .../main/java/io/github/kurrycat/mpkmod/settings/Settings.java | 1 + 1 file changed, 1 insertion(+) diff --git a/common/src/main/java/io/github/kurrycat/mpkmod/settings/Settings.java b/common/src/main/java/io/github/kurrycat/mpkmod/settings/Settings.java index 3a112a69..fbd92af9 100644 --- a/common/src/main/java/io/github/kurrycat/mpkmod/settings/Settings.java +++ b/common/src/main/java/io/github/kurrycat/mpkmod/settings/Settings.java @@ -82,6 +82,7 @@ public static void loadSettings() { if (settings == null) { if (JSONConfig.optionsFile.exists()) { JSONConfig.optionsFile.delete(); + saveSettings(); } else { saveSettings(); } From 46a7342983635503d196f7351dc5f76f0a7cf7d9 Mon Sep 17 00:00:00 2001 From: Exterminate Date: Wed, 16 Sep 2026 15:37:17 +1000 Subject: [PATCH 5/5] forgor --- .../kurrycat/mpkmod/compatibility/fabric_26_3/MPKMod.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/MPKMod.java b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/MPKMod.java index 09a45d09..8d487e47 100644 --- a/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/MPKMod.java +++ b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/MPKMod.java @@ -37,7 +37,7 @@ public void onInitialize() { // However, some things (like resources) may still be uninitialized. API.LOGGER.info("Loading " + API.NAME + " " + API.VERSION); API.preInit(getClass()); - //registerKeybindingsFromGUIs(); + registerKeybindingsFromGUIs(); HudElementRegistry.attachElementBefore(VanillaHudElements.PLAYER_LIST, Identifier.fromNamespaceAndPath(API.MODID, "hud_layer"), eventHandler::onInGameOverlayRender); ClientTickEvents.START_CLIENT_TICK.register(eventHandler::onClientTickStart);