diff --git a/README.md b/README.md index f306e9a..9a55b38 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # ItemCounts A Minecraft [Fabric](https://fabricmc.net/) mod that displays the total amount of items in your hotbar. -Built for version 1.19.4 +Built for version 1.20.1 [Curseforge release](https://www.curseforge.com/minecraft/mc-mods/item-counts-fabric) diff --git a/build.gradle b/build.gradle index 538d167..7decb9f 100644 --- a/build.gradle +++ b/build.gradle @@ -29,10 +29,10 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation("me.shedaniel.cloth:cloth-config-fabric:[10.0,11.0)") { + modImplementation("me.shedaniel.cloth:cloth-config-fabric:[11.0,12.0)") { exclude(group: "net.fabricmc.fabric-api") } - modImplementation("com.terraformersmc:modmenu:[6.0,7.0)") { + modImplementation("com.terraformersmc:modmenu:[7.1,8.0)") { exclude group: "net.fabricmc.fabric-api" } diff --git a/gradle.properties b/gradle.properties index 52d7160..c36d1a4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/versions.html - minecraft_version=1.19.4 - yarn_mappings=1.19.4+build.1 - loader_version=0.14.17 + minecraft_version=1.20.1 + yarn_mappings=1.20.1+build.1 + loader_version=0.14.21 # Mod Properties mod_version = 1.3.0 @@ -13,4 +13,4 @@ org.gradle.jvmargs=-Xmx1G archives_base_name = itemcounts # Dependencies - fabric_version=0.75.3+1.19.4 + fabric_version=0.83.0+1.20.1 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f72df95..fae0804 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/blazingtwist/itemcounts/config/ItemCountsConfig.java b/src/main/java/blazingtwist/itemcounts/config/ItemCountsConfig.java index 552e677..6ad1ae8 100644 --- a/src/main/java/blazingtwist/itemcounts/config/ItemCountsConfig.java +++ b/src/main/java/blazingtwist/itemcounts/config/ItemCountsConfig.java @@ -174,7 +174,7 @@ public int getHotbarItemCount(PlayerEntity player, ItemStack stack) { } private boolean mergeStackCounts(ItemStack a, ItemStack b) { - return b.isItemEqual(a) && !countStacksSeparately(a, b); + return ItemStack.areItemsEqual(a, b) && !countStacksSeparately(a, b); } private boolean countStacksSeparately(ItemStack a, ItemStack b) { diff --git a/src/main/java/blazingtwist/itemcounts/mixin/InGameHudMixin.java b/src/main/java/blazingtwist/itemcounts/mixin/InGameHudMixin.java index d97e02d..4e2be28 100644 --- a/src/main/java/blazingtwist/itemcounts/mixin/InGameHudMixin.java +++ b/src/main/java/blazingtwist/itemcounts/mixin/InGameHudMixin.java @@ -9,6 +9,7 @@ import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.hud.InGameHud; import net.minecraft.client.render.DiffuseLighting; import net.minecraft.client.render.OverlayTexture; @@ -159,7 +160,7 @@ private void renderItemAt(ItemStack item, int x, int y, float scaleFactor, boole } @Inject(method = "renderHotbarItem(" + - "Lnet/minecraft/client/util/math/MatrixStack;" + + "Lnet/minecraft/client/gui/DrawContext;" + "I" + "I" + "F" + @@ -167,7 +168,7 @@ private void renderItemAt(ItemStack item, int x, int y, float scaleFactor, boole "Lnet/minecraft/item/ItemStack;" + "I" + ")V", at = @At("HEAD")) - public void onRenderHotbarItem(MatrixStack matrixStack, int x, int y, float tickDelta, PlayerEntity player, ItemStack stack, int seed, CallbackInfo info) { + public void onRenderHotbarItem(DrawContext context, int x, int y, float tickDelta, PlayerEntity player, ItemStack stack, int seed, CallbackInfo info) { if (stack.isEmpty()) { return; } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 9fb0d52..f4aabe1 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -30,9 +30,9 @@ ], "depends": { - "fabricloader": ">=0.14.17", + "fabricloader": ">=0.14.21", "fabric": "*", - "minecraft": "~1.19.4", + "minecraft": "~1.20.1", "java": ">=17" }, "suggests": {