move things around

Author: Lulu13022002

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

@@ -28,7 +28,7 @@ public interface TileState extends BlockState, PersistentDataHolder {
      * stored by the {@link BlockState}.
      *
      * When storing changes on the {@link PersistentDataHolder}, the updated
-     * content will only be applied to the actual tile entity after one of the
+     * content will only be applied to the actual block entity after one of the
      * {@link #update()} methods is called.
      *
      * @return the custom tag container
@@ -40,7 +40,7 @@ public interface TileState extends BlockState, PersistentDataHolder {
     // Paper start
     /**
      * Checks if this TileState is a snapshot or a live
-     * representation of the underlying tile entity.
+     * representation of the underlying block entity.
      * <p>
      * NOTE: You may still have to call {@link BlockState#update()} on
      * live representations to update any visuals on the block.

paper-api/src/main/java/org/bukkit/entity/FallingBlock.java

@@ -47,7 +47,7 @@ public interface FallingBlock extends Entity {
     org.bukkit.block.BlockState getBlockState();
 
     /**
-     * Sets the {@link BlockData} and possibly present tile entity data for the falling block.
+     * Sets the {@link BlockData} and possibly present block entity data for the falling block.
      *
      * @param blockState the BlockState to use
      */

paper-api/src/main/java/org/bukkit/inventory/Inventory.java

@@ -400,7 +400,7 @@ public interface Inventory extends Iterable<ItemStack> {
     /**
      * Gets the block or entity belonging to the open inventory
      *
-     * @param useSnapshot Create a snapshot if the holder is a tile entity
+     * @param useSnapshot Create a snapshot if the holder is a block entity
      * @return The holder of the inventory; null if it has no holder.
      */
     @Nullable

paper-api/src/main/java/org/bukkit/inventory/view/builder/LocationInventoryViewBuilder.java

@@ -45,7 +45,7 @@ public interface LocationInventoryViewBuilder<V extends InventoryView> extends I
      * building this view it may come with the costs associated with chunk
      * loading.
      * <p>
-     * Providing a location of a tile entity with a non matching menu comes with
+     * Providing a location of a block entity with a non matching menu comes with
      * extra costs associated with ensuring that the correct view is created.
      *
      * @param location the location to bind to this view

paper-server/patches/sources/net/minecraft/core/component/DataComponentPatch.java.patch

@@ -5,9 +5,9 @@
                      buffer.writeVarInt(0);
                  } else {
 +                    // Paper start - data sanitization for items
-+                    final io.papermc.paper.util.ItemObfuscationSession itemObfuscationSession = value.map.isEmpty()
++                    final io.papermc.paper.util.sanitizer.ItemObfuscationSession itemObfuscationSession = value.map.isEmpty()
 +                        ? null // Avoid thread local lookup of current session if it won't be needed anyway.
-+                        : io.papermc.paper.util.ItemObfuscationSession.currentSession();
++                        : io.papermc.paper.util.sanitizer.ItemObfuscationSession.currentSession();
 +                    // Paper end - data sanitization for items
                      int i = 0;
                      int i1 = 0;
@@ -17,15 +17,15 @@
                      )) {
                          if (entry.getValue().isPresent()) {
 -                            i++;
-+                            if (!io.papermc.paper.util.ItemComponentSanitizer.shouldDrop(itemObfuscationSession, entry.getKey())) i++; // Paper - data sanitization for items
++                            if (!io.papermc.paper.util.sanitizer.ItemComponentSanitizer.shouldDrop(itemObfuscationSession, entry.getKey())) i++; // Paper - data sanitization for items
                          } else {
                              i1++;
                          }
 @@ -126,6 +_,7 @@
                          value.map
                      )) {
                          Optional<?> optional = entryx.getValue();
-+                        optional = io.papermc.paper.util.ItemComponentSanitizer.override(itemObfuscationSession, entryx.getKey(), entryx.getValue()); // Paper - data sanitization for items
++                        optional = io.papermc.paper.util.sanitizer.ItemComponentSanitizer.override(itemObfuscationSession, entryx.getKey(), entryx.getValue()); // Paper - data sanitization for items
                          if (optional.isPresent()) {
                              DataComponentType<?> dataComponentType = entryx.getKey();
                              DataComponentType.STREAM_CODEC.encode(buffer, dataComponentType);

paper-server/patches/sources/net/minecraft/core/component/DataComponents.java.patch

@@ -5,11 +5,11 @@
      );
      public static final DataComponentType<ChargedProjectiles> CHARGED_PROJECTILES = register(
 -        "charged_projectiles", builder -> builder.persistent(ChargedProjectiles.CODEC).networkSynchronized(ChargedProjectiles.STREAM_CODEC).cacheEncoding()
-+        "charged_projectiles", builder -> builder.persistent(ChargedProjectiles.CODEC).networkSynchronized(io.papermc.paper.util.OversizedItemComponentSanitizer.CHARGED_PROJECTILES).cacheEncoding() // Paper - sanitize charged projectiles
++        "charged_projectiles", builder -> builder.persistent(ChargedProjectiles.CODEC).networkSynchronized(io.papermc.paper.util.sanitizer.OversizedItemComponentSanitizer.CHARGED_PROJECTILES).cacheEncoding() // Paper - sanitize charged projectiles
      );
      public static final DataComponentType<BundleContents> BUNDLE_CONTENTS = register(
 -        "bundle_contents", builder -> builder.persistent(BundleContents.CODEC).networkSynchronized(BundleContents.STREAM_CODEC).cacheEncoding()
-+        "bundle_contents", builder -> builder.persistent(BundleContents.CODEC).networkSynchronized(io.papermc.paper.util.OversizedItemComponentSanitizer.BUNDLE_CONTENTS).cacheEncoding() // Paper - sanitize bundle contents
++        "bundle_contents", builder -> builder.persistent(BundleContents.CODEC).networkSynchronized(io.papermc.paper.util.sanitizer.OversizedItemComponentSanitizer.BUNDLE_CONTENTS).cacheEncoding() // Paper - sanitize bundle contents
      );
      public static final DataComponentType<PotionContents> POTION_CONTENTS = register(
          "potion_contents", builder -> builder.persistent(PotionContents.CODEC).networkSynchronized(PotionContents.STREAM_CODEC).cacheEncoding()
@@ -18,7 +18,7 @@
      );
      public static final DataComponentType<ItemContainerContents> CONTAINER = register(
 -        "container", builder -> builder.persistent(ItemContainerContents.CODEC).networkSynchronized(ItemContainerContents.STREAM_CODEC).cacheEncoding()
-+        "container", builder -> builder.persistent(ItemContainerContents.CODEC).networkSynchronized(io.papermc.paper.util.OversizedItemComponentSanitizer.CONTAINER).cacheEncoding() // Paper - sanitize container contents
++        "container", builder -> builder.persistent(ItemContainerContents.CODEC).networkSynchronized(io.papermc.paper.util.sanitizer.OversizedItemComponentSanitizer.CONTAINER).cacheEncoding() // Paper - sanitize container contents
      );
      public static final DataComponentType<BlockItemStateProperties> BLOCK_STATE = register(
          "block_state", builder -> builder.persistent(BlockItemStateProperties.CODEC).networkSynchronized(BlockItemStateProperties.STREAM_CODEC).cacheEncoding()

paper-server/patches/sources/net/minecraft/network/protocol/game/ClientboundSetEntityDataPacket.java.patch

@@ -4,7 +4,7 @@
      }
 
      private static void pack(List<SynchedEntityData.DataValue<?>> dataValues, RegistryFriendlyByteBuf buffer) {
-+        try (io.papermc.paper.util.ItemObfuscationSession ignored = io.papermc.paper.util.ItemObfuscationSession.start(io.papermc.paper.configuration.GlobalConfiguration.get().anticheat.obfuscation.items.binding.level)) { // Paper - data sanitization
++        try (io.papermc.paper.util.sanitizer.ItemObfuscationSession ignored = io.papermc.paper.util.sanitizer.ItemObfuscationSession.start(io.papermc.paper.configuration.GlobalConfiguration.get().anticheat.obfuscation.items.binding.level)) { // Paper - data sanitization
          for (SynchedEntityData.DataValue<?> dataValue : dataValues) {
              dataValue.write(buffer);
          }

paper-server/patches/sources/net/minecraft/network/protocol/game/ClientboundSetEquipmentPacket.java.patch

@@ -18,7 +18,7 @@
          buffer.writeVarInt(this.entity);
          int size = this.slots.size();
 
-+        try (final io.papermc.paper.util.ItemObfuscationSession ignored = io.papermc.paper.util.ItemObfuscationSession.start(this.sanitize ? io.papermc.paper.configuration.GlobalConfiguration.get().anticheat.obfuscation.items.binding.level : io.papermc.paper.util.ItemObfuscationSession.ObfuscationLevel.NONE)) { // Paper - data sanitization
++        try (final io.papermc.paper.util.sanitizer.ItemObfuscationSession ignored = io.papermc.paper.util.sanitizer.ItemObfuscationSession.start(this.sanitize ? io.papermc.paper.configuration.GlobalConfiguration.get().anticheat.obfuscation.items.binding.level : io.papermc.paper.util.sanitizer.ItemObfuscationSession.ObfuscationLevel.NONE)) { // Paper - data sanitization
          for (int i = 0; i < size; i++) {
              Pair<EquipmentSlot, ItemStack> pair = this.slots.get(i);
              EquipmentSlot equipmentSlot = pair.getFirst();

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

@@ -1056,7 +1056,7 @@
 +        // blocks at the same Y level with the same state can be assumed to be saplings which trigger observers regardless of if the
 +        // tree grew or not
 +        if (craftBlockState.getPosition().getY() == pos.getY() && this.getBlockState(craftBlockState.getPosition()) == craftBlockState.getHandle()) {
-+            this.notifyAndUpdatePhysics(craftBlockState.getPosition(), null, craftBlockState.getHandle(), craftBlockState.getHandle(), craftBlockState.getHandle(), craftBlockState.getFlag(), 512);
++            this.notifyAndUpdatePhysics(craftBlockState.getPosition(), null, craftBlockState.getHandle(), craftBlockState.getHandle(), craftBlockState.getHandle(), craftBlockState.getFlags(), 512);
 +        }
 +    }
 +    // Paper end - notify observers even if grow failed

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

@@ -92,7 +92,7 @@
              this.debugLogging(pos, false, sequence, "too far");
          } else if (pos.getY() > maxBuildHeight) {
              this.player.connection.send(new ClientboundBlockUpdatePacket(pos, this.level.getBlockState(pos)));
-@@ -138,16 +_,39 @@
+@@ -138,16 +_,35 @@
          } else {
              if (action == ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK) {
                  if (!this.level.mayInteract(this.player, pos)) {
@@ -102,7 +102,6 @@
                      this.debugLogging(pos, false, sequence, "may not interact");
 -                    return;
 -                }
-+                    // Update any tile entity data for this block
 +                    this.capturedBlockEntity = true; // Paper - Send block entities after destroy prediction
 +                    // CraftBukkit end
 +                    return;
@@ -111,9 +110,6 @@
 +                // CraftBukkit start
 +                org.bukkit.event.player.PlayerInteractEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent(this.player, org.bukkit.event.block.Action.LEFT_CLICK_BLOCK, pos, face, this.player.getInventory().getSelectedItem(), InteractionHand.MAIN_HAND);
 +                if (event.isCancelled()) {
-+                    // Let the client know the block still exists
-+                    // this.player.connection.send(new ClientboundBlockUpdatePacket(this.level, pos)); // Paper - Don't resync blocks
-+                    // Update any tile entity data for this block
 +                    this.capturedBlockEntity = true; // Paper - Send block entities after destroy prediction
 +                    return;
 +                }

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

@@ -9,11 +9,11 @@
                      buffer.writeVarInt(0);
                  } else {
 -                    buffer.writeVarInt(value.getCount());
-+                    buffer.writeVarInt(io.papermc.paper.util.ItemComponentSanitizer.sanitizeCount(io.papermc.paper.util.ItemObfuscationSession.currentSession(), value, value.getCount())); // Paper - potentially sanitize count
++                    buffer.writeVarInt(io.papermc.paper.util.sanitizer.ItemComponentSanitizer.sanitizeCount(io.papermc.paper.util.sanitizer.ItemObfuscationSession.currentSession(), value, value.getCount())); // Paper - potentially sanitize count
                      Item.STREAM_CODEC.encode(buffer, value.getItemHolder());
 +                    // Paper start - adventure; conditionally render translatable components
 +                    boolean prev = net.minecraft.network.chat.ComponentSerialization.DONT_RENDER_TRANSLATABLES.get();
-+                    try (final io.papermc.paper.util.SafeAutoClosable ignored = io.papermc.paper.util.ItemObfuscationSession.withContext(c -> c.itemStack(value))) { // pass the itemstack as context to the obfuscation session
++                    try (final io.papermc.paper.util.SafeAutoClosable ignored = io.papermc.paper.util.sanitizer.ItemObfuscationSession.withContext(c -> c.itemStack(value))) { // pass the itemstack as context to the obfuscation session
 +                        net.minecraft.network.chat.ComponentSerialization.DONT_RENDER_TRANSLATABLES.set(true);
                      streamCodec.encode(buffer, value.components.asPatch());
 +                    } finally {
@@ -125,7 +125,7 @@
 +                    }
 +
 +                    for (org.bukkit.block.BlockState blockstate : blocks) {
-+                        int updateFlag = ((org.bukkit.craftbukkit.block.CraftBlockState) blockstate).getFlag();
++                        int updateFlags = ((org.bukkit.craftbukkit.block.CraftBlockState) blockstate).getFlags();
 +                        net.minecraft.world.level.block.state.BlockState oldBlock = ((org.bukkit.craftbukkit.block.CraftBlockState) blockstate).getHandle();
 +                        BlockPos newPos = ((org.bukkit.craftbukkit.block.CraftBlockState) blockstate).getPosition();
 +                        net.minecraft.world.level.block.state.BlockState block = serverLevel.getBlockState(newPos);
@@ -134,7 +134,7 @@
 +                            block.onPlace(serverLevel, newPos, oldBlock, true, context);
 +                        }
 +
-+                        serverLevel.notifyAndUpdatePhysics(newPos, null, oldBlock, block, serverLevel.getBlockState(newPos), updateFlag, net.minecraft.world.level.block.Block.UPDATE_LIMIT); // send null chunk as chunk.k() returns false by this point
++                        serverLevel.notifyAndUpdatePhysics(newPos, null, oldBlock, block, serverLevel.getBlockState(newPos), updateFlags, net.minecraft.world.level.block.Block.UPDATE_LIMIT); // send null chunk as chunk.k() returns false by this point
 +                    }
 +
 +                    if (this.item == Items.WITHER_SKELETON_SKULL) { // Special case skulls to allow wither spawns to be cancelled

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

@@ -354,7 +354,7 @@
 +                this.capturedBlockStates.put(pos.immutable(), blockstate);
 +            }
 +            blockstate.setData(state);
-+            blockstate.setFlag(flags);
++            blockstate.setFlags(flags);
 +            return true;
 +        }
 +        // CraftBukkit end
@@ -369,7 +369,7 @@
 +            boolean captured = false;
 +            if (this.captureBlockStates && !this.capturedBlockStates.containsKey(pos)) {
 +                CraftBlockState blockstate = (CraftBlockState) world.getBlockAt(pos.getX(), pos.getY(), pos.getZ()).getState(); // Paper - use CB getState to get a suitable snapshot
-+                blockstate.setFlag(flags); // Paper - set flag
++                blockstate.setFlags(flags); // Paper - set flag
 +                this.capturedBlockStates.put(pos.immutable(), blockstate);
 +                captured = true;
 +            }

paper-server/patches/sources/net/minecraft/world/level/block/SpongeBlock.java.patch

@@ -85,7 +85,7 @@
 +                        // Paper end - Fix SpongeAbsortEvent handling
 +                    }
 +                }
-+                level.setBlock(blockPos, block.getHandle(), block.getFlag());
++                level.setBlock(blockPos, block.getHandle(), block.getFlags());
 +            }
 +
 +            return true;

paper-server/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java

@@ -5,14 +5,13 @@
 import io.papermc.paper.configuration.constraint.Constraints;
 import io.papermc.paper.configuration.type.number.DoubleOr;
 import io.papermc.paper.configuration.type.number.IntOr;
-import io.papermc.paper.util.ItemObfuscationBinding;
+import io.papermc.paper.util.sanitizer.ItemObfuscationBinding;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ServerboundPlaceRecipePacket;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.Items;
 import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.spongepowered.configurate.objectmapping.ConfigSerializable;

paper-server/src/main/java/io/papermc/paper/util/ItemComponentSanitizer.java paper-server/src/main/java/io/papermc/paper/util/sanitizer/ItemComponentSanitizer.java

@@ -1,4 +1,4 @@
-package io.papermc.paper.util;
+package io.papermc.paper.util.sanitizer;
 
 import com.google.common.collect.ImmutableMap;
 import io.papermc.paper.configuration.GlobalConfiguration;

paper-server/src/main/java/io/papermc/paper/util/ItemObfuscationBinding.java paper-server/src/main/java/io/papermc/paper/util/sanitizer/ItemObfuscationBinding.java

@@ -1,4 +1,4 @@
-package io.papermc.paper.util;
+package io.papermc.paper.util.sanitizer;
 
 import io.papermc.paper.configuration.GlobalConfiguration;
 import java.util.Collections;
@@ -97,8 +97,7 @@ public BoundObfuscationConfiguration getAssetObfuscation(final ItemStack itemSta
         DataComponents.CAN_PLACE_ON,
         DataComponents.CAN_BREAK,
         DataComponents.ATTRIBUTE_MODIFIERS,
-        DataComponents.HIDE_ADDITIONAL_TOOLTIP,
-        DataComponents.HIDE_TOOLTIP,
+        DataComponents.TOOLTIP_DISPLAY,
         DataComponents.REPAIR_COST,
         DataComponents.USE_REMAINDER,
         DataComponents.FOOD,

paper-server/src/main/java/io/papermc/paper/util/ItemObfuscationSession.java paper-server/src/main/java/io/papermc/paper/util/sanitizer/ItemObfuscationSession.java

@@ -1,7 +1,8 @@
-package io.papermc.paper.util;
+package io.papermc.paper.util.sanitizer;
 
 import java.util.function.UnaryOperator;
 import com.google.common.base.Preconditions;
+import io.papermc.paper.util.SafeAutoClosable;
 import net.minecraft.world.item.ItemStack;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;

paper-server/src/main/java/io/papermc/paper/util/OversizedItemComponentSanitizer.java paper-server/src/main/java/io/papermc/paper/util/sanitizer/OversizedItemComponentSanitizer.java

@@ -1,5 +1,6 @@
-package io.papermc.paper.util;
+package io.papermc.paper.util.sanitizer;
 
+import io.papermc.paper.util.SafeAutoClosable;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import java.util.List;
 import java.util.function.UnaryOperator;

paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java

@@ -195,6 +195,7 @@
 import org.bukkit.craftbukkit.tag.CraftDamageTag;
 import org.bukkit.craftbukkit.tag.CraftEntityTag;
 import org.bukkit.craftbukkit.tag.CraftFluidTag;
+import org.bukkit.craftbukkit.tag.CraftGameEventTag;
 import org.bukkit.craftbukkit.tag.CraftItemTag;
 import org.bukkit.craftbukkit.util.ApiVersion;
 import org.bukkit.craftbukkit.util.CraftChatMessage;
@@ -2913,7 +2914,7 @@ public <T extends Keyed> org.bukkit.Tag<T> getTag(String registry, NamespacedKey
                 Preconditions.checkArgument(clazz == org.bukkit.GameEvent.class, "Game Event namespace must have GameEvent type");
                 TagKey<net.minecraft.world.level.gameevent.GameEvent> gameEventTagKey = TagKey.create(net.minecraft.core.registries.Registries.GAME_EVENT, key);
                 if (net.minecraft.core.registries.BuiltInRegistries.GAME_EVENT.get(gameEventTagKey).isPresent()) {
-                    return (org.bukkit.Tag<T>) new io.papermc.paper.CraftGameEventTag(net.minecraft.core.registries.BuiltInRegistries.GAME_EVENT, gameEventTagKey);
+                    return (org.bukkit.Tag<T>) new CraftGameEventTag(net.minecraft.core.registries.BuiltInRegistries.GAME_EVENT, gameEventTagKey);
                 }
             }
             // Paper end
@@ -2958,7 +2959,7 @@ public <T extends Keyed> Iterable<org.bukkit.Tag<T>> getTags(String registry, Cl
             case org.bukkit.Tag.REGISTRY_GAME_EVENTS -> {
                 Preconditions.checkArgument(clazz == org.bukkit.GameEvent.class);
                 net.minecraft.core.Registry<net.minecraft.world.level.gameevent.GameEvent> gameEvents = net.minecraft.core.registries.BuiltInRegistries.GAME_EVENT;
-                return gameEvents.getTags().map(pair -> (org.bukkit.Tag<T>) new io.papermc.paper.CraftGameEventTag(gameEvents, pair.key())).collect(ImmutableList.toImmutableList());
+                return gameEvents.getTags().map(pair -> (org.bukkit.Tag<T>) new CraftGameEventTag(gameEvents, pair.key())).collect(ImmutableList.toImmutableList());
             }
             // Paper end
             default -> throw new IllegalArgumentException();