BlueGit

timfa copper-key

Fix advancement registration on Paper 26.2.

Add required JSON fields and register via loadAdvancements(..., false) to avoid datapack persistence NPE.

Co-authored-by: Cursor <cursoragent@cursor.com>

timfa Tim Falken · pushed by timfa

Authored 2026-08-22 · 2 months ago

Hash
f55596d1bd605df644fcea7344f7a81d4307877f
Parent
3e1a4a15
3 files changed +44 −16
src/main/java/nl/timfalken/copperkeys/CopperKeysPlugin.java +34 −14
@@ -57,11 +57,12 @@ import org.bukkit.plugin.java.JavaPlugin;
57 57 import java.io.IOException;
58 58 import java.io.InputStream;
59 59 import java.nio.charset.StandardCharsets;
60 import java.util.HashMap;
61 60 import java.util.ArrayList;
61 import java.util.HashMap;
62 62 import java.util.LinkedHashSet;
63 63 import java.util.List;
64 64 import java.util.Locale;
65 import java.util.Map;
65 66 import java.util.Set;
66 67 import java.util.UUID;
67 68 import java.util.logging.Level;
@@ -85,8 +86,7 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
85 86 oopsAdvancementKey = new NamespacedKey(this, "oops");
86 87
87 88 registerRecipes();
88 registerAdvancement(burglarAdvancementKey, "advancements/burglar.json", "Burglar");
89 registerAdvancement(oopsAdvancementKey, "advancements/oops.json", "Oops");
89 registerAdvancements();
90 90 var keyNameCommand = getCommand("keyname");
91 91 if (keyNameCommand != null) {
92 92 keyNameCommand.setExecutor(new KeyNameCommand(this));
@@ -133,23 +133,43 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
133 133 Bukkit.addRecipe(copyRecipe);
134 134 }
135 135
136 private void registerAdvancement(NamespacedKey key, String resourcePath, String label) {
137 if (Bukkit.getAdvancement(key) != null) {
136 private void registerAdvancements() {
137 if (Bukkit.getAdvancement(burglarAdvancementKey) != null
138 && Bukkit.getAdvancement(oopsAdvancementKey) != null) {
139 return;
140 }
141
142 String burglarJson = readAdvancementJson("advancements/burglar.json", "Burglar");
143 String oopsJson = readAdvancementJson("advancements/oops.json", "Oops");
144 if (burglarJson == null || oopsJson == null) {
138 145 return;
139 146 }
147
148 Map<NamespacedKey, String> definitions = Map.of(
149 burglarAdvancementKey, burglarJson,
150 oopsAdvancementKey, oopsJson
151 );
152
153 try {
154 List<Advancement> loaded = Bukkit.getUnsafe().loadAdvancements(definitions, false);
155 if (loaded.size() != definitions.size()) {
156 getLogger().warning("Registered " + loaded.size() + " of " + definitions.size() + " advancements.");
157 }
158 } catch (RuntimeException ex) {
159 getLogger().log(Level.WARNING, "Could not register CopperKeys advancements", ex);
160 }
161 }
162
163 private String readAdvancementJson(String resourcePath, String label) {
140 164 try (InputStream in = getResource(resourcePath)) {
141 165 if (in == null) {
142 166 getLogger().warning("Missing " + resourcePath + "; " + label + " advancement not registered.");
143 return;
144 }
145 String json = new String(in.readAllBytes(), StandardCharsets.UTF_8);
146 @SuppressWarnings("deprecation")
147 Advancement loaded = Bukkit.getUnsafe().loadAdvancement(key, json);
148 if (loaded == null) {
149 getLogger().warning("Could not register " + label + " advancement.");
167 return null;
150 168 }
151 } catch (IOException | RuntimeException ex) {
152 getLogger().log(Level.WARNING, "Could not register " + label + " advancement", ex);
169 return new String(in.readAllBytes(), StandardCharsets.UTF_8);
170 } catch (IOException ex) {
171 getLogger().log(Level.WARNING, "Could not read " + label + " advancement", ex);
172 return null;
153 173 }
154 174 }
155 175
@@ -57,11 +57,12 @@ import org.bukkit.plugin.java.JavaPlugin;
57import java.io.IOException;
57import java.io.IOException;
58import java.io.InputStream;
58import java.io.InputStream;
59import java.nio.charset.StandardCharsets;
59import java.nio.charset.StandardCharsets;
60import java.util.HashMap;
61import java.util.ArrayList;
60import java.util.ArrayList;
61import java.util.HashMap;
62import java.util.LinkedHashSet;
62import java.util.LinkedHashSet;
63import java.util.List;
63import java.util.List;
64import java.util.Locale;
64import java.util.Locale;
65import java.util.Map;
65import java.util.Set;
66import java.util.Set;
66import java.util.UUID;
67import java.util.UUID;
67import java.util.logging.Level;
68import java.util.logging.Level;
@@ -85,8 +86,7 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
85 oopsAdvancementKey = new NamespacedKey(this, "oops");
86 oopsAdvancementKey = new NamespacedKey(this, "oops");
86
87
87 registerRecipes();
88 registerRecipes();
88 registerAdvancement(burglarAdvancementKey, "advancements/burglar.json", "Burglar");
89 registerAdvancements();
89 registerAdvancement(oopsAdvancementKey, "advancements/oops.json", "Oops");
90 var keyNameCommand = getCommand("keyname");
90 var keyNameCommand = getCommand("keyname");
91 if (keyNameCommand != null) {
91 if (keyNameCommand != null) {
92 keyNameCommand.setExecutor(new KeyNameCommand(this));
92 keyNameCommand.setExecutor(new KeyNameCommand(this));
@@ -133,23 +133,43 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
133 Bukkit.addRecipe(copyRecipe);
133 Bukkit.addRecipe(copyRecipe);
134 }
134 }
135
135
136 private void registerAdvancement(NamespacedKey key, String resourcePath, String label) {
136 private void registerAdvancements() {
137 if (Bukkit.getAdvancement(key) != null) {
137 if (Bukkit.getAdvancement(burglarAdvancementKey) != null
138 && Bukkit.getAdvancement(oopsAdvancementKey) != null) {
139 return;
140 }
141
142 String burglarJson = readAdvancementJson("advancements/burglar.json", "Burglar");
143 String oopsJson = readAdvancementJson("advancements/oops.json", "Oops");
144 if (burglarJson == null || oopsJson == null) {
138 return;
145 return;
139 }
146 }
147
148 Map<NamespacedKey, String> definitions = Map.of(
149 burglarAdvancementKey, burglarJson,
150 oopsAdvancementKey, oopsJson
151 );
152
153 try {
154 List<Advancement> loaded = Bukkit.getUnsafe().loadAdvancements(definitions, false);
155 if (loaded.size() != definitions.size()) {
156 getLogger().warning("Registered " + loaded.size() + " of " + definitions.size() + " advancements.");
157 }
158 } catch (RuntimeException ex) {
159 getLogger().log(Level.WARNING, "Could not register CopperKeys advancements", ex);
160 }
161 }
162
163 private String readAdvancementJson(String resourcePath, String label) {
140 try (InputStream in = getResource(resourcePath)) {
164 try (InputStream in = getResource(resourcePath)) {
141 if (in == null) {
165 if (in == null) {
142 getLogger().warning("Missing " + resourcePath + "; " + label + " advancement not registered.");
166 getLogger().warning("Missing " + resourcePath + "; " + label + " advancement not registered.");
143 return;
167 return null;
144 }
145 String json = new String(in.readAllBytes(), StandardCharsets.UTF_8);
146 @SuppressWarnings("deprecation")
147 Advancement loaded = Bukkit.getUnsafe().loadAdvancement(key, json);
148 if (loaded == null) {
149 getLogger().warning("Could not register " + label + " advancement.");
150 }
168 }
151 } catch (IOException | RuntimeException ex) {
169 return new String(in.readAllBytes(), StandardCharsets.UTF_8);
152 getLogger().log(Level.WARNING, "Could not register " + label + " advancement", ex);
170 } catch (IOException ex) {
171 getLogger().log(Level.WARNING, "Could not read " + label + " advancement", ex);
172 return null;
153 }
173 }
154 }
174 }
155
175
src/main/resources/advancements/burglar.json +5 −1
@@ -19,5 +19,9 @@
19 19 "burglar": {
20 20 "trigger": "minecraft:impossible"
21 21 }
22 }
22 },
23 "requirements": [
24 ["burglar"]
25 ],
26 "sends_telemetry_event": false
23 27 }
@@ -19,5 +19,9 @@
19 "burglar": {
19 "burglar": {
20 "trigger": "minecraft:impossible"
20 "trigger": "minecraft:impossible"
21 }
21 }
22 }
22 },
23 "requirements": [
24 ["burglar"]
25 ],
26 "sends_telemetry_event": false
23}
27}
src/main/resources/advancements/oops.json +5 −1
@@ -19,5 +19,9 @@
19 19 "oops": {
20 20 "trigger": "minecraft:impossible"
21 21 }
22 }
22 },
23 "requirements": [
24 ["oops"]
25 ],
26 "sends_telemetry_event": false
23 27 }
@@ -19,5 +19,9 @@
19 "oops": {
19 "oops": {
20 "trigger": "minecraft:impossible"
20 "trigger": "minecraft:impossible"
21 }
21 }
22 }
22 },
23 "requirements": [
24 ["oops"]
25 ],
26 "sends_telemetry_event": false
23}
27}