Now supports multiple RPG cores at the same time

MMOItems-API/src/main/java/net/Indyuce/mmoitems/MMOItems.java

@@ -47,6 +47,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.jetbrains.annotations.NotNull;
@@ -54,6 +55,7 @@ import org.jetbrains.annotations.NotNull;
 import javax.annotation.Nullable;
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
 
@@ -83,7 +85,7 @@ public class MMOItems extends JavaPlugin {
     private SetManager setManager;
 
     private VaultSupport vaultSupport;
-    private RPGHandler rpgPlugin;
+    private final List<RPGHandler> rpgPlugins = new ArrayList<>();
 
     /**
      * Startup issues usually prevent the plugin from loading and just
@@ -152,7 +154,7 @@ public class MMOItems extends JavaPlugin {
         });
         PluginUtils.hookDependencyIfPresent("MMOInventory", unused -> new MMOInventorySupport());
 
-        findRpgPlugin();
+        findRpgPlugins();
 
         /*
          * After tiers, sets and upgrade templates are loaded, MI template data
@@ -293,8 +295,19 @@ public class MMOItems extends JavaPlugin {
         return setManager;
     }
 
+    @Deprecated
     public RPGHandler getRPG() {
-        return rpgPlugin;
+        return getMainRPG();
+    }
+
+    @Nullable
+    public RPGHandler getMainRPG() {
+        Validate.isTrue(!rpgPlugins.isEmpty(), "No RPG plugin was found");
+        return rpgPlugins.get(0);
+    }
+
+    public List<RPGHandler> getRPGs() {
+        return rpgPlugins;
     }
 
     /**
@@ -306,21 +319,38 @@ public class MMOItems extends JavaPlugin {
      * provider in the main plugin config. If it can't be found, it will look for RPG
      * plugins in the installed plugin list.
      */
-    public void findRpgPlugin() {
+    public void findRpgPlugins() {
-        if (rpgPlugin != null) return;
+        Validate.isTrue(rpgPlugins.isEmpty(), "RPG hooks have already been computed");
 
-        // Preferred rpg provider
+        // Default hook
-        String preferred = plugin.getConfig().getString("preferred-rpg-provider", null);
+        rpgPlugins.add(new DefaultHook());
-        if (preferred != null && setRPG(RPGHandler.PluginEnum.valueOf(preferred.toUpperCase())))
+
-            return;
+        // Find preferred provider
+        final @NotNull String preferredName = plugin.getConfig().getString("preferred-rpg-provider");
 
         // Look through installed plugins
-        for (RPGHandler.PluginEnum pluginEnum : RPGHandler.PluginEnum.values())
+        for (RPGHandler.PluginEnum enumPlugin : RPGHandler.PluginEnum.values())
-            if (Bukkit.getPluginManager().getPlugin(pluginEnum.getName()) != null && setRPG(pluginEnum))
+            if (Bukkit.getPluginManager().getPlugin(enumPlugin.getName()) != null)
-                return;
+                try {
+                    final RPGHandler handler = enumPlugin.load();
+                    rpgPlugins.add(handler);
+                    getLogger().log(Level.INFO, "Hooked onto " + enumPlugin.getName());
 
-        // Just use the default
+                    // Register as main RPG plugin
-        setRPG(new DefaultHook());
+                    if (preferredName.equalsIgnoreCase(enumPlugin.name())) {
+                        Collections.swap(rpgPlugins, 0, rpgPlugins.size() - 1);
+                        getLogger().log(Level.INFO, "Now using " + enumPlugin.getName() + " as RPG core plugin");
+                    }
+
+                } catch (Exception exception) {
+                    MMOItems.plugin.getLogger().log(Level.WARNING, "Could not initialize RPG plugin compatibility with " + enumPlugin.getName() + ":");
+                    exception.printStackTrace();
+                }
+
+        // Register listener for preferred provider
+        final @NotNull RPGHandler preferred = rpgPlugins.get(0);
+        if (rpgPlugins.get(0) instanceof Listener)
+            Bukkit.getPluginManager().registerEvents((Listener) preferred, this);
     }
 
     /**
@@ -330,14 +360,14 @@ public class MMOItems extends JavaPlugin {
      *
      * @param handler Your RPGHandler instance
      */
-    public void setRPG(RPGHandler handler) {
+    public void setRPG(@NotNull RPGHandler handler) {
         Validate.notNull(handler, "RPGHandler cannot be null");
 
-        // Unregister events from current RPGPlugin instance
+        // Unregister old events
-        if (rpgPlugin != null && rpgPlugin instanceof Listener && isEnabled())
+        if (getMainRPG() instanceof Listener && isEnabled())
-            HandlerList.unregisterAll((Listener) rpgPlugin);
+            HandlerList.unregisterAll((Plugin) getMainRPG());
 
-        rpgPlugin = handler;
+        rpgPlugins.add(0, handler);
         getLogger().log(Level.INFO, "Now using " + handler.getClass().getSimpleName() + " as RPG provider");
 
         // Register new events
@@ -345,25 +375,6 @@ public class MMOItems extends JavaPlugin {
             Bukkit.getPluginManager().registerEvents((Listener) handler, this);
     }
 
-    /**
-     * @param potentialPlugin Some plugin that the user wants compatibility with
-     * @return If it worked
-     */
-    public boolean setRPG(RPGHandler.PluginEnum potentialPlugin) {
-
-        try {
-            Validate.notNull(Bukkit.getPluginManager().getPlugin(potentialPlugin.getName()), "Plugin is not installed");
-            setRPG(potentialPlugin.load());
-            return true;
-
-            // Some loading issue
-        } catch (Exception exception) {
-            MMOItems.plugin.getLogger().log(Level.WARNING, "Could not initialize RPG plugin compatibility with " + potentialPlugin.getName() + ":");
-            exception.printStackTrace();
-            return false;
-        }
-    }
-
     public PluginUpdateManager getUpdates() {
         return pluginUpdateManager;
     }

MMOItems-API/src/main/java/net/Indyuce/mmoitems/api/player/PlayerData.java

@@ -63,7 +63,7 @@ public class PlayerData {
 
     private PlayerData(@NotNull MMOPlayerData mmoData) {
         this.mmoData = mmoData;
-        rpgPlayer = MMOItems.plugin.getRPG().getInfo(this);
+        rpgPlayer = MMOItems.plugin.getMainRPG().getInfo(this);
         stats = new PlayerStats(this);
 
         load(new ConfigFile("/userdata", getUniqueId().toString()).getConfig());
@@ -305,7 +305,7 @@ public class PlayerData {
         stats.updateStats();
 
         // Update stats from external plugins
-        MMOItems.plugin.getRPG().refreshStats(this);
+        MMOItems.plugin.getRPGs().forEach(rpg -> rpg.refreshStats(this));
 
         // Actually update cached player inventory so the task doesn't infinitely loop
         inventory.helmet = getPlayer().getInventory().getHelmet();
@@ -443,6 +443,7 @@ public class PlayerData {
      * Called when the corresponding MMOPlayerData has already been initialized.
      */
     public static PlayerData load(@NotNull UUID player) {
+
         /*
          * Double check they are online, for some reason even if this is fired
          * from the join event the player can be offline if they left in the
@@ -460,7 +461,7 @@ public class PlayerData {
          * data of other rpg plugins
          */
         PlayerData playerData = data.get(player);
-        playerData.rpgPlayer = MMOItems.plugin.getRPG().getInfo(playerData);
+        playerData.rpgPlayer = MMOItems.plugin.getMainRPG().getInfo(playerData);
         return playerData;
     }
 

MMOItems-API/src/main/java/net/Indyuce/mmoitems/comp/rpg/AureliumSkillsHook.java

@@ -32,7 +32,6 @@ public class AureliumSkillsHook implements RPGHandler, Listener {
 
     private final Map<Stats, ItemStat> statExtra = new HashMap<>();
 
-
     public AureliumSkillsHook() {
         aSkills = (AureliumSkills) Bukkit.getPluginManager().getPlugin("AureliumSkills");
 

MMOItems-API/src/main/java/net/Indyuce/mmoitems/comp/rpg/ProSkillAPIHook.java

@@ -11,7 +11,9 @@ import io.lumine.mythic.lib.damage.AttackHandler;
 import io.lumine.mythic.lib.damage.AttackMetadata;
 import io.lumine.mythic.lib.damage.DamageMetadata;
 import io.lumine.mythic.lib.damage.DamageType;
+import net.Indyuce.mmoitems.MMOItems;
 import net.Indyuce.mmoitems.api.player.RPGPlayer;
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -28,6 +30,7 @@ public class ProSkillAPIHook implements RPGHandler, Listener, AttackHandler {
 
     public ProSkillAPIHook() {
         MythicLib.plugin.getDamage().registerHandler(this);
+        Bukkit.getPluginManager().registerEvents(new InnerListener(), MMOItems.plugin);
     }
 
     @Override
@@ -41,6 +44,8 @@ public class ProSkillAPIHook implements RPGHandler, Listener, AttackHandler {
         return damageInfo.get(event.getEntity().getEntityId());
     }
 
+    class InnerListener implements Listener {
+
         @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
         public void a(SkillDamageEvent event) {
             if (!(event.getDamager() instanceof Player))
@@ -55,6 +60,7 @@ public class ProSkillAPIHook implements RPGHandler, Listener, AttackHandler {
         public void c(EntityDamageByEntityEvent event) {
             damageInfo.remove(event.getEntity().getEntityId());
         }
+    }
 
     @EventHandler
     public void b(PlayerLevelUpEvent event) {

MMOItems-API/src/main/java/net/Indyuce/mmoitems/comp/rpg/SkillAPIHook.java

@@ -11,7 +11,9 @@ import io.lumine.mythic.lib.damage.AttackHandler;
 import io.lumine.mythic.lib.damage.AttackMetadata;
 import io.lumine.mythic.lib.damage.DamageMetadata;
 import io.lumine.mythic.lib.damage.DamageType;
+import net.Indyuce.mmoitems.MMOItems;
 import net.Indyuce.mmoitems.api.player.RPGPlayer;
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -23,11 +25,12 @@ import org.jetbrains.annotations.Nullable;
 import java.util.HashMap;
 import java.util.Map;
 
-public class SkillAPIHook implements RPGHandler, Listener, AttackHandler {
+public class SkillAPIHook implements RPGHandler, AttackHandler {
     private final Map<Integer, AttackMetadata> damageInfo = new HashMap<>();
 
     public SkillAPIHook() {
         MythicLib.plugin.getDamage().registerHandler(this);
+        Bukkit.getPluginManager().registerEvents(new InnerListener(), MMOItems.plugin);
     }
 
     @Override
@@ -41,6 +44,8 @@ public class SkillAPIHook implements RPGHandler, Listener, AttackHandler {
         return damageInfo.get(event.getEntity().getEntityId());
     }
 
+    class InnerListener implements Listener {
+
         @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
         public void a(SkillDamageEvent event) {
             if (!(event.getDamager() instanceof Player))
@@ -52,9 +57,10 @@ public class SkillAPIHook implements RPGHandler, Listener, AttackHandler {
         }
 
         @EventHandler(priority = EventPriority.MONITOR)
-    public void c(EntityDamageByEntityEvent event) {
+        public void b(EntityDamageByEntityEvent event) {
             damageInfo.remove(event.getEntity().getEntityId());
         }
+    }
 
     @EventHandler
     public void b(PlayerLevelUpEvent event) {

MMOItems-Dist/src/main/resources/config.yml

@@ -15,6 +15,23 @@ iterate-whole-inventory: false
 # When this is set to true, skins can only be applied to an item ONCE. 
 locked-skins: true
 
+# Since 6.9.3 dev builds, MMOItems supports the use of multiple
+# RPG core plugins at the same time. However, MMOItems needs one
+# specific plugin to hook onto level, class, etc.
+#
+# Available plugins:
+# - MMOCORE (level, class, mana, stamina)
+# - HEROES (level, class, mana, stamina)
+# - SKILLAPI or PROSKILLAPI (level, class, mana)
+# - RPGPLAYERLEVELING (level, mana, power)
+# - RACESANDCLASSES (level, class, mana)
+# - BATTLELEVELS (level)
+# - MCMMO (power level)
+# - MCRPG (power level)
+# - SKILLS or SKILLSPRO (class, level, mana)
+# - AURELIUM_SKILLS (power level, mana)
+preferred-rpg-provider: MMOCORE
+
 # By default, all player inventories will be updated every
 # 10 ticks which corresponds to 2 inventory updates a second.
 inventory-update-delay: 10
@@ -381,6 +398,3 @@ gem-upgrade-default: 'NEVER'
 # This option allows you to disable the ability to
 # use MMOItems that have been removed from your config.
 disable-removed-items: true
-
-# When I was a kid, I saw the Mona Lisa in my school art book...
-# The fist time I saw her, with her hands on her knee... how do I say this...