aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0838-API-for-updating-recipes-on-clients.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0838-API-for-updating-recipes-on-clients.patch')
-rw-r--r--patches/server/0838-API-for-updating-recipes-on-clients.patch113
1 files changed, 113 insertions, 0 deletions
diff --git a/patches/server/0838-API-for-updating-recipes-on-clients.patch b/patches/server/0838-API-for-updating-recipes-on-clients.patch
new file mode 100644
index 0000000000..77a9a4fe09
--- /dev/null
+++ b/patches/server/0838-API-for-updating-recipes-on-clients.patch
@@ -0,0 +1,113 @@
+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 8b54fab09699dec0cb0fb6063accb04e48a36b6e..bd097ae6edfc0ad810d41ed8bbc7fab34d255610 100644
+--- a/src/main/java/net/minecraft/server/players/PlayerList.java
++++ b/src/main/java/net/minecraft/server/players/PlayerList.java
+@@ -1449,6 +1449,13 @@ public abstract class PlayerList {
+ }
+
+ public void reloadResources() {
++ // Paper start - API for updating recipes on clients
++ this.reloadAdvancementData();
++ this.reloadTagData();
++ this.reloadRecipes();
++ }
++ public void reloadAdvancementData() {
++ // Paper end - API for updating recipes on clients
+ // CraftBukkit start
+ /*Iterator iterator = this.advancements.values().iterator();
+
+@@ -1464,9 +1471,13 @@ public abstract class PlayerList {
+ }
+ // CraftBukkit end
+
++ // Paper start - API for updating recipes on clients
++ }
++ public void reloadTagData() {
+ this.broadcastAll(new ClientboundUpdateTagsPacket(TagNetworkSerialization.serializeTagsToNetwork(this.registries)));
+ // CraftBukkit start
+- this.reloadRecipes();
++ // this.reloadRecipes(); // Paper - do not reload recipes just because tag data was reloaded
++ // Paper end - API for updating recipes on clients
+ }
+
+ public void reloadRecipes() {
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+index 54b5dee7cfd19ad58e376eee80d3827f1a80cfcd..a755137d8d4b266a648cb2a4f41a5ed00262f121 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+@@ -1190,6 +1190,18 @@ public final class CraftServer implements Server {
+ ReloadCommand.reload(this.console);
+ }
+
++ // Paper start - API for updating recipes on clients
++ @Override
++ public void updateResources() {
++ this.playerList.reloadResources();
++ }
++
++ @Override
++ public void updateRecipes() {
++ this.playerList.reloadRecipes();
++ }
++ // Paper end - API for updating recipes on clients
++
+ private void loadIcon() {
+ this.icon = new CraftIconCache(null);
+ try {
+@@ -1569,6 +1581,13 @@ public final class CraftServer implements Server {
+
+ @Override
+ public boolean addRecipe(Recipe recipe) {
++ // Paper start - API for updating recipes on clients
++ return this.addRecipe(recipe, false);
++ }
++
++ @Override
++ public boolean addRecipe(Recipe recipe, boolean resendRecipes) {
++ // Paper end - API for updating recipes on clients
+ CraftRecipe toAdd;
+ if (recipe instanceof CraftRecipe) {
+ toAdd = (CraftRecipe) recipe;
+@@ -1600,6 +1619,11 @@ public final class CraftServer implements Server {
+ }
+ }
+ toAdd.addToCraftingManager();
++ // Paper start - API for updating recipes on clients
++ if (true || resendRecipes) { // Always needs to be resent now... TODO
++ this.playerList.reloadRecipes();
++ }
++ // Paper end - API for updating recipes on clients
+ return true;
+ }
+
+@@ -1780,9 +1804,23 @@ public final class CraftServer implements Server {
+
+ @Override
+ public boolean removeRecipe(NamespacedKey recipeKey) {
++ // Paper start - API for updating recipes on clients
++ return this.removeRecipe(recipeKey, false);
++ }
++
++ @Override
++ public boolean removeRecipe(NamespacedKey recipeKey, boolean resendRecipes) {
++ // Paper end - API for updating recipes on clients
+ Preconditions.checkArgument(recipeKey != null, "recipeKey == null");
+
+- return this.getServer().getRecipeManager().removeRecipe(CraftRecipe.toMinecraft(recipeKey));
++ // Paper start - resend recipes on successful removal
++ final ResourceKey<net.minecraft.world.item.crafting.Recipe<?>> minecraftKey = CraftRecipe.toMinecraft(recipeKey);
++ final boolean removed = this.getServer().getRecipeManager().removeRecipe(minecraftKey);
++ if (removed/* && resendRecipes*/) { // TODO Always need to resend them rn - deprecate this method?
++ this.playerList.reloadRecipes();
++ }
++ return removed;
++ // Paper end - resend recipes on successful removal
+ }
+
+ @Override