tag changes and update some mapping

Author: Lulu13022002

paper-api/src/main/java/io/papermc/paper/block/LockableTileState.java

@@ -5,7 +5,7 @@
 import org.bukkit.block.TileState;
 
 /**
- * Interface for tile entities that are lockable.
+ * Interface for block entities that are lockable.
  */
 public interface LockableTileState extends TileState, Lockable, Nameable {
 }

paper-api/src/main/java/org/bukkit/Chunk.java

@@ -136,9 +136,9 @@ static long getChunkKey(int x, int z) {
     @NotNull Entity @NotNull [] getEntities();
 
     /**
-     * Get a list of all tile entities in the chunk.
+     * Get a list of all block entities in the chunk.
      *
-     * @return The tile entities.
+     * @return The block entities.
      */
     @NotNull
     // Paper start
@@ -147,20 +147,20 @@ static long getChunkKey(int x, int z) {
     }
 
     /**
-     * Get a list of all tile entities in the chunk.
+     * Get a list of all block entities in the chunk.
      *
      * @param useSnapshot Take snapshots or direct references
-     * @return The tile entities.
+     * @return The block entities.
      */
     @NotNull
     BlockState @NotNull [] getTileEntities(boolean useSnapshot);
 
     /**
-     * Get a list of all tile entities that match a given predicate in the chunk.
+     * Get a list of all block entities that match a given predicate in the chunk.
      *
-     * @param blockPredicate The predicate of blocks to return tile entities for
+     * @param blockPredicate The predicate of blocks to return block entities for
      * @param useSnapshot Take snapshots or direct references
-     * @return The tile entities.
+     * @return The block entities.
      */
     @NotNull
     Collection<BlockState> getTileEntities(java.util.function.@NotNull Predicate<? super Block> blockPredicate, boolean useSnapshot);

paper-api/src/main/java/org/bukkit/Tag.java

@@ -727,10 +727,16 @@ public interface Tag<T extends Keyed> extends Keyed {
      */
     Tag<Material> MANGROVE_ROOTS_CAN_GROW_THROUGH = Bukkit.getTag(REGISTRY_BLOCKS, NamespacedKey.minecraft("mangrove_roots_can_grow_through"), Material.class);
     /**
-     * Vanilla block tag representing all blocks which dead bushes may be placed
-     * on.
+     * Vanilla block tag representing all blocks which dry vegetation may be placed on.
+     */
+    Tag<Material> DRY_VEGETATION_MAY_PLACE_ON = Bukkit.getTag(REGISTRY_BLOCKS, NamespacedKey.minecraft("dry_vegetation_may_place_on"), Material.class);
+    /**
+     * Vanilla block tag representing all blocks which dead bushes may be placed on.
+     *
+     * @deprecated partially replaced by {@link #DRY_VEGETATION_MAY_PLACE_ON}
      */
-    Tag<Material> DEAD_BUSH_MAY_PLACE_ON = Bukkit.getTag(REGISTRY_BLOCKS, NamespacedKey.minecraft("dead_bush_may_place_on"), Material.class);
+    @Deprecated(since = "1.21.5", forRemoval = true)
+    Tag<Material> DEAD_BUSH_MAY_PLACE_ON = DRY_VEGETATION_MAY_PLACE_ON;
     /**
      * Vanilla block tag representing all blocks which snap dropped goat horns.
      */

paper-api/src/main/java/org/bukkit/World.java

@@ -103,27 +103,27 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
 
     // Paper start
     /**
-     * @return The amount of Entities in this world
+     * @return The amount of entities in this world
      */
     int getEntityCount();
 
     /**
-     * @return The amount of Tile Entities in this world
+     * @return The amount of block entities in this world
      */
     int getTileEntityCount();
 
     /**
-     * @return The amount of Tickable Tile Entities in this world
+     * @return The amount of tickable block entities in this world
      */
     int getTickableTileEntityCount();
 
     /**
-     * @return The amount of Chunks in this world
+     * @return The amount of chunks in this world
      */
     int getChunkCount();
 
     /**
-     * @return The amount of Players in this world
+     * @return The amount of players in this world
      */
     int getPlayerCount();
     // Paper end
@@ -744,7 +744,7 @@ default boolean regenerateChunk(int x, int z) {
      *     this method
      * @return true if the tree was created successfully, otherwise false
      * @see #generateTree(org.bukkit.Location, java.util.Random, org.bukkit.TreeType, java.util.function.Consumer)
-     * @deprecated this method does not handle tile entities (bee nests)
+     * @deprecated this method does not handle block entities (bee nests)
      */
     @Deprecated(since = "1.17.1")
     public boolean generateTree(@NotNull Location loc, @NotNull TreeType type, @NotNull BlockChangeDelegate delegate);

paper-api/src/main/java/org/bukkit/block/Block.java

@@ -364,7 +364,7 @@ public static int getBlockKeyZ(long packed) {
     // Paper start
     /**
      * @see #getState() optionally disables use of snapshot, to operate on real block data
-     * @param useSnapshot if this block is a TE, should we create a fully copy of the TileEntity
+     * @param useSnapshot if this block is a block entity, should we create a full copy of the BlockEntity
      * @return BlockState with the current state of this block
      */
     @NotNull

paper-server/patches/sources/net/minecraft/core/dispenser/DispenseItemBehavior.java.patch

@@ -141,13 +141,13 @@
 +                int x = blockPos.getX();
 +                int y = blockPos.getY();
 +                int z = blockPos.getZ();
-+                BlockState iblockdata = level.getBlockState(blockPos);
++                BlockState state = level.getBlockState(blockPos);
 +                ItemStack dispensedItem = item; // Paper - track changed item from the dispense event
 +                // Paper start - correctly check if the bucket place will succeed
 +                /* Taken from SolidBucketItem#emptyContents */
-+                boolean willEmptyContentsSolidBucketItem = dispensibleContainerItem instanceof net.minecraft.world.item.SolidBucketItem && level.isInWorldBounds(blockPos) && iblockdata.isAir();
++                boolean willEmptyContentsSolidBucketItem = dispensibleContainerItem instanceof net.minecraft.world.item.SolidBucketItem && level.isInWorldBounds(blockPos) && state.isAir();
 +                /* Taken from BucketItem#emptyContents */
-+                boolean willEmptyBucketItem = dispensibleContainerItem instanceof final net.minecraft.world.item.BucketItem bucketItem && bucketItem.content instanceof net.minecraft.world.level.material.FlowingFluid && (iblockdata.isAir() || iblockdata.canBeReplaced(bucketItem.content) || (iblockdata.getBlock() instanceof net.minecraft.world.level.block.LiquidBlockContainer liquidBlockContainer && liquidBlockContainer.canPlaceLiquid(null, level, blockPos, iblockdata, bucketItem.content)));
++                boolean willEmptyBucketItem = dispensibleContainerItem instanceof final net.minecraft.world.item.BucketItem bucketItem && bucketItem.content instanceof net.minecraft.world.level.material.FlowingFluid && (state.isAir() || state.canBeReplaced(bucketItem.content) || (state.getBlock() instanceof net.minecraft.world.level.block.LiquidBlockContainer liquidBlockContainer && liquidBlockContainer.canPlaceLiquid(null, level, blockPos, state, bucketItem.content)));
 +                if (willEmptyContentsSolidBucketItem || willEmptyBucketItem) {
 +                // Paper end - correctly check if the bucket place will succeed
 +                    org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(level, blockSource.pos());

paper-server/patches/sources/net/minecraft/server/MinecraftServer.java.patch

@@ -586,7 +586,7 @@
              flag = true;
          }
 
-+        /* // CraftBukkit start - moved to WorldServer.save
++        /* // CraftBukkit start - moved to ServerLevel#save
          ServerLevel serverLevel1 = this.overworld();
          ServerLevelData serverLevelData = this.worldData.overworldData();
          serverLevelData.setWorldBorder(serverLevel1.getWorldBorder().createSettings());

paper-server/patches/sources/net/minecraft/server/level/ServerLevel.java.patch

@@ -532,10 +532,10 @@
              }
          }
 +
-+        // CraftBukkit start - moved from MinecraftServer.saveChunks
-+        ServerLevel worldserver1 = this;
++        // CraftBukkit start - moved from MinecraftServer#saveAllChunks
++        ServerLevel serverLevel1 = this;
 +
-+        this.serverLevelData.setWorldBorder(worldserver1.getWorldBorder().createSettings());
++        this.serverLevelData.setWorldBorder(serverLevel1.getWorldBorder().createSettings());
 +        this.serverLevelData.setCustomBossEvents(this.server.getCustomBossEvents().save(this.registryAccess()));
 +        this.levelStorageAccess.saveDataTag(this.server.registryAccess(), this.serverLevelData, this.server.getPlayerList().getSingleplayerData());
 +        // CraftBukkit end

paper-server/patches/sources/net/minecraft/server/level/ServerPlayer.java.patch

@@ -599,7 +599,7 @@
 +
 +            org.bukkit.Location enter = this.getBukkitEntity().getLocation();
 +            PositionMoveRotation absolutePosition = PositionMoveRotation.calculateAbsolute(PositionMoveRotation.of(this), PositionMoveRotation.of(teleportTransition), teleportTransition.relatives());
-+            org.bukkit.Location exit = /* (worldserver == null) ? null : // Paper - always non-null */org.bukkit.craftbukkit.util.CraftLocation.toBukkit(absolutePosition.position(), level.getWorld(), absolutePosition.yRot(), absolutePosition.xRot());
++            org.bukkit.Location exit = org.bukkit.craftbukkit.util.CraftLocation.toBukkit(absolutePosition.position(), level.getWorld(), absolutePosition.yRot(), absolutePosition.xRot());
 +            org.bukkit.event.player.PlayerTeleportEvent tpEvent = new org.bukkit.event.player.PlayerTeleportEvent(this.getBukkitEntity(), enter, exit, teleportTransition.cause());
 +            // Paper start - gateway-specific teleport event
 +            if (this.portalProcess != null && this.portalProcess.isSamePortal(((net.minecraft.world.level.block.EndGatewayBlock) net.minecraft.world.level.block.Blocks.END_GATEWAY)) && this.serverLevel().getBlockEntity(this.portalProcess.getEntryPosition()) instanceof net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity theEndGatewayBlockEntity) {

paper-server/patches/sources/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java.patch

@@ -264,9 +264,9 @@
 +
 +    // CraftBukkit start - SPIGOT-2420: Special case, the ender dragon drops 12000 xp for the first kill and 500 xp for every other kill and this over time.
 +    @Override
-+    public int getExpReward(ServerLevel worldserver, Entity entity) {
++    public int getExpReward(ServerLevel level, Entity entity) {
 +        // CraftBukkit - Moved from #tickDeath method
-+        boolean flag = worldserver.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT);
++        boolean flag = level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT);
 +        int i = 500;
 +
 +        if (this.dragonFight != null && !this.dragonFight.hasPreviouslyKilledDragon()) {

paper-server/patches/sources/net/minecraft/world/item/ItemStack.java.patch

@@ -167,25 +167,25 @@
 +                        }
 +                    }
 +
-+                    // SPIGOT-7315: Moved from BlockBed#setPlacedBy
++                    // SPIGOT-7315: Moved from BedBlock#setPlacedBy
 +                    if (placeEvent != null && this.item instanceof BedItem) {
-+                        BlockPos position = ((org.bukkit.craftbukkit.block.CraftBlock) placeEvent.getBlock()).getPosition();
-+                        net.minecraft.world.level.block.state.BlockState blockData = serverLevel.getBlockState(position);
++                        BlockPos pos = ((org.bukkit.craftbukkit.block.CraftBlock) placeEvent.getBlock()).getPosition();
++                        net.minecraft.world.level.block.state.BlockState state = serverLevel.getBlockState(pos);
 +
-+                        if (blockData.getBlock() instanceof net.minecraft.world.level.block.BedBlock) {
-+                            serverLevel.updateNeighborsAt(position, net.minecraft.world.level.block.Blocks.AIR);
-+                            blockData.updateNeighbourShapes(serverLevel, position, 3);
++                        if (state.getBlock() instanceof net.minecraft.world.level.block.BedBlock) {
++                            serverLevel.updateNeighborsAt(pos, net.minecraft.world.level.block.Blocks.AIR);
++                            state.updateNeighbourShapes(serverLevel, pos, 3);
 +                        }
 +                    }
 +
-+                    // SPIGOT-1288 - play sound stripped from ItemBlock
++                    // SPIGOT-1288 - play sound stripped from BlockItem
 +                    if (this.item instanceof BlockItem) {
 +                        // Paper start - Fix spigot sound playing for BlockItem ItemStacks
-+                        BlockPos position = new net.minecraft.world.item.context.BlockPlaceContext(context).getClickedPos();
-+                        net.minecraft.world.level.block.state.BlockState blockData = serverLevel.getBlockState(position);
-+                        net.minecraft.world.level.block.SoundType soundeffecttype = blockData.getSoundType();
++                        BlockPos pos = new net.minecraft.world.item.context.BlockPlaceContext(context).getClickedPos();
++                        net.minecraft.world.level.block.state.BlockState state = serverLevel.getBlockState(pos);
++                        net.minecraft.world.level.block.SoundType soundType = state.getSoundType();
 +                        // Paper end - Fix spigot sound playing for BlockItem ItemStacks
-+                        serverLevel.playSound(player, clickedPos, soundeffecttype.getPlaceSound(), net.minecraft.sounds.SoundSource.BLOCKS, (soundeffecttype.getVolume() + 1.0F) / 2.0F, soundeffecttype.getPitch() * 0.8F);
++                        serverLevel.playSound(player, clickedPos, soundType.getPlaceSound(), net.minecraft.sounds.SoundSource.BLOCKS, (soundType.getVolume() + 1.0F) / 2.0F, soundType.getPitch() * 0.8F);
 +                    }
 +
 +                    player.awardStat(Stats.ITEM_USED.get(item));