diff options
Diffstat (limited to 'patches/server/0977-API-for-updating-recipes-on-clients.patch')
-rw-r--r-- | patches/server/0977-API-for-updating-recipes-on-clients.patch | 114 |
1 files changed, 114 insertions, 0 deletions
diff --git a/patches/server/0977-API-for-updating-recipes-on-clients.patch b/patches/server/0977-API-for-updating-recipes-on-clients.patch new file mode 100644 index 0000000000..aed3faf1ef --- /dev/null +++ b/patches/server/0977-API-for-updating-recipes-on-clients.patch @@ -0,0 +1,114 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic <[email protected]> +Date: Sat, 21 Aug 2021 17:25:38 -0700 +Subject: [PATCH] API for updating recipes on clients + + +diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java +index 80919d247a9204ebf8d0e55df7fc6a2443ed91aa..3a70b7e1319c3ecab9eb720f8a1a34c0efe21a4b 100644 +--- a/src/main/java/net/minecraft/server/players/PlayerList.java ++++ b/src/main/java/net/minecraft/server/players/PlayerList.java +@@ -1539,6 +1539,13 @@ public abstract class PlayerList { + } + + public void reloadResources() { ++ // Paper start - split this method up into separate methods ++ this.reloadAdvancementData(); ++ this.reloadTagData(); ++ this.reloadRecipeData(); ++ } ++ public void reloadAdvancementData() { ++ // Paper end + // CraftBukkit start + /*Iterator iterator = this.advancements.values().iterator(); + +@@ -1554,7 +1561,15 @@ public abstract class PlayerList { + } + // CraftBukkit end + ++ // Paper start ++ } ++ public void reloadTagData() { ++ // Paper end + this.broadcastAll(new ClientboundUpdateTagsPacket(TagNetworkSerialization.serializeTagsToNetwork(this.registries))); ++ // Paper start ++ } ++ public void reloadRecipeData() { ++ // Paper end + ClientboundUpdateRecipesPacket packetplayoutrecipeupdate = new ClientboundUpdateRecipesPacket(this.server.getRecipeManager().getRecipes()); + Iterator iterator1 = this.players.iterator(); + +diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +index e3f776c909c2d4ea4311ea98dad8476b7da1f44e..7b8f4eac4b7361415695170beae50465d6605a22 100644 +--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java ++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +@@ -1131,6 +1131,18 @@ public final class CraftServer implements Server { + ReloadCommand.reload(this.console); + } + ++ // Paper start ++ @Override ++ public void updateResources() { ++ this.playerList.reloadResources(); ++ } ++ ++ @Override ++ public void updateRecipes() { ++ this.playerList.reloadRecipeData(); ++ } ++ // Paper end ++ + private void loadIcon() { + this.icon = new CraftIconCache(null); + try { +@@ -1474,6 +1486,13 @@ public final class CraftServer implements Server { + + @Override + public boolean addRecipe(Recipe recipe) { ++ // Paper start ++ return this.addRecipe(recipe, false); ++ } ++ ++ @Override ++ public boolean addRecipe(Recipe recipe, boolean resendRecipes) { ++ // Paper end + CraftRecipe toAdd; + if (recipe instanceof CraftRecipe) { + toAdd = (CraftRecipe) recipe; +@@ -1503,6 +1522,11 @@ public final class CraftServer implements Server { + } + } + toAdd.addToCraftingManager(); ++ // Paper start ++ if (resendRecipes) { ++ this.playerList.reloadRecipeData(); ++ } ++ // Paper end + return true; + } + +@@ -1622,10 +1646,23 @@ public final class CraftServer implements Server { + + @Override + public boolean removeRecipe(NamespacedKey recipeKey) { ++ // Paper start ++ return this.removeRecipe(recipeKey, false); ++ } ++ ++ @Override ++ public boolean removeRecipe(NamespacedKey recipeKey, boolean resendRecipes) { ++ // Paper end + Preconditions.checkArgument(recipeKey != null, "recipeKey == null"); + + ResourceLocation mcKey = CraftNamespacedKey.toMinecraft(recipeKey); +- return this.getServer().getRecipeManager().removeRecipe(mcKey); ++ // Paper start - resend recipes on successful removal ++ boolean removed = this.getServer().getRecipeManager().removeRecipe(mcKey); ++ if (removed && resendRecipes) { ++ this.playerList.reloadRecipeData(); ++ } ++ return removed; ++ // Paper end + } + + @Override |