Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@ea0b639 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9228)

.upstream-data

@@ -1,2 +1,2 @@
-purpurCommit = 68117a4e35802c17c89eb0b8ff993d08a8e2bd66
-pufferfishCommit = 19a70d2ca38093d36f233cb3b590f4d28b85c078
+purpurCommit = d6cfa8f939efaa1e8d91b0193ee6f0495a94bd5b
+pufferfishCommit = 845c015664150048d0a7c02b706fe1c05a91ac16

gradle.properties

@@ -1,7 +1,7 @@
 group = org.plazmamc.plazma
 version = 1.19.4-R0.1-SNAPSHOT
 
-paperCommit = f9f90791e43f396ed12be5e0e8867691fc87dbe7
+paperCommit = ea0b63992c307cf5425ba7876d6b853ef3173b88
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0001-Pufferfish-API-Changes.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 17 May 2023 05:33:40 +0000
+Date: Wed, 31 May 2023 12:39:00 +0000
 Subject: [PATCH] Pufferfish API Changes
 
 Original: Kevin Raneri <kevin.raneri@gmail.com>

patches/api/0002-Purpur-API-Changes.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 17 May 2023 05:41:48 +0000
+Date: Wed, 31 May 2023 12:46:00 +0000
 Subject: [PATCH] Purpur API Changes
 
 Original: PurpurMC
@@ -1171,10 +1171,10 @@ index bc84b892cae5fe7019a3ad481e9da79956efa1fe..48eb5b00c460cccde29d327cef1d63fc
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9cd49bf6db451af67cd15c8857d7bf51a4e1a67a..838f32eb3397d847071f54648dbac02c35d621cf 100644
+index 88c4885569d2b8b22fce55601d50608ac8e9388c..dc437885404ae147a06cac653e519a4674a9a951 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3057,4 +3057,139 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3068,4 +3068,139 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end

