3.0.0-SNAPSHOT-U20

Updated plugin to support Minecraft 1.13. Added bStats to use as the data tracking for the plugin. Continued to work on improving the Panel system. TODO: Make a seperate jar which supports Minecraft 1.8.
2025-02-23 06:01:51 +01:00 · 2018-08-06 22:02:58 +08:00 · 2018-08-06 22:02:58 +08:00 · d175810c89
commit d175810c89
parent 39c2cf12ec
24 changed files with 125 additions and 46 deletions
--- a/.idea/libraries/Maven__com_spigotmc_spigot_1_12_1.xml
+++ b/.idea/libraries/Maven__com_spigotmc_spigot_1_12_1.xml
@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: com.spigotmc:spigot:1.12.1">
+  <library name="Maven: com.spigotmc:spigot:1.13">
    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/spigotmc/spigot/1.12.1/spigot-1.12.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/spigotmc/spigot/1.13/spigot-1.13.jar!/" />
    </CLASSES>
    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/spigotmc/spigot/1.12.1/spigot-1.12.1-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/spigotmc/spigot/1.13/spigot-1.13-javadoc.jar!/" />
    </JAVADOC>
    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/spigotmc/spigot/1.12.1/spigot-1.12.1-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/spigotmc/spigot/1.13/spigot-1.13-sources.jar!/" />
    </SOURCES>
  </library>
 </component>
--- a/.idea/libraries/Maven__org_bstats_bstats_bukkit_1_2.xml
+++ b/.idea/libraries/Maven__org_bstats_bstats_bukkit_1_2.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.bstats:bstats-bukkit:1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/bstats/bstats-bukkit/1.2/bstats-bukkit-1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/bstats/bstats-bukkit/1.2/bstats-bukkit-1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/bstats/bstats-bukkit/1.2/bstats-bukkit-1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/api-modules/FactionsM/FactionsM.iml
+++ b/api-modules/FactionsM/FactionsM.iml
@ -12,7 +12,7 @@
    <orderEntry type="module" module-name="FactionHelper" scope="PROVIDED" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: com.massivecraft.factions:Factions:2.9.1-SNAPSHOT" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: com.massivecraft.massivecore:MassiveCore:2.9.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.spigotmc:spigot:1.12.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.spigotmc:spigot:1.13" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: net.milkbowl.vault:VaultAPI:1.6" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.9-R0.1-SNAPSHOT" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
@ -33,5 +33,6 @@
    <orderEntry type="library" scope="PROVIDED" name="Maven: rhino:js:1.7R2" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:10.0.1" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.22" level="project" />
+    <orderEntry type="library" name="Maven: org.bstats:bstats-bukkit:1.2" level="project" />
  </component>
 </module>
--- a/api-modules/FactionsOne/FactionsOne.iml
+++ b/api-modules/FactionsOne/FactionsOne.iml
@ -11,7 +11,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="FactionHelper" scope="PROVIDED" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: com.massivecraft:FactionsOne:1.2.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.spigotmc:spigot:1.12.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.spigotmc:spigot:1.13" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: net.milkbowl.vault:VaultAPI:1.6" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.9-R0.1-SNAPSHOT" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
@ -32,5 +32,6 @@
    <orderEntry type="library" scope="PROVIDED" name="Maven: rhino:js:1.7R2" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:10.0.1" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.22" level="project" />
+    <orderEntry type="library" name="Maven: org.bstats:bstats-bukkit:1.2" level="project" />
  </component>
 </module>
--- a/api-modules/FactionsUUID/FactionsUUID.iml
+++ b/api-modules/FactionsUUID/FactionsUUID.iml
@ -11,7 +11,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="FactionHelper" scope="PROVIDED" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: com.massivecraft.factions:FactionsUUID:1.6.9.5-U0.1.21" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.spigotmc:spigot:1.12.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.spigotmc:spigot:1.13" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: net.milkbowl.vault:VaultAPI:1.6" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.9-R0.1-SNAPSHOT" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
@ -32,5 +32,6 @@
    <orderEntry type="library" scope="PROVIDED" name="Maven: rhino:js:1.7R2" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:10.0.1" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.22" level="project" />
+    <orderEntry type="library" name="Maven: org.bstats:bstats-bukkit:1.2" level="project" />
  </component>
 </module>
