Revert "Load advancements via bundled datapack instead of UnsafeValues API."
This reverts commit 470a7479f95276d64323e9ff60149df8dc80e8f7.
@@ -1,31 +0,0 @@
1
package nl.timfalken.copperkeys;
2
3
import io.papermc.paper.datapack.DatapackRegistrar;
4
import io.papermc.paper.plugin.bootstrap.BootstrapContext;
5
import io.papermc.paper.plugin.bootstrap.PluginBootstrap;
6
import io.papermc.paper.plugin.lifecycle.event.LifecycleEventManager;
7
import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents;
8
9
import java.io.IOException;
10
import java.net.URI;
11
import java.net.URISyntaxException;
12
import java.util.Objects;
13
14
public final class CopperKeysBootstrap implements PluginBootstrap {
15
@Override
16
public void bootstrap(BootstrapContext context) {
17
LifecycleEventManager<BootstrapContext> lifecycle = context.getLifecycleManager();
18
lifecycle.registerEventHandler(LifecycleEvents.DATAPACK_DISCOVERY, event -> {
19
DatapackRegistrar registrar = event.registrar();
20
try {
21
URI uri = Objects.requireNonNull(
22
CopperKeysBootstrap.class.getResource("/datapack"),
23
"Missing /datapack resources"
24
).toURI();
25
registrar.discoverPack(uri, "advancements");
26
} catch (URISyntaxException | IOException ex) {
27
throw new RuntimeException("Failed to register CopperKeys datapack", ex);
28
}
29
});
30
}
31
}
@@ -1,31 +0,0 @@1
package nl.timfalken.copperkeys;2
3
import io.papermc.paper.datapack.DatapackRegistrar;4
import io.papermc.paper.plugin.bootstrap.BootstrapContext;5
import io.papermc.paper.plugin.bootstrap.PluginBootstrap;6
import io.papermc.paper.plugin.lifecycle.event.LifecycleEventManager;7
import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents;8
9
import java.io.IOException;10
import java.net.URI;11
import java.net.URISyntaxException;12
import java.util.Objects;13
14
public final class CopperKeysBootstrap implements PluginBootstrap {15
@Override16
public void bootstrap(BootstrapContext context) {17
LifecycleEventManager<BootstrapContext> lifecycle = context.getLifecycleManager();18
lifecycle.registerEventHandler(LifecycleEvents.DATAPACK_DISCOVERY, event -> {19
DatapackRegistrar registrar = event.registrar();20
try {21
URI uri = Objects.requireNonNull(22
CopperKeysBootstrap.class.getResource("/datapack"),23
"Missing /datapack resources"24
).toURI();25
registrar.discoverPack(uri, "advancements");26
} catch (URISyntaxException | IOException ex) {27
throw new RuntimeException("Failed to register CopperKeys datapack", ex);28
}29
});30
}31
}@@ -58,6 +58,9 @@ import org.bukkit.inventory.ShapedRecipe;
58
58
import org.bukkit.inventory.ShapelessRecipe;
59
59
import org.bukkit.plugin.java.JavaPlugin;
60
60
61
import java.io.IOException;
62
import java.io.InputStream;
63
import java.nio.charset.StandardCharsets;
61
64
import java.util.ArrayList;
62
65
import java.util.HashMap;
63
66
import java.util.LinkedHashSet;
@@ -66,6 +69,7 @@ import java.util.Locale;
66
69
import java.util.Map;
67
70
import java.util.Set;
68
71
import java.util.UUID;
72
import java.util.logging.Level;
69
73
70
74
public final class CopperKeysPlugin extends JavaPlugin implements Listener {
71
75
private LockStore lockStore;
@@ -94,6 +98,7 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
94
98
organisingAdvancementKey = new NamespacedKey(this, "organising");
95
99
96
100
registerRecipes();
101
registerAdvancements();
97
102
var keyNameCommand = getCommand("keyname");
98
103
if (keyNameCommand != null) {
99
104
keyNameCommand.setExecutor(new KeyNameCommand(this));
@@ -143,6 +148,46 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {
143
148
Bukkit.addRecipe(copyRecipe);
144
149
}
145
150
151
private void registerAdvancements() {
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");
158
}
159
160
private void registerAdvancement(NamespacedKey key, String resourcePath, String label) {
161
if (Bukkit.getAdvancement(key) != null) {
162
return;
163
}
164
String json = readAdvancementJson(resourcePath, label);
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);
175
}
176
}
177
178
private String readAdvancementJson(String resourcePath, String label) {
179
try (InputStream in = getResource(resourcePath)) {
180
if (in == null) {
181
getLogger().warning("Missing " + resourcePath + "; " + label + " advancement not registered.");
182
return null;
183
}
184
return new String(in.readAllBytes(), StandardCharsets.UTF_8);
185
} catch (IOException ex) {
186
getLogger().log(Level.WARNING, "Could not read " + label + " advancement", ex);
187
return null;
188
}
189
}
190
146
191
private void awardAdvancement(Player player, NamespacedKey key) {
147
192
Advancement advancement = Bukkit.getAdvancement(key);
148
193
if (advancement == null) {
@@ -58,6 +58,9 @@ import org.bukkit.inventory.ShapedRecipe;58
import org.bukkit.inventory.ShapelessRecipe;58
import org.bukkit.inventory.ShapelessRecipe;59
import org.bukkit.plugin.java.JavaPlugin;59
import org.bukkit.plugin.java.JavaPlugin;60
60
61
import java.io.IOException;62
import java.io.InputStream;63
import java.nio.charset.StandardCharsets;61
import java.util.ArrayList;64
import java.util.ArrayList;62
import java.util.HashMap;65
import java.util.HashMap;63
import java.util.LinkedHashSet;66
import java.util.LinkedHashSet;@@ -66,6 +69,7 @@ import java.util.Locale;66
import java.util.Map;69
import java.util.Map;67
import java.util.Set;70
import java.util.Set;68
import java.util.UUID;71
import java.util.UUID;72
import java.util.logging.Level;69
73
70
public final class CopperKeysPlugin extends JavaPlugin implements Listener {74
public final class CopperKeysPlugin extends JavaPlugin implements Listener {71
private LockStore lockStore;75
private LockStore lockStore;@@ -94,6 +98,7 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {94
organisingAdvancementKey = new NamespacedKey(this, "organising");98
organisingAdvancementKey = new NamespacedKey(this, "organising");95
99
96
registerRecipes();100
registerRecipes();101
registerAdvancements();97
var keyNameCommand = getCommand("keyname");102
var keyNameCommand = getCommand("keyname");98
if (keyNameCommand != null) {103
if (keyNameCommand != null) {99
keyNameCommand.setExecutor(new KeyNameCommand(this));104
keyNameCommand.setExecutor(new KeyNameCommand(this));@@ -143,6 +148,46 @@ public final class CopperKeysPlugin extends JavaPlugin implements Listener {143
Bukkit.addRecipe(copyRecipe);148
Bukkit.addRecipe(copyRecipe);144
}149
}145
150
151
private void registerAdvancements() {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");158
}159
160
private void registerAdvancement(NamespacedKey key, String resourcePath, String label) {161
if (Bukkit.getAdvancement(key) != null) {162
return;163
}164
String json = readAdvancementJson(resourcePath, label);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);175
}176
}177
178
private String readAdvancementJson(String resourcePath, String label) {179
try (InputStream in = getResource(resourcePath)) {180
if (in == null) {181
getLogger().warning("Missing " + resourcePath + "; " + label + " advancement not registered.");182
return null;183
}184
return new String(in.readAllBytes(), StandardCharsets.UTF_8);185
} catch (IOException ex) {186
getLogger().log(Level.WARNING, "Could not read " + label + " advancement", ex);187
return null;188
}189
}190
146
private void awardAdvancement(Player player, NamespacedKey key) {191
private void awardAdvancement(Player player, NamespacedKey key) {147
Advancement advancement = Bukkit.getAdvancement(key);192
Advancement advancement = Bukkit.getAdvancement(key);148
if (advancement == null) {193
if (advancement == null) {@@ -1,7 +0,0 @@
1
{
2
"pack": {
3
"description": "CopperKeys advancements",
4
"min_format": [107, 1],
5
"max_format": [107, 1]
6
}
7
}
@@ -1,7 +0,0 @@1
{2
"pack": {3
"description": "CopperKeys advancements",4
"min_format": [107, 1],5
"max_format": [107, 1]6
}7
}@@ -1,4 +0,0 @@
1
name: CopperKeys
2
version: '1.0.11'
3
api-version: '26.2'
4
bootstrapper: nl.timfalken.copperkeys.CopperKeysBootstrap
@@ -1,4 +0,0 @@1
name: CopperKeys2
version: '1.0.11'3
api-version: '26.2'4
bootstrapper: nl.timfalken.copperkeys.CopperKeysBootstrap