FancyInnovations/FancyPlugins
1
0
Fork 0
mirror of https://github.com/FancyInnovations/FancyPlugins.git synced 2025-12-06 07:43:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fancyholograms-v3: Update hologram data loading to use subdirectory structure

Browse Source
This commit is contained in:
Oliver
2025-05-17 18:40:01 +02:00
parent 271c94a3a0
commit 9454f4995c
4 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/commands/FancyHologramsCMD.java
View File

@@ -49,7 +49,7 @@ public final class FancyHologramsCMD extends Command {
this.plugin.getRegistry().clear(); this.plugin.getRegistry().clear();
for (World world : Bukkit.getWorlds()) { for (World world : Bukkit.getWorlds()) {
Collection<HologramData> hologramData = this.plugin.getStorage().loadAll(world.getName()); Collection<HologramData> hologramData = this.plugin.getStorage().loadAll("worlds/"+world.getName());
for (HologramData data : hologramData) { for (HologramData data : hologramData) {
Hologram hologram = this.plugin.getHologramFactory().apply(data); Hologram hologram = this.plugin.getHologramFactory().apply(data);
this.plugin.getRegistry().register(hologram); this.plugin.getRegistry().register(hologram);

2
plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/listeners/WorldListener.java
View File

@@ -18,7 +18,7 @@ public class WorldListener implements Listener {
FancyHologramsPlugin.get().getHologramThread().submit(() -> { FancyHologramsPlugin.get().getHologramThread().submit(() -> {
FancyHologramsPlugin.get().getFancyLogger().info("Loading holograms for world " + event.getWorld().getName()); FancyHologramsPlugin.get().getFancyLogger().info("Loading holograms for world " + event.getWorld().getName());
Collection<HologramData> data = FancyHologramsPlugin.get().getStorage().loadAll(event.getWorld().getName()); Collection<HologramData> data = FancyHologramsPlugin.get().getStorage().loadAll("worlds/"+event.getWorld().getName());
for (HologramData d : data) { for (HologramData d : data) {
Hologram hologram = FancyHologramsPlugin.get().getHologramFactory().apply(d); Hologram hologram = FancyHologramsPlugin.get().getHologramFactory().apply(d);
FancyHologramsPlugin.get().getRegistry().register(hologram); FancyHologramsPlugin.get().getRegistry().register(hologram);

2
plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/main/FancyHologramsPlugin.java
View File

@@ -194,7 +194,7 @@ public final class FancyHologramsPlugin extends JavaPlugin implements FancyHolog
new StorageMigrator().migrate(); new StorageMigrator().migrate();
for (World world : Bukkit.getWorlds()) { for (World world : Bukkit.getWorlds()) {
Collection<HologramData> data = storage.loadAll(world.getName()); Collection<HologramData> data = storage.loadAll("worlds/"+world.getName());
for (HologramData d : data) { for (HologramData d : data) {
Hologram hologram = hologramFactory.apply(d); Hologram hologram = hologramFactory.apply(d);
registry.register(hologram); registry.register(hologram);

14
plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/JsonStorage.java
View File

@@ -51,20 +51,14 @@ public class JsonStorage implements HologramStorage {
} }
@Override @Override
public Collection<HologramData> loadAll(String world) { public Collection<HologramData> loadAll(String subdir) {
List<HologramData> holograms = new ArrayList<>(); List<HologramData> holograms = new ArrayList<>();
try { try {
List<JsonDataUnion> allTextUnions = jdb.getAll("worlds/" + world + "/text", JsonDataUnion.class); List<JsonDataUnion> allTextUnions = jdb.getAll(subdir, JsonDataUnion.class);
allTextUnions.forEach(u -> holograms.add(JsonAdapter.fromJson(u))); allTextUnions.forEach(u -> holograms.add(JsonAdapter.fromJson(u)));
List<JsonDataUnion> allItemUnions = jdb.getAll("worlds/" + world + "/item", JsonDataUnion.class);
allItemUnions.forEach(u -> holograms.add(JsonAdapter.fromJson(u)));
List<JsonDataUnion> allBlockUnions = jdb.getAll("worlds/" + world + "/block", JsonDataUnion.class);
allBlockUnions.forEach(u -> holograms.add(JsonAdapter.fromJson(u)));
} catch (IOException e) { } catch (IOException e) {
FancyHolograms.get().getFancyLogger().error("Failed to load all holograms from world " + world); FancyHolograms.get().getFancyLogger().error("Failed to load all holograms from " + subdir);
FancyHolograms.get().getFancyLogger().error(e); FancyHolograms.get().getFancyLogger().error(e);
} }
@@ -72,6 +66,6 @@ public class JsonStorage implements HologramStorage {
} }
public String getKey(HologramData data) { public String getKey(HologramData data) {
return "worlds/" + data.getLocation().getWorld().getName() + "/" + data.getType().toString().toLowerCase() + "/" + data.getName(); return "worlds/" + data.getLocation().getWorld().getName() + "/" + data.getName();
} }
} }