patch

KessokuTeaTime · Mar 2, 2024 · a8da34a · a8da34a
1 parent ea6d788
commit a8da34a
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 7 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 maven-group = "net.krlite"
 archives-name = "reicollapsibleentries"
-mod = "3.0.0"
+mod = "3.0.1"
 
 minecraft = "1.20"
 yarn = "1.20+build.1"

diff --git a/src/main/java/net/krlite/reicollapsibleentries/client/command/HeldItemTagsCommand.java b/src/main/java/net/krlite/reicollapsibleentries/client/command/HeldItemTagsCommand.java
@@ -20,12 +20,17 @@ public int run(CommandContext<FabricClientCommandSource> context) {
 		ItemStack stack = context.getSource().getPlayer().getMainHandStack();
 		Identifier itemId = Registries.ITEM.getId(stack.getItem());
 
-		if (stack.isOf(Items.AIR))
-			return 0;
+		if (stack.isOf(Items.AIR)) return 0;
+		long size = stack.getItem().getRegistryEntry().streamTags().count();
 
-		if (stack.getItem().getRegistryEntry().streamTags().findAny().isPresent()) {
+		context.getSource().sendFeedback(Text.translatable(
+				size == 0 ? "tagged.none" : size == 1 ? "tagged.only" : "tagged.more",
+				stack.toHoverableText()
+		));
+
+		if (size > 0) {
 			context.getSource().sendFeedback(streamTags(stack));
-		} else context.getSource().sendFeedback(Text.translatable("tagged.none"));
+		}
 
 		return SINGLE_SUCCESS;
 	}

diff --git a/src/main/resources/assets/reicollapsibleentries/lang/en_us.json b/src/main/resources/assets/reicollapsibleentries/lang/en_us.json
@@ -7,7 +7,10 @@
   "comment_tag": "Tags",
 
   "tagged.#": "#",
-  "tagged.none": "§7Empty Tag",
+
+  "tagged.only": "%s §7has the following tag:",
+  "tagged.more": "%s §7has the following tags:",
+  "tagged.none": "%s §7has no tag",
 
   "tagged.c.shulker_boxes": "Shulker Boxes",
   "tagged.c.ores"         : "Ores",
@@ -47,6 +50,9 @@
 
   "tagged.catwalksinc.filled_paint_rolls": "§6Filled Paint Rollers",
 
+  "tagged.create.toolboxes": "Toolboxes",
+  "tagged.create.seats"    : "Seats",
+
   "tagged.create.stone_types/veridium" : "Veridiums",
   "tagged.create.stone_types/scorchia" : "Scorchias",
   "tagged.create.stone_types/scoria"   : "Scorias",

diff --git a/src/main/resources/assets/reicollapsibleentries/lang/zh_cn.json b/src/main/resources/assets/reicollapsibleentries/lang/zh_cn.json
@@ -9,7 +9,9 @@
 
   "comment_tag": "标签",
 
-  "tagged.none": "§7空标签",
+  "tagged.only": "%s§7有以下标签：",
+  "tagged.more": "%s§7有以下标签：",
+  "tagged.none": "%s§7没有标签",
 
   "tagged.c.shulker_boxes": "潜影盒",
   "tagged.c.ores"         : "矿物",
@@ -49,6 +51,9 @@
 
   "tagged.catwalksinc.filled_paint_rolls": "§6油漆滚筒",
 
+  "tagged.create.toolboxes": "工具箱",
+  "tagged.create.seats"    : "座垫",
+
   "tagged.create.stone_types/veridium" : "辉绿岩系",
   "tagged.create.stone_types/scorchia" : "焦黑熔渣岩系",
   "tagged.create.stone_types/scoria"   : "熔渣岩系",

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -32,6 +32,7 @@
   "mixins": [
     "reicollapsibleentries.mixins.json"
   ],
+  "accessWidener": "reicollapsibleentries.accesswidener",
 
   "depends": {
     "fabricloader": "*",