--- a/api-modules/LegacyFactions/LegacyFactions.iml
+++ b/api-modules/LegacyFactions/LegacyFactions.iml
@ -11,7 +11,7 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="FactionHelper" scope="PROVIDED" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: net.redstoneore.legacyfactions:LegacyFactions:1.4.7" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.spigotmc:spigot:1.12.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.spigotmc:spigot:1.13" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: net.milkbowl.vault:VaultAPI:1.6" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.9-R0.1-SNAPSHOT" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
@ -32,5 +32,6 @@
    <orderEntry type="library" scope="PROVIDED" name="Maven: rhino:js:1.7R2" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:10.0.1" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.22" level="project" />
+    <orderEntry type="library" name="Maven: org.bstats:bstats-bukkit:1.2" level="project" />
  </component>
 </module>
--- a/custombosses.iml
+++ b/custombosses.iml
@ -9,7 +9,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.spigotmc:spigot:1.12.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.spigotmc:spigot:1.13" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: net.milkbowl.vault:VaultAPI:1.6" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.9-R0.1-SNAPSHOT" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
@ -30,5 +30,6 @@
    <orderEntry type="library" scope="PROVIDED" name="Maven: rhino:js:1.7R2" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:10.0.1" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.22" level="project" />
+    <orderEntry type="library" name="Maven: org.bstats:bstats-bukkit:1.2" level="project" />
  </component>
 </module>
--- a/plugin-modules/Core/Core.iml
+++ b/plugin-modules/Core/Core.iml
@ -17,7 +17,7 @@
    <orderEntry type="module" module-name="FactionsOne" />
    <orderEntry type="module" module-name="FactionsUUID" />
    <orderEntry type="module" module-name="LegacyFactions" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.spigotmc:spigot:1.12.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.spigotmc:spigot:1.13" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: net.milkbowl.vault:VaultAPI:1.6" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.9-R0.1-SNAPSHOT" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
@ -38,5 +38,6 @@
    <orderEntry type="library" scope="PROVIDED" name="Maven: rhino:js:1.7R2" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:10.0.1" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.22" level="project" />
+    <orderEntry type="library" name="Maven: org.bstats:bstats-bukkit:1.2" level="project" />
  </component>
 </module>
--- a/plugin-modules/Core/pom.xml
+++ b/plugin-modules/Core/pom.xml
@ -58,7 +58,15 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-shade-plugin</artifactId>
-                <version>1.4</version>
+                <version>3.1.0</version>
+                <configuration>
+                    <relocations>
+                        <relocation>
+                            <pattern>org.bstats</pattern>
+                            <shadedPattern>net.aminecraftdev.custombosses.utils.bstats</shadedPattern>
+                        </relocation>
+                    </relocations>
+                </configuration>
                <executions>
                    <execution>
                        <phase>package</phase>
--- a/plugin-modules/Core/src/net/aminecraftdev/custombosses/CustomBosses.java
+++ b/plugin-modules/Core/src/net/aminecraftdev/custombosses/CustomBosses.java
@ -8,6 +8,7 @@ import net.aminecraftdev.custombosses.managers.files.BossItemFileManager;
 import net.aminecraftdev.custombosses.managers.BossMechanicManager;
 import net.aminecraftdev.custombosses.managers.files.BossesFileManager;
 import net.aminecraftdev.custombosses.utils.IReloadable;
