Improved curse rendering and command

Author: Inf1nlty

src/generated/resources/.cache/20f5c98dc0fe2d7a53fc98de5b4a9405da0eaab5

@@ -1,4 +1,4 @@
-// 1.21.1	2025-08-14T02:08:17.9000088	Biome Modifier Registries: ifw
+// 1.21.1	2025-08-14T14:36:59.4074154	Biome Modifier Registries: ifw
 49f499fed8f8f7c797c3124710dff297dfe03998 data/ifw/neoforge/biome_modifier/ifw_add_deepslate_spawns.json
 d3ce835cbe615798480c31acf5200397159fd125 data/ifw/neoforge/biome_modifier/ifw_add_deep_ores.json
 5073fcccdb1b63e1972de71daef79b5d55a8ea59 data/ifw/neoforge/biome_modifier/ifw_add_forest_spawns.json

src/generated/resources/.cache/9b202840df605b173b28438db133c4554f0ba728

@@ -1,2 +1,2 @@
-// 1.21.1	2025-08-13T02:40:42.2004208	Languages: zh_cn for mod: ifw
-219f46162f43ff9a0e2305dc5344e737699569f9 assets/ifw/lang/zh_cn.json
+// 1.21.1	2025-08-14T14:36:59.4094454	Languages: zh_cn for mod: ifw
+e58157dc84dda3ac65215ad77f1e0d6f1b359a3d assets/ifw/lang/zh_cn.json

src/generated/resources/.cache/e4beba3a8dbdb37f546ef7961fb2493d4be02251

@@ -1,2 +1,2 @@
-// 1.21.1	2025-08-13T03:09:33.6115343	Languages: en_us for mod: ifw
-948ae885f71816d32e804da4f96d555f39f80899 assets/ifw/lang/en_us.json
+// 1.21.1	2025-08-14T14:36:59.4112416	Languages: en_us for mod: ifw
+f633d82e520e0fb6fa8f214487a3b3d42bb31bcc assets/ifw/lang/en_us.json

src/generated/resources/assets/ifw/lang/en_us.json

@@ -200,15 +200,6 @@
   "block.ifw.silver_ore": "Silver Ore",
   "block.ifw.silver_private_chest": "Silver Private Chest",
   "block.ifw.stone_furnace": "Stone Furnace",
-  "cannot_drink": "CantDrink",
-  "cannot_eat_meats": "CantEatAnimals",
-  "cannot_eat_plants": "CantEatPlants",
-  "cannot_hold_breath": "CantHoldBreath",
-  "cannot_open_chests": "CantOpenChests",
-  "cannot_run": "CantRun",
-  "cannot_sleep": "CantSleep",
-  "cannot_wear_armor": "CantWearArmor",
-  "clumsiness": "Elumsiness",
   "commands.clear.curse.player": "Removed curse from %s",
   "commands.clear.curse.players": "Removed curse from %s targets",
   "commands.day.message": "It is day %s of this world",
@@ -223,11 +214,44 @@
   "commands.status.harvesting": "Harvesting: %s",
   "commands.status.melee_damage": "Melee Damage: %s",
   "container.enchant.experience.requirement": "Experience Requirement: %s",
+  "curse.ifw.cannot_drink": "Can't Drink",
+  "curse.ifw.cannot_drink.desc": "You find yourself unable to drink liquids",
+  "curse.ifw.cannot_eat_meats": "Can't Eat Animals",
+  "curse.ifw.cannot_eat_meats.desc": "You find yourself unable to eat meat or animal products",
+  "curse.ifw.cannot_eat_plants": "Can't Eat Plants",
+  "curse.ifw.cannot_eat_plants.desc": "You find yourself unable to eat seeds and other plant foods",
+  "curse.ifw.cannot_hold_breath": "Can't Hold Breath",
+  "curse.ifw.cannot_hold_breath.desc": "You seem unable to hold your breath for very long",
+  "curse.ifw.cannot_open_chests": "Can't Open Chests",
+  "curse.ifw.cannot_open_chests.desc": "You find yourself unable to open chests",
+  "curse.ifw.cannot_run": "Can't Run",
+  "curse.ifw.cannot_run.desc": "You find that your legs don't obey when you try to run",
+  "curse.ifw.cannot_sleep": "Can't Sleep",
+  "curse.ifw.cannot_sleep.desc": "You find yourself unable to sleep at night",
+  "curse.ifw.cannot_wear_armor": "Can't Wear Armor",
+  "curse.ifw.cannot_wear_armor.desc": "You find yourself unable to wear armor of any sort",
+  "curse.ifw.clumsiness": "Clumsiness",
+  "curse.ifw.clumsiness.desc": "Everything feels clumsy in your hands and crafting is difficult",
+  "curse.ifw.endermen_aggro": "Endermen Enemy",
+  "curse.ifw.endermen_aggro.desc": "Endermen seem to have taken a strong disliking to you",
+  "curse.ifw.entanglement": "Entanglement",
+  "curse.ifw.entanglement.desc": "You find yourself having great difficulty moving through vines and other plants",
+  "curse.ifw.equipment_decays_faster": "Equipment Decay",
+  "curse.ifw.equipment_decays_faster.desc": "Your equipment is wearing out faster than usual",
+  "curse.ifw.fear_of_creepers": "Fear of Creepers",
+  "curse.ifw.fear_of_creepers.desc": "You've become fearful of creepers and have difficulty striking them in melee combat",
+  "curse.ifw.fear_of_spiders": "Fear of Spiders",
+  "curse.ifw.fear_of_spiders.desc": "You've become fearful of spiders and have difficulty striking them in melee combat",
+  "curse.ifw.fear_of_undead": "Fear of Undead",
+  "curse.ifw.fear_of_undead.desc": "You've become fearful of undead and have difficulty striking them in melee combat",
+  "curse.ifw.fear_of_wolves": "Fear of Wolves",
+  "curse.ifw.fear_of_wolves.desc": "You've become fearful of wolves and have difficulty striking them in melee combat",
+  "curse.ifw.none": "Empty",
+  "curse.ifw.none.desc": "You are not cursed",
+  "curse.ifw.unknown.desc": "You have been cursed, but its nature is currently unknown.",
   "effect.ifw.insulin_resistance": "Insulin Resistance",
