Class System Implementation

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "java.compile.nullAnalysis.mode": "automatic"
+}

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.zenox</groupId>
     <artifactId>evocraft</artifactId>
-    <version>1.2.0-ALPHA</version>
+    <version>1.3.0-ALPHA</version>
     <packaging>jar</packaging>
 
     <name>EvoCraft</name>
@@ -96,32 +96,37 @@
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.19.3-R0.1-SNAPSHOT</version>
+            <version>1.20.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.19-R0.1-SNAPSHOT</version>
+            <version>1.20.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.sk89q.worldguard</groupId>
             <artifactId>worldguard-bukkit</artifactId>
-            <version>7.0.7</version>
+            <version>7.0.9</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.github.Archy-X</groupId>
-            <artifactId>AureliumSkills</artifactId>
-            <version>Beta1.3.6</version>
+            <groupId>dev.aurelium</groupId>
+            <artifactId>auraskills-api-bukkit</artifactId>
+            <version>2.2.4</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <version>3.12.0</version>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.7</version>
+        </dependency>
         <dependency>
             <groupId>com.moandjiezana.toml</groupId>
             <artifactId>toml4j</artifactId>
@@ -130,24 +135,30 @@
         <dependency>
             <groupId>com.comphenix.protocol</groupId>
             <artifactId>ProtocolLib</artifactId>
-            <version>4.7.0</version>
+            <version>5.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.ticxo.modelengine</groupId>
             <artifactId>api</artifactId>
-            <version>R3.0.1</version>
+            <version>R3.1.6</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>de.studiocode.invui</groupId>
-            <artifactId>InvUI</artifactId>
-            <version>0.8.2</version>
+            <groupId>xyz.xenondevs.invui</groupId>
+            <artifactId>invui</artifactId>
+            <version>1.23</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>23.5-jre</version>
         </dependency>
         <dependency>
             <groupId>net.citizensnpcs</groupId>
             <artifactId>citizens-main</artifactId>
-            <version>2.0.30-SNAPSHOT</version>
+            <version>2.0.33-SNAPSHOT</version>
             <type>jar</type>
             <scope>provided</scope>
             <exclusions>
@@ -163,5 +174,10 @@
             <version>1.7</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.mojang</groupId>
+            <artifactId>authlib</artifactId>
+            <version>3.5.41</version>
+        </dependency>
     </dependencies>
 </project>

src/main/java/me/zenox/evocraft/EvoCraft.java

@@ -1,32 +1,32 @@
 package me.zenox.evocraft;
 
-import com.archyx.aureliumskills.api.AureliumAPI;
-import com.archyx.aureliumskills.modifier.Modifiers;
-import com.archyx.aureliumskills.ui.ActionBar;
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.ProtocolManager;
 import com.sk89q.worldguard.WorldGuard;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import de.studiocode.invui.gui.structure.Structure;
-import de.studiocode.invui.item.builder.ItemBuilder;
+import dev.aurelium.auraskills.api.AuraSkillsApi;
+import dev.aurelium.auraskills.api.AuraSkillsBukkit;
 import me.zenox.evocraft.abilities.AbilityRegistry;
 import me.zenox.evocraft.attribute.AttributeRegistry;
 import me.zenox.evocraft.command.Command;
 import me.zenox.evocraft.data.ConfigLoader;
 import me.zenox.evocraft.data.LanguageLoader;
+import me.zenox.evocraft.data.PlayerDataManager;
 import me.zenox.evocraft.enchant.EnchantRegistry;
 import me.zenox.evocraft.events.*;
+import me.zenox.evocraft.gameclass.ClassAbilityListener;
 import me.zenox.evocraft.item.ItemRegistry;
 import me.zenox.evocraft.item.VanillaItem;
 import me.zenox.evocraft.network.GlowFilter;
 import me.zenox.evocraft.recipe.RecipeRegistry;
-import me.zenox.evocraft.story.ChapterManager;
 import me.zenox.evocraft.util.Util;
 import net.milkbowl.vault.economy.Economy;
 import net.milkbowl.vault.permission.Permission;
 import org.bukkit.Material;
 import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.plugin.java.JavaPlugin;
