115 Zeilen
4.5 KiB
Diff
115 Zeilen
4.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
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 b00da578cb4ba037a540584738b3f866acfa9f88..2f62af670441d422133b18d00d9e5e5e58e4afe7 100644
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
@@ -1530,6 +1530,13 @@ public abstract class PlayerList {
|
|
}
|
|
|
|
public void reloadResources() {
|
|
+ // Paper start - API for updating recipes on clients
|
|
+ this.reloadAdvancementData();
|
|
+ this.reloadTagData();
|
|
+ this.reloadRecipeData();
|
|
+ }
|
|
+ public void reloadAdvancementData() {
|
|
+ // Paper end - API for updating recipes on clients
|
|
// CraftBukkit start
|
|
/*Iterator iterator = this.advancements.values().iterator();
|
|
|
|
@@ -1545,7 +1552,15 @@ public abstract class PlayerList {
|
|
}
|
|
// CraftBukkit end
|
|
|
|
+ // Paper start - API for updating recipes on clients
|
|
+ }
|
|
+ public void reloadTagData() {
|
|
+ // Paper end - API for updating recipes on clients
|
|
this.broadcastAll(new ClientboundUpdateTagsPacket(TagNetworkSerialization.serializeTagsToNetwork(this.registries)));
|
|
+ // Paper start - API for updating recipes on clients
|
|
+ }
|
|
+ public void reloadRecipeData() {
|
|
+ // Paper end - API for updating recipes on clients
|
|
ClientboundUpdateRecipesPacket packetplayoutrecipeupdate = new ClientboundUpdateRecipesPacket(this.server.getRecipeManager().getOrderedRecipes());
|
|
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 bebccf63126be70bf7487361ba8a836131aaf524..4806076159431403b5d8dae8472b9c3acd5ecb36 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -1143,6 +1143,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.reloadRecipeData();
|
|
+ }
|
|
+ // Paper end - API for updating recipes on clients
|
|
+
|
|
private void loadIcon() {
|
|
this.icon = new CraftIconCache(null);
|
|
try {
|
|
@@ -1522,6 +1534,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;
|
|
@@ -1551,6 +1570,11 @@ public final class CraftServer implements Server {
|
|
}
|
|
}
|
|
toAdd.addToCraftingManager();
|
|
+ // Paper start - API for updating recipes on clients
|
|
+ if (resendRecipes) {
|
|
+ this.playerList.reloadRecipeData();
|
|
+ }
|
|
+ // Paper end - API for updating recipes on clients
|
|
return true;
|
|
}
|
|
|
|
@@ -1731,10 +1755,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");
|
|
|
|
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
|