-  "effect.ifw.unkonwn.curse": "You have been cursed",
+  "effect.ifw.unkonwn.curse": "Unknown Curse",
   "enchantment.ifw.speed": "Speed",
-  "endermen_aggro": "EndermenEnemy",
-  "entanglement": "Entanglement",
   "entity.ifw.ancient_bone_lord": "Ancient Bone Lord",
   "entity.ifw.black_widow_spider": "Black Widow Spider",
   "entity.ifw.blob": "Blob",
@@ -257,17 +281,12 @@
   "entity.ifw.wight": "Wight",
   "entity.ifw.wood_spider": "Wood Spider",
   "entity.ifw.zombie": "Zombie",
-  "equipment_decays_faster": "EquipmentDecay",
-  "fear_of_creepers": "FearOfCreepers",
-  "fear_of_spiders": "FearOfSpiders",
-  "fear_of_undead": "FearOfUndead",
-  "fear_of_wolves": "FearOfWolves",
   "foodtips.insulinresponse": "+%s Insulin Response",
   "foodtips.nutrition": "+%s  Food Value",
   "foodtips.phytonutrients": "+%s Phytonutrients Value",
   "foodtips.protein": "+%s Protein Value",
   "foodtips.saturation": "+%s Saturation Value",
-  "ifw.witch_curse.curse": "You have been cursed",
+  "ifw.witch_curse.curse": "You have been cursed!",
   "ifw.witch_curse.discurse": "The curse has gone",
   "item.ifw.adamantium_axe": "Adamantium Axe",
   "item.ifw.adamantium_battle_axe": "Adamantium Battle Axe",
@@ -604,7 +623,6 @@
   "itemGroup.ifw.entity": "IFW| Spawn Eggs",
   "itemGroup.ifw.item": "IFW| Item",
   "itemGroup.ifw.tool": "IFW| Tool",
-  "none": "Empty",
   "tooltip.infinity.armor_penetration": "Ignores 3 armor against skeletons",
   "tooltip.infinity.effective_against_skeletons": "+50% Damage Against Skeletons",
   "tooltip.infinity.gem.xp": "+%s Experience Value",

src/generated/resources/assets/ifw/lang/zh_cn.json

@@ -200,15 +200,6 @@
   "block.ifw.silver_ore": "银矿石",
   "block.ifw.silver_private_chest": "银保险箱",
   "block.ifw.stone_furnace": "石制熔炉",
-  "cannot_drink": "汤煲厌食",
-  "cannot_eat_meats": "肉奶厌食",
-  "cannot_eat_plants": "蔬果厌食",
-  "cannot_hold_breath": "呼吸困难",
-  "cannot_open_chests": "柜子动了",
-  "cannot_run": "腿脚僵硬",
-  "cannot_sleep": "失眠症",
-  "cannot_wear_armor": "盔甲排斥",
-  "clumsiness": "智力下降",
   "commands.clear.curse.player": "已为 %s 清除诅咒",
   "commands.clear.curse.players": "已为个 %s 玩家清除诅咒",
   "commands.day.message": "今天是第 %s 天",
@@ -223,11 +214,44 @@
   "commands.status.harvesting": "采集速度: %s",
   "commands.status.melee_damage": "近战伤害: %s",
   "container.enchant.experience.requirement": "经验需要: %s",
+  "curse.ifw.cannot_drink": "汤煲厌食",
+  "curse.ifw.cannot_drink.desc": "你发现你不能饮用任何汤、煲类食物",
+  "curse.ifw.cannot_eat_meats": "肉奶厌食",
+  "curse.ifw.cannot_eat_meats.desc": "你发现你不能食用任何动物制品",
+  "curse.ifw.cannot_eat_plants": "蔬果厌食",
+  "curse.ifw.cannot_eat_plants.desc": "你发现你不能食用任何植物制品",
+  "curse.ifw.cannot_hold_breath": "呼吸困难",
+  "curse.ifw.cannot_hold_breath.desc": "你发现你不能屏息很长时间",
+  "curse.ifw.cannot_open_chests": "柜子动了",
+  "curse.ifw.cannot_open_chests.desc": "你发现你无法打开箱子（我柜子怎么动了）",
+  "curse.ifw.cannot_run": "腿脚僵硬",
+  "curse.ifw.cannot_run.desc": "你发现你不能疾跑",
+  "curse.ifw.cannot_sleep": "失眠症",
+  "curse.ifw.cannot_sleep.desc": "你发现你在晚上无法入睡",
+  "curse.ifw.cannot_wear_armor": "盔甲排斥",
+  "curse.ifw.cannot_wear_armor.desc": "你发现你不能穿着盔甲",
+  "curse.ifw.clumsiness": "智力下降",
+  "curse.ifw.clumsiness.desc": "你发现制作物品变得十分困难",
+  "curse.ifw.endermen_aggro": "末影仇恨",
+  "curse.ifw.endermen_aggro.desc": "你发现末影人总是对你无缘无故地发起攻击",
+  "curse.ifw.entanglement": "植物缠绕",
+  "curse.ifw.entanglement.desc": "你发现你很难穿越草、藤蔓等植物",
+  "curse.ifw.equipment_decays_faster": "腐蚀性皮肤",
+  "curse.ifw.equipment_decays_faster.desc": "你发现你的装备、武器与工具的耐久度下降得更快",
+  "curse.ifw.fear_of_creepers": "苦力怕恐惧",
+  "curse.ifw.fear_of_creepers.desc": "你发现你难以对苦力怕发起有效攻击",
+  "curse.ifw.fear_of_spiders": "蜘蛛恐惧",
+  "curse.ifw.fear_of_spiders.desc": "你发现你难以对蜘蛛发起有效攻击",
+  "curse.ifw.fear_of_undead": "亡灵生物恐惧",
+  "curse.ifw.fear_of_undead.desc": "你发现你难以对亡灵生物发起有效攻击",
+  "curse.ifw.fear_of_wolves": "恶狼恐惧",
+  "curse.ifw.fear_of_wolves.desc": "你发现你难以对狼发起有效攻击",
+  "curse.ifw.none": "无诅咒",
+  "curse.ifw.none.desc": "你没有被诅咒",
+  "curse.ifw.unknown.desc": "你被诅咒了，但诅咒效果未知.",
   "effect.ifw.insulin_resistance": "胰岛素抵抗",
-  "effect.ifw.unkonwn.curse": "你已经被诅咒了！",
+  "effect.ifw.unkonwn.curse": "未知诅咒",
   "enchantment.ifw.speed": "速度",
-  "endermen_aggro": "末影仇恨",
-  "entanglement": "植物缠绕",
   "entity.ifw.ancient_bone_lord": "远古亡骸领主",
   "entity.ifw.black_widow_spider": "黑寡妇蜘蛛",
   "entity.ifw.blob": "泡泡怪",
@@ -257,17 +281,12 @@
   "entity.ifw.wight": "尸妖",
   "entity.ifw.wood_spider": "木蜘蛛",
   "entity.ifw.zombie": "僵尸",
-  "equipment_decays_faster": "腐蚀性皮肤",
-  "fear_of_creepers": "苦力怕恐惧",
-  "fear_of_spiders": "蜘蛛恐惧",
-  "fear_of_undead": "亡灵生物恐惧",
-  "fear_of_wolves": "恶狼恐惧",
   "foodtips.insulinresponse": "+%s 胰岛素反应",
   "foodtips.nutrition": "+%s 饥饿值",
   "foodtips.phytonutrients": "+%s 植物营养素",
   "foodtips.protein": "+%s 蛋白质",
   "foodtips.saturation": "+%s 饱和度",
-  "ifw.witch_curse.curse": "你已经被诅咒",
+  "ifw.witch_curse.curse": "你已经被诅咒了！",
   "ifw.witch_curse.discurse": "诅咒消逝",
   "item.ifw.adamantium_axe": "艾德曼斧",
   "item.ifw.adamantium_battle_axe": "艾德曼战斧",
