Updated Bukkit dependency to 1.13

Now the plugin supports 1.13 and 1.14

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sacredlabyrinth.phaed.simpleclans</groupId>
     <artifactId>SimpleClans</artifactId>
-    <version>2.7.23</version>
+    <version>2.7.24</version>
     <name>SimpleClans</name>
     <url>http://dev.bukkit.org/server-mods/simpleclans/</url>
 
@@ -61,19 +61,13 @@
         <dependency>
             <groupId>com.destroystokyo.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.12.2-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <version>1.12-R0.1-SNAPSHOT</version>
+            <version>1.13.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.milkbowl.vault</groupId>
             <artifactId>VaultAPI</artifactId>
-            <version>1.6</version>
+            <version>1.7</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -89,10 +83,6 @@
             <id>vault-repo</id>
             <url>http://nexus.hc.to/content/repositories/pub_releases</url>
         </repository>
-        <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-        </repository>
         <repository>
             <id>paper-repo</id>
             <url>https://repo.destroystokyo.com/repository/maven-public/</url>

src/main/java/net/sacredlabyrinth/phaed/simpleclans/managers/ClanManager.java

@@ -554,7 +554,7 @@ public final class ClanManager {
                 out += ChatColor.WHITE + plugin.getLang("armor.h");
             } else if (h.getType().equals(Material.DIAMOND_HELMET)) {
                 out += ChatColor.AQUA + plugin.getLang("armor.h");
-            } else if (h.getType().equals(Material.GOLD_HELMET)) {
+            } else if (h.getType().equals(Material.GOLDEN_HELMET)) {
                 out += ChatColor.YELLOW + plugin.getLang("armor.h");
             } else if (h.getType().equals(Material.IRON_HELMET)) {
                 out += ChatColor.GRAY + plugin.getLang("armor.h");
@@ -573,7 +573,7 @@ public final class ClanManager {
                 out += ChatColor.WHITE + plugin.getLang("armor.c");
             } else if (c.getType().equals(Material.DIAMOND_CHESTPLATE)) {
                 out += ChatColor.AQUA + plugin.getLang("armor.c");
-            } else if (c.getType().equals(Material.GOLD_CHESTPLATE)) {
+            } else if (c.getType().equals(Material.GOLDEN_CHESTPLATE)) {
                 out += ChatColor.YELLOW + plugin.getLang("armor.c");
             } else if (c.getType().equals(Material.IRON_CHESTPLATE)) {
                 out += ChatColor.GRAY + plugin.getLang("armor.c");
@@ -592,7 +592,7 @@ public final class ClanManager {
                 out += ChatColor.WHITE + plugin.getLang("armor.l");
             } else if (l.getType().equals(Material.DIAMOND_LEGGINGS)) {
                 out += plugin.getLang("armor.l");
-            } else if (l.getType().equals(Material.GOLD_LEGGINGS)) {
+            } else if (l.getType().equals(Material.GOLDEN_LEGGINGS)) {
                 out += plugin.getLang("armor.l");
             } else if (l.getType().equals(Material.IRON_LEGGINGS)) {
                 out += plugin.getLang("armor.l");
@@ -611,7 +611,7 @@ public final class ClanManager {
                 out += ChatColor.WHITE + plugin.getLang("armor.B");
             } else if (b.getType().equals(Material.DIAMOND_BOOTS)) {
                 out += ChatColor.AQUA + plugin.getLang("armor.B");
-            } else if (b.getType().equals(Material.GOLD_BOOTS)) {
+            } else if (b.getType().equals(Material.GOLDEN_BOOTS)) {
                 out += ChatColor.YELLOW + plugin.getLang("armor.B");
             } else if (b.getType().equals(Material.IRON_BOOTS)) {
                 out += ChatColor.WHITE + plugin.getLang("armor.B");
@@ -649,7 +649,7 @@ public final class ClanManager {
             out += ChatColor.AQUA + plugin.getLang("weapon.S") + headColor + countString;
         }
 
-        count = getItemCount(inv.all(Material.GOLD_SWORD));
+        count = getItemCount(inv.all(Material.GOLDEN_SWORD));
 
         if (count > 0) {
             String countString = count > 1 ? count + "" : "";
@@ -670,7 +670,7 @@ public final class ClanManager {
             out += ChatColor.GRAY + plugin.getLang("weapon.S") + headColor + countString;
         }
 
-        count = getItemCount(inv.all(Material.WOOD_SWORD));
+        count = getItemCount(inv.all(Material.WOODEN_SWORD));
 
         if (count > 0) {
             String countString = count > 1 ? count + "" : "";
@@ -689,7 +689,7 @@ public final class ClanManager {
         count += getItemCount(inv.all(Material.TIPPED_ARROW));
 
         if (count > 0) {
-            out += ChatColor.WHITE + headColor + count;
+            out += ChatColor.WHITE + plugin.getLang("weapon.A") + headColor + count;
         }
 
         if (out.length() == 0) {
@@ -733,30 +733,30 @@ public final class ClanManager {
         count += getFoodPoints(inv, Material.CAKE, 14, 2.8);
         count += getFoodPoints(inv, Material.CARROT, 3, 3.6);
         count += getFoodPoints(inv, Material.CHORUS_FRUIT, 4, 2.4);
-        count += getFoodPoints(inv, Material.RAW_FISH, 2, 5, .2); //clownfish
         count += getFoodPoints(inv, Material.COOKED_CHICKEN, 6, 7.2);
-        count += getFoodPoints(inv, Material.COOKED_FISH, 5, 6);
         count += getFoodPoints(inv, Material.COOKED_MUTTON, 6, 9.6);
-        count += getFoodPoints(inv, Material.GRILLED_PORK, 8, 12.8);
+        count += getFoodPoints(inv, Material.COOKED_PORKCHOP, 8, 12.8);
         count += getFoodPoints(inv, Material.COOKED_RABBIT, 5, 6);
-        count += getFoodPoints(inv, Material.COOKED_FISH, 1, 6, 9.6); //salmon
+        count += getFoodPoints(inv, Material.COOKED_SALMON, 1, 6, 9.6);
         count += getFoodPoints(inv, Material.COOKIE, 2, .4);
         count += getFoodPoints(inv, Material.GOLDEN_APPLE, 4, 9.6);
         count += getFoodPoints(inv, Material.GOLDEN_CARROT, 6, 14.4);
         count += getFoodPoints(inv, Material.MELON, 2, 1.2);
-        count += getFoodPoints(inv, Material.MUSHROOM_SOUP, 6, 7.2);
+        count += getFoodPoints(inv, Material.MUSHROOM_STEW, 6, 7.2);
         count += getFoodPoints(inv, Material.POISONOUS_POTATO, 2, 1.2);
         count += getFoodPoints(inv, Material.POTATO, 1, 0.6);
-        count += getFoodPoints(inv, Material.RAW_FISH, 3, 1, 0.2); //pufferfish
+        count += getFoodPoints(inv, Material.PUFFERFISH, 3, 1, 0.2);
         count += getFoodPoints(inv, Material.PUMPKIN_PIE, 8, 4.8);
         count += getFoodPoints(inv, Material.RABBIT_STEW, 10, 12);
-        count += getFoodPoints(inv, Material.RAW_BEEF, 3, 1.8);
-        count += getFoodPoints(inv, Material.RAW_CHICKEN, 2, 1.2);
-        count += getFoodPoints(inv, Material.RAW_FISH, 0, 4, .4); //fish
+        count += getFoodPoints(inv, Material.BEEF, 3, 1.8);
+        count += getFoodPoints(inv, Material.CHICKEN, 2, 1.2);
         count += getFoodPoints(inv, Material.MUTTON, 2, 1.2);
-        count += getFoodPoints(inv, Material.PORK, 3, 1.8);
+        count += getFoodPoints(inv, Material.PORKCHOP, 3, 1.8);
         count += getFoodPoints(inv, Material.RABBIT, 3, 1.8);
-        count += getFoodPoints(inv, Material.RAW_FISH, 1, .4); //raw salmon
+        count += getFoodPoints(inv, Material.SALMON, 1, .4);
+        count += getFoodPoints(inv, Material.COD, 2, .4);
+        count += getFoodPoints(inv, Material.COOKED_COD, 5, 6);
+        count += getFoodPoints(inv, Material.TROPICAL_FISH, 1, .2);
         count += getFoodPoints(inv, Material.ROTTEN_FLESH, 4, .8);
         count += getFoodPoints(inv, Material.SPIDER_EYE, 2, 3.2);
         count += getFoodPoints(inv, Material.COOKED_BEEF, 8, 12.8);

src/main/java/net/sacredlabyrinth/phaed/simpleclans/managers/TeleportManager.java

@@ -61,7 +61,7 @@ public final class TeleportManager {
 
                 List<Integer> itemsList = plugin.getSettingsManager().getItemsList();
 
-                if (itemsList.contains(item.getTypeId())) {
+                if (itemsList.contains(item.getType().getId())) {
                     player.getWorld().dropItemNaturally(player.getLocation(), item);
                     inv.remove(item);
                 }
@@ -78,7 +78,7 @@ public final class TeleportManager {
 
                     List<Integer> itemsList = plugin.getSettingsManager().getItemsList();
 
-                    if (!itemsList.contains(item.getTypeId())) {
+                    if (!itemsList.contains(item.getType().getId())) {
                         player.getWorld().dropItemNaturally(player.getLocation(), item);
                         inv.remove(item);
                     }

src/main/resources/plugin.yml

@@ -2,6 +2,7 @@ name: SimpleClans
 main: net.sacredlabyrinth.phaed.simpleclans.SimpleClans
 version: ${project.version}
 softdepend: [VanishNoPacket, Permissions, PermissionsBukkit, Vault, PermissionsEx, mChat, mChatSuite]
+api-version: '1.13'
 permissions:
   simpleclans.admin.permissions:
     description: Can grant clans permissions
@@ -53,6 +54,8 @@ permissions:
     description: Can view his own clan's profile
   simpleclans.member.roster:
     description: Can view his own clan's member list
+  simpleclans.member.bypass-fee:
+    description: Can bypass the member fee
   simpleclans.member.lookup:
     description: Can view his own player info
   simpleclans.member.vitals: