Improve curse system

Author: Inf1nlty

src/generated/resources/.cache/20f5c98dc0fe2d7a53fc98de5b4a9405da0eaab5

@@ -1,4 +1,4 @@
-// 1.21.1	2025-09-01T23:42:28.1862181	Biome Modifier Registries: ifw
+// 1.21.1	2025-09-02T08:11:44.5705808	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
@@ -8,7 +8,7 @@ d3ce835cbe615798480c31acf5200397159fd125 data/ifw/neoforge/biome_modifier/ifw_ad
 956d62903ec65e1961be03c957e150f715e717ee data/ifw/neoforge/biome_modifier/ifw_add_shallow_cave_spawns.json
 f204760a74278b1d6101ab42521b8ca6074d5010 data/ifw/neoforge/biome_modifier/ifw_add_silverfish_blocks.json
 4ce978fd516237cda2e397b6021e110a6466b02e data/ifw/neoforge/biome_modifier/ifw_modify_spawns.json
-c3c517b6bb5c1a869ec2b8bb6a5895a4eda835c4 data/ifw/neoforge/biome_modifier/ifw_remove_overworld_features.json
+78e29f65210883c5baddabec772009c2be349d3e data/ifw/neoforge/biome_modifier/ifw_remove_overworld_features.json
 d8062a9987536bc654ee223b0460fb6b8c465eb4 data/ifw/neoforge/biome_modifier/ifw_remove_overworld_spawns.json
 e1ad57aee768b341f1e08d868724c970c8f70c9d data/ifw/worldgen/configured_feature/ore_adamantium.json
 4f66ef802aa37f492bcc727cffaa821b4411a8fa data/ifw/worldgen/configured_feature/ore_mithril.json

src/generated/resources/.cache/4bcb1c211b05e58ffb2380862bfb6b11ccce7318

@@ -1,4 +1,4 @@
-// 1.21.1	2025-08-12T22:56:30.1909377	Item Models: ifw
+// 1.21.1	2025-09-02T08:44:56.6883667	Item Models: ifw
 9ab6010cac42ea73553903db669fc5c01da3210b assets/ifw/models/item/adamantium_axe.json
 3e249b9ae88c47d265a6ad92dba33dd7b78a34b9 assets/ifw/models/item/adamantium_battle_axe.json
 76e201d75e58d642af30ed859a4d320fe680b55d assets/ifw/models/item/adamantium_block.json
@@ -88,6 +88,7 @@ aa50639a2f49d36eff86485122cb855251407d54 assets/ifw/models/item/beef_stew.json
 63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/ifw/models/item/blob_spawn_egg.json
 a3348deef0d095298887251ea972b6e4f4de7b08 assets/ifw/models/item/blueberry.json
 63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/ifw/models/item/bone_lord_spawn_egg.json
+0c3a7017adcc2ae33acf12a18686a8bfb3f23759 assets/ifw/models/item/bottle_of_disenchanting.json
 63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/ifw/models/item/cave_spider_spawn_egg.json
 4d4b4c3bf529abe5e355c9810cffb05df656bbb9 assets/ifw/models/item/cereal.json
 c94008cfc66a738ab0539be5f54fbee69cbf4b76 assets/ifw/models/item/cheese.json

src/generated/resources/.cache/9b202840df605b173b28438db133c4554f0ba728

@@ -1,2 +1,2 @@
-// 1.21.1	2025-09-02T05:11:44.3042787	Languages: zh_cn for mod: ifw
-f815a3fbdccd3df9f5d1025d4085b426d4d6e6de assets/ifw/lang/zh_cn.json
+// 1.21.1	2025-09-02T15:18:15.7228813	Languages: zh_cn for mod: ifw
+6af5e2436aa115c7b0a7267aad825ef67bee7bc4 assets/ifw/lang/zh_cn.json

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

