Refactor totem item config and update GUI classes

Moved the totem item definition from ItemRegistry to a new TotemConfig class for better configuration management. Updated GiveCommand to use TotemConfig for totem item creation. Renamed GuiItem to MenuItem and refactored GUI menu classes to use MenuItem. Improved PluginMessages with new messages and added PAPIProvider integration. Cleaned up ItemConstruct and EnchantConstructType logic, and removed unused ItemRegistry.

Took 1 hour 57 minutes

Author: Oribuin

src/main/java/dev/oribuin/fishing/FishingPlugin.java

@@ -4,8 +4,9 @@
 import dev.oribuin.fishing.config.impl.Config;
 import dev.oribuin.fishing.config.impl.MySQLConfig;
 import dev.oribuin.fishing.config.impl.PluginMessages;
-import dev.oribuin.fishing.gui.impl.totem.TotemMainMenu;
+import dev.oribuin.fishing.config.impl.TotemConfig;
 import dev.oribuin.fishing.hook.plugin.HeadDbProvider;
+import dev.oribuin.fishing.hook.plugin.PAPIProvider;
 import dev.oribuin.fishing.listener.FishListener;
 import dev.oribuin.fishing.listener.PlayerListeners;
 import dev.oribuin.fishing.listener.TotemListeners;
