From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jake Potrebic 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 b54f1d7da0e6aa39172848871bd4b0073f43380d..09196224b9b5362918726265a8daad814118f83b 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1545,6 +1545,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(); @@ -1560,7 +1567,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 81afb0d5349102025a96610098676e21647f85da..7155948d803bdea48602d10ca9f18b64c9fd1991 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1129,6 +1129,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 { @@ -1509,6 +1521,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; @@ -1538,6 +1557,11 @@ public final class CraftServer implements Server { } } toAdd.addToCraftingManager(); + // Paper start + if (resendRecipes) { + this.playerList.reloadRecipeData(); + } + // Paper end return true; } @@ -1718,10 +1742,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