Update/26.2

common/src/main/java/io/github/kurrycat/mpkmod/discord/DiscordRPC.java

@@ -68,6 +68,7 @@ private static void startCallbackThread() {
             }
             disableRPC();
         }, API.MODID + " Discord RPC Callback Handler");
+        t.setDaemon(true);
         t.start();
     }
 

fabric-26.1/build.gradle → fabric-26.2/build.gradle

@@ -22,8 +22,8 @@ dependencies {
 
     implementation include("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
 
-    compileOnly "com.viaversion:viafabricplus-api:4.4.8"
-    compileOnly "com.terraformersmc:modmenu:18.0.0-alpha.6"
+    compileOnly "com.viaversion:viafabricplus-api:4.5.4"
+    compileOnly "com.terraformersmc:modmenu:20.0.0-beta.2"
 
     implementation "com.github.MPKMod.MPKNetworkAPI:common:${project.networkApiVersion}"
 }
@@ -46,7 +46,7 @@ publishMods {
     modrinth {
         projectId = "412tAvWq"
         accessToken = providers.environmentVariable("MODRINTH_TOKEN")
-        minecraftVersions.add("26.1")
+        minecraftVersions.add("26.2")
     }
     /*github {
         repository = "MPKMod/MPKMod2"

fabric-26.1/gradle.properties → fabric-26.2/gradle.properties

@@ -4,10 +4,10 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=26.1
-loader_version=0.18.4
+minecraft_version=26.2
+loader_version=0.19.3
 
 # Fabric API
-fabric_version=0.144.0+26.1
+fabric_version=0.152.1+26.2
 
 jdkVersion=25

fabric-26.1/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_1/EventHandler.java → fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/EventHandler.java

@@ -1,10 +1,10 @@
-package io.github.kurrycat.mpkmod.compatibility.fabric_26_1;
+package io.github.kurrycat.mpkmod.compatibility.fabric_26_2;
 
 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_1.mixin.KeyMappingAccessor;
+import io.github.kurrycat.mpkmod.compatibility.fabric_26_2.mixin.KeyMappingAccessor;
 import io.github.kurrycat.mpkmod.ticks.ButtonMS;
 import io.github.kurrycat.mpkmod.ticks.ButtonMSList;
 import io.github.kurrycat.mpkmod.util.BoundingBox3D;
@@ -99,7 +99,7 @@ public void onMouseButton(MouseButtonInfo input, int action, double x, double y)
     }
 
     private void checkKeyBinding(int keyCode) {
-        if (Minecraft.getInstance().screen != null) return;
+        if (Minecraft.getInstance().gui.screen() != null) return;
 
         for (Map.Entry<String, KeyMapping> keyBindingEntry : MPKMod.keyBindingMap.entrySet()) {
             InputConstants.Key boundKey = ((KeyMappingAccessor) keyBindingEntry.getValue()).getKey();
@@ -122,7 +122,7 @@ public void onInGameOverlayRender(GuiGraphicsExtractor drawContext, DeltaTracker
     public void onRenderWorldOverlay(PoseStack matrixStack, float tickDelta) {
         MPKMod.INSTANCE.matrixStack = matrixStack;
         matrixStack.pushPose();
-        Vec3 pos = Minecraft.getInstance().gameRenderer.getMainCamera().position().reverse();
+        Vec3 pos = Minecraft.getInstance().gameRenderer.mainCamera().position().reverse();
         MPKMod.INSTANCE.matrixStack.translate(pos);
         API.Events.onRenderWorldOverlay(tickDelta);
         matrixStack.popPose();

fabric-26.1/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_1/FunctionCompatibility.java → fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/FunctionCompatibility.java

@@ -1,11 +1,10 @@
-package io.github.kurrycat.mpkmod.compatibility.fabric_26_1;
+package io.github.kurrycat.mpkmod.compatibility.fabric_26_2;
 
 import com.mojang.blaze3d.pipeline.RenderPipeline;
-import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import io.github.kurrycat.mpkmod.compatibility.MCClasses.*;
-import io.github.kurrycat.mpkmod.compatibility.fabric_26_1.mixin.KeyMappingAccessor;
-import io.github.kurrycat.mpkmod.compatibility.fabric_26_1.network.DataCustomPayload;
+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.gui.MPKGuiScreen;
 import io.github.kurrycat.mpkmod.util.BoundingBox3D;
 import io.github.kurrycat.mpkmod.util.Debug;
@@ -22,20 +21,21 @@
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.client.renderer.RenderPipelines;
-import net.minecraft.client.renderer.rendertype.RenderTypes;
 import net.minecraft.client.renderer.state.gui.GuiElementRenderState;
 import net.minecraft.client.renderer.state.gui.pip.PictureInPictureRenderState;
 import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.gizmos.GizmoStyle;
+import net.minecraft.gizmos.Gizmos;
 import net.minecraft.sounds.SoundEvents;
+import net.minecraft.util.ARGB;
 import net.minecraft.util.Mth;
 import net.minecraft.util.Util;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
-import net.minecraft.world.phys.shapes.Shapes;
-import net.minecraft.world.phys.shapes.VoxelShape;
 import org.jetbrains.annotations.Nullable;
 
 import java.awt.*;
@@ -128,71 +128,17 @@ public String getLookingAtBlock() {
     }
 
     public void drawBox(BoundingBox3D bb, Color color, float partialTicks) {
-        var ms = MPKMod.INSTANCE.matrixStack;
-        ms.pushPose();
-        ms.translate((float) bb.minX(), (float) bb.minY(), (float) bb.minZ());
-
-        VoxelShape shape = Shapes.box(
-                0.0, 0.0, 0.0,
-                bb.maxX() - bb.minX(),
-                bb.maxY() - bb.minY(),
-                bb.maxZ() - bb.minZ()
+
+        AABB shape = new AABB(
+                bb.minX(),
+                bb.minY(),
+                bb.minZ(),
+                bb.maxX(),
+                bb.maxY(),
+                bb.maxZ()
         );
 
-        VertexConsumer buf = net.minecraft.client.Minecraft.getInstance()
-                .renderBuffers().bufferSource().getBuffer(RenderTypes.debugFilledBox());
-
-        renderFilled(ms, buf, shape, 0, 0, 0, color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f);
-        ms.popPose();
-    }
-
-    public static void renderFilled(PoseStack poseStack, VertexConsumer vertexConsumer, VoxelShape voxelShape, double x, double y, double z, float r, float g, float b, float a) {
-        PoseStack.Pose pose = poseStack.last();
-        voxelShape.forAllBoxes((minX, minY, minZ, maxX, maxY, maxZ) -> {
-            float x1 = (float)(minX + x);
-            float y1 = (float)(minY + y);
-            float z1 = (float)(minZ + z);
-            float x2 = (float)(maxX + x);
-            float y2 = (float)(maxY + y);
-            float z2 = (float)(maxZ + z);
-
-            // Draw all 6 faces of the box
-            // Down
-            vertexConsumer.addVertex(pose, x1, y1, z1).setColor(r, g, b, a).setNormal(pose, 0, -1, 0);
-            vertexConsumer.addVertex(pose, x2, y1, z1).setColor(r, g, b, a).setNormal(pose, 0, -1, 0);
-            vertexConsumer.addVertex(pose, x2, y1, z2).setColor(r, g, b, a).setNormal(pose, 0, -1, 0);
-            vertexConsumer.addVertex(pose, x1, y1, z2).setColor(r, g, b, a).setNormal(pose, 0, -1, 0);
-
-            // Up
-            vertexConsumer.addVertex(pose, x1, y2, z2).setColor(r, g, b, a).setNormal(pose, 0, 1, 0);
-            vertexConsumer.addVertex(pose, x2, y2, z2).setColor(r, g, b, a).setNormal(pose, 0, 1, 0);
-            vertexConsumer.addVertex(pose, x2, y2, z1).setColor(r, g, b, a).setNormal(pose, 0, 1, 0);
-            vertexConsumer.addVertex(pose, x1, y2, z1).setColor(r, g, b, a).setNormal(pose, 0, 1, 0);
-
-            // North
-            vertexConsumer.addVertex(pose, x1, y1, z1).setColor(r, g, b, a).setNormal(pose, 0, 0, -1);
-            vertexConsumer.addVertex(pose, x1, y2, z1).setColor(r, g, b, a).setNormal(pose, 0, 0, -1);
-            vertexConsumer.addVertex(pose, x2, y2, z1).setColor(r, g, b, a).setNormal(pose, 0, 0, -1);
-            vertexConsumer.addVertex(pose, x2, y1, z1).setColor(r, g, b, a).setNormal(pose, 0, 0, -1);
-
-            // South
-            vertexConsumer.addVertex(pose, x2, y1, z2).setColor(r, g, b, a).setNormal(pose, 0, 0, 1);
-            vertexConsumer.addVertex(pose, x2, y2, z2).setColor(r, g, b, a).setNormal(pose, 0, 0, 1);
-            vertexConsumer.addVertex(pose, x1, y2, z2).setColor(r, g, b, a).setNormal(pose, 0, 0, 1);
-            vertexConsumer.addVertex(pose, x1, y1, z2).setColor(r, g, b, a).setNormal(pose, 0, 0, 1);
-
-            // West
-            vertexConsumer.addVertex(pose, x1, y1, z2).setColor(r, g, b, a).setNormal(pose, -1, 0, 0);
-            vertexConsumer.addVertex(pose, x1, y2, z2).setColor(r, g, b, a).setNormal(pose, -1, 0, 0);
-            vertexConsumer.addVertex(pose, x1, y2, z1).setColor(r, g, b, a).setNormal(pose, -1, 0, 0);
-            vertexConsumer.addVertex(pose, x1, y1, z1).setColor(r, g, b, a).setNormal(pose, -1, 0, 0);
-
-            // East
-            vertexConsumer.addVertex(pose, x2, y1, z1).setColor(r, g, b, a).setNormal(pose, 1, 0, 0);
-            vertexConsumer.addVertex(pose, x2, y2, z1).setColor(r, g, b, a).setNormal(pose, 1, 0, 0);
-            vertexConsumer.addVertex(pose, x2, y2, z2).setColor(r, g, b, a).setNormal(pose, 1, 0, 0);
-            vertexConsumer.addVertex(pose, x2, y1, z2).setColor(r, g, b, a).setNormal(pose, 1, 0, 0);
-        });
+        Gizmos.cuboid(shape, GizmoStyle.fill(ARGB.color(0.7f, color.getRGB())));
     }
 
 
@@ -313,19 +259,19 @@ public int getPing() {
     }
 
     public void displayGuiScreen(MPKGuiScreen screen) {
-        net.minecraft.client.Minecraft.getInstance().setScreen(
+        net.minecraft.client.Minecraft.getInstance().gui.setScreen(
                 screen == null
                         ? null
-                        : new io.github.kurrycat.mpkmod.compatibility.fabric_26_1.MPKGuiScreen(screen));
+                        : new io.github.kurrycat.mpkmod.compatibility.fabric_26_2.MPKGuiScreen(screen));
     }
 
     public String getCurrentGuiScreen() {
-        Screen curr = net.minecraft.client.Minecraft.getInstance().screen;
+        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_1.MPKGuiScreen) {
-            String id = ((io.github.kurrycat.mpkmod.compatibility.fabric_26_1.MPKGuiScreen) curr).eventReceiver.getID();
+        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();
             if (id == null)
                 id = "unknown";
 

fabric-26.1/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_1/MPKGuiScreen.java → fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/MPKGuiScreen.java

@@ -1,4 +1,4 @@
-package io.github.kurrycat.mpkmod.compatibility.fabric_26_1;
+package io.github.kurrycat.mpkmod.compatibility.fabric_26_2;
 
 import io.github.kurrycat.mpkmod.compatibility.API;
 import io.github.kurrycat.mpkmod.compatibility.MCClasses.Profiler;

fabric-26.1/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_1/MPKMod.java → fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/MPKMod.java

@@ -1,11 +1,11 @@
-package io.github.kurrycat.mpkmod.compatibility.fabric_26_1;
+package io.github.kurrycat.mpkmod.compatibility.fabric_26_2;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.viaversion.viafabricplus.ViaFabricPlus;
 import com.viaversion.viafabricplus.api.ViaFabricPlusBase;
 import io.github.kurrycat.mpkmod.compatibility.API;
 import io.github.kurrycat.mpkmod.compatibility.MCClasses.KeyBinding;
-import io.github.kurrycat.mpkmod.compatibility.fabric_26_1.network.DataCustomPayload;
+import io.github.kurrycat.mpkmod.compatibility.fabric_26_2.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;

fabric-26.1/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_1/MPKModMenu.java → fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/MPKModMenu.java

@@ -1,4 +1,4 @@
-package io.github.kurrycat.mpkmod.compatibility.fabric_26_1;
+package io.github.kurrycat.mpkmod.compatibility.fabric_26_2;
 
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;

fabric-26.1/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_1/mixin/KeyMappingAccessor.java → fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/mixin/KeyMappingAccessor.java

@@ -1,4 +1,4 @@
-package io.github.kurrycat.mpkmod.compatibility.fabric_26_1.mixin;
+package io.github.kurrycat.mpkmod.compatibility.fabric_26_2.mixin;
 
 import com.mojang.blaze3d.platform.InputConstants;
 import net.minecraft.client.KeyMapping;

fabric-26.1/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_1/mixin/KeyboardHandlerMixin.java → fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/mixin/KeyboardHandlerMixin.java

@@ -1,6 +1,6 @@
-package io.github.kurrycat.mpkmod.compatibility.fabric_26_1.mixin;
+package io.github.kurrycat.mpkmod.compatibility.fabric_26_2.mixin;
 
-import io.github.kurrycat.mpkmod.compatibility.fabric_26_1.MPKMod;
+import io.github.kurrycat.mpkmod.compatibility.fabric_26_2.MPKMod;
 import net.minecraft.client.KeyboardHandler;
 import net.minecraft.client.input.KeyEvent;
 import org.spongepowered.asm.mixin.Mixin;

fabric-26.1/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_1/mixin/LevelRendererMixin.java → fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/mixin/LevelRendererMixin.java

@@ -1,10 +1,10 @@
-package io.github.kurrycat.mpkmod.compatibility.fabric_26_1.mixin;
+package io.github.kurrycat.mpkmod.compatibility.fabric_26_2.mixin;
 
 import com.mojang.blaze3d.vertex.PoseStack;
-import io.github.kurrycat.mpkmod.compatibility.fabric_26_1.MPKMod;
+import io.github.kurrycat.mpkmod.compatibility.fabric_26_2.MPKMod;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.LevelRenderer;
-import net.minecraft.client.renderer.SubmitNodeStorage;
+import net.minecraft.client.renderer.SubmitNodeCollector;
 import net.minecraft.client.renderer.state.level.LevelRenderState;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -14,7 +14,7 @@
 @Mixin(LevelRenderer.class)
 public class LevelRendererMixin {
     @Inject(method = "submitBlockEntities", at = @At("HEAD"))
-    public void render(PoseStack poseStack, LevelRenderState levelRenderState, SubmitNodeStorage submitNodeStorage, CallbackInfo ci) {
+    public void render(PoseStack poseStack, LevelRenderState levelRenderState, SubmitNodeCollector submitNodeCollector, CallbackInfo ci) {
         MPKMod.INSTANCE.eventHandler.onRenderWorldOverlay(
                 new PoseStack(),
                 Minecraft.getInstance().getDeltaTracker().getGameTimeDeltaPartialTick(true)

fabric-26.1/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_1/mixin/MinecraftMixin.java → fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/mixin/MinecraftMixin.java

@@ -1,6 +1,6 @@
-package io.github.kurrycat.mpkmod.compatibility.fabric_26_1.mixin;
+package io.github.kurrycat.mpkmod.compatibility.fabric_26_2.mixin;
 
-import io.github.kurrycat.mpkmod.compatibility.fabric_26_1.MPKMod;
+import io.github.kurrycat.mpkmod.compatibility.fabric_26_2.MPKMod;
 import net.minecraft.client.Minecraft;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

fabric-26.1/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_1/mixin/MouseHandlerMixin.java → fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/mixin/MouseHandlerMixin.java

@@ -1,6 +1,6 @@
-package io.github.kurrycat.mpkmod.compatibility.fabric_26_1.mixin;
+package io.github.kurrycat.mpkmod.compatibility.fabric_26_2.mixin;
 
-import io.github.kurrycat.mpkmod.compatibility.fabric_26_1.MPKMod;
+import io.github.kurrycat.mpkmod.compatibility.fabric_26_2.MPKMod;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.MouseHandler;
 import net.minecraft.client.input.MouseButtonInfo;

fabric-26.1/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_1/mixin/ToggleSprintKeyMixin.java → fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/mixin/ToggleSprintKeyMixin.java

@@ -1,4 +1,4 @@
-package io.github.kurrycat.mpkmod.compatibility.fabric_26_1.mixin;
+package io.github.kurrycat.mpkmod.compatibility.fabric_26_2.mixin;
 
 import io.github.kurrycat.mpkmod.compatibility.MCClasses.Minecraft;
 import net.minecraft.client.KeyMapping;

fabric-26.1/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_1/network/DataCustomPayload.java → fabric-26.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_2/network/DataCustomPayload.java

@@ -1,4 +1,4 @@
-package io.github.kurrycat.mpkmod.compatibility.fabric_26_1.network;
+package io.github.kurrycat.mpkmod.compatibility.fabric_26_2.network;
 
 import io.github.kurrycat.mpknetapi.common.MPKNetworking;
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;

fabric-26.1/src/main/resources/fabric.mod.json → fabric-26.2/src/main/resources/fabric.mod.json

@@ -30,9 +30,9 @@
   ],
   "accessWidener" : "mpkmod.classtweaker",
   "depends": {
-    "fabricloader": ">=0.18.4",
+    "fabricloader": ">=0.19.3",
     "fabric-api": "*",
-    "minecraft": ">=26.1",
+    "minecraft": ">=26.2",
     "java": ">=25"
   },
   "suggests": {}

fabric-26.1/src/main/resources/mpkmod.mixins.json → fabric-26.2/src/main/resources/mpkmod.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "minVersion": "0.8",
-  "package": "io.github.kurrycat.mpkmod.compatibility.fabric_26_1.mixin",
+  "package": "io.github.kurrycat.mpkmod.compatibility.fabric_26_2.mixin",
   "compatibilityLevel": "JAVA_25",
   "mixins": [
   ],

gradle.properties

@@ -1,6 +1,6 @@
 $group=io.github.kurrycat.mpkmod
 $jitpackGroup=com.github.mpkmod
-$version=2.3.2
+$version=2.3.3
 $apiVersion=1.0
 $modBaseName=mpkmod
 $commonBaseName=mpkmod-common

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.1")
+    include("fabric-26.2")
 }