diff --git a/README.md b/README.md index 50e71191..bd21e821 100644 --- a/README.md +++ b/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**
+> [!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. diff --git a/fabric-1.19.4/gradle.properties b/fabric-1.19.4/gradle.properties index 1841edb0..5c2d7d37 100644 --- a/fabric-1.19.4/gradle.properties +++ b/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 diff --git a/fabric-1.19.4/src/main/resources/fabric.mod.json b/fabric-1.19.4/src/main/resources/fabric.mod.json index d3a2c33a..6d2068eb 100644 --- a/fabric-1.19.4/src/main/resources/fabric.mod.json +++ b/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" diff --git a/fabric-1.20/.gitignore b/fabric-1.20.4/.gitignore similarity index 100% rename from fabric-1.20/.gitignore rename to fabric-1.20.4/.gitignore diff --git a/fabric-1.20/build.gradle b/fabric-1.20.4/build.gradle similarity index 100% rename from fabric-1.20/build.gradle rename to fabric-1.20.4/build.gradle diff --git a/fabric-1.20/gradle.properties b/fabric-1.20.4/gradle.properties similarity index 61% rename from fabric-1.20/gradle.properties rename to fabric-1.20.4/gradle.properties index a1a646b9..753a3e42 100644 --- a/fabric-1.20/gradle.properties +++ b/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 diff --git a/fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/EventHandler.java b/fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/EventHandler.java similarity index 97% rename from fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/EventHandler.java rename to fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/EventHandler.java index 3c29cf93..61b77cee 100644 --- a/fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/EventHandler.java +++ b/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; diff --git a/fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/FunctionCompatibility.java b/fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/FunctionCompatibility.java similarity index 97% rename from fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/FunctionCompatibility.java rename to fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/FunctionCompatibility.java index a4d95ec4..b2cd4e8a 100644 --- a/fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/FunctionCompatibility.java +++ b/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,7 +309,7 @@ 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() { @@ -317,8 +317,8 @@ public String getCurrentGuiScreen() { 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 getPressedButtons() { diff --git a/fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/MPKGuiScreen.java b/fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/MPKGuiScreen.java similarity index 91% rename from fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/MPKGuiScreen.java rename to fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/MPKGuiScreen.java index a6c93453..79439e7e 100644 --- a/fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/MPKGuiScreen.java +++ b/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); } } diff --git a/fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/MPKMod.java b/fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/MPKMod.java similarity index 98% rename from fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/MPKMod.java rename to fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/MPKMod.java index cfc92758..66f94c70 100644 --- a/fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/MPKMod.java +++ b/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; diff --git a/fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/mixin/GameRendererMixin.java b/fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/mixin/GameRendererMixin.java similarity index 84% rename from fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/mixin/GameRendererMixin.java rename to fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/mixin/GameRendererMixin.java index d5daf6c8..3dd4ff09 100644 --- a/fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/mixin/GameRendererMixin.java +++ b/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; diff --git a/fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/mixin/KeyBindingAccessor.java b/fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/mixin/KeyBindingAccessor.java similarity index 81% rename from fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/mixin/KeyBindingAccessor.java rename to fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/mixin/KeyBindingAccessor.java index 52adad96..34483a91 100644 --- a/fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/mixin/KeyBindingAccessor.java +++ b/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; diff --git a/fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/mixin/KeyboardMixin.java b/fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/mixin/KeyboardMixin.java similarity index 80% rename from fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/mixin/KeyboardMixin.java rename to fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/mixin/KeyboardMixin.java index 74ea32fb..68b9bad9 100644 --- a/fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/mixin/KeyboardMixin.java +++ b/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; diff --git a/fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/mixin/MinecraftClientMixin.java b/fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/mixin/MinecraftClientMixin.java similarity index 76% rename from fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/mixin/MinecraftClientMixin.java rename to fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/mixin/MinecraftClientMixin.java index a89cef2e..913c8f9e 100644 --- a/fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/mixin/MinecraftClientMixin.java +++ b/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; diff --git a/fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/mixin/MouseMixin.java b/fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/mixin/MouseMixin.java similarity index 96% rename from fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/mixin/MouseMixin.java rename to fabric-1.20.4/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20_4/mixin/MouseMixin.java index d5bb3ede..67edd326 100644 --- a/fabric-1.20/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/mixin/MouseMixin.java +++ b/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; diff --git a/fabric-1.20/src/main/resources/assets/mpkmod/icon.png b/fabric-1.20.4/src/main/resources/assets/mpkmod/icon.png similarity index 100% rename from fabric-1.20/src/main/resources/assets/mpkmod/icon.png rename to fabric-1.20.4/src/main/resources/assets/mpkmod/icon.png diff --git a/fabric-1.20/src/main/resources/assets/mpkmod/lang/en_US.lang b/fabric-1.20.4/src/main/resources/assets/mpkmod/lang/en_US.lang similarity index 100% rename from fabric-1.20/src/main/resources/assets/mpkmod/lang/en_US.lang rename to fabric-1.20.4/src/main/resources/assets/mpkmod/lang/en_US.lang diff --git a/fabric-1.20/src/main/resources/assets/mpkmod/lang/en_us.json b/fabric-1.20.4/src/main/resources/assets/mpkmod/lang/en_us.json similarity index 100% rename from fabric-1.20/src/main/resources/assets/mpkmod/lang/en_us.json rename to fabric-1.20.4/src/main/resources/assets/mpkmod/lang/en_us.json diff --git a/fabric-1.20/src/main/resources/assets/mpkmod/lang/pl_pl.json b/fabric-1.20.4/src/main/resources/assets/mpkmod/lang/pl_pl.json similarity index 100% rename from fabric-1.20/src/main/resources/assets/mpkmod/lang/pl_pl.json rename to fabric-1.20.4/src/main/resources/assets/mpkmod/lang/pl_pl.json diff --git a/fabric-1.20/src/main/resources/assets/mpkmod/lang/pl_pl.lang b/fabric-1.20.4/src/main/resources/assets/mpkmod/lang/pl_pl.lang similarity index 100% rename from fabric-1.20/src/main/resources/assets/mpkmod/lang/pl_pl.lang rename to fabric-1.20.4/src/main/resources/assets/mpkmod/lang/pl_pl.lang diff --git a/fabric-1.20/src/main/resources/fabric.mod.json b/fabric-1.20.4/src/main/resources/fabric.mod.json similarity index 82% rename from fabric-1.20/src/main/resources/fabric.mod.json rename to fabric-1.20.4/src/main/resources/fabric.mod.json index 96472988..f50e0ad2 100644 --- a/fabric-1.20/src/main/resources/fabric.mod.json +++ b/fabric-1.20.4/src/main/resources/fabric.mod.json @@ -19,7 +19,7 @@ "environment": "client", "entrypoints": { "main": [ - "io.github.kurrycat.mpkmod.compatibility.fabric_1_20.MPKMod" + "io.github.kurrycat.mpkmod.compatibility.fabric_1_20_4.MPKMod" ] }, "mixins": [ @@ -27,9 +27,9 @@ ], "depends": { - "fabricloader": ">=0.14.21", + "fabricloader": ">=0.15.3", "fabric-api": "*", - "minecraft": "~1.20", + "minecraft": "~1.20.4", "java": ">=17" }, "suggests": {} diff --git a/fabric-1.20/src/main/resources/mpkmod.mixins.json b/fabric-1.20.4/src/main/resources/mpkmod.mixins.json similarity index 96% rename from fabric-1.20/src/main/resources/mpkmod.mixins.json rename to fabric-1.20.4/src/main/resources/mpkmod.mixins.json index 6e5801ba..05668f05 100644 --- a/fabric-1.20/src/main/resources/mpkmod.mixins.json +++ b/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": [ ], diff --git a/settings.gradle b/settings.gradle index 445726ff..7518d601 100644 --- a/settings.gradle +++ b/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' }