@@ -1,4 +1,4 @@
-// 1.21.1	2025-08-14T00:49:00.7206092	Recipes
+// 1.21.1	2025-09-02T08:44:56.6968709	Recipes
 8b121b827b1b9657f5f6e233bbec2659875f4afe data/ifw/advancement/recipes/building_blocks/adamantium_anvil.json
 8095e32c2e0106f3ba40a10c204f6043d8dabfeb data/ifw/advancement/recipes/building_blocks/adamantium_bars.json
 9d5e5fb6ff22512e12565ce8c70ec8434a2d5448 data/ifw/advancement/recipes/building_blocks/adamantium_door.json

src/generated/resources/.cache/e4beba3a8dbdb37f546ef7961fb2493d4be02251

@@ -1,2 +1,2 @@
-// 1.21.1	2025-09-02T05:11:44.3064375	Languages: en_us for mod: ifw
-e78936d64bfaf3b80ed6f6ff102ad201ce0475dd assets/ifw/lang/en_us.json
+// 1.21.1	2025-09-02T15:18:15.7248811	Languages: en_us for mod: ifw
+39bed468fdf81bfb05524597ed628a86d2855835 assets/ifw/lang/en_us.json

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

@@ -298,7 +298,7 @@
   "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": "%s has cursed you!",
   "ifw.witch_curse.discurse": "The curse has gone",
   "item.ifw.adamantium_axe": "Adamantium Axe",
   "item.ifw.adamantium_battle_axe": "Adamantium Battle Axe",
@@ -366,6 +366,7 @@
   "item.ifw.blob_spawn_egg": "Blob Spawn Egg",
   "item.ifw.blueberry": "Blueberry",
   "item.ifw.bone_lord_spawn_egg": "Bone Lord Spawn Egg",
+  "item.ifw.bottle_of_disenchanting": "Bottle of Disenchanting",
   "item.ifw.cave_spider_spawn_egg": "Cave Spider Spawn Egg",
   "item.ifw.cereal": "Cereal",
   "item.ifw.chanceOfBucketMelting": "%d%% Chance of melting",

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

@@ -298,7 +298,7 @@
   "foodtips.phytonutrients": "+%s 植物营养素",
   "foodtips.protein": "+%s 蛋白质",
   "foodtips.saturation": "+%s 饱和度",
-  "ifw.witch_curse.curse": "你已经被诅咒了！",
+  "ifw.witch_curse.curse": "%s 已经诅咒了你！",
   "ifw.witch_curse.discurse": "诅咒消逝",
   "item.ifw.adamantium_axe": "艾德曼斧",
   "item.ifw.adamantium_battle_axe": "艾德曼战斧",
@@ -366,6 +366,7 @@
   "item.ifw.blob_spawn_egg": "泡泡刷怪蛋",
   "item.ifw.blueberry": "蓝莓",
   "item.ifw.bone_lord_spawn_egg": "亡骸领主刷怪蛋",
+  "item.ifw.bottle_of_disenchanting": "祛魔之瓶",
   "item.ifw.cave_spider_spawn_egg": "洞穴蜘蛛刷怪蛋",
   "item.ifw.cereal": "麦片粥",
   "item.ifw.chanceOfBucketMelting": "有%d%%的几率融毁",

src/generated/resources/assets/ifw/models/item/bottle_of_disenchanting.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "ifw:item/bottle_of_disenchanting"
+  }
+}

src/generated/resources/data/ifw/neoforge/biome_modifier/ifw_remove_overworld_features.json

@@ -7,7 +7,7 @@
     "minecraft:patch_melon_sparse"
   ],
   "steps": [
-    "lakes",
-    "vegetal_decoration"
+    "vegetal_decoration",
+    "lakes"
   ]
 }

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

@@ -18,7 +18,7 @@ public static int giveCurse(CommandSourceStack stack, CurseType curse, Collectio
             if (entity instanceof Player player) {
                 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.ifw$setCurse(curse);
                 player.setData(IFWAttachments.player_curse_known, false); // 给予时重置识别状态
             }
         }
@@ -33,7 +33,7 @@ public static int clearCurse(CommandSourceStack stack, Collection<? extends Enti
             if (entity instanceof Player player) {
                 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.ifw$setCurse(CurseType.none);
                 // 不需要重置 player_curse_known
             }
         }