+import xyz.xenondevs.invui.gui.structure.Structure;
+import xyz.xenondevs.invui.item.builder.ItemBuilder;
 
 public final class EvoCraft extends JavaPlugin {
 
@@ -36,12 +36,12 @@ public final class EvoCraft extends JavaPlugin {
     private static Permission perms = null;
 
     public boolean isUsingWorldGuard;
-    public static Modifiers modifiers;
     private static LanguageLoader languageLoader;
     private static ConfigLoader configLoader;
     private static ProtocolManager protocolManager;
-    private static ChapterManager chapterManager;
-    private static ActionBar actionBar;
+    private static PlayerDataManager playerDataManager;
+    private static AuraSkillsApi auraSkillsApi;
+    private static AuraSkillsBukkit auraSkillsBukkit;
 
     public static EvoCraft getPlugin() {
         return plugin;
@@ -50,6 +50,7 @@ public static EvoCraft getPlugin() {
 
     @Override
     public void onEnable() {
+        long startTime = System.currentTimeMillis();
         plugin = this;
         plugin.getLogger().info("EvoCraft v" + plugin.getDescription().getVersion() + " loaded.");
 
@@ -78,12 +79,13 @@ public void onEnable() {
             return;
         }
 
-        modifiers = new Modifiers(AureliumAPI.getPlugin());
-        actionBar = AureliumAPI.getPlugin().getActionBar();
+        auraSkillsApi = AuraSkillsApi.get();
+        auraSkillsBukkit = AuraSkillsBukkit.get();
+
+        playerDataManager = new PlayerDataManager();
 
         configLoader = new ConfigLoader(plugin);
         languageLoader = new LanguageLoader(plugin);
-        chapterManager = new ChapterManager(plugin);
 
         registerGlobalGUIItems();
 
@@ -102,6 +104,7 @@ public void onEnable() {
 
         registerListeners();
 
+        Util.logToConsole("v" + plugin.getDescription().getVersion() + " enabled in &e" + (System.currentTimeMillis() - startTime) + "&fms.");
     }
 
     private void registerListeners() {
@@ -110,6 +113,7 @@ private void registerListeners() {
         new InventoryListener(plugin);
         new DimensionLocker(plugin);
         new DeathManager(plugin);
+        new ClassAbilityListener(plugin);
     }
 
     private boolean setupEconomy() {
@@ -163,20 +167,15 @@ public static Permission getPermissions() {
         return perms;
     }
 
-    public static ChapterManager getChapterManager() {
-        return chapterManager;
-    }
-
-    public static ActionBar getActionBar() {
-        return actionBar;
-    }
     public void reload() {
         this.reloadConfig();
         this.languageLoader = new LanguageLoader(this);
     }
 
     @Override
     public void onDisable() {
-        // Plugin shutdown logic
+        long startTime = System.currentTimeMillis();
+        playerDataManager.shutdown();
+        Util.logToConsole("v" + plugin.getDescription().getVersion() + " disabled in &e" + (System.currentTimeMillis() - startTime) + "&fms.");
     }
 }

src/main/java/me/zenox/evocraft/Slot.java

@@ -42,10 +42,10 @@ public enum Slot {
      * @return The list of unique abilities that the player possesses
      */
     @Deprecated
-    public static List<Ability> uniqueEquipped(Player p) {
+    public static List<Ability<?>> uniqueEquipped(Player p) {
         List<ItemStack> items = Arrays.stream(new ItemStack[]{MAIN_HAND.item(p).get(0), OFF_HAND.item(p).get(0), HEAD.item(p).get(0), CHEST.item(p).get(0), LEGS.item(p).get(0), FEET.item(p).get(0)})
                 .filter(Objects::nonNull).toList();
-        List<Ability> abilities = new ArrayList<>();
+        List<Ability<?>> abilities = new ArrayList<>();
         items.stream()
                 .map(ComplexItemStack::of)
                 .forEach((complexItemStack) -> abilities.addAll(complexItemStack.getAbilities()));