update getter for main class

Crazy-Crew · Aug 20, 2024 · 44370d4 · 44370d4
1 parent 132b45c
commit 44370d4
Show file tree

Hide file tree

Showing 32 changed files with 33 additions and 54 deletions.
diff --git a/src/main/java/com/badbones69/crazycrates/CrazyCrates.java b/src/main/java/com/badbones69/crazycrates/CrazyCrates.java
@@ -36,6 +36,10 @@
 
 public class CrazyCrates extends JavaPlugin {
 
+    public static CrazyCrates getPlugin() {
+        return JavaPlugin.getPlugin(CrazyCrates.class);
+    }
+
     private final Timer timer;
     private final long startTime;
 

diff --git a/src/main/java/com/badbones69/crazycrates/api/PrizeManager.java b/src/main/java/com/badbones69/crazycrates/api/PrizeManager.java
@@ -12,7 +12,6 @@
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import com.badbones69.crazycrates.api.utils.MiscUtils;
 import com.badbones69.crazycrates.api.utils.MsgUtils;
@@ -26,7 +25,7 @@
 
 public class PrizeManager {
 
-    private static @NotNull final CrazyCrates plugin = JavaPlugin.getPlugin(CrazyCrates.class);
+    private static @NotNull final CrazyCrates plugin = CrazyCrates.getPlugin();
 
     /**
      * Gets the prize for the player.

diff --git a/src/main/java/com/badbones69/crazycrates/api/builders/CrateBuilder.java b/src/main/java/com/badbones69/crazycrates/api/builders/CrateBuilder.java
@@ -17,7 +17,6 @@
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import us.crazycrew.crazycrates.api.enums.types.CrateType;
 import us.crazycrew.crazycrates.api.enums.types.KeyType;
@@ -28,7 +27,7 @@
 
 public abstract class CrateBuilder extends FoliaRunnable {
 
-    protected @NotNull final CrazyCrates plugin = JavaPlugin.getPlugin(CrazyCrates.class);
+    protected @NotNull final CrazyCrates plugin = CrazyCrates.getPlugin();
 
     protected @NotNull final CrateManager crateManager = this.plugin.getCrateManager();
 

diff --git a/src/main/java/com/badbones69/crazycrates/api/builders/InventoryBuilder.java b/src/main/java/com/badbones69/crazycrates/api/builders/InventoryBuilder.java
@@ -22,7 +22,6 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.plugin.java.JavaPlugin;
 import com.badbones69.crazycrates.config.ConfigManager;
 import com.badbones69.crazycrates.config.impl.ConfigKeys;
 import me.clip.placeholderapi.PlaceholderAPI;
@@ -36,7 +35,7 @@
 
 public abstract class InventoryBuilder implements InventoryHolder, Listener {
 
-    protected @NotNull final CrazyCrates plugin = JavaPlugin.getPlugin(CrazyCrates.class);
+    protected @NotNull final CrazyCrates plugin = CrazyCrates.getPlugin();
 
     protected @NotNull final BukkitUserManager userManager = this.plugin.getUserManager();
 

diff --git a/src/main/java/com/badbones69/crazycrates/api/enums/Files.java b/src/main/java/com/badbones69/crazycrates/api/enums/Files.java
@@ -13,7 +13,7 @@ public enum Files {
 
     private final String fileName;
 
-    private @NotNull final CrazyCrates plugin = JavaPlugin.getPlugin(CrazyCrates.class);
+    private @NotNull final CrazyCrates plugin = CrazyCrates.getPlugin();
 
     private @NotNull final FileManager fileManager = this.plugin.getFileManager();
 

diff --git a/src/main/java/com/badbones69/crazycrates/api/enums/PersistentKeys.java b/src/main/java/com/badbones69/crazycrates/api/enums/PersistentKeys.java
@@ -20,7 +20,7 @@ public enum PersistentKeys {
     crate_tier("crate_tier", PersistentDataType.STRING),
     crate_key("crate_key", PersistentDataType.STRING);
 
-    private @NotNull final CrazyCrates plugin = JavaPlugin.getPlugin(CrazyCrates.class);
+    private @NotNull final CrazyCrates plugin = CrazyCrates.getPlugin();
 
     private final String NamespacedKey;
     private final PersistentDataType type;

diff --git a/src/main/java/com/badbones69/crazycrates/api/objects/Crate.java b/src/main/java/com/badbones69/crazycrates/api/objects/Crate.java
@@ -21,7 +21,6 @@
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
-import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.Nullable;
 import us.crazycrew.crazycrates.api.enums.types.CrateType;
 import com.badbones69.crazycrates.CrazyCrates;
@@ -84,7 +83,7 @@ public class Crate {
 
     private List<String> prizeCommands = new ArrayList<>();
 
-    private @NotNull final CrazyCrates plugin = JavaPlugin.getPlugin(CrazyCrates.class);
+    private @NotNull final CrazyCrates plugin = CrazyCrates.getPlugin();
 
     private @NotNull final CrateManager crateManager = this.plugin.getCrateManager();
 

diff --git a/src/main/java/com/badbones69/crazycrates/api/objects/Prize.java b/src/main/java/com/badbones69/crazycrates/api/objects/Prize.java
@@ -18,7 +18,6 @@
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import java.util.ArrayList;
@@ -27,7 +26,7 @@
 
 public class Prize {
 
-    private final CrazyCrates plugin = JavaPlugin.getPlugin(CrazyCrates.class);
+    private final CrazyCrates plugin = CrazyCrates.getPlugin();
 
     private final ConfigurationSection section;
     private final List<ItemBuilder> builders;

diff --git a/src/main/java/com/badbones69/crazycrates/api/objects/other/BrokeLocation.java b/src/main/java/com/badbones69/crazycrates/api/objects/other/BrokeLocation.java
@@ -3,13 +3,12 @@
 import com.badbones69.crazycrates.CrazyCrates;
 import com.badbones69.crazycrates.api.objects.Crate;
 import org.bukkit.Location;
-import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class BrokeLocation {
 
-    private @NotNull final CrazyCrates plugin = JavaPlugin.getPlugin(CrazyCrates.class);
+    private @NotNull final CrazyCrates plugin = CrazyCrates.getPlugin();
 
     /**
      * Empty values that get instantiated below.

diff --git a/src/main/java/com/badbones69/crazycrates/api/objects/other/Server.java b/src/main/java/com/badbones69/crazycrates/api/objects/other/Server.java
@@ -3,7 +3,6 @@
 import com.badbones69.crazycrates.config.impl.ConfigKeys;
 import com.ryderbelserion.vital.common.utils.FileUtil;
 import com.ryderbelserion.vital.paper.VitalPaper;
-import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import us.crazycrew.crazycrates.CratesProvider;

diff --git a/src/main/java/com/badbones69/crazycrates/api/utils/ItemUtils.java b/src/main/java/com/badbones69/crazycrates/api/utils/ItemUtils.java
@@ -18,7 +18,6 @@
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
-import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import java.util.List;
 import java.util.Optional;
@@ -27,7 +26,7 @@
 
 public class ItemUtils {
 
-    private static @NotNull final CrazyCrates plugin = JavaPlugin.getPlugin(CrazyCrates.class);
+    private static @NotNull final CrazyCrates plugin = CrazyCrates.getPlugin();
 
     private static @NotNull final CrateManager crateManager = plugin.getCrateManager();
 

diff --git a/src/main/java/com/badbones69/crazycrates/api/utils/MiscUtils.java b/src/main/java/com/badbones69/crazycrates/api/utils/MiscUtils.java
@@ -3,7 +3,6 @@
 import com.badbones69.crazycrates.api.enums.Permissions;
 import com.badbones69.crazycrates.api.builders.ItemBuilder;
 import org.bukkit.permissions.Permission;
-import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.Nullable;
 import com.badbones69.crazycrates.config.ConfigManager;
 import com.badbones69.crazycrates.config.impl.ConfigKeys;
@@ -35,7 +34,7 @@
 
 public class MiscUtils {
 
-    private static @NotNull final CrazyCrates plugin = JavaPlugin.getPlugin(CrazyCrates.class);
+    private static @NotNull final CrazyCrates plugin = CrazyCrates.getPlugin();
 
     public static void sendCommand(@NotNull final String command) {
         if (command.isEmpty()) return;

diff --git a/src/main/java/com/badbones69/crazycrates/commands/CommandManager.java b/src/main/java/com/badbones69/crazycrates/commands/CommandManager.java
@@ -33,7 +33,7 @@
 
 public class CommandManager {
 
-    private final static @NotNull CrazyCrates plugin = JavaPlugin.getPlugin(CrazyCrates.class);
+    private final static @NotNull CrazyCrates plugin = CrazyCrates.getPlugin();
     private final static @NotNull CrateManager crateManager = plugin.getCrateManager();
 
     private final static @NotNull BukkitCommandManager<CommandSender> commandManager = BukkitCommandManager.create(plugin);

diff --git a/src/main/java/com/badbones69/crazycrates/commands/crates/types/BaseCommand.java b/src/main/java/com/badbones69/crazycrates/commands/crates/types/BaseCommand.java
@@ -15,7 +15,6 @@
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -29,7 +28,7 @@
 @Command(value = "crazycrates", alias = {"crates", "crate"})
 public abstract class BaseCommand {
 
-    protected @NotNull final CrazyCrates plugin = JavaPlugin.getPlugin(CrazyCrates.class);
+    protected @NotNull final CrazyCrates plugin = CrazyCrates.getPlugin();
 
     protected @NotNull final InventoryManager inventoryManager = this.plugin.getInventoryManager();
 

diff --git a/...om/badbones69/crazycrates/commands/crates/types/admin/crates/migrator/ICrateMigrator.java b/...om/badbones69/crazycrates/commands/crates/types/admin/crates/migrator/ICrateMigrator.java
@@ -16,7 +16,6 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.plugin.java.JavaPlugin;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -25,7 +24,7 @@
 
 public abstract class ICrateMigrator {
 
-    protected final CrazyCrates plugin = JavaPlugin.getPlugin(CrazyCrates.class);
+    protected final CrazyCrates plugin = CrazyCrates.getPlugin();
 
     protected final CrateManager crateManager = this.plugin.getCrateManager();
 

diff --git a/src/main/java/com/badbones69/crazycrates/commands/crates/types/player/CommandKey.java b/src/main/java/com/badbones69/crazycrates/commands/crates/types/player/CommandKey.java
@@ -27,7 +27,7 @@
 @Description("Views the amount of keys you/others have.")
 public class CommandKey {
 
-    private @NotNull final CrazyCrates plugin = JavaPlugin.getPlugin(CrazyCrates.class);
+    private @NotNull final CrazyCrates plugin = CrazyCrates.getPlugin();
 
     private @NotNull final BukkitUserManager userManager = this.plugin.getUserManager();
     private @NotNull final CrateManager crateManager = this.plugin.getCrateManager();

diff --git a/src/main/java/com/badbones69/crazycrates/listeners/BrokeLocationsListener.java b/src/main/java/com/badbones69/crazycrates/listeners/BrokeLocationsListener.java
@@ -10,7 +10,6 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.world.WorldLoadEvent;
-import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import com.badbones69.crazycrates.tasks.crates.CrateManager;
 import java.util.ArrayList;
@@ -19,7 +18,7 @@
 // Only use for this class is to check if for broken locations and to try and fix them when the server loads the world.
 public class BrokeLocationsListener implements Listener {
 
-    private @NotNull final CrazyCrates plugin = JavaPlugin.getPlugin(CrazyCrates.class);
+    private @NotNull final CrazyCrates plugin = CrazyCrates.getPlugin();
 
     private @NotNull final CrateManager crateManager = this.plugin.getCrateManager();
 

diff --git a/src/main/java/com/badbones69/crazycrates/listeners/CrateControlListener.java b/src/main/java/com/badbones69/crazycrates/listeners/CrateControlListener.java
@@ -21,7 +21,6 @@
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
 import us.crazycrew.crazycrates.api.enums.types.CrateType;
@@ -39,7 +38,7 @@
 
 public class CrateControlListener implements Listener {
 
-    private @NotNull final CrazyCrates plugin = JavaPlugin.getPlugin(CrazyCrates.class);
+    private @NotNull final CrazyCrates plugin = CrazyCrates.getPlugin();
 
     private @NotNull final InventoryManager inventoryManager = this.plugin.getInventoryManager();
 

diff --git a/src/main/java/com/badbones69/crazycrates/listeners/MiscListener.java b/src/main/java/com/badbones69/crazycrates/listeners/MiscListener.java
@@ -25,14 +25,13 @@
 import org.bukkit.event.Listener;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import com.badbones69.crazycrates.tasks.crates.CrateManager;
 import us.crazycrew.crazycrates.api.enums.types.CrateType;
 
 public class MiscListener implements Listener {
 
-    private @NotNull final CrazyCrates plugin = JavaPlugin.getPlugin(CrazyCrates.class);
+    private @NotNull final CrazyCrates plugin = CrazyCrates.getPlugin();
 
     private @NotNull final CrateManager crateManager = this.plugin.getCrateManager();
 

diff --git a/src/main/java/com/badbones69/crazycrates/listeners/crates/CosmicCrateListener.java b/src/main/java/com/badbones69/crazycrates/listeners/crates/CosmicCrateListener.java
@@ -9,7 +9,6 @@
 import me.clip.placeholderapi.PlaceholderAPI;
 import net.kyori.adventure.sound.Sound;
 import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.plugin.java.JavaPlugin;
 import com.badbones69.crazycrates.config.ConfigManager;
 import com.badbones69.crazycrates.config.impl.ConfigKeys;
 import com.badbones69.crazycrates.api.PrizeManager;
@@ -48,7 +47,7 @@
 
 public class CosmicCrateListener implements Listener {
 
-    private @NotNull final CrazyCrates plugin = JavaPlugin.getPlugin(CrazyCrates.class);
+    private @NotNull final CrazyCrates plugin = CrazyCrates.getPlugin();
 
     private @NotNull final CrateManager crateManager = this.plugin.getCrateManager();
 

diff --git a/src/main/java/com/badbones69/crazycrates/listeners/crates/CrateOpenListener.java b/src/main/java/com/badbones69/crazycrates/listeners/crates/CrateOpenListener.java
@@ -16,15 +16,14 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
-import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import us.crazycrew.crazycrates.api.enums.types.CrateType;
 import com.badbones69.crazycrates.api.utils.MsgUtils;
 import java.util.List;
 
 public class CrateOpenListener implements Listener {
 
-    private @NotNull final CrazyCrates plugin = JavaPlugin.getPlugin(CrazyCrates.class);
+    private @NotNull final CrazyCrates plugin = CrazyCrates.getPlugin();
 
     private @NotNull final CrateManager crateManager = this.plugin.getCrateManager();
 

diff --git a/src/main/java/com/badbones69/crazycrates/listeners/crates/MobileCrateListener.java b/src/main/java/com/badbones69/crazycrates/listeners/crates/MobileCrateListener.java
@@ -18,15 +18,14 @@
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
-import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import us.crazycrew.crazycrates.api.enums.types.CrateType;
 import com.badbones69.crazycrates.api.utils.ItemUtils;
 import com.badbones69.crazycrates.api.utils.MiscUtils;
 
 public class MobileCrateListener implements Listener {
 
-    private @NotNull final CrazyCrates plugin = JavaPlugin.getPlugin(CrazyCrates.class);
+    private @NotNull final CrazyCrates plugin = CrazyCrates.getPlugin();
 
     private @NotNull final CrateManager crateManager = this.plugin.getCrateManager();
 

diff --git a/src/main/java/com/badbones69/crazycrates/listeners/crates/QuadCrateListener.java b/src/main/java/com/badbones69/crazycrates/listeners/crates/QuadCrateListener.java
@@ -30,8 +30,6 @@
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.metadata.FixedMetadataValue;
-import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
 import java.util.HashMap;
@@ -41,7 +39,7 @@
 
 public class QuadCrateListener implements Listener {
 
-    private @NotNull final CrazyCrates plugin = JavaPlugin.getPlugin(CrazyCrates.class);
+    private @NotNull final CrazyCrates plugin = CrazyCrates.getPlugin();
 
     private @NotNull final SessionManager sessionManager = new SessionManager();
 

diff --git a/src/main/java/com/badbones69/crazycrates/listeners/crates/WarCrateListener.java b/src/main/java/com/badbones69/crazycrates/listeners/crates/WarCrateListener.java
@@ -13,7 +13,6 @@
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import us.crazycrew.crazycrates.api.enums.types.CrateType;
 import com.badbones69.crazycrates.CrazyCrates;
@@ -23,7 +22,7 @@
 
 public class WarCrateListener implements Listener {
 
-    private @NotNull final CrazyCrates plugin = JavaPlugin.getPlugin(CrazyCrates.class);
+    private @NotNull final CrazyCrates plugin = CrazyCrates.getPlugin();
 
     private @NotNull final CrateManager crateManager = this.plugin.getCrateManager();
 

diff --git a/src/main/java/com/badbones69/crazycrates/support/holograms/HologramManager.java b/src/main/java/com/badbones69/crazycrates/support/holograms/HologramManager.java
@@ -5,7 +5,6 @@
 import com.badbones69.crazycrates.api.objects.Crate;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
-import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -19,7 +18,7 @@
 @SuppressWarnings("deprecation")
 public abstract class HologramManager {
 
-    protected CrazyCrates plugin = JavaPlugin.getPlugin(CrazyCrates.class);
+    protected CrazyCrates plugin = CrazyCrates.getPlugin();
 
     public abstract void createHologram(final Location location, final Crate crate, final String id);
 

diff --git a/src/main/java/com/badbones69/crazycrates/support/placeholders/PlaceholderAPISupport.java b/src/main/java/com/badbones69/crazycrates/support/placeholders/PlaceholderAPISupport.java
@@ -9,7 +9,6 @@
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
-import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import com.badbones69.crazycrates.tasks.BukkitUserManager;
 import java.text.NumberFormat;
@@ -18,7 +17,7 @@
 
 public class PlaceholderAPISupport extends PlaceholderExpansion {
 
-    private @NotNull final CrazyCrates plugin = JavaPlugin.getPlugin(CrazyCrates.class);
+    private @NotNull final CrazyCrates plugin = CrazyCrates.getPlugin();
 
     private @NotNull final BukkitUserManager userManager = this.plugin.getUserManager();