conflicts

Author: LPMC Dev

README.md

@@ -15,11 +15,11 @@
 
 <p align="center">
    <img alt="Version" src="https://img.shields.io/badge/version-2.0.0-blue.svg?cacheSeconds=2592000" />
-   <a href="https://www.minecraft.net/en-us/article/minecraft-1-21-93-bedrock-changelog">
-      <img alt="Minecraft" src="https://img.shields.io/badge/minecraft-v1.21.93%20(Bedrock)-56383E" />
+   <a href="https://www.minecraft.net/en-us/article/minecraft-1-21-100-bedrock-changelog">
+      <img alt="Minecraft" src="https://img.shields.io/badge/minecraft-v1.21.100%20(Bedrock)-56383E" />
    </a>
    <a href="https://github.com/Mojang/bedrock-protocol-docs">
-      <img alt="Protocol" src="https://img.shields.io/badge/protocol-819-blue" />
+      <img alt="Protocol" src="https://img.shields.io/badge/protocol-827-blue" />
    </a>
    <a href="https://github.com/PowerNukkitX/PowerNukkitX/actions?query=branch%3Amaster+is%3Asuccess" target="_blank">
       <img alt="Action" src="https://img.shields.io/badge/action-all%20builds-FF9B21" />

src/main/java/cn/nukkit/Player.java

@@ -158,6 +158,7 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.Map.Entry;
+import java.util.Queue;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -354,7 +355,7 @@ public class Player extends EntityHuman implements CommandSender, ChunkLoader, I
     protected boolean fakeInventoryOpen;
     ///
 
-    ///todo hack for receive a error position after teleport
+    /// todo hack for receive a error position after teleport
     private Pair<Location, Long> lastTeleportMessage;
     ///
 
@@ -583,6 +584,9 @@ private void setTitle(String text) {
         SetTitlePacket packet = new SetTitlePacket();
         packet.text = text;
         packet.type = SetTitlePacket.TYPE_TITLE;
+        packet.fadeInTime = -1;
+        packet.stayTime = -1;
+        packet.fadeOutTime = -1;
         this.dataPacket(packet);
     }
 
