From 8fc0ee405cde5a9cf2528be368b7342a9528e0f8 Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 27 Dec 2024 20:49:56 +0100 Subject: [PATCH] Rename main class to FancyHologramsPlugin --- build.gradle.kts | 2 +- .../fancyholograms/HologramManagerImpl.java | 22 +++++------ .../commands/FancyHologramsCMD.java | 10 ++--- .../commands/FancyHologramsTestCMD.java | 6 +-- .../fancyholograms/commands/HologramCMD.java | 6 +-- .../commands/hologram/BackgroundCMD.java | 6 +-- .../commands/hologram/BillboardCMD.java | 6 +-- .../commands/hologram/BlockCMD.java | 6 +-- .../commands/hologram/BrightnessCMD.java | 6 +-- .../commands/hologram/CenterCMD.java | 6 +-- .../commands/hologram/CopyCMD.java | 12 +++--- .../commands/hologram/CreateCMD.java | 8 ++-- .../commands/hologram/InsertAfterCMD.java | 6 +-- .../commands/hologram/InsertBeforeCMD.java | 6 +-- .../commands/hologram/ItemCMD.java | 6 +-- .../commands/hologram/LinkWithNpcCMD.java | 8 ++-- .../commands/hologram/ListCMD.java | 4 +- .../commands/hologram/MoveHereCMD.java | 6 +-- .../commands/hologram/NearbyCMD.java | 4 +- .../commands/hologram/RemoveCMD.java | 3 +- .../commands/hologram/ScaleCMD.java | 6 +-- .../commands/hologram/SeeThroughCMD.java | 6 +-- .../commands/hologram/SetLineCMD.java | 6 +-- .../commands/hologram/ShadowRadiusCMD.java | 6 +-- .../commands/hologram/ShadowStrengthCMD.java | 6 +-- .../commands/hologram/TextAlignmentCMD.java | 6 +-- .../commands/hologram/TextShadowCMD.java | 6 +-- .../commands/hologram/TranslateCommand.java | 6 +-- .../commands/hologram/UnlinkWithNpcCMD.java | 6 +-- .../hologram/UpdateTextIntervalCMD.java | 6 +-- .../commands/hologram/VisibilityCMD.java | 6 +-- .../hologram/VisibilityDistanceCMD.java | 6 +-- .../config/FHConfiguration.java | 3 +- .../fancyholograms/config/FHFeatureFlags.java | 4 +- .../fancyholograms/listeners/NpcListener.java | 6 +-- .../listeners/PlayerListener.java | 10 ++--- .../listeners/WorldListener.java | 14 +++---- ...lograms.java => FancyHologramsPlugin.java} | 9 +++-- .../fancyholograms/metrics/FHMetrics.java | 22 +++++------ .../storage/FlatFileHologramStorage.java | 38 +++++++++---------- .../storage/converter/HologramConverter.java | 4 +- 41 files changed, 162 insertions(+), 159 deletions(-) rename src/main/java/de/oliver/fancyholograms/main/{FancyHolograms.java => FancyHologramsPlugin.java} (97%) diff --git a/build.gradle.kts b/build.gradle.kts index 1bce955e..44d45f0d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -74,7 +74,7 @@ dependencies { } paper { - main = "de.oliver.fancyholograms.main.FancyHolograms" + main = "de.oliver.fancyholograms.main.FancyHologramsPlugin" bootstrapper = "de.oliver.fancyholograms.main.FancyHologramsBootstrapper" loader = "de.oliver.fancyholograms.main.FancyHologramsLoader" foliaSupported = true diff --git a/src/main/java/de/oliver/fancyholograms/HologramManagerImpl.java b/src/main/java/de/oliver/fancyholograms/HologramManagerImpl.java index 078d0651..86dbafa1 100644 --- a/src/main/java/de/oliver/fancyholograms/HologramManagerImpl.java +++ b/src/main/java/de/oliver/fancyholograms/HologramManagerImpl.java @@ -9,7 +9,7 @@ import de.oliver.fancyholograms.api.events.HologramsLoadedEvent; import de.oliver.fancyholograms.api.events.HologramsUnloadedEvent; import de.oliver.fancyholograms.api.hologram.Hologram; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancynpcs.api.FancyNpcsPlugin; import org.bukkit.Bukkit; import org.bukkit.World; @@ -31,7 +31,7 @@ */ public final class HologramManagerImpl implements HologramManager { - private final @NotNull FancyHolograms plugin; + private final @NotNull FancyHologramsPlugin plugin; /** * The adapter function used to create holograms from hologram data. */ @@ -45,7 +45,7 @@ public final class HologramManagerImpl implements HologramManager { */ private boolean isLoaded = false; - public HologramManagerImpl(@NotNull final FancyHolograms plugin, @NotNull final Function adapter) { + public HologramManagerImpl(@NotNull final FancyHologramsPlugin plugin, @NotNull final Function adapter) { this.plugin = plugin; this.adapter = adapter; } @@ -112,11 +112,11 @@ public void removeHologram(@NotNull final Hologram hologram) { for (UUID viewer : hologram.getViewers()) { Player player = Bukkit.getPlayer(viewer); if (player != null) { - FancyHolograms.get().getHologramThread().submit(() -> hologram.forceHideHologram(player)); + FancyHologramsPlugin.get().getHologramThread().submit(() -> hologram.forceHideHologram(player)); } } - FancyHolograms.get().getHologramThread().submit(() -> plugin.getHologramStorage().delete(hologram)); + FancyHologramsPlugin.get().getHologramThread().submit(() -> plugin.getHologramStorage().delete(hologram)); } ); @@ -155,9 +155,9 @@ public void loadHolograms() { } isLoaded = true; - FancyHolograms.get().getHologramThread().submit(() -> Bukkit.getPluginManager().callEvent(new HologramsLoadedEvent(ImmutableList.copyOf(allLoaded)))); + FancyHologramsPlugin.get().getHologramThread().submit(() -> Bukkit.getPluginManager().callEvent(new HologramsLoadedEvent(ImmutableList.copyOf(allLoaded)))); - FancyHolograms.get().getFancyLogger().info(String.format("Loaded %d holograms for all loaded worlds", allLoaded.size())); + FancyHologramsPlugin.get().getFancyLogger().info(String.format("Loaded %d holograms for all loaded worlds", allLoaded.size())); } public void loadHolograms(String world) { @@ -168,7 +168,7 @@ public void loadHolograms(String world) { Bukkit.getPluginManager().callEvent(new HologramsLoadedEvent(ImmutableList.copyOf(loaded))); - FancyHolograms.get().getFancyLogger().info(String.format("Loaded %d holograms for world %s", loaded.size(), world)); + FancyHologramsPlugin.get().getFancyLogger().info(String.format("Loaded %d holograms for world %s", loaded.size(), world)); } /** @@ -244,7 +244,7 @@ public void reloadHolograms() { } public void unloadHolograms() { - FancyHolograms.get().getHologramThread().submit(() -> { + FancyHologramsPlugin.get().getHologramThread().submit(() -> { List unloaded = new ArrayList<>(); for (final var hologram : this.getPersistentHolograms()) { @@ -266,12 +266,12 @@ public void unloadHolograms() { public void unloadHolograms(String world) { final var online = List.copyOf(Bukkit.getOnlinePlayers()); - FancyHolograms.get().getHologramThread().submit(() -> { + FancyHologramsPlugin.get().getHologramThread().submit(() -> { List h = getPersistentHolograms().stream() .filter(hologram -> hologram.getData().getLocation().getWorld().getName().equals(world)) .toList(); - FancyHolograms.get().getHologramStorage().saveBatch(h, false); + FancyHologramsPlugin.get().getHologramStorage().saveBatch(h, false); for (final Hologram hologram : h) { this.holograms.remove(hologram.getName()); diff --git a/src/main/java/de/oliver/fancyholograms/commands/FancyHologramsCMD.java b/src/main/java/de/oliver/fancyholograms/commands/FancyHologramsCMD.java index 2924b72e..ac0b6dd9 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/FancyHologramsCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/FancyHologramsCMD.java @@ -2,7 +2,7 @@ import de.oliver.fancyholograms.api.data.HologramData; import de.oliver.fancyholograms.api.hologram.Hologram; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancyholograms.storage.converter.ConverterTarget; import de.oliver.fancyholograms.storage.converter.FHConversionRegistry; import de.oliver.fancyholograms.storage.converter.HologramConversionSession; @@ -17,9 +17,9 @@ public final class FancyHologramsCMD extends Command { @NotNull - private final FancyHolograms plugin; + private final FancyHologramsPlugin plugin; - public FancyHologramsCMD(@NotNull final FancyHolograms plugin) { + public FancyHologramsCMD(@NotNull final FancyHologramsPlugin plugin) { super("fancyholograms"); setPermission("fancyholograms.admin"); this.plugin = plugin; @@ -48,8 +48,8 @@ public boolean execute(@NotNull CommandSender sender, @NotNull String label, @No MessageHelper.success(sender, "Reloaded config and holograms"); } case "version" -> { - FancyHolograms.get().getHologramThread().submit(() -> { - FancyHolograms.get().getVersionConfig().checkVersionAndDisplay(sender, false); + FancyHologramsPlugin.get().getHologramThread().submit(() -> { + FancyHologramsPlugin.get().getVersionConfig().checkVersionAndDisplay(sender, false); }); } case "convert" -> { diff --git a/src/main/java/de/oliver/fancyholograms/commands/FancyHologramsTestCMD.java b/src/main/java/de/oliver/fancyholograms/commands/FancyHologramsTestCMD.java index 684753e4..aac67749 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/FancyHologramsTestCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/FancyHologramsTestCMD.java @@ -2,7 +2,7 @@ import de.oliver.fancyholograms.api.data.TextHologramData; import de.oliver.fancyholograms.api.hologram.Hologram; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancylib.MessageHelper; import org.bukkit.Color; import org.bukkit.command.Command; @@ -20,9 +20,9 @@ public class FancyHologramsTestCMD extends Command { @NotNull - private final FancyHolograms plugin; + private final FancyHologramsPlugin plugin; - public FancyHologramsTestCMD(@NotNull final FancyHolograms plugin) { + public FancyHologramsTestCMD(@NotNull final FancyHologramsPlugin plugin) { super("FancyHologramsTest"); setPermission("fancyholograms.admin"); this.plugin = plugin; diff --git a/src/main/java/de/oliver/fancyholograms/commands/HologramCMD.java b/src/main/java/de/oliver/fancyholograms/commands/HologramCMD.java index 3c6073cf..0024b30c 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/HologramCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/HologramCMD.java @@ -8,7 +8,7 @@ import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.api.hologram.HologramType; import de.oliver.fancyholograms.commands.hologram.*; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancyholograms.util.Constants; import de.oliver.fancyholograms.util.PluginUtils; import de.oliver.fancylib.MessageHelper; @@ -29,9 +29,9 @@ public final class HologramCMD extends Command { @NotNull - private final FancyHolograms plugin; + private final FancyHologramsPlugin plugin; - public HologramCMD(@NotNull final FancyHolograms plugin) { + public HologramCMD(@NotNull final FancyHologramsPlugin plugin) { super("hologram", "Main command for the FancyHolograms plugin", "/hologram help", List.of("holograms", "holo", "fholo")); setPermission("fancyholograms.admin"); diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/BackgroundCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/BackgroundCMD.java index 64c6eee5..3ba1ed84 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/BackgroundCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/BackgroundCMD.java @@ -5,7 +5,7 @@ import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.HologramCMD; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancylib.MessageHelper; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.Color; @@ -81,8 +81,8 @@ public boolean run(@NotNull CommandSender player, @Nullable Hologram hologram, @ textData.setBackground(copied.getBackground()); - if (FancyHolograms.get().getHologramConfiguration().isSaveOnChangedEnabled()) { - FancyHolograms.get().getHologramStorage().save(hologram); + if (FancyHologramsPlugin.get().getHologramConfiguration().isSaveOnChangedEnabled()) { + FancyHologramsPlugin.get().getHologramStorage().save(hologram); } MessageHelper.success(player, "Changed background color"); diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/BillboardCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/BillboardCMD.java index 7bc269e5..193290ef 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/BillboardCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/BillboardCMD.java @@ -6,7 +6,7 @@ import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.HologramCMD; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancylib.MessageHelper; import org.apache.commons.lang3.StringUtils; import org.bukkit.command.CommandSender; @@ -63,8 +63,8 @@ public boolean run(@NotNull CommandSender player, @Nullable Hologram hologram, @ displayData.setBillboard(copied.getBillboard()); - if (FancyHolograms.get().getHologramConfiguration().isSaveOnChangedEnabled()) { - FancyHolograms.get().getHologramStorage().save(hologram); + if (FancyHologramsPlugin.get().getHologramConfiguration().isSaveOnChangedEnabled()) { + FancyHologramsPlugin.get().getHologramStorage().save(hologram); } MessageHelper.success(player, "Changed the billboard to " + StringUtils.capitalize(billboard.name().toLowerCase(Locale.ROOT))); diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/BlockCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/BlockCMD.java index 600ea7c6..0bb03df1 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/BlockCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/BlockCMD.java @@ -5,7 +5,7 @@ import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.HologramCMD; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancylib.MessageHelper; import org.bukkit.Material; import org.bukkit.command.CommandSender; @@ -58,8 +58,8 @@ public boolean run(@NotNull CommandSender player, @Nullable Hologram hologram, @ blockData.setBlock(block); - if (FancyHolograms.get().getHologramConfiguration().isSaveOnChangedEnabled()) { - FancyHolograms.get().getHologramStorage().save(hologram); + if (FancyHologramsPlugin.get().getHologramConfiguration().isSaveOnChangedEnabled()) { + FancyHologramsPlugin.get().getHologramStorage().save(hologram); } MessageHelper.success(player, "Set block to '" + block.name() + "'"); diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/BrightnessCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/BrightnessCMD.java index 198bc242..fd33c143 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/BrightnessCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/BrightnessCMD.java @@ -3,7 +3,7 @@ import de.oliver.fancyholograms.api.data.DisplayHologramData; import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancyholograms.util.NumberHelper; import de.oliver.fancylib.MessageHelper; import org.bukkit.command.CommandSender; @@ -61,8 +61,8 @@ public boolean run(@NotNull CommandSender player, @Nullable Hologram hologram, @ displayData.setBrightness(new Display.Brightness(blockBrightness, skyBrightness)); - if (FancyHolograms.get().getHologramConfiguration().isSaveOnChangedEnabled()) { - FancyHolograms.get().getHologramStorage().save(hologram); + if (FancyHologramsPlugin.get().getHologramConfiguration().isSaveOnChangedEnabled()) { + FancyHologramsPlugin.get().getHologramStorage().save(hologram); } MessageHelper.success(player, "Changed " + brightnessType.toLowerCase() + " brightness to " + brightnessValue); diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/CenterCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/CenterCMD.java index b1e93fb3..83288254 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/CenterCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/CenterCMD.java @@ -2,7 +2,7 @@ import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancyholograms.util.Constants; import de.oliver.fancylib.MessageHelper; import org.bukkit.Location; @@ -36,8 +36,8 @@ public boolean run(@NotNull CommandSender player, @Nullable Hologram hologram, @ hologram.getData().setLocation(location); - if (FancyHolograms.get().getHologramConfiguration().isSaveOnChangedEnabled()) { - FancyHolograms.get().getHologramStorage().save(hologram); + if (FancyHologramsPlugin.get().getHologramConfiguration().isSaveOnChangedEnabled()) { + FancyHologramsPlugin.get().getHologramStorage().save(hologram); } MessageHelper.success(player, "Centered the hologram to %s/%s/%s %s\u00B0 %s\u00B0".formatted( diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/CopyCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/CopyCMD.java index 7c30b3da..c607274d 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/CopyCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/CopyCMD.java @@ -3,7 +3,7 @@ import de.oliver.fancyholograms.api.events.HologramCreateEvent; import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancylib.MessageHelper; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -41,7 +41,7 @@ public boolean run(@NotNull CommandSender sender, @Nullable Hologram hologram, @ String name = args[2]; - if (FancyHolograms.get().getHologramsManager().getHologram(name).isPresent()) { + if (FancyHologramsPlugin.get().getHologramsManager().getHologram(name).isPresent()) { MessageHelper.error(sender, "There already exists a hologram with this name"); return false; } @@ -58,7 +58,7 @@ public boolean run(@NotNull CommandSender sender, @Nullable Hologram hologram, @ location.setYaw(originalLocation.getYaw()); data.setLocation(location); - final var copy = FancyHolograms.get().getHologramsManager().create(data); + final var copy = FancyHologramsPlugin.get().getHologramsManager().create(data); if (!new HologramCreateEvent(copy, player).callEvent()) { MessageHelper.error(sender, "Creating the copied hologram was cancelled"); @@ -70,10 +70,10 @@ public boolean run(@NotNull CommandSender sender, @Nullable Hologram hologram, @ copy.updateShownStateFor(onlinePlayer); } - FancyHolograms.get().getHologramsManager().addHologram(copy); + FancyHologramsPlugin.get().getHologramsManager().addHologram(copy); - if (FancyHolograms.get().getHologramConfiguration().isSaveOnChangedEnabled()) { - FancyHolograms.get().getHologramStorage().save(hologram); + if (FancyHologramsPlugin.get().getHologramConfiguration().isSaveOnChangedEnabled()) { + FancyHologramsPlugin.get().getHologramStorage().save(hologram); } MessageHelper.success(sender, "Copied the hologram"); diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/CreateCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/CreateCMD.java index fbfc97f3..53863cdc 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/CreateCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/CreateCMD.java @@ -8,7 +8,7 @@ import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.api.hologram.HologramType; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancylib.MessageHelper; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; @@ -51,7 +51,7 @@ public boolean run(@NotNull CommandSender sender, @Nullable Hologram hologram, @ String name = args[2]; - if (FancyHolograms.get().getHologramsManager().getHologram(name).isPresent()) { + if (FancyHologramsPlugin.get().getHologramsManager().getHologram(name).isPresent()) { MessageHelper.error(player, "There already exists a hologram with this name"); return false; } @@ -74,7 +74,7 @@ public boolean run(@NotNull CommandSender sender, @Nullable Hologram hologram, @ } } - final var holo = FancyHolograms.get().getHologramsManager().create(displayData); + final var holo = FancyHologramsPlugin.get().getHologramsManager().create(displayData); if (!new HologramCreateEvent(holo, player).callEvent()) { MessageHelper.error(player, "Creating the hologram was cancelled"); return false; @@ -85,7 +85,7 @@ public boolean run(@NotNull CommandSender sender, @Nullable Hologram hologram, @ holo.updateShownStateFor(onlinePlayer); } - FancyHolograms.get().getHologramsManager().addHologram(holo); + FancyHologramsPlugin.get().getHologramsManager().addHologram(holo); MessageHelper.success(player, "Created the hologram"); return true; diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/InsertAfterCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/InsertAfterCMD.java index 117ed958..aeb6c0fb 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/InsertAfterCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/InsertAfterCMD.java @@ -6,7 +6,7 @@ import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.HologramCMD; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancylib.MessageHelper; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; @@ -70,8 +70,8 @@ public boolean run(@NotNull CommandSender player, @Nullable Hologram hologram, @ textData.setText(copied.getText()); - if (FancyHolograms.get().getHologramConfiguration().isSaveOnChangedEnabled()) { - FancyHolograms.get().getHologramStorage().save(hologram); + if (FancyHologramsPlugin.get().getHologramConfiguration().isSaveOnChangedEnabled()) { + FancyHologramsPlugin.get().getHologramStorage().save(hologram); } MessageHelper.success(player, "Inserted line"); diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/InsertBeforeCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/InsertBeforeCMD.java index 1a6e6848..cea2296f 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/InsertBeforeCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/InsertBeforeCMD.java @@ -6,7 +6,7 @@ import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.HologramCMD; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancylib.MessageHelper; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; @@ -72,8 +72,8 @@ public boolean run(@NotNull CommandSender player, @Nullable Hologram hologram, @ textData.setText(copied.getText()); - if (FancyHolograms.get().getHologramConfiguration().isSaveOnChangedEnabled()) { - FancyHolograms.get().getHologramStorage().save(hologram); + if (FancyHologramsPlugin.get().getHologramConfiguration().isSaveOnChangedEnabled()) { + FancyHologramsPlugin.get().getHologramStorage().save(hologram); } MessageHelper.success(player, "Inserted line"); diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/ItemCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/ItemCMD.java index 8b6ace97..43ad9ff1 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/ItemCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/ItemCMD.java @@ -5,7 +5,7 @@ import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.HologramCMD; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancylib.MessageHelper; import org.bukkit.Material; import org.bukkit.command.CommandSender; @@ -66,8 +66,8 @@ public boolean run(@NotNull CommandSender sender, @Nullable Hologram hologram, @ itemData.setItemStack(item); - if (FancyHolograms.get().getHologramConfiguration().isSaveOnChangedEnabled()) { - FancyHolograms.get().getHologramStorage().save(hologram); + if (FancyHologramsPlugin.get().getHologramConfiguration().isSaveOnChangedEnabled()) { + FancyHologramsPlugin.get().getHologramStorage().save(hologram); } MessageHelper.success(player, "Set the item to '" + item.getType().name() + "'"); diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/LinkWithNpcCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/LinkWithNpcCMD.java index f3a58e6b..45959d20 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/LinkWithNpcCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/LinkWithNpcCMD.java @@ -2,7 +2,7 @@ import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancyholograms.util.PluginUtils; import de.oliver.fancylib.MessageHelper; import de.oliver.fancynpcs.api.FancyNpcsPlugin; @@ -48,10 +48,10 @@ public boolean run(@NotNull CommandSender player, @Nullable Hologram hologram, @ hologram.getData().setLinkedNpcName(npc.getData().getName()); - FancyHolograms.get().getHologramsManager().syncHologramWithNpc(hologram); + FancyHologramsPlugin.get().getHologramsManager().syncHologramWithNpc(hologram); - if (FancyHolograms.get().getHologramConfiguration().isSaveOnChangedEnabled()) { - FancyHolograms.get().getHologramStorage().save(hologram); + if (FancyHologramsPlugin.get().getHologramConfiguration().isSaveOnChangedEnabled()) { + FancyHologramsPlugin.get().getHologramStorage().save(hologram); } MessageHelper.success(player, "Linked hologram with NPC"); diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/ListCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/ListCMD.java index 8d03f751..dbd56b6b 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/ListCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/ListCMD.java @@ -3,7 +3,7 @@ import com.google.common.primitives.Ints; import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancyholograms.util.Constants; import de.oliver.fancylib.MessageHelper; import org.bukkit.command.CommandSender; @@ -27,7 +27,7 @@ public boolean run(@NotNull CommandSender player, @Nullable Hologram hologram, @ return false; } - final var holograms = FancyHolograms.get().getHologramsManager().getPersistentHolograms(); + final var holograms = FancyHologramsPlugin.get().getHologramsManager().getPersistentHolograms(); if (holograms.isEmpty()) { MessageHelper.warning(player, "There are no holograms. Use '/hologram create' to create one"); diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/MoveHereCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/MoveHereCMD.java index 59a18077..d32a2094 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/MoveHereCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/MoveHereCMD.java @@ -5,7 +5,7 @@ import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.HologramCMD; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancyholograms.util.Constants; import de.oliver.fancylib.MessageHelper; import org.apache.commons.lang3.StringUtils; @@ -39,8 +39,8 @@ public static boolean setLocation(Player player, Hologram hologram, Location loc hologram.getData().setLocation(copied.getLocation()); - if (FancyHolograms.get().getHologramConfiguration().isSaveOnChangedEnabled()) { - FancyHolograms.get().getHologramStorage().save(hologram); + if (FancyHologramsPlugin.get().getHologramConfiguration().isSaveOnChangedEnabled()) { + FancyHologramsPlugin.get().getHologramStorage().save(hologram); } MessageHelper.success(player, "Moved the hologram to %s/%s/%s %s\u00B0 %s\u00B0".formatted( diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/NearbyCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/NearbyCMD.java index 61a60da8..17e2a289 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/NearbyCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/NearbyCMD.java @@ -2,7 +2,7 @@ import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancyholograms.util.Constants; import de.oliver.fancyholograms.util.NumberHelper; import de.oliver.fancylib.MessageHelper; @@ -52,7 +52,7 @@ public boolean run(@NotNull CommandSender player, @Nullable Hologram hologram, @ Location playerLocation = ((Player) player).getLocation().clone(); - List> nearby = FancyHolograms.get() + List> nearby = FancyHologramsPlugin.get() .getHologramsManager() .getPersistentHolograms() .stream() diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/RemoveCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/RemoveCMD.java index 022b6c0f..b4b9d1b6 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/RemoveCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/RemoveCMD.java @@ -4,6 +4,7 @@ import de.oliver.fancyholograms.api.events.HologramDeleteEvent; import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.Subcommand; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancylib.MessageHelper; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; @@ -32,7 +33,7 @@ public boolean run(@NotNull CommandSender player, @Nullable Hologram hologram, @ } FancyHolograms.get().getHologramThread().submit(() -> { - de.oliver.fancyholograms.main.FancyHolograms.get().getHologramsManager().removeHologram(hologram); + FancyHologramsPlugin.get().getHologramsManager().removeHologram(hologram); MessageHelper.success(player, "Removed the hologram"); }); diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/ScaleCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/ScaleCMD.java index 865f0a38..352f5e79 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/ScaleCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/ScaleCMD.java @@ -6,7 +6,7 @@ import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.HologramCMD; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancylib.MessageHelper; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; @@ -70,8 +70,8 @@ public boolean run(@NotNull CommandSender player, @Nullable Hologram hologram, @ copied.getScale().y(), copied.getScale().z())); - if (FancyHolograms.get().getHologramConfiguration().isSaveOnChangedEnabled()) { - FancyHolograms.get().getHologramStorage().save(hologram); + if (FancyHologramsPlugin.get().getHologramConfiguration().isSaveOnChangedEnabled()) { + FancyHologramsPlugin.get().getHologramStorage().save(hologram); } MessageHelper.success(player, "Changed scale to " + scaleX + ", " + scaleY + ", " + scaleZ); diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/SeeThroughCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/SeeThroughCMD.java index 7b96d27f..05e82ed3 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/SeeThroughCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/SeeThroughCMD.java @@ -5,7 +5,7 @@ import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.HologramCMD; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancylib.MessageHelper; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; @@ -64,8 +64,8 @@ public boolean run(@NotNull CommandSender player, @Nullable Hologram hologram, @ textData.setSeeThrough(copied.isSeeThrough()); - if (FancyHolograms.get().getHologramConfiguration().isSaveOnChangedEnabled()) { - FancyHolograms.get().getHologramStorage().save(hologram); + if (FancyHologramsPlugin.get().getHologramConfiguration().isSaveOnChangedEnabled()) { + FancyHologramsPlugin.get().getHologramStorage().save(hologram); } MessageHelper.success(player, "Changed see through"); diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/SetLineCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/SetLineCMD.java index 67a5a6f6..f42c8634 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/SetLineCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/SetLineCMD.java @@ -6,7 +6,7 @@ import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.HologramCMD; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancylib.MessageHelper; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; @@ -48,8 +48,8 @@ public static boolean setLine(CommandSender player, Hologram hologram, int index textData.setText(copied.getText()); - if (FancyHolograms.get().getHologramConfiguration().isSaveOnChangedEnabled()) { - FancyHolograms.get().getHologramStorage().save(hologram); + if (FancyHologramsPlugin.get().getHologramConfiguration().isSaveOnChangedEnabled()) { + FancyHologramsPlugin.get().getHologramStorage().save(hologram); } MessageHelper.success(player, "Changed text for line " + (Math.min(index, lines.size() - 1) + 1)); diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/ShadowRadiusCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/ShadowRadiusCMD.java index 1d7c3948..b7cd73ca 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/ShadowRadiusCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/ShadowRadiusCMD.java @@ -6,7 +6,7 @@ import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.HologramCMD; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancylib.MessageHelper; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; @@ -60,8 +60,8 @@ public boolean run(@NotNull CommandSender player, @Nullable Hologram hologram, @ displayData.setShadowRadius(copied.getShadowRadius()); - if (FancyHolograms.get().getHologramConfiguration().isSaveOnChangedEnabled()) { - FancyHolograms.get().getHologramStorage().save(hologram); + if (FancyHologramsPlugin.get().getHologramConfiguration().isSaveOnChangedEnabled()) { + FancyHologramsPlugin.get().getHologramStorage().save(hologram); } MessageHelper.success(player, "Changed shadow radius"); diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/ShadowStrengthCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/ShadowStrengthCMD.java index 02144a64..10a1ae5e 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/ShadowStrengthCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/ShadowStrengthCMD.java @@ -6,7 +6,7 @@ import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.HologramCMD; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancylib.MessageHelper; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; @@ -60,8 +60,8 @@ public boolean run(@NotNull CommandSender player, @Nullable Hologram hologram, @ displayData.setShadowStrength(copied.getShadowStrength()); - if (FancyHolograms.get().getHologramConfiguration().isSaveOnChangedEnabled()) { - FancyHolograms.get().getHologramStorage().save(hologram); + if (FancyHologramsPlugin.get().getHologramConfiguration().isSaveOnChangedEnabled()) { + FancyHologramsPlugin.get().getHologramStorage().save(hologram); } MessageHelper.success(player, "Changed shadow strength"); diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/TextAlignmentCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/TextAlignmentCMD.java index 292e1ac5..45620f1b 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/TextAlignmentCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/TextAlignmentCMD.java @@ -6,7 +6,7 @@ import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.HologramCMD; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancylib.MessageHelper; import org.bukkit.command.CommandSender; import org.bukkit.entity.TextDisplay; @@ -62,8 +62,8 @@ public boolean run(@NotNull CommandSender player, @Nullable Hologram hologram, @ textData.setTextAlignment(((TextHologramData) copied).getTextAlignment()); - if (FancyHolograms.get().getHologramConfiguration().isSaveOnChangedEnabled()) { - FancyHolograms.get().getHologramStorage().save(hologram); + if (FancyHologramsPlugin.get().getHologramConfiguration().isSaveOnChangedEnabled()) { + FancyHologramsPlugin.get().getHologramStorage().save(hologram); } MessageHelper.success(player, "Changed text alignment"); diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/TextShadowCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/TextShadowCMD.java index 732911cc..19781167 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/TextShadowCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/TextShadowCMD.java @@ -5,7 +5,7 @@ import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.HologramCMD; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancylib.MessageHelper; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; @@ -64,8 +64,8 @@ public boolean run(@NotNull CommandSender player, @Nullable Hologram hologram, @ textData.setTextShadow(copied.hasTextShadow()); - if (FancyHolograms.get().getHologramConfiguration().isSaveOnChangedEnabled()) { - FancyHolograms.get().getHologramStorage().save(hologram); + if (FancyHologramsPlugin.get().getHologramConfiguration().isSaveOnChangedEnabled()) { + FancyHologramsPlugin.get().getHologramStorage().save(hologram); } MessageHelper.success(player, "Changed text shadow"); diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/TranslateCommand.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/TranslateCommand.java index edd8513b..eba8f4e0 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/TranslateCommand.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/TranslateCommand.java @@ -6,7 +6,7 @@ import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.HologramCMD; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancylib.MessageHelper; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; @@ -70,8 +70,8 @@ public boolean run(@NotNull CommandSender player, @Nullable Hologram hologram, @ copied.getTranslation().y(), copied.getTranslation().z())); - if (FancyHolograms.get().getHologramConfiguration().isSaveOnChangedEnabled()) { - FancyHolograms.get().getHologramStorage().save(hologram); + if (FancyHologramsPlugin.get().getHologramConfiguration().isSaveOnChangedEnabled()) { + FancyHologramsPlugin.get().getHologramStorage().save(hologram); } MessageHelper.success(player, "Changed translation to " + translateX + ", " + translateY + ", " + translateZ); diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/UnlinkWithNpcCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/UnlinkWithNpcCMD.java index 80533250..f250631c 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/UnlinkWithNpcCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/UnlinkWithNpcCMD.java @@ -2,7 +2,7 @@ import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancyholograms.util.PluginUtils; import de.oliver.fancylib.MessageHelper; import de.oliver.fancynpcs.api.FancyNpcsPlugin; @@ -47,8 +47,8 @@ public boolean run(@NotNull CommandSender player, @Nullable Hologram hologram, @ npc.updateForAll(); } - if (FancyHolograms.get().getHologramConfiguration().isSaveOnChangedEnabled()) { - FancyHolograms.get().getHologramStorage().save(hologram); + if (FancyHologramsPlugin.get().getHologramConfiguration().isSaveOnChangedEnabled()) { + FancyHologramsPlugin.get().getHologramStorage().save(hologram); } MessageHelper.success(player, "Unlinked hologram with NPC"); diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/UpdateTextIntervalCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/UpdateTextIntervalCMD.java index 181eb5dd..3d751bdd 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/UpdateTextIntervalCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/UpdateTextIntervalCMD.java @@ -6,7 +6,7 @@ import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.HologramCMD; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancylib.MessageHelper; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; @@ -87,8 +87,8 @@ public boolean run(@NotNull CommandSender player, @Nullable Hologram hologram, @ textData.setTextUpdateInterval(copied.getTextUpdateInterval()); - if (FancyHolograms.get().getHologramConfiguration().isSaveOnChangedEnabled()) { - FancyHolograms.get().getHologramStorage().save(hologram); + if (FancyHologramsPlugin.get().getHologramConfiguration().isSaveOnChangedEnabled()) { + FancyHologramsPlugin.get().getHologramStorage().save(hologram); } MessageHelper.success(player, "Changed the text update interval"); diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/VisibilityCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/VisibilityCMD.java index 4294aed3..30254531 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/VisibilityCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/VisibilityCMD.java @@ -3,7 +3,7 @@ import de.oliver.fancyholograms.api.data.property.Visibility; import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancylib.MessageHelper; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; @@ -46,8 +46,8 @@ public boolean run(@NotNull CommandSender player, @Nullable Hologram hologram, @ hologram.getData().setVisibility(copied.getVisibility()); - if (FancyHolograms.get().getHologramConfiguration().isSaveOnChangedEnabled()) { - FancyHolograms.get().getHologramStorage().save(hologram); + if (FancyHologramsPlugin.get().getHologramConfiguration().isSaveOnChangedEnabled()) { + FancyHologramsPlugin.get().getHologramStorage().save(hologram); } MessageHelper.success(player, "Changed visibility to " + visibility); diff --git a/src/main/java/de/oliver/fancyholograms/commands/hologram/VisibilityDistanceCMD.java b/src/main/java/de/oliver/fancyholograms/commands/hologram/VisibilityDistanceCMD.java index caed1ac9..78d0e19d 100644 --- a/src/main/java/de/oliver/fancyholograms/commands/hologram/VisibilityDistanceCMD.java +++ b/src/main/java/de/oliver/fancyholograms/commands/hologram/VisibilityDistanceCMD.java @@ -5,7 +5,7 @@ import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.commands.HologramCMD; import de.oliver.fancyholograms.commands.Subcommand; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancylib.MessageHelper; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; @@ -58,8 +58,8 @@ public boolean run(@NotNull CommandSender player, @Nullable Hologram hologram, @ hologram.getData().setVisibilityDistance(copied.getVisibilityDistance()); - if (FancyHolograms.get().getHologramConfiguration().isSaveOnChangedEnabled()) { - FancyHolograms.get().getHologramStorage().save(hologram); + if (FancyHologramsPlugin.get().getHologramConfiguration().isSaveOnChangedEnabled()) { + FancyHologramsPlugin.get().getHologramStorage().save(hologram); } MessageHelper.success(player, "Changed visibility distance"); diff --git a/src/main/java/de/oliver/fancyholograms/config/FHConfiguration.java b/src/main/java/de/oliver/fancyholograms/config/FHConfiguration.java index 0819f7b7..24723983 100644 --- a/src/main/java/de/oliver/fancyholograms/config/FHConfiguration.java +++ b/src/main/java/de/oliver/fancyholograms/config/FHConfiguration.java @@ -2,6 +2,7 @@ import de.oliver.fancyholograms.api.FancyHolograms; import de.oliver.fancyholograms.api.HologramConfiguration; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancylib.ConfigHelper; import org.jetbrains.annotations.NotNull; @@ -52,7 +53,7 @@ public final class FHConfiguration implements HologramConfiguration { @Override public void reload(@NotNull FancyHolograms plugin) { - de.oliver.fancyholograms.main.FancyHolograms pluginImpl = (de.oliver.fancyholograms.main.FancyHolograms) plugin; + FancyHologramsPlugin pluginImpl = (FancyHologramsPlugin) plugin; pluginImpl.reloadConfig(); final var config = pluginImpl.getConfig(); diff --git a/src/main/java/de/oliver/fancyholograms/config/FHFeatureFlags.java b/src/main/java/de/oliver/fancyholograms/config/FHFeatureFlags.java index 8bc14683..d8e60dd5 100644 --- a/src/main/java/de/oliver/fancyholograms/config/FHFeatureFlags.java +++ b/src/main/java/de/oliver/fancyholograms/config/FHFeatureFlags.java @@ -1,6 +1,6 @@ package de.oliver.fancyholograms.config; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancylib.featureFlags.FeatureFlag; import de.oliver.fancylib.featureFlags.FeatureFlagConfig; @@ -9,7 +9,7 @@ public class FHFeatureFlags { public static final FeatureFlag DISABLE_HOLOGRAMS_FOR_BEDROCK_PLAYERS = new FeatureFlag("disable-holograms-for-bedrock-players", "Do not show holograms to bedrock players", false); public static void load() { - FeatureFlagConfig config = new FeatureFlagConfig(FancyHolograms.get()); + FeatureFlagConfig config = new FeatureFlagConfig(FancyHologramsPlugin.get()); config.addFeatureFlag(DISABLE_HOLOGRAMS_FOR_BEDROCK_PLAYERS); config.load(); } diff --git a/src/main/java/de/oliver/fancyholograms/listeners/NpcListener.java b/src/main/java/de/oliver/fancyholograms/listeners/NpcListener.java index 35dd4afb..64d32a8b 100644 --- a/src/main/java/de/oliver/fancyholograms/listeners/NpcListener.java +++ b/src/main/java/de/oliver/fancyholograms/listeners/NpcListener.java @@ -2,7 +2,7 @@ import de.oliver.fancyholograms.api.data.HologramData; import de.oliver.fancyholograms.api.hologram.Hologram; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancylib.FancyLib; import de.oliver.fancylib.MessageHelper; import de.oliver.fancynpcs.api.events.NpcModifyEvent; @@ -14,9 +14,9 @@ public final class NpcListener implements Listener { - private final @NotNull FancyHolograms plugin; + private final @NotNull FancyHologramsPlugin plugin; - public NpcListener(@NotNull final FancyHolograms plugin) { + public NpcListener(@NotNull final FancyHologramsPlugin plugin) { this.plugin = plugin; } diff --git a/src/main/java/de/oliver/fancyholograms/listeners/PlayerListener.java b/src/main/java/de/oliver/fancyholograms/listeners/PlayerListener.java index ffbc06e6..76b28d7a 100644 --- a/src/main/java/de/oliver/fancyholograms/listeners/PlayerListener.java +++ b/src/main/java/de/oliver/fancyholograms/listeners/PlayerListener.java @@ -1,7 +1,7 @@ package de.oliver.fancyholograms.listeners; import de.oliver.fancyholograms.api.hologram.Hologram; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; @@ -13,11 +13,11 @@ public final class PlayerListener implements Listener { - private final @NotNull FancyHolograms plugin; + private final @NotNull FancyHologramsPlugin plugin; private final Map> loadingResourcePacks; - public PlayerListener(@NotNull final FancyHolograms plugin) { + public PlayerListener(@NotNull final FancyHologramsPlugin plugin) { this.plugin = plugin; this.loadingResourcePacks = new HashMap<>(); } @@ -40,13 +40,13 @@ public void onJoin(@NotNull final PlayerJoinEvent event) { } if (!this.plugin.getHologramConfiguration().areVersionNotificationsMuted() && event.getPlayer().hasPermission("fancyholograms.admin")) { - FancyHolograms.get().getHologramThread().submit(() -> FancyHolograms.get().getVersionConfig().checkVersionAndDisplay(event.getPlayer(), true)); + FancyHologramsPlugin.get().getHologramThread().submit(() -> FancyHologramsPlugin.get().getVersionConfig().checkVersionAndDisplay(event.getPlayer(), true)); } } @EventHandler(priority = EventPriority.MONITOR) public void onQuit(@NotNull final PlayerQuitEvent event) { - FancyHolograms.get().getHologramThread().submit(() -> { + FancyHologramsPlugin.get().getHologramThread().submit(() -> { for (final var hologram : this.plugin.getHologramsManager().getHolograms()) { hologram.hideHologram(event.getPlayer()); } diff --git a/src/main/java/de/oliver/fancyholograms/listeners/WorldListener.java b/src/main/java/de/oliver/fancyholograms/listeners/WorldListener.java index f73eb977..b84b74d0 100644 --- a/src/main/java/de/oliver/fancyholograms/listeners/WorldListener.java +++ b/src/main/java/de/oliver/fancyholograms/listeners/WorldListener.java @@ -1,6 +1,6 @@ package de.oliver.fancyholograms.listeners; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.world.WorldLoadEvent; @@ -10,17 +10,17 @@ public class WorldListener implements Listener { @EventHandler public void onWorldLoad(WorldLoadEvent event) { - FancyHolograms.get().getHologramThread().submit(() -> { - FancyHolograms.get().getFancyLogger().info("Loading holograms for world " + event.getWorld().getName()); - FancyHolograms.get().getHologramsManager().loadHolograms(event.getWorld().getName()); + FancyHologramsPlugin.get().getHologramThread().submit(() -> { + FancyHologramsPlugin.get().getFancyLogger().info("Loading holograms for world " + event.getWorld().getName()); + FancyHologramsPlugin.get().getHologramsManager().loadHolograms(event.getWorld().getName()); }); } @EventHandler public void onWorldUnload(WorldUnloadEvent event) { - FancyHolograms.get().getHologramThread().submit(() -> { - FancyHolograms.get().getFancyLogger().info("Unloading holograms for world " + event.getWorld().getName()); - FancyHolograms.get().getHologramsManager().unloadHolograms(event.getWorld().getName()); + FancyHologramsPlugin.get().getHologramThread().submit(() -> { + FancyHologramsPlugin.get().getFancyLogger().info("Unloading holograms for world " + event.getWorld().getName()); + FancyHologramsPlugin.get().getHologramsManager().unloadHolograms(event.getWorld().getName()); }); } diff --git a/src/main/java/de/oliver/fancyholograms/main/FancyHolograms.java b/src/main/java/de/oliver/fancyholograms/main/FancyHologramsPlugin.java similarity index 97% rename from src/main/java/de/oliver/fancyholograms/main/FancyHolograms.java rename to src/main/java/de/oliver/fancyholograms/main/FancyHologramsPlugin.java index 203c8031..206dc776 100644 --- a/src/main/java/de/oliver/fancyholograms/main/FancyHolograms.java +++ b/src/main/java/de/oliver/fancyholograms/main/FancyHologramsPlugin.java @@ -7,6 +7,7 @@ import de.oliver.fancyanalytics.logger.appender.ConsoleAppender; import de.oliver.fancyanalytics.logger.appender.JsonAppender; import de.oliver.fancyholograms.HologramManagerImpl; +import de.oliver.fancyholograms.api.FancyHolograms; import de.oliver.fancyholograms.api.HologramConfiguration; import de.oliver.fancyholograms.api.HologramManager; import de.oliver.fancyholograms.api.HologramStorage; @@ -52,9 +53,9 @@ import static java.util.concurrent.CompletableFuture.supplyAsync; -public final class FancyHolograms extends JavaPlugin implements de.oliver.fancyholograms.api.FancyHolograms { +public final class FancyHologramsPlugin extends JavaPlugin implements FancyHolograms { - private static @Nullable FancyHolograms INSTANCE; + private static @Nullable FancyHologramsPlugin INSTANCE; private final ExtendedFancyLogger fancyLogger; @@ -71,7 +72,7 @@ public final class FancyHolograms extends JavaPlugin implements de.oliver.fancyh private HologramManagerImpl hologramsManager; - public FancyHolograms() { + public FancyHologramsPlugin() { INSTANCE = this; Appender consoleAppender = new ConsoleAppender("[{loggerName}] ({threadName}) {logLevel}: {message}"); @@ -110,7 +111,7 @@ public FancyHolograms() { configuration = new FHConfiguration(); } - public static @NotNull FancyHolograms get() { + public static @NotNull FancyHologramsPlugin get() { return Objects.requireNonNull(INSTANCE, "plugin is not initialized"); } diff --git a/src/main/java/de/oliver/fancyholograms/metrics/FHMetrics.java b/src/main/java/de/oliver/fancyholograms/metrics/FHMetrics.java index 5826a24a..c25286b1 100644 --- a/src/main/java/de/oliver/fancyholograms/metrics/FHMetrics.java +++ b/src/main/java/de/oliver/fancyholograms/metrics/FHMetrics.java @@ -5,7 +5,7 @@ import de.oliver.fancyanalytics.logger.ExtendedFancyLogger; import de.oliver.fancyholograms.api.HologramManager; import de.oliver.fancyholograms.config.FHFeatureFlags; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import de.oliver.fancylib.Metrics; import org.bukkit.Bukkit; @@ -16,22 +16,22 @@ public class FHMetrics { private boolean isDevelopmentBuild = true; public FHMetrics() { - logger = FancyHolograms.get().getFancyLogger(); - isDevelopmentBuild = !FancyHolograms.get().getVersionConfig().getBuild().equalsIgnoreCase("undefined"); + logger = FancyHologramsPlugin.get().getFancyLogger(); + isDevelopmentBuild = !FancyHologramsPlugin.get().getVersionConfig().getBuild().equalsIgnoreCase("undefined"); } public void register() { fancyAnalytics = new FancyAnalyticsAPI("3b77bd59-2b01-46f2-b3aa-a9584401797f", "E2gW5zc2ZTk1OGFkNGY2ZDQ0ODlM6San"); fancyAnalytics.getConfig().setDisableLogging(true); - fancyAnalytics.registerMinecraftPluginMetrics(FancyHolograms.get()); - fancyAnalytics.getExceptionHandler().registerLogger(FancyHolograms.get().getLogger()); + fancyAnalytics.registerMinecraftPluginMetrics(FancyHologramsPlugin.get()); + fancyAnalytics.getExceptionHandler().registerLogger(FancyHologramsPlugin.get().getLogger()); fancyAnalytics.getExceptionHandler().registerLogger(Bukkit.getLogger()); fancyAnalytics.getExceptionHandler().registerLogger(logger); - HologramManager manager = FancyHolograms.get().getHologramManager(); + HologramManager manager = FancyHologramsPlugin.get().getHologramManager(); - fancyAnalytics.registerStringMetric(new MetricSupplier<>("commit_hash", () -> FancyHolograms.get().getVersionConfig().getHash().substring(0, 7))); + fancyAnalytics.registerStringMetric(new MetricSupplier<>("commit_hash", () -> FancyHologramsPlugin.get().getVersionConfig().getHash().substring(0, 7))); fancyAnalytics.registerStringMetric(new MetricSupplier<>("server_size", () -> { long onlinePlayers = Bukkit.getOnlinePlayers().size(); @@ -56,7 +56,7 @@ public void register() { })); fancyAnalytics.registerNumberMetric(new MetricSupplier<>("amount_holograms", () -> (double) manager.getHolograms().size())); - fancyAnalytics.registerStringMetric(new MetricSupplier<>("enabled_update_notifications", () -> FancyHolograms.get().getFHConfiguration().areVersionNotificationsMuted() ? "false" : "true")); + fancyAnalytics.registerStringMetric(new MetricSupplier<>("enabled_update_notifications", () -> FancyHologramsPlugin.get().getFHConfiguration().areVersionNotificationsMuted() ? "false" : "true")); fancyAnalytics.registerStringMetric(new MetricSupplier<>("fflag_disable_holograms_for_bedrock_players", () -> FHFeatureFlags.DISABLE_HOLOGRAMS_FOR_BEDROCK_PLAYERS.isEnabled() ? "true" : "false")); fancyAnalytics.registerStringMetric(new MetricSupplier<>("using_development_build", () -> isDevelopmentBuild ? "true" : "false")); @@ -75,9 +75,9 @@ public void register() { } public void registerLegacy() { - Metrics metrics = new Metrics(FancyHolograms.get(), 17990); - metrics.addCustomChart(new Metrics.SingleLineChart("total_holograms", () -> FancyHolograms.get().getHologramManager().getHolograms().size())); - metrics.addCustomChart(new Metrics.SimplePie("update_notifications", () -> FancyHolograms.get().getFHConfiguration().areVersionNotificationsMuted() ? "No" : "Yes")); + Metrics metrics = new Metrics(FancyHologramsPlugin.get(), 17990); + metrics.addCustomChart(new Metrics.SingleLineChart("total_holograms", () -> FancyHologramsPlugin.get().getHologramManager().getHolograms().size())); + metrics.addCustomChart(new Metrics.SimplePie("update_notifications", () -> FancyHologramsPlugin.get().getFHConfiguration().areVersionNotificationsMuted() ? "No" : "Yes")); metrics.addCustomChart(new Metrics.SimplePie("using_development_build", () -> isDevelopmentBuild ? "Yes" : "No")); } diff --git a/src/main/java/de/oliver/fancyholograms/storage/FlatFileHologramStorage.java b/src/main/java/de/oliver/fancyholograms/storage/FlatFileHologramStorage.java index 1d3a5126..980c2bde 100644 --- a/src/main/java/de/oliver/fancyholograms/storage/FlatFileHologramStorage.java +++ b/src/main/java/de/oliver/fancyholograms/storage/FlatFileHologramStorage.java @@ -7,7 +7,7 @@ import de.oliver.fancyholograms.api.data.TextHologramData; import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.api.hologram.HologramType; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import org.bukkit.Location; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.YamlConfiguration; @@ -53,7 +53,7 @@ public void saveBatch(Collection holograms, boolean override) { } } - FancyHolograms.get().getFancyLogger().debug("Saved " + holograms.size() + " holograms to file (override=" + override + ")"); + FancyHologramsPlugin.get().getFancyLogger().debug("Saved " + holograms.size() + " holograms to file (override=" + override + ")"); } @Override @@ -74,7 +74,7 @@ public void save(Hologram hologram) { } } - FancyHolograms.get().getFancyLogger().debug("Saved hologram " + hologram.getData().getName() + " to file"); + FancyHologramsPlugin.get().getFancyLogger().debug("Saved hologram " + hologram.getData().getName() + " to file"); } @Override @@ -95,20 +95,20 @@ public void delete(Hologram hologram) { } } - FancyHolograms.get().getFancyLogger().debug("Deleted hologram " + hologram.getData().getName() + " from file"); + FancyHologramsPlugin.get().getFancyLogger().debug("Deleted hologram " + hologram.getData().getName() + " from file"); } @Override public Collection loadAll() { List holograms = readHolograms(FlatFileHologramStorage.HOLOGRAMS_CONFIG_FILE, null); - FancyHolograms.get().getFancyLogger().debug("Loaded " + holograms.size() + " holograms from file"); + FancyHologramsPlugin.get().getFancyLogger().debug("Loaded " + holograms.size() + " holograms from file"); return holograms; } @Override public Collection loadAll(String world) { List holograms = readHolograms(FlatFileHologramStorage.HOLOGRAMS_CONFIG_FILE, world); - FancyHolograms.get().getFancyLogger().debug("Loaded " + holograms.size() + " holograms from file (world=" + world + ")"); + FancyHologramsPlugin.get().getFancyLogger().debug("Loaded " + holograms.size() + " holograms from file (world=" + world + ")"); return holograms; } @@ -121,14 +121,14 @@ private List readHolograms(@NotNull File configFile, @Nullable String YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile); if (!config.isConfigurationSection("holograms")) { - FancyHolograms.get().getFancyLogger().warn("No holograms section found in config"); + FancyHologramsPlugin.get().getFancyLogger().warn("No holograms section found in config"); return new ArrayList<>(0); } int configVersion = config.getInt("version", 1); if (configVersion != 2) { - FancyHolograms.get().getFancyLogger().warn("Config version is not 2, skipping loading holograms"); - FancyHolograms.get().getFancyLogger().warn("Old config version detected, skipping loading holograms"); + FancyHologramsPlugin.get().getFancyLogger().warn("Config version is not 2, skipping loading holograms"); + FancyHologramsPlugin.get().getFancyLogger().warn("Old config version detected, skipping loading holograms"); return new ArrayList<>(0); } @@ -138,7 +138,7 @@ private List readHolograms(@NotNull File configFile, @Nullable String for (String name : hologramsSection.getKeys(false)) { ConfigurationSection holoSection = hologramsSection.getConfigurationSection(name); if (holoSection == null) { - FancyHolograms.get().getFancyLogger().warn("Could not load hologram section in config"); + FancyHologramsPlugin.get().getFancyLogger().warn("Could not load hologram section in config"); continue; } @@ -148,13 +148,13 @@ private List readHolograms(@NotNull File configFile, @Nullable String String typeName = holoSection.getString("type"); if (typeName == null) { - FancyHolograms.get().getFancyLogger().warn("HologramType was not saved"); + FancyHologramsPlugin.get().getFancyLogger().warn("HologramType was not saved"); continue; } HologramType type = HologramType.getByName(typeName); if (type == null) { - FancyHolograms.get().getFancyLogger().warn("Could not parse HologramType"); + FancyHologramsPlugin.get().getFancyLogger().warn("Could not parse HologramType"); continue; } @@ -166,15 +166,15 @@ private List readHolograms(@NotNull File configFile, @Nullable String } if (!displayData.read(holoSection, name)) { - FancyHolograms.get().getFancyLogger().warn("Could not read hologram data - skipping hologram"); + FancyHologramsPlugin.get().getFancyLogger().warn("Could not read hologram data - skipping hologram"); continue; } - Hologram hologram = FancyHolograms.get().getHologramManager().create(displayData); + Hologram hologram = FancyHologramsPlugin.get().getHologramManager().create(displayData); holograms.add(hologram); } - FancyHolograms.get().getFancyLogger().debug("Loaded " + holograms.size() + " holograms from file"); + FancyHologramsPlugin.get().getFancyLogger().debug("Loaded " + holograms.size() + " holograms from file"); return holograms; } finally { lock.readLock().unlock(); @@ -197,14 +197,14 @@ private void writeHologram(YamlConfiguration config, Hologram hologram) { } hologram.getData().write(holoSection, holoName); - FancyHolograms.get().getFancyLogger().debug("Wrote hologram " + holoName + " to config"); + FancyHologramsPlugin.get().getFancyLogger().debug("Wrote hologram " + holoName + " to config"); } private void saveConfig(YamlConfiguration config) { config.set("version", 2); config.setInlineComments("version", List.of("DO NOT CHANGE")); - FancyHolograms.get().getStorageThread().execute(() -> { + FancyHologramsPlugin.get().getStorageThread().execute(() -> { lock.writeLock().lock(); try { config.save(HOLOGRAMS_CONFIG_FILE); @@ -214,11 +214,11 @@ private void saveConfig(YamlConfiguration config) { lock.writeLock().unlock(); } - if(!FancyHolograms.canGet()) { + if(!FancyHologramsPlugin.canGet()) { return; } - FancyHolograms.get().getFancyLogger().debug("Saved config to file"); + FancyHologramsPlugin.get().getFancyLogger().debug("Saved config to file"); }); } } diff --git a/src/main/java/de/oliver/fancyholograms/storage/converter/HologramConverter.java b/src/main/java/de/oliver/fancyholograms/storage/converter/HologramConverter.java index 15a49ab7..13ad277b 100644 --- a/src/main/java/de/oliver/fancyholograms/storage/converter/HologramConverter.java +++ b/src/main/java/de/oliver/fancyholograms/storage/converter/HologramConverter.java @@ -2,7 +2,7 @@ import de.oliver.fancyanalytics.api.events.Event; import de.oliver.fancyholograms.api.data.HologramData; -import de.oliver.fancyholograms.main.FancyHolograms; +import de.oliver.fancyholograms.main.FancyHologramsPlugin; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -33,7 +33,7 @@ public abstract class HologramConverter { .withProperty("converter", getId()) .withProperty("target", spec.getTarget().getRegex().pattern()) .withProperty("amount", String.valueOf(converted.size())); - FancyHolograms.get().getMetrics().getFancyAnalytics().sendEvent(event); + FancyHologramsPlugin.get().getMetrics().getFancyAnalytics().sendEvent(event); return converted; }