Codex upgrade

pom.xml

@@ -16,7 +16,7 @@
     <description>Custom items, combat, and more!</description>
 
     <properties>
-        <codex.version>1.0.1-R0.15-SNAPSHOT</codex.version>
+        <codex.version>1.1.0-R0.1-SNAPSHOT</codex.version>
         <fabled.version>1.0.4-R0.8-SNAPSHOT</fabled.version>
     </properties>
 
@@ -38,6 +38,18 @@
     </repositories>
 
     <dependencies>
+        <dependency>
+            <groupId>org.mockbukkit.mockbukkit</groupId>
+            <artifactId>mockbukkit-v1.21</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.20.6-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.mojang</groupId>
             <artifactId>authlib</artifactId>
@@ -61,6 +73,19 @@
             <version>${fabled.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <version>${mysql.version}</version>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.protobuf</groupId>
+                    <artifactId>protobuf-java</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>io.lumine</groupId>
             <artifactId>Mythic-Dist</artifactId>

src/main/java/studio/magemonkey/divinity/Divinity.java

@@ -33,7 +33,6 @@
 import studio.magemonkey.divinity.manager.profile.ProfileManager;
 import studio.magemonkey.divinity.manager.worth.WorthManager;
 import studio.magemonkey.divinity.modules.ModuleCache;
-import studio.magemonkey.divinity.nms.engine.PMS;
 import studio.magemonkey.divinity.nms.engine.PMSManager;
 import studio.magemonkey.divinity.stats.EntityStats;
 import studio.magemonkey.divinity.stats.items.ItemStats;
@@ -53,7 +52,8 @@
 import java.util.List;
 
 /**
- * Divinity 
+ * Divinity
+ *
  * @author ©2024 MageMonkeyStudio
  */
 public class Divinity extends CodexDataPlugin<Divinity, DivinityUser> {
@@ -118,11 +118,9 @@ public void enable() {
 
         }
 
-        if (this.pms.get() == null || !minCoreVersionMet) {
-            if (!minCoreVersionMet) {
-                warn("Missing required Codex version. " + coreVersion + " installed. "
-                        + DependencyRequirement.MIN_CORE_VERSION + " required. Disabling.");
-            }
+        if (!minCoreVersionMet) {
+            warn("Missing required Codex version. " + coreVersion + " installed. "
+                    + DependencyRequirement.MIN_CORE_VERSION + " required. Disabling.");
             this.getPluginManager().disablePlugin(this);
             return;
         }
@@ -303,11 +301,6 @@ private void addCustomActions() {
         this.getActionsManager().registerExecutor(new ActionTakeMana(this));
     }
 
-    @NotNull
-    public PMS getPMS() {
-        return this.pms.get();
-    }
-
     @NotNull
     public InteractionManager getInteractionManager() {
         return interactionManager;

src/main/java/studio/magemonkey/divinity/api/event/DivinityDamageEvent.java

@@ -10,7 +10,7 @@
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import studio.magemonkey.codex.manager.api.event.ICancellableEvent;
+import studio.magemonkey.codex.api.events.ICancellableEvent;
 import studio.magemonkey.divinity.manager.damage.DamageMeta;
 import studio.magemonkey.divinity.modules.list.arrows.ArrowManager.QArrow;
 import studio.magemonkey.divinity.stats.EntityStats;

src/main/java/studio/magemonkey/divinity/api/event/DivinityItemDamageEvent.java

@@ -4,7 +4,7 @@
 import lombok.RequiredArgsConstructor;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.inventory.ItemStack;
-import studio.magemonkey.codex.manager.api.event.ICancellableEvent;
+import studio.magemonkey.codex.api.events.ICancellableEvent;
 
 @Getter
 @RequiredArgsConstructor

src/main/java/studio/magemonkey/divinity/config/Config.java

@@ -7,7 +7,7 @@
 import org.jetbrains.annotations.Nullable;
 import studio.magemonkey.codex.config.api.IConfigTemplate;
 import studio.magemonkey.codex.config.api.JYML;
-import studio.magemonkey.codex.items.ItemType;
+import studio.magemonkey.codex.api.items.ItemType;
 import studio.magemonkey.codex.util.StringUT;
 import studio.magemonkey.codex.util.actions.ActionManipulator;
 import studio.magemonkey.codex.util.constants.JStrings;

src/main/java/studio/magemonkey/divinity/config/Lang.java

@@ -3,7 +3,7 @@
 import org.jetbrains.annotations.NotNull;
 import studio.magemonkey.codex.config.api.ILangMsg;
 import studio.magemonkey.codex.core.config.CoreLang;
-import studio.magemonkey.codex.manager.types.ClickType;
+import studio.magemonkey.codex.manager.api.ClickType;
 import studio.magemonkey.divinity.Divinity;
 import studio.magemonkey.divinity.data.api.UserEntityNamesMode;
 import studio.magemonkey.divinity.modules.list.classes.object.ClassAttributeType;

src/main/java/studio/magemonkey/divinity/manager/damage/DamageManager.java

@@ -22,8 +22,8 @@
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import studio.magemonkey.codex.api.items.PrefixHelper;
 import studio.magemonkey.codex.hooks.Hooks;
-import studio.magemonkey.codex.items.CodexItemManager;
 import studio.magemonkey.codex.manager.IListener;
 import studio.magemonkey.codex.registry.damage.DamageTypeProvider;
 import studio.magemonkey.codex.util.LocUT;
@@ -521,7 +521,7 @@ public boolean dealDamage(@NotNull LivingEntity entity,
                               String damageType,
                               @Nullable LivingEntity damager) {
         DamageAttribute damageAttribute =
-                ItemStats.getDamageById(CodexItemManager.stripPrefix(getNamespace(), damageType));
+                ItemStats.getDamageById(PrefixHelper.stripPrefix(getNamespace(), damageType));
         if (damageAttribute == null) return false;
         final boolean[] success = {false};
         Listener listener = new Listener() {

src/main/java/studio/magemonkey/divinity/manager/listener/object/VanillaWrapperListener.java

@@ -17,10 +17,10 @@
 import org.bukkit.projectiles.ProjectileSource;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
+import studio.magemonkey.codex.compat.VersionManager;
 import studio.magemonkey.codex.hooks.Hooks;
 import studio.magemonkey.codex.manager.IListener;
 import studio.magemonkey.codex.registry.attribute.AttributeRegistry;
-import studio.magemonkey.codex.util.AttributeUT;
 import studio.magemonkey.codex.util.ItemUT;
 import studio.magemonkey.divinity.Divinity;
 import studio.magemonkey.divinity.api.event.DivinityDamageEvent;
@@ -290,7 +290,7 @@ public void onVanillaDamage(EntityDamageEvent e) {
 
                 if (Divinity.getInstance().getModuleCache().getTierManager().isItemOfThisModule(weapon)) {
                     AttributeInstance attackDamageAttribute =
-                            damager.getAttribute(AttributeUT.resolve("ATTACK_DAMAGE"));
+                            damager.getAttribute(VersionManager.getNms().getAttribute("ATTACK_DAMAGE"));
                     damagerAttackDamage =
                             attackDamageAttribute != null ? attackDamageAttribute.getBaseValue() : 1;
                 }

src/main/java/studio/magemonkey/divinity/modules/ModuleItem.java

@@ -14,11 +14,11 @@
 import org.bukkit.inventory.meta.PotionMeta;
 import org.jetbrains.annotations.NotNull;
 import studio.magemonkey.codex.CodexEngine;
+import studio.magemonkey.codex.api.items.ItemType;
+import studio.magemonkey.codex.api.items.exception.MissingItemException;
+import studio.magemonkey.codex.api.items.exception.MissingProviderException;
+import studio.magemonkey.codex.api.items.providers.VanillaProvider;
 import studio.magemonkey.codex.config.api.JYML;
-import studio.magemonkey.codex.items.ItemType;
-import studio.magemonkey.codex.items.exception.MissingItemException;
-import studio.magemonkey.codex.items.exception.MissingProviderException;
-import studio.magemonkey.codex.items.providers.VanillaProvider;
 import studio.magemonkey.codex.manager.LoadableItem;
 import studio.magemonkey.codex.util.ItemUT;
 import studio.magemonkey.codex.util.NamespaceResolver;

src/main/java/studio/magemonkey/divinity/modules/command/MDropCmd.java

@@ -7,9 +7,9 @@
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import studio.magemonkey.codex.CodexEngine;
-import studio.magemonkey.codex.items.ItemType;
-import studio.magemonkey.codex.items.exception.MissingItemException;
-import studio.magemonkey.codex.items.exception.MissingProviderException;
+import studio.magemonkey.codex.api.items.ItemType;
+import studio.magemonkey.codex.api.items.exception.MissingItemException;
+import studio.magemonkey.codex.api.items.exception.MissingProviderException;
 import studio.magemonkey.codex.util.ItemUT;
 import studio.magemonkey.codex.util.LocUT;
 import studio.magemonkey.codex.util.random.Rnd;

src/main/java/studio/magemonkey/divinity/modules/command/MGetCmd.java

@@ -5,9 +5,9 @@
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import studio.magemonkey.codex.CodexEngine;
-import studio.magemonkey.codex.items.ItemType;
-import studio.magemonkey.codex.items.exception.MissingItemException;
-import studio.magemonkey.codex.items.exception.MissingProviderException;
+import studio.magemonkey.codex.api.items.ItemType;
+import studio.magemonkey.codex.api.items.exception.MissingItemException;
+import studio.magemonkey.codex.api.items.exception.MissingProviderException;
 import studio.magemonkey.codex.util.ItemUT;
 import studio.magemonkey.codex.util.random.Rnd;
 import studio.magemonkey.divinity.Perms;

src/main/java/studio/magemonkey/divinity/modules/command/MGiveCmd.java

@@ -5,9 +5,9 @@
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import studio.magemonkey.codex.CodexEngine;
-import studio.magemonkey.codex.items.ItemType;
-import studio.magemonkey.codex.items.exception.MissingItemException;
-import studio.magemonkey.codex.items.exception.MissingProviderException;
+import studio.magemonkey.codex.api.items.ItemType;
+import studio.magemonkey.codex.api.items.exception.MissingItemException;
+import studio.magemonkey.codex.api.items.exception.MissingProviderException;
 import studio.magemonkey.codex.util.ItemUT;
 import studio.magemonkey.codex.util.PlayerUT;
 import studio.magemonkey.codex.util.random.Rnd;

src/main/java/studio/magemonkey/divinity/modules/list/classes/ComboManager.java

@@ -17,6 +17,7 @@
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import studio.magemonkey.codex.compat.VersionManager;
 import studio.magemonkey.codex.config.api.JYML;
 import studio.magemonkey.codex.manager.IListener;
 import studio.magemonkey.codex.manager.api.Loadable;
@@ -284,7 +285,7 @@ public void onClassCombo3(EntityDamageByEntityEvent e) {
     public void playAttackAnim(@NotNull Player player, boolean main) {
         int animId = main ? 0 : 3;
         this.stopCombo(player);
-        this.plugin.getNMS().sendAttackPacket(player, animId);
+        VersionManager.getNms().sendAttackPacket(player, animId);
     }
 
     public void stopCombo(@NotNull Player p) {
@@ -582,7 +583,7 @@ public void click(@NotNull Player p, @Nullable Enum<?> type, @NotNull InventoryC
         }
 
         @Override
-        protected void onCreate(Player player, Inventory inv, int page) {
+        protected void onCreate(@NotNull Player player, @NotNull Inventory inv, int page) {
             // Show current skill combo
             int count = 0;
             for (ComboKey key : this.data.getCombo()) {

src/main/java/studio/magemonkey/divinity/modules/list/classes/event/PlayerClassEvent.java

@@ -2,7 +2,7 @@
 
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
-import studio.magemonkey.codex.manager.api.event.IEvent;
+import studio.magemonkey.codex.api.events.IEvent;
 import studio.magemonkey.divinity.modules.list.classes.api.UserClassData;
 
 public abstract class PlayerClassEvent extends IEvent {

src/main/java/studio/magemonkey/divinity/modules/list/classes/gui/ClassSelectionGUI.java

@@ -19,10 +19,10 @@
 
 public class ClassSelectionGUI extends NGUI<Divinity> {
 
-    private ClassManager classManager;
-    private boolean      allowClose;
-    private int[]        objSlots;
-    private boolean      isMainSelector;
+    private final ClassManager classManager;
+    private final boolean      allowClose;
+    private final int[]        objSlots;
+    private final boolean      isMainSelector;
 
     public ClassSelectionGUI(@NotNull ClassManager classManager,
                              @NotNull JYML cfg,

src/main/java/studio/magemonkey/divinity/modules/list/classes/object/ClassAttributeType.java

@@ -2,11 +2,10 @@
 
 import org.bukkit.attribute.Attribute;
 import org.jetbrains.annotations.NotNull;
-import studio.magemonkey.codex.util.AttributeUT;
+import studio.magemonkey.codex.compat.VersionManager;
 import studio.magemonkey.codex.util.StringUT;
 
 public enum ClassAttributeType {
-
     ARMOR(0D),
     ARMOR_TOUGHNESS(0D),
     ATTACK_DAMAGE(1D),
@@ -22,8 +21,8 @@ public enum ClassAttributeType {
     private String    name;
     private double    defValue;
 
-    private ClassAttributeType(double def) {
-        this.att = AttributeUT.resolve(this.name());
+    ClassAttributeType(double def) {
+        this.att = VersionManager.getNms().getAttribute(this.name());
         this.name = this.name();
         this.defValue = def;
     }

src/main/java/studio/magemonkey/divinity/modules/list/dismantle/event/PlayerDismantleItemEvent.java

@@ -3,7 +3,7 @@
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
-import studio.magemonkey.codex.manager.api.event.IEvent;
+import studio.magemonkey.codex.api.events.IEvent;
 import studio.magemonkey.divinity.modules.list.dismantle.DismantleManager.OutputContainer;
 
 import java.util.HashMap;

src/main/java/studio/magemonkey/divinity/modules/list/dismantle/event/PlayerPreDismantleItemEvent.java

@@ -3,7 +3,7 @@
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
-import studio.magemonkey.codex.manager.api.event.ICancellableEvent;
+import studio.magemonkey.codex.api.events.ICancellableEvent;
 import studio.magemonkey.divinity.modules.list.dismantle.DismantleManager.OutputContainer;
 
 import java.util.Map;

src/main/java/studio/magemonkey/divinity/modules/list/drops/DropManager.java

@@ -20,7 +20,7 @@
 import org.jetbrains.annotations.Nullable;
 import studio.magemonkey.codex.config.api.JYML;
 import studio.magemonkey.codex.hooks.Hooks;
-import studio.magemonkey.codex.manager.types.MobGroup;
+import studio.magemonkey.codex.manager.api.MobGroup;
 import studio.magemonkey.codex.util.actions.ActionManipulator;
 import studio.magemonkey.codex.util.constants.JStrings;
 import studio.magemonkey.divinity.Divinity;

src/main/java/studio/magemonkey/divinity/modules/list/extractor/event/PlayerExtractSocketEvent.java

@@ -5,7 +5,7 @@
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
-import studio.magemonkey.codex.manager.api.event.ICancellableEvent;
+import studio.magemonkey.codex.api.events.ICancellableEvent;
 import studio.magemonkey.divinity.stats.items.attributes.SocketAttribute;
 
 import java.util.List;

src/main/java/studio/magemonkey/divinity/modules/list/identify/IdentifyManager.java

@@ -9,10 +9,10 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import studio.magemonkey.codex.CodexEngine;
+import studio.magemonkey.codex.api.items.ItemType;
+import studio.magemonkey.codex.api.items.providers.ICodexItemProvider;
+import studio.magemonkey.codex.api.items.providers.VanillaProvider;
 import studio.magemonkey.codex.config.api.JYML;
-import studio.magemonkey.codex.items.ItemType;
-import studio.magemonkey.codex.items.providers.ICodexItemProvider;
-import studio.magemonkey.codex.items.providers.VanillaProvider;
 import studio.magemonkey.codex.modules.IModule;
 import studio.magemonkey.codex.util.ItemUT;
 import studio.magemonkey.codex.util.actions.ActionManipulator;

src/main/java/studio/magemonkey/divinity/modules/list/identify/event/PlayerIdentifyItemEvent.java

@@ -3,7 +3,7 @@
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
-import studio.magemonkey.codex.manager.api.event.ICancellableEvent;
+import studio.magemonkey.codex.api.events.ICancellableEvent;
 import studio.magemonkey.divinity.modules.list.identify.IdentifyManager.IdentifyTome;
 import studio.magemonkey.divinity.modules.list.identify.IdentifyManager.UnidentifiedItem;