From 1f2d58d4542853c05d2c56626c573c3d71f0e614 Mon Sep 17 00:00:00 2001 From: lukasabbe <67807954+lukasabbe@users.noreply.github.com> Date: Wed, 13 Nov 2024 22:06:39 +0100 Subject: [PATCH 1/7] 1.21.4 version --- gradle.properties | 8 ++++---- .../network/packets/ModCheckPayload.java | 2 +- src/main/resources/fabric.mod.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index dcec897..b335565 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,16 +2,16 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.21.3 -yarn_mappings=1.21.3+build.2 +minecraft_version=24w46a +yarn_mappings=24w46a+build.4 loader_version=0.16.9 # Mod Properties -mod_version=1.8+1.21.3 +mod_version=1.8+1.21.4-SNAPSHOT.2 maven_group=me.lukasabbe archives_base_name=Bookshelfinspector # Dependencies -fabric_version=0.107.3+1.21.3 +fabric_version=0.108.1+1.21.4 cloth_config=16.0.141 modmenu=12.0.0-beta.1 YAML_snake=2.2 \ No newline at end of file diff --git a/src/main/java/me/lukasabbe/bookshelfinspector/network/packets/ModCheckPayload.java b/src/main/java/me/lukasabbe/bookshelfinspector/network/packets/ModCheckPayload.java index 5f2866c..56c4927 100644 --- a/src/main/java/me/lukasabbe/bookshelfinspector/network/packets/ModCheckPayload.java +++ b/src/main/java/me/lukasabbe/bookshelfinspector/network/packets/ModCheckPayload.java @@ -10,7 +10,7 @@ public record ModCheckPayload(boolean modActivated) implements CustomPayload { public static final CustomPayload.Id ID = new CustomPayload.Id<>(BookShelfInspectorNetworkConstants.MOD_CHECK_PACKET_ID); public static final PacketCodec CODEC = PacketCodec.tuple( - PacketCodecs.BOOL, ModCheckPayload::modActivated, + PacketCodecs.BOOLEAN, ModCheckPayload::modActivated, ModCheckPayload::new ); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 68722ac..60df794 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -25,7 +25,7 @@ ], "depends": { "fabricloader": ">=${loader_version}", - "minecraft": ">=1.21.3", + "minecraft": ">=1.21.4-alpha.24.46.a", "fabric-api-base": "*", "fabric-networking-api-v1": "*", "fabric-lifecycle-events-v1": "*", From a0ba6fec51767b142616610671758014d8a0c284 Mon Sep 17 00:00:00 2001 From: lukasabbe <67807954+lukasabbe@users.noreply.github.com> Date: Thu, 21 Nov 2024 16:06:27 +0100 Subject: [PATCH 2/7] pre rel --- gradle.properties | 8 ++++---- src/main/resources/fabric.mod.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index b335565..7fc8d6b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,16 +2,16 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=24w46a -yarn_mappings=24w46a+build.4 +minecraft_version=1.21.4-pre1 +yarn_mappings=1.21.4-pre1+build.2 loader_version=0.16.9 # Mod Properties -mod_version=1.8+1.21.4-SNAPSHOT.2 +mod_version=1.8+1.21.4-SNAPSHOT.3 maven_group=me.lukasabbe archives_base_name=Bookshelfinspector # Dependencies -fabric_version=0.108.1+1.21.4 +fabric_version=0.109.1+1.21.4 cloth_config=16.0.141 modmenu=12.0.0-beta.1 YAML_snake=2.2 \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 60df794..7b2a84e 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -2,7 +2,7 @@ "schemaVersion": 1, "id": "bookshelfinspector", "version": "${version}", - "name": "Bookshelfinspector", + "name": "Bookshelf Inspector", "description": "Inspect any book in a chiseled bookshelf.", "authors": ["Lukasabbe"], "contact": {}, From a389be966440ec271e5731634acf581eb10b9ea5 Mon Sep 17 00:00:00 2001 From: lukasabbe <67807954+lukasabbe@users.noreply.github.com> Date: Wed, 27 Nov 2024 19:17:36 +0100 Subject: [PATCH 3/7] pre3 --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7fc8d6b..8e9af25 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.21.4-pre1 -yarn_mappings=1.21.4-pre1+build.2 +minecraft_version=1.21.4-pre3 +yarn_mappings=1.21.4-pre3+build.2 loader_version=0.16.9 # Mod Properties mod_version=1.8+1.21.4-SNAPSHOT.3 @@ -11,7 +11,7 @@ maven_group=me.lukasabbe archives_base_name=Bookshelfinspector # Dependencies -fabric_version=0.109.1+1.21.4 +fabric_version=0.110.0+1.21.4 cloth_config=16.0.141 modmenu=12.0.0-beta.1 YAML_snake=2.2 \ No newline at end of file From 2e660089fb87768de3adb536385307948716052c Mon Sep 17 00:00:00 2001 From: lukasabbe <67807954+lukasabbe@users.noreply.github.com> Date: Mon, 2 Dec 2024 15:42:03 +0100 Subject: [PATCH 4/7] fixed last things for 1.21.4 --- build.gradle | 4 +++- gradle.properties | 2 +- .../bookshelfinspector/util/HudRenderer.java | 16 ++++++++++------ .../bookshelfinspector/util/Inspector.java | 6 +++--- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 0f4cd8d..d167c5f 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,9 @@ dependencies { "fabric-api-base", "fabric-networking-api-v1", "fabric-lifecycle-events-v1", - "fabric-resource-loader-v0" + "fabric-resource-loader-v0", + "fabric-client-tags-api-v1", + "fabric-convention-tags-v2", ] apiMudules.forEach { diff --git a/gradle.properties b/gradle.properties index 8e9af25..efa9e6a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ maven_group=me.lukasabbe archives_base_name=Bookshelfinspector # Dependencies -fabric_version=0.110.0+1.21.4 +fabric_version=0.110.3+1.21.4 cloth_config=16.0.141 modmenu=12.0.0-beta.1 YAML_snake=2.2 \ No newline at end of file diff --git a/src/main/java/me/lukasabbe/bookshelfinspector/util/HudRenderer.java b/src/main/java/me/lukasabbe/bookshelfinspector/util/HudRenderer.java index dd642b9..e72eb41 100644 --- a/src/main/java/me/lukasabbe/bookshelfinspector/util/HudRenderer.java +++ b/src/main/java/me/lukasabbe/bookshelfinspector/util/HudRenderer.java @@ -52,17 +52,21 @@ public class HudRenderer { final int level = storedComponents.getLevel(enchantment); if(level != 1) lvl = String.valueOf(level); - final MutableText append; + final MutableText enchantmentText; + if(!BookshelfinspectorClient.config.useRoman || level == -1) - append = enchantment.value().description().copy().append(" " + lvl); + enchantmentText = enchantment.value().description().copy().append(" " + lvl); + else if (level != 1) + enchantmentText = enchantment.value().description().copy().append(" " + RomanNumerals.toRoman(level)); else - append = enchantment.value().description().copy().append(" " + RomanNumerals.toRoman(level)); + enchantmentText = enchantment.value().description().copy(); + if(enchantment.isIn(EnchantmentTags.CURSE)) { - Texts.setStyleIfAbsent(append, Style.EMPTY.withColor(Formatting.RED)); + Texts.setStyleIfAbsent(enchantmentText, Style.EMPTY.withColor(Formatting.RED)); }else { - Texts.setStyleIfAbsent(append, Style.EMPTY.withColor(Formatting.GRAY)); + Texts.setStyleIfAbsent(enchantmentText, Style.EMPTY.withColor(Formatting.GRAY)); } - drawScaledText(context, append, x,y+i, 0xFFFFFFFF,client.textRenderer); + drawScaledText(context, enchantmentText, x,y+i, 0xFFFFFFFF,client.textRenderer); i+=(int)(10*scaleFactor); } } diff --git a/src/main/java/me/lukasabbe/bookshelfinspector/util/Inspector.java b/src/main/java/me/lukasabbe/bookshelfinspector/util/Inspector.java index 817eea2..676d0bb 100644 --- a/src/main/java/me/lukasabbe/bookshelfinspector/util/Inspector.java +++ b/src/main/java/me/lukasabbe/bookshelfinspector/util/Inspector.java @@ -8,17 +8,16 @@ import me.lukasabbe.bookshelfinspector.network.packets.LecternInventoryRequestPa import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.ChiseledBookshelfBlock; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.block.entity.LecternBlockEntity; import net.minecraft.client.MinecraftClient; +import net.minecraft.registry.tag.BlockTags; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.hit.HitResult; import net.minecraft.util.math.BlockPos; -import java.util.Optional; import java.util.OptionalInt; import static me.lukasabbe.bookshelfinspector.BookshelfinspectorClient.*; @@ -53,6 +52,7 @@ public class Inspector { } bookShelfData.latestPos = pos; + if(client.player.getWorld().getBlockState(pos).isOf(Blocks.CHISELED_BOOKSHELF)){ bookShelfInspect(pos, blockHitResult, client); }else if(client.player.getWorld().getBlockState(pos).isOf(Blocks.LECTERN) && config.lecternToggle){ From c09be6977a00a4f162089c8cb976b715c29e57f2 Mon Sep 17 00:00:00 2001 From: lukasabbe <67807954+lukasabbe@users.noreply.github.com> Date: Mon, 2 Dec 2024 15:44:16 +0100 Subject: [PATCH 5/7] bumped version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index efa9e6a..59f58cc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ minecraft_version=1.21.4-pre3 yarn_mappings=1.21.4-pre3+build.2 loader_version=0.16.9 # Mod Properties -mod_version=1.8+1.21.4-SNAPSHOT.3 +mod_version=1.9+1.21.4-SNAPSHOT.4 maven_group=me.lukasabbe archives_base_name=Bookshelfinspector From f5b2ce2261597b48a1feea44167efee21ee3543f Mon Sep 17 00:00:00 2001 From: lukasabbe <67807954+lukasabbe@users.noreply.github.com> Date: Mon, 2 Dec 2024 15:51:37 +0100 Subject: [PATCH 6/7] built in rc.3 --- gradle.properties | 6 +++--- src/main/resources/fabric.mod.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 59f58cc..054117b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ # Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx1G +org.gradle.jvmargs=-Xmx4G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.21.4-pre3 -yarn_mappings=1.21.4-pre3+build.2 +minecraft_version=1.21.4-rc3 +yarn_mappings=1.21.4-rc3+build.3 loader_version=0.16.9 # Mod Properties mod_version=1.9+1.21.4-SNAPSHOT.4 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 7b2a84e..8d17f30 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -25,7 +25,7 @@ ], "depends": { "fabricloader": ">=${loader_version}", - "minecraft": ">=1.21.4-alpha.24.46.a", + "minecraft": ">=1.21.4-rc.3", "fabric-api-base": "*", "fabric-networking-api-v1": "*", "fabric-lifecycle-events-v1": "*", From 25887286fa734d1d8cf61237e67f6903b5c2e798 Mon Sep 17 00:00:00 2001 From: lukasabbe <67807954+lukasabbe@users.noreply.github.com> Date: Tue, 3 Dec 2024 21:52:30 +0100 Subject: [PATCH 7/7] 1.21.4 without cloth-config --- gradle.properties | 6 +++--- src/main/resources/fabric.mod.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 054117b..6ef9224 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx4G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.21.4-rc3 -yarn_mappings=1.21.4-rc3+build.3 +minecraft_version=1.21.4 +yarn_mappings=1.21.4+build.1 loader_version=0.16.9 # Mod Properties mod_version=1.9+1.21.4-SNAPSHOT.4 @@ -11,7 +11,7 @@ maven_group=me.lukasabbe archives_base_name=Bookshelfinspector # Dependencies -fabric_version=0.110.3+1.21.4 +fabric_version=0.110.5+1.21.4 cloth_config=16.0.141 modmenu=12.0.0-beta.1 YAML_snake=2.2 \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 8d17f30..cb9c24e 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -25,7 +25,7 @@ ], "depends": { "fabricloader": ">=${loader_version}", - "minecraft": ">=1.21.4-rc.3", + "minecraft": ">=1.21.4", "fabric-api-base": "*", "fabric-networking-api-v1": "*", "fabric-lifecycle-events-v1": "*",