@@ -38,10 +39,11 @@ public void onEnable() {
 
         // Load this plugin configs
         this.configLoader = new ConfigLoader();
-        this.configLoader.loadConfig(Config.class, "config");
+        this.configLoader.loadConfig(Config.class, "settings");
         this.configLoader.loadConfig(PluginMessages.class, "messages");
-        this.configLoader.loadConfig(MySQLConfig.class, "mysql-config");
-        
+        this.configLoader.loadConfig(MySQLConfig.class, "database-settings");
+        this.configLoader.loadConfig(TotemConfig.class, "totem-settings");
+
         // Load the plugin managers
         this.commandManager = new CommandManager(this);
         this.dataManager = new DataManager(this);
@@ -55,17 +57,17 @@ public void onEnable() {
         manager.registerEvents(new FishListener(this), this);
         manager.registerEvents(new PlayerListeners(this), this);
         manager.registerEvents(new TotemListeners(this), this);
-
-        if (HeadDbProvider.isEnabled()) {
-            manager.registerEvents(new HeadDbProvider(), this);
-        }
+        
+        // register plugin hooks
+        if (HeadDbProvider.isEnabled()) manager.registerEvents(new HeadDbProvider(), this);
+        if (PAPIProvider.isEnabled()) new PAPIProvider(this).register();
     }
 
     public void reload() {
         this.commandManager.reload(this);
         this.tierManager.reload(this);
         this.fishManager.reload(this);
-        this.augmentManager.reload(this); 
+        this.augmentManager.reload(this);
         this.totemManager.reload(this);
         this.menuManager.reload(this);
         this.dataManager.reload(this);
@@ -106,5 +108,5 @@ public MenuManager getMenuManager() {
     public ConfigLoader getConfigLoader() {
         return configLoader;
     }
-    
+
 }

src/main/java/dev/oribuin/fishing/api/Propertied.java

@@ -51,7 +51,7 @@ public void loadProperties(PersistentDataContainer container) {
      */
     public final <T> T applyProperty(PersistentDataType<?, T> type, NamespacedKey key, T value) {
         this.properties.put(key, type);
-        
+
         if (value != null) {
             this.container.put(key, value);
         }

src/main/java/dev/oribuin/fishing/api/event/EventWrapper.java

@@ -14,7 +14,7 @@
  * @param <T>      The event type to be registered with the function
  */
 public record EventWrapper<T extends Event>(Class<T> event, BiConsumer<T, Integer> function, EventPriority order) {
-    
+
     /**
      * Call the function that was registered with the event, This will cast the event to the correct type
      *

src/main/java/dev/oribuin/fishing/api/event/def/FishingEvents.java

@@ -80,9 +80,10 @@ default void onConditionCheck(ConditionCheckEvent event, int level) {}
 
     /**
      * The functionality provided when a fish bites the rod before it is caught
-     * @param event The fishing event 
+     *
+     * @param event The fishing event
      * @param level The level of the ability that was used, if applicable (0 if not)
      */
     default void onBite(PlayerFishEvent event, int level) {}
-    
+
 }

src/main/java/dev/oribuin/fishing/api/event/def/TotemEvents.java

@@ -20,12 +20,12 @@ public interface TotemEvents {
      * @param event The event that was called when a player activates a totem
      */
     default void onActivate(TotemActivateEvent event) {}
-    
+
     /**
      * The functionality provided when the fishing totem deactivates
      *
      * @param event The event that was called when the totem deactivates
      */
     default void onDeactivate(TotemActivateEvent event) {}
-    
+
 }

src/main/java/dev/oribuin/fishing/api/event/impl/FishCatchEvent.java

@@ -26,7 +26,7 @@ public class FishCatchEvent extends PlayerEvent implements Cancellable {
     private final ItemStack rod;
     private final FishHook hook;
     private Fish fish;
-    
+
     private final int baseEntropy;
     private final int baseFishExp;
     private final float baseNaturalExp;
@@ -75,7 +75,8 @@ public Map<Augment, Integer> getAugments() {
 
     /**
      * The fishing rod the player is using to catch the fish
-     *-
+     * -
+     *
      * @return The fishing rod {@link ItemStack}
      */
     public @NotNull ItemStack rod() {
@@ -108,7 +109,7 @@ public Map<Augment, Integer> getAugments() {
     public void fish(@Nullable Fish fish) {
         this.fish = fish;
     }
-    
+
     /**
      * The base amount of entropy the fish gives
      *
@@ -135,7 +136,7 @@ public int entropy() {
     public void entropy(int entropy) {
         this.entropy = entropy;
     }
-    
+
     /**
      * The base amount of plugin experience the fish gives
      *
@@ -162,7 +163,7 @@ public int fishExp() {
     public void fishExp(int fishExp) {
         this.fishExp = fishExp;
     }
-    
+
     /**
      * The base minecraft experience the fish gives
      *

src/main/java/dev/oribuin/fishing/api/event/impl/TotemDeactivateEvent.java

@@ -2,11 +2,9 @@
 
 import dev.oribuin.fishing.model.totem.Totem;
 import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
-import org.bukkit.event.player.PlayerEvent;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -21,7 +19,7 @@ public class TotemDeactivateEvent extends Event implements Cancellable {
     /**
      * Define a new Totem Deactivate Event, This is called when a totem deactivates by running out of time.
      *
-     * @param totem     The {@link Totem} that is being deactivated
+     * @param totem The {@link Totem} that is being deactivated
      */
     public TotemDeactivateEvent(@NotNull Totem totem) {
         super(!Bukkit.isPrimaryThread());
@@ -37,7 +35,7 @@ public TotemDeactivateEvent(@NotNull Totem totem) {
     public @NotNull Totem totem() {
         return this.totem;
     }
-    
+
     /**
      * Get the handlers for this event class
      *

src/main/java/dev/oribuin/fishing/api/task/AsyncTicker.java

@@ -41,5 +41,5 @@ default ScheduledTask schedule() {
 
         return PluginScheduler.get().runTaskTimerAsync(this::tickAsync, this.delay().toSeconds(), 0, TimeUnit.SECONDS);
     }
-    
+
 }

src/main/java/dev/oribuin/fishing/command/argument/FishArgumentHandler.java

@@ -43,7 +43,7 @@ public class FishArgumentHandler implements ArgumentParser<CommandSender, Fish>
                         .toList()
         );
     }
-    
+
     public static final class FishParserException extends ParserException {
 
         private final String input;

src/main/java/dev/oribuin/fishing/command/impl/GiveCommand.java

@@ -3,7 +3,7 @@
 import dev.oribuin.fishing.FishingPlugin;
 import dev.oribuin.fishing.command.FishCommand;
 import dev.oribuin.fishing.config.impl.PluginMessages;
-import dev.oribuin.fishing.item.ItemRegistry;
+import dev.oribuin.fishing.config.impl.TotemConfig;
 import dev.oribuin.fishing.model.augment.Augment;
 import dev.oribuin.fishing.model.fish.Fish;
 import dev.oribuin.fishing.model.totem.Totem;
@@ -26,7 +26,7 @@ public class GiveCommand implements FishCommand {
     public GiveCommand(FishingPlugin plugin) {
         this.plugin = plugin;
     }
-    
+
     /**
      * Give a fish to a specified player
      *
@@ -98,9 +98,9 @@ public void giveAugment(CommandSender sender, Player target, Augment augment, In
     /**
      * Give a totem to a specified player
      *
-     * @param sender  The sender running the command
-     * @param target  The target receiving the augment
-     * @param amount  The amount of augments being given
+     * @param sender The sender running the command
+     * @param target The target receiving the augment
+     * @param amount The amount of augments being given
      */
     @Command("fishing|fish give <target> totem [amount]")
     @Permission("fishing.give")
@@ -109,9 +109,9 @@ public void giveTotem(CommandSender sender, Player target, Integer amount) {
         if (amount == null || amount < 0) amount = 1;
 
         Totem totem = new Totem(null, target);
-        ItemStack itemStack = ItemRegistry.FISHING_TOTEM.build(totem.placeholders()); // todo: make not horrific, move to TotemManager
+        ItemStack itemStack = TotemConfig.get().getTotemItem().build(totem.placeholders());
         totem.saveTo(itemStack);
-        
+
         if (itemStack == null) {
             sender.sendMessage("An error occurred while creating the fish item."); // TODO: Plugin Message
             return;