Add entanglement curse

Inf1nlty · Inf1nlty · commit 2b9fffc7eb1b · 2025-09-04T01:44:10.000+08:00
diff --git a/src/generated/resources/.cache/20f5c98dc0fe2d7a53fc98de5b4a9405da0eaab5 b/src/generated/resources/.cache/20f5c98dc0fe2d7a53fc98de5b4a9405da0eaab5
@@ -1,4 +1,4 @@
-// 1.21.1	2025-09-03T16:46:32.689735	Biome Modifier Registries: ifw
+// 1.21.1	2025-09-03T21:54:12.3100982	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
-78e29f65210883c5baddabec772009c2be349d3e data/ifw/neoforge/biome_modifier/ifw_remove_overworld_features.json
+c3c517b6bb5c1a869ec2b8bb6a5895a4eda835c4 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
diff --git a/src/generated/resources/.cache/8c8364f4e83c409ec545b3c2adc7d52ce75bbb78 b/src/generated/resources/.cache/8c8364f4e83c409ec545b3c2adc7d52ce75bbb78
@@ -1,4 +1,4 @@
-// 1.21.1	2025-09-03T00:16:39.68161	Tags for minecraft:item mod id vanilla
+// 1.21.1	2025-09-04T00:03:02.758718	Tags for minecraft:item mod id vanilla
 20de0e0f4a475259665e322b8fce4c6dc9bd398e data/c/tags/item/buckets/empty.json
 c8bdd264e6a8f676f43d71732fa26d39c6cb405e data/c/tags/item/buckets/entity_water.json
 443176368149964cb5339e006ca44d79e5343a0e data/c/tags/item/buckets/lava.json
@@ -16,7 +16,6 @@ f15a43877db5554ee1ea3e17e18374d0de62d6b2 data/ifw/tags/item/armors.json
 bdd81346635b7b10de96229750d71f72b3168a47 data/ifw/tags/item/battle_axe.json
 0b14fbac1d0ddc8bc58dbbf25cef44e5b81efd19 data/ifw/tags/item/buckets_stone.json
 090c6c0dba8de4988a2c80904208e91580c23928 data/ifw/tags/item/buckets_tropical_fish.json
-c9cf8fb9f1c7fdeb4c0a355a2a701aaf89e303c7 data/ifw/tags/item/chests.json
 91e6fcd988d4016348a8188dcd9e1c6d02f0f8c2 data/ifw/tags/item/dagger.json
 bedd52b24b6d8a88115a5750382fc77c652cdc3d data/ifw/tags/item/drinks.json
 6807f04f2cbec6fafec09761de05d1251d5bc484 data/ifw/tags/item/has_enchanting_recipe.json
diff --git a/src/generated/resources/.cache/c80c7a8ccd90f729100f93f300ddc4b41c2f09db b/src/generated/resources/.cache/c80c7a8ccd90f729100f93f300ddc4b41c2f09db
@@ -1,6 +1,9 @@
-// 1.21.1	2025-06-07T19:35:43.8564045	Tags for minecraft:block mod id ifw
+// 1.21.1	2025-09-04T00:03:02.7551917	Tags for minecraft:block mod id ifw
 a57428087e9da6acde3be57b776296773fedbbb5 data/ifw/tags/block/acid_degradable.json
+c9cf8fb9f1c7fdeb4c0a355a2a701aaf89e303c7 data/ifw/tags/block/chests.json
 5da647fe8f09b8b9032c0be9a3f63752f470e49a data/ifw/tags/block/corrosive_dirt.json
+be1ae031f59eb6eac18376f0e656cb7f09c77500 data/ifw/tags/block/entangle_plants_60.json
+c03eb1dd14513db935f5dcfe131479942dec7bff data/ifw/tags/block/entangle_plants_80.json
 37a6c3a11450b21a8e0381b726b34e2085dd5d29 data/ifw/tags/block/fallen_dirt.json
 b147fcff5c0b4d72df1cb7809b063b2562180832 data/ifw/tags/block/harvest_level_0_tool.json
 7d3e39787ca0ec017e53abe718814453f9da57c3 data/ifw/tags/block/harvest_level_1_tool.json