@@ -851,7 +855,7 @@ public void onRun(int currentTick) {
 
     protected void checkNearEntities() {
         for (Entity entity : this.level.getNearbyEntities(this.boundingBox.grow(1, 0.5, 1), this)) {
-            if(entity == null) continue;
+            if (entity == null) continue;
             entity.scheduleUpdate();
 
             if (!entity.isAlive() || !this.isAlive()) {
@@ -1692,10 +1696,30 @@ public boolean hasAutoJump() {
         return this.getAdventureSettings().get(Type.AUTO_JUMP);
     }
 
+    public void broadcastClientSyncedProperties(Player... viewers) {
+        PropertySyncData data = this.getClientSyncProperties();
+        if (data == null) return;
+
+        SetEntityDataPacket pk = new SetEntityDataPacket();
+        pk.eid = this.getId();
+        pk.entityData = this.getEntityDataMap();
+        pk.syncedProperties = data;
+        pk.frame = 0L;
+
+        Player[] targets = (viewers == null || viewers.length == 0)
+            ? this.getViewers().values().toArray(Player.EMPTY_ARRAY)
+            : viewers;
+
+        for (Player v : targets) {
+            if (v != null) v.dataPacket(pk);
+        }
+    }
+
     @Override
     public void spawnTo(Player player) {
         if (player.spawned && this.isAlive() && player.getLevel() == this.level && player.canSee(this)/* && !this.isSpectator()*/) {
             super.spawnTo(player);
+            this.broadcastClientSyncedProperties(player);
 
             if (this.isSpectator()) {
                 //发送旁观者的游戏模式给对方，使得对方客户端正确渲染玩家实体
@@ -2073,34 +2097,45 @@ public boolean isUsingItem(String itemId) {
     }
 
     /**
-     * Sets the cooldown time for the specified item to use
+     * the cooldown of specified item is end
      *
-     * @param coolDownTick the cool down tick
-     * @param itemId       the item id
+     * @param itemId the item identifier
+     * @return the boolean
      */
-    public void setItemCoolDown(int coolDownTick, Identifier itemId) {
-        var pk = new PlayerStartItemCoolDownPacket();
-        pk.setCoolDownDuration(coolDownTick);
-        pk.setItemCategory(itemId.toString());
-        this.cooldownTickMap.put(itemId.toString(), this.level.getTick() + coolDownTick);
-        this.dataPacket(pk);
+    public boolean isItemCoolDownEnd(Identifier itemId) {
+        return isItemCoolDownEnd(itemId.toString());
     }
 
     /**
      * the cooldown of specified item is end
      *
-     * @param itemId the item
+     * @param category a string category
      * @return the boolean
      */
-    public boolean isItemCoolDownEnd(Identifier itemId) {
-        Integer tick = this.cooldownTickMap.getOrDefault(itemId.toString(), 0);
-        boolean result = this.getLevel().getTick() - tick > 0;
-        if (result) {
-            cooldownTickMap.remove(itemId.toString());
-        }
-        return result;
+    public boolean isItemCoolDownEnd(String category) {
+        int now  = this.getLevel().getTick();
+        int end  = this.cooldownTickMap.getOrDefault(category, 0);
+        boolean done = now - end >= 0;
+        if (done) this.cooldownTickMap.remove(category);
+        return done;
     }
 
+    /**
+     * Sets the cooldown time for the specified item to use
+     *
+     * @param coolDownTick the cool down tick
+     * @param itemId       the item id
+     */
+    public void setItemCoolDown(int coolDown, Identifier itemId) {
+        setItemCoolDown(coolDown, itemId.toString());
+    }
+
+    /**
+     * Sets the cooldown time for the specified item to use
+     *
+     * @param coolDownTick the cool down tick
+     * @param itemId       a string category
+     */
     public void setItemCoolDown(int coolDown, String category) {
         var pk = new PlayerStartItemCoolDownPacket();
         pk.setCoolDownDuration(coolDown);
@@ -2109,15 +2144,6 @@ public void setItemCoolDown(int coolDown, String category) {
         this.dataPacket(pk);
     }
 
-    public boolean isItemCoolDownEnd(String category) {
-        Integer tick = this.cooldownTickMap.getOrDefault(category, 0);
-        boolean result = this.getLevel().getTick() - tick > 0;
-        if (result) {
-            cooldownTickMap.remove(category);
-        }
-        return result;
-    }
-
     /**
      * Start last use tick for an item(right-click).
      *
@@ -2203,7 +2229,7 @@ public Pair<Position, SpawnPointType> getSpawn() {
     public void setSpawn(Position pos, SpawnPointType spawnPointType) {
         Preconditions.checkNotNull(pos);
         Preconditions.checkNotNull(pos.level);
-        this.spawnPoint = new Position(pos.x, pos.y, pos.z, level);
+        this.spawnPoint = new Position(pos.x, pos.y, pos.z, pos.level);
         this.spawnPointType = spawnPointType;
         SetSpawnPositionPacket pk = new SetSpawnPositionPacket();
         pk.spawnType = SetSpawnPositionPacket.TYPE_PLAYER_SPAWN;
@@ -2231,8 +2257,8 @@ public void sendChunk(int x, int z, DataPacket packet) {
             }
         }
 
-        for(BlockEntity entity : this.level.getChunkBlockEntities(x, z).values()) {
-            if(entity instanceof BlockEntitySpawnable spawnable) {
+        for (BlockEntity entity : this.level.getChunkBlockEntities(x, z).values()) {
+            if (entity instanceof BlockEntitySpawnable spawnable) {
                 spawnable.spawnTo(this);
             }
         }
@@ -2680,7 +2706,7 @@ public boolean onUpdate(int currentTick) {
 
             this.entityBaseTick(tickDiff);
 
-            if (this.getServer().getDifficulty() == 0 && this.level.getGameRules().getBoolean(GameRule.NATURAL_REGENERATION)) {
+            if (this.getServer().getDifficulty() == 0 || this.level.getGameRules().getBoolean(GameRule.NATURAL_REGENERATION)) {
                 if (this.getHealth() < this.getMaxHealth() && this.ticksLived % 20 == 0) {
                     this.heal(1);
                 }
@@ -4344,7 +4370,6 @@ public void refreshChunkRender() {
     }
 
     /**
-     *
      * Sends a form to a player and assigns the next ID to it
      * To open a form safely, please use {@link Form#send(Player)}
      *
@@ -4356,12 +4381,11 @@ public int sendForm(Form<?> form) {
     }
 
     /**
-     *
      * Sends a form to a player and assigns a given ID to it
      * To open a form safely, please use {@link Form#send(Player)}
      *
      * @param form The form to open
-     * @param id The ID to assign the form to
+     * @param id   The ID to assign the form to
      * @return The id assigned to the form
      */
     public int sendForm(Form<?> form, int id) {
@@ -4370,7 +4394,7 @@ public int sendForm(Form<?> form, int id) {
             return id;
         }
 
-        if(!form.isViewer(this)) {
+        if (!form.isViewer(this)) {
             form.viewers().add(this);
         }
 
@@ -4587,7 +4611,7 @@ public Inventory getWindowById(int id) {
      * @return The unique identifier assigned to the window if successfully added and opened; -1 if the window fails to be added.
      */
     public int addWindow(@NotNull Inventory inventory) {
-        if(getTopWindow().isPresent() || inventoryOpen) return -1;
+        if (getTopWindow().isPresent() || inventoryOpen) return -1;
         Preconditions.checkNotNull(inventory);
         if (this.windows.containsKey(inventory)) {
             return this.windows.get(inventory);
@@ -4605,10 +4629,10 @@ public int addWindow(@NotNull Inventory inventory) {
             this.removeWindow(inventory);
             return -1;
         }
-        for(int index : inventory.getContents().keySet()) {
+        for (int index : inventory.getContents().keySet()) {
             Item item = inventory.getUnclonedItem(index);
-            if(item instanceof ItemBundle bundle) {
-                if(bundle.hasCompoundTag()) {
+            if (item instanceof ItemBundle bundle) {
+                if (bundle.hasCompoundTag()) {
                     bundle.onChange(inventory);
                     inventory.sendSlot(index, this);
                 }
@@ -4909,14 +4933,21 @@ public Set<Long> getUsedChunks() {
     @Override
     public void setSprinting(boolean value) {
         if (value && this.getFreezingTicks() > 0) return;
+
         if (isSprinting() != value) {
             super.setSprinting(value);
-            this.setMovementSpeed(value ? getMovementSpeed() * 1.3f : getMovementSpeed() / 1.3f);
 
+            float base = DEFAULT_SPEED;
+            int speedLvl = 0;
             if (this.hasEffect(EffectType.SPEED)) {
-                float movementSpeed = this.getMovementSpeed();
-                this.sendMovementSpeed(value ? movementSpeed * 1.3f : movementSpeed);
+                speedLvl = this.getEffect(EffectType.SPEED).getLevel();
             }
+            float effectMul = 1.0f + 0.2f * speedLvl;
+            float sprintMul = value ? 1.3f : 1.0f;
+
+            float finalSpeed = base * effectMul * sprintMul;
+
+            this.setMovementSpeed(finalSpeed, true);
         }
     }
 

src/main/java/cn/nukkit/PlayerFood.java

@@ -5,6 +5,7 @@
 import cn.nukkit.event.entity.EntityDamageEvent;
 import cn.nukkit.event.entity.EntityRegainHealthEvent;
 import cn.nukkit.event.player.PlayerFoodLevelChangeEvent;
+import cn.nukkit.item.Item;
 import cn.nukkit.item.ItemFood;
 
 /**
@@ -79,8 +80,8 @@ public void setSaturation(float saturation) {
         }
     }
 
-    public void addFood(ItemFood food) {
-        this.addFood(food.getFoodRestore(), food.getSaturationRestore());
+    public void addFood(Item item) {
+        this.addFood(item.getNutrition(), item.getSaturation());
     }
 
     public void setFood(int food) {

src/main/java/cn/nukkit/Server.java

@@ -126,6 +126,7 @@
 import java.util.concurrent.ForkJoinWorkerThread;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Pattern;
 
 /**
  * Represents a server object, global singleton.
@@ -196,12 +197,20 @@ public class Server {
     private final String filePath;
     private final String dataPath;
     private final String pluginPath;
+    public final String structurePath;
     private final Set<UUID> uniquePlayers = new HashSet<>();
     private final Map<InetSocketAddress, Player> players = new ConcurrentHashMap<>();
     private final Map<UUID, Player> playerList = new ConcurrentHashMap<>();
     private QueryRegenerateEvent queryRegenerateEvent;
     private PositionTrackingService positionTrackingService;
 
+    // Dynamic Properties defaults
+    private static volatile String DP_DEFAULT_GROUP_UUID = "00000000-0000-0000-0000-000000000000";
+    private static final int DP_MAX_STRING_BYTES = 32767;
+    private static final double DP_NUMBER_ABS_MAX = 9_223_372_036_854_775_807d;
+    private static final Pattern DP_UUID_CANON =
+                Pattern.compile("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$");
+
     private final Map<Integer, Level> levels = new HashMap<>() {
         @Override
         public Level put(Integer key, Level value) {
@@ -255,11 +264,16 @@ public Level remove(Object key) {
         if (!new File(dataPath + "players/").exists()) {
             new File(dataPath + "players/").mkdirs();
         }
+        if (!new File(dataPath + "structures/").exists()) {
+            new File(dataPath + "structures/").mkdirs();
+        }
         if (!new File(pluginPath).exists()) {
             new File(pluginPath).mkdirs();
         }
+
         this.dataPath = new File(dataPath).getAbsolutePath() + "/";
         this.pluginPath = new File(pluginPath).getAbsolutePath() + "/";
+        this.structurePath = new File(dataPath).getAbsolutePath() + "/structures/";
         String commandDataPath = new File(dataPath).getAbsolutePath() + "/command_data";
         if (!new File(commandDataPath).exists()) {
             new File(commandDataPath).mkdirs();
@@ -403,7 +417,6 @@ public Level remove(Object key) {
             Registries.PACKET.init();
             Registries.ENTITY.init();
             Registries.BLOCKENTITY.init();
-            Registries.BLOCKSTATE_ITEMMETA.init();
             Registries.ITEM_RUNTIMEID.init();
             Registries.BLOCK.init();
             Registries.BLOCKSTATE.init();
@@ -478,7 +491,6 @@ public Level remove(Object key) {
             Registries.PACKET.trim();
             Registries.ENTITY.trim();
             Registries.BLOCKENTITY.trim();
-            Registries.BLOCKSTATE_ITEMMETA.trim();
             Registries.BLOCKSTATE.trim();
             Registries.ITEM_RUNTIMEID.trim();
             Registries.BLOCK.trim();
@@ -649,7 +661,6 @@ public void reload() {
             Registries.PACKET.reload();
             Registries.ENTITY.reload();
             Registries.BLOCKENTITY.reload();
-            Registries.BLOCKSTATE_ITEMMETA.reload();
             Registries.BLOCKSTATE.reload();
             Registries.ITEM_RUNTIMEID.reload();
             Registries.BLOCK.reload();
@@ -673,7 +684,6 @@ public void reload() {
             Registries.PACKET.trim();
             Registries.ENTITY.trim();
             Registries.BLOCKENTITY.trim();
-            Registries.BLOCKSTATE_ITEMMETA.trim();
             Registries.BLOCKSTATE.trim();
             Registries.ITEM_RUNTIMEID.trim();
             Registries.BLOCK.trim();
@@ -2753,6 +2763,19 @@ public List<ExperimentEntry> getExperiments() {
         return experiments;
     }
 
+    /** Allow plugins to override the default DP group UUID (e.g., when migrating from BDS). */
+    public static void setDefaultDynamicPropertiesGroupUUID(String uuid) {
+        if (uuid == null || !DP_UUID_CANON.matcher(uuid).matches()) {
+            log.warn("DynamicProperties default group UUID rejected: '{}'", uuid);
+            return;
+        }
+        DP_DEFAULT_GROUP_UUID = uuid.toLowerCase();
+    }
+
+    public static String getDefaultDynamicPropertiesGroupUUID() { return DP_DEFAULT_GROUP_UUID; }
+    public static int    getDynamicPropertiesMaxStringBytes()   { return DP_MAX_STRING_BYTES; }
+    public static double getDynamicPropertiesNumberAbsMax()     { return DP_NUMBER_ABS_MAX; }
+
     //todo NukkitConsole 会阻塞关不掉
     private class ConsoleThread extends Thread implements InterruptibleThread {
         public ConsoleThread() {