@@ -604,7 +623,6 @@
   "itemGroup.ifw.entity": "IFW| 刷怪蛋",
   "itemGroup.ifw.item": "IFW| 物品",
   "itemGroup.ifw.tool": "IFW| 工具",
-  "none": "无诅咒",
   "tooltip.infinity.armor_penetration": "无视骷髅3点护甲值",
   "tooltip.infinity.effective_against_skeletons": "对骷髅类生物+50%伤害",
   "tooltip.infinity.gem.xp": "+%s 玩家经验",

src/main/java/huix/infinity/attachment/IFWAttachments.java

@@ -42,12 +42,13 @@ public class IFWAttachments {
             "is_panic", () -> AttachmentType.builder(() -> false).serialize(Codec.BOOL).build()
     );
 
-
     public static final Supplier<AttachmentType<Integer>> player_curse = ATTACHMENT_TYPES.register(
             "player_curse", () -> AttachmentType.builder(() -> 0).serialize(Codec.INT).copyOnDeath().build()
     );
-    public static final Supplier<AttachmentType<Boolean>> learned_curse = ATTACHMENT_TYPES.register(
-            "learned_curse", () -> AttachmentType.builder(() -> false).serialize(Codec.BOOL).copyOnDeath().build()
-    );
 
-}
+    // 修正：用于“未知诅咒”机制
+    // changed from 'learned_curse' (bool) to 'player_curse_known' (bool) for consistent naming
+    public static final Supplier<AttachmentType<Boolean>> player_curse_known = ATTACHMENT_TYPES.register(
+            "player_curse_known", () -> AttachmentType.builder(() -> false).serialize(Codec.BOOL).copyOnDeath().build()
+    );
+}

src/main/java/huix/infinity/common/command/CommandHandler.java

@@ -1,5 +1,6 @@
 package huix.infinity.common.command;
 
+import huix.infinity.attachment.IFWAttachments;
 import huix.infinity.common.world.curse.CurseType;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.network.chat.Component;
@@ -9,26 +10,33 @@
 import java.util.Collection;
 
 public class CommandHandler {
-
+    /**
+     * 给予玩家指定诅咒，并设置识别状态为未识别
+     */
     public static int giveCurse(CommandSourceStack stack, CurseType curse, Collection<? extends Entity> entities) {
         for (Entity entity : entities) {
             if (entity instanceof Player player) {
-                if (entities.size() == 1) stack.sendSuccess(() -> Component.translatable("commands.give.curse.player", curse.name(), entities.iterator().next().getDisplayName()), true);
+                if (entities.size() == 1) stack.sendSuccess(() -> Component.translatable("commands.give.curse.player", curse.name(), entity.getDisplayName()), true);
                 else stack.sendSuccess(() -> Component.translatable("commands.give.curse.players", curse.name(), entities.size()), true);
                 player.setCurse(curse);
+                player.setData(IFWAttachments.player_curse_known, false); // 给予时重置识别状态
             }
         }
         return entities.size();
     }
 
+    /**
+     * 清除玩家诅咒
+     */
     public static int clearCurse(CommandSourceStack stack, Collection<? extends Entity> entities) {
         for (Entity entity : entities) {
             if (entity instanceof Player player) {
-                if (entities.size() == 1) stack.sendSuccess(() -> Component.translatable("commands.clear.curse.player", entities.iterator().next().getDisplayName()), true);
+                if (entities.size() == 1) stack.sendSuccess(() -> Component.translatable("commands.clear.curse.player", entity.getDisplayName()), true);
                 else stack.sendSuccess(() -> Component.translatable("commands.clear.curse.players", entities.size()), true);
                 player.setCurse(CurseType.none);
+                // 不需要重置 player_curse_known
             }
         }
         return entities.size();
     }
-}
+}

src/main/java/huix/infinity/common/command/arguments/CurseArgument.java

@@ -5,14 +5,15 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
+import com.mojang.brigadier.suggestion.Suggestions;
+import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 import huix.infinity.common.world.curse.CurseType;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.network.chat.Component;
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.function.Supplier;
-
+import java.util.concurrent.CompletableFuture;
 
 public class CurseArgument implements ArgumentType<CurseType> {
 
@@ -37,9 +38,17 @@ public static CurseArgument curse() {
         return new CurseArgument();
     }
 
-
     @Override
     public Collection<String> getExamples() {
         return Arrays.asList("equipment_decays_faster", "cannot_hold_breath");
     }
-}
+    @Override
+    public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
+        for (CurseType type : CurseType.values()) {
+            if (type != CurseType.none) {
+                builder.suggest(type.name());
+            }
+        }
+        return builder.buildFuture();
+    }
+}