修改家具存储方案

2026-01-03 06:12:24 +00:00 · 2025-05-11 17:28:11 +08:00
parent b58d5d944c
commit 2d8eb48d51
28 changed files with 360 additions and 64 deletions
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/CraftEngineFurniture.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/api/CraftEngineFurniture.java
@@ -9,6 +9,7 @@ import net.momirealms.craftengine.bukkit.util.LocationUtils;
 import net.momirealms.craftengine.bukkit.world.BukkitWorld;
 import net.momirealms.craftengine.core.entity.furniture.AnchorType;
 import net.momirealms.craftengine.core.entity.furniture.CustomFurniture;
+import net.momirealms.craftengine.core.entity.furniture.FurnitureExtraData;
 import net.momirealms.craftengine.core.item.Item;
 import net.momirealms.craftengine.core.loot.LootTable;
 import net.momirealms.craftengine.core.plugin.context.ContextHolder;
@@ -41,7 +42,7 @@ public final class CraftEngineFurniture {
    }

    /**
-     * Places furniture at the certain location
+     * Places furniture at certain location
     *
     * @param location    location
     * @param furnitureId furniture to place
@@ -55,7 +56,7 @@ public final class CraftEngineFurniture {
    }

    /**
-     * Places furniture at the certain location
+     * Places furniture at certain location
     *
     * @param location    location
     * @param furnitureId furniture to place
@@ -66,11 +67,11 @@ public final class CraftEngineFurniture {
    public static LoadedFurniture place(Location location, Key furnitureId, AnchorType anchorType) {
        CustomFurniture furniture = byId(furnitureId);
        if (furniture == null) return null;
-        return BukkitFurnitureManager.instance().place(furniture, location, anchorType, true);
+        return BukkitFurnitureManager.instance().place(location, furniture, FurnitureExtraData.builder().anchorType(anchorType).build(), true);
    }

    /**
-     * Places furniture at the certain location
+     * Places furniture at certain location
     *
     * @param location   location
     * @param furniture  furniture to place
@@ -79,11 +80,11 @@ public final class CraftEngineFurniture {
     */
    @NotNull
    public static LoadedFurniture place(Location location, CustomFurniture furniture, AnchorType anchorType) {
-        return BukkitFurnitureManager.instance().place(furniture, location, anchorType, true);
+        return BukkitFurnitureManager.instance().place(location, furniture, FurnitureExtraData.builder().anchorType(anchorType).build(), true);
    }

    /**
-     * Places furniture at the certain location
+     * Places furniture at certain location
     *
     * @param location    location
     * @param furnitureId furniture to place
@@ -95,11 +96,11 @@ public final class CraftEngineFurniture {
    public static LoadedFurniture place(Location location, Key furnitureId, AnchorType anchorType, boolean playSound) {
        CustomFurniture furniture = byId(furnitureId);
        if (furniture == null) return null;
-        return BukkitFurnitureManager.instance().place(furniture, location, anchorType, playSound);
+        return BukkitFurnitureManager.instance().place(location, furniture, FurnitureExtraData.builder().anchorType(anchorType).build(), playSound);
    }

    /**
-     * Places furniture at the certain location
+     * Places furniture at certain location
     *
     * @param location   location
     * @param furniture  furniture to place
@@ -109,7 +110,7 @@ public final class CraftEngineFurniture {
     */
    @NotNull
    public static LoadedFurniture place(Location location, CustomFurniture furniture, AnchorType anchorType, boolean playSound) {
-        return BukkitFurnitureManager.instance().place(furniture, location, anchorType, playSound);
+        return BukkitFurnitureManager.instance().place(location, furniture, FurnitureExtraData.builder().anchorType(anchorType).build(), playSound);
    }

    /**
@@ -222,7 +223,7 @@ public final class CraftEngineFurniture {
    }

    /**
-     * Removes furniture by providing a plugin furniture instance
+     * Removes furniture by providing furniture instance
     *
     * @param loadedFurniture loaded furniture
     * @param dropLoot whether to drop loots
@@ -235,7 +236,7 @@ public final class CraftEngineFurniture {
    }

    /**
-     * Removes furniture by providing a plugin furniture instance
+     * Removes furniture by providing furniture instance
     *
     * @param loadedFurniture loaded furniture
     * @param player the player who removes the furniture
@@ -251,7 +252,7 @@ public final class CraftEngineFurniture {
    }

    /**
-     * Removes furniture by providing a plugin furniture instance
+     * Removes furniture by providing furniture instance
     *
     * @param loadedFurniture loaded furniture
     * @param player the player who removes the furniture
@@ -272,6 +273,7 @@ public final class CraftEngineFurniture {
            ContextHolder.Builder builder = ContextHolder.builder();
            builder.withParameter(CommonParameters.LOCATION, vec3d);
            builder.withParameter(CommonParameters.WORLD, world);
+            builder.withOptionalParameter(CommonParameters.FURNITURE_ITEM, loadedFurniture.extraData().item().orElse(null));
            if (player != null) {
                builder.withParameter(CommonParameters.PLAYER, player);
                //mark item builder.withOptionalParameter(CommonParameters.MAIN_HAND_ITEM, player.getItemInHand(InteractionHand.MAIN_HAND));
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurnitureManager.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurnitureManager.java
@@ -6,6 +6,7 @@ import net.momirealms.craftengine.bukkit.nms.FastNMS;
 import net.momirealms.craftengine.bukkit.plugin.BukkitCraftEngine;
 import net.momirealms.craftengine.bukkit.plugin.network.handler.FurniturePacketHandler;
 import net.momirealms.craftengine.bukkit.util.EntityUtils;
+import net.momirealms.craftengine.bukkit.util.LocationUtils;
 import net.momirealms.craftengine.bukkit.util.Reflections;
 import net.momirealms.craftengine.core.entity.Billboard;
 import net.momirealms.craftengine.core.entity.ItemDisplayContext;
@@ -20,7 +21,7 @@ import net.momirealms.craftengine.core.sound.SoundData;
 import net.momirealms.craftengine.core.util.Key;
 import net.momirealms.craftengine.core.util.MiscUtils;
 import net.momirealms.craftengine.core.util.VersionHelper;
-import net.momirealms.craftengine.core.world.Vec3d;
+import net.momirealms.craftengine.core.world.WorldPosition;
 import org.bukkit.*;
 import org.bukkit.entity.*;
 import org.bukkit.event.HandlerList;
@@ -31,13 +32,16 @@ import org.jetbrains.annotations.NotNull;
 import org.joml.Vector3f;

 import javax.annotation.Nullable;
+import java.io.IOException;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;

 public class BukkitFurnitureManager extends AbstractFurnitureManager {
    public static final NamespacedKey FURNITURE_KEY = Objects.requireNonNull(NamespacedKey.fromString("craftengine:furniture_id"));
-    public static final NamespacedKey FURNITURE_ANCHOR_KEY = Objects.requireNonNull(NamespacedKey.fromString("craftengine:anchor_type"));
+    // DEPRECATED
+    // public static final NamespacedKey FURNITURE_ANCHOR_KEY = Objects.requireNonNull(NamespacedKey.fromString("craftengine:anchor_type"));
+    public static final NamespacedKey FURNITURE_EXTRA_DATA_KEY = Objects.requireNonNull(NamespacedKey.fromString("craftengine:furniture_extra_data"));
    public static final NamespacedKey FURNITURE_SEAT_BASE_ENTITY_KEY = Objects.requireNonNull(NamespacedKey.fromString("craftengine:seat_to_base_entity"));
    public static final NamespacedKey FURNITURE_SEAT_VECTOR_3F_KEY = Objects.requireNonNull(NamespacedKey.fromString("craftengine:seat_vector"));
    public static final NamespacedKey FURNITURE_COLLISION = Objects.requireNonNull(NamespacedKey.fromString("craftengine:collision"));
@@ -66,19 +70,23 @@ public class BukkitFurnitureManager extends AbstractFurnitureManager {
    }

    @Override
-    public Furniture place(CustomFurniture furniture, Vec3d vec3d, net.momirealms.craftengine.core.world.World world, AnchorType anchorType, boolean playSound) {
-        return this.place(furniture, new Location((World) world.platformWorld(), vec3d.x(), vec3d.y(), vec3d.z()), anchorType, playSound);
+    public Furniture place(WorldPosition position, CustomFurniture furniture, FurnitureExtraData extraData, boolean playSound) {
+        return this.place(LocationUtils.toLocation(position), furniture, extraData, playSound);
    }

-    public LoadedFurniture place(CustomFurniture furniture, Location location, AnchorType anchorType, boolean playSound) {
-        if (furniture.isAllowedPlacement(anchorType)) {
-            anchorType = furniture.getAnyPlacement();
+    public LoadedFurniture place(Location location, CustomFurniture furniture, FurnitureExtraData extraData, boolean playSound) {
+        Optional<AnchorType> optionalAnchorType = extraData.anchorType();
+        if (optionalAnchorType.isEmpty() || !furniture.isAllowedPlacement(optionalAnchorType.get())) {
+            extraData.anchorType(furniture.getAnyPlacement());
        }
-        AnchorType finalAnchorType = anchorType;
        Entity furnitureEntity = EntityUtils.spawnEntity(location.getWorld(), location, EntityType.ITEM_DISPLAY, entity -> {
            ItemDisplay display = (ItemDisplay) entity;
            display.getPersistentDataContainer().set(BukkitFurnitureManager.FURNITURE_KEY, PersistentDataType.STRING, furniture.id().toString());
-            display.getPersistentDataContainer().set(BukkitFurnitureManager.FURNITURE_ANCHOR_KEY, PersistentDataType.STRING, finalAnchorType.name());
+            try {
+                display.getPersistentDataContainer().set(BukkitFurnitureManager.FURNITURE_EXTRA_DATA_KEY, PersistentDataType.BYTE_ARRAY, extraData.toBytes());
+            } catch (IOException e) {
+                this.plugin.logger().warn("Failed to set furniture PDC for " + furniture.id().toString(), e);
+            }
            handleBaseEntityLoadEarly(display);
        });
        if (playSound) {
@@ -224,9 +232,6 @@ public class BukkitFurnitureManager extends AbstractFurnitureManager {
                    handleCollisionEntityLoadOnEntitiesLoad(interaction);
                } else if (entity instanceof Boat boat) {
                    handleCollisionEntityLoadOnEntitiesLoad(boat);
-                } else if (entity instanceof Shulker shulker) {
-                    // TODO 移除这一行，预计过一个月
-                    handleCollisionEntityLoadOnEntitiesLoad(shulker);
                }
            }
        }
@@ -301,7 +306,7 @@ public class BukkitFurnitureManager extends AbstractFurnitureManager {
        boolean preventChange = FastNMS.INSTANCE.isPreventingStatusUpdates(location.getWorld(), location.getBlockX() >> 4, location.getBlockZ() >> 4);
        if (above1_20_1) {
            if (!preventChange) {
-                LoadedFurniture furniture = addNewFurniture(display, customFurniture, getAnchorType(display, customFurniture));
+                LoadedFurniture furniture = addNewFurniture(display, customFurniture);
                furniture.initializeColliders();
                for (Player player : display.getTrackedPlayers()) {
                    this.plugin.adapt(player).entityPacketHandlers().computeIfAbsent(furniture.baseEntityId(), k -> new FurniturePacketHandler(furniture.fakeEntityIds()));
@@ -309,7 +314,7 @@ public class BukkitFurnitureManager extends AbstractFurnitureManager {
                }
            }
        } else {
-            LoadedFurniture furniture = addNewFurniture(display, customFurniture, getAnchorType(display, customFurniture));
+            LoadedFurniture furniture = addNewFurniture(display, customFurniture);
            for (Player player : display.getTrackedPlayers()) {
                this.plugin.adapt(player).entityPacketHandlers().computeIfAbsent(furniture.baseEntityId(), k -> new FurniturePacketHandler(furniture.fakeEntityIds()));
                this.plugin.networkManager().sendPacket(player, furniture.spawnPacket(player));
@@ -373,7 +378,7 @@ public class BukkitFurnitureManager extends AbstractFurnitureManager {
            CustomFurniture customFurniture = optionalFurniture.get();
            LoadedFurniture previous = this.furnitureByRealEntityId.get(display.getEntityId());
            if (previous != null) return;
-            LoadedFurniture furniture = addNewFurniture(display, customFurniture, getAnchorType(display, customFurniture));
+            LoadedFurniture furniture = addNewFurniture(display, customFurniture);
            furniture.initializeColliders(); // safely do it here
        }
    }
@@ -394,24 +399,37 @@ public class BukkitFurnitureManager extends AbstractFurnitureManager {
        collisionEntity.remove();
    }

-    private AnchorType getAnchorType(Entity baseEntity, CustomFurniture furniture) {
-        String anchorType = baseEntity.getPersistentDataContainer().get(FURNITURE_ANCHOR_KEY, PersistentDataType.STRING);
-        if (anchorType != null) {
-            try {
-                AnchorType unverified = AnchorType.valueOf(anchorType);
-                if (furniture.isAllowedPlacement(unverified)) {
-                    return unverified;
-                }
-            } catch (IllegalArgumentException ignored) {
-            }
-        }
-        AnchorType anchorTypeEnum = furniture.getAnyPlacement();
-        baseEntity.getPersistentDataContainer().set(FURNITURE_ANCHOR_KEY, PersistentDataType.STRING, anchorTypeEnum.name());
-        return anchorTypeEnum;
+    private FurnitureExtraData getFurnitureExtraData(Entity baseEntity) throws IOException {
+        byte[] extraData = baseEntity.getPersistentDataContainer().get(FURNITURE_EXTRA_DATA_KEY, PersistentDataType.BYTE_ARRAY);
+        if (extraData == null) return FurnitureExtraData.builder().build();
+        return FurnitureExtraData.fromBytes(extraData);
    }

-    private synchronized LoadedFurniture addNewFurniture(ItemDisplay display, CustomFurniture furniture, AnchorType anchorType) {
-        LoadedFurniture loadedFurniture = new LoadedFurniture(display, furniture, anchorType);
+//    private AnchorType getAnchorType(Entity baseEntity, CustomFurniture furniture) {
+//        String anchorType = baseEntity.getPersistentDataContainer().get(FURNITURE_ANCHOR_KEY, PersistentDataType.STRING);
+//        if (anchorType != null) {
+//            try {
+//                AnchorType unverified = AnchorType.valueOf(anchorType);
+//                if (furniture.isAllowedPlacement(unverified)) {
+//                    return unverified;
+//                }
+//            } catch (IllegalArgumentException ignored) {
+//            }
+//        }
+//        AnchorType anchorTypeEnum = furniture.getAnyPlacement();
+//        baseEntity.getPersistentDataContainer().set(FURNITURE_ANCHOR_KEY, PersistentDataType.STRING, anchorTypeEnum.name());
+//        return anchorTypeEnum;
+//    }
+
+    private synchronized LoadedFurniture addNewFurniture(ItemDisplay display, CustomFurniture furniture) {
+        FurnitureExtraData extraData;
+        try {
+            extraData = getFurnitureExtraData(display);
+        } catch (IOException e) {
+            extraData = FurnitureExtraData.builder().build();
+            plugin.logger().warn("Furniture extra data could not be loaded", e);
+        }
+        LoadedFurniture loadedFurniture = new LoadedFurniture(display, furniture, extraData);
        this.furnitureByRealEntityId.put(loadedFurniture.baseEntityId(), loadedFurniture);
        for (int entityId : loadedFurniture.entityIds()) {
            this.furnitureByEntityId.put(entityId, loadedFurniture);
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/LoadedFurniture.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/LoadedFurniture.java
@@ -31,6 +31,7 @@ public class LoadedFurniture implements Furniture {
    private final Key id;
    private final CustomFurniture furniture;
    private final AnchorType anchorType;
+    private final FurnitureExtraData extraData;
    // location
    private final Location location;
    // base entity
@@ -54,10 +55,11 @@ public class LoadedFurniture implements Furniture {

    public LoadedFurniture(Entity baseEntity,
                           CustomFurniture furniture,
-                           AnchorType anchorType) {
+                           FurnitureExtraData extraData) {
        this.id = furniture.id();
+        this.extraData = extraData;
        this.baseEntityId = baseEntity.getEntityId();
-        this.anchorType = anchorType;
+        this.anchorType = extraData.anchorType().orElse(furniture.getAnyPlacement());
        this.location = baseEntity.getLocation();
        this.baseEntity = new WeakReference<>(baseEntity);
        this.furniture = furniture;
@@ -305,6 +307,11 @@ public class LoadedFurniture implements Furniture {
        spawnSeatEntityForPlayer((Player) player.platformPlayer(), seat);
    }

+    @Override
+    public FurnitureExtraData extraData() {
+        return this.extraData;
+    }
+
    public void spawnSeatEntityForPlayer(org.bukkit.entity.Player player, Seat seat) {
        Location location = this.calculateSeatLocation(seat);
        Entity seatEntity = seat.limitPlayerRotation() ?
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/BukkitItemManager.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/BukkitItemManager.java
@@ -1,5 +1,6 @@
 package net.momirealms.craftengine.bukkit.item;

+import com.saicone.rtag.item.ItemTagStream;
 import net.momirealms.craftengine.bukkit.item.behavior.AxeItemBehavior;
 import net.momirealms.craftengine.bukkit.item.behavior.BoneMealItemBehavior;
 import net.momirealms.craftengine.bukkit.item.behavior.BucketItemBehavior;
@@ -163,6 +164,11 @@ public class BukkitItemManager extends AbstractItemManager<ItemStack> {
        HandlerList.unregisterAll(this.debugStickListener);
    }

+    @Override
+    public Item<ItemStack> fromByteArray(byte[] bytes) {
+        return this.factory.wrap(ItemTagStream.INSTANCE.fromBytes(bytes));
+    }
+
    @Override
    public ConfigParser parser() {
        return this.itemParser;
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/ComponentItemWrapper.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/ComponentItemWrapper.java
@@ -71,7 +71,7 @@ public class ComponentItemWrapper implements ItemWrapper<ItemStack> {

    @Override
    public ItemWrapper<ItemStack> copyWithCount(int count) {
-        ItemStack copied = item.clone();
+        ItemStack copied = this.item.clone();
        copied.setAmount(count);
        return new ComponentItemWrapper(copied);
    }
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/ComponentTypes.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/ComponentTypes.java
@@ -25,6 +25,7 @@ public class ComponentTypes {
    public static final Object REPAIR_COST = getComponentType(ComponentKeys.REPAIR_COST);
    public static final Object CUSTOM_DATA = getComponentType(ComponentKeys.CUSTOM_DATA);
    public static final Object PROFILE = getComponentType(ComponentKeys.PROFILE);
+    public static final Object DYED_COLOR = getComponentType(ComponentKeys.DYED_COLOR);

    private ComponentTypes() {}

--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/FurnitureItemBehavior.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/FurnitureItemBehavior.java
@@ -10,6 +10,7 @@ import net.momirealms.craftengine.bukkit.util.DirectionUtils;
 import net.momirealms.craftengine.bukkit.util.EventUtils;
 import net.momirealms.craftengine.core.entity.furniture.AnchorType;
 import net.momirealms.craftengine.core.entity.furniture.CustomFurniture;
+import net.momirealms.craftengine.core.entity.furniture.FurnitureExtraData;
 import net.momirealms.craftengine.core.entity.furniture.HitBox;
 import net.momirealms.craftengine.core.entity.player.InteractionResult;
 import net.momirealms.craftengine.core.entity.player.Player;
@@ -126,7 +127,15 @@ public class FurnitureItemBehavior extends ItemBehavior {
            return InteractionResult.FAIL;
        }

-        LoadedFurniture loadedFurniture = BukkitFurnitureManager.instance().place(customFurniture, furnitureLocation.clone(), anchorType, false);
+        Item<?> item = context.getItem();
+
+        LoadedFurniture loadedFurniture = BukkitFurnitureManager.instance().place(
+                furnitureLocation.clone(), customFurniture,
+                FurnitureExtraData.builder()
+                        .item(item.copyWithCount(1))
+                        .anchorType(anchorType)
+                        .dyedColor(item.dyedColor().orElse(-1))
+                        .build(), false);

        FurniturePlaceEvent placeEvent = new FurniturePlaceEvent(bukkitPlayer, loadedFurniture, furnitureLocation, context.getHand());
        if (EventUtils.fireAndCheckCancel(placeEvent)) {
@@ -135,7 +144,6 @@ public class FurnitureItemBehavior extends ItemBehavior {
        }

        if (!player.isCreativeMode()) {
-            Item<?> item = context.getItem();
            item.count(item.count() - 1);
            item.load();
        }
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/BukkitItemFactory.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/BukkitItemFactory.java
@@ -1,6 +1,7 @@
 package net.momirealms.craftengine.bukkit.item.factory;

 import com.google.gson.JsonElement;
+import com.saicone.rtag.item.ItemTagStream;
 import net.momirealms.craftengine.bukkit.util.ItemTags;
 import net.momirealms.craftengine.bukkit.util.Reflections;
 import net.momirealms.craftengine.core.item.EquipmentData;
@@ -46,6 +47,11 @@ public abstract class BukkitItemFactory<W extends ItemWrapper<ItemStack>> extend
        }
    }

+    @Override
+    protected byte[] toByteArray(W item) {
+        return ItemTagStream.INSTANCE.toBytes(item.getItem());
+    }
+
    @Override
    protected boolean isBlockItem(W item) {
        return item.getItem().getType().isBlock();
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/ComponentItemFactory1_20_5.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/ComponentItemFactory1_20_5.java
@@ -244,6 +244,26 @@ public class ComponentItemFactory1_20_5 extends BukkitItemFactory<ComponentItemW
        }
    }

+    @Override
+    protected Optional<Integer> dyedColor(ComponentItemWrapper item) {
+        if (!item.hasComponent(ComponentTypes.DYED_COLOR)) return Optional.empty();
+        return Optional.ofNullable(
+                (Integer) ComponentType.encodeJava(
+                        ComponentTypes.DYED_COLOR,
+                        item.getComponent(ComponentTypes.DYED_COLOR)
+                ).orElse(null)
+        );
+    }
+
+    @Override
+    protected void dyedColor(ComponentItemWrapper item, Integer color) {
+        if (color == null) {
+            item.resetComponent(ComponentTypes.DYED_COLOR);
+        } else {
+            item.setJavaComponent(ComponentTypes.DYED_COLOR, color);
+        }
+    }
+
    @Override
    protected Optional<Integer> maxDamage(ComponentItemWrapper item) {
        if (!item.hasComponent(ComponentTypes.MAX_DAMAGE)) return Optional.of((int) item.getItem().getType().getMaxDurability());
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/UniversalItemFactory.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/UniversalItemFactory.java
@@ -152,6 +152,21 @@ public class UniversalItemFactory extends BukkitItemFactory<LegacyItemWrapper> {
        item.set(damage, "Damage");
    }

+    @Override
+    protected Optional<Integer> dyedColor(LegacyItemWrapper item) {
+        if (!item.hasTag("display", "color")) return Optional.empty();
+        return Optional.of(item.get("display", "color"));
+    }
+
+    @Override
+    protected void dyedColor(LegacyItemWrapper item, Integer color) {
+        if (color == null) {
+            item.remove("display", "color");
+        } else {
+            item.set(color, "display", "color");
+        }
+    }
+
    @Override
    protected Optional<Integer> maxDamage(LegacyItemWrapper item) {
        return Optional.of((int) item.getItem().getType().getMaxDurability());
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/DebugSpawnFurnitureCommand.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/DebugSpawnFurnitureCommand.java
@@ -1,5 +1,6 @@
 package net.momirealms.craftengine.bukkit.plugin.command.feature;

+import net.momirealms.craftengine.bukkit.api.CraftEngineFurniture;
 import net.momirealms.craftengine.bukkit.entity.furniture.BukkitFurnitureManager;
 import net.momirealms.craftengine.bukkit.plugin.command.BukkitCommandFeature;
 import net.momirealms.craftengine.bukkit.util.KeyUtils;
@@ -55,7 +56,7 @@ public class DebugSpawnFurnitureCommand extends BukkitCommandFeature<CommandSend
                    CustomFurniture customFurniture = optionalCustomFurniture.get();
                    AnchorType anchorType = (AnchorType) context.optional("anchor-type").orElse(customFurniture.getAnyPlacement());
                    boolean playSound = context.flags().hasFlag("silent");
-                    furnitureManager.place(customFurniture, location, anchorType, !playSound);
+                    CraftEngineFurniture.place(location, customFurniture, anchorType, playSound);
                });
    }

--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/TestCommand.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/TestCommand.java
@@ -1,31 +1,25 @@
 package net.momirealms.craftengine.bukkit.plugin.command.feature;

-import net.momirealms.craftengine.bukkit.item.BukkitItemManager;
 import net.momirealms.craftengine.bukkit.plugin.command.BukkitCommandFeature;
 import net.momirealms.craftengine.bukkit.util.BlockTags;
-import net.momirealms.craftengine.core.item.Item;
 import net.momirealms.craftengine.core.plugin.CraftEngine;
 import net.momirealms.craftengine.core.plugin.command.CraftEngineCommandManager;
-import net.momirealms.craftengine.core.util.Key;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.incendo.cloud.Command;
-import org.incendo.cloud.bukkit.data.BlockPredicate;
-import org.incendo.cloud.bukkit.parser.BlockPredicateParser;
 import org.incendo.cloud.bukkit.parser.NamespacedKeyParser;
 import org.incendo.cloud.context.CommandContext;
 import org.incendo.cloud.context.CommandInput;
 import org.incendo.cloud.parser.standard.BooleanParser;
-import org.incendo.cloud.parser.standard.ByteParser;
 import org.incendo.cloud.parser.standard.StringParser;
 import org.incendo.cloud.suggestion.Suggestion;
 import org.incendo.cloud.suggestion.SuggestionProvider;

-import java.util.*;
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.concurrent.CompletableFuture;

 public class TestCommand extends BukkitCommandFeature<CommandSender> {
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/LocationUtils.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/LocationUtils.java
@@ -3,13 +3,19 @@ package net.momirealms.craftengine.bukkit.util;
 import net.momirealms.craftengine.bukkit.nms.FastNMS;
 import net.momirealms.craftengine.core.world.BlockPos;
 import net.momirealms.craftengine.core.world.Vec3d;
+import net.momirealms.craftengine.core.world.WorldPosition;
 import org.bukkit.Location;
+import org.bukkit.World;
 import org.jetbrains.annotations.NotNull;

 public class LocationUtils {

    private LocationUtils() {}

+    public static Location toLocation(WorldPosition position) {
+        return new Location((World) position.world().platformWorld(), position.position().x(), position.position().y(), position.position().z());
+    }
+
    public static Vec3d toVec3d(Location loc) {
        return new Vec3d(loc.getX(), loc.getY(), loc.getZ());
    }