Fix advancement registration to compile against Paper 26.2 API.
Register advancements individually with loadAdvancement instead of the bulk API that required Adventure Key types. Co-authored-by: Cursor <cursoragent@cursor.com>
@@ -5,7 +5,6 @@ import io.papermc.paper.event.entity.ItemTransportingEntityValidateTargetEvent;
5
5
import net.kyori.adventure.text.Component;
6
6
import net.kyori.adventure.text.format.NamedTextColor;
7
7
import org.bukkit.Bukkit;
8
import org.bukkit.Key;
9
8
import org.bukkit.Location;
10
9
import org.bukkit.Material;
11
10
import org.bukkit.NamespacedKey;
@@ -150,39 +149,29 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
150
149
}
151
150
152
151
private void registerAdvancements() {
153
Map<Key, String> definitions = new HashMap<>();
154
addAdvancementDefinition(definitions, burglarAdvancementKey, "advancements/burglar.json", "Burglar");
155
addAdvancementDefinition(definitions, oopsAdvancementKey, "advancements/oops.json", "Oops");
156
addAdvancementDefinition(definitions, sharingIsCaringAdvancementKey, "advancements/sharing_is_caring.json", "Sharing is Caring");
157
addAdvancementDefinition(definitions, heavyDutyAdvancementKey, "advancements/heavy_duty.json", "Heavy Duty");
158
addAdvancementDefinition(definitions, lockedOutAdvancementKey, "advancements/locked_out.json", "Locked Out");
159
addAdvancementDefinition(definitions, organisingAdvancementKey, "advancements/organising.json", "Organising");
160
if (definitions.isEmpty()) {
161
return;
162
}
163
164
try {
165
List<Advancement> loaded = Bukkit.getUnsafe().loadAdvancements(definitions, false);
166
if (loaded.size() != definitions.size()) {
167
getLogger().warning("Registered " + loaded.size() + " of " + definitions.size() + " advancements.");
168
}
169
} catch (RuntimeException ex) {
170
getLogger().log(Level.WARNING, "Could not register CopperKeys advancements", ex);
171
}
152
registerAdvancement(burglarAdvancementKey, "advancements/burglar.json", "Burglar");
153
registerAdvancement(oopsAdvancementKey, "advancements/oops.json", "Oops");
154
registerAdvancement(sharingIsCaringAdvancementKey, "advancements/sharing_is_caring.json", "Sharing is Caring");
155
registerAdvancement(heavyDutyAdvancementKey, "advancements/heavy_duty.json", "Heavy Duty");
156
registerAdvancement(lockedOutAdvancementKey, "advancements/locked_out.json", "Locked Out");
157
registerAdvancement(organisingAdvancementKey, "advancements/organising.json", "Organising");
172
158
}
173
159
174
private void addAdvancementDefinition(
175
Map<Key, String> definitions,
176
NamespacedKey key,
177
String resourcePath,
178
String label
179
) {
160
private void registerAdvancement(NamespacedKey key, String resourcePath, String label) {
180
161
if (Bukkit.getAdvancement(key) != null) {
181
162
return;
182
163
}
183
164
String json = readAdvancementJson(resourcePath, label);
184
if (json != null) {
185
definitions.put(key, json);
165
if (json == null) {
166
return;
167
}
168
try {
169
Bukkit.getUnsafe().loadAdvancement(key, json, false);
170
if (Bukkit.getAdvancement(key) == null) {
171
getLogger().warning("Could not register " + label + " advancement.");
172
}
173
} catch (RuntimeException ex) {
174
getLogger().log(Level.WARNING, "Could not register " + label + " advancement", ex);
186
175
}
187
176
}
188
177
@@ -5,7 +5,6 @@ import io.papermc.paper.event.entity.ItemTransportingEntityValidateTargetEvent;5
import net.kyori.adventure.text.Component;5
import net.kyori.adventure.text.Component;6
import net.kyori.adventure.text.format.NamedTextColor;6
import net.kyori.adventure.text.format.NamedTextColor;7
import org.bukkit.Bukkit;7
import org.bukkit.Bukkit;8
import org.bukkit.Key;9
import org.bukkit.Location;8
import org.bukkit.Location;10
import org.bukkit.Material;9
import org.bukkit.Material;11
import org.bukkit.NamespacedKey;10
import org.bukkit.NamespacedKey;@@ -150,39 +149,29 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {150
}149
}151
150
152
private void registerAdvancements() {151
private void registerAdvancements() {153
Map<Key, String> definitions = new HashMap<>();152
registerAdvancement(burglarAdvancementKey, "advancements/burglar.json", "Burglar");154
addAdvancementDefinition(definitions, burglarAdvancementKey, "advancements/burglar.json", "Burglar");153
registerAdvancement(oopsAdvancementKey, "advancements/oops.json", "Oops");155
addAdvancementDefinition(definitions, oopsAdvancementKey, "advancements/oops.json", "Oops");154
registerAdvancement(sharingIsCaringAdvancementKey, "advancements/sharing_is_caring.json", "Sharing is Caring");156
addAdvancementDefinition(definitions, sharingIsCaringAdvancementKey, "advancements/sharing_is_caring.json", "Sharing is Caring");155
registerAdvancement(heavyDutyAdvancementKey, "advancements/heavy_duty.json", "Heavy Duty");157
addAdvancementDefinition(definitions, heavyDutyAdvancementKey, "advancements/heavy_duty.json", "Heavy Duty");156
registerAdvancement(lockedOutAdvancementKey, "advancements/locked_out.json", "Locked Out");158
addAdvancementDefinition(definitions, lockedOutAdvancementKey, "advancements/locked_out.json", "Locked Out");157
registerAdvancement(organisingAdvancementKey, "advancements/organising.json", "Organising");159
addAdvancementDefinition(definitions, organisingAdvancementKey, "advancements/organising.json", "Organising");160
if (definitions.isEmpty()) {161
return;162
}163
164
try {165
List<Advancement> loaded = Bukkit.getUnsafe().loadAdvancements(definitions, false);166
if (loaded.size() != definitions.size()) {167
getLogger().warning("Registered " + loaded.size() + " of " + definitions.size() + " advancements.");168
}169
} catch (RuntimeException ex) {170
getLogger().log(Level.WARNING, "Could not register CopperKeys advancements", ex);171
}172
}158
}173
159
174
private void addAdvancementDefinition(160
private void registerAdvancement(NamespacedKey key, String resourcePath, String label) {175
Map<Key, String> definitions,176
NamespacedKey key,177
String resourcePath,178
String label179
) {180
if (Bukkit.getAdvancement(key) != null) {161
if (Bukkit.getAdvancement(key) != null) {181
return;162
return;182
}163
}183
String json = readAdvancementJson(resourcePath, label);164
String json = readAdvancementJson(resourcePath, label);184
if (json != null) {165
if (json == null) {185
definitions.put(key, json);166
return;167
}168
try {169
Bukkit.getUnsafe().loadAdvancement(key, json, false);170
if (Bukkit.getAdvancement(key) == null) {171
getLogger().warning("Could not register " + label + " advancement.");172
}173
} catch (RuntimeException ex) {174
getLogger().log(Level.WARNING, "Could not register " + label + " advancement", ex);186
}175
}187
}176
}188
177