patches/server/0001-Pufferfish-Server-Changes.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 17 May 2023 05:33:40 +0000
+Date: Wed, 31 May 2023 12:39:00 +0000
 Subject: [PATCH] Pufferfish Server Changes
 
 Original: Kevin Raneri <kevin.raneri@gmail.com>
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 9cf389defdaeb887e9cad4f0fed3f3b95667b238..b41b186397d013c19436c345be98b785d4bd0295 100644
+index 4f2fa65ade89c5703451dad4f80eeef162b277d1..3ee1160c796cc86db9bc9438055b307239e9a8f7 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -7,8 +7,12 @@ plugins {
@@ -3431,10 +3431,10 @@ index ebe65474a4a05ff1637d7f37ebcfe690af59def5..42142c512b12e5b269c19f1e821c50e7
  
      @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e769f7b0904814ee63e2a73dca57e5dc33382fba..e38391da44a1b5e3b845eba2d80453021a1e0c25 100644
+index 894c0d5bfa001def4374b657e3eb8f15a0caa1e9..a49520fbb3cbce866338c964dd0aadbd113bf411 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -257,7 +257,7 @@ import javax.annotation.Nullable; // Paper
+@@ -259,7 +259,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
@@ -3443,7 +3443,7 @@ index e769f7b0904814ee63e2a73dca57e5dc33382fba..e38391da44a1b5e3b845eba2d8045302
      private final String serverVersion;
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
-@@ -1040,6 +1040,11 @@ public final class CraftServer implements Server {
+@@ -1042,6 +1042,11 @@ public final class CraftServer implements Server {
                  plugin.getPluginMeta().getDisplayName(),
                  "This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
              ));

patches/server/0002-Purpur-Server-Changes.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 17 May 2023 05:41:47 +0000
+Date: Wed, 31 May 2023 12:46:00 +0000
 Subject: [PATCH] Purpur Server Changes
 
 Original: PurpurMC
@@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index b41b186397d013c19436c345be98b785d4bd0295..22470f0ab8354a9f31a0f195f3fe80f2f5ee2f0e 100644
+index 3ee1160c796cc86db9bc9438055b307239e9a8f7..9c01005751c0088f560f96401cdfdebbbda4e7ec 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -7,12 +7,8 @@ plugins {
@@ -3620,7 +3620,7 @@ index 9ddbfcf80d9a381dace78a62880f85a4d767e0eb..7383c7d3820dce06108eaafd236a7c6c
      }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5c21de0d48fba88c3164b72e0eb624706b683fab..c27e455321951e76e4818fec0e64301f5620dbf6 100644
+index 92e758a286a5db079c32d53cc52c8a422457daef..ff56981a03b55f9ee1ec8ad36adaf9849b2c914b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -469,6 +469,7 @@ public abstract class PlayerList {
@@ -18061,37 +18061,31 @@ index a6c25647fb37f59307de0d390f8e8cf55504d7d3..52aae8bd4023b2bb48f12983f54b20fa
              world.scheduleTick(pos, this, 1);
              return super.updateShape(state, direction, neighborState, world, pos, neighborPos);
 diff --git a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-index fb4382337fe83f7d00c2212a7a71e0ba5bdd51cc..f085a669e2f2645e8c4f7a7e5a3c958f13809744 100644
+index 6fab2b69a0af298bd00b309efcd6aa8399e23d1f..4f7b21caa123ea7896788fd25133d8de3ab1ccaf 100644
 --- a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-@@ -228,26 +228,28 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+@@ -228,20 +228,28 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
          ItemStack itemstack = player.getItemInHand(hand);
  
          if (i < 8 && ComposterBlock.COMPOSTABLES.containsKey(itemstack.getItem())) {
 -            if (i < 7 && !world.isClientSide) {
--                // Paper start - EntityChangeBlockEvent
--                double rand = world.getRandom().nextDouble();
--                BlockState dummyBlockState = ComposterBlock.addItem(player, state, org.bukkit.craftbukkit.util.DummyGeneratorAccess.INSTANCE, pos, itemstack, rand);
--                if (dummyBlockState == null) {
+-                BlockState iblockdata1 = ComposterBlock.addItem(player, state, world, pos, itemstack);
+-                // Paper start - handle cancelled events
+-                if (iblockdata1 == null) {
 -                    return InteractionResult.PASS;
 -                }
--                if (state != dummyBlockState && org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(player, pos, dummyBlockState).isCancelled()) { // if block state will change and event cancelled
--                    return InteractionResult.sidedSuccess(world.isClientSide);
--                }
--                BlockState iblockdata1 = ComposterBlock.addItem(player, state, world, pos, itemstack, rand);
 -                // Paper end
--
++            // Purpur start
++            BlockState newState = process(i, state, world, itemstack, pos, player);
++            if (newState == null) {
++                return InteractionResult.PASS;
++            }
+ 
 -                world.levelEvent(1500, pos, state != iblockdata1 ? 1 : 0);
 -                player.awardStat(Stats.ITEM_USED.get(itemstack.getItem()));
 -                if (!player.getAbilities().instabuild) {
 -                    itemstack.shrink(1);
 -                }
-+            // Purpur start
-+            BlockState newState = process(i, state, world, itemstack, pos, player);
-+            if (newState == null) {
-+                return InteractionResult.PASS;
-             }
- 
 +            if (world.purpurConfig.composterBulkProcess && player.isShiftKeyDown() && newState != state) {
 +                BlockState oldState;
 +                int oldCount, newCount, oldLevel, newLevel;
@@ -18106,28 +18100,22 @@ index fb4382337fe83f7d00c2212a7a71e0ba5bdd51cc..f085a669e2f2645e8c4f7a7e5a3c958f
 +                    newCount = itemstack.getCount();
 +                    newLevel = newState.getValue(ComposterBlock.LEVEL);
 +                } while (newCount > 0 && (newCount != oldCount || newLevel != oldLevel || newState != oldState));
-+            }
+             }
 +            // Purpur end
+ 
              return InteractionResult.sidedSuccess(world.isClientSide);
          } else if (i == 8) {
-             ComposterBlock.extractProduce(player, state, world, pos);
-@@ -257,6 +259,32 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+@@ -252,6 +260,26 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
          }
      }
  
-+    // Purpur start
 +    private static BlockState process(int level, BlockState state, Level world, ItemStack itemstack, BlockPos pos, Player player) {
 +        if (level < 7 && !world.isClientSide) {
-+            // Paper start - EntityChangeBlockEvent
-+            double rand = world.getRandom().nextDouble();
-+            BlockState dummyBlockState = ComposterBlock.addItem(player, state, org.bukkit.craftbukkit.util.DummyGeneratorAccess.INSTANCE, pos, itemstack, rand);
-+            if (dummyBlockState == null) {
-+                return dummyBlockState;
++            BlockState iblockdata1 = ComposterBlock.addItem(player, state, world, pos, itemstack);
++            // Paper start - handle cancelled events
++            if (iblockdata1 == null) {
++                return iblockdata1;
 +            }
-+            if (state != dummyBlockState && org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(player, pos, dummyBlockState).isCancelled()) { // if block state will change and event cancelled
-+                return state;
-+            }
-+            BlockState iblockdata1 = ComposterBlock.addItem(player, state, world, pos, itemstack, rand);
 +            // Paper end
 +
 +            world.levelEvent(1500, pos, state != iblockdata1 ? 1 : 0);
@@ -18135,7 +18123,7 @@ index fb4382337fe83f7d00c2212a7a71e0ba5bdd51cc..f085a669e2f2645e8c4f7a7e5a3c958f
 +            if (!player.getAbilities().instabuild) {
 +                itemstack.shrink(1);
 +            }
-+            return dummyBlockState;
++            return iblockdata1;
 +        }
 +        return state;
 +    }
@@ -20240,10 +20228,10 @@ index 714afc98b5150907b45a00060be4e41582333204..312a6d90c0a09570aef24c205dc2ff27
 +    // Purpur end - OfflinePlayer API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e38391da44a1b5e3b845eba2d80453021a1e0c25..e5bac6bc792196226f975e7f3dd8f147fb14dbad 100644
+index a49520fbb3cbce866338c964dd0aadbd113bf411..3f80b16c8d69f284a26b16cf2513a955005bf458 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -257,7 +257,7 @@ import javax.annotation.Nullable; // Paper
+@@ -259,7 +259,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
@@ -20252,7 +20240,7 @@ index e38391da44a1b5e3b845eba2d80453021a1e0c25..e5bac6bc792196226f975e7f3dd8f147
      private final String serverVersion;
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
-@@ -317,6 +317,20 @@ public final class CraftServer implements Server {
+@@ -319,6 +319,20 @@ public final class CraftServer implements Server {
          this.structureManager = new CraftStructureManager(console.getStructureManager());
  
          Bukkit.setServer(this);
@@ -20273,7 +20261,7 @@ index e38391da44a1b5e3b845eba2d80453021a1e0c25..e5bac6bc792196226f975e7f3dd8f147
  
          // Register all the Enchantments and PotionTypes now so we can stop new registration immediately after
          Enchantments.SHARPNESS.getClass();
-@@ -957,6 +971,7 @@ public final class CraftServer implements Server {
+@@ -959,6 +973,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
@@ -20281,7 +20269,7 @@ index e38391da44a1b5e3b845eba2d80453021a1e0c25..e5bac6bc792196226f975e7f3dd8f147
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -972,6 +987,7 @@ public final class CraftServer implements Server {
+@@ -974,6 +989,7 @@ public final class CraftServer implements Server {
                  }
              }
              world.spigotConfig.init(); // Spigot
@@ -20289,7 +20277,7 @@ index e38391da44a1b5e3b845eba2d80453021a1e0c25..e5bac6bc792196226f975e7f3dd8f147
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -987,6 +1003,7 @@ public final class CraftServer implements Server {
+@@ -989,6 +1005,7 @@ public final class CraftServer implements Server {
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -20297,7 +20285,7 @@ index e38391da44a1b5e3b845eba2d80453021a1e0c25..e5bac6bc792196226f975e7f3dd8f147
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -1429,6 +1446,55 @@ public final class CraftServer implements Server {
+@@ -1431,6 +1448,55 @@ public final class CraftServer implements Server {
          return true;
      }
  
@@ -20353,7 +20341,7 @@ index e38391da44a1b5e3b845eba2d80453021a1e0c25..e5bac6bc792196226f975e7f3dd8f147
      @Override
      public List<Recipe> getRecipesFor(ItemStack result) {
          Validate.notNull(result, "Result cannot be null");
-@@ -2700,6 +2766,7 @@ public final class CraftServer implements Server {
+@@ -2702,6 +2768,7 @@ public final class CraftServer implements Server {
      @Override
      public double[] getTPS() {
          return new double[] {
@@ -20361,7 +20349,7 @@ index e38391da44a1b5e3b845eba2d80453021a1e0c25..e5bac6bc792196226f975e7f3dd8f147
                  net.minecraft.server.MinecraftServer.getServer().tps1.getAverage(),
                  net.minecraft.server.MinecraftServer.getServer().tps5.getAverage(),
                  net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
-@@ -2746,6 +2813,18 @@ public final class CraftServer implements Server {
+@@ -2748,6 +2815,18 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
  
@@ -20380,7 +20368,7 @@ index e38391da44a1b5e3b845eba2d80453021a1e0c25..e5bac6bc792196226f975e7f3dd8f147
          @Override
          public void restart() {
              org.spigotmc.RestartCommand.restart();
-@@ -2921,4 +3000,16 @@ public final class CraftServer implements Server {
+@@ -2961,4 +3040,16 @@ public final class CraftServer implements Server {
      }
  
      // Paper end
@@ -20398,10 +20386,10 @@ index e38391da44a1b5e3b845eba2d80453021a1e0c25..e5bac6bc792196226f975e7f3dd8f147
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8d3a32a0538a6065fd0725721ab8a1a011c4d64a..3013aeb442799aba5b2ae45edcb3c2c72a18a740 100644
+index dafd2c85f89d8822e50db63c21631199c69a97a0..39a2ff8c34f995ab860aadc24d24136d602af646 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2249,6 +2249,48 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2282,6 +2282,48 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return (this.getHandle().dragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().dragonFight());
      }
  
@@ -20801,10 +20789,10 @@ index 4d7a2c4c1001aefe9fcd4be8dbcb414f721bfff9..2c7716a9d65ebda209a144b82c2126b6
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3f498543cf0476ff1b184788d93f13b70c476c16..f4a341f72d727bbffa4cfcf72eda8ed0c8945c9e 100644
+index 5f0146255b050dfc873789e7dd4bc1dc4a929f02..69fe6480a52dca86b09a331345347e88f77a298d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -533,10 +533,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -534,10 +534,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setPlayerListName(String name) {
@@ -20821,7 +20809,7 @@ index 3f498543cf0476ff1b184788d93f13b70c476c16..f4a341f72d727bbffa4cfcf72eda8ed0
          for (ServerPlayer player : (List<ServerPlayer>) server.getHandle().players) {
              if (player.getBukkitEntity().canSee(this)) {
                  player.connection.send(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
-@@ -1357,6 +1362,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1358,6 +1363,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
          if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API
@@ -20832,7 +20820,7 @@ index 3f498543cf0476ff1b184788d93f13b70c476c16..f4a341f72d727bbffa4cfcf72eda8ed0
              return false;
          }
  
-@@ -2404,6 +2413,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2405,6 +2414,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().getAbilities().walkingSpeed * 2f;
      }
  
@@ -20861,7 +20849,7 @@ index 3f498543cf0476ff1b184788d93f13b70c476c16..f4a341f72d727bbffa4cfcf72eda8ed0
      private void validateSpeed(float value) {
          if (value < 0) {
              if (value < -1f) {
-@@ -3196,4 +3227,97 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3180,4 +3211,97 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.spigot;
      }
      // Spigot end

patches/server/0004-Rebrand.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 22470f0ab8354a9f31a0f195f3fe80f2f5ee2f0e..dc89b3a8956af69fa71a2bfa17c22aee6c5e9edf 100644
+index 9c01005751c0088f560f96401cdfdebbbda4e7ec..46fda579a95f9ab92a1ba61cad8218024a722208 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -7,7 +7,7 @@ plugins {
@@ -245,10 +245,10 @@ index bd502ca721de0cab438d995efa00ad0554c0d2fe..d72f61f545c3929825e628607b85e0d2
  
      private static final int DEFAULT_SIZE_THRESHOLD = 1024 * 8;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e5bac6bc792196226f975e7f3dd8f147fb14dbad..4ca714c797e42102e2cd65ba5176ff20e6e5d0ca 100644
+index 3f80b16c8d69f284a26b16cf2513a955005bf458..26c4f8da23bf83abf2e78894b731312028bed191 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -257,7 +257,7 @@ import javax.annotation.Nullable; // Paper
+@@ -259,7 +259,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {

patches/server/0006-Plazma-Configurations.patch

@@ -300,10 +300,10 @@ index 92b440b24c6b083f81837611d08fbd6773a2a6e6..058449f24eb3260dc230dad2a0b4c552
          this.playerBreedingCooldowns = this.getNewBreedingCooldownCache(); // Purpur
          this.generator = gen;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4ca714c797e42102e2cd65ba5176ff20e6e5d0ca..7ab657fba87964db3dc7d6b4ba2d7f635e9f1f17 100644
+index 26c4f8da23bf83abf2e78894b731312028bed191..bb5ec38711f369ffcbd184b4e144bc0d8d576013 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -971,6 +971,7 @@ public final class CraftServer implements Server {
+@@ -973,6 +973,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
@@ -311,7 +311,7 @@ index 4ca714c797e42102e2cd65ba5176ff20e6e5d0ca..7ab657fba87964db3dc7d6b4ba2d7f63
          org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
-@@ -2813,6 +2814,13 @@ public final class CraftServer implements Server {
+@@ -2815,6 +2816,13 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
  

patches/server/0008-Optimize-Default-Configurations.patch

@@ -261,10 +261,10 @@ index 1ea3012995c738c67b31e997c138f824f9e69ba1..8ed00a650b712cbf4bc8796165a539d7
          this.enableStatus = this.get("enable-status", true);
          this.hideOnlinePlayers = this.get("hide-online-players", false);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7ab657fba87964db3dc7d6b4ba2d7f635e9f1f17..75290e5f555f1401b1b6904e8a44c97332bbd01f 100644
+index bb5ec38711f369ffcbd184b4e144bc0d8d576013..5df6fd278a6555e483ea4ebc4e9625907585f77f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -347,7 +347,7 @@ public final class CraftServer implements Server {
+@@ -349,7 +349,7 @@ public final class CraftServer implements Server {
  
          this.configuration = YamlConfiguration.loadConfiguration(this.getConfigFile());
          this.configuration.options().copyDefaults(true);

patches/server/0040-Reduce-allocations.patch

@@ -797,10 +797,10 @@ index cf0ad841267cac84ed058dee6cdd62a835325feb..24756bb1913eb1f00dc367dd9c9741a3
          return slices.getChunkEntities();
      }
 diff --git a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-index f085a669e2f2645e8c4f7a7e5a3c958f13809744..279531a360cc1408ad8dd1e668a1e9f05753d676 100644
+index 4f7b21caa123ea7896788fd25133d8de3ab1ccaf..3683eb2d249fecdd0df781e4cdfd2df5d09843b0 100644
 --- a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-@@ -441,7 +441,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+@@ -442,7 +442,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
  
          @Override
          public int[] getSlotsForFace(Direction side) {
@@ -809,7 +809,7 @@ index f085a669e2f2645e8c4f7a7e5a3c958f13809744..279531a360cc1408ad8dd1e668a1e9f0
          }
  
          @Override
-@@ -490,7 +490,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+@@ -491,7 +491,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
  
          @Override
          public int[] getSlotsForFace(Direction side) {
@@ -818,7 +818,7 @@ index f085a669e2f2645e8c4f7a7e5a3c958f13809744..279531a360cc1408ad8dd1e668a1e9f0
          }
  
          @Override
-@@ -532,7 +532,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+@@ -533,7 +533,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
  
          @Override
          public int[] getSlotsForFace(Direction side) {
@@ -1100,10 +1100,10 @@ index 9a2ec50be757dfa3780a49ec96942fed89ed530c..d5b904a36d7c0a9d0f8787eccc770fd4
              System.out.println("Starting server");
              Thread runThread = new Thread(() -> {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f4a341f72d727bbffa4cfcf72eda8ed0c8945c9e..ca5b436821c9d5e070ab271fc91a29cf53834a89 100644
+index 69fe6480a52dca86b09a331345347e88f77a298d..7fedc6f701167c5b1ef39a89abe96e81704878ff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -471,7 +471,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -472,7 +472,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void sendTitle(Title title) {
          Preconditions.checkNotNull(title, "Title is null");
          setTitleTimes(title.getFadeIn(), title.getStay(), title.getFadeOut());

patches/todo/0041-Reduce-allocations2.patch

@@ -1,196 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: IPECTER <ipectert@gmail.com>
-Date: Tue, 30 May 2023 11:57:07 +0900
-Subject: [PATCH] Reduce-allocations2
-
-
-diff --git a/src/main/java/net/minecraft/advancements/AdvancementRewards.java b/src/main/java/net/minecraft/advancements/AdvancementRewards.java
-index 9e20a870a9c9c295b32cfa591eb52625125a5439..30473930bf3acf0ae74f3ff5e500f6e1374c11da 100644
---- a/src/main/java/net/minecraft/advancements/AdvancementRewards.java
-+++ b/src/main/java/net/minecraft/advancements/AdvancementRewards.java
-@@ -24,7 +24,7 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
- import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
- 
- public class AdvancementRewards {
--    public static final AdvancementRewards EMPTY = new AdvancementRewards(0, new ResourceLocation[0], new ResourceLocation[0], CommandFunction.CacheableFunction.NONE);
-+    public static final AdvancementRewards EMPTY = new AdvancementRewards(0, org.plazmamc.plazma.util.Constants.RESOURCE_LOCATION, org.plazmamc.plazma.util.Constants.RESOURCE_LOCATION, CommandFunction.CacheableFunction.NONE);
-     private final int experience;
-     private final ResourceLocation[] loot;
-     private final ResourceLocation[] recipes;
-@@ -187,7 +187,7 @@ public class AdvancementRewards {
-         }
- 
-         public AdvancementRewards build() {
--            return new AdvancementRewards(this.experience, this.loot.toArray(new ResourceLocation[0]), this.recipes.toArray(new ResourceLocation[0]), this.function == null ? CommandFunction.CacheableFunction.NONE : new CommandFunction.CacheableFunction(this.function));
-+            return new AdvancementRewards(this.experience, this.loot.toArray(org.plazmamc.plazma.util.Constants.RESOURCE_LOCATION), this.recipes.toArray(org.plazmamc.plazma.util.Constants.RESOURCE_LOCATION), this.function == null ? CommandFunction.CacheableFunction.NONE : new CommandFunction.CacheableFunction(this.function));
-         }
-     }
- }
-diff --git a/src/main/java/net/minecraft/advancements/RequirementsStrategy.java b/src/main/java/net/minecraft/advancements/RequirementsStrategy.java
-index 051c1fb81d79c40be683edb86579bb975643bcb3..469c34c773e3257d0edfc807cb882b4cbfc3c53f 100644
---- a/src/main/java/net/minecraft/advancements/RequirementsStrategy.java
-+++ b/src/main/java/net/minecraft/advancements/RequirementsStrategy.java
-@@ -14,7 +14,7 @@ public interface RequirementsStrategy {
-         return strings;
-     };
-     RequirementsStrategy OR = (criteriaNames) -> {
--        return new String[][]{criteriaNames.toArray(new String[0])};
-+        return new String[][]{criteriaNames.toArray(org.plazmamc.plazma.util.Constants.EMPTY_STRING)};
-     };
- 
-     String[][] createRequirements(Collection<String> criteriaNames);
-diff --git a/src/main/java/net/minecraft/nbt/ListTag.java b/src/main/java/net/minecraft/nbt/ListTag.java
-index 749d3e67a877d7d1ed47b5fef511a604ee6589b6..0529814353ba82d6083a88531f06e73377ab5aaf 100644
---- a/src/main/java/net/minecraft/nbt/ListTag.java
-+++ b/src/main/java/net/minecraft/nbt/ListTag.java
-@@ -230,7 +230,7 @@ public class ListTag extends CollectionTag<Tag> {
-             }
-         }
- 
--        return new int[0];
-+        return org.plazmamc.plazma.util.Constants.EMPTY_INT;
-     }
- 
-     public long[] getLongArray(int index) {
-@@ -241,7 +241,7 @@ public class ListTag extends CollectionTag<Tag> {
-             }
-         }
- 
--        return new long[0];
-+        return org.plazmamc.plazma.util.Constants.EMPTY_LONG;
-     }
- 
-     public double getDouble(int index) {
-diff --git a/src/main/java/net/minecraft/nbt/LongArrayTag.java b/src/main/java/net/minecraft/nbt/LongArrayTag.java
-index bdc0adc652228328ebe8fe2455c73c257a89d3c5..122d4b9391ddaae2631db213230f57a829d1c943 100644
---- a/src/main/java/net/minecraft/nbt/LongArrayTag.java
-+++ b/src/main/java/net/minecraft/nbt/LongArrayTag.java
-@@ -193,7 +193,7 @@ public class LongArrayTag extends CollectionTag<LongTag> {
- 
-     @Override
-     public void clear() {
--        this.data = new long[0];
-+        this.data = org.plazmamc.plazma.util.Constants.EMPTY_LONG;
-     }
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/network/CipherBase.java b/src/main/java/net/minecraft/network/CipherBase.java
-index a2920b8a9eff77d9c5d1d7f70ad3abdacba8f0fa..c1c97cc8fa5e0d8349655f90392382a0a878c95f 100644
---- a/src/main/java/net/minecraft/network/CipherBase.java
-+++ b/src/main/java/net/minecraft/network/CipherBase.java
-@@ -7,8 +7,8 @@ import javax.crypto.ShortBufferException;
- 
- public class CipherBase {
-     private final Cipher cipher;
--    private byte[] heapIn = new byte[0];
--    private byte[] heapOut = new byte[0];
-+    private byte[] heapIn = org.plazmamc.plazma.util.Constants.EMPTY_BYTE;
-+    private byte[] heapOut = org.plazmamc.plazma.util.Constants.EMPTY_BYTE;
- 
-     protected CipherBase(Cipher cipher) {
-         this.cipher = cipher;
-diff --git a/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java b/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java
-index 8a68baf6bd46b59cf57c94ffe5651d47a7cae99c..c732299c908622e3b6262cd942a7397b3f34b8e9 100644
---- a/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java
-+++ b/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java
-@@ -21,7 +21,7 @@ import net.minecraft.network.chat.Style;
- import net.minecraft.world.entity.Entity;
- 
- public class TranslatableContents implements ComponentContents {
--    public static final Object[] NO_ARGS = new Object[0];
-+    public static final Object[] NO_ARGS = org.plazmamc.plazma.util.Constants.EMPTY_OBJECT;
-     private static final FormattedText TEXT_PERCENT = FormattedText.of("%");
-     private static final FormattedText TEXT_NULL = FormattedText.of("null");
-     private final String key;
-diff --git a/src/main/java/net/minecraft/server/RunningOnDifferentThreadException.java b/src/main/java/net/minecraft/server/RunningOnDifferentThreadException.java
-index 0f52e8a61ca7e57e9f52473dceb9cc3464c0c86d..857c3609b3cd965e1c10caa8fc5682baae999820 100644
---- a/src/main/java/net/minecraft/server/RunningOnDifferentThreadException.java
-+++ b/src/main/java/net/minecraft/server/RunningOnDifferentThreadException.java
-@@ -4,12 +4,12 @@ public final class RunningOnDifferentThreadException extends RuntimeException {
-     public static final RunningOnDifferentThreadException RUNNING_ON_DIFFERENT_THREAD = new RunningOnDifferentThreadException();
- 
-     private RunningOnDifferentThreadException() {
--        this.setStackTrace(new StackTraceElement[0]);
-+        this.setStackTrace(org.plazmamc.plazma.util.Constants.STACK_TRACE_ELEMENT);
-     }
- 
-     @Override
-     public synchronized Throwable fillInStackTrace() {
--        this.setStackTrace(new StackTraceElement[0]);
-+        this.setStackTrace(org.plazmamc.plazma.util.Constants.STACK_TRACE_ELEMENT);
-         return this;
-     }
- }
-diff --git a/src/main/java/net/minecraft/server/ServerFunctionLibrary.java b/src/main/java/net/minecraft/server/ServerFunctionLibrary.java
-index 975422a57b83a31e63a600bb4ff9c4e2baaf6da7..64d8935c18f3e92ec35b3b160443700e350a72fa 100644
---- a/src/main/java/net/minecraft/server/ServerFunctionLibrary.java
-+++ b/src/main/java/net/minecraft/server/ServerFunctionLibrary.java
-@@ -81,7 +81,7 @@ public class ServerFunctionLibrary implements PreparableReloadListener {
-                 }, prepareExecutor));
-             }
- 
--            CompletableFuture<?>[] completableFutures = map.values().toArray(new CompletableFuture[0]);
-+            CompletableFuture<?>[] completableFutures = map.values().toArray(org.plazmamc.plazma.util.Constants.COMPLETABLE_FUTURE);
-             return CompletableFuture.allOf(completableFutures).handle((unused, ex) -> {
-                 return map;
-             });
-diff --git a/src/main/java/net/minecraft/util/MemoryReserve.java b/src/main/java/net/minecraft/util/MemoryReserve.java
-index 0ee04fe6ff6a4d09754f326526ae04fe7226bab2..0efc5682210e6cd3e0ee03a5e4340614869a8575 100644
---- a/src/main/java/net/minecraft/util/MemoryReserve.java
-+++ b/src/main/java/net/minecraft/util/MemoryReserve.java
-@@ -11,6 +11,6 @@ public class MemoryReserve {
-     }
- 
-     public static void release() {
--        reserve = new byte[0];
-+        reserve = org.plazmamc.plazma.util.Constants.EMPTY_BYTE;
-     }
- }
-diff --git a/src/main/java/net/minecraft/world/level/levelgen/DebugLevelSource.java b/src/main/java/net/minecraft/world/level/levelgen/DebugLevelSource.java
-index c68736b023127c7b395835f4fa82d9062110697b..bd88f27db229d1e34b69bcd9e975bec502d8226b 100644
---- a/src/main/java/net/minecraft/world/level/levelgen/DebugLevelSource.java
-+++ b/src/main/java/net/minecraft/world/level/levelgen/DebugLevelSource.java
-@@ -88,7 +88,7 @@ public class DebugLevelSource extends ChunkGenerator {
- 
-     @Override
-     public NoiseColumn getBaseColumn(int x, int z, LevelHeightAccessor world, RandomState noiseConfig) {
--        return new NoiseColumn(0, new BlockState[0]);
-+        return new NoiseColumn(0, org.plazmamc.plazma.util.Constants.BLOCK_STATE);
-     }
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/world/level/storage/loot/LootPool.java b/src/main/java/net/minecraft/world/level/storage/loot/LootPool.java
-index fad524f8b032174cee0c68da7c68e020ee3cd619..92fe0ca7c16134701f72ea263d9aa933185978d3 100644
---- a/src/main/java/net/minecraft/world/level/storage/loot/LootPool.java
-+++ b/src/main/java/net/minecraft/world/level/storage/loot/LootPool.java
-@@ -160,7 +160,7 @@ public class LootPool {
-             if (this.rolls == null) {
-                 throw new IllegalArgumentException("Rolls not set");
-             } else {
--                return new LootPool(this.entries.toArray(new LootPoolEntryContainer[0]), this.conditions.toArray(new LootItemCondition[0]), this.functions.toArray(new LootItemFunction[0]), this.rolls, this.bonusRolls);
-+                return new LootPool(this.entries.toArray(new LootPoolEntryContainer[0]), this.conditions.toArray(new LootItemCondition[0]), this.functions.toArray(org.plazmamc.plazma.util.Constants.LOOT_ITEM_FUNCTION), this.rolls, this.bonusRolls);
-             }
-         }
-     }
-@@ -171,7 +171,7 @@ public class LootPool {
-             JsonObject jsonObject = GsonHelper.convertToJsonObject(jsonElement, "loot pool");
-             LootPoolEntryContainer[] lootPoolEntryContainers = GsonHelper.getAsObject(jsonObject, "entries", jsonDeserializationContext, LootPoolEntryContainer[].class);
-             LootItemCondition[] lootItemConditions = GsonHelper.getAsObject(jsonObject, "conditions", new LootItemCondition[0], jsonDeserializationContext, LootItemCondition[].class);
--            LootItemFunction[] lootItemFunctions = GsonHelper.getAsObject(jsonObject, "functions", new LootItemFunction[0], jsonDeserializationContext, LootItemFunction[].class);
-+            LootItemFunction[] lootItemFunctions = GsonHelper.getAsObject(jsonObject, "functions", org.plazmamc.plazma.util.Constants.LOOT_ITEM_FUNCTION, jsonDeserializationContext, LootItemFunction[].class);
-             NumberProvider numberProvider = GsonHelper.getAsObject(jsonObject, "rolls", jsonDeserializationContext, NumberProvider.class);
-             NumberProvider numberProvider2 = GsonHelper.getAsObject(jsonObject, "bonus_rolls", ConstantValue.exactly(0.0F), jsonDeserializationContext, NumberProvider.class);
-             return new LootPool(lootPoolEntryContainers, lootItemConditions, lootItemFunctions, numberProvider, numberProvider2);
-diff --git a/src/main/java/net/minecraft/world/scores/Team.java b/src/main/java/net/minecraft/world/scores/Team.java
-index 16d2aa4556bc9f32a2def7f9ca282aa3fa23fb87..c9b266246a83e3d7f5ce61306f291ceff902079d 100644
---- a/src/main/java/net/minecraft/world/scores/Team.java
-+++ b/src/main/java/net/minecraft/world/scores/Team.java
-@@ -80,7 +80,7 @@ public abstract class Team {
-         public final int id;
- 
-         public static String[] getAllNames() {
--            return BY_NAME.keySet().toArray(new String[0]);
-+            return BY_NAME.keySet().toArray(org.plazmamc.plazma.util.Constants.EMPTY_STRING);
-         }
- 
-         @Nullable

patches/todo/0042-213.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: IPECTER <ipectert@gmail.com>
-Date: Tue, 30 May 2023 12:17:59 +0900
-Subject: [PATCH] 213
-
-
-diff --git a/src/main/java/net/minecraft/util/datafix/fixes/LeavesFix.java b/src/main/java/net/minecraft/util/datafix/fixes/LeavesFix.java
-index 89d70a992e0bcc8e7292c4f736470eafd8747b24..a3f071101fbd10272373f99ebd2c76c0805d0d25 100644
---- a/src/main/java/net/minecraft/util/datafix/fixes/LeavesFix.java
-+++ b/src/main/java/net/minecraft/util/datafix/fixes/LeavesFix.java
-@@ -70,7 +70,7 @@ public class LeavesFix extends DataFix {
-             OpticFinder<?> opticFinder3 = DSL.typeFinder(type3);
-             return this.fixTypeEverywhereTyped("Leaves fix", type, (typed) -> {
-                 return typed.updateTyped(opticFinder, (typedx) -> {
--                    int[] is = new int[]{0};
-+                    int[] is = org.plazmamc.plazma.util.Constants.ZERO_INT;
-                     Typed<?> typed2 = typedx.updateTyped(opticFinder2, (typed2x) -> {
-                         Int2ObjectMap<LeavesFix.LeavesSection> int2ObjectMap = new Int2ObjectOpenHashMap<>(typed2x.getAllTyped(opticFinder3).stream().map((typedx2) -> {
-                             return new LeavesFix.LeavesSection(typedx2, this.getInputSchema());