Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-01 13:57:35 +01:00
Code Issues Projects Releases Wiki Activity

Readd last API patch (with TODO)

Browse Source
This commit is contained in:
Nassim Jahnke 2024-10-27 09:43:00 +01:00
parent 909afb02ee
commit ba24f1b59d
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
patches/unapplied/api/API-for-updating-recipes-on-clients.patch → patches/api/API-for-updating-recipes-on-clients.patch
View File

18
patches/unapplied/server/API-for-updating-recipes-on-clients.patch → patches/server/API-for-updating-recipes-on-clients.patch
View File

@ -29,15 +29,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ // Paper start - API for updating recipes on clients + // Paper start - API for updating recipes on clients
+ } + }
+ public void reloadTagData() { + public void reloadTagData() {
+ // Paper end - API for updating recipes on clients
this.broadcastAll(new ClientboundUpdateTagsPacket(TagNetworkSerialization.serializeTagsToNetwork(this.registries))); this.broadcastAll(new ClientboundUpdateTagsPacket(TagNetworkSerialization.serializeTagsToNetwork(this.registries)));
+ // Paper start - API for updating recipes on clients
+ } + }
+ public void reloadRecipeData() { + public void reloadRecipeData() {
+ // Paper end - API for updating recipes on clients + // Paper end - API for updating recipes on clients
ClientboundUpdateRecipesPacket packetplayoutrecipeupdate = new ClientboundUpdateRecipesPacket(this.server.getRecipeManager().getOrderedRecipes()); RecipeManager craftingmanager = this.server.getRecipeManager();
ClientboundUpdateRecipesPacket packetplayoutrecipeupdate = new ClientboundUpdateRecipesPacket(craftingmanager.getSynchronizedItemProperties(), craftingmanager.getSynchronizedStonecutterRecipes());
Iterator iterator1 = this.players.iterator(); 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 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@ -80,7 +78,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
toAdd.addToCraftingManager(); toAdd.addToCraftingManager();
+ // Paper start - API for updating recipes on clients + // Paper start - API for updating recipes on clients
+ if (resendRecipes) { + if (true || resendRecipes) { // Always needs to be resent now... TODO
+ this.playerList.reloadRecipeData(); + this.playerList.reloadRecipeData();
+ } + }
+ // Paper end - API for updating recipes on clients + // Paper end - API for updating recipes on clients
@ -100,15 +98,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ // Paper end - API for updating recipes on clients + // Paper end - API for updating recipes on clients
Preconditions.checkArgument(recipeKey != null, "recipeKey == null"); Preconditions.checkArgument(recipeKey != null, "recipeKey == null");
ResourceLocation mcKey = CraftNamespacedKey.toMinecraft(recipeKey); - return this.getServer().getRecipeManager().removeRecipe(CraftRecipe.toMinecraft(recipeKey));
- return this.getServer().getRecipeManager().removeRecipe(mcKey);
+ // Paper start - resend recipes on successful removal + // Paper start - resend recipes on successful removal
+ boolean removed = this.getServer().getRecipeManager().removeRecipe(mcKey); + final ResourceKey<net.minecraft.world.item.crafting.Recipe<?>> minecraftKey = CraftRecipe.toMinecraft(recipeKey);
+ if (removed && resendRecipes) { + final boolean removed = this.getServer().getRecipeManager().removeRecipe(minecraftKey);
+ if (removed/* && resendRecipes*/) { // TODO Always need to resend them rn - deprecate this method?
+ this.playerList.reloadRecipeData(); + this.playerList.reloadRecipeData();
+ } + }
+ return removed; + return removed;
+ // Paper end + // Paper end - resend recipes on successful removal
} }
@Override @Override