Cleanup plugin main class

api/src/main/java/de/oliver/fancyholograms/api/FancyHologramsPlugin.java → api/src/main/java/de/oliver/fancyholograms/api/FancyHolograms.java

@@ -7,9 +7,9 @@
 
 import java.util.concurrent.ScheduledExecutorService;
 
-public interface FancyHologramsPlugin {
+public interface FancyHolograms {
 
-    static FancyHologramsPlugin get() {
+    static FancyHolograms get() {
         if (isEnabled()) {
             return EnabledChecker.getPlugin();
         }
@@ -34,14 +34,6 @@ static boolean isEnabled() {
      */
     HologramConfiguration getHologramConfiguration();
 
-    /**
-     * Sets the configuration of the plugin.
-     *
-     * @param configuration The new configuration.
-     * @param reload        Whether the configuration should be reloaded.
-     */
-    void setHologramConfiguration(HologramConfiguration configuration, boolean reload);
-
     /**
      * @return The hologram storage.
      */
@@ -52,18 +44,11 @@ static boolean isEnabled() {
      */
     ScheduledExecutorService getHologramThread();
 
-    /**
-     * Sets the hologram storage.
-     *
-     * @param storage The new hologram storage.
-     * @param reload  Whether the current hologram cache should be reloaded.
-     */
-    void setHologramStorage(HologramStorage storage, boolean reload);
 
     class EnabledChecker {
 
         private static Boolean enabled;
-        private static FancyHologramsPlugin plugin;
+        private static FancyHolograms plugin;
 
         public static Boolean isFancyHologramsEnabled() {
             if (enabled != null) return enabled;
@@ -72,7 +57,7 @@ public static Boolean isFancyHologramsEnabled() {
 
             if (pl != null && pl.isEnabled()) {
                 try {
-                    plugin = (FancyHologramsPlugin) pl;
+                    plugin = (FancyHolograms) pl;
                 } catch (ClassCastException e) {
                     throw new IllegalStateException("API failed to access plugin, if using the FancyHolograms API make sure to set the dependency to compile only.");
                 }
@@ -84,7 +69,7 @@ public static Boolean isFancyHologramsEnabled() {
             return false;
         }
 
-        public static FancyHologramsPlugin getPlugin() {
+        public static FancyHolograms getPlugin() {
             return plugin;
         }
     }

api/src/main/java/de/oliver/fancyholograms/api/HologramConfiguration.java

@@ -9,7 +9,7 @@ public interface HologramConfiguration {
      *
      * @param plugin The plugin instance.
      */
-    void reload(@NotNull FancyHologramsPlugin plugin);
+    void reload(@NotNull FancyHolograms plugin);
 
     /**
      * Returns whether version notifications are muted.

api/src/main/java/de/oliver/fancyholograms/api/data/HologramData.java

@@ -1,6 +1,6 @@
 package de.oliver.fancyholograms.api.data;
 
-import de.oliver.fancyholograms.api.FancyHologramsPlugin;
+import de.oliver.fancyholograms.api.FancyHolograms;
 import de.oliver.fancyholograms.api.data.property.Visibility;
 import de.oliver.fancyholograms.api.hologram.HologramType;
 import org.bukkit.Bukkit;
@@ -78,7 +78,7 @@ public int getVisibilityDistance() {
             return visibilityDistance;
         }
 
-        return FancyHologramsPlugin.get().getHologramConfiguration().getDefaultVisibilityDistance();
+        return FancyHolograms.get().getHologramConfiguration().getDefaultVisibilityDistance();
     }
 
     public HologramData setVisibilityDistance(int visibilityDistance) {
@@ -145,7 +145,7 @@ public boolean read(ConfigurationSection section, String name) {
 
         World world = Bukkit.getWorld(worldName);
         if (world == null) {
-            FancyHologramsPlugin.get().getFancyLogger().warn("Could not load hologram '" + name + "', because the world '" + worldName + "' is not loaded");
+            FancyHolograms.get().getFancyLogger().warn("Could not load hologram '" + name + "', because the world '" + worldName + "' is not loaded");
             return false;
         }
 

src/main/java/de/oliver/fancyholograms/HologramManagerImpl.java

@@ -45,7 +45,7 @@ public final class HologramManagerImpl implements HologramManager {
      */
     private boolean isLoaded = false;
 
-    HologramManagerImpl(@NotNull final FancyHolograms plugin, @NotNull final Function<HologramData, Hologram> adapter) {
+    public HologramManagerImpl(@NotNull final FancyHolograms plugin, @NotNull final Function<HologramData, Hologram> adapter) {
         this.plugin = plugin;
         this.adapter = adapter;
     }
@@ -176,7 +176,7 @@ public void loadHolograms(String world) {
      * <p>
      * This method is intended to be called internally by the plugin.
      */
-    void initializeTasks() {
+    public void initializeTasks() {
         ScheduledExecutorService hologramThread = plugin.getHologramThread();
         hologramThread.submit(() -> {
             loadHolograms();

src/main/java/de/oliver/fancyholograms/commands/FancyHologramsCMD.java

@@ -1,8 +1,8 @@
 package de.oliver.fancyholograms.commands;
 
-import de.oliver.fancyholograms.main.FancyHolograms;
 import de.oliver.fancyholograms.api.data.HologramData;
 import de.oliver.fancyholograms.api.hologram.Hologram;
+import de.oliver.fancyholograms.main.FancyHolograms;
 import de.oliver.fancyholograms.storage.converter.ConverterTarget;
 import de.oliver.fancyholograms.storage.converter.FHConversionRegistry;
 import de.oliver.fancyholograms.storage.converter.HologramConversionSession;
@@ -44,7 +44,6 @@ public boolean execute(@NotNull CommandSender sender, @NotNull String label, @No
             case "reload" -> {
                 this.plugin.getHologramConfiguration().reload(plugin);
                 this.plugin.getHologramsManager().reloadHolograms();
-                this.plugin.reloadCommands();
 
                 MessageHelper.success(sender, "Reloaded config and holograms");
             }

src/main/java/de/oliver/fancyholograms/commands/FancyHologramsTestCMD.java

@@ -1,8 +1,8 @@
 package de.oliver.fancyholograms.commands;
 
-import de.oliver.fancyholograms.main.FancyHolograms;
-import de.oliver.fancyholograms.api.hologram.Hologram;
 import de.oliver.fancyholograms.api.data.TextHologramData;
+import de.oliver.fancyholograms.api.hologram.Hologram;
+import de.oliver.fancyholograms.main.FancyHolograms;
 import de.oliver.fancylib.MessageHelper;
 import org.bukkit.Color;
 import org.bukkit.command.Command;

src/main/java/de/oliver/fancyholograms/commands/HologramCMD.java

@@ -1,14 +1,14 @@
 package de.oliver.fancyholograms.commands;
 
 import com.google.common.primitives.Ints;
-import de.oliver.fancyholograms.main.FancyHolograms;
 import de.oliver.fancyholograms.api.data.DisplayHologramData;
 import de.oliver.fancyholograms.api.data.HologramData;
 import de.oliver.fancyholograms.api.data.TextHologramData;
 import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
 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.util.Constants;
 import de.oliver.fancyholograms.util.PluginUtils;
 import de.oliver.fancylib.MessageHelper;

src/main/java/de/oliver/fancyholograms/commands/hologram/BackgroundCMD.java

@@ -1,11 +1,11 @@
 package de.oliver.fancyholograms.commands.hologram;
 
-import de.oliver.fancyholograms.main.FancyHolograms;
-import de.oliver.fancyholograms.api.hologram.Hologram;
 import de.oliver.fancyholograms.api.data.TextHologramData;
 import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
+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.fancylib.MessageHelper;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Color;

src/main/java/de/oliver/fancyholograms/commands/hologram/BillboardCMD.java

@@ -1,12 +1,12 @@
 package de.oliver.fancyholograms.commands.hologram;
 
 import com.google.common.base.Enums;
-import de.oliver.fancyholograms.main.FancyHolograms;
-import de.oliver.fancyholograms.api.hologram.Hologram;
 import de.oliver.fancyholograms.api.data.DisplayHologramData;
 import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
+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.fancylib.MessageHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.CommandSender;

src/main/java/de/oliver/fancyholograms/commands/hologram/BlockCMD.java

@@ -1,11 +1,11 @@
 package de.oliver.fancyholograms.commands.hologram;
 
-import de.oliver.fancyholograms.main.FancyHolograms;
-import de.oliver.fancyholograms.api.hologram.Hologram;
 import de.oliver.fancyholograms.api.data.BlockHologramData;
 import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
+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.fancylib.MessageHelper;
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;

src/main/java/de/oliver/fancyholograms/commands/hologram/BrightnessCMD.java

@@ -1,9 +1,9 @@
 package de.oliver.fancyholograms.commands.hologram;
 
-import de.oliver.fancyholograms.main.FancyHolograms;
 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.util.NumberHelper;
 import de.oliver.fancylib.MessageHelper;
 import org.bukkit.command.CommandSender;

src/main/java/de/oliver/fancyholograms/commands/hologram/CenterCMD.java

@@ -1,8 +1,8 @@
 package de.oliver.fancyholograms.commands.hologram;
 
-import de.oliver.fancyholograms.main.FancyHolograms;
 import de.oliver.fancyholograms.api.hologram.Hologram;
 import de.oliver.fancyholograms.commands.Subcommand;
+import de.oliver.fancyholograms.main.FancyHolograms;
 import de.oliver.fancyholograms.util.Constants;
 import de.oliver.fancylib.MessageHelper;
 import org.bukkit.Location;

src/main/java/de/oliver/fancyholograms/commands/hologram/CopyCMD.java

@@ -1,9 +1,9 @@
 package de.oliver.fancyholograms.commands.hologram;
 
-import de.oliver.fancyholograms.main.FancyHolograms;
-import de.oliver.fancyholograms.api.hologram.Hologram;
 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.fancylib.MessageHelper;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;

src/main/java/de/oliver/fancyholograms/commands/hologram/CreateCMD.java

@@ -1,11 +1,14 @@
 package de.oliver.fancyholograms.commands.hologram;
 
-import de.oliver.fancyholograms.main.FancyHolograms;
+import de.oliver.fancyholograms.api.data.BlockHologramData;
+import de.oliver.fancyholograms.api.data.DisplayHologramData;
+import de.oliver.fancyholograms.api.data.ItemHologramData;
+import de.oliver.fancyholograms.api.data.TextHologramData;
+import de.oliver.fancyholograms.api.events.HologramCreateEvent;
 import de.oliver.fancyholograms.api.hologram.Hologram;
 import de.oliver.fancyholograms.api.hologram.HologramType;
-import de.oliver.fancyholograms.api.data.*;
-import de.oliver.fancyholograms.api.events.HologramCreateEvent;
 import de.oliver.fancyholograms.commands.Subcommand;
+import de.oliver.fancyholograms.main.FancyHolograms;
 import de.oliver.fancylib.MessageHelper;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;

src/main/java/de/oliver/fancyholograms/commands/hologram/InsertAfterCMD.java

@@ -1,12 +1,12 @@
 package de.oliver.fancyholograms.commands.hologram;
 
 import com.google.common.primitives.Ints;
-import de.oliver.fancyholograms.main.FancyHolograms;
-import de.oliver.fancyholograms.api.hologram.Hologram;
 import de.oliver.fancyholograms.api.data.TextHologramData;
 import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
+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.fancylib.MessageHelper;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;

src/main/java/de/oliver/fancyholograms/commands/hologram/InsertBeforeCMD.java

@@ -1,12 +1,12 @@
 package de.oliver.fancyholograms.commands.hologram;
 
 import com.google.common.primitives.Ints;
-import de.oliver.fancyholograms.main.FancyHolograms;
-import de.oliver.fancyholograms.api.hologram.Hologram;
 import de.oliver.fancyholograms.api.data.TextHologramData;
 import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
+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.fancylib.MessageHelper;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;

src/main/java/de/oliver/fancyholograms/commands/hologram/ItemCMD.java

@@ -1,11 +1,11 @@
 package de.oliver.fancyholograms.commands.hologram;
 
-import de.oliver.fancyholograms.main.FancyHolograms;
-import de.oliver.fancyholograms.api.hologram.Hologram;
 import de.oliver.fancyholograms.api.data.ItemHologramData;
 import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
+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.fancylib.MessageHelper;
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;

src/main/java/de/oliver/fancyholograms/commands/hologram/LinkWithNpcCMD.java

@@ -1,8 +1,8 @@
 package de.oliver.fancyholograms.commands.hologram;
 
-import de.oliver.fancyholograms.main.FancyHolograms;
 import de.oliver.fancyholograms.api.hologram.Hologram;
 import de.oliver.fancyholograms.commands.Subcommand;
+import de.oliver.fancyholograms.main.FancyHolograms;
 import de.oliver.fancyholograms.util.PluginUtils;
 import de.oliver.fancylib.MessageHelper;
 import de.oliver.fancynpcs.api.FancyNpcsPlugin;

src/main/java/de/oliver/fancyholograms/commands/hologram/ListCMD.java

@@ -1,9 +1,9 @@
 package de.oliver.fancyholograms.commands.hologram;
 
 import com.google.common.primitives.Ints;
-import de.oliver.fancyholograms.main.FancyHolograms;
 import de.oliver.fancyholograms.api.hologram.Hologram;
 import de.oliver.fancyholograms.commands.Subcommand;
+import de.oliver.fancyholograms.main.FancyHolograms;
 import de.oliver.fancyholograms.util.Constants;
 import de.oliver.fancylib.MessageHelper;
 import org.bukkit.command.CommandSender;

src/main/java/de/oliver/fancyholograms/commands/hologram/MoveHereCMD.java

@@ -1,11 +1,11 @@
 package de.oliver.fancyholograms.commands.hologram;
 
 import com.google.common.primitives.Doubles;
-import de.oliver.fancyholograms.main.FancyHolograms;
-import de.oliver.fancyholograms.api.hologram.Hologram;
 import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
+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.util.Constants;
 import de.oliver.fancylib.MessageHelper;
 import org.apache.commons.lang3.StringUtils;

src/main/java/de/oliver/fancyholograms/commands/hologram/NearbyCMD.java

@@ -1,8 +1,8 @@
 package de.oliver.fancyholograms.commands.hologram;
 
-import de.oliver.fancyholograms.main.FancyHolograms;
 import de.oliver.fancyholograms.api.hologram.Hologram;
 import de.oliver.fancyholograms.commands.Subcommand;
+import de.oliver.fancyholograms.main.FancyHolograms;
 import de.oliver.fancyholograms.util.Constants;
 import de.oliver.fancyholograms.util.NumberHelper;
 import de.oliver.fancylib.MessageHelper;

src/main/java/de/oliver/fancyholograms/commands/hologram/RemoveCMD.java

@@ -1,7 +1,6 @@
 package de.oliver.fancyholograms.commands.hologram;
 
-import de.oliver.fancyholograms.main.FancyHolograms;
-import de.oliver.fancyholograms.api.FancyHologramsPlugin;
+import de.oliver.fancyholograms.api.FancyHolograms;
 import de.oliver.fancyholograms.api.events.HologramDeleteEvent;
 import de.oliver.fancyholograms.api.hologram.Hologram;
 import de.oliver.fancyholograms.commands.Subcommand;
@@ -32,8 +31,8 @@ public boolean run(@NotNull CommandSender player, @Nullable Hologram hologram, @
             return false;
         }
 
-        FancyHologramsPlugin.get().getHologramThread().submit(() -> {
-            FancyHolograms.get().getHologramsManager().removeHologram(hologram);
+        FancyHolograms.get().getHologramThread().submit(() -> {
+            de.oliver.fancyholograms.main.FancyHolograms.get().getHologramsManager().removeHologram(hologram);
             MessageHelper.success(player, "Removed the hologram");
         });
 

src/main/java/de/oliver/fancyholograms/commands/hologram/ScaleCMD.java

@@ -1,12 +1,12 @@
 package de.oliver.fancyholograms.commands.hologram;
 
 import com.google.common.primitives.Floats;
-import de.oliver.fancyholograms.main.FancyHolograms;
-import de.oliver.fancyholograms.api.hologram.Hologram;
 import de.oliver.fancyholograms.api.data.DisplayHologramData;
 import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
+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.fancylib.MessageHelper;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;

src/main/java/de/oliver/fancyholograms/commands/hologram/SeeThroughCMD.java

@@ -1,11 +1,11 @@
 package de.oliver.fancyholograms.commands.hologram;
 
-import de.oliver.fancyholograms.main.FancyHolograms;
-import de.oliver.fancyholograms.api.hologram.Hologram;
 import de.oliver.fancyholograms.api.data.TextHologramData;
 import de.oliver.fancyholograms.api.events.HologramUpdateEvent;
+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.fancylib.MessageHelper;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;