diff --git a/gradle.properties b/gradle.properties
index 7b037aeb0..ded5f9acf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.20.1-R0.1-SNAPSHOT
mcVersion = 1.20.1
-paperCommit = 1b1c23010ac55e610e3a36f4e5b93a8198cff69c
+paperCommit = 773dd724469bae89d0c2075edc3d1ddc8d5b0b18
org.gradle.caching = true
org.gradle.parallel = true
diff --git a/patches/api/0005-Purpur-client-support.patch b/patches/api/0005-Purpur-client-support.patch
index 4ddbb6f31..d34cc24e3 100644
--- a/patches/api/0005-Purpur-client-support.patch
+++ b/patches/api/0005-Purpur-client-support.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f9dd00210c1762a40259f823aeb8d8a5ddc78e3e..9ee0d60775a00a99c8ac779e8602c619565e6a42 100644
+index f59cbc92334c7b7b20e593a58232fb3c4434f12b..205ddc2abe17781da97fafa06f412b8160cb4427 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3271,4 +3271,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3273,4 +3273,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end
diff --git a/patches/api/0010-AFK-API.patch b/patches/api/0010-AFK-API.patch
index ea7bab12e..0aca04d65 100644
--- a/patches/api/0010-AFK-API.patch
+++ b/patches/api/0010-AFK-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9ee0d60775a00a99c8ac779e8602c619565e6a42..2ddacd7f74cba66f67ab6957e03522453de01117 100644
+index 205ddc2abe17781da97fafa06f412b8160cb4427..fdcbcc9c53d72127b8d1a0072f0f9726f90eb766 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3279,5 +3279,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3281,5 +3281,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return True if Player uses Purpur Client
*/
public boolean usesPurpurClient();
diff --git a/patches/api/0016-Player-invulnerabilities.patch b/patches/api/0016-Player-invulnerabilities.patch
index 32920bcf2..be83154c1 100644
--- a/patches/api/0016-Player-invulnerabilities.patch
+++ b/patches/api/0016-Player-invulnerabilities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 2ddacd7f74cba66f67ab6957e03522453de01117..1994acf66919c92f59e2a9f2f873f50b73d76d1a 100644
+index fdcbcc9c53d72127b8d1a0072f0f9726f90eb766..407940174a485d082350f01e7e5e2b879fb911b5 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3298,5 +3298,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3300,5 +3300,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0
*/
void resetIdleTimer();
diff --git a/patches/api/0042-Add-local-difficulty-api.patch b/patches/api/0042-Add-local-difficulty-api.patch
index 3b9825738..e152cbe75 100644
--- a/patches/api/0042-Add-local-difficulty-api.patch
+++ b/patches/api/0042-Add-local-difficulty-api.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add local difficulty api
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 6917931966377c51db88a3364997a110dd987970..1fba792419ea6b5e8c640a2599e4b2dd16ee87d0 100644
+index b8b97df069b28fa3cf32f1ad1f01f586a0cfbc78..aa60e6db5705764c8b9e766460c692260a2e8fb3 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
-@@ -3992,6 +3992,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4008,6 +4008,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@Nullable
public DragonBattle getEnderDragonBattle();
diff --git a/patches/api/0045-Debug-Marker-API.patch b/patches/api/0045-Debug-Marker-API.patch
index f5194ac9e..d09791a06 100644
--- a/patches/api/0045-Debug-Marker-API.patch
+++ b/patches/api/0045-Debug-Marker-API.patch
@@ -179,10 +179,10 @@ index 3bc9fa8b68b284516ddbf0ace0c1dc52768307cb..aaef58468a3c31f35e5067ed4263e9dd
// Purpur end
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 1fba792419ea6b5e8c640a2599e4b2dd16ee87d0..bf39c6602cfca70a6352519fa26059cd79143cdd 100644
+index aa60e6db5705764c8b9e766460c692260a2e8fb3..63bf1d70cce9176f47a158a4a767b1bf38d60dbd 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
-@@ -4000,6 +4000,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4016,6 +4016,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
* @return The local difficulty
*/
public float getLocalDifficultyAt(@NotNull Location location);
@@ -260,10 +260,10 @@ index 1fba792419ea6b5e8c640a2599e4b2dd16ee87d0..bf39c6602cfca70a6352519fa26059cd
/**
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 1994acf66919c92f59e2a9f2f873f50b73d76d1a..b1a5baf12343f5db11ef58666bf6393b008c7dcf 100644
+index 407940174a485d082350f01e7e5e2b879fb911b5..11ef2a302586e276a11360caa7d75101939988ab 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3319,5 +3319,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3321,5 +3321,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param invulnerableTicks Invulnerable ticks remaining
*/
void setSpawnInvulnerableTicks(int invulnerableTicks);
diff --git a/patches/api/0046-Add-death-screen-API.patch b/patches/api/0046-Add-death-screen-API.patch
index 1256eaa99..3f6455f73 100644
--- a/patches/api/0046-Add-death-screen-API.patch
+++ b/patches/api/0046-Add-death-screen-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b1a5baf12343f5db11ef58666bf6393b008c7dcf..9193288438671409cc3cf92033ef7cb60d798b69 100644
+index 11ef2a302586e276a11360caa7d75101939988ab..d3d5d2c78cc4ee36beaa355ef7e61ef13332abab 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3389,5 +3389,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3391,5 +3391,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Clears all debug block highlights
*/
void clearBlockHighlights();
diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch
index 957d15318..d36441494 100644
--- a/patches/server/0001-Pufferfish-Server-Changes.patch
+++ b/patches/server/0001-Pufferfish-Server-Changes.patch
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
diff --git a/build.gradle.kts b/build.gradle.kts
-index 8998b8cfd4b0785848ec4b3e33f453548e07cae5..d3124aa84000f1dcf3ea03b91578c8f00d8c5261 100644
+index 7e0580bbd0a557c7bb269507a99d25db07bf31f1..4d89c46c7ee559acf986ff5081a42fe91cb5a257 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -1850,7 +1850,7 @@ index 241fec02e6869c638d3a160819b32173a081467b..6a8f9e8f5bf108674c47018def28906e
public int getContainerSize() {
return this.container1.getContainerSize() + this.container2.getContainerSize();
diff --git a/src/main/java/net/minecraft/world/Container.java b/src/main/java/net/minecraft/world/Container.java
-index 04b1531572e8fff1e46fe1c94e7fc863841e0f66..47ddc42f2b63d9d3fae5ae6ea93d418352d76c94 100644
+index aee02acd4b2f2fdcb574c37c077fb57013ccb596..5a1c2d62c0e55c5bf16ca3e208dc486bf3b064b2 100644
--- a/src/main/java/net/minecraft/world/Container.java
+++ b/src/main/java/net/minecraft/world/Container.java
@@ -3,6 +3,8 @@ package net.minecraft.world;
@@ -3362,7 +3362,7 @@ 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 1150a114e56899758264aa678db4e9ec3e78befc..58a8869b5e23db22cba83aaa2f25e0427742bd1d 100644
+index 74d06790de674cbd230a0b14ac9a6b614c9f84ef..0f89716d1131178bd7ac927ef68337357139e2b7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -265,7 +265,7 @@ import javax.annotation.Nullable; // Paper
@@ -3374,7 +3374,7 @@ index 1150a114e56899758264aa678db4e9ec3e78befc..58a8869b5e23db22cba83aaa2f25e042
private final String serverVersion;
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
-@@ -1118,6 +1118,11 @@ public final class CraftServer implements Server {
+@@ -1120,6 +1120,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."
));
diff --git a/patches/server/0004-Purpur-config-files.patch b/patches/server/0004-Purpur-config-files.patch
index 17d003d0d..5387bef11 100644
--- a/patches/server/0004-Purpur-config-files.patch
+++ b/patches/server/0004-Purpur-config-files.patch
@@ -112,10 +112,10 @@ index 2f1b2160684bf60715cff541834b714ce62a0241..f8615d9714ac6a9c83d881d6d89b1182
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 22cb0531514cb72bbd3bd487bcef371bb882cf8e..ece0c8c903e9eb5890a6a770c908e624d0478671 100644
+index 3234f6c53d931c13d47a58f8bb16e22b52389b4a..3cdb675a5ae2ca3e4694d379ffe4fdb4f7831e63 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1035,6 +1035,7 @@ public final class CraftServer implements Server {
+@@ -1037,6 +1037,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
this.console.paperConfigurations.reloadConfigs(this.console);
@@ -123,7 +123,7 @@ index 22cb0531514cb72bbd3bd487bcef371bb882cf8e..ece0c8c903e9eb5890a6a770c908e624
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))
-@@ -1050,6 +1051,7 @@ public final class CraftServer implements Server {
+@@ -1052,6 +1053,7 @@ public final class CraftServer implements Server {
}
}
world.spigotConfig.init(); // Spigot
@@ -131,7 +131,7 @@ index 22cb0531514cb72bbd3bd487bcef371bb882cf8e..ece0c8c903e9eb5890a6a770c908e624
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -1065,6 +1067,7 @@ public final class CraftServer implements Server {
+@@ -1067,6 +1069,7 @@ public final class CraftServer implements Server {
this.reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -139,7 +139,7 @@ index 22cb0531514cb72bbd3bd487bcef371bb882cf8e..ece0c8c903e9eb5890a6a770c908e624
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
-@@ -2915,6 +2918,18 @@ public final class CraftServer implements Server {
+@@ -2917,6 +2920,18 @@ public final class CraftServer implements Server {
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}
diff --git a/patches/server/0013-Bring-back-server-name.patch b/patches/server/0013-Bring-back-server-name.patch
index 21ab90d13..98247ea72 100644
--- a/patches/server/0013-Bring-back-server-name.patch
+++ b/patches/server/0013-Bring-back-server-name.patch
@@ -17,10 +17,10 @@ index 818289e831e3dad29345c43265e2efd7689bc500..1ea3012995c738c67b31e997c138f824
public final boolean spawnNpcs = this.get("spawn-npcs", true);
public final boolean pvp = this.get("pvp", true);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ece0c8c903e9eb5890a6a770c908e624d0478671..6eb6c98492667192224dfe6981a2353fe7210a46 100644
+index 3cdb675a5ae2ca3e4694d379ffe4fdb4f7831e63..139ff6af8134dd26b0ee40fa3d62a00f55e41694 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3143,4 +3143,11 @@ public final class CraftServer implements Server {
+@@ -3145,4 +3145,11 @@ public final class CraftServer implements Server {
}
// Paper end
diff --git a/patches/server/0016-Lagging-threshold.patch b/patches/server/0016-Lagging-threshold.patch
index e4e816d14..11d5a40bc 100644
--- a/patches/server/0016-Lagging-threshold.patch
+++ b/patches/server/0016-Lagging-threshold.patch
@@ -25,10 +25,10 @@ index 1265167bc9167cb586b98391ea3daaa09fa4e7fb..287f5b64622cdc98cbe8248c89af27c9
}
// Spigot end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6eb6c98492667192224dfe6981a2353fe7210a46..936c47a174f434feecbf76a6454d6199515d4d88 100644
+index 139ff6af8134dd26b0ee40fa3d62a00f55e41694..98c4b8356dc26cf220dddb5ec319751b81601991 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3149,5 +3149,10 @@ public final class CraftServer implements Server {
+@@ -3151,5 +3151,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return this.getProperties().serverName;
}
diff --git a/patches/server/0060-Add-5-second-tps-average-in-tps.patch b/patches/server/0060-Add-5-second-tps-average-in-tps.patch
index 1776a6712..95a380a01 100644
--- a/patches/server/0060-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0060-Add-5-second-tps-average-in-tps.patch
@@ -69,10 +69,10 @@ index eda8479d26d5ccbb516adc6c483c1c8366375ddd..4cadfd50a0c465ab8d809b91b9a99994
lagging = recentTps[0] < org.purpurmc.purpur.PurpurConfig.laggingThreshold; // Purpur
tickSection = curTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 936c47a174f434feecbf76a6454d6199515d4d88..50ffdecfd3d696947011dbb4bfb9e07f4954b227 100644
+index 98c4b8356dc26cf220dddb5ec319751b81601991..9bf5facac29591b7f6d5cfb7abb5a7bf6e9d382b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2872,6 +2872,7 @@ public final class CraftServer implements Server {
+@@ -2874,6 +2874,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {
diff --git a/patches/server/0211-Added-the-ability-to-add-combustible-items.patch b/patches/server/0211-Added-the-ability-to-add-combustible-items.patch
index 090d2ca8c..ea351942f 100644
--- a/patches/server/0211-Added-the-ability-to-add-combustible-items.patch
+++ b/patches/server/0211-Added-the-ability-to-add-combustible-items.patch
@@ -51,10 +51,10 @@ index ca2052804ad829a1528a9c5a0a792275beead113..997d0fab71eacc6466ffe3bc8f6349e5
private int maxStack = MAX_STACK;
public List transaction = new java.util.ArrayList();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 50ffdecfd3d696947011dbb4bfb9e07f4954b227..9f218ed41e29cf96a8953ba366a1c3048dffa8d4 100644
+index 9bf5facac29591b7f6d5cfb7abb5a7bf6e9d382b..ab31661318beb96bc18b270cc614adcf0ea86d08 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1533,6 +1533,19 @@ public final class CraftServer implements Server {
+@@ -1535,6 +1535,19 @@ public final class CraftServer implements Server {
return true;
}
diff --git a/patches/server/0272-Debug-Marker-API.patch b/patches/server/0272-Debug-Marker-API.patch
index 565608f01..98bd940b8 100644
--- a/patches/server/0272-Debug-Marker-API.patch
+++ b/patches/server/0272-Debug-Marker-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Debug Marker API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9f218ed41e29cf96a8953ba366a1c3048dffa8d4..e9d0b32b0fa39ea422ab1cbd985bcb05321b22bf 100644
+index ab31661318beb96bc18b270cc614adcf0ea86d08..9bb5c8a2480dbb86c022d9a83b892d28cf232e8d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1544,6 +1544,42 @@ public final class CraftServer implements Server {
+@@ -1546,6 +1546,42 @@ public final class CraftServer implements Server {
public void removeFuel(org.bukkit.Material material) {
net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity.removeFuel(net.minecraft.world.item.ItemStack.fromBukkitCopy(new ItemStack(material)));
}
diff --git a/patches/server/0283-Language-API.patch b/patches/server/0283-Language-API.patch
index edaf2a367..f95b2cb32 100644
--- a/patches/server/0283-Language-API.patch
+++ b/patches/server/0283-Language-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Language API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5ac085f56464dfd9ff6b3786968ad43f4f506371..b08d4a2a74392b1d59b1eeeab3108103d83ad96c 100644
+index 9bb5c8a2480dbb86c022d9a83b892d28cf232e8d..b21bc96232d0fd52e5dae7fa1c413714f8ddd7ee 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -397,6 +397,20 @@ public final class CraftServer implements Server {
@@ -27,5 +27,5 @@ index 5ac085f56464dfd9ff6b3786968ad43f4f506371..b08d4a2a74392b1d59b1eeeab3108103
+ });
+ // Purpur end
- // Register all the Enchantments and PotionTypes now so we can stop new registration immediately after
- Enchantments.SHARPNESS.getClass();
+ CraftRegistry.setMinecraftRegistry(console.registryAccess());
+
diff --git a/patches/server/0308-temporarily-revert-PaperMC-Paper-eb60bff.patch b/patches/server/0308-temporarily-revert-PaperMC-Paper-eb60bff.patch
deleted file mode 100644
index 37f7dcdb8..000000000
--- a/patches/server/0308-temporarily-revert-PaperMC-Paper-eb60bff.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: granny
-Date: Sat, 16 Sep 2023 21:28:59 -0700
-Subject: [PATCH] temporarily revert PaperMC/Paper@eb60bff
-
-updating paperweight to v1.5.6 breaks compileJava tasks
-
-since changes in PaperMC/Paper@eb60bff require functions added by paperweight v1.5.6, the commit needs to be reverted
-
-this patch can be deleted once createReobfBundlerJar and createReobfPaperclipJar don't throw an error while using the latest paperweight version
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index ade33f87435f7790dbc870b3ea1544704df1205d..92118ece03afbe49bbe4dbe8a54c6d434434bd0c 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -221,14 +221,16 @@ tasks.registerRunTask("runReobf") {
- classpath(runtimeClasspathWithoutVanillaServer)
- }
-
--val runtimeClasspathForRunDev = sourceSets.main.flatMap { src ->
-+/*val runtimeClasspathForRunDev = sourceSets.main.flatMap { src -> // Purpur
- src.runtimeClasspath.elements.map { elements ->
- elements.filterNot { file -> file.asFile.endsWith("minecraft.jar") }
- }
--}
-+}*/ // Purpur
- tasks.registerRunTask("runDev") {
- description = "Spin up a non-relocated Mojang-mapped test server"
-- classpath(tasks.filterProjectDir.flatMap { it.outputJar })
-- classpath(runtimeClasspathForRunDev)
-- jvmArgs("-DPaper.isRunDev=true")
-+ // Purpur start
-+ classpath(sourceSets.main.map { it.runtimeClasspath })
-+ // classpath(runtimeClasspathForRunDev)
-+ // jvmArgs("-DPaper.isRunDev=true")
-+ // Purpur end
- }
-diff --git a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
-index e4fd372a1d585887287253a02531cd192929377b..8a674441a27137ddf00561647115da1bf841090e 100644
---- a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
-+++ b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
-@@ -221,7 +221,7 @@ public final class ChatProcessor {
- final ChatRenderer renderer = event.renderer();
-
- final Set viewers = event.viewers();
-- final ResourceKey chatTypeKey = renderer instanceof ChatRenderer.Default ? ChatType.CHAT : PAPER_RAW;
-+ final ResourceKey chatTypeKey = renderer instanceof ChatRenderer.Default ? ChatType.CHAT : ChatType.RAW; // Purpur
- final ChatType.Bound chatType = ChatType.bind(chatTypeKey, this.player.level().registryAccess(), PaperAdventure.asVanilla(displayName(player)));
-
- OutgoingChat outgoingChat = viewers instanceof LazyChatAudienceSet lazyAudienceSet && lazyAudienceSet.isLazy() ? new ServerOutgoingChat() : new ViewersOutgoingChat();
-diff --git a/src/main/java/net/minecraft/network/chat/ChatType.java b/src/main/java/net/minecraft/network/chat/ChatType.java
-index 618a9335faf9df4a7d0cc971a8e62a0e3b239aa3..160600470c2bdb4c58f5375626a194b1b372f458 100644
---- a/src/main/java/net/minecraft/network/chat/ChatType.java
-+++ b/src/main/java/net/minecraft/network/chat/ChatType.java
-@@ -26,6 +26,7 @@ public record ChatType(ChatTypeDecoration chat, ChatTypeDecoration narration) {
- public static final ResourceKey TEAM_MSG_COMMAND_INCOMING = create("team_msg_command_incoming");
- public static final ResourceKey TEAM_MSG_COMMAND_OUTGOING = create("team_msg_command_outgoing");
- public static final ResourceKey EMOTE_COMMAND = create("emote_command");
-+ public static final ResourceKey RAW = create("raw"); // Purpur
-
- private static ResourceKey create(String id) {
- return ResourceKey.create(Registries.CHAT_TYPE, new ResourceLocation(id));
-@@ -39,6 +40,7 @@ public record ChatType(ChatTypeDecoration chat, ChatTypeDecoration narration) {
- messageTypeRegisterable.register(TEAM_MSG_COMMAND_INCOMING, new ChatType(ChatTypeDecoration.teamMessage("chat.type.team.text"), ChatTypeDecoration.withSender("chat.type.text.narrate")));
- messageTypeRegisterable.register(TEAM_MSG_COMMAND_OUTGOING, new ChatType(ChatTypeDecoration.teamMessage("chat.type.team.sent"), ChatTypeDecoration.withSender("chat.type.text.narrate")));
- messageTypeRegisterable.register(EMOTE_COMMAND, new ChatType(ChatTypeDecoration.withSender("chat.type.emote"), ChatTypeDecoration.withSender("chat.type.emote")));
-+ messageTypeRegisterable.register(RAW, new ChatType(new ChatTypeDecoration("%s", java.util.List.of(ChatTypeDecoration.Parameter.CONTENT), Style.EMPTY), new ChatTypeDecoration("%s", java.util.List.of(ChatTypeDecoration.Parameter.CONTENT), Style.EMPTY))); // Purpur
- }
-
- public static ChatType.Bound bind(ResourceKey typeKey, Entity entity) {
-diff --git a/src/main/java/net/minecraft/resources/RegistryDataLoader.java b/src/main/java/net/minecraft/resources/RegistryDataLoader.java
-index 5f051cb22ae77f4d8994b07ac5b963bd0ff05673..aab07057606ee9c0893286bb3df82e84b87793f9 100644
---- a/src/main/java/net/minecraft/resources/RegistryDataLoader.java
-+++ b/src/main/java/net/minecraft/resources/RegistryDataLoader.java
-@@ -61,6 +61,11 @@ public class RegistryDataLoader {
- RegistryOps.RegistryInfoLookup registryInfoLookup = createContext(baseRegistryManager, list);
- list.forEach((loader) -> {
- loader.getSecond().load(resourceManager, registryInfoLookup);
-+ // Purpur start
-+ if (loader.getFirst().key() == Registries.CHAT_TYPE) {
-+ Registry.register((Registry) loader.getFirst(), ChatType.RAW, new ChatType(new net.minecraft.network.chat.ChatTypeDecoration("%s", List.of(net.minecraft.network.chat.ChatTypeDecoration.Parameter.CONTENT), net.minecraft.network.chat.Style.EMPTY), new net.minecraft.network.chat.ChatTypeDecoration("%s", List.of(net.minecraft.network.chat.ChatTypeDecoration.Parameter.CONTENT), net.minecraft.network.chat.Style.EMPTY))); // CraftBukkit
-+ }
-+ // Purpur end
- });
- list.forEach((loader) -> {
- Registry registry = loader.getFirst();
-diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index a7ebf851a65231074c89a24f30de4ac2fb5b63e4..f8d1631b274751a60d429f847ca7689e17adf1a2 100644
---- a/src/main/java/net/minecraft/server/Main.java
-+++ b/src/main/java/net/minecraft/server/Main.java
-@@ -112,7 +112,7 @@ public class Main {
-
- try {
- // Paper start
-- if (Boolean.getBoolean("Paper.isRunDev")) {
-+ /*if (Boolean.getBoolean("Paper.isRunDev")) { // Purpur
- net.minecraft.server.packs.VanillaPackResourcesBuilder.developmentConfig = builder -> {
- try {
- builder.pushAssetPath(net.minecraft.server.packs.PackType.SERVER_DATA, net.minecraft.server.packs.VanillaPackResourcesBuilder.safeGetPath(java.util.Objects.requireNonNull(Main.class.getResource("/data/.paperassetsroot"), "Missing required .paperassetsroot file").toURI()).getParent());
-@@ -120,7 +120,7 @@ public class Main {
- throw new RuntimeException(ex);
- }
- };
-- }
-+ }*/ // Purpur
- // Paper end
-
- Path path = (Path) optionset.valueOf("pidFile"); // CraftBukkit
-diff --git a/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java b/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java
-index 43ce85977472fd831fa272ff1d81df4586352d72..536047faf2496add18b6a245aa587dc0d6a3b27e 100644
---- a/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java
-+++ b/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java
-@@ -28,7 +28,7 @@ public class ServerPacksSource extends BuiltInPackSource {
- }
-
- private static VanillaPackResources createVanillaPackSource() {
-- return (new VanillaPackResourcesBuilder()).setMetadata(BUILT_IN_METADATA).exposeNamespace("minecraft", ResourceLocation.PAPER_NAMESPACE).applyDevelopmentConfig().pushJarResources().build(); // Paper
-+ return (new VanillaPackResourcesBuilder()).setMetadata(BUILT_IN_METADATA).exposeNamespace("minecraft").applyDevelopmentConfig().pushJarResources().build(); // Paper // Purpur
- }
-
- @Override