Skip to content

Update/26.3 #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Exterminate5573 merged 5 commits into from
Sep 17, 2026
Merged

Update/26.3 #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
080ea22
update vfp to the new 5.0 update
Exterminate5573 Sep 16, 2026
b91190a
26.3 compatibility
Exterminate5573 Sep 16, 2026
c35c311
Fix settings loading
Exterminate5573 Sep 16, 2026
04effe9
also save
Exterminate5573 Sep 16, 2026
46a7342
forgor
Exterminate5573 Sep 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
330 changes: 164 additions & 166 deletions common/src/main/java/io/github/kurrycat/mpkmod/compatibility/MCClasses/InputConstants.java
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 10 additions & 1 deletion common/src/main/java/io/github/kurrycat/mpkmod/settings/Settings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,16 @@ 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();
saveSettings();
} else {
saveSettings();
}

return;
}

for (Setting setting : SETTINGS_LIST) {
for (int i = 0; i < settings.size(); i++) {
Expand Down
0 fabric-26.2/.gitignore → fabric-26.3/.gitignore
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions fabric-26.2/build.gradle → fabric-26.3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ dependencies {

implementation include("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")

compileOnly "com.viaversion:viafabricplus-api:4.5.4"
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}"
}
Expand Down
6 changes: 3 additions & 3 deletions fabric-26.2/gradle.properties → fabric-26.3/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 3 additions & 4 deletions ...mpatibility/fabric_26_2/EventHandler.java → ...mpatibility/fabric_26_3/EventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand All @@ -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(),
Expand Down
14 changes: 7 additions & 7 deletions ...ty/fabric_26_2/FunctionCompatibility.java → ...ty/fabric_26_3/FunctionCompatibility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -264,16 +264,16 @@ 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() {
Screen curr = net.minecraft.client.Minecraft.getInstance().gui.screen();

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";

Expand Down
4 changes: 2 additions & 2 deletions ...mpatibility/fabric_26_2/MPKGuiScreen.java → ...mpatibility/fabric_26_3/MPKGuiScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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);
}

Expand Down
13 changes: 7 additions & 6 deletions ...mod/compatibility/fabric_26_2/MPKMod.java → ...mod/compatibility/fabric_26_3/MPKMod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.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;
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;
Expand Down Expand Up @@ -55,9 +56,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 = (
Expand All @@ -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
);

Expand Down
2 changes: 1 addition & 1 deletion ...compatibility/fabric_26_2/MPKModMenu.java → ...compatibility/fabric_26_3/MPKModMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...fabric_26_2/mixin/KeyMappingAccessor.java → ...fabric_26_3/mixin/KeyMappingAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...bric_26_2/mixin/KeyboardHandlerMixin.java → ...bric_26_3/mixin/KeyboardHandlerMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...fabric_26_2/mixin/LevelRendererMixin.java → ...fabric_26_3/mixin/LevelRendererMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ity/fabric_26_2/mixin/MinecraftMixin.java → ...ity/fabric_26_3/mixin/MinecraftMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
10 changes: 5 additions & 5 deletions .../fabric_26_2/mixin/MouseHandlerMixin.java → .../fabric_26_3/mixin/MouseHandlerMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...bric_26_2/mixin/ToggleSprintKeyMixin.java → ...bric_26_3/mixin/ToggleSprintKeyMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...abric_26_2/network/DataCustomPayload.java → ...abric_26_3/network/DataCustomPayload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
0 ...n/resources/assets/mpkmod/lang/en_us.json → ...n/resources/assets/mpkmod/lang/en_us.json
View file
Open in desktop
File renamed without changes.
0 ...n/resources/assets/mpkmod/lang/pl_pl.json → ...n/resources/assets/mpkmod/lang/pl_pl.json
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...c-26.2/src/main/resources/fabric.mod.json → ...c-26.3/src/main/resources/fabric.mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@
"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": [
"mpkmod.mixins.json"
],
"accessWidener" : "mpkmod.classtweaker",
"depends": {
"fabricloader": ">=0.19.3",
"fabricloader": ">=0.19.5",
"fabric-api": "*",
"minecraft": ">=26.2",
"minecraft": ">=26.3",
"java": ">=25"
},
"suggests": {}
Expand Down
0 ....2/src/main/resources/mpkmod.classtweaker → ....3/src/main/resources/mpkmod.classtweaker
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...6.2/src/main/resources/mpkmod.mixins.json → ...6.3/src/main/resources/mpkmod.mixins.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
],
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Loading