+import org.bstats.bukkit.Metrics;
 import org.bukkit.plugin.java.JavaPlugin;

 /**
@ -24,14 +25,26 @@ public class CustomBosses extends JavaPlugin implements IReloadable {

    @Override
    public void onEnable() {
+        final long startMs = System.currentTimeMillis();
+        long beginMs = System.currentTimeMillis();
+
        new BossAPI(this);
+        new Metrics(this);
+
+        System.out.println("Boss API loaded (took " + (System.currentTimeMillis() - beginMs) + "ms)");
+        beginMs = System.currentTimeMillis();

        this.bossEntityContainer = new BossEntityContainer();
        this.itemStackManager = new BossItemFileManager(this);
        this.bossesFileManager = new BossesFileManager(this);
        this.bossMechanicManager = new BossMechanicManager(this);

+        System.out.println("Managers and Containers loaded (took " + (System.currentTimeMillis() - beginMs) + "ms)");
+        beginMs = System.currentTimeMillis();
+
        reload();
+
+        System.out.println("Reloaded all fields (took " + (System.currentTimeMillis() - beginMs) + "ms) and plugin is now loaded. Took a total of " + (System.currentTimeMillis() - startMs) + "ms.");
    }


--- a/plugin-modules/Core/src/net/aminecraftdev/custombosses/api/BossAPI.java
+++ b/plugin-modules/Core/src/net/aminecraftdev/custombosses/api/BossAPI.java
@ -5,11 +5,13 @@ import net.aminecraftdev.custombosses.entity.BossEntity;
 import net.aminecraftdev.custombosses.entity.elements.*;
 import net.aminecraftdev.custombosses.utils.Debug;
 import net.aminecraftdev.custombosses.utils.EntityFinder;
+import net.aminecraftdev.custombosses.utils.panel.Panel;
 import net.aminecraftdev.custombosses.utils.potion.holder.PotionEffectHolder;

 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;

 /**
 * @author Charles Cullen
@ -38,6 +40,24 @@ public class BossAPI {
        }

        PLUGIN = plugin;
+        Panel.setPlugin(plugin);
+    }
+
+    /**
+     * Used to get the Boss configuration section name
+     * from a BossEntity instance.
+     *
+     * @param bossEntity - the boss Entity instance
+     * @return name of the boss from the BossContainer or null if not found.
+     */
+    public static String getBossEntityName(BossEntity bossEntity) {
+        for(Map.Entry<String, BossEntity> entry : PLUGIN.getBossEntityContainer().getData().entrySet()) {
+            if(entry.getValue().equals(bossEntity)) {
+                return entry.getKey();
+            }
+        }
+
+        return null;
    }

    /**
--- a/plugin-modules/Core/src/net/aminecraftdev/custombosses/mechanics/EntityTypeMechanic.java
+++ b/plugin-modules/Core/src/net/aminecraftdev/custombosses/mechanics/EntityTypeMechanic.java
@ -1,12 +1,17 @@
 package net.aminecraftdev.custombosses.mechanics;

+import net.aminecraftdev.custombosses.api.BossAPI;
+import net.aminecraftdev.custombosses.container.BossEntityContainer;
 import net.aminecraftdev.custombosses.entity.BossEntity;
 import net.aminecraftdev.custombosses.entity.elements.MainStatsElement;
 import net.aminecraftdev.custombosses.holder.ActiveBossHolder;
+import net.aminecraftdev.custombosses.utils.Debug;
 import net.aminecraftdev.custombosses.utils.EntityFinder;
 import net.aminecraftdev.custombosses.utils.IMechanic;
 import org.bukkit.entity.LivingEntity;

+import java.util.Map;
+
 /**
 * @author Charles Cullen
 * @version 1.0.0
@ -30,6 +35,18 @@ public class EntityTypeMechanic implements IMechanic {
            if(livingEntity == null) return false;

            activeBossHolder.setLivingEntity(position, livingEntity);
+
+            if(position > 1) {
+                int lowerPosition = position - 1;
+                LivingEntity lowerLivingEntity = activeBossHolder.getLivingEntityMap().getOrDefault(lowerPosition, null);
+
+                if(lowerLivingEntity == null) {
+                    Debug.FAILED_ATTEMPT_TO_STACK_BOSSES.debug(BossAPI.getBossEntityName(bossEntity));
+                    return false;
+                }
+
+                lowerLivingEntity.setPassenger(livingEntity);
+            }
        }

        return true;
--- a/plugin-modules/Core/src/net/aminecraftdev/custombosses/mechanics/HealthMechanic.java
+++ b/plugin-modules/Core/src/net/aminecraftdev/custombosses/mechanics/HealthMechanic.java
@ -16,11 +16,12 @@ public class HealthMechanic implements IMechanic {

    @Override
    public boolean applyMechanic(BossEntity bossEntity, ActiveBossHolder activeBossHolder) {
-        if(activeBossHolder.getLivingEntity() == null) return false;
+        if(activeBossHolder.getLivingEntityMap().getOrDefault(0, null) == null) return false;
+        if(bossEntity.getMainStats().isEmpty() || bossEntity.getMainStats().get(0) == null) return false;

-        LivingEntity livingEntity = activeBossHolder.getLivingEntity();
+        LivingEntity livingEntity = activeBossHolder.getLivingEntityMap().getOrDefault(0, null);
        double maxHealthSetting = (double) SpigotYmlReader.get().getObject("settings.attribute.maxHealth.max");
-        double maxHealth = bossEntity.getMainStats().getHealth();
+        double maxHealth = bossEntity.getMainStats().get(0).getHealth();

        if(maxHealth > maxHealthSetting) {
            Debug.MAX_HEALTH.debug(maxHealthSetting);
--- a/plugin-modules/Core/src/net/aminecraftdev/custombosses/mechanics/NameMechanic.java
+++ b/plugin-modules/Core/src/net/aminecraftdev/custombosses/mechanics/NameMechanic.java
@ -15,11 +15,12 @@ public class NameMechanic implements IMechanic {

    @Override
    public boolean applyMechanic(BossEntity bossEntity, ActiveBossHolder activeBossHolder) {
-        if(activeBossHolder.getLivingEntity() == null) return false;
+        if(activeBossHolder.getLivingEntityMap().getOrDefault(0, null) == null) return false;
+        if(bossEntity.getMainStats().isEmpty() || bossEntity.getMainStats().get(0) == null) return false;

-        LivingEntity livingEntity = activeBossHolder.getLivingEntity();
+        LivingEntity livingEntity = activeBossHolder.getLivingEntityMap().getOrDefault(0, null);

-        String customName = bossEntity.getMainStats().getDisplayName();
+        String customName = bossEntity.getMainStats().get(0).getDisplayName();

        if(customName != null) {
            livingEntity.setCustomName(StringUtils.get().translateColor(customName));
--- a/plugin-modules/Core/src/net/aminecraftdev/custombosses/mechanics/PotionMechanic.java
+++ b/plugin-modules/Core/src/net/aminecraftdev/custombosses/mechanics/PotionMechanic.java
@ -24,9 +24,9 @@ public class PotionMechanic implements IMechanic {

    @Override
    public boolean applyMechanic(BossEntity bossEntity, ActiveBossHolder activeBossHolder) {
-        if(activeBossHolder.getLivingEntity() == null) return false;
+        if(activeBossHolder.getLivingEntityMap().getOrDefault(0, null) == null) return false;

-        LivingEntity livingEntity = activeBossHolder.getLivingEntity();
+        LivingEntity livingEntity = activeBossHolder.getLivingEntityMap().getOrDefault(0, null);
        List<PotionEffectHolder> potionElements = bossEntity.getPotions();

        if(potionElements != null && !potionElements.isEmpty()) {
--- a/plugin-modules/Core/src/net/aminecraftdev/custombosses/mechanics/SettingsMechanic.java
+++ b/plugin-modules/Core/src/net/aminecraftdev/custombosses/mechanics/SettingsMechanic.java
@ -25,9 +25,9 @@ public class SettingsMechanic implements IMechanic {

    @Override
    public boolean applyMechanic(BossEntity bossEntity, ActiveBossHolder activeBossHolder) {
-        if(activeBossHolder.getLivingEntity() == null) return false;
+        if(activeBossHolder.getLivingEntityMap().getOrDefault(0, null) == null) return false;

-        LivingEntity livingEntity = activeBossHolder.getLivingEntity();
+        LivingEntity livingEntity = activeBossHolder.getLivingEntityMap().getOrDefault(0, null);
        EntityEquipment entityEquipment = livingEntity.getEquipment();

        livingEntity.setRemoveWhenFarAway(false);
--- a/plugin-modules/Core/src/net/aminecraftdev/custombosses/utils/Debug.java
+++ b/plugin-modules/Core/src/net/aminecraftdev/custombosses/utils/Debug.java
@ -16,7 +16,8 @@ public enum Debug {

    ATTEMPTED_TO_UPDATE_PLUGIN("Something has attempted to update the PLUGIN variable in the BossAPI class while it is already initialized."),
    ATTEMPTED_TO_SPAWN_WHILE_DISABLED("The {0} boss/minion attempted to spawn while editing is enabled."),
-    FAILED_ATTEMPT_TO_SPAWN_BOSS("A boss has attempted to spawn but cannot spawn for the following reason: \n{0}");
+    FAILED_ATTEMPT_TO_SPAWN_BOSS("A boss has attempted to spawn but cannot spawn for the following reason: \n{0}"),
+    FAILED_ATTEMPT_TO_STACK_BOSSES("A boss has failed to stack on top of another boss under the {0} boss configuration.");

    private String message;

--- a/plugin-modules/Core/src/net/aminecraftdev/custombosses/utils/EnchantFinder.java
+++ b/plugin-modules/Core/src/net/aminecraftdev/custombosses/utils/EnchantFinder.java
@ -22,15 +22,15 @@ public enum EnchantFinder {
    aqua_affinity("Aqua Affinity", Enchantment.WATER_WORKER, "water_worker", "water worker", "aquaaffinity", "aqua_affinity", "aqua affinity"),
    thorns("Thorns", Enchantment.THORNS, "thorns"),
    depth_strider("Depth Strider", Enchantment.DEPTH_STRIDER, "depth_strider", "depth strider"),
-    frost_walker("Frost Walker", Enchantment.getById(9), "frost_walker", "frost walker"),
-    binding_curse("Curse of Binding", Enchantment.getById(10), "binding_curse", "binding curse", "curse"),
+    frost_walker("Frost Walker", Enchantment.FROST_WALKER, "frost_walker", "frost walker"),
+    binding_curse("Curse of Binding", Enchantment.BINDING_CURSE, "binding_curse", "binding curse", "curse"),
    sharpness("Sharpness", Enchantment.DAMAGE_ALL, "sharpness", "damage", "damage all", "damage_all"),
    smite("Smite", Enchantment.DAMAGE_UNDEAD, "smite", "damage_undead", "damage undead"),
    bane_of_arthropods("Bane of Arthropods", Enchantment.DAMAGE_ARTHROPODS, "damage_arthropods", "arthropods", "bane_of_arthropods", "bane of arthropods"),
    knockback("Knockback", Enchantment.KNOCKBACK, "knockback"),
    fire_aspect("Fire Aspect", Enchantment.FIRE_ASPECT, "fire aspect", "fire_aspect", "fireaspect"),
    looting("Looting", Enchantment.LOOT_BONUS_MOBS, "looting", "loot bonus mobs", "loot_bonus_mobs"),
-    sweeping_edge("Sweeping Edge", Enchantment.getById(22), "sweeping edge", "sweeping_edge"),
+    sweeping_edge("Sweeping Edge", Enchantment.SWEEPING_EDGE, "sweeping edge", "sweeping_edge"),
    efficiency("Efficiency", Enchantment.DIG_SPEED, "efficiency", "dig speed", "dig_speed", "digspeed"),
    silk_touch("Silk Touch", Enchantment.SILK_TOUCH, "silk touch", "silk_touch", "silktouch", "silk"),
    unbreaking("Unbreaking", Enchantment.DURABILITY, "durability", "unbreaking"),
@ -41,8 +41,8 @@ public enum EnchantFinder {
    infinite("Infinite", Enchantment.ARROW_INFINITE, "infinite", "arrow_infinite", "arrow infinite"),
    luck("Luck", Enchantment.LUCK, "luck"),
    lure("Lure", Enchantment.LURE, "lure"),
-    mending("Mending", Enchantment.getById(70), "mending"),
-    curse_of_vanishing("Curse of Vanishing", Enchantment.getById(71), "vanishing", "vanishing curse", "vanishing_curse", "curseofvanishing", "vanishingcurse", "curse of vanishing", "curse_of_vanishing");
+    mending("Mending", Enchantment.MENDING, "mending"),
+    curse_of_vanishing("Curse of Vanishing", Enchantment.VANISHING_CURSE, "vanishing", "vanishing curse", "vanishing_curse", "curseofvanishing", "vanishingcurse", "curse of vanishing", "curse_of_vanishing");

    private Enchantment enchantment;
    private String fancyName;
--- a/plugin-modules/Core/src/net/aminecraftdev/custombosses/utils/Versions.java
+++ b/plugin-modules/Core/src/net/aminecraftdev/custombosses/utils/Versions.java
@ -18,7 +18,8 @@ public enum Versions {
    v1_9_R2(7, "1.9.4"),
    v1_10_R1(8, "1.10"),
    v1_11_R1(9, "1.11.2"),
-    v1_12_R1(10, "1.12.1");
+    v1_12_R1(10, "1.12.1"),
+    v1_13_R1(11, "1.13");

    @Getter private String displayVersion, bukkitVersion;
    private int weight;
--- a/plugin-modules/Core/src/net/aminecraftdev/custombosses/utils/itemstack/ItemStackUtils.java
+++ b/plugin-modules/Core/src/net/aminecraftdev/custombosses/utils/itemstack/ItemStackUtils.java
@ -169,7 +169,7 @@ public class ItemStackUtils {
            itemStack.setDurability(dura);
        }

-        if(configurationSection.contains("owner") && itemStack.getType() == Material.SKULL_ITEM) {
+        if(configurationSection.contains("owner") && itemStack.getType() == Material.LEGACY_SKULL_ITEM) {
            SkullMeta skullMeta = (SkullMeta) itemStack.getItemMeta();

            skullMeta.setOwner(owner);
@ -185,15 +185,11 @@ public class ItemStackUtils {

        if(material == null) {
            if(NumberUtils.get().isInt(string)) {
-                material = Material.getMaterial(Integer.valueOf(string));
-
-                if(material != null) return material;
-
                return null;
            } else {
                String[] split = string.split(":");

-                material = Material.getMaterial(Integer.valueOf(split[0]));
+                material = Material.getMaterial(split[0]);

                if(material != null) return material;

--- a/plugin-modules/Core/src/net/aminecraftdev/custombosses/utils/itemstack/converters/MaterialConverter.java
+++ b/plugin-modules/Core/src/net/aminecraftdev/custombosses/utils/itemstack/converters/MaterialConverter.java
@ -18,18 +18,10 @@ public class MaterialConverter implements IConverter<String, Material> {

    @Override
    public Material from(String input) {
-        if(NumberUtils.get().isInt(input)) {
-            return Material.getMaterial(Integer.parseInt(input));
-        }
-
        if(input.contains(":")) {
            String[] split = input.split(":");

            input = split[0];
-
-            if(NumberUtils.get().isInt(input)) {
-                return Material.getMaterial(Integer.parseInt(input));
-            }
        }

        return Material.matchMaterial(input);
--- a/plugin-modules/Core/src/net/aminecraftdev/custombosses/utils/panel/Panel.java
+++ b/plugin-modules/Core/src/net/aminecraftdev/custombosses/utils/panel/Panel.java
@ -5,7 +5,6 @@ import net.aminecraftdev.custombosses.utils.StringUtils;
 import net.aminecraftdev.custombosses.utils.panel.base.ClickAction;
 import net.aminecraftdev.custombosses.utils.panel.base.PageAction;
 import net.aminecraftdev.custombosses.utils.panel.base.PanelCloseAction;
-import net.aminecraftdev.custombosses.utils.panel.builder.PanelBuilderCounter;
 import net.aminecraftdev.custombosses.utils.panel.builder.PanelBuilderSettings;
 import org.bukkit.Bukkit;
 import org.bukkit.Sound;
--- a/plugin-modules/FactionHelper/FactionHelper.iml
+++ b/plugin-modules/FactionHelper/FactionHelper.iml
@ -9,7 +9,7 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.spigotmc:spigot:1.12.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.spigotmc:spigot:1.13" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: net.milkbowl.vault:VaultAPI:1.6" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.9-R0.1-SNAPSHOT" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
@ -30,5 +30,6 @@
    <orderEntry type="library" scope="PROVIDED" name="Maven: rhino:js:1.7R2" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:10.0.1" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.22" level="project" />
+    <orderEntry type="library" name="Maven: org.bstats:bstats-bukkit:1.2" level="project" />
  </component>
 </module>
--- a/pom.xml
+++ b/pom.xml
@ -19,7 +19,7 @@
    </modules>

    <properties>
-        <plugin.version>3.0.0-SNAPSHOT-U19</plugin.version>
+        <plugin.version>3.0.0-SNAPSHOT-U20</plugin.version>
        <plugin.name>CustomBosses</plugin.name>
        <plugin.main>net.aminecraftdev.custombosses.CustomBosses</plugin.main>
        <plugin.author>AMinecraftDev</plugin.author>
@ -29,7 +29,7 @@
        <dependency>
            <groupId>com.spigotmc</groupId>
            <artifactId>spigot</artifactId>
-            <version>1.12.1</version>
+            <version>1.13</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
@ -56,6 +56,12 @@
            <version>1.16.22</version>
            <scope>provided</scope>
        </dependency>
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-bukkit</artifactId>
+            <version>1.2</version>
+            <scope>compile</scope>
+        </dependency>
    </dependencies>

    <repositories>
@ -63,6 +69,10 @@
            <id>vault-repo</id>
            <url>http://nexus.hc.to/content/repositories/pub_releases</url>
        </repository>
+        <repository>
+            <id>bstats-repo</id>
+            <url>http://repo.bstats.org/content/repositories/releases/</url>
+        </repository>
    </repositories>

    <build>