diff --git a/src/generated/resources/data/ifw/neoforge/biome_modifier/ifw_remove_overworld_features.json b/src/generated/resources/data/ifw/neoforge/biome_modifier/ifw_remove_overworld_features.json
@@ -7,7 +7,7 @@
     "minecraft:patch_melon_sparse"
   ],
   "steps": [
-    "vegetal_decoration",
-    "lakes"
+    "lakes",
+    "vegetal_decoration"
   ]
 }
diff --git a/src/generated/resources/data/ifw/tags/block/chests.json b/src/generated/resources/data/ifw/tags/block/chests.json
diff --git a/src/generated/resources/data/ifw/tags/block/entangle_plants_60.json b/src/generated/resources/data/ifw/tags/block/entangle_plants_60.json
@@ -0,0 +1,72 @@
+{
+  "values": [
+    "minecraft:fern",
+    "minecraft:large_fern",
+    "minecraft:tall_grass",
+    "minecraft:short_grass",
+    "minecraft:dead_bush",
+    "minecraft:azalea",
+    "minecraft:flowering_azalea",
+    "minecraft:pink_petals",
+    "minecraft:small_dripleaf",
+    "minecraft:big_dripleaf",
+    "minecraft:lily_pad",
+    "minecraft:spore_blossom",
+    "minecraft:torchflower",
+    "minecraft:torchflower_crop",
+    "minecraft:pitcher_plant",
+    "minecraft:pitcher_crop",
+    "minecraft:sunflower",
+    "minecraft:peony",
+    "minecraft:rose_bush",
+    "minecraft:oak_sapling",
+    "minecraft:spruce_sapling",
+    "minecraft:birch_sapling",
+    "minecraft:jungle_sapling",
+    "minecraft:acacia_sapling",
+    "minecraft:dark_oak_sapling",
+    "minecraft:cherry_sapling",
+    "minecraft:mangrove_propagule",
+    "minecraft:bamboo",
+    "minecraft:bamboo_sapling",
+    "minecraft:sugar_cane",
+    "minecraft:crimson_fungus",
+    "minecraft:warped_fungus",
+    "minecraft:cocoa",
+    "minecraft:crimson_roots",
+    "minecraft:warped_roots",
+    "minecraft:nether_sprouts",
+    "minecraft:hanging_roots",
+    "minecraft:seagrass",
+    "minecraft:tall_seagrass",
+    "minecraft:red_mushroom",
+    "minecraft:brown_mushroom",
+    "minecraft:moss_block",
+    "minecraft:moss_carpet",
+    "minecraft:blue_orchid",
+    "minecraft:allium",
+    "minecraft:azure_bluet",
+    "minecraft:red_tulip",
+    "minecraft:orange_tulip",
+    "minecraft:white_tulip",
+    "minecraft:pink_tulip",
+    "minecraft:dandelion",
+    "minecraft:poppy",
+    "minecraft:cornflower",
+    "minecraft:lily_of_the_valley",
+    "minecraft:sweet_berry_bush",
+    "minecraft:kelp",
+    "minecraft:kelp_plant",
+    "minecraft:chorus_flower",
+    "minecraft:chorus_plant",
+    "minecraft:wheat",
+    "minecraft:carrots",
+    "minecraft:potatoes",
+    "minecraft:beetroots",
+    "minecraft:melon_stem",
+    "minecraft:pumpkin_stem",
+    "minecraft:attached_melon_stem",
+    "minecraft:attached_pumpkin_stem",
+    "minecraft:nether_wart"
+  ]
+}
diff --git a/src/generated/resources/data/ifw/tags/block/entangle_plants_80.json b/src/generated/resources/data/ifw/tags/block/entangle_plants_80.json
@@ -0,0 +1,11 @@
+{
+  "values": [
+    "minecraft:vine",
+    "minecraft:weeping_vines",
+    "minecraft:weeping_vines_plant",
+    "minecraft:twisting_vines",
+    "minecraft:twisting_vines_plant",
+    "minecraft:cave_vines",
+    "minecraft:cave_vines_plant"
+  ]
+}
diff --git a/src/main/java/huix/infinity/attachment/IFWAttachments.java b/src/main/java/huix/infinity/attachment/IFWAttachments.java
@@ -46,8 +46,6 @@ public class IFWAttachments {
             "player_curse", () -> AttachmentType.builder(() -> 0).serialize(Codec.INT).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()
     );
