Merge pull request #31 from kurrycat2004/1.20.4

Update to 1.20.4

README.md

@@ -29,13 +29,13 @@ If you think that mpkmod should have a specific feature, encounter any bugs or i
 
 ### Supported versions
 
-* [Forge](https://files.minecraftforge.net)
+* [Forge](https://files.minecraftforge.net/)
     - 1.8.9
     - 1.19.4
     - 1.20
 * [Fabric](https://fabricmc.net/)
     - 1.19.4
-    - 1.20
+    - 1.20.4
 
 ---
 
@@ -80,6 +80,8 @@ The landing mode is `Land` by default, which will compare the specified bounding
 
 ### Snapshots
 
-**IMPORTANT: GitHub only displays artifacts if you are logged in** <br>
+> [!IMPORTANT]  
+> GitHub only displays artifacts if you are logged in.
+
 Go to [actions](https://github.com/kurrycat2004/MPKMod_2/actions/workflows/gradle.yml?query=is%3Asuccess+branch%3Amaster), click the build you want to download (first=newest) and scroll down to Artifacts.
 The zip file (`mpkmod-build.DATE-TIME.zip`) will contain the mod jar for every supported version.

fabric-1.19.4/gradle.properties

@@ -6,7 +6,7 @@ org.gradle.parallel=true
 # check these on https://fabricmc.net/develop
 minecraft_version=1.19.4
 yarn_mappings=1.19.4+build.2
-loader_version=0.14.21
+loader_version=0.15.3
 
 #Fabric api
 fabric_version=0.83.0+1.19.4

fabric-1.19.4/src/main/resources/fabric.mod.json

@@ -27,7 +27,7 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.14.19",
+    "fabricloader": ">=0.15.3",
     "fabric-api": "*",
     "minecraft": "~1.19.4",
     "java": ">=17"

fabric-1.20/gradle.properties → fabric-1.20.4/gradle.properties

@@ -4,12 +4,11 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.20
-yarn_mappings=1.20+build.1
-yarn_mappings_version=1
-loader_version=0.14.21
+minecraft_version=1.20.4
+yarn_mappings=1.20.4+build.3
+loader_version=0.15.3
 
 #Fabric api
-fabric_version=0.83.0+1.20
+fabric_version=0.92.0+1.20.4
 
 jdkVersion=17

fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/EventHandler.java → fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/EventHandler.java

@@ -1,9 +1,9 @@
-package io.github.kurrycat.mpkmod.compatibility.fabric_1_20;
+package io.github.kurrycat.mpkmod.compatibility.fabric_1_20_4;
 
 
 import io.github.kurrycat.mpkmod.compatibility.API;
 import io.github.kurrycat.mpkmod.compatibility.MCClasses.Player;
-import io.github.kurrycat.mpkmod.compatibility.fabric_1_20.mixin.KeyBindingAccessor;
+import io.github.kurrycat.mpkmod.compatibility.fabric_1_20_4.mixin.KeyBindingAccessor;
 import io.github.kurrycat.mpkmod.ticks.ButtonMS;
 import io.github.kurrycat.mpkmod.ticks.ButtonMSList;
 import io.github.kurrycat.mpkmod.util.Vector3D;

fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/FunctionCompatibility.java → fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/FunctionCompatibility.java

@@ -1,8 +1,8 @@
-package io.github.kurrycat.mpkmod.compatibility.fabric_1_20;
+package io.github.kurrycat.mpkmod.compatibility.fabric_1_20_4;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import io.github.kurrycat.mpkmod.compatibility.MCClasses.*;
-import io.github.kurrycat.mpkmod.compatibility.fabric_1_20.mixin.KeyBindingAccessor;
+import io.github.kurrycat.mpkmod.compatibility.fabric_1_20_4.mixin.KeyBindingAccessor;
 import io.github.kurrycat.mpkmod.gui.MPKGuiScreen;
 import io.github.kurrycat.mpkmod.util.BoundingBox3D;
 import io.github.kurrycat.mpkmod.util.Debug;
@@ -309,16 +309,16 @@ public void displayGuiScreen(MPKGuiScreen screen) {
         MinecraftClient.getInstance().setScreen(
                 screen == null
                         ? null
-                        : new io.github.kurrycat.mpkmod.compatibility.fabric_1_20.MPKGuiScreen(screen));
+                        : new io.github.kurrycat.mpkmod.compatibility.fabric_1_20_4.MPKGuiScreen(screen));
     }
 
     public String getCurrentGuiScreen() {
         Screen curr = MinecraftClient.getInstance().currentScreen;
 
         if (curr == null)
             return null;
-        else if (curr instanceof io.github.kurrycat.mpkmod.compatibility.fabric_1_20.MPKGuiScreen) {
-            String id = ((io.github.kurrycat.mpkmod.compatibility.fabric_1_20.MPKGuiScreen) curr).eventReceiver.getID();
+        else if (curr instanceof io.github.kurrycat.mpkmod.compatibility.fabric_1_20_4.MPKGuiScreen) {
+            String id = ((io.github.kurrycat.mpkmod.compatibility.fabric_1_20_4.MPKGuiScreen) curr).eventReceiver.getID();
             if (id == null)
                 id = "unknown";
 
@@ -397,7 +397,7 @@ public boolean setInputs(Float yaw, boolean relYaw, Float pitch, boolean relPitc
     }
 
     public boolean isF3Enabled() {
-        return MinecraftClient.getInstance().options.debugEnabled;
+        return MinecraftClient.getInstance().getDebugHud().shouldShowDebugHud();
     }
 
     public List<Integer> getPressedButtons() {

fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/MPKGuiScreen.java → fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/MPKGuiScreen.java

@@ -1,4 +1,4 @@
-package io.github.kurrycat.mpkmod.compatibility.fabric_1_20;
+package io.github.kurrycat.mpkmod.compatibility.fabric_1_20_4;
 
 import io.github.kurrycat.mpkmod.compatibility.API;
 import io.github.kurrycat.mpkmod.compatibility.MCClasses.Profiler;
@@ -76,11 +76,11 @@ public boolean charTyped(char c, int modifiers) {
     }
 
     @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double delta) {
+    public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) {
         eventReceiver.onMouseScroll(
                 new Vector2D(mouseX, mouseY),
-                (int) (MathUtil.constrain(delta, -1, 1) * 7)
+                (int) (MathUtil.constrain(verticalAmount, -1, 1) * 7)
         );
-        return super.mouseScrolled(mouseX, mouseY, delta);
+        return super.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount);
     }
 }

fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/MPKMod.java → fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/MPKMod.java

@@ -1,4 +1,4 @@
-package io.github.kurrycat.mpkmod.compatibility.fabric_1_20;
+package io.github.kurrycat.mpkmod.compatibility.fabric_1_20_4;
 
 import io.github.kurrycat.mpkmod.compatibility.API;
 import io.github.kurrycat.mpkmod.compatibility.MCClasses.KeyBinding;

fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/mixin/GameRendererMixin.java → fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/mixin/GameRendererMixin.java

@@ -1,6 +1,6 @@
-package io.github.kurrycat.mpkmod.compatibility.fabric_1_20.mixin;
+package io.github.kurrycat.mpkmod.compatibility.fabric_1_20_4.mixin;
 
-import io.github.kurrycat.mpkmod.compatibility.fabric_1_20.MPKMod;
+import io.github.kurrycat.mpkmod.compatibility.fabric_1_20_4.MPKMod;
 import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 import org.spongepowered.asm.mixin.Mixin;

fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/mixin/KeyBindingAccessor.java → fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/mixin/KeyBindingAccessor.java

@@ -1,4 +1,4 @@
-package io.github.kurrycat.mpkmod.compatibility.fabric_1_20.mixin;
+package io.github.kurrycat.mpkmod.compatibility.fabric_1_20_4.mixin;
 
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.InputUtil;

fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/mixin/KeyboardMixin.java → fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/mixin/KeyboardMixin.java

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

fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/mixin/MinecraftClientMixin.java → fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/mixin/MinecraftClientMixin.java

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

fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/mixin/MouseMixin.java → fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/mixin/MouseMixin.java

@@ -1,4 +1,4 @@
-package io.github.kurrycat.mpkmod.compatibility.fabric_1_20.mixin;
+package io.github.kurrycat.mpkmod.compatibility.fabric_1_20_4.mixin;
 
 import io.github.kurrycat.mpkmod.compatibility.API;
 import net.minecraft.client.Mouse;

fabric-1.20/src/main/resources/fabric.mod.json → fabric-1.20.4/src/main/resources/fabric.mod.json

@@ -19,17 +19,17 @@
   "environment": "client",
   "entrypoints": {
     "main": [
-      "io.github.kurrycat.mpkmod.compatibility.fabric_1_20.MPKMod"
+      "io.github.kurrycat.mpkmod.compatibility.fabric_1_20_4.MPKMod"
     ]
   },
   "mixins": [
     "mpkmod.mixins.json"
   ],
 
   "depends": {
-    "fabricloader": ">=0.14.21",
+    "fabricloader": ">=0.15.3",
     "fabric-api": "*",
-    "minecraft": "~1.20",
+    "minecraft": "~1.20.4",
     "java": ">=17"
   },
   "suggests": {}

fabric-1.20/src/main/resources/mpkmod.mixins.json → fabric-1.20.4/src/main/resources/mpkmod.mixins.json

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

settings.gradle

@@ -28,5 +28,5 @@ if (!System.env.JITPACK) {
     include 'forge-1.19.4'
     include 'fabric-1.19.4'
     include 'forge-1.20'
-    include 'fabric-1.20'
+    include 'fabric-1.20.4'
 }