Updated Upstream (CraftBukkit/Spigot)

Doesn't compile yet.

CraftBukkit Changes:
90d6905b Repackage NMS
69cf961d Repackage patches

Spigot Changes:
79d53c28 Repackage NMS

Spigot-Server-Patches/0547-Brand-support.patch

@@ -4,10 +4,10 @@ Date: Sat, 11 Apr 2020 13:10:58 +0200
 Subject: [PATCH] Brand support
 
 
-diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
+diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PlayerConnection.java
+--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
++++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -0,0 +0,0 @@ import com.google.common.primitives.Doubles;
  import com.google.common.primitives.Floats;
  import com.mojang.brigadier.ParseResults;

Spigot-Server-Patches/API-to-get-a-BlockState-without-a-snapshot.patch

@@ -12,11 +12,11 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE
 
 If Tile Entity was null, correct Sign to return empty lines instead of null
 
-diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/TileEntity.java
+--- a/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
-+++ b/src/main/java/net/minecraft/server/TileEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
-@@ -0,0 +0,0 @@ public abstract class TileEntity implements KeyedObject { // Paper
+@@ -0,0 +0,0 @@ public abstract class TileEntity implements net.minecraft.server.KeyedObject { /
      public TileEntity(TileEntityTypes<?> tileentitytypes) {
          this.position = BlockPosition.ZERO;
          this.tileType = tileentitytypes;
@@ -24,16 +24,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      // Paper start
-@@ -0,0 +0,0 @@ public abstract class TileEntity implements KeyedObject { // Paper
+@@ -0,0 +0,0 @@ public abstract class TileEntity implements net.minecraft.server.KeyedObject { /
      public void load(IBlockData iblockdata, NBTTagCompound nbttagcompound) {
          this.position = new BlockPosition(nbttagcompound.getInt("x"), nbttagcompound.getInt("y"), nbttagcompound.getInt("z"));
          // CraftBukkit start - read container
 -        this.persistentDataContainer = new CraftPersistentDataContainer(DATA_TYPE_REGISTRY);
 +        this.persistentDataContainer.clear(); // Paper - clear instead of reinit
  
-         NBTBase persistentDataTag = nbttagcompound.get("PublicBukkitValues");
+         net.minecraft.nbt.NBTBase persistentDataTag = nbttagcompound.get("PublicBukkitValues");
          if (persistentDataTag instanceof NBTTagCompound) {
-@@ -0,0 +0,0 @@ public abstract class TileEntity implements KeyedObject { // Paper
+@@ -0,0 +0,0 @@ public abstract class TileEntity implements net.minecraft.server.KeyedObject { /
      }
  
      // CraftBukkit start - add method
@@ -46,7 +46,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          if (world == null) return null;
          // Spigot start
          org.bukkit.block.Block block = world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ());
-@@ -0,0 +0,0 @@ public abstract class TileEntity implements KeyedObject { // Paper
+@@ -0,0 +0,0 @@ public abstract class TileEntity implements net.minecraft.server.KeyedObject { /
              return null;
          }
          // Spigot end

Spigot-Server-Patches/Ability-to-apply-mending-to-XP-API.patch

@@ -9,25 +9,10 @@ of giving the player experience points.
 
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
-diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
+diff --git a/src/main/java/net/minecraft/world/entity/EntityExperienceOrb.java b/src/main/java/net/minecraft/world/entity/EntityExperienceOrb.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EnchantmentManager.java
+--- a/src/main/java/net/minecraft/world/entity/EntityExperienceOrb.java
-+++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
++++ b/src/main/java/net/minecraft/world/entity/EntityExperienceOrb.java
-@@ -0,0 +0,0 @@ public class EnchantmentManager {
-         return getEnchantmentLevel(Enchantments.CHANNELING, itemstack) > 0;
-     }
- 
--    @Nullable
--    public static Entry<EnumItemSlot, ItemStack> b(Enchantment enchantment, EntityLiving entityliving) {
-+    public static @javax.annotation.Nonnull ItemStack getRandomEquippedItemWithEnchant(Enchantment enchantment, EntityLiving entityliving) { Entry<EnumItemSlot, ItemStack> entry = b(enchantment, entityliving); return entry != null ? entry.getValue() : ItemStack.NULL_ITEM; } // Paper - OBFHELPER
-+    @Nullable public static Entry<EnumItemSlot, ItemStack> b(Enchantment enchantment, EntityLiving entityliving) {
-         return a(enchantment, entityliving, (itemstack) -> {
-             return true;
-         });
-diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-+++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -0,0 +0,0 @@ public class EntityExperienceOrb extends Entity {
          }
      }
@@ -41,6 +26,21 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private int c(int i) {
          return i * 2;
      }
+diff --git a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentManager.java b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentManager.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentManager.java
++++ b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentManager.java
+@@ -0,0 +0,0 @@ public class EnchantmentManager {
+         return getEnchantmentLevel(Enchantments.CHANNELING, itemstack) > 0;
+     }
+ 
+-    @Nullable
+-    public static Entry<EnumItemSlot, ItemStack> b(Enchantment enchantment, EntityLiving entityliving) {
++    public static @javax.annotation.Nonnull ItemStack getRandomEquippedItemWithEnchant(Enchantment enchantment, EntityLiving entityliving) { Entry<EnumItemSlot, ItemStack> entry = b(enchantment, entityliving); return entry != null ? entry.getValue() : ItemStack.NULL_ITEM; } // Paper - OBFHELPER
++    @Nullable public static Entry<EnumItemSlot, ItemStack> b(Enchantment enchantment, EntityLiving entityliving) {
+         return a(enchantment, entityliving, (itemstack) -> {
+             return true;
+         });
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java

Spigot-Server-Patches/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch

@@ -5,12 +5,12 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
 
 This will allow you to change the players name or skin on login.
 
-diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
+diff --git a/src/main/java/net/minecraft/server/network/LoginListener.java b/src/main/java/net/minecraft/server/network/LoginListener.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/LoginListener.java
+--- a/src/main/java/net/minecraft/server/network/LoginListener.java
-+++ b/src/main/java/net/minecraft/server/LoginListener.java
++++ b/src/main/java/net/minecraft/server/network/LoginListener.java
 @@ -0,0 +0,0 @@
- package net.minecraft.server;
+ package net.minecraft.server.network;
  
 +import com.destroystokyo.paper.profile.CraftPlayerProfile;
 +import com.destroystokyo.paper.profile.PlayerProfile;
@@ -18,8 +18,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import com.mojang.authlib.exceptions.AuthenticationUnavailableException;
  import java.math.BigInteger;
 @@ -0,0 +0,0 @@ import org.apache.logging.log4j.Logger;
- 
  // CraftBukkit start
+ import net.minecraft.network.chat.ChatComponentText;
  import io.papermc.paper.adventure.PaperAdventure; // Paper
 +import org.bukkit.Bukkit;
  import org.bukkit.craftbukkit.util.Waitable;

Spigot-Server-Patches/Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch

@@ -17,8 +17,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import java.util.Collection;
 +import java.util.List;
  import java.util.function.Predicate;
- import net.minecraft.server.BiomeStorage;
+ import net.minecraft.core.BlockPosition;
- import net.minecraft.server.BlockPosition;
+ import net.minecraft.core.IRegistry;
 @@ -0,0 +0,0 @@ public class CraftChunk implements Chunk {
  
      @Override
@@ -34,7 +34,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          }
 +        // Paper end
          int index = 0;
-         net.minecraft.server.Chunk chunk = getHandle();
+         net.minecraft.world.level.chunk.Chunk chunk = getHandle();
  
 @@ -0,0 +0,0 @@ public class CraftChunk implements Chunk {
              }
@@ -54,7 +54,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        if (!isLoaded()) {
 +            getWorld().getChunkAt(x, z); // Transient load for this tick
 +        }
-+        net.minecraft.server.Chunk chunk = getHandle();
++        net.minecraft.world.level.chunk.Chunk chunk = getHandle();
 +
 +        List<BlockState> entities = new ArrayList<>();
 +

Spigot-Server-Patches/Add-API-for-quit-reason.patch

@@ -4,22 +4,10 @@ Date: Sat, 14 Nov 2020 16:19:52 +0100
 Subject: [PATCH] Add API for quit reason
 
 
-diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
+diff --git a/src/main/java/net/minecraft/network/NetworkManager.java b/src/main/java/net/minecraft/network/NetworkManager.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityPlayer.java
+--- a/src/main/java/net/minecraft/network/NetworkManager.java
-+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
++++ b/src/main/java/net/minecraft/network/NetworkManager.java
-@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-     double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
- 
-     boolean needsChunkCenterUpdate; // Paper - no-tick view distance
-+    public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event
- 
-     public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
-         super(worldserver, worldserver.getSpawn(), worldserver.v(), gameprofile);
-diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/NetworkManager.java
-+++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -0,0 +0,0 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
  
              this.u = true;
@@ -36,10 +24,22 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                      if (flag) {
                          NetworkManager.LOGGER.debug("Failed to sent packet", throwable);
                          this.sendPacket(new PacketPlayOutKickDisconnect(chatmessage), (future) -> {
-diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
+diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PlayerConnection.java
+--- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
++++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
+@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+     double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
+ 
+     boolean needsChunkCenterUpdate; // Paper - no-tick view distance
++    public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event
+ 
+     public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
+         super(worldserver, worldserver.getSpawn(), worldserver.v(), gameprofile);
+diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
++++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn {
          final IChatBaseComponent ichatbasecomponent = PaperAdventure.asVanilla(event.reason()); // Paper - Adventure
          // CraftBukkit end
@@ -48,10 +48,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          this.networkManager.sendPacket(new PacketPlayOutKickDisconnect(ichatbasecomponent), (future) -> {
              this.networkManager.close(ichatbasecomponent);
          });
-diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
+diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PlayerList.java
+--- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/PlayerList.java
++++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -0,0 +0,0 @@ public abstract class PlayerList {
              entityplayer.closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.DISCONNECT); // Paper
          }

Spigot-Server-Patches/Add-API-methods-to-control-if-armour-stands-can-move.patch

@@ -4,10 +4,10 @@ Date: Wed, 21 Dec 2016 11:47:25 -0600
 Subject: [PATCH] Add API methods to control if armour stands can move
 
 
-diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
+diff --git a/src/main/java/net/minecraft/world/entity/decoration/EntityArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/EntityArmorStand.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+--- a/src/main/java/net/minecraft/world/entity/decoration/EntityArmorStand.java
-+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
++++ b/src/main/java/net/minecraft/world/entity/decoration/EntityArmorStand.java
 @@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
      public Vector3f rightArmPose;
      public Vector3f leftLegPose;

Spigot-Server-Patches/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch

@@ -15,10 +15,10 @@ current defacto implementation, I've elected to deprecate (with no
 intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
-diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
+diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityPlayer.java
+--- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
++++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public int ping;
      public boolean viewingCredits;
@@ -26,11 +26,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    public long loginTime; // Paper
      // Paper start - cancellable death event
      public boolean queueHealthUpdatePacket = false;
-     public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket;
+     public net.minecraft.network.protocol.game.PacketPlayOutUpdateHealth queuedHealthUpdatePacket;
-diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
+diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PlayerList.java
+--- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/PlayerList.java
++++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -0,0 +0,0 @@ public abstract class PlayerList {
      }
  

Spigot-Server-Patches/Add-ArmorStand-Item-Meta.patch

@@ -286,14 +286,6 @@ diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-@@ -0,0 +0,0 @@ import java.util.ArrayList;
- import java.util.Arrays;
- import java.util.List;
- import java.util.UUID;
-+import com.destroystokyo.paper.inventory.meta.ArmorStandMeta; // Paper
- import net.minecraft.server.Block;
- import net.minecraft.server.IRegistry;
- import net.minecraft.server.ITileEntity;
 @@ -0,0 +0,0 @@ public class ItemMetaTest extends AbstractTestingBase {
                      final CraftMetaArmorStand meta = (CraftMetaArmorStand) cleanStack.getItemMeta();
                      meta.entityTag = new NBTTagCompound();

Spigot-Server-Patches/Add-BeaconEffectEvent.patch

@@ -4,11 +4,11 @@ Date: Wed, 2 Mar 2016 23:30:53 -0600
 Subject: [PATCH] Add BeaconEffectEvent
 
 
-diff --git a/src/main/java/net/minecraft/server/TileEntityBeacon.java b/src/main/java/net/minecraft/server/TileEntityBeacon.java
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/TileEntityBeacon.java b/src/main/java/net/minecraft/world/level/block/entity/TileEntityBeacon.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/TileEntityBeacon.java
+--- a/src/main/java/net/minecraft/world/level/block/entity/TileEntityBeacon.java
-+++ b/src/main/java/net/minecraft/server/TileEntityBeacon.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/TileEntityBeacon.java
-@@ -0,0 +0,0 @@ import javax.annotation.Nullable;
+@@ -0,0 +0,0 @@ import net.minecraft.world.phys.AxisAlignedBB;
  import org.bukkit.craftbukkit.potion.CraftPotionUtil;
  import org.bukkit.potion.PotionEffect;
  // CraftBukkit end

Spigot-Server-Patches/Add-BellRingEvent.patch

@@ -6,18 +6,18 @@ Subject: [PATCH] Add BellRingEvent
 Add a new event, BellRingEvent, to trigger whenever a player rings a
 village bell. Passes along the bell block and the player who rang it.
 
-diff --git a/src/main/java/net/minecraft/server/BlockBell.java b/src/main/java/net/minecraft/server/BlockBell.java
+diff --git a/src/main/java/net/minecraft/world/level/block/BlockBell.java b/src/main/java/net/minecraft/world/level/block/BlockBell.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/BlockBell.java
+--- a/src/main/java/net/minecraft/world/level/block/BlockBell.java
-+++ b/src/main/java/net/minecraft/server/BlockBell.java
++++ b/src/main/java/net/minecraft/world/level/block/BlockBell.java
 @@ -0,0 +0,0 @@
- package net.minecraft.server;
+ package net.minecraft.world.level.block;
  
 +import io.papermc.paper.event.block.BellRingEvent;
 +
  import javax.annotation.Nullable;
- 
+ import net.minecraft.core.BlockPosition;
- public class BlockBell extends BlockTileEntity {
+ import net.minecraft.core.EnumDirection;
 @@ -0,0 +0,0 @@ public class BlockBell extends BlockTileEntity {
          boolean flag1 = !flag || this.a(iblockdata, enumdirection, movingobjectpositionblock.getPos().y - (double) blockposition.getY());
  

Spigot-Server-Patches/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch

@@ -5,23 +5,10 @@ Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
 
 Add -Ddebug.entities=true to your JVM flags to gain more information
 
-diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
+diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/Entity.java
+--- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-+++ b/src/main/java/net/minecraft/server/Entity.java
++++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
-     public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
-     private CraftEntity bukkitEntity;
- 
-+    PlayerChunkMap.EntityTracker tracker; // Paper
-+    Throwable addedToWorldStack; // Paper - entity debug
-     public CraftEntity getBukkitEntity() {
-         if (bukkitEntity == null) {
-             bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
-diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
-+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -0,0 +0,0 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
              } else {
                  PlayerChunkMap.EntityTracker playerchunkmap_entitytracker = new PlayerChunkMap.EntityTracker(entity, i, j, entitytypes.isDeltaTracking());
@@ -39,22 +26,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      protected void g() {
-diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
+diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/World.java
+--- a/src/main/java/net/minecraft/server/level/WorldServer.java
-+++ b/src/main/java/net/minecraft/server/World.java
++++ b/src/main/java/net/minecraft/server/level/WorldServer.java
-@@ -0,0 +0,0 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
-     public boolean pvpMode;
-     public boolean keepSpawnInMemory = true;
-     public org.bukkit.generator.ChunkGenerator generator;
-+    public static final boolean DEBUG_ENTITIES = Boolean.getBoolean("debug.entities"); // Paper
- 
-     public boolean captureBlockStates = false;
-     public boolean captureTreeGeneration = false;
-diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/WorldServer.java
-+++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -0,0 +0,0 @@ public class WorldServer extends World implements GeneratorAccessSeed {
      public final Convertable.ConversionSession convertable;
      public final UUID uuid;
@@ -121,3 +96,28 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              this.getChunkProvider().addEntity(entity);
              // CraftBukkit start - SPIGOT-5278
              if (entity instanceof EntityDrowned) {
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+     public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
+     private CraftEntity bukkitEntity;
+ 
++    PlayerChunkMap.EntityTracker tracker; // Paper
++    Throwable addedToWorldStack; // Paper - entity debug
+     public CraftEntity getBukkitEntity() {
+         if (bukkitEntity == null) {
+             bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
+diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/level/World.java
++++ b/src/main/java/net/minecraft/world/level/World.java
+@@ -0,0 +0,0 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+     public boolean pvpMode;
+     public boolean keepSpawnInMemory = true;
+     public org.bukkit.generator.ChunkGenerator generator;
++    public static final boolean DEBUG_ENTITIES = Boolean.getBoolean("debug.entities"); // Paper
+ 
+     public boolean captureBlockStates = false;
+     public boolean captureTreeGeneration = false;

Spigot-Server-Patches/Add-Destroy-Speed-API.patch

@@ -16,7 +16,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +    @Override
 +    public float getDestroySpeed(ItemStack itemStack, boolean considerEnchants) {
-+        net.minecraft.server.ItemStack nmsItemStack;
++        net.minecraft.world.item.ItemStack nmsItemStack;
 +        if (itemStack instanceof CraftItemStack) {
 +            nmsItemStack = ((CraftItemStack) itemStack).getHandle();
 +        } else {
@@ -24,7 +24,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        }
 +        float speed = nmsItemStack.getItem().getDestroySpeed(nmsItemStack, this.getNMSBlock().getBlockData());
 +        if (speed > 1.0F && considerEnchants) {
-+            int enchantLevel = net.minecraft.server.EnchantmentManager.getEnchantmentLevel(net.minecraft.server.Enchantments.DIG_SPEED, nmsItemStack);
++            int enchantLevel = net.minecraft.world.item.enchantment.EnchantmentManager.getEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.DIG_SPEED, nmsItemStack);
 +            if (enchantLevel > 0) {
 +                speed += enchantLevel * enchantLevel + 1;
 +            }

Spigot-Server-Patches/Add-EntityLoadCrossbowEvent.patch

@@ -4,17 +4,15 @@ Date: Wed, 7 Oct 2020 12:04:01 -0400
 Subject: [PATCH] Add EntityLoadCrossbowEvent
 
 
-diff --git a/src/main/java/net/minecraft/server/ItemCrossbow.java b/src/main/java/net/minecraft/server/ItemCrossbow.java
+diff --git a/src/main/java/net/minecraft/world/item/ItemCrossbow.java b/src/main/java/net/minecraft/world/item/ItemCrossbow.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/ItemCrossbow.java
+--- a/src/main/java/net/minecraft/world/item/ItemCrossbow.java
-+++ b/src/main/java/net/minecraft/server/ItemCrossbow.java
++++ b/src/main/java/net/minecraft/world/item/ItemCrossbow.java
-@@ -0,0 +0,0 @@
+@@ -0,0 +0,0 @@ package net.minecraft.world.item;
- package net.minecraft.server;
- 
  import com.google.common.collect.Lists;
-+
+ import com.mojang.math.Quaternion;
-+import org.bukkit.inventory.EquipmentSlot;
+ import com.mojang.math.Vector3fa;
-+
++import org.bukkit.inventory.EquipmentSlot; // Paper
 +import io.papermc.paper.event.entity.EntityLoadCrossbowEvent; // Paper - EntityLoadCrossbowEvent namespace conflicts
  import java.util.List;
  import java.util.Random;

Spigot-Server-Patches/Add-EntityZapEvent.patch

@@ -4,10 +4,10 @@ Date: Sun, 16 Oct 2016 23:19:30 -0700
 Subject: [PATCH] Add EntityZapEvent
 
 
-diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
+diff --git a/src/main/java/net/minecraft/world/entity/animal/EntityPig.java b/src/main/java/net/minecraft/world/entity/animal/EntityPig.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityPig.java
+--- a/src/main/java/net/minecraft/world/entity/animal/EntityPig.java
-+++ b/src/main/java/net/minecraft/server/EntityPig.java
++++ b/src/main/java/net/minecraft/world/entity/animal/EntityPig.java
 @@ -0,0 +0,0 @@ public class EntityPig extends EntityAnimal implements ISteerable, ISaddleable {
              }
  
@@ -20,10 +20,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              // CraftBukkit start
              if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
                  return;
-diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
+diff --git a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityVillager.java
+--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
-+++ b/src/main/java/net/minecraft/server/EntityVillager.java
++++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
 @@ -0,0 +0,0 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
              EntityVillager.LOGGER.info("Villager {} was struck by lightning {}.", this, entitylightning);
              EntityWitch entitywitch = (EntityWitch) EntityTypes.WITCH.a((World) worldserver);

Spigot-Server-Patches/Add-Heightmap-API.patch

@@ -4,10 +4,10 @@ Date: Tue, 1 Jan 2019 02:22:01 -0800
 Subject: [PATCH] Add Heightmap API
 
 
-diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
+diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/World.java
+--- a/src/main/java/net/minecraft/world/level/World.java
-+++ b/src/main/java/net/minecraft/server/World.java
++++ b/src/main/java/net/minecraft/world/level/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          }
      }

Spigot-Server-Patches/Add-LivingEntity-getTargetEntity.patch

@@ -4,52 +4,11 @@ Date: Sat, 22 Sep 2018 00:33:08 -0500
 Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 
-diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public class AxisAlignedBB {
+@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
-         return this.b(vec3d.x, vec3d.y, vec3d.z);
-     }
- 
-+    public final AxisAlignedBB expand(double x, double y, double z) { return b(x, y, z); } // Paper - OBFHELPER
-     public AxisAlignedBB b(double d0, double d1, double d2) {
-         double d3 = this.minX;
-         double d4 = this.minY;
-@@ -0,0 +0,0 @@ public class AxisAlignedBB {
-         return new AxisAlignedBB(d3, d4, d5, d6, d7, d8);
-     }
- 
-+    // Paper start
-+    public AxisAlignedBB grow(double d0) {
-+        return grow(d0, d0, d0);
-+    }
-+    // Paper end
-+
-     public AxisAlignedBB grow(double d0, double d1, double d2) {
-         double d3 = this.minX - d0;
-         double d4 = this.minY - d1;
-@@ -0,0 +0,0 @@ public class AxisAlignedBB {
-         return this.minX < d3 && this.maxX > d0 && this.minY < d4 && this.maxY > d1 && this.minZ < d5 && this.maxZ > d2;
-     }
- 
-+    public final boolean contains(Vec3D vec3d) { return d(vec3d); } // Paper - OBFHELPER
-     public boolean d(Vec3D vec3d) {
-         return this.e(vec3d.x, vec3d.y, vec3d.z);
-     }
-@@ -0,0 +0,0 @@ public class AxisAlignedBB {
-         return this.g(-d0);
-     }
- 
-+    public final Optional<Vec3D> calculateIntercept(Vec3D vec3d, Vec3D vec3d1) { return b(vec3d, vec3d1); } // Paper - OBFHELPER
-     public Optional<Vec3D> b(Vec3D vec3d, Vec3D vec3d1) {
-         double[] adouble = new double[]{1.0D};
-         double d0 = vec3d1.x - vec3d.x;
-diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/Entity.java
-+++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.c(f - 90.0F, f1);
      }
  
@@ -57,7 +16,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public final Vec3D j(float f) {
          if (f == 1.0F) {
              return new Vec3D(this.locX(), this.getHeadY(), this.locZ());
-@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return this.getPassengers().size() < 1;
      }
  
@@ -65,10 +24,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public float bg() {
          return 0.0F;
      }
-diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
+diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityLiving.java
+--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
-+++ b/src/main/java/net/minecraft/server/EntityLiving.java
++++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
          return world.rayTrace(raytrace);
      }
@@ -107,10 +66,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public int shieldBlockingDelay = world.paperConfig.shieldBlockingDelay;
  
      public int getShieldBlockingDelay() {
-diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
+diff --git a/src/main/java/net/minecraft/world/entity/IEntitySelector.java b/src/main/java/net/minecraft/world/entity/IEntitySelector.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/IEntitySelector.java
+--- a/src/main/java/net/minecraft/world/entity/IEntitySelector.java
-+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
++++ b/src/main/java/net/minecraft/world/entity/IEntitySelector.java
 @@ -0,0 +0,0 @@ public final class IEntitySelector {
      public static final Predicate<Entity> e = (entity) -> {
          return !(entity instanceof EntityHuman) || !entity.isSpectator() && !((EntityHuman) entity).isCreative();
@@ -119,6 +78,47 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public static final Predicate<Entity> f = (entity) -> {
          return !(entity instanceof EntityHuman) || !entity.isSpectator() && !((EntityHuman) entity).isCreative() && entity.world.getDifficulty() != EnumDifficulty.PEACEFUL;
      };
+diff --git a/src/main/java/net/minecraft/world/phys/AxisAlignedBB.java b/src/main/java/net/minecraft/world/phys/AxisAlignedBB.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/phys/AxisAlignedBB.java
++++ b/src/main/java/net/minecraft/world/phys/AxisAlignedBB.java
+@@ -0,0 +0,0 @@ public class AxisAlignedBB {
+         return this.b(vec3d.x, vec3d.y, vec3d.z);
+     }
+ 
++    public final AxisAlignedBB expand(double x, double y, double z) { return b(x, y, z); } // Paper - OBFHELPER
+     public AxisAlignedBB b(double d0, double d1, double d2) {
+         double d3 = this.minX;
+         double d4 = this.minY;
+@@ -0,0 +0,0 @@ public class AxisAlignedBB {
+         return new AxisAlignedBB(d3, d4, d5, d6, d7, d8);
+     }
+ 
++    // Paper start
++    public AxisAlignedBB grow(double d0) {
++        return grow(d0, d0, d0);
++    }
++    // Paper end
++
+     public AxisAlignedBB grow(double d0, double d1, double d2) {
+         double d3 = this.minX - d0;
+         double d4 = this.minY - d1;
+@@ -0,0 +0,0 @@ public class AxisAlignedBB {
+         return this.minX < d3 && this.maxX > d0 && this.minY < d4 && this.maxY > d1 && this.minZ < d5 && this.maxZ > d2;
+     }
+ 
++    public final boolean contains(Vec3D vec3d) { return d(vec3d); } // Paper - OBFHELPER
+     public boolean d(Vec3D vec3d) {
+         return this.e(vec3d.x, vec3d.y, vec3d.z);
+     }
+@@ -0,0 +0,0 @@ public class AxisAlignedBB {
+         return this.g(-d0);
+     }
+ 
++    public final Optional<Vec3D> calculateIntercept(Vec3D vec3d, Vec3D vec3d1) { return b(vec3d, vec3d1); } // Paper - OBFHELPER
+     public Optional<Vec3D> b(Vec3D vec3d, Vec3D vec3d1) {
+         double[] adouble = new double[]{1.0D};
+         double d0 = vec3d1.x - vec3d.x;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java

Spigot-Server-Patches/Add-MinecraftKey-Information-to-Objects.patch

@@ -18,16 +18,33 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
                      MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                      ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.chunkX, e.chunkZ);
-diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
+diff --git a/src/main/java/net/minecraft/server/KeyedObject.java b/src/main/java/net/minecraft/server/KeyedObject.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
+--- /dev/null
++++ b/src/main/java/net/minecraft/server/KeyedObject.java
+@@ -0,0 +0,0 @@
++package net.minecraft.server;
++
++import net.minecraft.resources.MinecraftKey;
++
++public interface KeyedObject {
++    MinecraftKey getMinecraftKey();
++    default String getMinecraftKeyString() {
++        MinecraftKey key = getMinecraftKey();
++        return key != null ? key.toString() : null;
++    }
++}
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/Entity.java
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/server/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -0,0 +0,0 @@ import org.bukkit.event.player.PlayerTeleportEvent;
  import org.bukkit.plugin.PluginManager;
  // CraftBukkit end
  
 -public abstract class Entity implements INamableTileEntity, ICommandListener {
-+public abstract class Entity implements INamableTileEntity, ICommandListener, KeyedObject { // Paper
++public abstract class Entity implements INamableTileEntity, ICommandListener, net.minecraft.server.KeyedObject { // Paper
  
      // CraftBukkit start
      private static final int CURRENT_LEVEL = 2;
@@ -64,10 +81,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      protected abstract void loadData(NBTTagCompound nbttagcompound);
-diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
+diff --git a/src/main/java/net/minecraft/world/entity/EntityTypes.java b/src/main/java/net/minecraft/world/entity/EntityTypes.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityTypes.java
+--- a/src/main/java/net/minecraft/world/entity/EntityTypes.java
-+++ b/src/main/java/net/minecraft/server/EntityTypes.java
++++ b/src/main/java/net/minecraft/world/entity/EntityTypes.java
 @@ -0,0 +0,0 @@ public class EntityTypes<T extends Entity> {
          }
      }
@@ -76,31 +93,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public boolean a() {
          return this.bi;
      }
-diff --git a/src/main/java/net/minecraft/server/KeyedObject.java b/src/main/java/net/minecraft/server/KeyedObject.java
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
---- /dev/null
-+++ b/src/main/java/net/minecraft/server/KeyedObject.java
-@@ -0,0 +0,0 @@
-+package net.minecraft.server;
-+
-+public interface KeyedObject {
-+    MinecraftKey getMinecraftKey();
-+    default String getMinecraftKeyString() {
-+        MinecraftKey key = getMinecraftKey();
-+        return key != null ? key.toString() : null;
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/TileEntity.java
+--- a/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
-+++ b/src/main/java/net/minecraft/server/TileEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
 @@ -0,0 +0,0 @@ import org.bukkit.inventory.InventoryHolder;
  
  import org.spigotmc.CustomTimingsHandler; // Spigot
  
 -public abstract class TileEntity {
-+public abstract class TileEntity implements KeyedObject { // Paper
++public abstract class TileEntity implements net.minecraft.server.KeyedObject { // Paper
  
      public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getTileEntityTimings(this); // Spigot
      // CraftBukkit start - data containers

Spigot-Server-Patches/Add-More-Creeper-API.patch

@@ -4,10 +4,10 @@ Date: Fri, 24 Aug 2018 11:50:26 -0500
 Subject: [PATCH] Add More Creeper API
 
 
-diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
+diff --git a/src/main/java/net/minecraft/world/entity/monster/EntityCreeper.java b/src/main/java/net/minecraft/world/entity/monster/EntityCreeper.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityCreeper.java
+--- a/src/main/java/net/minecraft/world/entity/monster/EntityCreeper.java
-+++ b/src/main/java/net/minecraft/server/EntityCreeper.java
++++ b/src/main/java/net/minecraft/world/entity/monster/EntityCreeper.java
 @@ -0,0 +0,0 @@ public class EntityCreeper extends EntityMonster {
      private static final DataWatcherObject<Boolean> POWERED = DataWatcher.a(EntityCreeper.class, DataWatcherRegistry.i);
      private static final DataWatcherObject<Boolean> d = DataWatcher.a(EntityCreeper.class, DataWatcherRegistry.i); private static final DataWatcherObject<Boolean> isIgnitedDW = d; // Paper OBFHELPER

Spigot-Server-Patches/Add-PhantomPreSpawnEvent.patch

@@ -4,10 +4,10 @@ Date: Sat, 25 Aug 2018 19:56:51 -0500
 Subject: [PATCH] Add PhantomPreSpawnEvent
 
 
-diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
+diff --git a/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java b/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityPhantom.java
+--- a/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
-+++ b/src/main/java/net/minecraft/server/EntityPhantom.java
++++ b/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
 @@ -0,0 +0,0 @@ public class EntityPhantom extends EntityFlying implements IMonster {
          }
  
@@ -47,10 +47,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      class b extends PathfinderGoal {
  
          private final PathfinderTargetCondition b;
-diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
+diff --git a/src/main/java/net/minecraft/world/level/levelgen/MobSpawnerPhantom.java b/src/main/java/net/minecraft/world/level/levelgen/MobSpawnerPhantom.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
+--- a/src/main/java/net/minecraft/world/level/levelgen/MobSpawnerPhantom.java
-+++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
++++ b/src/main/java/net/minecraft/world/level/levelgen/MobSpawnerPhantom.java
 @@ -0,0 +0,0 @@ public class MobSpawnerPhantom implements MobSpawner {
                                              int k = 1 + random.nextInt(difficultydamagescaler.a().a() + 1);
  

Spigot-Server-Patches/Add-PlayerArmorChangeEvent.patch

@@ -4,12 +4,12 @@ Date: Fri, 10 Nov 2017 23:46:34 -0500
 Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
-diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
+diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityLiving.java
+--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
-+++ b/src/main/java/net/minecraft/server/EntityLiving.java
++++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -0,0 +0,0 @@
- package net.minecraft.server;
+ package net.minecraft.world.entity;
  
 +import com.destroystokyo.paper.event.player.PlayerArmorChangeEvent; // Paper
  import com.google.common.base.Objects;
@@ -29,10 +29,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  if (map == null) {
                      map = Maps.newEnumMap(EnumItemSlot.class);
                  }
-diff --git a/src/main/java/net/minecraft/server/EnumItemSlot.java b/src/main/java/net/minecraft/server/EnumItemSlot.java
+diff --git a/src/main/java/net/minecraft/world/entity/EnumItemSlot.java b/src/main/java/net/minecraft/world/entity/EnumItemSlot.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EnumItemSlot.java
+--- a/src/main/java/net/minecraft/world/entity/EnumItemSlot.java
-+++ b/src/main/java/net/minecraft/server/EnumItemSlot.java
++++ b/src/main/java/net/minecraft/world/entity/EnumItemSlot.java
 @@ -0,0 +0,0 @@ public enum EnumItemSlot {
          this.j = s;
      }

Spigot-Server-Patches/Add-PlayerAttackEntityCooldownResetEvent.patch

@@ -4,10 +4,10 @@ Date: Thu, 26 Mar 2020 19:44:50 -0700
 Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent
 
 
-diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
+diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityLiving.java
+--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
-+++ b/src/main/java/net/minecraft/server/EntityLiving.java
++++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
  
              EntityDamageEvent event = CraftEventFactory.handleLivingEntityDamageEvent(this, damagesource, originalDamage, hardHatModifier, blockingModifier, armorModifier, resistanceModifier, magicModifier, absorptionModifier, hardHat, blocking, armor, resistance, magic, absorption);

Spigot-Server-Patches/Add-PlayerConnectionCloseEvent.patch

@@ -33,26 +33,10 @@ API spec for this event. Plugins should not be using that event, and
 how PlayerPreLoginEvent interacts with PlayerConnectionCloseEvent
 is undefined.
 
-diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
+diff --git a/src/main/java/net/minecraft/network/NetworkManager.java b/src/main/java/net/minecraft/network/NetworkManager.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/LoginListener.java
+--- a/src/main/java/net/minecraft/network/NetworkManager.java
-+++ b/src/main/java/net/minecraft/server/LoginListener.java
++++ b/src/main/java/net/minecraft/network/NetworkManager.java
-@@ -0,0 +0,0 @@ public class LoginListener implements PacketLoginInListener {
-     private final byte[] e = new byte[4];
-     private final MinecraftServer server;
-     public final NetworkManager networkManager;
--    private LoginListener.EnumProtocolState g;
-+    private LoginListener.EnumProtocolState g; public final LoginListener.EnumProtocolState getLoginState() { return this.g; }; // Paper - OBFHELPER
-     private int h;
--    private GameProfile i; private void setGameProfile(final GameProfile profile) { this.i = profile; } private GameProfile getGameProfile() { return this.i; } // Paper - OBFHELPER
-+    private GameProfile i; private void setGameProfile(final GameProfile profile) { this.i = profile; } public GameProfile getGameProfile() { return this.i; } // Paper - OBFHELPER
-     private final String j;
-     private SecretKey loginKey;
-     private EntityPlayer l;
-diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/NetworkManager.java
-+++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -0,0 +0,0 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
                      this.j().a(new ChatMessage("multiplayer.disconnect.generic"));
                  }
@@ -80,3 +64,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              }
  
          }
+diff --git a/src/main/java/net/minecraft/server/network/LoginListener.java b/src/main/java/net/minecraft/server/network/LoginListener.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/network/LoginListener.java
++++ b/src/main/java/net/minecraft/server/network/LoginListener.java
+@@ -0,0 +0,0 @@ public class LoginListener implements PacketLoginInListener {
+     private final byte[] e = new byte[4];
+     private final MinecraftServer server;
+     public final NetworkManager networkManager;
+-    private LoginListener.EnumProtocolState g;
++    private LoginListener.EnumProtocolState g; public final LoginListener.EnumProtocolState getLoginState() { return this.g; }; // Paper - OBFHELPER
+     private int h;
+-    private GameProfile i; private void setGameProfile(final GameProfile profile) { this.i = profile; } private GameProfile getGameProfile() { return this.i; } // Paper - OBFHELPER
++    private GameProfile i; private void setGameProfile(final GameProfile profile) { this.i = profile; } public GameProfile getGameProfile() { return this.i; } // Paper - OBFHELPER
+     private final String j;
+     private SecretKey loginKey;
+     private EntityPlayer l;

Spigot-Server-Patches/Add-PlayerInitialSpawnEvent.patch

@@ -8,10 +8,10 @@ For modifying a player's initial spawn location as they join the server
 This is a duplicate API from spigot, so use our duplicate subclass and
 improve setPosition to use raw
 
-diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
+diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PlayerList.java
+--- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/PlayerList.java
++++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -0,0 +0,0 @@ public abstract class PlayerList {
  
          // Spigot start - spawn location event
@@ -25,8 +25,24 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
          entityplayer.spawnIn(worldserver1);
          entityplayer.playerInteractManager.a((WorldServer) entityplayer.world);
--        entityplayer.setPosition(loc.getX(), loc.getY(), loc.getZ());
+-        entityplayer.setLocation(loc.getX(), loc.getY(), loc.getZ(), loc.getYaw(), loc.getPitch());
-+        entityplayer.setPositionRaw(loc.getX(), loc.getY(), loc.getZ()); // Paper - set raw so we aren't fully joined to the world (not added to chunk or world)
++        // Paper start - set raw so we aren't fully joined to the world (not added to chunk or world)
-         entityplayer.setYawPitch(loc.getYaw(), loc.getPitch());
++        entityplayer.setPositionRaw(loc.getX(), loc.getY(), loc.getZ());
++        entityplayer.setYawPitch(loc.getYaw(), loc.getPitch());
++        // Paper end
          // Spigot end
  
+         // CraftBukkit - Moved message to after join
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+         return d1 * d1 + d2 * d2 + d3 * d3 < d0 * d0;
+     }
+ 
+-    protected void setYawPitch(float f, float f1) {
++    public void setYawPitch(float f, float f1) { // Paper - protected -> public
+         // CraftBukkit start - yaw was sometimes set to NaN, so we need to set it back to 0
+         if (Float.isNaN(f)) {
+             f = 0;

Spigot-Server-Patches/Add-PlayerItemCooldownEvent.patch

@@ -4,12 +4,13 @@ Date: Tue, 25 Aug 2020 13:48:33 +0200
 Subject: [PATCH] Add PlayerItemCooldownEvent
 
 
-diff --git a/src/main/java/net/minecraft/server/ItemCooldownPlayer.java b/src/main/java/net/minecraft/server/ItemCooldownPlayer.java
+diff --git a/src/main/java/net/minecraft/world/item/ItemCooldownPlayer.java b/src/main/java/net/minecraft/world/item/ItemCooldownPlayer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/ItemCooldownPlayer.java
+--- a/src/main/java/net/minecraft/world/item/ItemCooldownPlayer.java
-+++ b/src/main/java/net/minecraft/server/ItemCooldownPlayer.java
++++ b/src/main/java/net/minecraft/world/item/ItemCooldownPlayer.java
-@@ -0,0 +0,0 @@
+@@ -0,0 +0,0 @@ package net.minecraft.world.item;
- package net.minecraft.server;
+ import net.minecraft.network.protocol.game.PacketPlayOutSetCooldown;
+ import net.minecraft.server.level.EntityPlayer;
  
 +import io.papermc.paper.event.player.PlayerItemCooldownEvent; // Paper
 +

Spigot-Server-Patches/Add-PlayerJumpEvent.patch

@@ -4,10 +4,10 @@ Date: Thu, 28 Sep 2017 17:21:44 -0400
 Subject: [PATCH] Add PlayerJumpEvent
 
 
-diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
+diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PlayerConnection.java
+--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
++++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn {
                              boolean flag = d8 > 0.0D;
  

Spigot-Server-Patches/Add-PlayerShearBlockEvent.patch

@@ -4,10 +4,10 @@ Date: Thu, 27 Aug 2020 15:02:48 -0400
 Subject: [PATCH] Add PlayerShearBlockEvent
 
 
-diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
+diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/Block.java
+--- a/src/main/java/net/minecraft/world/level/block/Block.java
-+++ b/src/main/java/net/minecraft/server/Block.java
++++ b/src/main/java/net/minecraft/world/level/block/Block.java
 @@ -0,0 +0,0 @@ public class Block extends BlockBase implements IMaterial {
  
      }
@@ -17,12 +17,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          if (!world.isClientSide && !itemstack.isEmpty() && world.getGameRules().getBoolean(GameRules.DO_TILE_DROPS)) {
              float f = 0.5F;
              double d0 = (double) (world.random.nextFloat() * 0.5F) + 0.25D;
-diff --git a/src/main/java/net/minecraft/server/BlockBeehive.java b/src/main/java/net/minecraft/server/BlockBeehive.java
+diff --git a/src/main/java/net/minecraft/world/level/block/BlockBeehive.java b/src/main/java/net/minecraft/world/level/block/BlockBeehive.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/BlockBeehive.java
+--- a/src/main/java/net/minecraft/world/level/block/BlockBeehive.java
-+++ b/src/main/java/net/minecraft/server/BlockBeehive.java
++++ b/src/main/java/net/minecraft/world/level/block/BlockBeehive.java
 @@ -0,0 +0,0 @@
- package net.minecraft.server;
+ package net.minecraft.world.level.block;
  
 +import io.papermc.paper.event.block.PlayerShearBlockEvent; // Paper - PlayerShearBlockEvent namespace conflicts
 +
@@ -50,12 +50,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  itemstack.damage(1, entityhuman, (entityhuman1) -> {
                      entityhuman1.broadcastItemBreak(enumhand);
                  });
-diff --git a/src/main/java/net/minecraft/server/BlockPumpkin.java b/src/main/java/net/minecraft/server/BlockPumpkin.java
+diff --git a/src/main/java/net/minecraft/world/level/block/BlockPumpkin.java b/src/main/java/net/minecraft/world/level/block/BlockPumpkin.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/BlockPumpkin.java
+--- a/src/main/java/net/minecraft/world/level/block/BlockPumpkin.java
-+++ b/src/main/java/net/minecraft/server/BlockPumpkin.java
++++ b/src/main/java/net/minecraft/world/level/block/BlockPumpkin.java
-@@ -0,0 +0,0 @@
+@@ -0,0 +0,0 @@ import net.minecraft.world.level.block.state.BlockBase;
- package net.minecraft.server;
+ import net.minecraft.world.level.block.state.IBlockData;
+ import net.minecraft.world.phys.MovingObjectPositionBlock;
  
 +import io.papermc.paper.event.block.PlayerShearBlockEvent; // Paper - PlayerShearBlockEvent namespace conflicts
 +

Spigot-Server-Patches/Add-PlayerUseUnknownEntityEvent.patch

@@ -4,11 +4,11 @@ Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
 
 
-diff --git a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
+diff --git a/src/main/java/net/minecraft/network/protocol/game/PacketPlayInUseEntity.java b/src/main/java/net/minecraft/network/protocol/game/PacketPlayInUseEntity.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
+--- a/src/main/java/net/minecraft/network/protocol/game/PacketPlayInUseEntity.java
-+++ b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
++++ b/src/main/java/net/minecraft/network/protocol/game/PacketPlayInUseEntity.java
-@@ -0,0 +0,0 @@ import javax.annotation.Nullable;
+@@ -0,0 +0,0 @@ import net.minecraft.world.phys.Vec3D;
  
  public class PacketPlayInUseEntity implements Packet<PacketListenerPlayIn> {
  
@@ -17,10 +17,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private PacketPlayInUseEntity.EnumEntityUseAction action;
      private Vec3D c;
      private EnumHand d;
-diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
+diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PlayerConnection.java
+--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
++++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn {
                  }
              }

Spigot-Server-Patches/Add-Plugin-Tickets-to-API-Chunk-Methods.patch

@@ -60,17 +60,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        }
 +        return chunk.bukkitChunk;
 +        // Paper end
-     }
++    }
- 
++
 +    // Paper start
 +    private void addTicket(int x, int z) {
 +        MCUtil.MAIN_EXECUTOR.execute(() -> world.getChunkProvider().addTicket(TicketType.PLUGIN, new ChunkCoordIntPair(x, z), 0, Unit.INSTANCE)); // Paper
-+    }
+     }
 +    // Paper end
-+
+ 
      @Override
      public Chunk getChunkAt(Block block) {
-         Preconditions.checkArgument(block != null, "null block");
 @@ -0,0 +0,0 @@ public class CraftWorld implements World {
      public boolean unloadChunkRequest(int x, int z) {
          org.spigotmc.AsyncCatcher.catchOp("chunk unload"); // Spigot
@@ -88,14 +87,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        if (immediate != null) return true; // Paper
  
          if (!generate) {
- 
 -            IChunkAccess immediate = world.getChunkProvider().getChunkAtImmediately(x, z);
++
 +            //IChunkAccess immediate = world.getChunkProvider().getChunkAtImmediately(x, z); // Paper
              if (immediate == null) {
                  immediate = world.getChunkProvider().playerChunkMap.getUnloadingChunk(x, z);
              }
 @@ -0,0 +0,0 @@ public class CraftWorld implements World {
-                 if (!(immediate instanceof ProtoChunkExtension) && !(immediate instanceof net.minecraft.server.Chunk)) {
+                 if (!(immediate instanceof ProtoChunkExtension) && !(immediate instanceof net.minecraft.world.level.chunk.Chunk)) {
                      return false; // not full status
                  }
 -                world.getChunkProvider().addTicket(TicketType.PLUGIN, chunkPos, 1, Unit.INSTANCE);
@@ -115,8 +114,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ public class CraftWorld implements World {
          }
          return this.world.getChunkProvider().getChunkAtAsynchronously(x, z, gen, urgent).thenComposeAsync((either) -> {
-             net.minecraft.server.Chunk chunk = (net.minecraft.server.Chunk) either.left().orElse(null);
+             net.minecraft.world.level.chunk.Chunk chunk = (net.minecraft.world.level.chunk.Chunk) either.left().orElse(null);
 +            if (chunk != null) addTicket(x, z); // Paper
              return CompletableFuture.completedFuture(chunk == null ? null : chunk.getBukkitChunk());
-         }, MinecraftServer.getServer());
+         }, net.minecraft.server.MinecraftServer.getServer());
      }

Spigot-Server-Patches/Add-PrepareResultEvent.patch

@@ -7,10 +7,10 @@ Adds a new event for all crafting stations that generate a result slot item
 
 Anvil, Grindstone and Smithing now extend this event
 
-diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java
+diff --git a/src/main/java/net/minecraft/world/inventory/Container.java b/src/main/java/net/minecraft/world/inventory/Container.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/Container.java
+--- a/src/main/java/net/minecraft/world/inventory/Container.java
-+++ b/src/main/java/net/minecraft/server/Container.java
++++ b/src/main/java/net/minecraft/world/inventory/Container.java
 @@ -0,0 +0,0 @@ public abstract class Container {
          return nonnulllist;
      }
@@ -19,10 +19,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public void c() {
          int i;
  
-diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
+diff --git a/src/main/java/net/minecraft/world/inventory/ContainerAnvil.java b/src/main/java/net/minecraft/world/inventory/ContainerAnvil.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/ContainerAnvil.java
+--- a/src/main/java/net/minecraft/world/inventory/ContainerAnvil.java
-+++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
++++ b/src/main/java/net/minecraft/world/inventory/ContainerAnvil.java
 @@ -0,0 +0,0 @@ public class ContainerAnvil extends ContainerAnvilAbstract {
          }
  
@@ -31,10 +31,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      // CraftBukkit start
-diff --git a/src/main/java/net/minecraft/server/ContainerAnvilAbstract.java b/src/main/java/net/minecraft/server/ContainerAnvilAbstract.java
+diff --git a/src/main/java/net/minecraft/world/inventory/ContainerAnvilAbstract.java b/src/main/java/net/minecraft/world/inventory/ContainerAnvilAbstract.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/ContainerAnvilAbstract.java
+--- a/src/main/java/net/minecraft/world/inventory/ContainerAnvilAbstract.java
-+++ b/src/main/java/net/minecraft/server/ContainerAnvilAbstract.java
++++ b/src/main/java/net/minecraft/world/inventory/ContainerAnvilAbstract.java
 @@ -0,0 +0,0 @@ public abstract class ContainerAnvilAbstract extends Container {
          super.a(iinventory);
          if (iinventory == this.repairInventory) {
@@ -43,10 +43,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          }
  
      }
-diff --git a/src/main/java/net/minecraft/server/ContainerCartography.java b/src/main/java/net/minecraft/server/ContainerCartography.java
+diff --git a/src/main/java/net/minecraft/world/inventory/ContainerCartography.java b/src/main/java/net/minecraft/world/inventory/ContainerCartography.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/ContainerCartography.java
+--- a/src/main/java/net/minecraft/world/inventory/ContainerCartography.java
-+++ b/src/main/java/net/minecraft/server/ContainerCartography.java
++++ b/src/main/java/net/minecraft/world/inventory/ContainerCartography.java
 @@ -0,0 +0,0 @@ public class ContainerCartography extends Container {
              this.a(itemstack, itemstack1, itemstack2);
          }
@@ -55,10 +55,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      private void a(ItemStack itemstack, ItemStack itemstack1, ItemStack itemstack2) {
-diff --git a/src/main/java/net/minecraft/server/ContainerGrindstone.java b/src/main/java/net/minecraft/server/ContainerGrindstone.java
+diff --git a/src/main/java/net/minecraft/world/inventory/ContainerGrindstone.java b/src/main/java/net/minecraft/world/inventory/ContainerGrindstone.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/ContainerGrindstone.java
+--- a/src/main/java/net/minecraft/world/inventory/ContainerGrindstone.java
-+++ b/src/main/java/net/minecraft/server/ContainerGrindstone.java
++++ b/src/main/java/net/minecraft/world/inventory/ContainerGrindstone.java
 @@ -0,0 +0,0 @@ public class ContainerGrindstone extends Container {
          super.a(iinventory);
          if (iinventory == this.craftInventory) {
@@ -67,10 +67,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          }
  
      }
-diff --git a/src/main/java/net/minecraft/server/ContainerLoom.java b/src/main/java/net/minecraft/server/ContainerLoom.java
+diff --git a/src/main/java/net/minecraft/world/inventory/ContainerLoom.java b/src/main/java/net/minecraft/world/inventory/ContainerLoom.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/ContainerLoom.java
+--- a/src/main/java/net/minecraft/world/inventory/ContainerLoom.java
-+++ b/src/main/java/net/minecraft/server/ContainerLoom.java
++++ b/src/main/java/net/minecraft/world/inventory/ContainerLoom.java
 @@ -0,0 +0,0 @@ public class ContainerLoom extends Container {
          }
  
@@ -81,10 +81,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      @Override
-diff --git a/src/main/java/net/minecraft/server/ContainerSmithing.java b/src/main/java/net/minecraft/server/ContainerSmithing.java
+diff --git a/src/main/java/net/minecraft/world/inventory/ContainerSmithing.java b/src/main/java/net/minecraft/world/inventory/ContainerSmithing.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/ContainerSmithing.java
+--- a/src/main/java/net/minecraft/world/inventory/ContainerSmithing.java
-+++ b/src/main/java/net/minecraft/server/ContainerSmithing.java
++++ b/src/main/java/net/minecraft/world/inventory/ContainerSmithing.java
 @@ -0,0 +0,0 @@ public class ContainerSmithing extends ContainerAnvilAbstract {
              org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareSmithingEvent(getBukkitView(), itemstack); // CraftBukkit
          }
@@ -93,10 +93,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      @Override
-diff --git a/src/main/java/net/minecraft/server/ContainerStonecutter.java b/src/main/java/net/minecraft/server/ContainerStonecutter.java
+diff --git a/src/main/java/net/minecraft/world/inventory/ContainerStonecutter.java b/src/main/java/net/minecraft/world/inventory/ContainerStonecutter.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/ContainerStonecutter.java
+--- a/src/main/java/net/minecraft/world/inventory/ContainerStonecutter.java
-+++ b/src/main/java/net/minecraft/server/ContainerStonecutter.java
++++ b/src/main/java/net/minecraft/world/inventory/ContainerStonecutter.java
 @@ -0,0 +0,0 @@ public class ContainerStonecutter extends Container {
              this.a(iinventory, itemstack);
          }

Spigot-Server-Patches/Add-ProjectileCollideEvent.patch

@@ -4,10 +4,10 @@ Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent
 
 
-diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
+diff --git a/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java b/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityArrow.java
+--- a/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java
-+++ b/src/main/java/net/minecraft/server/EntityArrow.java
++++ b/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java
 @@ -0,0 +0,0 @@ public abstract class EntityArrow extends IProjectile {
                      }
                  }
@@ -26,10 +26,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  if (object != null && !flag) {
                      this.a((MovingObjectPosition) object);
                      this.impulse = true;
-diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java
+diff --git a/src/main/java/net/minecraft/world/entity/projectile/EntityFireball.java b/src/main/java/net/minecraft/world/entity/projectile/EntityFireball.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityFireball.java
+--- a/src/main/java/net/minecraft/world/entity/projectile/EntityFireball.java
-+++ b/src/main/java/net/minecraft/server/EntityFireball.java
++++ b/src/main/java/net/minecraft/world/entity/projectile/EntityFireball.java
 @@ -0,0 +0,0 @@ public abstract class EntityFireball extends IProjectile {
  
              MovingObjectPosition movingobjectposition = ProjectileHelper.a((Entity) this, this::a);
@@ -48,10 +48,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  this.a(movingobjectposition);
  
                  // CraftBukkit start - Fire ProjectileHitEvent
-diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
+diff --git a/src/main/java/net/minecraft/world/entity/projectile/EntityProjectile.java b/src/main/java/net/minecraft/world/entity/projectile/EntityProjectile.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityProjectile.java
+--- a/src/main/java/net/minecraft/world/entity/projectile/EntityProjectile.java
-+++ b/src/main/java/net/minecraft/server/EntityProjectile.java
++++ b/src/main/java/net/minecraft/world/entity/projectile/EntityProjectile.java
 @@ -0,0 +0,0 @@ public abstract class EntityProjectile extends IProjectile {
          }
  

Spigot-Server-Patches/Add-Raw-Byte-ItemStack-Serialization.patch

@@ -5,34 +5,10 @@ Subject: [PATCH] Add Raw Byte ItemStack Serialization
 
 Serializes using NBT which is safer for server data migrations than bukkits format.
 
-diff --git a/src/main/java/net/minecraft/server/DataConverterRegistry.java b/src/main/java/net/minecraft/server/DataConverterRegistry.java
+diff --git a/src/main/java/net/minecraft/nbt/NBTCompressedStreamTools.java b/src/main/java/net/minecraft/nbt/NBTCompressedStreamTools.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/DataConverterRegistry.java
+--- a/src/main/java/net/minecraft/nbt/NBTCompressedStreamTools.java
-+++ b/src/main/java/net/minecraft/server/DataConverterRegistry.java
++++ b/src/main/java/net/minecraft/nbt/NBTCompressedStreamTools.java
-@@ -0,0 +0,0 @@ public class DataConverterRegistry {
-         return datafixerbuilder.build(SystemUtils.e());
-     }
- 
-+    public static DataFixer getDataFixer() { return a(); } // Paper - OBFHELPER
-     public static DataFixer a() {
-         return DataConverterRegistry.c;
-     }
-diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/ItemStack.java
-+++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -0,0 +0,0 @@ public final class ItemStack {
-         this.checkEmpty();
-     }
- 
-+    public static ItemStack fromCompound(NBTTagCompound nbttagcompound) { return a(nbttagcompound); } // Paper - OBFHELPER
-     public static ItemStack a(NBTTagCompound nbttagcompound) {
-         try {
-             return new ItemStack(nbttagcompound);
-diff --git a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
-+++ b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
 @@ -0,0 +0,0 @@ public class NBTCompressedStreamTools {
          return nbttagcompound;
      }
@@ -49,6 +25,30 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public static void a(NBTTagCompound nbttagcompound, OutputStream outputstream) throws IOException {
          DataOutputStream dataoutputstream = new DataOutputStream(new BufferedOutputStream(new GZIPOutputStream(outputstream)));
          Throwable throwable = null;
+diff --git a/src/main/java/net/minecraft/util/datafix/DataConverterRegistry.java b/src/main/java/net/minecraft/util/datafix/DataConverterRegistry.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/util/datafix/DataConverterRegistry.java
++++ b/src/main/java/net/minecraft/util/datafix/DataConverterRegistry.java
+@@ -0,0 +0,0 @@ public class DataConverterRegistry {
+         return datafixerbuilder.build(SystemUtils.e());
+     }
+ 
++    public static DataFixer getDataFixer() { return a(); } // Paper - OBFHELPER
+     public static DataFixer a() {
+         return DataConverterRegistry.c;
+     }
+diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/item/ItemStack.java
++++ b/src/main/java/net/minecraft/world/item/ItemStack.java
+@@ -0,0 +0,0 @@ public final class ItemStack {
+         this.checkEmpty();
+     }
+ 
++    public static ItemStack fromCompound(NBTTagCompound nbttagcompound) { return a(nbttagcompound); } // Paper - OBFHELPER
+     public static ItemStack a(NBTTagCompound nbttagcompound) {
+         try {
+             return new ItemStack(nbttagcompound);
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -67,7 +67,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        NBTTagCompound compound = (item instanceof CraftItemStack ? ((CraftItemStack) item).getHandle() : CraftItemStack.asNMSCopy(item)).save(new NBTTagCompound());
 +        compound.setInt("DataVersion", getDataVersion());
 +        try {
-+            net.minecraft.server.NBTCompressedStreamTools.writeNBT(
++            net.minecraft.nbt.NBTCompressedStreamTools.writeNBT(
 +                compound,
 +                outputStream
 +            );
@@ -84,14 +84,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        Preconditions.checkArgument(data.length > 0, "cannot deserialize nothing");
 +
 +        try {
-+            NBTTagCompound compound = net.minecraft.server.NBTCompressedStreamTools.readNBT(
++            NBTTagCompound compound = net.minecraft.nbt.NBTCompressedStreamTools.readNBT(
 +                new java.io.ByteArrayInputStream(data)
 +            );
 +            int dataVersion = compound.getInt("DataVersion");
 +
 +            Preconditions.checkArgument(dataVersion <= getDataVersion(), "Newer version! Server downgrades are not supported!");
 +            Dynamic<NBTBase> converted = DataConverterRegistry.getDataFixer().update(DataConverterTypes.ITEM_STACK, new Dynamic<NBTBase>(DynamicOpsNBT.a, compound), dataVersion, getDataVersion());
-+            return CraftItemStack.asCraftMirror(net.minecraft.server.ItemStack.fromCompound((NBTTagCompound) converted.getValue()));
++            return CraftItemStack.asCraftMirror(net.minecraft.world.item.ItemStack.fromCompound((NBTTagCompound) converted.getValue()));
 +        } catch (IOException ex) {
 +            com.destroystokyo.paper.util.SneakyThrow.sneaky(ex);
 +            throw new RuntimeException();

Spigot-Server-Patches/Add-StructureLocateEvent.patch

@@ -4,11 +4,11 @@ Date: Wed, 16 Sep 2020 01:12:29 -0700
 Subject: [PATCH] Add StructureLocateEvent
 
 
-diff --git a/src/main/java/net/minecraft/server/ChunkGenerator.java b/src/main/java/net/minecraft/server/ChunkGenerator.java
+diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/ChunkGenerator.java
+--- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-+++ b/src/main/java/net/minecraft/server/ChunkGenerator.java
++++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-@@ -0,0 +0,0 @@ package net.minecraft.server;
+@@ -0,0 +0,0 @@ package net.minecraft.world.level.chunk;
  
  import com.google.common.collect.Lists;
  import com.mojang.serialization.Codec;

Spigot-Server-Patches/Add-TNTPrimeEvent.patch

@@ -4,11 +4,35 @@ Date: Mon, 16 Jul 2018 00:05:05 +0300
 Subject: [PATCH] Add TNTPrimeEvent
 
 
-diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
+diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/BlockFire.java
+--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
-+++ b/src/main/java/net/minecraft/server/BlockFire.java
++++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
-@@ -0,0 +0,0 @@ package net.minecraft.server;
+@@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.block.CraftBlock;
+ import org.bukkit.event.entity.EntityExplodeEvent;
+ import org.bukkit.event.entity.EntityRegainHealthEvent;
+ // CraftBukkit end
++import com.destroystokyo.paper.event.block.TNTPrimeEvent; // Paper - TNTPrimeEvent
+ 
+ public class EntityEnderDragon extends EntityInsentient implements IMonster {
+ 
+@@ -0,0 +0,0 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
+                     });
+                     craftBlock.getNMS().dropNaturally((WorldServer) world, blockposition, ItemStack.b);
+                 }
++                // Paper start - TNTPrimeEvent
++                org.bukkit.block.Block tntBlock = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
++                if(!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.EXPLOSION, explosionSource.getSource().getBukkitEntity()).callEvent())
++                    continue;
++                // Paper end
+                 nmsBlock.wasExploded(world, blockposition, explosionSource);
+ 
+                 this.world.a(blockposition, false);
+diff --git a/src/main/java/net/minecraft/world/level/block/BlockFire.java b/src/main/java/net/minecraft/world/level/block/BlockFire.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/level/block/BlockFire.java
++++ b/src/main/java/net/minecraft/world/level/block/BlockFire.java
+@@ -0,0 +0,0 @@ package net.minecraft.world.level.block;
  import com.google.common.collect.ImmutableMap;
  import it.unimi.dsi.fastutil.objects.Object2IntMap;
  import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
@@ -39,14 +63,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  BlockTNT.a(world, blockposition);
              }
          }
-diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java
+diff --git a/src/main/java/net/minecraft/world/level/block/BlockTNT.java b/src/main/java/net/minecraft/world/level/block/BlockTNT.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/BlockTNT.java
+--- a/src/main/java/net/minecraft/world/level/block/BlockTNT.java
-+++ b/src/main/java/net/minecraft/server/BlockTNT.java
++++ b/src/main/java/net/minecraft/world/level/block/BlockTNT.java
-@@ -0,0 +0,0 @@
+@@ -0,0 +0,0 @@ import net.minecraft.world.level.block.state.IBlockData;
- package net.minecraft.server;
+ import net.minecraft.world.level.block.state.properties.BlockProperties;
- 
+ import net.minecraft.world.level.block.state.properties.BlockStateBoolean;
- import javax.annotation.Nullable;
+ import net.minecraft.world.phys.MovingObjectPositionBlock;
 +import com.destroystokyo.paper.event.block.TNTPrimeEvent; // Paper - TNTPrimeEvent
  
  public class BlockTNT extends Block {
@@ -56,7 +80,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          if (!iblockdata1.a(iblockdata.getBlock())) {
              if (world.isBlockIndirectlyPowered(blockposition)) {
 +                // Paper start - TNTPrimeEvent
-+                org.bukkit.block.Block tntBlock = MCUtil.toBukkitBlock(world, blockposition);;
++                org.bukkit.block.Block tntBlock = net.minecraft.server.MCUtil.toBukkitBlock(world, blockposition);;
 +                if(!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.REDSTONE, null).callEvent())
 +                    return;
 +                // Paper end
@@ -68,7 +92,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public void doPhysics(IBlockData iblockdata, World world, BlockPosition blockposition, Block block, BlockPosition blockposition1, boolean flag) {
          if (world.isBlockIndirectlyPowered(blockposition)) {
 +            // Paper start - TNTPrimeEvent
-+            org.bukkit.block.Block tntBlock = MCUtil.toBukkitBlock(world, blockposition);;
++            org.bukkit.block.Block tntBlock = net.minecraft.server.MCUtil.toBukkitBlock(world, blockposition);;
 +            if(!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.REDSTONE, null).callEvent())
 +                return;
 +            // Paper end
@@ -80,7 +104,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public void wasExploded(World world, BlockPosition blockposition, Explosion explosion) {
          if (!world.isClientSide) {
 +            // Paper start - TNTPrimeEvent
-+            org.bukkit.block.Block tntBlock = MCUtil.toBukkitBlock(world, blockposition);
++            org.bukkit.block.Block tntBlock = net.minecraft.server.MCUtil.toBukkitBlock(world, blockposition);
 +            org.bukkit.entity.Entity source = explosion.source != null ? explosion.source.getBukkitEntity() : null;
 +            if(!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.EXPLOSION, source).callEvent())
 +                return;
@@ -93,7 +117,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              return super.interact(iblockdata, world, blockposition, entityhuman, enumhand, movingobjectpositionblock);
          } else {
 +            // Paper start - TNTPrimeEvent
-+            org.bukkit.block.Block tntBlock = MCUtil.toBukkitBlock(world, blockposition);
++            org.bukkit.block.Block tntBlock = net.minecraft.server.MCUtil.toBukkitBlock(world, blockposition);
 +            if(!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.ITEM, entityhuman.getBukkitEntity()).callEvent())
 +                return EnumInteractionResult.FAIL;
 +            // Paper end
@@ -105,7 +129,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  // CraftBukkit end
  
 +                // Paper start - TNTPrimeEvent
-+                org.bukkit.block.Block tntBlock = MCUtil.toBukkitBlock(world, blockposition);
++                org.bukkit.block.Block tntBlock = net.minecraft.server.MCUtil.toBukkitBlock(world, blockposition);
 +                if (!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.PROJECTILE, iprojectile.getBukkitEntity()).callEvent()) {
 +                    return;
 +                }
@@ -114,27 +138,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  a(world, blockposition, entity instanceof EntityLiving ? (EntityLiving) entity : null);
                  world.a(blockposition, false);
              }
-diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
-+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-@@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.block.CraftBlock;
- import org.bukkit.event.entity.EntityExplodeEvent;
- import org.bukkit.event.entity.EntityRegainHealthEvent;
- // CraftBukkit end
-+import com.destroystokyo.paper.event.block.TNTPrimeEvent; // Paper - TNTPrimeEvent
- 
- public class EntityEnderDragon extends EntityInsentient implements IMonster {
- 
-@@ -0,0 +0,0 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
-                     });
-                     craftBlock.getNMS().dropNaturally((WorldServer) world, blockposition, ItemStack.b);
-                 }
-+                // Paper start - TNTPrimeEvent
-+                org.bukkit.block.Block tntBlock = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
-+                if(!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.EXPLOSION, explosionSource.getSource().getBukkitEntity()).callEvent())
-+                    continue;
-+                // Paper end
-                 nmsBlock.wasExploded(world, blockposition, explosionSource);
- 
-                 this.world.a(blockposition, false);

Spigot-Server-Patches/Add-ThrownEggHatchEvent.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Add ThrownEggHatchEvent
 Adds a new event similar to PlayerEggThrowEvent, but without the Player requirement
 (dispensers can throw eggs to hatch them, too).
 
-diff --git a/src/main/java/net/minecraft/server/EntityEgg.java b/src/main/java/net/minecraft/server/EntityEgg.java
+diff --git a/src/main/java/net/minecraft/world/entity/projectile/EntityEgg.java b/src/main/java/net/minecraft/world/entity/projectile/EntityEgg.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityEgg.java
+--- a/src/main/java/net/minecraft/world/entity/projectile/EntityEgg.java
-+++ b/src/main/java/net/minecraft/server/EntityEgg.java
++++ b/src/main/java/net/minecraft/world/entity/projectile/EntityEgg.java
 @@ -0,0 +0,0 @@ public class EntityEgg extends EntityProjectileThrowable {
                      hatchingType = event.getHatchingType();
                  }

Spigot-Server-Patches/Add-UnknownCommandEvent.patch

@@ -8,9 +8,9 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/ja
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -0,0 +0,0 @@ import net.minecraft.server.WorldNBTStorage;
+@@ -0,0 +0,0 @@ import net.minecraft.world.level.storage.WorldNBTStorage;
- import net.minecraft.server.WorldServer;
+ import net.minecraft.world.level.storage.loot.LootTableRegistry;
- import net.minecraft.server.WorldSettings;
+ import net.minecraft.world.phys.Vec3D;
  import org.apache.commons.lang.Validate;
 +import org.apache.commons.lang3.StringUtils;
  import org.bukkit.BanList;

Spigot-Server-Patches/Add-Velocity-IP-Forwarding-Support.patch

@@ -66,7 +66,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import com.mojang.authlib.GameProfile;
 +import com.mojang.authlib.properties.Property;
 +import net.minecraft.server.MinecraftKey;
-+import net.minecraft.server.PacketDataSerializer;
++import net.minecraft.network.protocol.game.PacketDataSerializer;
 +
 +import java.net.InetAddress;
 +import java.security.InvalidKeyException;
@@ -126,10 +126,72 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        }
 +    }
 +}
-diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
+diff --git a/src/main/java/net/minecraft/network/PacketDataSerializer.java b/src/main/java/net/minecraft/network/PacketDataSerializer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/LoginListener.java
+--- a/src/main/java/net/minecraft/network/PacketDataSerializer.java
-+++ b/src/main/java/net/minecraft/server/LoginListener.java
++++ b/src/main/java/net/minecraft/network/PacketDataSerializer.java
+@@ -0,0 +0,0 @@ public class PacketDataSerializer extends ByteBuf {
+         return this.d(oenum.ordinal());
+     }
+ 
++    public int readVarInt() { return i(); } // Paper - OBFHELPER
+     public int i() {
+         int i = 0;
+         int j = 0;
+@@ -0,0 +0,0 @@ public class PacketDataSerializer extends ByteBuf {
+         return this;
+     }
+ 
++    public UUID readUUID() { return k(); } // Paper - OBFHELPER
+     public UUID k() {
+         return new UUID(this.readLong(), this.readLong());
+     }
+@@ -0,0 +0,0 @@ public class PacketDataSerializer extends ByteBuf {
+         }
+     }
+ 
++    public String readUTF(int maxLength) { return this.e(maxLength); } // Paper - OBFHELPER
+     public String e(int i) {
+         int j = this.i();
+ 
+diff --git a/src/main/java/net/minecraft/network/protocol/login/PacketLoginInCustomPayload.java b/src/main/java/net/minecraft/network/protocol/login/PacketLoginInCustomPayload.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/network/protocol/login/PacketLoginInCustomPayload.java
++++ b/src/main/java/net/minecraft/network/protocol/login/PacketLoginInCustomPayload.java
+@@ -0,0 +0,0 @@ import net.minecraft.network.protocol.Packet;
+ 
+ public class PacketLoginInCustomPayload implements Packet<PacketLoginInListener> {
+ 
+-    private int a;
+-    private PacketDataSerializer b;
++    private int a; public int getId() { return a; } // Paper - OBFHELPER
++    private PacketDataSerializer b; public PacketDataSerializer getBuf() { return b; } // Paper - OBFHELPER
+ 
+     public PacketLoginInCustomPayload() {}
+ 
+diff --git a/src/main/java/net/minecraft/network/protocol/login/PacketLoginOutCustomPayload.java b/src/main/java/net/minecraft/network/protocol/login/PacketLoginOutCustomPayload.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/network/protocol/login/PacketLoginOutCustomPayload.java
++++ b/src/main/java/net/minecraft/network/protocol/login/PacketLoginOutCustomPayload.java
+@@ -0,0 +0,0 @@ public class PacketLoginOutCustomPayload implements Packet<PacketLoginOutListene
+ 
+     public PacketLoginOutCustomPayload() {}
+ 
++    // Paper start
++    public PacketLoginOutCustomPayload(int id, MinecraftKey channel, PacketDataSerializer buf) {
++        this.a = id;
++        this.b = channel;
++        this.c = buf;
++    }
++    // Paper end
++
+     @Override
+     public void a(PacketDataSerializer packetdataserializer) throws IOException {
+         this.a = packetdataserializer.i();
+diff --git a/src/main/java/net/minecraft/server/network/LoginListener.java b/src/main/java/net/minecraft/server/network/LoginListener.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/network/LoginListener.java
++++ b/src/main/java/net/minecraft/server/network/LoginListener.java
 @@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.util.Waitable;
  import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
  import org.bukkit.event.player.PlayerPreLoginEvent;
@@ -210,68 +272,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          this.disconnect(new ChatMessage("multiplayer.disconnect.unexpected_query_response"));
      }
  
-diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
-+++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-@@ -0,0 +0,0 @@ public class PacketDataSerializer extends ByteBuf {
-         return this.d(oenum.ordinal());
-     }
- 
-+    public int readVarInt() { return i(); } // Paper - OBFHELPER
-     public int i() {
-         int i = 0;
-         int j = 0;
-@@ -0,0 +0,0 @@ public class PacketDataSerializer extends ByteBuf {
-         return this;
-     }
- 
-+    public UUID readUUID() { return k(); } // Paper - OBFHELPER
-     public UUID k() {
-         return new UUID(this.readLong(), this.readLong());
-     }
-@@ -0,0 +0,0 @@ public class PacketDataSerializer extends ByteBuf {
-         }
-     }
- 
-+    public String readUTF(int maxLength) { return this.e(maxLength); } // Paper - OBFHELPER
-     public String e(int i) {
-         int j = this.i();
- 
-diff --git a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
-+++ b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
-@@ -0,0 +0,0 @@ import java.io.IOException;
- 
- public class PacketLoginInCustomPayload implements Packet<PacketLoginInListener> {
- 
--    private int a;
--    private PacketDataSerializer b;
-+    private int a; public int getId() { return a; } // Paper - OBFHELPER
-+    private PacketDataSerializer b; public PacketDataSerializer getBuf() { return b; } // Paper - OBFHELPER
- 
-     public PacketLoginInCustomPayload() {}
- 
-diff --git a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
-+++ b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
-@@ -0,0 +0,0 @@ public class PacketLoginOutCustomPayload implements Packet<PacketLoginOutListene
- 
-     public PacketLoginOutCustomPayload() {}
- 
-+    // Paper start
-+    public PacketLoginOutCustomPayload(int id, MinecraftKey channel, PacketDataSerializer buf) {
-+        this.a = id;
-+        this.b = channel;
-+        this.c = buf;
-+    }
-+    // Paper end
-+
-     @Override
-     public void a(PacketDataSerializer packetdataserializer) throws IOException {
-         this.a = packetdataserializer.i();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java

Spigot-Server-Patches/Add-Wandering-Trader-spawn-rate-config-options.patch

@@ -32,10 +32,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        wanderingTraderSpawnChanceMax = getInt("wandering-trader.spawn-chance-max", wanderingTraderSpawnChanceMax);
 +    }
  }
-diff --git a/src/main/java/net/minecraft/server/MobSpawnerTrader.java b/src/main/java/net/minecraft/server/MobSpawnerTrader.java
+diff --git a/src/main/java/net/minecraft/world/entity/npc/MobSpawnerTrader.java b/src/main/java/net/minecraft/world/entity/npc/MobSpawnerTrader.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/MobSpawnerTrader.java
+--- a/src/main/java/net/minecraft/world/entity/npc/MobSpawnerTrader.java
-+++ b/src/main/java/net/minecraft/server/MobSpawnerTrader.java
++++ b/src/main/java/net/minecraft/world/entity/npc/MobSpawnerTrader.java
 @@ -0,0 +0,0 @@ public class MobSpawnerTrader implements MobSpawner {
  
      private final Random a = new Random();

Spigot-Server-Patches/Add-World-Util-Methods.patch

@@ -5,10 +5,23 @@ Subject: [PATCH] Add World Util Methods
 
 Methods that can be used for other patches to help improve logic.
 
-diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
+diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/World.java
+--- a/src/main/java/net/minecraft/server/level/WorldServer.java
-+++ b/src/main/java/net/minecraft/server/World.java
++++ b/src/main/java/net/minecraft/server/level/WorldServer.java
+@@ -0,0 +0,0 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+     public final Convertable.ConversionSession convertable;
+     public final UUID uuid;
+ 
+-    public Chunk getChunkIfLoaded(int x, int z) {
++    @Override public Chunk getChunkIfLoaded(int x, int z) { // Paper - this was added in world too but keeping here for NMS ABI
+         return this.chunkProvider.getChunkAt(x, z, false);
+     }
+ 
+diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/level/World.java
++++ b/src/main/java/net/minecraft/world/level/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
      }
  
@@ -38,10 +51,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      // Paper end
  
      @Override
-diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
+diff --git a/src/main/java/net/minecraft/world/level/border/WorldBorder.java b/src/main/java/net/minecraft/world/level/border/WorldBorder.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/WorldBorder.java
+--- a/src/main/java/net/minecraft/world/level/border/WorldBorder.java
-+++ b/src/main/java/net/minecraft/server/WorldBorder.java
++++ b/src/main/java/net/minecraft/world/level/border/WorldBorder.java
 @@ -0,0 +0,0 @@ public class WorldBorder {
  
      public WorldBorder() {}
@@ -50,16 +63,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public boolean a(BlockPosition blockposition) {
          return (double) (blockposition.getX() + 1) > this.e() && (double) blockposition.getX() < this.g() && (double) (blockposition.getZ() + 1) > this.f() && (double) blockposition.getZ() < this.h();
      }
-diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/WorldServer.java
-+++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -0,0 +0,0 @@ public class WorldServer extends World implements GeneratorAccessSeed {
-     public final Convertable.ConversionSession convertable;
-     public final UUID uuid;
- 
--    public Chunk getChunkIfLoaded(int x, int z) {
-+    @Override public Chunk getChunkIfLoaded(int x, int z) { // Paper - this was added in world too but keeping here for NMS ABI
-         return this.chunkProvider.getChunkAt(x, z, false);
-     }
- 

Spigot-Server-Patches/Add-a-way-to-get-translation-keys-for-blocks-entitie.patch

@@ -5,22 +5,10 @@ Subject: [PATCH] Add a way to get translation keys for blocks, entities and
  materials
 
 
-diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
+diff --git a/src/main/java/net/minecraft/world/entity/EntityTypes.java b/src/main/java/net/minecraft/world/entity/EntityTypes.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/Block.java
+--- a/src/main/java/net/minecraft/world/entity/EntityTypes.java
-+++ b/src/main/java/net/minecraft/server/Block.java
++++ b/src/main/java/net/minecraft/world/entity/EntityTypes.java
-@@ -0,0 +0,0 @@ public class Block extends BlockBase implements IMaterial {
-         return !this.material.isBuildable() && !this.material.isLiquid();
-     }
- 
-+    public String getDescriptionId() { return i(); } // Paper - OBFHELPER
-     public String i() {
-         if (this.name == null) {
-             this.name = SystemUtils.a("block", IRegistry.BLOCK.getKey(this));
-diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityTypes.java
-+++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -0,0 +0,0 @@ public class EntityTypes<T extends Entity> {
          return IRegistry.ENTITY_TYPE.getKey(entitytypes);
      }
@@ -37,10 +25,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public String f() {
          if (this.bo == null) {
              this.bo = SystemUtils.a("entity", IRegistry.ENTITY_TYPE.getKey(this));
-diff --git a/src/main/java/net/minecraft/server/Item.java b/src/main/java/net/minecraft/server/Item.java
+diff --git a/src/main/java/net/minecraft/world/item/Item.java b/src/main/java/net/minecraft/world/item/Item.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/Item.java
+--- a/src/main/java/net/minecraft/world/item/Item.java
-+++ b/src/main/java/net/minecraft/server/Item.java
++++ b/src/main/java/net/minecraft/world/item/Item.java
 @@ -0,0 +0,0 @@ public class Item implements IMaterial {
      private final FoodInfo foodInfo;
  
@@ -58,6 +46,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      protected String m() {
          if (this.name == null) {
              this.name = SystemUtils.a("item", IRegistry.ITEM.getKey(this));
+diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/level/block/Block.java
++++ b/src/main/java/net/minecraft/world/level/block/Block.java
+@@ -0,0 +0,0 @@ public class Block extends BlockBase implements IMaterial {
+         return !this.material.isBuildable() && !this.material.isLiquid();
+     }
+ 
++    public String getDescriptionId() { return i(); } // Paper - OBFHELPER
+     public String i() {
+         if (this.name == null) {
+             this.name = SystemUtils.a("block", IRegistry.BLOCK.getKey(this));
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +    @Override
 +    public String getTranslationKey(org.bukkit.entity.EntityType type) {
-+        return net.minecraft.server.EntityTypes.getByName(type.getName()).map(net.minecraft.server.EntityTypes::getDescriptionId).orElse(null);
++        return net.minecraft.world.entity.EntityTypes.getByName(type.getName()).map(net.minecraft.world.entity.EntityTypes::getDescriptionId).orElse(null);
 +    }
 +
      // Paper end

Spigot-Server-Patches/Add-ability-to-configure-frosted_ice-properties.patch

@@ -23,10 +23,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        log("Frosted Ice: " + (this.frostedIceEnabled ? "enabled" : "disabled") + " / delay: min=" + this.frostedIceDelayMin + ", max=" + this.frostedIceDelayMax);
 +    }
  }
-diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java
+diff --git a/src/main/java/net/minecraft/world/level/block/BlockIceFrost.java b/src/main/java/net/minecraft/world/level/block/BlockIceFrost.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/BlockIceFrost.java
+--- a/src/main/java/net/minecraft/world/level/block/BlockIceFrost.java
-+++ b/src/main/java/net/minecraft/server/BlockIceFrost.java
++++ b/src/main/java/net/minecraft/world/level/block/BlockIceFrost.java
 @@ -0,0 +0,0 @@ public class BlockIceFrost extends BlockIce {
  
      @Override

Spigot-Server-Patches/Add-and-implement-PlayerRecipeBookClickEvent.patch

@@ -4,10 +4,10 @@ Date: Fri, 5 Jun 2020 18:24:06 -0400
 Subject: [PATCH] Add and implement PlayerRecipeBookClickEvent
 
 
-diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
+diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PlayerConnection.java
+--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
++++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn {
          PlayerConnectionUtils.ensureMainThread(packetplayinautorecipe, this, this.player.getWorldServer());
          this.player.resetIdleTimer();

Spigot-Server-Patches/Add-config-to-disable-ender-dragon-legacy-check.patch

@@ -18,10 +18,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        scanForLegacyEnderDragon = getBoolean("game-mechanics.scan-for-legacy-ender-dragon", true);
 +    }
  }
-diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
+diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EnderDragonBattle.java b/src/main/java/net/minecraft/world/level/dimension/end/EnderDragonBattle.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
+--- a/src/main/java/net/minecraft/world/level/dimension/end/EnderDragonBattle.java
-+++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
++++ b/src/main/java/net/minecraft/world/level/dimension/end/EnderDragonBattle.java
 @@ -0,0 +0,0 @@ public class EnderDragonBattle {
      private boolean dragonKilled;
      private boolean previouslyKilled;

Spigot-Server-Patches/Add-configurable-despawn-distances-for-living-entiti.patch

@@ -29,10 +29,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        hardDespawnDistance = hardDespawnDistance*hardDespawnDistance;
 +    }
  }
-diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
+diff --git a/src/main/java/net/minecraft/world/entity/EntityInsentient.java b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityInsentient.java
+--- a/src/main/java/net/minecraft/world/entity/EntityInsentient.java
-+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
++++ b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
 @@ -0,0 +0,0 @@ public abstract class EntityInsentient extends EntityLiving {
                  int i = this.getEntityType().e().f();
                  int j = i * i;

Spigot-Server-Patches/Add-configurable-portal-search-radius.patch

@@ -22,11 +22,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        portalSearchVanillaDimensionScaling = getBoolean("portal-search-vanilla-dimension-scaling", true);
 +    }
  }
-diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/Entity.java
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/server/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
                  double d4 = DimensionManager.a(this.world.getDimensionManager(), worldserver.getDimensionManager());
                  BlockPosition blockposition = new BlockPosition(MathHelper.a(this.locX() * d4, d0, d2), this.locY(), MathHelper.a(this.locZ() * d4, d1, d3));
                  // CraftBukkit start
@@ -41,10 +41,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  if (event == null) {
                      return null;
                  }
-diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
+diff --git a/src/main/java/net/minecraft/world/level/portal/PortalTravelAgent.java b/src/main/java/net/minecraft/world/level/portal/PortalTravelAgent.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
+--- a/src/main/java/net/minecraft/world/level/portal/PortalTravelAgent.java
-+++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
++++ b/src/main/java/net/minecraft/world/level/portal/PortalTravelAgent.java
 @@ -0,0 +0,0 @@ public class PortalTravelAgent {
  
      public Optional<BlockUtil.Rectangle> findPortal(BlockPosition blockposition, boolean flag) {

Spigot-Server-Patches/Add-dropLeash-variable-to-EntityUnleashEvent.patch

@@ -4,10 +4,10 @@ Date: Fri, 29 Jan 2021 15:13:11 +0100
 Subject: [PATCH] Add dropLeash variable to EntityUnleashEvent
 
 
-diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
+diff --git a/src/main/java/net/minecraft/world/entity/EntityCreature.java b/src/main/java/net/minecraft/world/entity/EntityCreature.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityCreature.java
+--- a/src/main/java/net/minecraft/world/entity/EntityCreature.java
-+++ b/src/main/java/net/minecraft/server/EntityCreature.java
++++ b/src/main/java/net/minecraft/world/entity/EntityCreature.java
 @@ -0,0 +0,0 @@ public abstract class EntityCreature extends EntityInsentient {
  
              if (this instanceof EntityTameableAnimal && ((EntityTameableAnimal) this).isSitting()) {
@@ -36,10 +36,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  this.goalSelector.a(PathfinderGoal.Type.MOVE);
              } else if (f > 6.0F) {
                  double d0 = (entity.locX() - this.locX()) / (double) f;
-diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
+diff --git a/src/main/java/net/minecraft/world/entity/EntityInsentient.java b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityInsentient.java
+--- a/src/main/java/net/minecraft/world/entity/EntityInsentient.java
-+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
++++ b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
 @@ -0,0 +0,0 @@ import org.bukkit.event.entity.EntityTargetEvent;
  import org.bukkit.event.entity.EntityTransformEvent;
  import org.bukkit.event.entity.EntityUnleashEvent;
@@ -107,18 +107,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        // Paper end
      }
  }
-diff --git a/src/main/java/net/minecraft/server/EntityLeash.java b/src/main/java/net/minecraft/server/EntityLeash.java
+diff --git a/src/main/java/net/minecraft/world/entity/decoration/EntityLeash.java b/src/main/java/net/minecraft/world/entity/decoration/EntityLeash.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityLeash.java
+--- a/src/main/java/net/minecraft/world/entity/decoration/EntityLeash.java
-+++ b/src/main/java/net/minecraft/server/EntityLeash.java
++++ b/src/main/java/net/minecraft/world/entity/decoration/EntityLeash.java
-@@ -0,0 +0,0 @@ import java.util.List;
+@@ -0,0 +0,0 @@ import net.minecraft.server.level.WorldServer;
- import javax.annotation.Nullable;
+ import org.bukkit.craftbukkit.event.CraftEventFactory;
+ // CraftBukkit end
  
- import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
 +import org.bukkit.event.player.PlayerUnleashEntityEvent; // Paper
- 
++
  public class EntityLeash extends EntityHanging {
  
+     public EntityLeash(EntityTypes<? extends EntityLeash> entitytypes, World world) {
 @@ -0,0 +0,0 @@ public class EntityLeash extends EntityHanging {
                          entityinsentient = (EntityInsentient) iterator.next();
                          if (entityinsentient.isLeashed() && entityinsentient.getLeashHolder() == this) {

Spigot-Server-Patches/Add-effect-to-block-break-naturally.patch

@@ -20,13 +20,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    public boolean breakNaturally(ItemStack item, boolean triggerEffect) {
 +        // Paper end
          // Order matters here, need to drop before setting to air so skulls can get their data
-         net.minecraft.server.IBlockData iblockdata = this.getNMS();
+         net.minecraft.world.level.block.state.IBlockData iblockdata = this.getNMS();
-         net.minecraft.server.Block block = iblockdata.getBlock();
+         net.minecraft.world.level.block.Block block = iblockdata.getBlock();
 @@ -0,0 +0,0 @@ public class CraftBlock implements Block {
          // Modelled off EntityHuman#hasBlock
          if (block != Blocks.AIR && (item == null || !iblockdata.isRequiresSpecialTool() || nmsItem.canDestroySpecialBlock(iblockdata))) {
-             net.minecraft.server.Block.dropItems(iblockdata, world.getMinecraftWorld(), position, world.getTileEntity(position), null, nmsItem);
+             net.minecraft.world.level.block.Block.dropItems(iblockdata, world.getMinecraftWorld(), position, world.getTileEntity(position), null, nmsItem);
-+            if (triggerEffect) world.triggerEffect(org.bukkit.Effect.STEP_SOUND.getId(), position, net.minecraft.server.Block.getCombinedId(block.getBlockData())); // Paper
++            if (triggerEffect) world.triggerEffect(org.bukkit.Effect.STEP_SOUND.getId(), position, net.minecraft.world.level.block.Block.getCombinedId(block.getBlockData())); // Paper
              result = true;
          }
  

Spigot-Server-Patches/Add-entity-liquid-API.patch

@@ -4,11 +4,11 @@ Date: Thu, 2 Jul 2020 18:11:43 -0500
 Subject: [PATCH] Add entity liquid API
 
 
-diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/Entity.java
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/server/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return this.inWater;
      }
  
@@ -23,7 +23,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private boolean k() {
          return this.world.getType(this.getChunkCoordinates()).a(Blocks.BUBBLE_COLUMN);
      }
-@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return this.isInWater() || this.isInRain() || this.k();
      }
  
@@ -31,7 +31,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public boolean aH() {
          return this.isInWater() || this.k();
      }
-@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return this.O == tag;
      }
  

Spigot-Server-Patches/Add-exception-reporting-event.patch

@@ -48,43 +48,24 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        return internalTask;
 +    }
 +}
-diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
+diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/Chunk.java
+--- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-+++ b/src/main/java/net/minecraft/server/Chunk.java
++++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-@@ -0,0 +0,0 @@
+@@ -0,0 +0,0 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
- package net.minecraft.server;
+                 return true;
- 
+             } catch (Exception exception) {
-+import com.destroystokyo.paper.exception.ServerInternalException;
+                 PlayerChunkMap.LOGGER.error("Failed to save chunk {},{}", chunkcoordintpair.x, chunkcoordintpair.z, exception);
- import com.google.common.collect.Maps;
++                com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(exception); // Paper
- import com.google.common.collect.Sets;
+                 return false;
- import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
-@@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
-             this.tileEntities.remove(blockposition);
-             // Paper end
-         } else {
--            System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ()
--                + " (" + getType(blockposition) + ") where there was no entity tile!");
--            System.out.println("Chunk coordinates: " + (this.loc.x * 16) + "," + (this.loc.z * 16));
--            new Exception().printStackTrace();
-+            // Paper start
-+            ServerInternalException e = new ServerInternalException(
-+                    "Attempted to place a tile entity (" + tileentity + ") at " + tileentity.position.getX() + ","
-+                            + tileentity.position.getY() + "," + tileentity.position.getZ()
-+                            + " (" + getType(blockposition) + ") where there was no entity tile!\n" +
-+                            "Chunk coordinates: " + (this.loc.x * 16) + "," + (this.loc.z * 16));
-+            e.printStackTrace();
-+            ServerInternalException.reportInternalException(e);
-+            // Paper end
-             // CraftBukkit end
              }
          }
-diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
+diff --git a/src/main/java/net/minecraft/server/players/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/players/NameReferencingFileConverter.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
+--- a/src/main/java/net/minecraft/server/players/NameReferencingFileConverter.java
-+++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
++++ b/src/main/java/net/minecraft/server/players/NameReferencingFileConverter.java
 @@ -0,0 +0,0 @@
- package net.minecraft.server;
+ package net.minecraft.server.players;
  
 +import com.destroystokyo.paper.exception.ServerInternalException;
  import com.google.common.collect.Lists;
@@ -106,78 +87,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                              }
                         }
                          // CraftBukkit end
-diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
+diff --git a/src/main/java/net/minecraft/world/entity/ai/village/VillageSiege.java b/src/main/java/net/minecraft/world/entity/ai/village/VillageSiege.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+--- a/src/main/java/net/minecraft/world/entity/ai/village/VillageSiege.java
-+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
++++ b/src/main/java/net/minecraft/world/entity/ai/village/VillageSiege.java
-@@ -0,0 +0,0 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
-                 return true;
-             } catch (Exception exception) {
-                 PlayerChunkMap.LOGGER.error("Failed to save chunk {},{}", chunkcoordintpair.x, chunkcoordintpair.z, exception);
-+                com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(exception); // Paper
-                 return false;
-             }
-         }
-diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/RegionFile.java
-+++ b/src/main/java/net/minecraft/server/RegionFile.java
-@@ -0,0 +0,0 @@ public class RegionFile implements AutoCloseable {
-                     return true;
-                 }
-             } catch (IOException ioexception) {
-+                com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(ioexception); // Paper
-                 return false;
-             }
-         }
-@@ -0,0 +0,0 @@ public class RegionFile implements AutoCloseable {
-             filechannel.write(bytebuffer);
-         } catch (Throwable throwable1) {
-             throwable = throwable1;
-+            com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(throwable); // Paper
-             throw throwable1;
-         } finally {
-             if (filechannel != null) {
-diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/SpawnerCreature.java
-+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
-@@ -0,0 +0,0 @@ import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
- 
- // CraftBukkit start
-+import com.destroystokyo.paper.exception.ServerInternalException;
- import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
- // CraftBukkit end
- 
-@@ -0,0 +0,0 @@ public final class SpawnerCreature {
-             }
-         } catch (Exception exception) {
-             SpawnerCreature.LOGGER.warn("Failed to create mob", exception);
-+            ServerInternalException.reportInternalException(exception); // Paper
-             return null;
-         }
-     }
-@@ -0,0 +0,0 @@ public final class SpawnerCreature {
-                                 entity = biomesettingsmobs_c.c.a((World) worldaccess.getMinecraftWorld());
-                             } catch (Exception exception) {
-                                 SpawnerCreature.LOGGER.warn("Failed to create mob", exception);
-+                                ServerInternalException.reportInternalException(exception); // Paper
-                                 continue;
-                             }
- 
-diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/VillageSiege.java
-+++ b/src/main/java/net/minecraft/server/VillageSiege.java
 @@ -0,0 +0,0 @@
- package net.minecraft.server;
+ package net.minecraft.world.entity.ai.village;
  
 +import com.destroystokyo.paper.exception.ServerInternalException;
 +
  import java.util.Iterator;
  import javax.annotation.Nullable;
- import org.apache.logging.log4j.LogManager;
+ import net.minecraft.core.BaseBlockPosition;
 @@ -0,0 +0,0 @@ public class VillageSiege implements MobSpawner {
                  entityzombie.prepare(worldserver, worldserver.getDamageScaler(entityzombie.getChunkCoordinates()), EnumMobSpawn.EVENT, (GroupDataEntity) null, (NBTTagCompound) null);
              } catch (Exception exception) {
@@ -186,12 +107,32 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  return;
              }
  
-diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
+diff --git a/src/main/java/net/minecraft/world/level/SpawnerCreature.java b/src/main/java/net/minecraft/world/level/SpawnerCreature.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/World.java
+--- a/src/main/java/net/minecraft/world/level/SpawnerCreature.java
-+++ b/src/main/java/net/minecraft/server/World.java
++++ b/src/main/java/net/minecraft/world/level/SpawnerCreature.java
+@@ -0,0 +0,0 @@ public final class SpawnerCreature {
+             }
+         } catch (Exception exception) {
+             SpawnerCreature.LOGGER.warn("Failed to create mob", exception);
++            com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(exception); // Paper
+             return null;
+         }
+     }
+@@ -0,0 +0,0 @@ public final class SpawnerCreature {
+                                 entity = biomesettingsmobs_c.c.a((World) worldaccess.getMinecraftWorld());
+                             } catch (Exception exception) {
+                                 SpawnerCreature.LOGGER.warn("Failed to create mob", exception);
++                                com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(exception); // Paper
+                                 continue;
+                             }
+ 
+diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/level/World.java
++++ b/src/main/java/net/minecraft/world/level/World.java
 @@ -0,0 +0,0 @@
- package net.minecraft.server;
+ package net.minecraft.world.level;
  
 +import co.aikar.timings.Timing;
 +import co.aikar.timings.Timings;
@@ -226,10 +167,61 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              entity.dead = true;
              return;
              // Paper end
-diff --git a/src/main/java/net/minecraft/server/WorldPersistentData.java b/src/main/java/net/minecraft/server/WorldPersistentData.java
+diff --git a/src/main/java/net/minecraft/world/level/chunk/Chunk.java b/src/main/java/net/minecraft/world/level/chunk/Chunk.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/WorldPersistentData.java
+--- a/src/main/java/net/minecraft/world/level/chunk/Chunk.java
-+++ b/src/main/java/net/minecraft/server/WorldPersistentData.java
++++ b/src/main/java/net/minecraft/world/level/chunk/Chunk.java
+@@ -0,0 +0,0 @@
+ package net.minecraft.world.level.chunk;
+ 
++import com.destroystokyo.paper.exception.ServerInternalException;
+ import com.google.common.collect.Maps;
+ import com.google.common.collect.Sets;
+ import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
+@@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
+             this.tileEntities.remove(blockposition);
+             // Paper end
+         } else {
+-            System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.getPosition().getX() + "," + tileentity.getPosition().getY() + "," + tileentity.getPosition().getZ()
+-                + " (" + getType(blockposition) + ") where there was no entity tile!");
+-            System.out.println("Chunk coordinates: " + (this.loc.x * 16) + "," + (this.loc.z * 16));
+-            new Exception().printStackTrace();
++            // Paper start
++            ServerInternalException e = new ServerInternalException(
++                    "Attempted to place a tile entity (" + tileentity + ") at " + tileentity.position.getX() + ","
++                            + tileentity.position.getY() + "," + tileentity.position.getZ()
++                            + " (" + getType(blockposition) + ") where there was no entity tile!\n" +
++                            "Chunk coordinates: " + (this.loc.x * 16) + "," + (this.loc.z * 16));
++            e.printStackTrace();
++            ServerInternalException.reportInternalException(e);
++            // Paper end
+             // CraftBukkit end
+         }
+     }
+diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
++++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
+@@ -0,0 +0,0 @@ public class RegionFile implements AutoCloseable {
+                     return true;
+                 }
+             } catch (IOException ioexception) {
++                com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(ioexception); // Paper
+                 return false;
+             }
+         }
+@@ -0,0 +0,0 @@ public class RegionFile implements AutoCloseable {
+             filechannel.write(bytebuffer);
+         } catch (Throwable throwable1) {
+             throwable = throwable1;
++            com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(throwable); // Paper
+             throw throwable1;
+         } finally {
+             if (filechannel != null) {
+diff --git a/src/main/java/net/minecraft/world/level/storage/WorldPersistentData.java b/src/main/java/net/minecraft/world/level/storage/WorldPersistentData.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/level/storage/WorldPersistentData.java
++++ b/src/main/java/net/minecraft/world/level/storage/WorldPersistentData.java
 @@ -0,0 +0,0 @@ public class WorldPersistentData {
              }
          } catch (Throwable throwable6) {

Spigot-Server-Patches/Add-fast-alternative-constructor-for-Vector3f.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add fast alternative constructor for Vector3f
 
 Signed-off-by: Irmo van den Berge <irmo.vandenberge@ziggo.nl>
 
-diff --git a/src/main/java/net/minecraft/server/Vector3f.java b/src/main/java/net/minecraft/server/Vector3f.java
+diff --git a/src/main/java/net/minecraft/core/Vector3f.java b/src/main/java/net/minecraft/core/Vector3f.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/Vector3f.java
+--- a/src/main/java/net/minecraft/core/Vector3f.java
-+++ b/src/main/java/net/minecraft/server/Vector3f.java
++++ b/src/main/java/net/minecraft/core/Vector3f.java
 @@ -0,0 +0,0 @@ public class Vector3f {
          this(nbttaglist.i(0), nbttaglist.i(1), nbttaglist.i(2));
      }

Spigot-Server-Patches/Add-hand-to-bucket-events.patch

@@ -4,10 +4,41 @@ Date: Thu, 2 Aug 2018 08:44:35 -0500
 Subject: [PATCH] Add hand to bucket events
 
 
-diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
+diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityCow.java
+--- a/src/main/java/net/minecraft/server/level/WorldServer.java
-+++ b/src/main/java/net/minecraft/server/EntityCow.java
++++ b/src/main/java/net/minecraft/server/level/WorldServer.java
+@@ -0,0 +0,0 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+         this.getMinecraftServer().getPlayerList().sendAll(new PacketPlayOutSpawnPosition(blockposition, f));
+     }
+ 
+-    public BlockPosition getSpawn() {
+-        BlockPosition blockposition = new BlockPosition(this.worldData.a(), this.worldData.b(), this.worldData.c());
+-
+-        if (!this.getWorldBorder().a(blockposition)) {
+-            blockposition = this.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING, new BlockPosition(this.getWorldBorder().getCenterX(), 0.0D, this.getWorldBorder().getCenterZ()));
+-        }
+-
+-        return blockposition;
+-    }
++    // Paper - moved up to World
++    //public BlockPosition getSpawn() {
++    //    BlockPosition blockposition = new BlockPosition(this.worldData.a(), this.worldData.b(), this.worldData.c());
++    //
++    //    if (!this.getWorldBorder().a(blockposition)) {
++    //        blockposition = this.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING, new BlockPosition(this.getWorldBorder().getCenterX(), 0.0D, this.getWorldBorder().getCenterZ()));
++    //    }
++    //
++    //    return blockposition;
++    //}
++    // Paper end
+ 
+     public float v() {
+         return this.worldData.d();
+diff --git a/src/main/java/net/minecraft/world/entity/animal/EntityCow.java b/src/main/java/net/minecraft/world/entity/animal/EntityCow.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/EntityCow.java
++++ b/src/main/java/net/minecraft/world/entity/animal/EntityCow.java
 @@ -0,0 +0,0 @@ public class EntityCow extends EntityAnimal {
  
          if (itemstack.getItem() == Items.BUCKET && !this.isBaby()) {
@@ -17,10 +48,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
              if (event.isCancelled()) {
                  return EnumInteractionResult.PASS;
-diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java
+diff --git a/src/main/java/net/minecraft/world/item/ItemBucket.java b/src/main/java/net/minecraft/world/item/ItemBucket.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/ItemBucket.java
+--- a/src/main/java/net/minecraft/world/item/ItemBucket.java
-+++ b/src/main/java/net/minecraft/server/ItemBucket.java
++++ b/src/main/java/net/minecraft/world/item/ItemBucket.java
 @@ -0,0 +0,0 @@ public class ItemBucket extends Item {
                      if (iblockdata.getBlock() instanceof IFluidSource) {
                          // CraftBukkit start
@@ -72,10 +103,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              } else if (world.getDimensionManager().isNether() && this.fluidType.a((Tag) TagsFluid.WATER)) {
                  int i = blockposition.getX();
                  int j = blockposition.getY();
-diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
+diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/World.java
+--- a/src/main/java/net/minecraft/world/level/World.java
-+++ b/src/main/java/net/minecraft/server/World.java
++++ b/src/main/java/net/minecraft/world/level/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
      }
      // Paper end
@@ -94,37 +125,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      @Override
      public boolean s_() {
          return this.isClientSide;
-diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/WorldServer.java
-+++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -0,0 +0,0 @@ public class WorldServer extends World implements GeneratorAccessSeed {
-         this.getMinecraftServer().getPlayerList().sendAll(new PacketPlayOutSpawnPosition(blockposition, f));
-     }
- 
--    public BlockPosition getSpawn() {
--        BlockPosition blockposition = new BlockPosition(this.worldData.a(), this.worldData.b(), this.worldData.c());
--
--        if (!this.getWorldBorder().a(blockposition)) {
--            blockposition = this.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING, new BlockPosition(this.getWorldBorder().getCenterX(), 0.0D, this.getWorldBorder().getCenterZ()));
--        }
--
--        return blockposition;
--    }
-+    // Paper - moved up to World
-+    //public BlockPosition getSpawn() {
-+    //    BlockPosition blockposition = new BlockPosition(this.worldData.a(), this.worldData.b(), this.worldData.c());
-+    //
-+    //    if (!this.getWorldBorder().a(blockposition)) {
-+    //        blockposition = this.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING, new BlockPosition(this.getWorldBorder().getCenterX(), 0.0D, this.getWorldBorder().getCenterZ()));
-+    //    }
-+    //
-+    //    return blockposition;
-+    //}
-+    // Paper end
- 
-     public float v() {
-         return this.worldData.d();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -141,7 +141,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ public class CraftEventFactory {
      }
  
-     private static PlayerEvent getPlayerBucketEvent(boolean isFilling, WorldServer world, EntityHuman who, BlockPosition changed, BlockPosition clicked, EnumDirection clickedFace, ItemStack itemstack, net.minecraft.server.Item item) {
+     private static PlayerEvent getPlayerBucketEvent(boolean isFilling, WorldServer world, EntityHuman who, BlockPosition changed, BlockPosition clicked, EnumDirection clickedFace, ItemStack itemstack, net.minecraft.world.item.Item item) {
 +        // Paper start - add enumHand
 +        return getPlayerBucketEvent(isFilling, world, who, changed, clicked, clickedFace, itemstack, item, null);
 +    }
@@ -150,11 +150,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        return (PlayerBucketEmptyEvent) getPlayerBucketEvent(false, world, who, changed, clicked, clickedFace, itemstack, Items.BUCKET, enumHand);
 +    }
 +
-+    public static PlayerBucketFillEvent callPlayerBucketFillEvent(World world, EntityHuman who, BlockPosition changed, BlockPosition clicked, EnumDirection clickedFace, ItemStack itemInHand, net.minecraft.server.Item bucket, EnumHand enumHand) {
++    public static PlayerBucketFillEvent callPlayerBucketFillEvent(World world, EntityHuman who, BlockPosition changed, BlockPosition clicked, EnumDirection clickedFace, ItemStack itemInHand, net.minecraft.world.item.Item bucket, EnumHand enumHand) {
 +        return (PlayerBucketFillEvent) getPlayerBucketEvent(true, world, who, clicked, changed, clickedFace, itemInHand, bucket, enumHand);
 +    }
 +
-+    private static PlayerEvent getPlayerBucketEvent(boolean isFilling, World world, EntityHuman who, BlockPosition changed, BlockPosition clicked, EnumDirection clickedFace, ItemStack itemstack, net.minecraft.server.Item item, EnumHand enumHand) {
++    private static PlayerEvent getPlayerBucketEvent(boolean isFilling, World world, EntityHuman who, BlockPosition changed, BlockPosition clicked, EnumDirection clickedFace, ItemStack itemstack, net.minecraft.world.item.Item item, EnumHand enumHand) {
 +        // Paper end
          Player player = (Player) who.getBukkitEntity();
          CraftItemStack itemInHand = CraftItemStack.asNewCraftStack(item);

Spigot-Server-Patches/Add-handshake-event-to-allow-plugins-to-handle-clien.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client
  handshaking logic themselves
 
 
-diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
+diff --git a/src/main/java/net/minecraft/server/network/HandshakeListener.java b/src/main/java/net/minecraft/server/network/HandshakeListener.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/HandshakeListener.java
+--- a/src/main/java/net/minecraft/server/network/HandshakeListener.java
-+++ b/src/main/java/net/minecraft/server/HandshakeListener.java
++++ b/src/main/java/net/minecraft/server/network/HandshakeListener.java
 @@ -0,0 +0,0 @@ public class HandshakeListener implements PacketHandshakingInListener {
      // CraftBukkit end
      private static final IChatBaseComponent a = new ChatComponentText("Ignoring status request");

Spigot-Server-Patches/Add-ignore-discounts-API.patch

@@ -4,10 +4,10 @@ Date: Mon, 9 Nov 2020 20:44:51 +0100
 Subject: [PATCH] Add ignore discounts API
 
 
-diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
+diff --git a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityVillager.java
+--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
-+++ b/src/main/java/net/minecraft/server/EntityVillager.java
++++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
 @@ -0,0 +0,0 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
  
              while (iterator.hasNext()) {
@@ -24,10 +24,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  double d0 = 0.3D + 0.0625D * (double) j;
                  int k = (int) Math.floor(d0 * (double) merchantrecipe1.a().getCount());
  
-diff --git a/src/main/java/net/minecraft/server/MerchantRecipe.java b/src/main/java/net/minecraft/server/MerchantRecipe.java
+diff --git a/src/main/java/net/minecraft/world/item/trading/MerchantRecipe.java b/src/main/java/net/minecraft/world/item/trading/MerchantRecipe.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/MerchantRecipe.java
+--- a/src/main/java/net/minecraft/world/item/trading/MerchantRecipe.java
-+++ b/src/main/java/net/minecraft/server/MerchantRecipe.java
++++ b/src/main/java/net/minecraft/world/item/trading/MerchantRecipe.java
 @@ -0,0 +0,0 @@ public class MerchantRecipe {
      private int demand;
      public float priceMultiplier;
@@ -102,9 +102,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    public CraftMerchantRecipe(ItemStack result, int uses, int maxUses, boolean experienceReward, int experience, float priceMultiplier, boolean ignoreDiscounts) {
 +        super(result, uses, maxUses, experienceReward, experience, priceMultiplier, ignoreDiscounts);
 +        // Paper end
-         this.handle = new net.minecraft.server.MerchantRecipe(
+         this.handle = new net.minecraft.world.item.trading.MerchantRecipe(
-                 net.minecraft.server.ItemStack.b,
+                 net.minecraft.world.item.ItemStack.b,
-                 net.minecraft.server.ItemStack.b,
+                 net.minecraft.world.item.ItemStack.b,
 @@ -0,0 +0,0 @@ public class CraftMerchantRecipe extends MerchantRecipe {
                  maxUses,
                  experience,
@@ -129,7 +129,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +    // Paper end
 +
-     public net.minecraft.server.MerchantRecipe toMinecraft() {
+     public net.minecraft.world.item.trading.MerchantRecipe toMinecraft() {
          List<ItemStack> ingredients = getIngredients();
          Preconditions.checkState(!ingredients.isEmpty(), "No offered ingredients");
 @@ -0,0 +0,0 @@ public class CraftMerchantRecipe extends MerchantRecipe {

Spigot-Server-Patches/Add-more-Evoker-API.patch

@@ -4,11 +4,11 @@ Date: Sun, 23 Aug 2020 15:28:35 +0200
 Subject: [PATCH] Add more Evoker API
 
 
-diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
+diff --git a/src/main/java/net/minecraft/world/entity/monster/EntityEvoker.java b/src/main/java/net/minecraft/world/entity/monster/EntityEvoker.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityEvoker.java
+--- a/src/main/java/net/minecraft/world/entity/monster/EntityEvoker.java
-+++ b/src/main/java/net/minecraft/server/EntityEvoker.java
++++ b/src/main/java/net/minecraft/world/entity/monster/EntityEvoker.java
-@@ -0,0 +0,0 @@ import javax.annotation.Nullable;
+@@ -0,0 +0,0 @@ import net.minecraft.world.phys.shapes.VoxelShape;
  
  public class EntityEvoker extends EntityIllagerWizard {
  

Spigot-Server-Patches/Add-more-Witch-API.patch

@@ -4,12 +4,12 @@ Date: Fri, 12 Oct 2018 14:10:46 -0500
 Subject: [PATCH] Add more Witch API
 
 
-diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
+diff --git a/src/main/java/net/minecraft/world/entity/monster/EntityWitch.java b/src/main/java/net/minecraft/world/entity/monster/EntityWitch.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityWitch.java
+--- a/src/main/java/net/minecraft/world/entity/monster/EntityWitch.java
-+++ b/src/main/java/net/minecraft/server/EntityWitch.java
++++ b/src/main/java/net/minecraft/world/entity/monster/EntityWitch.java
 @@ -0,0 +0,0 @@
- package net.minecraft.server;
+ package net.minecraft.world.entity.monster;
  
 +// Paper start
 +import com.destroystokyo.paper.event.entity.WitchReadyPotionEvent;
@@ -108,11 +108,7 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/m
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
-@@ -0,0 +0,0 @@
+@@ -0,0 +0,0 @@ import net.minecraft.world.entity.monster.EntityWitch;
- package org.bukkit.craftbukkit.entity;
- 
--import com.destroystokyo.paper.entity.CraftRangedEntity; // Paper
- import net.minecraft.server.EntityWitch;
  import org.bukkit.craftbukkit.CraftServer;
  import org.bukkit.entity.EntityType;
  import org.bukkit.entity.Witch;
@@ -124,9 +120,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import org.bukkit.inventory.ItemStack;
 +// Paper end
  
- public class CraftWitch extends CraftRaider implements Witch, CraftRangedEntity<EntityWitch> { // Paper
+ public class CraftWitch extends CraftRaider implements Witch, com.destroystokyo.paper.entity.CraftRangedEntity<EntityWitch> { // Paper
      public CraftWitch(CraftServer server, EntityWitch entity) {
-@@ -0,0 +0,0 @@ public class CraftWitch extends CraftRaider implements Witch, CraftRangedEntity<
+@@ -0,0 +0,0 @@ public class CraftWitch extends CraftRaider implements Witch, com.destroystokyo.
      public EntityType getType() {
          return EntityType.WITCH;
      }

Spigot-Server-Patches/Add-more-Zombie-API.patch

@@ -4,10 +4,10 @@ Date: Sun, 7 Oct 2018 04:29:59 -0500
 Subject: [PATCH] Add more Zombie API
 
 
-diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
+diff --git a/src/main/java/net/minecraft/world/entity/monster/EntityZombie.java b/src/main/java/net/minecraft/world/entity/monster/EntityZombie.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityZombie.java
+--- a/src/main/java/net/minecraft/world/entity/monster/EntityZombie.java
-+++ b/src/main/java/net/minecraft/server/EntityZombie.java
++++ b/src/main/java/net/minecraft/world/entity/monster/EntityZombie.java
 @@ -0,0 +0,0 @@ public class EntityZombie extends EntityMonster {
      private int bt;
      public int drownedConversionTime;

Spigot-Server-Patches/Add-option-to-allow-iron-golems-to-spawn-in-air.patch

@@ -20,10 +20,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public boolean armorStandEntityLookups = true;
      private void armorStandEntityLookups() {
          armorStandEntityLookups = getBoolean("armor-stands-do-collision-entity-lookups", true);
-diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java
+diff --git a/src/main/java/net/minecraft/world/entity/animal/EntityIronGolem.java b/src/main/java/net/minecraft/world/entity/animal/EntityIronGolem.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityIronGolem.java
+--- a/src/main/java/net/minecraft/world/entity/animal/EntityIronGolem.java
-+++ b/src/main/java/net/minecraft/server/EntityIronGolem.java
++++ b/src/main/java/net/minecraft/world/entity/animal/EntityIronGolem.java
 @@ -0,0 +0,0 @@ public class EntityIronGolem extends EntityGolem implements IEntityAngerable {
          BlockPosition blockposition1 = blockposition.down();
          IBlockData iblockdata = iworldreader.getType(blockposition1);

Spigot-Server-Patches/Add-option-to-disable-pillager-patrols.patch

@@ -18,10 +18,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        disablePillagerPatrols = getBoolean("game-mechanics.disable-pillager-patrols", disablePillagerPatrols);
 +    }
  }
-diff --git a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java
+diff --git a/src/main/java/net/minecraft/world/level/levelgen/MobSpawnerPatrol.java b/src/main/java/net/minecraft/world/level/levelgen/MobSpawnerPatrol.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java
+--- a/src/main/java/net/minecraft/world/level/levelgen/MobSpawnerPatrol.java
-+++ b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java
++++ b/src/main/java/net/minecraft/world/level/levelgen/MobSpawnerPatrol.java
 @@ -0,0 +0,0 @@ public class MobSpawnerPatrol implements MobSpawner {
  
      @Override

Spigot-Server-Patches/Add-option-to-make-parrots-stay-on-shoulders-despite.patch

@@ -25,23 +25,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        log("Parrots are unaffected by player movement: " + parrotsHangOnBetter);
 +    }
  }
-diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
+diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityHuman.java
+--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/EntityHuman.java
++++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-@@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
-         this.j(this.getShoulderEntityLeft());
-         this.j(this.getShoulderEntityRight());
-         if (!this.world.isClientSide && (this.fallDistance > 0.5F || this.isInWater()) || this.abilities.isFlying || this.isSleeping()) {
--            this.releaseShoulderEntities();
-+            if (!this.world.paperConfig.parrotsHangOnBetter) this.releaseShoulderEntities(); // Paper - Hang on!
-         }
- 
-     }
-diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn {
          switch (packetplayinentityaction.c()) {
              case PRESS_SHIFT_KEY:
@@ -56,3 +43,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  break;
              case RELEASE_SHIFT_KEY:
                  this.player.setSneaking(false);
+diff --git a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
++++ b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
+@@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
+         this.j(this.getShoulderEntityLeft());
+         this.j(this.getShoulderEntityRight());
+         if (!this.world.isClientSide && (this.fallDistance > 0.5F || this.isInWater()) || this.abilities.isFlying || this.isSleeping()) {
+-            this.releaseShoulderEntities();
++            if (!this.world.paperConfig.parrotsHangOnBetter) this.releaseShoulderEntities(); // Paper - Hang on!
+         }
+ 
+     }

Spigot-Server-Patches/Add-option-to-nerf-pigmen-from-nether-portals.patch

@@ -18,24 +18,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        nerfNetherPortalPigmen = getBoolean("game-mechanics.nerf-pigmen-from-nether-portals", nerfNetherPortalPigmen);
 +    }
  }
-diff --git a/src/main/java/net/minecraft/server/BlockPortal.java b/src/main/java/net/minecraft/server/BlockPortal.java
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/BlockPortal.java
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/server/BlockPortal.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public class BlockPortal extends Block {
+@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
- 
-                 if (entity != null) {
-                     entity.resetPortalCooldown();
-+                    entity.fromNetherPortal = true; // Paper
-+                    if (worldserver.paperConfig.nerfNetherPortalPigmen) ((EntityInsentient) entity).aware = false; // Paper
-                 }
-             }
-         }
-diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/Entity.java
-+++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      public long activatedTick = Integer.MIN_VALUE;
      public boolean isTemporarilyActive = false; // Paper
      public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one
@@ -43,7 +30,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      protected int numCollisions = 0; // Paper
      public void inactiveTick() { }
      // Spigot end
-@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
              if (spawnedViaMobSpawner) {
                  nbttagcompound.setBoolean("Paper.FromMobSpawner", true);
              }
@@ -53,7 +40,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              // Paper end
              return nbttagcompound;
          } catch (Throwable throwable) {
-@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
              }
  
              spawnedViaMobSpawner = nbttagcompound.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status
@@ -61,3 +48,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              if (nbttagcompound.hasKey("Paper.SpawnReason")) {
                  String spawnReasonName = nbttagcompound.getString("Paper.SpawnReason");
                  try {
+diff --git a/src/main/java/net/minecraft/world/level/block/BlockPortal.java b/src/main/java/net/minecraft/world/level/block/BlockPortal.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/level/block/BlockPortal.java
++++ b/src/main/java/net/minecraft/world/level/block/BlockPortal.java
+@@ -0,0 +0,0 @@ public class BlockPortal extends Block {
+ 
+                 if (entity != null) {
+                     entity.resetPortalCooldown();
++                    entity.fromNetherPortal = true; // Paper
++                    if (worldserver.paperConfig.nerfNetherPortalPigmen) ((EntityInsentient) entity).aware = false; // Paper
+                 }
+             }
+         }

Spigot-Server-Patches/Add-option-to-prevent-players-from-moving-into-unloa.patch

@@ -19,10 +19,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        preventMovingIntoUnloadedChunks = getBoolean("prevent-moving-into-unloaded-chunks", false);
 +    }
  }
-diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
+diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PlayerConnection.java
+--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
++++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn {
                  }
                  speed *= 2f; // TODO: Get the speed of the vehicle instead of the player

Spigot-Server-Patches/Add-permission-for-command-blocks.patch

@@ -4,36 +4,23 @@ Date: Sat, 16 May 2020 10:05:30 +0200
 Subject: [PATCH] Add permission for command blocks
 
 
-diff --git a/src/main/java/net/minecraft/server/BlockCommand.java b/src/main/java/net/minecraft/server/BlockCommand.java
+diff --git a/src/main/java/net/minecraft/server/level/PlayerInteractManager.java b/src/main/java/net/minecraft/server/level/PlayerInteractManager.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/BlockCommand.java
+--- a/src/main/java/net/minecraft/server/level/PlayerInteractManager.java
-+++ b/src/main/java/net/minecraft/server/BlockCommand.java
++++ b/src/main/java/net/minecraft/server/level/PlayerInteractManager.java
-@@ -0,0 +0,0 @@ public class BlockCommand extends BlockTileEntity {
+@@ -0,0 +0,0 @@ public class PlayerInteractManager {
-     public EnumInteractionResult interact(IBlockData iblockdata, World world, BlockPosition blockposition, EntityHuman entityhuman, EnumHand enumhand, MovingObjectPositionBlock movingobjectpositionblock) {
+             TileEntity tileentity = this.world.getTileEntity(blockposition);
-         TileEntity tileentity = world.getTileEntity(blockposition);
+             Block block = iblockdata.getBlock();
  
--        if (tileentity instanceof TileEntityCommand && entityhuman.isCreativeAndOp()) {
+-            if ((block instanceof BlockCommand || block instanceof BlockStructure || block instanceof BlockJigsaw) && !this.player.isCreativeAndOp()) {
-+        if (tileentity instanceof TileEntityCommand && (entityhuman.isCreativeAndOp() || (entityhuman.isCreative() && entityhuman.getBukkitEntity().hasPermission("minecraft.commandblock")))) { // Paper - command block permission
++            if ((block instanceof BlockCommand || block instanceof BlockStructure || block instanceof BlockJigsaw) && !this.player.isCreativeAndOp() && !(block instanceof BlockCommand && (this.player.isCreative() && this.player.getBukkitEntity().hasPermission("minecraft.commandblock")))) { // Paper - command block permission
-             entityhuman.a((TileEntityCommand) tileentity);
+                 this.world.notify(blockposition, iblockdata, iblockdata, 3);
-             return EnumInteractionResult.a(world.isClientSide);
+                 return false;
-         } else {
+             } else if (this.player.a((World) this.world, blockposition, this.gamemode)) {
-diff --git a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
+diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
+--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
++++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-@@ -0,0 +0,0 @@ public abstract class CommandBlockListenerAbstract implements ICommandListener {
-     }
- 
-     public EnumInteractionResult a(EntityHuman entityhuman) {
--        if (!entityhuman.isCreativeAndOp()) {
-+        if (!entityhuman.isCreativeAndOp() && !entityhuman.isCreative() && !entityhuman.getBukkitEntity().hasPermission("minecraft.commandblock")) { // Paper - command block permission
-             return EnumInteractionResult.PASS;
-         } else {
-             if (entityhuman.getWorld().isClientSide) {
-diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn {
          PlayerConnectionUtils.ensureMainThread(packetplayinsetcommandblock, this, this.player.getWorldServer());
          if (!this.minecraftServer.getEnableCommandBlock()) {
@@ -52,19 +39,32 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              this.player.sendMessage(new ChatMessage("advMode.notAllowed"), SystemUtils.b);
          } else {
              CommandBlockListenerAbstract commandblocklistenerabstract = packetplayinsetcommandminecart.a(this.player.world);
-diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
+diff --git a/src/main/java/net/minecraft/world/level/CommandBlockListenerAbstract.java b/src/main/java/net/minecraft/world/level/CommandBlockListenerAbstract.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
+--- a/src/main/java/net/minecraft/world/level/CommandBlockListenerAbstract.java
-+++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
++++ b/src/main/java/net/minecraft/world/level/CommandBlockListenerAbstract.java
-@@ -0,0 +0,0 @@ public class PlayerInteractManager {
+@@ -0,0 +0,0 @@ public abstract class CommandBlockListenerAbstract implements ICommandListener {
-             TileEntity tileentity = this.world.getTileEntity(blockposition);
+     }
-             Block block = iblockdata.getBlock();
  
--            if ((block instanceof BlockCommand || block instanceof BlockStructure || block instanceof BlockJigsaw) && !this.player.isCreativeAndOp()) {
+     public EnumInteractionResult a(EntityHuman entityhuman) {
-+            if ((block instanceof BlockCommand || block instanceof BlockStructure || block instanceof BlockJigsaw) && !this.player.isCreativeAndOp() && !(block instanceof BlockCommand && (this.player.isCreative() && this.player.getBukkitEntity().hasPermission("minecraft.commandblock")))) { // Paper - command block permission
+-        if (!entityhuman.isCreativeAndOp()) {
-                 this.world.notify(blockposition, iblockdata, iblockdata, 3);
++        if (!entityhuman.isCreativeAndOp() && !entityhuman.isCreative() && !entityhuman.getBukkitEntity().hasPermission("minecraft.commandblock")) { // Paper - command block permission
-                 return false;
+             return EnumInteractionResult.PASS;
-             } else if (this.player.a((World) this.world, blockposition, this.gamemode)) {
+         } else {
+             if (entityhuman.getWorld().isClientSide) {
+diff --git a/src/main/java/net/minecraft/world/level/block/BlockCommand.java b/src/main/java/net/minecraft/world/level/block/BlockCommand.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/level/block/BlockCommand.java
++++ b/src/main/java/net/minecraft/world/level/block/BlockCommand.java
+@@ -0,0 +0,0 @@ public class BlockCommand extends BlockTileEntity {
+     public EnumInteractionResult interact(IBlockData iblockdata, World world, BlockPosition blockposition, EntityHuman entityhuman, EnumHand enumhand, MovingObjectPositionBlock movingobjectpositionblock) {
+         TileEntity tileentity = world.getTileEntity(blockposition);
+ 
+-        if (tileentity instanceof TileEntityCommand && entityhuman.isCreativeAndOp()) {
++        if (tileentity instanceof TileEntityCommand && (entityhuman.isCreativeAndOp() || (entityhuman.isCreative() && entityhuman.getBukkitEntity().hasPermission("minecraft.commandblock")))) { // Paper - command block permission
+             entityhuman.a((TileEntityCommand) tileentity);
+             return EnumInteractionResult.a(world.isClientSide);
+         } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java

Spigot-Server-Patches/Add-phantom-creative-and-insomniac-controls.patch

@@ -20,22 +20,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        phantomOnlyAttackInsomniacs = getBoolean("phantoms-only-attack-insomniacs", phantomOnlyAttackInsomniacs);
 +    }
  }
-diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
+diff --git a/src/main/java/net/minecraft/world/entity/IEntitySelector.java b/src/main/java/net/minecraft/world/entity/IEntitySelector.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityPhantom.java
+--- a/src/main/java/net/minecraft/world/entity/IEntitySelector.java
-+++ b/src/main/java/net/minecraft/server/EntityPhantom.java
++++ b/src/main/java/net/minecraft/world/entity/IEntitySelector.java
-@@ -0,0 +0,0 @@ public class EntityPhantom extends EntityFlying implements IMonster {
-                         EntityHuman entityhuman = (EntityHuman) iterator.next();
- 
-                         if (EntityPhantom.this.a((EntityLiving) entityhuman, PathfinderTargetCondition.a)) {
-+                            if (!world.paperConfig.phantomOnlyAttackInsomniacs || IEntitySelector.isInsomniac.test(entityhuman)) // Paper
-                             EntityPhantom.this.setGoalTarget(entityhuman, org.bukkit.event.entity.EntityTargetEvent.TargetReason.CLOSEST_PLAYER, true); // CraftBukkit - reason
-                             return true;
-                         }
-diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/IEntitySelector.java
-+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -0,0 +0,0 @@ public final class IEntitySelector {
      public static final Predicate<Entity> g = (entity) -> {
          return !entity.isSpectator();
@@ -44,10 +32,22 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      // Paper start
      public static final Predicate<Entity> affectsSpawning = (entity) -> {
-diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
+diff --git a/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java b/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
+--- a/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
-+++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
++++ b/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
+@@ -0,0 +0,0 @@ public class EntityPhantom extends EntityFlying implements IMonster {
+                         EntityHuman entityhuman = (EntityHuman) iterator.next();
+ 
+                         if (EntityPhantom.this.a((EntityLiving) entityhuman, PathfinderTargetCondition.a)) {
++                            if (!world.paperConfig.phantomOnlyAttackInsomniacs || IEntitySelector.isInsomniac.test(entityhuman)) // Paper
+                             EntityPhantom.this.setGoalTarget(entityhuman, org.bukkit.event.entity.EntityTargetEvent.TargetReason.CLOSEST_PLAYER, true); // CraftBukkit - reason
+                             return true;
+                         }
+diff --git a/src/main/java/net/minecraft/world/level/levelgen/MobSpawnerPhantom.java b/src/main/java/net/minecraft/world/level/levelgen/MobSpawnerPhantom.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/level/levelgen/MobSpawnerPhantom.java
++++ b/src/main/java/net/minecraft/world/level/levelgen/MobSpawnerPhantom.java
 @@ -0,0 +0,0 @@ public class MobSpawnerPhantom implements MobSpawner {
                      while (iterator.hasNext()) {
                          EntityHuman entityhuman = (EntityHuman) iterator.next();

Spigot-Server-Patches/Add-ray-tracing-methods-to-LivingEntity.patch

@@ -4,10 +4,10 @@ Date: Mon, 3 Sep 2018 18:20:03 -0500
 Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 
-diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
+diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityLiving.java
+--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
-+++ b/src/main/java/net/minecraft/server/EntityLiving.java
++++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
          this.broadcastItemBreak(enumhand == EnumHand.MAIN_HAND ? EnumItemSlot.MAINHAND : EnumItemSlot.OFFHAND);
      }

Spigot-Server-Patches/Add-recipe-to-cook-events.patch

@@ -4,10 +4,10 @@ Date: Wed, 6 Jan 2021 12:04:03 -0800
 Subject: [PATCH] Add recipe to cook events
 
 
-diff --git a/src/main/java/net/minecraft/server/TileEntityCampfire.java b/src/main/java/net/minecraft/server/TileEntityCampfire.java
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/TileEntityCampfire.java b/src/main/java/net/minecraft/world/level/block/entity/TileEntityCampfire.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/TileEntityCampfire.java
+--- a/src/main/java/net/minecraft/world/level/block/entity/TileEntityCampfire.java
-+++ b/src/main/java/net/minecraft/server/TileEntityCampfire.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/TileEntityCampfire.java
 @@ -0,0 +0,0 @@ public class TileEntityCampfire extends TileEntity implements Clearable, ITickab
  
                  if (this.cookingTimes[i] >= this.cookingTotalTimes[i]) {
@@ -29,10 +29,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                      this.world.getServer().getPluginManager().callEvent(blockCookEvent);
  
                      if (blockCookEvent.isCancelled()) {
-diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/TileEntityFurnace.java b/src/main/java/net/minecraft/world/level/block/entity/TileEntityFurnace.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
+--- a/src/main/java/net/minecraft/world/level/block/entity/TileEntityFurnace.java
-+++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/TileEntityFurnace.java
 @@ -0,0 +0,0 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
              CraftItemStack source = CraftItemStack.asCraftMirror(itemstack);
              org.bukkit.inventory.ItemStack result = CraftItemStack.asBukkitCopy(itemstack1);

Spigot-Server-Patches/Add-sendOpLevel-API.patch

@@ -4,10 +4,10 @@ Date: Tue, 29 Dec 2020 15:03:03 +0100
 Subject: [PATCH] Add sendOpLevel API
 
 
-diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
+diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PlayerList.java
+--- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/PlayerList.java
++++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -0,0 +0,0 @@ public abstract class PlayerList {
      }
  

Spigot-Server-Patches/Add-setMaxPlayers-API.patch

@@ -4,10 +4,10 @@ Date: Sat, 22 Aug 2020 23:59:30 +0200
 Subject: [PATCH] Add #setMaxPlayers API
 
 
-diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
+diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PlayerList.java
+--- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/PlayerList.java
++++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -0,0 +0,0 @@ public abstract class PlayerList {
      public final WorldNBTStorage playerFileData;
      private boolean hasWhitelist;

Spigot-Server-Patches/Add-setPlayerProfile-API-for-Skulls.patch

@@ -51,15 +51,15 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-@@ -0,0 +0,0 @@ import com.google.common.collect.ImmutableMap.Builder;
+@@ -0,0 +0,0 @@ import net.minecraft.nbt.GameProfileSerializer;
- import com.mojang.authlib.GameProfile;
+ import net.minecraft.nbt.NBTBase;
- import java.util.Map;
+ import net.minecraft.nbt.NBTTagCompound;
- import java.util.UUID;
+ import net.minecraft.world.level.block.entity.TileEntitySkull;
 +import com.destroystokyo.paper.profile.CraftPlayerProfile;
 +import com.destroystokyo.paper.profile.PlayerProfile;
- import net.minecraft.server.GameProfileSerializer;
+ import org.bukkit.Bukkit;
- import net.minecraft.server.NBTBase;
+ import org.bukkit.Material;
- import net.minecraft.server.NBTTagCompound;
+ import org.bukkit.OfflinePlayer;
 @@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.inventory.CraftMetaItem.SerializableMeta;
  import org.bukkit.craftbukkit.util.CraftMagicNumbers;
  import org.bukkit.inventory.meta.SkullMeta;
@@ -88,3 +88,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      @Override
      public OfflinePlayer getOwningPlayer() {
          if (hasOwner()) {
+@@ -0,0 +0,0 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
+         } else {
+             // Paper start - Use Online Players Skull
+             GameProfile newProfile = null;
+-            net.minecraft.server.EntityPlayer player = net.minecraft.server.MinecraftServer.getServer().getPlayerList().getPlayer(name);
++            net.minecraft.server.level.EntityPlayer player = net.minecraft.server.MinecraftServer.getServer().getPlayerList().getPlayer(name);
+             if (player != null) newProfile = player.getProfile();
+             if (newProfile == null) newProfile = new GameProfile(null, name);
+             setProfile(newProfile);

Spigot-Server-Patches/Add-setting-for-proxy-online-mode-status.patch

@@ -30,10 +30,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        return Bukkit.getOnlineMode() || (SpigotConfig.bungee && bungeeOnlineMode);
 +    }
  }
-diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
+diff --git a/src/main/java/net/minecraft/server/players/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/players/NameReferencingFileConverter.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
+--- a/src/main/java/net/minecraft/server/players/NameReferencingFileConverter.java
-+++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
++++ b/src/main/java/net/minecraft/server/players/NameReferencingFileConverter.java
 @@ -0,0 +0,0 @@ public class NameReferencingFileConverter {
              return new String[i];
          });

Spigot-Server-Patches/Add-some-Debug-to-Chunk-Entity-slices.patch

@@ -8,10 +8,22 @@ If we detect unexpected state, log and try to recover
 This should hopefully avoid duplicate entities ever being created
 if the entity was to end up in 2 different chunk slices
 
-diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/Chunk.java
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/server/Chunk.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+             }
+         }
+     };
++    List<Entity> entitySlice = null;
+     // Paper end
+ 
+     public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
+diff --git a/src/main/java/net/minecraft/world/level/chunk/Chunk.java b/src/main/java/net/minecraft/world/level/chunk/Chunk.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/level/chunk/Chunk.java
++++ b/src/main/java/net/minecraft/world/level/chunk/Chunk.java
 @@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
          if (k >= this.entitySlices.length) {
              k = this.entitySlices.length - 1;
@@ -57,15 +69,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          if (!this.entitySlices[i].remove(entity)) {
              return;
          }
-diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/Entity.java
-+++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
-             }
-         }
-     };
-+    List<Entity> entitySlice = null;
-     // Paper end
- 
-     public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper

Spigot-Server-Patches/Add-source-to-PlayerExpChangeEvent.patch

@@ -4,10 +4,10 @@ Date: Thu, 8 Sep 2016 08:48:33 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
 
 
-diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
+diff --git a/src/main/java/net/minecraft/world/entity/EntityExperienceOrb.java b/src/main/java/net/minecraft/world/entity/EntityExperienceOrb.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
+--- a/src/main/java/net/minecraft/world/entity/EntityExperienceOrb.java
-+++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
++++ b/src/main/java/net/minecraft/world/entity/EntityExperienceOrb.java
 @@ -0,0 +0,0 @@ public class EntityExperienceOrb extends Entity {
                  }
  

Spigot-Server-Patches/Add-sun-related-API.patch

@@ -4,10 +4,10 @@ Date: Sun, 7 Oct 2018 00:54:21 -0500
 Subject: [PATCH] Add sun related API
 
 
-diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
+diff --git a/src/main/java/net/minecraft/world/entity/EntityInsentient.java b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityInsentient.java
+--- a/src/main/java/net/minecraft/world/entity/EntityInsentient.java
-+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
++++ b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
 @@ -0,0 +0,0 @@ public abstract class EntityInsentient extends EntityLiving {
  
      }

Spigot-Server-Patches/Add-toggle-for-always-placing-the-dragon-egg.patch

@@ -18,10 +18,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        enderDragonsDeathAlwaysPlacesDragonEgg = getBoolean("ender-dragons-death-always-places-dragon-egg", enderDragonsDeathAlwaysPlacesDragonEgg);
 +    }
  }
-diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
+diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EnderDragonBattle.java b/src/main/java/net/minecraft/world/level/dimension/end/EnderDragonBattle.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
+--- a/src/main/java/net/minecraft/world/level/dimension/end/EnderDragonBattle.java
-+++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
++++ b/src/main/java/net/minecraft/world/level/dimension/end/EnderDragonBattle.java
 @@ -0,0 +0,0 @@ public class EnderDragonBattle {
              this.bossBattle.setVisible(false);
              this.generateExitPortal(true);

Spigot-Server-Patches/Add-velocity-warnings.patch

@@ -68,7 +68,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -0,0 +0,0 @@ public class WatchdogThread extends Thread
                      log.log( Level.SEVERE, "During the run of the server, a physics stackoverflow was supressed" );
-                     log.log( Level.SEVERE, "near " + net.minecraft.server.World.lastPhysicsProblem );
+                     log.log( Level.SEVERE, "near " + net.minecraft.world.level.World.lastPhysicsProblem );
                  }
 -                //
 +                // Paper start - Warn in watchdog if an excessive velocity was ever set

Spigot-Server-Patches/Add-version-history-to-version-command.patch

@@ -201,10 +201,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        }
 +    }
 +}
-diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
+diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/DedicatedServer.java
+--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
++++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -0,0 +0,0 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
              return false;
          }

Spigot-Server-Patches/Add-villager-reputation-API.patch

@@ -19,23 +19,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        return new Reputation(values);
 +    }
 +}
-diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
+diff --git a/src/main/java/net/minecraft/world/entity/ai/gossip/Reputation.java b/src/main/java/net/minecraft/world/entity/ai/gossip/Reputation.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityVillager.java
+--- a/src/main/java/net/minecraft/world/entity/ai/gossip/Reputation.java
-+++ b/src/main/java/net/minecraft/server/EntityVillager.java
++++ b/src/main/java/net/minecraft/world/entity/ai/gossip/Reputation.java
-@@ -0,0 +0,0 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
+@@ -0,0 +0,0 @@ import net.minecraft.core.MinecraftSerializableUUID;
-         this.bD = 0;
-     }
- 
-+    public Reputation getReputation() { return this.fj(); } // Paper - OBFHELPER
-     public Reputation fj() {
-         return this.by;
-     }
-diff --git a/src/main/java/net/minecraft/server/Reputation.java b/src/main/java/net/minecraft/server/Reputation.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/Reputation.java
-+++ b/src/main/java/net/minecraft/server/Reputation.java
-@@ -0,0 +0,0 @@ import java.util.stream.Stream;
  
  public class Reputation {
  
@@ -87,24 +75,36 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      static class b {
+diff --git a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
++++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
+@@ -0,0 +0,0 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
+         this.bD = 0;
+     }
+ 
++    public Reputation getReputation() { return this.fj(); } // Paper - OBFHELPER
+     public Reputation fj() {
+         return this.by;
+     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
-@@ -0,0 +0,0 @@
+@@ -0,0 +0,0 @@ import org.bukkit.entity.Villager;
- package org.bukkit.craftbukkit.entity;
+ import org.bukkit.entity.Villager.Profession;
+ import org.bukkit.entity.Villager.Type;
  
-+import com.destroystokyo.paper.entity.villager.Reputation; // Paper
++// Paper start
- import com.google.common.base.Preconditions;
++import com.destroystokyo.paper.entity.villager.Reputation;
-+import com.google.common.collect.Maps; // Paper
++import com.google.common.collect.Maps;
- import java.util.Locale;
++import java.util.Map;
- import net.minecraft.server.BlockBed;
++import java.util.UUID;
- import net.minecraft.server.BlockPosition;
++// Paper end
-+import java.util.Map; // Paper
++
-+import java.util.UUID; // Paper
+ public class CraftVillager extends CraftAbstractVillager implements Villager {
- import net.minecraft.server.EntityVillager;
+ 
- import net.minecraft.server.IBlockData;
+     public CraftVillager(CraftServer server, EntityVillager entity) {
- import net.minecraft.server.IRegistry;
 @@ -0,0 +0,0 @@ public class CraftVillager extends CraftAbstractVillager implements Villager {
      public static VillagerProfession bukkitToNmsProfession(Profession bukkit) {
          return IRegistry.VILLAGER_PROFESSION.get(CraftNamespacedKey.toMinecraft(bukkit.getKey()));

Spigot-Server-Patches/Add-worldborder-events.patch

@@ -4,14 +4,14 @@ Date: Mon, 4 Jan 2021 22:40:34 -0800
 Subject: [PATCH] Add worldborder events
 
 
-diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
+diff --git a/src/main/java/net/minecraft/world/level/border/WorldBorder.java b/src/main/java/net/minecraft/world/level/border/WorldBorder.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/WorldBorder.java
+--- a/src/main/java/net/minecraft/world/level/border/WorldBorder.java
-+++ b/src/main/java/net/minecraft/server/WorldBorder.java
++++ b/src/main/java/net/minecraft/world/level/border/WorldBorder.java
-@@ -0,0 +0,0 @@ import com.google.common.collect.Lists;
+@@ -0,0 +0,0 @@ import net.minecraft.world.phys.AxisAlignedBB;
- import com.mojang.serialization.DynamicLike;
+ import net.minecraft.world.phys.shapes.OperatorBoolean;
- import java.util.Iterator;
+ import net.minecraft.world.phys.shapes.VoxelShape;
- import java.util.List;
+ import net.minecraft.world.phys.shapes.VoxelShapes;
 +import io.papermc.paper.event.world.border.WorldBorderBoundsChangeFinishEvent; // Paper
 +import io.papermc.paper.event.world.border.WorldBorderCenterChangeEvent; // Paper
 +import io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent; // Paper

Spigot-Server-Patches/Add-zombie-targets-turtle-egg-config.patch

@@ -18,10 +18,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        zombiesTargetTurtleEggs = getBoolean("zombies-target-turtle-eggs", zombiesTargetTurtleEggs);
 +    }
  }
-diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
+diff --git a/src/main/java/net/minecraft/world/entity/monster/EntityZombie.java b/src/main/java/net/minecraft/world/entity/monster/EntityZombie.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityZombie.java
+--- a/src/main/java/net/minecraft/world/entity/monster/EntityZombie.java
-+++ b/src/main/java/net/minecraft/server/EntityZombie.java
++++ b/src/main/java/net/minecraft/world/entity/monster/EntityZombie.java
 @@ -0,0 +0,0 @@ public class EntityZombie extends EntityMonster {
  
      @Override

Spigot-Server-Patches/Added-PlayerLecternPageChangeEvent.patch

@@ -4,10 +4,10 @@ Date: Mon, 23 Nov 2020 12:58:51 -0800
 Subject: [PATCH] Added PlayerLecternPageChangeEvent
 
 
-diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java
+diff --git a/src/main/java/net/minecraft/world/inventory/Container.java b/src/main/java/net/minecraft/world/inventory/Container.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/Container.java
+--- a/src/main/java/net/minecraft/world/inventory/Container.java
-+++ b/src/main/java/net/minecraft/server/Container.java
++++ b/src/main/java/net/minecraft/world/inventory/Container.java
 @@ -0,0 +0,0 @@ public abstract class Container {
          this.getSlot(i).set(itemstack);
      }
@@ -16,10 +16,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public void a(int i, int j) {
          ((ContainerProperty) this.d.get(i)).set(j);
      }
-diff --git a/src/main/java/net/minecraft/server/ContainerLectern.java b/src/main/java/net/minecraft/server/ContainerLectern.java
+diff --git a/src/main/java/net/minecraft/world/inventory/ContainerLectern.java b/src/main/java/net/minecraft/world/inventory/ContainerLectern.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/ContainerLectern.java
+--- a/src/main/java/net/minecraft/world/inventory/ContainerLectern.java
-+++ b/src/main/java/net/minecraft/server/ContainerLectern.java
++++ b/src/main/java/net/minecraft/world/inventory/ContainerLectern.java
 @@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.inventory.CraftInventoryView;
  import org.bukkit.entity.Player;
  import org.bukkit.event.player.PlayerTakeLecternBookEvent;

Spigot-Server-Patches/Added-PlayerLoomPatternSelectEvent.patch

@@ -4,10 +4,10 @@ Date: Wed, 25 Nov 2020 16:33:27 -0800
 Subject: [PATCH] Added PlayerLoomPatternSelectEvent
 
 
-diff --git a/src/main/java/net/minecraft/server/ContainerLoom.java b/src/main/java/net/minecraft/server/ContainerLoom.java
+diff --git a/src/main/java/net/minecraft/world/inventory/ContainerLoom.java b/src/main/java/net/minecraft/world/inventory/ContainerLoom.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/ContainerLoom.java
+--- a/src/main/java/net/minecraft/world/inventory/ContainerLoom.java
-+++ b/src/main/java/net/minecraft/server/ContainerLoom.java
++++ b/src/main/java/net/minecraft/world/inventory/ContainerLoom.java
 @@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.inventory.CraftInventoryLoom;
  import org.bukkit.craftbukkit.inventory.CraftInventoryView;
  import org.bukkit.entity.Player;
@@ -49,10 +49,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              this.j();
              return true;
          } else {
-diff --git a/src/main/java/net/minecraft/server/EnumBannerPatternType.java b/src/main/java/net/minecraft/server/EnumBannerPatternType.java
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/EnumBannerPatternType.java b/src/main/java/net/minecraft/world/level/block/entity/EnumBannerPatternType.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EnumBannerPatternType.java
+--- a/src/main/java/net/minecraft/world/level/block/entity/EnumBannerPatternType.java
-+++ b/src/main/java/net/minecraft/server/EnumBannerPatternType.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/EnumBannerPatternType.java
 @@ -0,0 +0,0 @@ public enum EnumBannerPatternType {
          this.T = flag;
      }

Spigot-Server-Patches/Added-PlayerStonecutterRecipeSelectEvent.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Added PlayerStonecutterRecipeSelectEvent
 
 Co-Authored-By: MiniDigger | Martin <admin@minidigger.dev>
 
-diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java
+diff --git a/src/main/java/net/minecraft/world/inventory/Container.java b/src/main/java/net/minecraft/world/inventory/Container.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/Container.java
+--- a/src/main/java/net/minecraft/world/inventory/Container.java
-+++ b/src/main/java/net/minecraft/server/Container.java
++++ b/src/main/java/net/minecraft/world/inventory/Container.java
 @@ -0,0 +0,0 @@ public abstract class Container {
          return slot;
      }
@@ -18,10 +18,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          this.d.add(containerproperty);
          return containerproperty;
      }
-diff --git a/src/main/java/net/minecraft/server/ContainerProperty.java b/src/main/java/net/minecraft/server/ContainerProperty.java
+diff --git a/src/main/java/net/minecraft/world/inventory/ContainerProperty.java b/src/main/java/net/minecraft/world/inventory/ContainerProperty.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/ContainerProperty.java
+--- a/src/main/java/net/minecraft/world/inventory/ContainerProperty.java
-+++ b/src/main/java/net/minecraft/server/ContainerProperty.java
++++ b/src/main/java/net/minecraft/world/inventory/ContainerProperty.java
 @@ -0,0 +0,0 @@ public abstract class ContainerProperty {
          };
      }
@@ -40,10 +40,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          int i = this.get();
          boolean flag = i != this.a;
  
-diff --git a/src/main/java/net/minecraft/server/ContainerStonecutter.java b/src/main/java/net/minecraft/server/ContainerStonecutter.java
+diff --git a/src/main/java/net/minecraft/world/inventory/ContainerStonecutter.java b/src/main/java/net/minecraft/world/inventory/ContainerStonecutter.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/ContainerStonecutter.java
+--- a/src/main/java/net/minecraft/world/inventory/ContainerStonecutter.java
-+++ b/src/main/java/net/minecraft/server/ContainerStonecutter.java
++++ b/src/main/java/net/minecraft/world/inventory/ContainerStonecutter.java
 @@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.inventory.CraftInventoryStonecutter;
  import org.bukkit.craftbukkit.inventory.CraftInventoryView;
  import org.bukkit.entity.Player;

Spigot-Server-Patches/Added-ServerResourcesReloadedEvent.patch

@@ -4,35 +4,6 @@ Date: Wed, 2 Dec 2020 20:04:01 -0800
 Subject: [PATCH] Added ServerResourcesReloadedEvent
 
 
-diff --git a/src/main/java/net/minecraft/server/CommandReload.java b/src/main/java/net/minecraft/server/CommandReload.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/CommandReload.java
-+++ b/src/main/java/net/minecraft/server/CommandReload.java
-@@ -0,0 +0,0 @@ import java.util.Collection;
- import java.util.Iterator;
- import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
-+import io.papermc.paper.event.server.ServerResourcesReloadedEvent; // Paper
- 
- public class CommandReload {
- 
-     private static final Logger LOGGER = LogManager.getLogger();
- 
-     public static void a(Collection<String> collection, CommandListenerWrapper commandlistenerwrapper) {
--        commandlistenerwrapper.getServer().a(collection).exceptionally((throwable) -> {
-+        commandlistenerwrapper.getServer().reloadServerResources(collection, ServerResourcesReloadedEvent.Cause.COMMAND).exceptionally((throwable) -> { // Paper
-             CommandReload.LOGGER.warn("Failed to execute reload", throwable);
-             commandlistenerwrapper.sendFailureMessage(new ChatMessage("commands.reload.failure"));
-             return null;
-@@ -0,0 +0,0 @@ public class CommandReload {
-         SaveData savedata = minecraftserver.getSaveData();
-         Collection<String> collection = resourcepackrepository.d();
-         Collection<String> collection1 = a(resourcepackrepository, savedata, collection);
--        minecraftserver.a(collection1);
-+        minecraftserver.reloadServerResources(collection1, ServerResourcesReloadedEvent.Cause.PLUGIN); // Paper
-     }
-     // CraftBukkit end
- 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -47,16 +18,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import com.google.common.collect.Lists;
  import com.google.common.collect.Maps;
  import com.google.common.collect.Sets;
-@@ -0,0 +0,0 @@ import com.mojang.serialization.Lifecycle;
+@@ -0,0 +0,0 @@ import org.bukkit.event.server.ServerLoadEvent;
- import com.google.common.collect.ImmutableSet;
- // import jline.console.ConsoleReader; // Paper
- import joptsimple.OptionSet;
--import org.bukkit.Bukkit;
--import org.bukkit.craftbukkit.CraftServer;
--import org.bukkit.craftbukkit.Main;
- import org.bukkit.event.server.ServerLoadEvent;
- // CraftBukkit end
- 
  import co.aikar.timings.MinecraftTimings; // Paper
  import org.spigotmc.SlackActivityAccountant; // Spigot
  import io.papermc.paper.util.PaperJvmChecker; // Paper
@@ -86,3 +48,32 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              if (Thread.currentThread() != this.serverThread) return; // Paper
              //this.getPlayerList().savePlayers(); // Paper - we don't need to do this
              this.getPlayerList().reload();
+diff --git a/src/main/java/net/minecraft/server/commands/CommandReload.java b/src/main/java/net/minecraft/server/commands/CommandReload.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/commands/CommandReload.java
++++ b/src/main/java/net/minecraft/server/commands/CommandReload.java
+@@ -0,0 +0,0 @@ import net.minecraft.server.packs.repository.ResourcePackRepository;
+ import net.minecraft.world.level.storage.SaveData;
+ import org.apache.logging.log4j.LogManager;
+ import org.apache.logging.log4j.Logger;
++import io.papermc.paper.event.server.ServerResourcesReloadedEvent; // Paper
+ 
+ public class CommandReload {
+ 
+     private static final Logger LOGGER = LogManager.getLogger();
+ 
+     public static void a(Collection<String> collection, CommandListenerWrapper commandlistenerwrapper) {
+-        commandlistenerwrapper.getServer().a(collection).exceptionally((throwable) -> {
++        commandlistenerwrapper.getServer().reloadServerResources(collection, ServerResourcesReloadedEvent.Cause.COMMAND).exceptionally((throwable) -> { // Paper
+             CommandReload.LOGGER.warn("Failed to execute reload", throwable);
+             commandlistenerwrapper.sendFailureMessage(new ChatMessage("commands.reload.failure"));
+             return null;
+@@ -0,0 +0,0 @@ public class CommandReload {
+         SaveData savedata = minecraftserver.getSaveData();
+         Collection<String> collection = resourcepackrepository.d();
+         Collection<String> collection1 = a(resourcepackrepository, savedata, collection);
+-        minecraftserver.a(collection1);
++        minecraftserver.reloadServerResources(collection1, ServerResourcesReloadedEvent.Cause.PLUGIN); // Paper
+     }
+     // CraftBukkit end
+ 

Spigot-Server-Patches/Added-Vanilla-Entity-Tags.patch

@@ -12,10 +12,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@
 +package io.papermc.paper;
 +
-+import net.minecraft.server.Entity;
++import net.minecraft.resources.MinecraftKey;
-+import net.minecraft.server.EntityTypes;
++import net.minecraft.tags.Tags;
-+import net.minecraft.server.MinecraftKey;
++import net.minecraft.world.entity.EntityTypes;
-+import net.minecraft.server.Tags;
 +import org.bukkit.craftbukkit.tag.CraftTag;
 +import org.bukkit.craftbukkit.util.CraftMagicNumbers;
 +import org.bukkit.entity.EntityType;
@@ -65,14 +64,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private static final Map<Material, Block> MATERIAL_BLOCK = new HashMap<>();
      private static final Map<Material, FluidType> MATERIAL_FLUID = new HashMap<>();
 +    // Paper start
-+    private static final Map<org.bukkit.entity.EntityType, net.minecraft.server.EntityTypes<?>> ENTITY_TYPE_ENTITY_TYPES = new HashMap<>();
++    private static final Map<org.bukkit.entity.EntityType, net.minecraft.world.entity.EntityTypes<?>> ENTITY_TYPE_ENTITY_TYPES = new HashMap<>();
-+    private static final Map<net.minecraft.server.EntityTypes<?>, org.bukkit.entity.EntityType> ENTITY_TYPES_ENTITY_TYPE = new HashMap<>();
++    private static final Map<net.minecraft.world.entity.EntityTypes<?>, org.bukkit.entity.EntityType> ENTITY_TYPES_ENTITY_TYPE = new HashMap<>();
  
      static {
 +        for (org.bukkit.entity.EntityType type : org.bukkit.entity.EntityType.values()) {
 +            if (type == org.bukkit.entity.EntityType.UNKNOWN) continue;
-+            ENTITY_TYPE_ENTITY_TYPES.put(type, net.minecraft.server.IRegistry.ENTITY_TYPE.get(CraftNamespacedKey.toMinecraft(type.getKey())));
++            ENTITY_TYPE_ENTITY_TYPES.put(type, IRegistry.ENTITY_TYPE.get(CraftNamespacedKey.toMinecraft(type.getKey())));
-+            ENTITY_TYPES_ENTITY_TYPE.put(net.minecraft.server.IRegistry.ENTITY_TYPE.get(CraftNamespacedKey.toMinecraft(type.getKey())), type);
++            ENTITY_TYPES_ENTITY_TYPE.put(IRegistry.ENTITY_TYPE.get(CraftNamespacedKey.toMinecraft(type.getKey())), type);
 +        }
 +        // Paper end
          for (Block block : IRegistry.BLOCK) {
@@ -83,10 +82,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          return CraftNamespacedKey.toMinecraft(mat.getKey());
      }
 +    // Paper start
-+    public static net.minecraft.server.EntityTypes<?> getEntityTypes(org.bukkit.entity.EntityType type) {
++    public static net.minecraft.world.entity.EntityTypes<?> getEntityTypes(org.bukkit.entity.EntityType type) {
 +        return ENTITY_TYPE_ENTITY_TYPES.get(type);
 +    }
-+    public static org.bukkit.entity.EntityType getEntityType(net.minecraft.server.EntityTypes<?> entityTypes) {
++    public static org.bukkit.entity.EntityType getEntityType(net.minecraft.world.entity.EntityTypes<?> entityTypes) {
 +        return ENTITY_TYPES_ENTITY_TYPE.get(entityTypes);
 +    }
 +    // Paper end

Spigot-Server-Patches/Added-WorldGameRuleChangeEvent.patch

@@ -4,10 +4,10 @@ Date: Sun, 20 Dec 2020 16:41:44 -0800
 Subject: [PATCH] Added WorldGameRuleChangeEvent
 
 
-diff --git a/src/main/java/net/minecraft/server/CommandGamerule.java b/src/main/java/net/minecraft/server/CommandGamerule.java
+diff --git a/src/main/java/net/minecraft/server/commands/CommandGamerule.java b/src/main/java/net/minecraft/server/commands/CommandGamerule.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/CommandGamerule.java
+--- a/src/main/java/net/minecraft/server/commands/CommandGamerule.java
-+++ b/src/main/java/net/minecraft/server/CommandGamerule.java
++++ b/src/main/java/net/minecraft/server/commands/CommandGamerule.java
 @@ -0,0 +0,0 @@ public class CommandGamerule {
          CommandListenerWrapper commandlistenerwrapper = (CommandListenerWrapper) commandcontext.getSource();
          T t0 = commandlistenerwrapper.getWorld().getGameRules().get(gamerules_gamerulekey); // CraftBukkit
@@ -17,12 +17,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          commandlistenerwrapper.sendMessage(new ChatMessage("commands.gamerule.set", new Object[]{gamerules_gamerulekey.a(), t0.toString()}), true);
          return t0.getIntValue();
      }
-diff --git a/src/main/java/net/minecraft/server/GameRules.java b/src/main/java/net/minecraft/server/GameRules.java
+diff --git a/src/main/java/net/minecraft/world/level/GameRules.java b/src/main/java/net/minecraft/world/level/GameRules.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/GameRules.java
+--- a/src/main/java/net/minecraft/world/level/GameRules.java
-+++ b/src/main/java/net/minecraft/server/GameRules.java
++++ b/src/main/java/net/minecraft/world/level/GameRules.java
-@@ -0,0 +0,0 @@ import java.util.function.Supplier;
+@@ -0,0 +0,0 @@ import net.minecraft.server.MinecraftServer;
- import javax.annotation.Nullable;
+ import net.minecraft.server.level.EntityPlayer;
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
 +import io.papermc.paper.event.world.WorldGameRuleChangeEvent; // Paper

Spigot-Server-Patches/Added-firing-of-PlayerChangeBeaconEffectEvent.patch

@@ -4,20 +4,21 @@ Date: Wed, 24 Jun 2020 15:14:51 -0600
 Subject: [PATCH] Added firing of PlayerChangeBeaconEffectEvent
 
 
-diff --git a/src/main/java/net/minecraft/server/ContainerBeacon.java b/src/main/java/net/minecraft/server/ContainerBeacon.java
+diff --git a/src/main/java/net/minecraft/world/inventory/ContainerBeacon.java b/src/main/java/net/minecraft/world/inventory/ContainerBeacon.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/ContainerBeacon.java
+--- a/src/main/java/net/minecraft/world/inventory/ContainerBeacon.java
-+++ b/src/main/java/net/minecraft/server/ContainerBeacon.java
++++ b/src/main/java/net/minecraft/world/inventory/ContainerBeacon.java
-@@ -0,0 +0,0 @@
+@@ -0,0 +0,0 @@ import net.minecraft.world.entity.player.PlayerInventory;
- package net.minecraft.server;
+ import org.bukkit.craftbukkit.inventory.CraftInventoryView;
+ // CraftBukkit end
  
- import org.bukkit.craftbukkit.inventory.CraftInventoryView; // CraftBukkit
 +// Paper start
 +import io.papermc.paper.event.player.PlayerChangeBeaconEffectEvent;
 +// Paper end
- 
++
  public class ContainerBeacon extends Container {
  
+     private final IInventory beacon;
 @@ -0,0 +0,0 @@ public class ContainerBeacon extends Container {
  
      public void c(int i, int j) {

Spigot-Server-Patches/Added-world-settings-for-mobs-picking-up-loot.patch

@@ -23,10 +23,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public int expMergeMaxValue;
      private void expMergeMaxValue() {
          expMergeMaxValue = getInt("experience-merge-max-value", -1);
-diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
+diff --git a/src/main/java/net/minecraft/world/entity/monster/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/world/entity/monster/EntitySkeletonAbstract.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
+--- a/src/main/java/net/minecraft/world/entity/monster/EntitySkeletonAbstract.java
-+++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
++++ b/src/main/java/net/minecraft/world/entity/monster/EntitySkeletonAbstract.java
 @@ -0,0 +0,0 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
          this.a(difficultydamagescaler);
          this.b(difficultydamagescaler);
@@ -36,10 +36,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          if (this.getEquipment(EnumItemSlot.HEAD).isEmpty()) {
              LocalDate localdate = LocalDate.now();
              int i = localdate.get(ChronoField.DAY_OF_MONTH);
-diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
+diff --git a/src/main/java/net/minecraft/world/entity/monster/EntityZombie.java b/src/main/java/net/minecraft/world/entity/monster/EntityZombie.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityZombie.java
+--- a/src/main/java/net/minecraft/world/entity/monster/EntityZombie.java
-+++ b/src/main/java/net/minecraft/server/EntityZombie.java
++++ b/src/main/java/net/minecraft/world/entity/monster/EntityZombie.java
 @@ -0,0 +0,0 @@ public class EntityZombie extends EntityMonster {
          Object object = super.prepare(worldaccess, difficultydamagescaler, enummobspawn, groupdataentity, nbttagcompound);
          float f = difficultydamagescaler.d();

Spigot-Server-Patches/Adventure.patch

@@ -36,9 +36,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import net.kyori.adventure.text.Component;
 +import net.kyori.adventure.text.TextComponent;
 +import net.kyori.adventure.text.serializer.plain.PlainComponentSerializer;
-+import net.minecraft.server.ChatModifier;
++import net.minecraft.network.chat.ChatModifier;
-+import net.minecraft.server.IChatBaseComponent;
++import net.minecraft.network.chat.IChatBaseComponent;
-+import net.minecraft.server.IChatMutableComponent;
++import net.minecraft.network.chat.IChatMutableComponent;
 +import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 +import org.checkerframework.checker.nullness.qual.Nullable;
 +
@@ -123,9 +123,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import net.kyori.adventure.text.Component;
 +import net.kyori.adventure.text.TextReplacementConfig;
 +import net.kyori.adventure.text.event.ClickEvent;
-+import net.minecraft.server.EntityPlayer;
++import net.kyori.adventure.text.format.Style;
-+import net.minecraft.server.IChatBaseComponent;
++import net.kyori.adventure.text.format.TextDecoration;
++import net.minecraft.network.chat.IChatBaseComponent;
 +import net.minecraft.server.MinecraftServer;
++import net.minecraft.server.level.EntityPlayer;
 +import org.bukkit.Bukkit;
 +import org.bukkit.craftbukkit.entity.CraftPlayer;
 +import org.bukkit.craftbukkit.util.LazyPlayerSet;
@@ -329,7 +331,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@
 +package io.papermc.paper.adventure;
 +
-+import net.minecraft.server.EntityPlayer;
++import net.minecraft.server.level.EntityPlayer;
 +import org.bukkit.ChatColor;
 +import org.bukkit.craftbukkit.entity.CraftPlayer;
 +
@@ -367,9 +369,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import net.kyori.adventure.text.serializer.gson.LegacyHoverEventSerializer;
 +import net.kyori.adventure.text.serializer.plain.PlainComponentSerializer;
 +import net.kyori.adventure.util.Codec;
-+import net.minecraft.server.MojangsonParser;
++import net.minecraft.nbt.MojangsonParser;
-+import net.minecraft.server.NBTBase;
++import net.minecraft.nbt.NBTBase;
-+import net.minecraft.server.NBTTagCompound;
++import net.minecraft.nbt.NBTTagCompound;
 +
 +final class NBTLegacyHoverEventSerializer implements LegacyHoverEventSerializer {
 +    public static final NBTLegacyHoverEventSerializer INSTANCE = new NBTLegacyHoverEventSerializer();
@@ -473,17 +475,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import net.kyori.adventure.text.serializer.plain.PlainComponentSerializer;
 +import net.kyori.adventure.translation.GlobalTranslator;
 +import net.kyori.adventure.util.Codec;
-+import net.minecraft.server.BossBattle;
++import net.minecraft.EnumChatFormat;
-+import net.minecraft.server.EnumChatFormat;
++import net.minecraft.locale.LocaleLanguage;
-+import net.minecraft.server.IChatBaseComponent;
++import net.minecraft.nbt.MojangsonParser;
-+import net.minecraft.server.ItemStack;
++import net.minecraft.nbt.NBTTagCompound;
-+import net.minecraft.server.LocaleLanguage;
++import net.minecraft.nbt.NBTTagList;
-+import net.minecraft.server.MinecraftKey;
++import net.minecraft.nbt.NBTTagString;
-+import net.minecraft.server.MojangsonParser;
++import net.minecraft.network.chat.IChatBaseComponent;
-+import net.minecraft.server.NBTTagCompound;
++import net.minecraft.resources.MinecraftKey;
-+import net.minecraft.server.NBTTagList;
++import net.minecraft.sounds.SoundCategory;
-+import net.minecraft.server.NBTTagString;
++import net.minecraft.world.BossBattle;
-+import net.minecraft.server.SoundCategory;
++import net.minecraft.world.item.ItemStack;
 +import org.bukkit.ChatColor;
 +import org.checkerframework.checker.nullness.qual.NonNull;
 +import org.checkerframework.checker.nullness.qual.Nullable;
@@ -717,7 +719,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    // Book
 +
 +    public static ItemStack asItemStack(final Book book, final Locale locale) {
-+        final ItemStack item = new ItemStack(net.minecraft.server.Items.WRITTEN_BOOK, 1);
++        final ItemStack item = new ItemStack(net.minecraft.world.item.Items.WRITTEN_BOOK, 1);
 +        final NBTTagCompound tag = item.getOrCreateTag();
 +        tag.setString("title", asJsonString(book.title(), locale));
 +        tag.setString("author", asJsonString(book.author(), locale));
@@ -801,7 +803,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import java.util.function.Consumer;
 +import net.kyori.adventure.bossbar.BossBar;
 +import net.kyori.adventure.text.Component;
-+import net.minecraft.server.PacketPlayOutBoss;
++import net.minecraft.network.protocol.game.PacketPlayOutBoss;
 +import org.checkerframework.checker.nullness.qual.NonNull;
 +
 +public final class VanillaBossBarListener implements BossBar.Listener {
@@ -846,7 +848,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +import net.kyori.adventure.text.Component;
 +import net.kyori.adventure.text.serializer.ComponentSerializer;
-+import net.minecraft.server.IChatBaseComponent;
++import net.minecraft.network.chat.IChatBaseComponent;
 +
 +final class WrapperAwareSerializer implements ComponentSerializer<Component, Component, IChatBaseComponent> {
 +    @Override
@@ -872,7 +874,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +import io.papermc.paper.adventure.PaperAdventure;
 +import io.papermc.paper.adventure.VanillaBossBarListener;
-+import net.minecraft.server.BossBattleServer;
++import net.minecraft.server.level.BossBattleServer;
 +import org.bukkit.craftbukkit.entity.CraftPlayer;
 +
 +public abstract class HackyBossBarPlatformBridge {
@@ -904,121 +906,239 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        }
 +    }
 +}
-diff --git a/src/main/java/net/minecraft/server/BossBattle.java b/src/main/java/net/minecraft/server/BossBattle.java
+diff --git a/src/main/java/net/minecraft/EnumChatFormat.java b/src/main/java/net/minecraft/EnumChatFormat.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/BossBattle.java
+--- a/src/main/java/net/minecraft/EnumChatFormat.java
-+++ b/src/main/java/net/minecraft/server/BossBattle.java
++++ b/src/main/java/net/minecraft/EnumChatFormat.java
+@@ -0,0 +0,0 @@ public enum EnumChatFormat {
+         return !this.A && this != EnumChatFormat.RESET;
+     }
+ 
++    @Nullable public Integer getHexValue() { return this.e(); } // Paper - OBFHELPER
+     @Nullable
+     public Integer e() {
+         return this.D;
+@@ -0,0 +0,0 @@ public enum EnumChatFormat {
+         return s == null ? null : (EnumChatFormat) EnumChatFormat.w.get(c(s));
+     }
+ 
++    // Paper start
++    @Nullable public static EnumChatFormat getByHexValue(int i) {
++        for (EnumChatFormat value : values()) {
++            if (value.getHexValue() != null && value.getHexValue() == i) {
++                return value;
++            }
++        }
++
++        return null;
++    }
++    // Paper end
++
+     @Nullable
+     public static EnumChatFormat a(int i) {
+         if (i < 0) {
+diff --git a/src/main/java/net/minecraft/nbt/NBTTagString.java b/src/main/java/net/minecraft/nbt/NBTTagString.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/nbt/NBTTagString.java
++++ b/src/main/java/net/minecraft/nbt/NBTTagString.java
+@@ -0,0 +0,0 @@ public class NBTTagString implements NBTBase {
+         this.data = s;
+     }
+ 
++    public static NBTTagString create(final String value) { return a(value); } // Paper - OBFHELPER
+     public static NBTTagString a(String s) {
+         return s.isEmpty() ? NBTTagString.b : new NBTTagString(s);
+     }
+diff --git a/src/main/java/net/minecraft/network/PacketDataSerializer.java b/src/main/java/net/minecraft/network/PacketDataSerializer.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/network/PacketDataSerializer.java
++++ b/src/main/java/net/minecraft/network/PacketDataSerializer.java
+@@ -0,0 +0,0 @@ import io.netty.buffer.ByteBufOutputStream;
+ import io.netty.handler.codec.DecoderException;
+ import io.netty.handler.codec.EncoderException;
+ import io.netty.util.ByteProcessor;
++import io.papermc.paper.adventure.PaperAdventure; // Paper
+ import java.io.DataInput;
+ import java.io.DataOutput;
+ import java.io.IOException;
+@@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.inventory.CraftItemStack; // CraftBukkit
+ public class PacketDataSerializer extends ByteBuf {
+ 
+     private final ByteBuf a;
++    public java.util.Locale adventure$locale; // Paper
+ 
+     public PacketDataSerializer(ByteBuf bytebuf) {
+         this.a = bytebuf;
+@@ -0,0 +0,0 @@ public class PacketDataSerializer extends ByteBuf {
+         return IChatBaseComponent.ChatSerializer.a(this.e(262144));
+     }
+ 
++    // Paper start
++    public PacketDataSerializer writeComponent(final net.kyori.adventure.text.Component component) {
++        return this.writeUtf(PaperAdventure.asJsonString(component, this.adventure$locale), 262144);
++    }
++    // Paper end
++
+     public PacketDataSerializer a(IChatBaseComponent ichatbasecomponent) {
+-        return this.a(IChatBaseComponent.ChatSerializer.a(ichatbasecomponent), 262144);
++        //return this.a(IChatBaseComponent.ChatSerializer.a(ichatbasecomponent), 262144); // Paper - comment
++        return this.writeUtf(PaperAdventure.asJsonString(ichatbasecomponent, this.adventure$locale), 262144); // Paper
+     }
+ 
+     public <T extends Enum<T>> T a(Class<T> oclass) {
+@@ -0,0 +0,0 @@ public class PacketDataSerializer extends ByteBuf {
+         return this.a(s, 32767);
+     }
+ 
++    public PacketDataSerializer writeUtf(final String string, final int maxLength) { return this.a(string, maxLength); } // Paper - OBFHELPER
+     public PacketDataSerializer a(String s, int i) {
+         byte[] abyte = s.getBytes(StandardCharsets.UTF_8);
+ 
+diff --git a/src/main/java/net/minecraft/network/PacketEncoder.java b/src/main/java/net/minecraft/network/PacketEncoder.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/network/PacketEncoder.java
++++ b/src/main/java/net/minecraft/network/PacketEncoder.java
+@@ -0,0 +0,0 @@ package net.minecraft.network;
+ import io.netty.buffer.ByteBuf;
+ import io.netty.channel.ChannelHandlerContext;
+ import io.netty.handler.codec.MessageToByteEncoder;
++import io.papermc.paper.adventure.PaperAdventure; // Paper
+ import java.io.IOException;
+ import net.minecraft.network.protocol.EnumProtocolDirection;
+ import net.minecraft.network.protocol.Packet;
+@@ -0,0 +0,0 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
+                 throw new IOException("Can't serialize unregistered packet");
+             } else {
+                 PacketDataSerializer packetdataserializer = new PacketDataSerializer(bytebuf);
++                packetdataserializer.adventure$locale = channelhandlercontext.channel().attr(PaperAdventure.LOCALE_ATTRIBUTE).get(); // Paper
+ 
+                 packetdataserializer.d(integer);
+ 
+diff --git a/src/main/java/net/minecraft/network/chat/IChatBaseComponent.java b/src/main/java/net/minecraft/network/chat/IChatBaseComponent.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/network/chat/IChatBaseComponent.java
++++ b/src/main/java/net/minecraft/network/chat/IChatBaseComponent.java
 @@ -0,0 +0,0 @@
- package net.minecraft.server;
+ package net.minecraft.network.chat;
  
-+import io.papermc.paper.adventure.PaperAdventure;
++import io.papermc.paper.adventure.AdventureComponent; // Paper
- import java.util.UUID;
+ import com.google.gson.Gson;
+ import com.google.gson.GsonBuilder;
+ import com.google.gson.JsonArray;
+@@ -0,0 +0,0 @@ public interface IChatBaseComponent extends Message, IChatFormatted, Iterable<IC
+             GsonBuilder gsonbuilder = new GsonBuilder();
  
- public abstract class BossBattle {
+             gsonbuilder.disableHtmlEscaping();
-@@ -0,0 +0,0 @@ public abstract class BossBattle {
++            gsonbuilder.registerTypeAdapter(AdventureComponent.class, new AdventureComponent.Serializer()); // Paper
-     protected boolean e;
+             gsonbuilder.registerTypeHierarchyAdapter(IChatBaseComponent.class, new IChatBaseComponent.ChatSerializer());
-     protected boolean f;
+             gsonbuilder.registerTypeHierarchyAdapter(ChatModifier.class, new ChatModifier.ChatModifierSerializer());
-     protected boolean g;
+             gsonbuilder.registerTypeAdapterFactory(new ChatTypeAdapterFactory());
-+    public net.kyori.adventure.bossbar.BossBar adventure; // Paper
+@@ -0,0 +0,0 @@ public interface IChatBaseComponent extends Message, IChatFormatted, Iterable<IC
- 
+             return jsonobject;
-     public BossBattle(UUID uuid, IChatBaseComponent ichatbasecomponent, BossBattle.BarColor bossbattle_barcolor, BossBattle.BarStyle bossbattle_barstyle) {
-         this.h = uuid;
-@@ -0,0 +0,0 @@ public abstract class BossBattle {
          }
  
-     public IChatBaseComponent j() {
++        public static String componentToJson(final IChatBaseComponent component) { return a(component); } // Paper - OBFHELPER
-+        if(this.adventure != null) return PaperAdventure.asVanilla(this.adventure.name()); // Paper
+         public static String a(IChatBaseComponent ichatbasecomponent) {
-         return this.title;
+             return IChatBaseComponent.ChatSerializer.a.toJson(ichatbasecomponent);
          }
  
-     public void a(IChatBaseComponent ichatbasecomponent) {
++        public static JsonElement toJsonTree(final IChatBaseComponent component) { return b(component); } // Paper - OBFHELPER
-+        if (this.adventure != null) this.adventure.name(PaperAdventure.asAdventure(ichatbasecomponent)); // Paper
+         public static JsonElement b(IChatBaseComponent ichatbasecomponent) {
-         this.title = ichatbasecomponent;
+             return IChatBaseComponent.ChatSerializer.a.toJsonTree(ichatbasecomponent);
+         }
+@@ -0,0 +0,0 @@ public interface IChatBaseComponent extends Message, IChatFormatted, Iterable<IC
+             return (IChatMutableComponent) ChatDeserializer.a(IChatBaseComponent.ChatSerializer.a, s, IChatMutableComponent.class, false);
          }
  
-     public float getProgress() {
++        public static @Nullable IChatBaseComponent fromJsonTree(final JsonElement json) { return a(json); } // Paper - OBFHELPER
-+        if (this.adventure != null) return this.adventure.progress(); // Paper
+         @Nullable
-         return this.b;
+         public static IChatMutableComponent a(JsonElement jsonelement) {
-     }
+             return (IChatMutableComponent) IChatBaseComponent.ChatSerializer.a.fromJson(jsonelement, IChatMutableComponent.class);
- 
+diff --git a/src/main/java/net/minecraft/network/protocol/game/PacketPlayOutChat.java b/src/main/java/net/minecraft/network/protocol/game/PacketPlayOutChat.java
-     public void a(float f) {
-+        if (this.adventure != null) this.adventure.progress(f); // Paper
-         this.b = f;
-     }
- 
-     public BossBattle.BarColor l() {
-+        if (this.adventure != null) return PaperAdventure.asVanilla(this.adventure.color()); // Paper
-         return this.color;
-     }
- 
-     public void a(BossBattle.BarColor bossbattle_barcolor) {
-+        if(this.adventure != null) this.adventure.color(PaperAdventure.asAdventure(bossbattle_barcolor)); // Paper
-         this.color = bossbattle_barcolor;
-     }
- 
-     public BossBattle.BarStyle m() {
-+        if(this.adventure != null) return PaperAdventure.asVanilla(this.adventure.overlay()); // Paper
-         return this.style;
-     }
- 
-     public void a(BossBattle.BarStyle bossbattle_barstyle) {
-+        if(this.adventure != null) this.adventure.overlay(PaperAdventure.asAdventure(bossbattle_barstyle)); // Paper
-         this.style = bossbattle_barstyle;
-     }
- 
-     public boolean isDarkenSky() {
-+        if(this.adventure != null) return this.adventure.hasFlag(net.kyori.adventure.bossbar.BossBar.Flag.DARKEN_SCREEN); // Paper
-         return this.e;
-     }
- 
-     public BossBattle a(boolean flag) {
-+        if(this.adventure != null) PaperAdventure.setFlag(this.adventure, net.kyori.adventure.bossbar.BossBar.Flag.DARKEN_SCREEN, flag); // Paper
-         this.e = flag;
-         return this;
-     }
- 
-     public boolean isPlayMusic() {
-+        if(this.adventure != null) return this.adventure.hasFlag(net.kyori.adventure.bossbar.BossBar.Flag.PLAY_BOSS_MUSIC); // Paper
-         return this.f;
-     }
- 
-     public BossBattle b(boolean flag) {
-+        if(this.adventure != null) PaperAdventure.setFlag(this.adventure, net.kyori.adventure.bossbar.BossBar.Flag.PLAY_BOSS_MUSIC, flag); // Paper
-         this.f = flag;
-         return this;
-     }
- 
-     public BossBattle c(boolean flag) {
-+        if(this.adventure != null) PaperAdventure.setFlag(this.adventure, net.kyori.adventure.bossbar.BossBar.Flag.CREATE_WORLD_FOG, flag); // Paper
-         this.g = flag;
-         return this;
-     }
- 
-     public boolean isCreateFog() {
-+        if(this.adventure != null) return this.adventure.hasFlag(net.kyori.adventure.bossbar.BossBar.Flag.CREATE_WORLD_FOG); // Paper
-         return this.g;
-     }
- 
-diff --git a/src/main/java/net/minecraft/server/Enchantment.java b/src/main/java/net/minecraft/server/Enchantment.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/Enchantment.java
+--- a/src/main/java/net/minecraft/network/protocol/game/PacketPlayOutChat.java
-+++ b/src/main/java/net/minecraft/server/Enchantment.java
++++ b/src/main/java/net/minecraft/network/protocol/game/PacketPlayOutChat.java
-@@ -0,0 +0,0 @@ public abstract class Enchantment {
+@@ -0,0 +0,0 @@ import net.minecraft.network.protocol.Packet;
-         return this.f();
+ public class PacketPlayOutChat implements Packet<PacketListenerPlayOut> {
+ 
+     private IChatBaseComponent a;
++    public net.kyori.adventure.text.Component adventure$message; // Paper
+     public net.md_5.bungee.api.chat.BaseComponent[] components; // Spigot
+     private ChatMessageType b;
+     private UUID c;
+@@ -0,0 +0,0 @@ public class PacketPlayOutChat implements Packet<PacketListenerPlayOut> {
+ 
+     @Override
+     public void b(PacketDataSerializer packetdataserializer) throws IOException {
++        // Paper start
++        if (this.adventure$message != null) {
++            packetdataserializer.writeComponent(this.adventure$message);
++        } else
++        // Paper end
+         // Spigot start
+         if (components != null) {
+             packetdataserializer.a(net.md_5.bungee.chat.ComponentSerializer.toString(components));
+diff --git a/src/main/java/net/minecraft/network/protocol/game/PacketPlayOutPlayerListHeaderFooter.java b/src/main/java/net/minecraft/network/protocol/game/PacketPlayOutPlayerListHeaderFooter.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/network/protocol/game/PacketPlayOutPlayerListHeaderFooter.java
++++ b/src/main/java/net/minecraft/network/protocol/game/PacketPlayOutPlayerListHeaderFooter.java
+@@ -0,0 +0,0 @@ public class PacketPlayOutPlayerListHeaderFooter implements Packet<PacketListene
+ 
+     public IChatBaseComponent header;
+     public IChatBaseComponent footer;
++    // Paper start
++    public net.kyori.adventure.text.Component adventure$header;
++    public net.kyori.adventure.text.Component adventure$footer;
++    // Paper end
+ 
+     public PacketPlayOutPlayerListHeaderFooter() {}
+ 
+@@ -0,0 +0,0 @@ public class PacketPlayOutPlayerListHeaderFooter implements Packet<PacketListene
+ 
+     @Override
+     public void b(PacketDataSerializer packetdataserializer) throws IOException {
++        // Paper start
++        if (this.adventure$header != null && this.adventure$footer != null) {
++            packetdataserializer.writeComponent(this.adventure$header);
++            packetdataserializer.writeComponent(this.adventure$footer);
++            return;
++        }
++        // Paper end
+         packetdataserializer.a(this.header);
+         packetdataserializer.a(this.footer);
+     }
+diff --git a/src/main/java/net/minecraft/network/protocol/game/PacketPlayOutTitle.java b/src/main/java/net/minecraft/network/protocol/game/PacketPlayOutTitle.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/network/protocol/game/PacketPlayOutTitle.java
++++ b/src/main/java/net/minecraft/network/protocol/game/PacketPlayOutTitle.java
+@@ -0,0 +0,0 @@ public class PacketPlayOutTitle implements Packet<PacketListenerPlayOut> {
+ 
+     private PacketPlayOutTitle.EnumTitleAction a;
+     private IChatBaseComponent b;
++    public net.kyori.adventure.text.Component adventure$text; // Paper
+     private int c;
+     private int d;
+     private int e;
+@@ -0,0 +0,0 @@ public class PacketPlayOutTitle implements Packet<PacketListenerPlayOut> {
+     public void b(PacketDataSerializer packetdataserializer) throws IOException {
+         packetdataserializer.a((Enum) this.a);
+         if (this.a == PacketPlayOutTitle.EnumTitleAction.TITLE || this.a == PacketPlayOutTitle.EnumTitleAction.SUBTITLE || this.a == PacketPlayOutTitle.EnumTitleAction.ACTIONBAR) {
++            // Paper start
++            if (this.adventure$text != null) {
++                packetdataserializer.writeComponent(this.adventure$text);
++            } else
++            // Paper end
+             packetdataserializer.a(this.b);
          }
  
-+    public final IChatBaseComponent getTranslationComponentForLevel(int level) { return this.d(level); } // Paper - OBFHELPER
+diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-     public IChatBaseComponent d(int i) {
-         ChatMessage chatmessage = new ChatMessage(this.g());
- 
-diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityPlayer.java
+--- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
++++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -0,0 +0,0 @@ import org.apache.logging.log4j.LogManager;
+@@ -0,0 +0,0 @@ import net.minecraft.world.item.enchantment.EnchantmentManager;
- import org.apache.logging.log4j.Logger;
+ import net.minecraft.world.level.block.BlockChest;
- 
+ import net.minecraft.world.level.dimension.DimensionManager;
- // CraftBukkit start
+ import net.minecraft.world.scores.Scoreboard;
 +import io.papermc.paper.adventure.PaperAdventure; // Paper
  import org.bukkit.Bukkit;
  import org.bukkit.GameMode;
@@ -1086,85 +1206,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          this.clientViewDistance = packetplayinsettings.viewDistance;
          // CraftBukkit end
          this.bY = packetplayinsettings.d();
-diff --git a/src/main/java/net/minecraft/server/EnumChatFormat.java b/src/main/java/net/minecraft/server/EnumChatFormat.java
+diff --git a/src/main/java/net/minecraft/server/network/LoginListener.java b/src/main/java/net/minecraft/server/network/LoginListener.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EnumChatFormat.java
+--- a/src/main/java/net/minecraft/server/network/LoginListener.java
-+++ b/src/main/java/net/minecraft/server/EnumChatFormat.java
++++ b/src/main/java/net/minecraft/server/network/LoginListener.java
-@@ -0,0 +0,0 @@ public enum EnumChatFormat {
+@@ -0,0 +0,0 @@ import org.apache.logging.log4j.Logger;
-         return !this.A && this != EnumChatFormat.RESET;
-     }
- 
-+    @Nullable public Integer getHexValue() { return this.e(); } // Paper - OBFHELPER
-     @Nullable
-     public Integer e() {
-         return this.D;
-@@ -0,0 +0,0 @@ public enum EnumChatFormat {
-         return s == null ? null : (EnumChatFormat) EnumChatFormat.w.get(c(s));
-     }
- 
-+    // Paper start
-+    @Nullable public static EnumChatFormat getByHexValue(int i) {
-+        for (EnumChatFormat value : values()) {
-+            if (value.getHexValue() != null && value.getHexValue() == i) {
-+                return value;
-+            }
-+        }
-+
-+        return null;
-+    }
-+    // Paper end
-+
-     @Nullable
-     public static EnumChatFormat a(int i) {
-         if (i < 0) {
-diff --git a/src/main/java/net/minecraft/server/IChatBaseComponent.java b/src/main/java/net/minecraft/server/IChatBaseComponent.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/IChatBaseComponent.java
-+++ b/src/main/java/net/minecraft/server/IChatBaseComponent.java
-@@ -0,0 +0,0 @@
- package net.minecraft.server;
- 
-+import io.papermc.paper.adventure.AdventureComponent; // Paper
- import com.google.gson.Gson;
- import com.google.gson.GsonBuilder;
- import com.google.gson.JsonArray;
-@@ -0,0 +0,0 @@ public interface IChatBaseComponent extends Message, IChatFormatted, Iterable<IC
-             GsonBuilder gsonbuilder = new GsonBuilder();
- 
-             gsonbuilder.disableHtmlEscaping();
-+            gsonbuilder.registerTypeAdapter(AdventureComponent.class, new AdventureComponent.Serializer()); // Paper
-             gsonbuilder.registerTypeHierarchyAdapter(IChatBaseComponent.class, new IChatBaseComponent.ChatSerializer());
-             gsonbuilder.registerTypeHierarchyAdapter(ChatModifier.class, new ChatModifier.ChatModifierSerializer());
-             gsonbuilder.registerTypeAdapterFactory(new ChatTypeAdapterFactory());
-@@ -0,0 +0,0 @@ public interface IChatBaseComponent extends Message, IChatFormatted, Iterable<IC
-             return jsonobject;
-         }
- 
-+        public static String componentToJson(final IChatBaseComponent component) { return a(component); } // Paper - OBFHELPER
-         public static String a(IChatBaseComponent ichatbasecomponent) {
-             return IChatBaseComponent.ChatSerializer.a.toJson(ichatbasecomponent);
-         }
- 
-+        public static JsonElement toJsonTree(final IChatBaseComponent component) { return b(component); } // Paper - OBFHELPER
-         public static JsonElement b(IChatBaseComponent ichatbasecomponent) {
-             return IChatBaseComponent.ChatSerializer.a.toJsonTree(ichatbasecomponent);
-         }
-@@ -0,0 +0,0 @@ public interface IChatBaseComponent extends Message, IChatFormatted, Iterable<IC
-             return (IChatMutableComponent) ChatDeserializer.a(IChatBaseComponent.ChatSerializer.a, s, IChatMutableComponent.class, false);
-         }
- 
-+        public static @Nullable IChatBaseComponent fromJsonTree(final JsonElement json) { return a(json); } // Paper - OBFHELPER
-         @Nullable
-         public static IChatMutableComponent a(JsonElement jsonelement) {
-             return (IChatMutableComponent) IChatBaseComponent.ChatSerializer.a.fromJson(jsonelement, IChatMutableComponent.class);
-diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/LoginListener.java
-+++ b/src/main/java/net/minecraft/server/LoginListener.java
-@@ -0,0 +0,0 @@ import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
  
  // CraftBukkit start
+ import net.minecraft.network.chat.ChatComponentText;
 +import io.papermc.paper.adventure.PaperAdventure; // Paper
  import org.bukkit.craftbukkit.util.Waitable;
  import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
@@ -1193,164 +1242,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                                  return;
                              }
                          }
-diff --git a/src/main/java/net/minecraft/server/NBTTagString.java b/src/main/java/net/minecraft/server/NBTTagString.java
+diff --git a/src/main/java/net/minecraft/server/network/PacketStatusListener.java b/src/main/java/net/minecraft/server/network/PacketStatusListener.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/NBTTagString.java
+--- a/src/main/java/net/minecraft/server/network/PacketStatusListener.java
-+++ b/src/main/java/net/minecraft/server/NBTTagString.java
++++ b/src/main/java/net/minecraft/server/network/PacketStatusListener.java
-@@ -0,0 +0,0 @@ public class NBTTagString implements NBTBase {
-         this.data = s;
-     }
- 
-+    public static NBTTagString create(final String value) { return a(value); } // Paper - OBFHELPER
-     public static NBTTagString a(String s) {
-         return s.isEmpty() ? NBTTagString.b : new NBTTagString(s);
-     }
-diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
-+++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-@@ -0,0 +0,0 @@ import io.netty.buffer.ByteBufOutputStream;
- import io.netty.handler.codec.DecoderException;
- import io.netty.handler.codec.EncoderException;
- import io.netty.util.ByteProcessor;
-+import io.papermc.paper.adventure.PaperAdventure; // Paper
- import java.io.DataInput;
- import java.io.DataOutput;
- import java.io.IOException;
-@@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.inventory.CraftItemStack; // CraftBukkit
- public class PacketDataSerializer extends ByteBuf {
- 
-     private final ByteBuf a;
-+    public java.util.Locale adventure$locale; // Paper
- 
-     public PacketDataSerializer(ByteBuf bytebuf) {
-         this.a = bytebuf;
-@@ -0,0 +0,0 @@ public class PacketDataSerializer extends ByteBuf {
-         return IChatBaseComponent.ChatSerializer.a(this.e(262144));
-     }
- 
-+    // Paper start
-+    public PacketDataSerializer writeComponent(final net.kyori.adventure.text.Component component) {
-+        return this.writeUtf(PaperAdventure.asJsonString(component, this.adventure$locale), 262144);
-+    }
-+    // Paper end
-+
-     public PacketDataSerializer a(IChatBaseComponent ichatbasecomponent) {
--        return this.a(IChatBaseComponent.ChatSerializer.a(ichatbasecomponent), 262144);
-+        //return this.a(IChatBaseComponent.ChatSerializer.a(ichatbasecomponent), 262144); // Paper - comment
-+        return this.writeUtf(PaperAdventure.asJsonString(ichatbasecomponent, this.adventure$locale), 262144); // Paper
-     }
- 
-     public <T extends Enum<T>> T a(Class<T> oclass) {
-@@ -0,0 +0,0 @@ public class PacketDataSerializer extends ByteBuf {
-         return this.a(s, 32767);
-     }
- 
-+    public PacketDataSerializer writeUtf(final String string, final int maxLength) { return this.a(string, maxLength); } // Paper - OBFHELPER
-     public PacketDataSerializer a(String s, int i) {
-         byte[] abyte = s.getBytes(StandardCharsets.UTF_8);
- 
-diff --git a/src/main/java/net/minecraft/server/PacketEncoder.java b/src/main/java/net/minecraft/server/PacketEncoder.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PacketEncoder.java
-+++ b/src/main/java/net/minecraft/server/PacketEncoder.java
-@@ -0,0 +0,0 @@ package net.minecraft.server;
- import io.netty.buffer.ByteBuf;
- import io.netty.channel.ChannelHandlerContext;
- import io.netty.handler.codec.MessageToByteEncoder;
-+import io.papermc.paper.adventure.PaperAdventure; // Paper
- import java.io.IOException;
- import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
-@@ -0,0 +0,0 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
-                 throw new IOException("Can't serialize unregistered packet");
-             } else {
-                 PacketDataSerializer packetdataserializer = new PacketDataSerializer(bytebuf);
-+                packetdataserializer.adventure$locale = channelhandlercontext.channel().attr(PaperAdventure.LOCALE_ATTRIBUTE).get(); // Paper
- 
-                 packetdataserializer.d(integer);
- 
-diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PacketPlayOutChat.java
-+++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
-@@ -0,0 +0,0 @@ import java.util.UUID;
- public class PacketPlayOutChat implements Packet<PacketListenerPlayOut> {
- 
-     private IChatBaseComponent a;
-+    public net.kyori.adventure.text.Component adventure$message; // Paper
-     public net.md_5.bungee.api.chat.BaseComponent[] components; // Spigot
-     private ChatMessageType b;
-     private UUID c;
-@@ -0,0 +0,0 @@ public class PacketPlayOutChat implements Packet<PacketListenerPlayOut> {
- 
-     @Override
-     public void b(PacketDataSerializer packetdataserializer) throws IOException {
-+        // Paper start
-+        if (this.adventure$message != null) {
-+            packetdataserializer.writeComponent(this.adventure$message);
-+        } else
-+        // Paper end
-         // Spigot start
-         if (components != null) {
-             packetdataserializer.a(net.md_5.bungee.chat.ComponentSerializer.toString(components));
-diff --git a/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java b/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java
-+++ b/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java
-@@ -0,0 +0,0 @@ public class PacketPlayOutPlayerListHeaderFooter implements Packet<PacketListene
- 
-     public IChatBaseComponent header;
-     public IChatBaseComponent footer;
-+    // Paper start
-+    public net.kyori.adventure.text.Component adventure$header;
-+    public net.kyori.adventure.text.Component adventure$footer;
-+    // Paper end
- 
-     public PacketPlayOutPlayerListHeaderFooter() {}
- 
-@@ -0,0 +0,0 @@ public class PacketPlayOutPlayerListHeaderFooter implements Packet<PacketListene
- 
-     @Override
-     public void b(PacketDataSerializer packetdataserializer) throws IOException {
-+        // Paper start
-+        if (this.adventure$header != null && this.adventure$footer != null) {
-+            packetdataserializer.writeComponent(this.adventure$header);
-+            packetdataserializer.writeComponent(this.adventure$footer);
-+            return;
-+        }
-+        // Paper end
-         packetdataserializer.a(this.header);
-         packetdataserializer.a(this.footer);
-     }
-diff --git a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java b/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
-+++ b/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
-@@ -0,0 +0,0 @@ public class PacketPlayOutTitle implements Packet<PacketListenerPlayOut> {
- 
-     private PacketPlayOutTitle.EnumTitleAction a;
-     private IChatBaseComponent b;
-+    public net.kyori.adventure.text.Component adventure$text; // Paper
-     private int c;
-     private int d;
-     private int e;
-@@ -0,0 +0,0 @@ public class PacketPlayOutTitle implements Packet<PacketListenerPlayOut> {
-     public void b(PacketDataSerializer packetdataserializer) throws IOException {
-         packetdataserializer.a((Enum) this.a);
-         if (this.a == PacketPlayOutTitle.EnumTitleAction.TITLE || this.a == PacketPlayOutTitle.EnumTitleAction.SUBTITLE || this.a == PacketPlayOutTitle.EnumTitleAction.ACTIONBAR) {
-+            // Paper start
-+            if (this.adventure$text != null) {
-+                packetdataserializer.writeComponent(this.adventure$text);
-+            } else
-+            // Paper end
-             packetdataserializer.a(this.b);
-         }
- 
-diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PacketStatusListener.java
-+++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
 @@ -0,0 +0,0 @@ public class PacketStatusListener implements PacketStatusInListener {
                  CraftIconCache icon = minecraftServer.server.getServerIcon();
  
@@ -1360,10 +1255,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  }
  
                  @Override
-diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
+diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PlayerConnection.java
+--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
++++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -0,0 +0,0 @@ import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
  
@@ -1372,7 +1267,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import io.papermc.paper.adventure.PaperAdventure; // Paper
  import java.util.concurrent.ExecutionException;
  import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
- import org.bukkit.Location;
+ import net.minecraft.network.protocol.game.PacketPlayOutAttachEntity;
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn {
          return this.minecraftServer.a(this.player.getProfile());
      }
@@ -1477,10 +1372,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  tileentitysign.isEditable = false;
               }
              // CraftBukkit end
-diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
+diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PlayerList.java
+--- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/PlayerList.java
++++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -0,0 +0,0 @@ import com.mojang.authlib.GameProfile;
  import com.mojang.serialization.DataResult;
  import com.mojang.serialization.Dynamic;
@@ -1601,10 +1496,117 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          }
          // CraftBukkit end
  
-diff --git a/src/main/java/net/minecraft/server/WorldMap.java b/src/main/java/net/minecraft/server/WorldMap.java
+diff --git a/src/main/java/net/minecraft/world/BossBattle.java b/src/main/java/net/minecraft/world/BossBattle.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/WorldMap.java
+--- a/src/main/java/net/minecraft/world/BossBattle.java
-+++ b/src/main/java/net/minecraft/server/WorldMap.java
++++ b/src/main/java/net/minecraft/world/BossBattle.java
+@@ -0,0 +0,0 @@
+ package net.minecraft.world;
+ 
++import io.papermc.paper.adventure.PaperAdventure;
+ import java.util.UUID;
+ import net.minecraft.EnumChatFormat;
+ import net.minecraft.network.chat.IChatBaseComponent;
+@@ -0,0 +0,0 @@ public abstract class BossBattle {
+     protected boolean e;
+     protected boolean f;
+     protected boolean g;
++    public net.kyori.adventure.bossbar.BossBar adventure; // Paper
+ 
+     public BossBattle(UUID uuid, IChatBaseComponent ichatbasecomponent, BossBattle.BarColor bossbattle_barcolor, BossBattle.BarStyle bossbattle_barstyle) {
+         this.h = uuid;
+@@ -0,0 +0,0 @@ public abstract class BossBattle {
+     }
+ 
+     public IChatBaseComponent j() {
++        if(this.adventure != null) return PaperAdventure.asVanilla(this.adventure.name()); // Paper
+         return this.title;
+     }
+ 
+     public void a(IChatBaseComponent ichatbasecomponent) {
++        if (this.adventure != null) this.adventure.name(PaperAdventure.asAdventure(ichatbasecomponent)); // Paper
+         this.title = ichatbasecomponent;
+     }
+ 
+     public float getProgress() {
++        if (this.adventure != null) return this.adventure.progress(); // Paper
+         return this.b;
+     }
+ 
+     public void a(float f) {
++        if (this.adventure != null) this.adventure.progress(f); // Paper
+         this.b = f;
+     }
+ 
+     public BossBattle.BarColor l() {
++        if (this.adventure != null) return PaperAdventure.asVanilla(this.adventure.color()); // Paper
+         return this.color;
+     }
+ 
+     public void a(BossBattle.BarColor bossbattle_barcolor) {
++        if(this.adventure != null) this.adventure.color(PaperAdventure.asAdventure(bossbattle_barcolor)); // Paper
+         this.color = bossbattle_barcolor;
+     }
+ 
+     public BossBattle.BarStyle m() {
++        if(this.adventure != null) return PaperAdventure.asVanilla(this.adventure.overlay()); // Paper
+         return this.style;
+     }
+ 
+     public void a(BossBattle.BarStyle bossbattle_barstyle) {
++        if(this.adventure != null) this.adventure.overlay(PaperAdventure.asAdventure(bossbattle_barstyle)); // Paper
+         this.style = bossbattle_barstyle;
+     }
+ 
+     public boolean isDarkenSky() {
++        if(this.adventure != null) return this.adventure.hasFlag(net.kyori.adventure.bossbar.BossBar.Flag.DARKEN_SCREEN); // Paper
+         return this.e;
+     }
+ 
+     public BossBattle a(boolean flag) {
++        if(this.adventure != null) PaperAdventure.setFlag(this.adventure, net.kyori.adventure.bossbar.BossBar.Flag.DARKEN_SCREEN, flag); // Paper
+         this.e = flag;
+         return this;
+     }
+ 
+     public boolean isPlayMusic() {
++        if(this.adventure != null) return this.adventure.hasFlag(net.kyori.adventure.bossbar.BossBar.Flag.PLAY_BOSS_MUSIC); // Paper
+         return this.f;
+     }
+ 
+     public BossBattle b(boolean flag) {
++        if(this.adventure != null) PaperAdventure.setFlag(this.adventure, net.kyori.adventure.bossbar.BossBar.Flag.PLAY_BOSS_MUSIC, flag); // Paper
+         this.f = flag;
+         return this;
+     }
+ 
+     public BossBattle c(boolean flag) {
++        if(this.adventure != null) PaperAdventure.setFlag(this.adventure, net.kyori.adventure.bossbar.BossBar.Flag.CREATE_WORLD_FOG, flag); // Paper
+         this.g = flag;
+         return this;
+     }
+ 
+     public boolean isCreateFog() {
++        if(this.adventure != null) return this.adventure.hasFlag(net.kyori.adventure.bossbar.BossBar.Flag.CREATE_WORLD_FOG); // Paper
+         return this.g;
+     }
+ 
+diff --git a/src/main/java/net/minecraft/world/item/enchantment/Enchantment.java b/src/main/java/net/minecraft/world/item/enchantment/Enchantment.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/item/enchantment/Enchantment.java
++++ b/src/main/java/net/minecraft/world/item/enchantment/Enchantment.java
+@@ -0,0 +0,0 @@ public abstract class Enchantment {
+         return this.f();
+     }
+ 
++    public final IChatBaseComponent getTranslationComponentForLevel(int level) { return this.d(level); } // Paper - OBFHELPER
+     public IChatBaseComponent d(int i) {
+         ChatMessage chatmessage = new ChatMessage(this.g());
+ 
+diff --git a/src/main/java/net/minecraft/world/level/saveddata/maps/WorldMap.java b/src/main/java/net/minecraft/world/level/saveddata/maps/WorldMap.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/level/saveddata/maps/WorldMap.java
++++ b/src/main/java/net/minecraft/world/level/saveddata/maps/WorldMap.java
 @@ -0,0 +0,0 @@ import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
  
@@ -1739,7 +1741,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    // Paper start
 +    @Override
 +    public net.kyori.adventure.text.Component motd() {
-+        return io.papermc.paper.adventure.PaperAdventure.asAdventure(new net.minecraft.server.ChatComponentText(console.getMotd()));
++        return io.papermc.paper.adventure.PaperAdventure.asAdventure(new net.minecraft.network.chat.ChatComponentText(console.getMotd()));
 +    }
 +    // Paper end
      @Override
@@ -1789,14 +1791,6 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftContainer.java b/sr
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftContainer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftContainer.java
-@@ -0,0 +0,0 @@
- package org.bukkit.craftbukkit.block;
- 
- import net.minecraft.server.ChestLock;
-+import net.minecraft.server.TileEntityBeacon;
- import net.minecraft.server.TileEntityContainer;
- import org.bukkit.Material;
- import org.bukkit.block.Block;
 @@ -0,0 +0,0 @@ public abstract class CraftContainer<T extends TileEntityContainer> extends Craf
          this.getSnapshot().chestLock = (key == null) ? ChestLock.a : new ChestLock(key);
      }
@@ -1990,20 +1984,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +    // Paper end
  
-     public net.minecraft.server.Enchantment getHandle() {
+     public net.minecraft.world.item.enchantment.Enchantment getHandle() {
          return target;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -0,0 +0,0 @@ import net.minecraft.server.EntityZombieVillager;
- import net.minecraft.server.IChatBaseComponent;
- import net.minecraft.server.NBTBase;
- import net.minecraft.server.NBTTagCompound;
-+import net.minecraft.server.TileEntityEnchantTable;
- import org.bukkit.Chunk; // Paper
- import org.bukkit.EntityEffect;
- import org.bukkit.Location;
 @@ -0,0 +0,0 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return getHandle().getVehicle().getBukkitEntity();
      }
@@ -2262,7 +2248,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +    @Override
 +    public void sendMessage(final net.kyori.adventure.identity.Identity identity, final net.kyori.adventure.text.Component message, final net.kyori.adventure.audience.MessageType type) {
-+        final PacketPlayOutChat packet = new PacketPlayOutChat(null, type == net.kyori.adventure.audience.MessageType.CHAT ? net.minecraft.server.ChatMessageType.CHAT : net.minecraft.server.ChatMessageType.SYSTEM, identity.uuid());
++        final PacketPlayOutChat packet = new PacketPlayOutChat(null, type == net.kyori.adventure.audience.MessageType.CHAT ? net.minecraft.network.chat.ChatMessageType.CHAT : net.minecraft.network.chat.ChatMessageType.SYSTEM, identity.uuid());
 +        packet.adventure$message = message;
 +        this.getHandle().playerConnection.sendPacket(packet);
 +    }
@@ -2350,7 +2336,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    @Override
 +    public void playSound(final net.kyori.adventure.sound.Sound sound, final double x, final double y, final double z) {
 +        final MinecraftKey name = io.papermc.paper.adventure.PaperAdventure.asVanilla(sound.name());
-+        final java.util.Optional<net.minecraft.server.SoundEffect> event = net.minecraft.server.IRegistry.SOUND_EVENT.getOptional(name);
++        final java.util.Optional<net.minecraft.sounds.SoundEffect> event = net.minecraft.core.IRegistry.SOUND_EVENT.getOptional(name);
 +        if (event.isPresent()) {
 +            this.getHandle().playerConnection.sendPacket(new PacketPlayOutNamedSoundEffect(event.get(), io.papermc.paper.adventure.PaperAdventure.asVanilla(sound.source()), x, y, z, sound.volume(), sound.pitch()));
 +        } else {
@@ -2369,14 +2355,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    @Override
 +    public void openBook(final net.kyori.adventure.inventory.Book book) {
 +        final java.util.Locale locale = this.getHandle().adventure$locale;
-+        final net.minecraft.server.ItemStack item = io.papermc.paper.adventure.PaperAdventure.asItemStack(book, locale);
++        final net.minecraft.world.item.ItemStack item = io.papermc.paper.adventure.PaperAdventure.asItemStack(book, locale);
 +        final EntityPlayer player = this.getHandle();
 +        final PlayerConnection connection = player.playerConnection;
-+        final net.minecraft.server.PlayerInventory inventory = player.inventory;
++        final net.minecraft.world.entity.player.PlayerInventory inventory = player.inventory;
 +        final int slot = inventory.items.size() + inventory.itemInHandIndex;
-+        connection.sendPacket(new net.minecraft.server.PacketPlayOutSetSlot(0, slot, item));
++        connection.sendPacket(new net.minecraft.network.protocol.game.PacketPlayOutSetSlot(0, slot, item));
-+        connection.sendPacket(new net.minecraft.server.PacketPlayOutOpenBook(net.minecraft.server.EnumHand.MAIN_HAND));
++        connection.sendPacket(new net.minecraft.network.protocol.game.PacketPlayOutOpenBook(net.minecraft.world.EnumHand.MAIN_HAND));
-+        connection.sendPacket(new net.minecraft.server.PacketPlayOutSetSlot(0, slot, inventory.getItemInHand()));
++        connection.sendPacket(new net.minecraft.network.protocol.game.PacketPlayOutSetSlot(0, slot, inventory.getItemInHand()));
 +    }
 +    // Paper end
 +
@@ -2592,7 +2578,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    // Paper start
 +    @Override
 +    public net.kyori.adventure.text.event.HoverEvent<net.kyori.adventure.text.event.HoverEvent.ShowItem> asHoverEvent(final ItemStack item, final java.util.function.UnaryOperator<net.kyori.adventure.text.event.HoverEvent.ShowItem> op) {
-+        final net.minecraft.server.NBTTagCompound tag = CraftItemStack.asNMSCopy(item).getTag();
++        final net.minecraft.nbt.NBTTagCompound tag = CraftItemStack.asNMSCopy(item).getTag();
 +        return net.kyori.adventure.text.event.HoverEvent.showItem(op.apply(net.kyori.adventure.text.event.HoverEvent.ShowItem.of(item.getType().getKey(), item.getAmount(), io.papermc.paper.adventure.PaperAdventure.asBinaryTagHolder(tag))));
 +    }
 +    // Paper end
@@ -2807,7 +2793,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -import com.google.common.collect.ImmutableMap.Builder;
 +import com.google.common.collect.ImmutableMap; // Paper
  import java.util.Map;
- import net.minecraft.server.NBTTagCompound;
+ import net.minecraft.nbt.NBTTagCompound;
  import org.bukkit.Material;
 @@ -0,0 +0,0 @@ class CraftMetaBookSigned extends CraftMetaBook implements BookMeta {
      }

Spigot-Server-Patches/All-chunks-are-slime-spawn-chunks-toggle.patch

@@ -18,10 +18,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
 +    }
  }
-diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
+diff --git a/src/main/java/net/minecraft/world/entity/monster/EntitySlime.java b/src/main/java/net/minecraft/world/entity/monster/EntitySlime.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntitySlime.java
+--- a/src/main/java/net/minecraft/world/entity/monster/EntitySlime.java
-+++ b/src/main/java/net/minecraft/server/EntitySlime.java
++++ b/src/main/java/net/minecraft/world/entity/monster/EntitySlime.java
 @@ -0,0 +0,0 @@ public class EntitySlime extends EntityInsentient implements IMonster {
              }
  

Spigot-Server-Patches/Allow-Saving-of-Oversized-Chunks.patch

@@ -30,10 +30,10 @@ This fix also maintains compatability if someone switches server jars to one wit
 this fix, as the data will remain in the oversized file. Once the server returns
 to a jar with this fix, the data will be restored.
 
-diff --git a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
+diff --git a/src/main/java/net/minecraft/nbt/NBTCompressedStreamTools.java b/src/main/java/net/minecraft/nbt/NBTCompressedStreamTools.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
+--- a/src/main/java/net/minecraft/nbt/NBTCompressedStreamTools.java
-+++ b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
++++ b/src/main/java/net/minecraft/nbt/NBTCompressedStreamTools.java
 @@ -0,0 +0,0 @@ public class NBTCompressedStreamTools {
  
      }
@@ -50,19 +50,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public static void a(NBTTagCompound nbttagcompound, DataOutput dataoutput) throws IOException {
          a((NBTBase) nbttagcompound, dataoutput);
      }
-diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
+diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/RegionFile.java
+--- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-+++ b/src/main/java/net/minecraft/server/RegionFile.java
++++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-@@ -0,0 +0,0 @@ import java.nio.file.Files;
+@@ -0,0 +0,0 @@ import java.nio.file.LinkOption;
- import java.nio.file.LinkOption;
+ import java.nio.file.Path;
  import java.nio.file.StandardCopyOption;
  import java.nio.file.StandardOpenOption;
 +import java.util.zip.InflaterInputStream; // Paper
 +
  import javax.annotation.Nullable;
- import org.apache.logging.log4j.LogManager;
+ import net.minecraft.SystemUtils;
- import org.apache.logging.log4j.Logger;
+ import net.minecraft.world.level.ChunkCoordIntPair;
 @@ -0,0 +0,0 @@ public class RegionFile implements AutoCloseable {
      private final IntBuffer i;
      @VisibleForTesting
@@ -73,13 +73,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          this(file.toPath(), file1.toPath(), RegionFileCompression.b, flag);
 @@ -0,0 +0,0 @@ public class RegionFile implements AutoCloseable {
  
-     public RegionFile(java.nio.file.Path java_nio_file_path, java.nio.file.Path java_nio_file_path1, RegionFileCompression regionfilecompression, boolean flag) throws IOException {
+     public RegionFile(Path path, Path path1, RegionFileCompression regionfilecompression, boolean flag) throws IOException {
          this.g = ByteBuffer.allocateDirect(8192);
 +        this.file = java_nio_file_path.toFile(); // Paper
 +        initOversizedState(); // Paper
          this.freeSectors = new RegionFileBitSet();
          this.f = regionfilecompression;
-         if (!Files.isDirectory(java_nio_file_path1, new LinkOption[0])) {
+         if (!Files.isDirectory(path1, new LinkOption[0])) {
 @@ -0,0 +0,0 @@ public class RegionFile implements AutoCloseable {
          void run() throws IOException;
      }
@@ -155,10 +155,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      class ChunkBuffer extends ByteArrayOutputStream {
  
          private final ChunkCoordIntPair b;
-diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
+diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileCache.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileCache.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/RegionFileCache.java
+--- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileCache.java
-+++ b/src/main/java/net/minecraft/server/RegionFileCache.java
++++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileCache.java
 @@ -0,0 +0,0 @@ public final class RegionFileCache implements AutoCloseable {
          }
      }

Spigot-Server-Patches/Allow-chests-to-be-placed-with-NBT-data.patch

@@ -4,10 +4,10 @@ Date: Sat, 8 Sep 2018 18:43:31 -0500
 Subject: [PATCH] Allow chests to be placed with NBT data
 
 
-diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
+diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/ItemStack.java
+--- a/src/main/java/net/minecraft/world/item/ItemStack.java
-+++ b/src/main/java/net/minecraft/server/ItemStack.java
++++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -0,0 +0,0 @@ public final class ItemStack {
                      enuminteractionresult = EnumInteractionResult.FAIL; // cancel placement
                      // PAIL: Remove this when MC-99075 fixed
@@ -16,10 +16,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                      // revert back all captured blocks
                      for (BlockState blockstate : blocks) {
                          blockstate.update(true, false);
-diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/TileEntityChest.java b/src/main/java/net/minecraft/world/level/block/entity/TileEntityChest.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/TileEntityChest.java
+--- a/src/main/java/net/minecraft/world/level/block/entity/TileEntityChest.java
-+++ b/src/main/java/net/minecraft/server/TileEntityChest.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/TileEntityChest.java
 @@ -0,0 +0,0 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic
      // CraftBukkit start
      @Override

Spigot-Server-Patches/Allow-delegation-to-vanilla-chunk-gen.patch

@@ -4,10 +4,10 @@ Date: Wed, 29 Apr 2020 02:10:32 +0200
 Subject: [PATCH] Allow delegation to vanilla chunk gen
 
 
-diff --git a/src/main/java/net/minecraft/server/ChunkConverter.java b/src/main/java/net/minecraft/server/ChunkConverter.java
+diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkConverter.java b/src/main/java/net/minecraft/world/level/chunk/ChunkConverter.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/ChunkConverter.java
+--- a/src/main/java/net/minecraft/world/level/chunk/ChunkConverter.java
-+++ b/src/main/java/net/minecraft/server/ChunkConverter.java
++++ b/src/main/java/net/minecraft/world/level/chunk/ChunkConverter.java
 @@ -0,0 +0,0 @@ import org.apache.logging.log4j.Logger;
  public class ChunkConverter {
  
@@ -40,13 +40,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        // get empty object
 +        CraftChunkData data = (CraftChunkData) createChunkData(world);
 +        // do bunch of vanilla shit
-+        net.minecraft.server.WorldServer nmsWorld = ((CraftWorld) world).getHandle();
++        net.minecraft.server.level.WorldServer nmsWorld = ((CraftWorld) world).getHandle();
-+        net.minecraft.server.ProtoChunk protoChunk = new net.minecraft.server.ProtoChunk(new net.minecraft.server.ChunkCoordIntPair(x, z), net.minecraft.server.ChunkConverter.getEmptyConverter(), nmsWorld);
++        net.minecraft.world.level.chunk.ProtoChunk protoChunk = new net.minecraft.world.level.chunk.ProtoChunk(new net.minecraft.world.level.ChunkCoordIntPair(x, z), net.minecraft.world.level.chunk.ChunkConverter.getEmptyConverter(), nmsWorld);
-+        List<net.minecraft.server.IChunkAccess> list = new ArrayList<>();
++        List<net.minecraft.world.level.chunk.IChunkAccess> list = new ArrayList<>();
 +        list.add(protoChunk);
-+        net.minecraft.server.RegionLimitedWorldAccess genRegion = new net.minecraft.server.RegionLimitedWorldAccess(nmsWorld, list);
++        net.minecraft.server.level.RegionLimitedWorldAccess genRegion = new net.minecraft.server.level.RegionLimitedWorldAccess(nmsWorld, list);
 +        // call vanilla generator, one feature after another. Order here is important!
-+        net.minecraft.server.ChunkGenerator chunkGenerator = nmsWorld.getChunkProvider().chunkGenerator;
++        net.minecraft.world.level.chunk.ChunkGenerator chunkGenerator = nmsWorld.getChunkProvider().chunkGenerator;
 +        if (chunkGenerator instanceof org.bukkit.craftbukkit.generator.CustomChunkGenerator) {
 +            chunkGenerator = ((org.bukkit.craftbukkit.generator.CustomChunkGenerator) chunkGenerator).delegate;
 +        }
@@ -97,8 +97,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
  public class CustomChunkGenerator extends InternalChunkGenerator {
  
--    private final net.minecraft.server.ChunkGenerator delegate;
+-    private final net.minecraft.world.level.chunk.ChunkGenerator delegate;
-+    public final net.minecraft.server.ChunkGenerator delegate; // Paper - public
++    public final net.minecraft.world.level.chunk.ChunkGenerator delegate; // Paper - public
      private final ChunkGenerator generator;
      private final WorldServer world;
      private final Random random = new Random();

Spigot-Server-Patches/Allow-disabling-armour-stand-ticking.patch

@@ -19,10 +19,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        log("ArmorStand ticking is " + (this.armorStandTick ? "enabled" : "disabled") + " by default");
 +    }
  }
-diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
+diff --git a/src/main/java/net/minecraft/world/entity/decoration/EntityArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/EntityArmorStand.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+--- a/src/main/java/net/minecraft/world/entity/decoration/EntityArmorStand.java
-+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
++++ b/src/main/java/net/minecraft/world/entity/decoration/EntityArmorStand.java
 @@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
      public Vector3f leftLegPose;
      public Vector3f rightLegPose;

Spigot-Server-Patches/Allow-disabling-mob-spawner-spawn-egg-transformation.patch

@@ -18,10 +18,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        disableMobSpawnerSpawnEggTransformation = getBoolean("game-mechanics.disable-mob-spawner-spawn-egg-transformation", disableMobSpawnerSpawnEggTransformation);
 +    }
  }
-diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
+diff --git a/src/main/java/net/minecraft/world/item/ItemMonsterEgg.java b/src/main/java/net/minecraft/world/item/ItemMonsterEgg.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java
+--- a/src/main/java/net/minecraft/world/item/ItemMonsterEgg.java
-+++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
++++ b/src/main/java/net/minecraft/world/item/ItemMonsterEgg.java
 @@ -0,0 +0,0 @@ public class ItemMonsterEgg extends Item {
              EnumDirection enumdirection = itemactioncontext.getClickedFace();
              IBlockData iblockdata = world.getType(blockposition);

Spigot-Server-Patches/Allow-for-toggling-of-spawn-chunks.patch

@@ -19,10 +19,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        log("Keep spawn chunk loaded: " + keepSpawnInMemory);
 +    }
  }
-diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
+diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/World.java
+--- a/src/main/java/net/minecraft/world/level/World.java
-+++ b/src/main/java/net/minecraft/server/World.java
++++ b/src/main/java/net/minecraft/world/level/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          });
          // CraftBukkit end

Spigot-Server-Patches/Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch

@@ -13,10 +13,10 @@ Use an ArrayDeque to store this Queue
 
 We make sure to also implement a pattern that is recursion safe too.
 
-diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
+diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+--- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
++++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 @@ -0,0 +0,0 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
      public final CallbackExecutor callbackExecutor = new CallbackExecutor();
      public static final class CallbackExecutor implements java.util.concurrent.Executor, Runnable {

Spigot-Server-Patches/Allow-nerfed-mobs-to-jump-and-take-water-damage.patch

@@ -18,23 +18,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        nerfedMobsShouldJump = getBoolean("spawner-nerfed-mobs-should-jump", false);
 +    }
  }
-diff --git a/src/main/java/net/minecraft/server/ControllerJump.java b/src/main/java/net/minecraft/server/ControllerJump.java
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/ControllerJump.java
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/server/ControllerJump.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public class ControllerJump {
+@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
-         this.a = true;
-     }
- 
-+    public final void jumpIfSet() { this.b(); } // Paper - OBFHELPER
-     public void b() {
-         this.b.setJumping(this.a);
-         this.a = false;
-diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/Entity.java
-+++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.isInWater() || this.isInRain();
      }
  
@@ -42,10 +30,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public boolean aG() {
          return this.isInWater() || this.isInRain() || this.k();
      }
-diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
+diff --git a/src/main/java/net/minecraft/world/entity/EntityInsentient.java b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityInsentient.java
+--- a/src/main/java/net/minecraft/world/entity/EntityInsentient.java
-+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
++++ b/src/main/java/net/minecraft/world/entity/EntityInsentient.java
 @@ -0,0 +0,0 @@ public abstract class EntityInsentient extends EntityLiving {
      private final EntityAIBodyControl c;
      protected NavigationAbstract navigation;
@@ -73,10 +61,22 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          this.world.getMethodProfiler().enter("sensing");
          this.bo.a();
          this.world.getMethodProfiler().exit();
-diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
+diff --git a/src/main/java/net/minecraft/world/entity/ai/control/ControllerJump.java b/src/main/java/net/minecraft/world/entity/ai/control/ControllerJump.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
+--- a/src/main/java/net/minecraft/world/entity/ai/control/ControllerJump.java
-+++ b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
++++ b/src/main/java/net/minecraft/world/entity/ai/control/ControllerJump.java
+@@ -0,0 +0,0 @@ public class ControllerJump {
+         this.a = true;
+     }
+ 
++    public final void jumpIfSet() { this.b(); } // Paper - OBFHELPER
+     public void b() {
+         this.b.setJumping(this.a);
+         this.a = false;
+diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/PathfinderGoalFloat.java b/src/main/java/net/minecraft/world/entity/ai/goal/PathfinderGoalFloat.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/entity/ai/goal/PathfinderGoalFloat.java
++++ b/src/main/java/net/minecraft/world/entity/ai/goal/PathfinderGoalFloat.java
 @@ -0,0 +0,0 @@ public class PathfinderGoalFloat extends PathfinderGoal {
  
      public PathfinderGoalFloat(EntityInsentient entityinsentient) {

Spigot-Server-Patches/Allow-setting-the-vex-s-summoner.patch

@@ -4,10 +4,10 @@ Date: Sat, 6 Oct 2018 21:47:44 -0500
 Subject: [PATCH] Allow setting the vex's summoner
 
 
-diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
+diff --git a/src/main/java/net/minecraft/world/entity/monster/EntityVex.java b/src/main/java/net/minecraft/world/entity/monster/EntityVex.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityVex.java
+--- a/src/main/java/net/minecraft/world/entity/monster/EntityVex.java
-+++ b/src/main/java/net/minecraft/server/EntityVex.java
++++ b/src/main/java/net/minecraft/world/entity/monster/EntityVex.java
 @@ -0,0 +0,0 @@ public class EntityVex extends EntityMonster {
          this.a(1, flag);
      }
@@ -21,11 +21,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 @@ -0,0 +0,0 @@ public class CraftVex extends CraftMonster implements Vex {
-         EntityInsentient owner = getHandle().getOwner();
+         net.minecraft.world.entity.EntityInsentient owner = getHandle().getOwner();
-         return owner != null ? (Mob) owner.getBukkitEntity() : null;
+         return owner != null ? (org.bukkit.entity.Mob) owner.getBukkitEntity() : null;
      }
 +
-+    public void setSummoner(Mob summoner) {
++    public void setSummoner(org.bukkit.entity.Mob summoner) {
 +        getHandle().setOwner(summoner == null ? null : ((CraftMob) summoner).getHandle());
 +    }
      // Paper end

Spigot-Server-Patches/Allow-specifying-a-custom-authentication-servers-dow.patch

@@ -26,10 +26,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        authenticationServersDownKickMessage = Strings.emptyToNull(getString("messages.kick.authentication-servers-down", authenticationServersDownKickMessage));
 +    }
  }
-diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
+diff --git a/src/main/java/net/minecraft/server/network/LoginListener.java b/src/main/java/net/minecraft/server/network/LoginListener.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/LoginListener.java
+--- a/src/main/java/net/minecraft/server/network/LoginListener.java
-+++ b/src/main/java/net/minecraft/server/LoginListener.java
++++ b/src/main/java/net/minecraft/server/network/LoginListener.java
 @@ -0,0 +0,0 @@ public class LoginListener implements PacketLoginInListener {
                          LoginListener.this.i = LoginListener.this.a(gameprofile);
                          LoginListener.this.g = LoginListener.EnumProtocolState.READY_TO_ACCEPT;

Spigot-Server-Patches/Allow-using-signs-inside-spawn-protection.patch

@@ -18,10 +18,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        allowUsingSignsInsideSpawnProtection = getBoolean("allow-using-signs-inside-spawn-protection", allowUsingSignsInsideSpawnProtection);
 +    }
  }
-diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
+diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PlayerConnection.java
+--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
++++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
          this.player.resetIdleTimer();

Spigot-Server-Patches/Always-tick-falling-blocks.patch

@@ -8,14 +8,6 @@ diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -0,0 +0,0 @@ import net.minecraft.server.EntityCreature;
- import net.minecraft.server.EntityCreeper;
- import net.minecraft.server.EntityEnderCrystal;
- import net.minecraft.server.EntityEnderDragon;
-+import net.minecraft.server.EntityFallingBlock; // Paper
- import net.minecraft.server.EntityFireball;
- import net.minecraft.server.EntityFireworks;
- import net.minecraft.server.EntityHuman;
 @@ -0,0 +0,0 @@ public class ActivationRange
                  || entity instanceof EntityFireball
                  || entity instanceof EntityLightning