diff --git a/src/main/java/huix/infinity/common/core/tag/IFWBlockTags.java b/src/main/java/huix/infinity/common/core/tag/IFWBlockTags.java
@@ -34,6 +34,9 @@ public class IFWBlockTags {
     public static final TagKey<Block> CORROSIVE_DIRT = create("corrosive_dirt");
     public static final TagKey<Block> SLOW_CORROSION = create("slow_corrosion");
     public static final TagKey<Block> ACID_DEGRADABLE = create("acid_degradable");
+    public static final TagKey<Block> CHESTS = create("chests");
+    public static final TagKey<Block> ENTANGLE_PLANTS_80 = create("entangle_plants_80");
+    public static final TagKey<Block> ENTANGLE_PLANTS_60 = create("entangle_plants_60");
 
     public static TagKey<Block> create(String name) {
         return TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath(InfinityWay.MOD_ID, name));
diff --git a/src/main/java/huix/infinity/common/core/tag/IFWItemTags.java b/src/main/java/huix/infinity/common/core/tag/IFWItemTags.java
@@ -25,7 +25,6 @@ public class IFWItemTags {
     public static final TagKey<Item> VEGETABLES = bind("vegetables");
     public static final TagKey<Item> DRINKS = bind("drinks");
     public static final TagKey<Item> ARMORS = bind("armors");
-    public static final TagKey<Item> CHESTS = bind("chests");
 
     public static TagKey<Item> bind(String name) {
         return TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(InfinityWay.MOD_ID, name));
diff --git a/src/main/java/huix/infinity/common/world/curse/CurseEffectHelper.java b/src/main/java/huix/infinity/common/world/curse/CurseEffectHelper.java
@@ -1,20 +1,22 @@
 package huix.infinity.common.world.curse;
 
-import huix.infinity.common.core.tag.IFWItemTags;
+import huix.infinity.common.core.tag.IFWBlockTags;
 import huix.infinity.common.world.item.IFWItems;
 import huix.infinity.extension.func.PlayerExtension;
 import huix.infinity.init.event.IFWSoundEvents;
 import huix.infinity.network.ClientBoundSetCursePayload;
 import huix.infinity.util.ReflectHelper;
+import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.tags.FluidTags;
+import net.minecraft.util.Mth;
 import net.minecraft.world.entity.monster.EnderMan;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
 import net.minecraft.world.level.block.Block;
 import net.neoforged.neoforge.network.PacketDistributor;
 
@@ -98,30 +100,34 @@ public static int getCursedBubbleMax(Player player, int vanillaBubbleMax, int ma
     public static boolean handleChestCurse(Player player, Block block) {
         if (!(player instanceof PlayerExtension ext)) return false;
         if (ext.getCurse() == CurseType.cannot_open_chests) {
-            Item item = Item.BY_BLOCK.get(block);
-            if (item != null) {
-                Holder<Item> holder = BuiltInRegistries.ITEM.wrapAsHolder(item);
-                if (holder.is(IFWItemTags.CHESTS)) {
-                    learnCurseEffect(ext);
-                    player.level().playSound(null, player.getX(), player.getY(), player.getZ(), IFWSoundEvents.CHEST_LOCKED.get(), SoundSource.BLOCKS, 0.2F, 1.0F);
-                    return true;
-                }
+            Holder<Block> holder = BuiltInRegistries.BLOCK.wrapAsHolder(block);
+            if (holder.is(IFWBlockTags.CHESTS)) {
+                learnCurseEffect(ext);
+                player.level().playSound(null, player.getX(), player.getY(), player.getZ(), IFWSoundEvents.CHEST_LOCKED.get(), SoundSource.BLOCKS, 0.2F, 1.0F);
+                return true;
             }
         }
         return false;
     }
 
     public static void handleEndermanAggro(EnderMan enderman) {
-        PlayerExtension nearestExt = null;
         Player nearestPlayer = null;
+        PlayerExtension nearestExt = null;
         double nearestDist = Double.MAX_VALUE;
+
         for (Player player : enderman.level().players()) {
             if (player instanceof PlayerExtension ext && ext.getCurse() == CurseType.endermen_aggro) {
                 double dist = enderman.distanceTo(player);
-                if (dist < nearestDist) {
-                    nearestDist = dist;
-                    nearestPlayer = player;
-                    nearestExt = ext;
+                if (dist < nearestDist && dist < 64.0) {
+                    if (enderman.getRandom().nextInt(3) == 0) {
+                        ItemStack helmet = player.getInventory().armor.get(3);
+                        boolean wearsPumpkin = helmet.is(Items.CARVED_PUMPKIN);
+                        if (!wearsPumpkin) {
+                            nearestDist = dist;
+                            nearestPlayer = player;
+                            nearestExt = ext;
+                        }
+                    }
                 }
             }
         }
@@ -141,4 +147,27 @@ public static boolean shouldBlockSleep(Player player) {
         }
         return false;
     }
+
+    public static float getEntangleCurseSlowdown(Player player) {
+        if (!(player instanceof PlayerExtension ext)) return 1.0F;
+        if (ext.getCurse() != CurseType.entanglement) return 1.0F;
+
+        var level = player.level();
+        var aabb = player.getBoundingBox();
+
+        for (BlockPos pos : BlockPos.betweenClosed(
+                Mth.floor(aabb.minX), Mth.floor(aabb.minY), Mth.floor(aabb.minZ),
+                Mth.floor(aabb.maxX), Mth.floor(aabb.maxY), Mth.floor(aabb.maxZ))) {
+            var state = level.getBlockState(pos);
+            if (state.is(IFWBlockTags.ENTANGLE_PLANTS_80)) {
+                learnCurseEffect(ext);
+                return 0.3F; // Actual test benchmark MITE
+            }
+            if (state.is(IFWBlockTags.ENTANGLE_PLANTS_60) || state.is(net.minecraft.tags.BlockTags.LEAVES)) {
+                learnCurseEffect(ext);
+                return 0.6F; // Actual test benchmark MITE
+            }
+        }
+        return 1.0F;
+    }
 }
diff --git a/src/main/java/huix/infinity/datagen/tag/IFWBlockTagsProvider.java b/src/main/java/huix/infinity/datagen/tag/IFWBlockTagsProvider.java
@@ -132,5 +132,35 @@ protected void addTags(final HolderLookup.@NotNull Provider provider) {
                         Blocks.NETHER_SPROUTS, Blocks.NETHER_WART, Blocks.COCOA, Blocks.SWEET_BERRY_BUSH,
                         Blocks.WEEPING_VINES, Blocks.WEEPING_VINES_PLANT, Blocks.TWISTING_VINES, Blocks.TWISTING_VINES_PLANT)
                 .remove(Blocks.WATER);
+
+        tag(IFWBlockTags.CHESTS).add(
+                // Vanilla
+                Blocks.CHEST, Blocks.TRAPPED_CHEST, Blocks.ENDER_CHEST, Blocks.BARREL,
+                Blocks.SHULKER_BOX, Blocks.WHITE_SHULKER_BOX, Blocks.ORANGE_SHULKER_BOX, Blocks.MAGENTA_SHULKER_BOX,
+                Blocks.LIGHT_BLUE_SHULKER_BOX, Blocks.YELLOW_SHULKER_BOX, Blocks.LIME_SHULKER_BOX, Blocks.PINK_SHULKER_BOX,
+                Blocks.GRAY_SHULKER_BOX, Blocks.LIGHT_GRAY_SHULKER_BOX, Blocks.CYAN_SHULKER_BOX, Blocks.PURPLE_SHULKER_BOX,
+                Blocks.BLUE_SHULKER_BOX, Blocks.BROWN_SHULKER_BOX, Blocks.GREEN_SHULKER_BOX, Blocks.RED_SHULKER_BOX, Blocks.BLACK_SHULKER_BOX,
+                // IFW
+                IFWBlocks.copper_private_chest.get(), IFWBlocks.silver_private_chest.get(), IFWBlocks.gold_private_chest.get(),
+                IFWBlocks.iron_private_chest.get(), IFWBlocks.ancient_metal_private_chest.get(),
+                IFWBlocks.mithril_private_chest.get(), IFWBlocks.adamantium_private_chest.get()
+        );
+
+        tag(IFWBlockTags.ENTANGLE_PLANTS_80)
+                .add(Blocks.VINE, Blocks.WEEPING_VINES, Blocks.WEEPING_VINES_PLANT, Blocks.TWISTING_VINES, Blocks.TWISTING_VINES_PLANT, Blocks.CAVE_VINES, Blocks.CAVE_VINES_PLANT);
+
+        tag(IFWBlockTags.ENTANGLE_PLANTS_60)
+                .add(
+                        Blocks.FERN, Blocks.LARGE_FERN, Blocks.TALL_GRASS, Blocks.SHORT_GRASS, Blocks.DEAD_BUSH, Blocks.AZALEA, Blocks.FLOWERING_AZALEA,
+                        Blocks.PINK_PETALS, Blocks.SMALL_DRIPLEAF, Blocks.BIG_DRIPLEAF, Blocks.LILY_PAD, Blocks.SPORE_BLOSSOM, Blocks.TORCHFLOWER, Blocks.TORCHFLOWER_CROP,
+                        Blocks.PITCHER_PLANT, Blocks.PITCHER_CROP, Blocks.SUNFLOWER, Blocks.PEONY, Blocks.ROSE_BUSH, Blocks.OAK_SAPLING, Blocks.SPRUCE_SAPLING,
+                        Blocks.BIRCH_SAPLING, Blocks.JUNGLE_SAPLING, Blocks.ACACIA_SAPLING, Blocks.DARK_OAK_SAPLING, Blocks.CHERRY_SAPLING, Blocks.MANGROVE_PROPAGULE,
+                        Blocks.BAMBOO, Blocks.BAMBOO_SAPLING, Blocks.SUGAR_CANE, Blocks.CRIMSON_FUNGUS, Blocks.WARPED_FUNGUS,Blocks.COCOA,
+                        Blocks.CRIMSON_ROOTS, Blocks.WARPED_ROOTS, Blocks.NETHER_SPROUTS, Blocks.HANGING_ROOTS, Blocks.SEAGRASS, Blocks.TALL_SEAGRASS,
+                        Blocks.RED_MUSHROOM, Blocks.BROWN_MUSHROOM, Blocks.MOSS_BLOCK, Blocks.MOSS_CARPET, Blocks.BLUE_ORCHID, Blocks.ALLIUM,
+                        Blocks.AZURE_BLUET, Blocks.RED_TULIP, Blocks.ORANGE_TULIP, Blocks.WHITE_TULIP, Blocks.PINK_TULIP, Blocks.DANDELION,
+                        Blocks.POPPY, Blocks.CORNFLOWER, Blocks.LILY_OF_THE_VALLEY, Blocks.SWEET_BERRY_BUSH, Blocks.KELP, Blocks.KELP_PLANT,
+                        Blocks.CHORUS_FLOWER, Blocks.CHORUS_PLANT, Blocks.WHEAT, Blocks.CARROTS, Blocks.POTATOES, Blocks.BEETROOTS,
+                        Blocks.MELON_STEM, Blocks.PUMPKIN_STEM, Blocks.ATTACHED_MELON_STEM, Blocks.ATTACHED_PUMPKIN_STEM, Blocks.NETHER_WART);
     }
 }
diff --git a/src/main/java/huix/infinity/datagen/tag/IFWItemTagsProvider.java b/src/main/java/huix/infinity/datagen/tag/IFWItemTagsProvider.java
@@ -2,13 +2,11 @@
 
 import fuzs.swordblockingmechanics.init.ModRegistry;
 import huix.infinity.common.core.tag.IFWItemTags;
-import huix.infinity.common.world.block.IFWBlocks;
 import huix.infinity.common.world.item.IFWItems;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.data.PackOutput;
 import net.minecraft.data.tags.ItemTagsProvider;
 import net.minecraft.data.tags.TagsProvider;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.world.item.Items;
@@ -179,18 +177,5 @@ protected void addTags(final HolderLookup.@NotNull Provider provider) {
                 IFWItems.mithril_chainmail_helmet.get(), IFWItems.mithril_chainmail_chestplate.get(), IFWItems.mithril_chainmail_leggings.get(), IFWItems.mithril_chainmail_boots.get(),
                 IFWItems.adamantium_chainmail_helmet.get(), IFWItems.adamantium_chainmail_chestplate.get(), IFWItems.adamantium_chainmail_leggings.get(), IFWItems.adamantium_chainmail_boots.get()
         );
-
-        tag(IFWItemTags.CHESTS).add(
-                // Vanilla
-                Items.CHEST, Items.TRAPPED_CHEST, Items.ENDER_CHEST, Items.BARREL,
-                Items.SHULKER_BOX, Items.WHITE_SHULKER_BOX, Items.ORANGE_SHULKER_BOX, Items.MAGENTA_SHULKER_BOX,
-                Items.LIGHT_BLUE_SHULKER_BOX, Items.YELLOW_SHULKER_BOX, Items.LIME_SHULKER_BOX, Items.PINK_SHULKER_BOX,
-                Items.GRAY_SHULKER_BOX, Items.LIGHT_GRAY_SHULKER_BOX, Items.CYAN_SHULKER_BOX, Items.PURPLE_SHULKER_BOX,
-                Items.BLUE_SHULKER_BOX, Items.BROWN_SHULKER_BOX, Items.GREEN_SHULKER_BOX, Items.RED_SHULKER_BOX, Items.BLACK_SHULKER_BOX,
-                // IFW
-                IFWBlocks.copper_private_chest_item.get(), IFWBlocks.silver_private_chest_item.get(), IFWBlocks.gold_private_chest_item.get(),
-                IFWBlocks.iron_private_chest_item.get(), IFWBlocks.ancient_metal_private_chest_item.get(),
-                IFWBlocks.mithril_private_chest_item.get(), IFWBlocks.adamantium_private_chest_item.get()
-                );
     }
 }
