Rename main class to FancyHologramsPlugin

FancyMcPlugins · Dec 27, 2024 · 8fc0ee4 · 8fc0ee4
1 parent 32eb710
commit 8fc0ee4
Show file tree

Hide file tree

Showing 41 changed files with 162 additions and 159 deletions.
diff --git 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
@@ -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<HologramData, Hologram> adapter) {
+    public HologramManagerImpl(@NotNull final FancyHologramsPlugin plugin, @NotNull final Function<HologramData, Hologram> 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<Hologram> 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<Hologram> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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");