添加新的条件类型和函数类型

2025-12-31 12:56:28 +00:00 · 2025-05-21 21:09:02 +08:00
parent c788689277
commit 7bcfbf9cfe
58 changed files with 393 additions and 76 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
@@ -1,7 +1,7 @@
 package net.momirealms.craftengine.bukkit.api;

-import net.momirealms.craftengine.bukkit.entity.furniture.BukkitFurnitureManager;
 import net.momirealms.craftengine.bukkit.entity.furniture.BukkitFurniture;
+import net.momirealms.craftengine.bukkit.entity.furniture.BukkitFurnitureManager;
 import net.momirealms.craftengine.bukkit.nms.CollisionEntity;
 import net.momirealms.craftengine.bukkit.nms.FastNMS;
 import net.momirealms.craftengine.bukkit.plugin.BukkitCraftEngine;
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BukkitBlockManager.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BukkitBlockManager.java
@@ -40,8 +40,8 @@ import org.bukkit.block.data.BlockData;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;

-import javax.annotation.Nullable;
 import java.io.File;
 import java.lang.reflect.Field;
 import java.nio.file.Path;
@@ -164,6 +164,21 @@ public class BukkitBlockManager extends AbstractBlockManager {
        }
    }

+    @Nullable
+    @Override
+    public BlockStateWrapper createPackedBlockState(String blockState) {
+        ImmutableBlockState state = BlockStateParser.deserialize(blockState);
+        if (state != null) {
+            return state.customBlockState();
+        }
+        try {
+            BlockData blockData = Bukkit.createBlockData(blockState);
+            return BlockStateUtils.toPackedBlockState(blockData);
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
+    }
+
    @Nullable
    public Object getMinecraftBlockHolder(int stateId) {
        return stateId2BlockHolder.get(stateId);
@@ -205,7 +220,7 @@ public class BukkitBlockManager extends AbstractBlockManager {
    }

    @Override
-    public Key getBlockOwnerId(PackedBlockState state) {
+    public Key getBlockOwnerId(BlockStateWrapper state) {
        return BlockStateUtils.getBlockOwnerIdFromState(state.handle());
    }

@@ -226,11 +241,11 @@ public class BukkitBlockManager extends AbstractBlockManager {

    private void initMirrorRegistry() {
        int size = RegistryUtils.currentBlockRegistrySize();
-        PackedBlockState[] states = new PackedBlockState[size];
+        BlockStateWrapper[] states = new BlockStateWrapper[size];
        for (int i = 0; i < size; i++) {
-            states[i] = new PackedBlockState(BlockStateUtils.idToBlockState(i), i);
+            states[i] = BlockStateWrapper.create(BlockStateUtils.idToBlockState(i), i, BlockStateUtils.isVanillaBlock(i));
        }
-        BlockRegistryMirror.init(states, new PackedBlockState(Reflections.instance$Blocks$STONE$defaultState, BlockStateUtils.blockStateToId(Reflections.instance$Blocks$STONE$defaultState)));
+        BlockRegistryMirror.init(states, BlockStateWrapper.vanilla(Reflections.instance$Blocks$STONE$defaultState, BlockStateUtils.blockStateToId(Reflections.instance$Blocks$STONE$defaultState)));
    }

    private void registerEmptyBlock() {
@@ -363,7 +378,7 @@ public class BukkitBlockManager extends AbstractBlockManager {
            if (singleState) {
                properties = Map.of();
                int internalId = ResourceConfigUtils.getAsInt(ResourceConfigUtils.requireNonNullOrThrow(stateSection.get("id"), "warning.config.block.state.missing_real_id"), "id");
-                VanillaBlock vanillaBlock = getVanillaBlock(id, stateSection);
+                VanillaBlockState vanillaBlock = getVanillaBlock(id, stateSection);
                appearances = Map.of("", vanillaBlock.registryId());
                Key internalBlockId = Key.of(Key.DEFAULT_NAMESPACE, vanillaBlock.type().value() + "_" + internalId);
                int internalBlockRegistryId = Optional.ofNullable(internalId2StateId.get(internalBlockId)).orElse(-1);
@@ -379,7 +394,7 @@ public class BukkitBlockManager extends AbstractBlockManager {
                Map<String, Key> appearance2BlockType = new HashMap<>();
                for (Map.Entry<String, Object> appearanceEntry : MiscUtils.castToMap(ResourceConfigUtils.requireNonNullOrThrow(stateSection.get("appearances"), "warning.config.block.state.missing_appearances"), false).entrySet()) {
                    if (appearanceEntry.getValue() instanceof Map<?, ?>) {
-                        VanillaBlock vanillaBlock = getVanillaBlock(id, MiscUtils.castToMap(appearanceEntry.getValue(), false));
+                        VanillaBlockState vanillaBlock = getVanillaBlock(id, MiscUtils.castToMap(appearanceEntry.getValue(), false));
                        appearances.put(appearanceEntry.getKey(), vanillaBlock.registryId());
                        appearance2BlockType.put(appearanceEntry.getKey(), vanillaBlock.type());
                    }
@@ -449,7 +464,7 @@ public class BukkitBlockManager extends AbstractBlockManager {
    }

    @NotNull
-    private VanillaBlock getVanillaBlock(Key id, Map<String, Object> section) {
+    private VanillaBlockState getVanillaBlock(Key id, Map<String, Object> section) {
        // require state non null
        String vanillaBlockStateTag = ResourceConfigUtils.requireNonEmptyStringOrThrow(section.get("state"), "warning.config.block.state.missing_state");
        // get its registry id
@@ -476,7 +491,7 @@ public class BukkitBlockManager extends AbstractBlockManager {
        JsonElement combinedVariant = GsonHelper.combine(variants);
        this.blockStateOverrides.computeIfAbsent(blockId, k -> new HashMap<>()).put(propertyNBT, combinedVariant);
        this.tempVanillaBlockStateModels.put(vanillaBlockStateRegistryId, combinedVariant);
-        return new VanillaBlock(blockId, propertyNBT, vanillaBlockStateRegistryId);
+        return new VanillaBlockState(blockId, propertyNBT, vanillaBlockStateRegistryId);
    }

    private JsonObject getVariantModel(Map<String, Object> singleModelMap) {
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurniture.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurniture.java
@@ -1,7 +1,6 @@
 package net.momirealms.craftengine.bukkit.entity.furniture;

 import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import net.momirealms.craftengine.bukkit.entity.BukkitEntity;
 import net.momirealms.craftengine.bukkit.nms.FastNMS;
@@ -9,15 +8,12 @@ import net.momirealms.craftengine.bukkit.util.EntityUtils;
 import net.momirealms.craftengine.bukkit.util.LegacyAttributeUtils;
 import net.momirealms.craftengine.bukkit.util.LocationUtils;
 import net.momirealms.craftengine.bukkit.util.Reflections;
-import net.momirealms.craftengine.bukkit.world.BukkitWorld;
 import net.momirealms.craftengine.core.entity.furniture.*;
 import net.momirealms.craftengine.core.plugin.CraftEngine;
 import net.momirealms.craftengine.core.util.ArrayUtils;
 import net.momirealms.craftengine.core.util.Key;
 import net.momirealms.craftengine.core.util.QuaternionUtils;
 import net.momirealms.craftengine.core.util.VersionHelper;
-import net.momirealms.craftengine.core.world.Vec3d;
-import net.momirealms.craftengine.core.world.World;
 import net.momirealms.craftengine.core.world.WorldPosition;
 import net.momirealms.craftengine.core.world.collision.AABB;
 import org.bukkit.Location;
--- 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
@@ -22,9 +22,9 @@ import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.persistence.PersistentDataType;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.joml.Vector3f;

-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/projectile/BukkitProjectileManager.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/projectile/BukkitProjectileManager.java
@@ -25,8 +25,8 @@ import org.bukkit.event.entity.ProjectileLaunchEvent;
 import org.bukkit.event.player.PlayerItemConsumeEvent;
 import org.bukkit.event.world.EntitiesLoadEvent;
 import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.Nullable;

-import javax.annotation.Nullable;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
--- 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
@@ -2,8 +2,8 @@ package net.momirealms.craftengine.bukkit.item.behavior;

 import net.momirealms.craftengine.bukkit.api.event.FurnitureAttemptPlaceEvent;
 import net.momirealms.craftengine.bukkit.api.event.FurniturePlaceEvent;
-import net.momirealms.craftengine.bukkit.entity.furniture.BukkitFurnitureManager;
 import net.momirealms.craftengine.bukkit.entity.furniture.BukkitFurniture;
+import net.momirealms.craftengine.bukkit.entity.furniture.BukkitFurnitureManager;
 import net.momirealms.craftengine.bukkit.nms.FastNMS;
 import net.momirealms.craftengine.bukkit.plugin.BukkitCraftEngine;
 import net.momirealms.craftengine.bukkit.util.DirectionUtils;
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/listener/DebugStickListener.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/listener/DebugStickListener.java
@@ -25,8 +25,8 @@ import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.Nullable;

-import javax.annotation.Nullable;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java
@@ -10,8 +10,8 @@ import net.momirealms.craftengine.bukkit.api.CraftEngineFurniture;
 import net.momirealms.craftengine.bukkit.api.event.FurnitureBreakEvent;
 import net.momirealms.craftengine.bukkit.api.event.FurnitureInteractEvent;
 import net.momirealms.craftengine.bukkit.block.BukkitBlockManager;
-import net.momirealms.craftengine.bukkit.entity.furniture.BukkitFurnitureManager;
 import net.momirealms.craftengine.bukkit.entity.furniture.BukkitFurniture;
+import net.momirealms.craftengine.bukkit.entity.furniture.BukkitFurnitureManager;
 import net.momirealms.craftengine.bukkit.entity.projectile.BukkitProjectileManager;
 import net.momirealms.craftengine.bukkit.item.behavior.FurnitureItemBehavior;
 import net.momirealms.craftengine.bukkit.nms.FastNMS;
@@ -39,7 +39,10 @@ import net.momirealms.craftengine.core.plugin.context.event.EventTrigger;
 import net.momirealms.craftengine.core.plugin.context.parameter.DirectContextParameters;
 import net.momirealms.craftengine.core.plugin.network.*;
 import net.momirealms.craftengine.core.util.*;
-import net.momirealms.craftengine.core.world.*;
+import net.momirealms.craftengine.core.world.BlockHitResult;
+import net.momirealms.craftengine.core.world.BlockPos;
+import net.momirealms.craftengine.core.world.EntityHitResult;
+import net.momirealms.craftengine.core.world.WorldEvents;
 import net.momirealms.craftengine.core.world.chunk.Palette;
 import net.momirealms.craftengine.core.world.chunk.PalettedContainer;
 import net.momirealms.craftengine.core.world.chunk.packet.BlockEntityData;
@@ -47,7 +50,6 @@ import net.momirealms.craftengine.core.world.chunk.packet.MCSection;
 import net.momirealms.craftengine.core.world.collision.AABB;
 import net.momirealms.sparrow.nbt.Tag;
 import org.bukkit.*;
-import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.entity.Player;
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java
@@ -11,8 +11,8 @@ import net.momirealms.craftengine.bukkit.plugin.gui.CraftEngineInventoryHolder;
 import net.momirealms.craftengine.bukkit.util.*;
 import net.momirealms.craftengine.bukkit.world.BukkitWorld;
 import net.momirealms.craftengine.core.block.BlockSettings;
+import net.momirealms.craftengine.core.block.BlockStateWrapper;
 import net.momirealms.craftengine.core.block.ImmutableBlockState;
-import net.momirealms.craftengine.core.block.PackedBlockState;
 import net.momirealms.craftengine.core.entity.player.GameMode;
 import net.momirealms.craftengine.core.entity.player.InteractionHand;
 import net.momirealms.craftengine.core.entity.player.Player;
@@ -405,7 +405,7 @@ public class BukkitServerPlayer extends Player {
        // instant break
        boolean custom = immutableBlockState != null;
        if (custom && getDestroyProgress(state, pos) >= 1f) {
-            PackedBlockState vanillaBlockState = immutableBlockState.vanillaBlockState();
+            BlockStateWrapper vanillaBlockState = immutableBlockState.vanillaBlockState();
            // if it's not an instant break on client side, we should resend level event
            if (vanillaBlockState != null && getDestroyProgress(vanillaBlockState.handle(), pos) < 1f) {
                Object levelEventPacket = FastNMS.INSTANCE.constructor$ClientboundLevelEventPacket(
@@ -613,6 +613,11 @@ public class BukkitServerPlayer extends Player {
        }
    }

+    @Override
+    public void breakBlock(int x, int y, int z) {
+        platformPlayer().breakBlock(new Location(platformPlayer().getWorld(), x, y, z).getBlock());
+    }
+
    private void broadcastDestroyProgress(org.bukkit.entity.Player player, BlockPos hitPos, Object blockPos, int stage) {
        Object packet = FastNMS.INSTANCE.constructor$ClientboundBlockDestructionPacket(Integer.MAX_VALUE - entityID(), blockPos, stage);
        for (org.bukkit.entity.Player other : player.getWorld().getPlayers()) {
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/BlockStateUtils.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/BlockStateUtils.java
@@ -33,6 +33,12 @@ public class BlockStateUtils {
        hasInit = true;
    }

+    public static BlockStateWrapper toPackedBlockState(BlockData blockData) {
+        Object state = blockDataToBlockState(blockData);
+        int id = blockStateToId(state);
+        return BlockStateWrapper.create(state, id, isVanillaBlock(id));
+    }
+
    public static boolean isCorrectTool(@NotNull ImmutableBlockState state, @Nullable Item<ItemStack> itemInHand) {
        BlockSettings settings = state.settings();
        if (settings.requireCorrectTool()) {
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/MaterialUtils.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/MaterialUtils.java
@@ -4,8 +4,8 @@ import net.momirealms.craftengine.core.util.Key;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.Registry;
+import org.jetbrains.annotations.Nullable;

-import javax.annotation.Nullable;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/world/BukkitWorld.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/world/BukkitWorld.java
@@ -3,6 +3,7 @@ package net.momirealms.craftengine.bukkit.world;
 import net.momirealms.craftengine.bukkit.nms.FastNMS;
 import net.momirealms.craftengine.bukkit.util.EntityUtils;
 import net.momirealms.craftengine.bukkit.util.ItemUtils;
+import net.momirealms.craftengine.core.block.BlockStateWrapper;
 import net.momirealms.craftengine.core.item.Item;
 import net.momirealms.craftengine.core.util.Key;
 import net.momirealms.craftengine.core.util.VersionHelper;
@@ -95,4 +96,11 @@ public class BukkitWorld implements World {
    public long time() {
        return platformWorld().getTime();
    }
+
+    @Override
+    public void setBlockAt(int x, int y, int z, BlockStateWrapper blockState, int flags) {
+        Object worldServer = serverWorld();
+        Object blockPos = FastNMS.INSTANCE.constructor$BlockPos(x, y, z);
+        FastNMS.INSTANCE.method$LevelWriter$setBlock(worldServer, blockPos, blockState.handle(), flags);
+    }
 }