diff --git a/src/main/java/huix/infinity/extension/func/ItemStackExtension.java b/src/main/java/huix/infinity/extension/func/ItemStackExtension.java
@@ -50,8 +50,4 @@ default boolean ifw_isArmor() {
         return false;
     }
 
-    default boolean ifw_isChest() {
-        return false;
-    }
-
 }
diff --git a/src/main/java/huix/infinity/mixin/world/entity/LivingEntityMixin.java b/src/main/java/huix/infinity/mixin/world/entity/LivingEntityMixin.java
@@ -1,6 +1,7 @@
 package huix.infinity.mixin.world.entity;
 
 import huix.infinity.attachment.IFWAttachments;
+import huix.infinity.common.world.curse.CurseEffectHelper;
 import huix.infinity.common.world.entity.LivingEntityAccess;
 import net.minecraft.core.Holder;
 import net.minecraft.util.Mth;
@@ -12,7 +13,9 @@
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.attributes.Attribute;
 import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.Vec3;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
@@ -21,6 +24,7 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import javax.annotation.Nullable;
 
@@ -76,4 +80,27 @@ public void tick(CallbackInfo ci) {
             --this.food_or_repair_item_pickup_cooldown;
         }
     }
+
+    // Entanglement Curse
+    @Inject(method = "travel", at = @At("HEAD"))
+    private void onTravel(Vec3 travelVector, CallbackInfo ci) {
+        if ((Object)this instanceof Player player) {
+            float slowdown = CurseEffectHelper.getEntangleCurseSlowdown(player);
+            if (slowdown < 1.0F) {
+                Vec3 motion = player.getDeltaMovement();
+                player.setDeltaMovement(motion.x * slowdown, motion.y, motion.z * slowdown);
+            }
+        }
+    }
+    @Inject(method = "handleOnClimbable", at = @At("RETURN"), cancellable = true)
+    private void patchClimbable(Vec3 deltaMovement, CallbackInfoReturnable<Vec3> cir) {
+        if ((Object)this instanceof Player player) {
+            float slowdown = CurseEffectHelper.getEntangleCurseSlowdown(player);
+            if (slowdown < 1.0F) {
+                Vec3 original = cir.getReturnValue();
+                Vec3 result = new Vec3(original.x * slowdown, original.y, original.z * slowdown);
+                cir.setReturnValue(result);
+            }
+        }
+    }
 }
diff --git a/src/main/java/huix/infinity/mixin/world/item/ItemStackMixin.java b/src/main/java/huix/infinity/mixin/world/item/ItemStackMixin.java

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`"minecraft:patch_melon_sparse"`
`8`	`8`	`],`
`9`	`9`	`"steps": [`
`10`		`- "vegetal_decoration",`
`11`		`- "lakes"`
	`10`	`+ "lakes",`
	`11`	`+ "vegetal_decoration"`
`12`	`12`	`]`
`13`	`13`	`}`