Update to use CraftBukkit 1.13.2.

Author: Colby Terry

dependency-reduced-pom.xml

@@ -76,7 +76,7 @@
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>bukkit</artifactId>
-      <version>1.10.2-R0.1-SNAPSHOT</version>
+      <version>1.13.2-R0.1-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

pom.xml

@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>1.10.2-R0.1-SNAPSHOT</version>
+            <version>1.13.2-R0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>

src/main/java/net/voidteam/websend/JSONSerializer.java

@@ -19,18 +19,20 @@
 import org.json.JSONObject;
 
 /**
- * Bukkit is not updated to 1.8 and the server mods based of bukkit are implementing their own patches to support 1.8
- * This is a compatibility problem since the central Bukkit API is now splitting up in several small APIs that all require seperate code to support.
- * This class provides several abstract serialization methods for subclasses to implement according to each API.
+ * Bukkit is not updated to 1.8 and the server mods based of bukkit are
+ * implementing their own patches to support 1.8 This is a compatibility problem
+ * since the central Bukkit API is now splitting up in several small APIs that
+ * all require seperate code to support. This class provides several abstract
+ * serialization methods for subclasses to implement according to each API.
  */
 public abstract class JSONSerializer {
     private static JSONSerializer instance = null;
 
-    public static JSONSerializer getInstance(){
-        if(instance == null){
-            if(Bukkit.getServer().getVersion().contains("Spigot")){
+    public static JSONSerializer getInstance() {
+        if (instance == null) {
+            if (Bukkit.getServer().getVersion().contains("Spigot")) {
                 instance = new SpigotJSONSerializer();
-            }else{
+            } else {
                 instance = new BukkitJSONSerializer();
             }
         }
@@ -51,7 +53,7 @@ public JSONObject serializePlayer(Player ply, boolean serializeAllData) throws J
             player.put("Health", ply.getHealth());
             player.put("IP", ply.getAddress().toString());
             player.put("IsOP", ply.isOp());
-            if(serializeAllData){
+            if (serializeAllData) {
                 player.put("CurrentItemIndex", ply.getInventory().getHeldItemSlot());
                 player.put("MainHandItemID", ply.getInventory().getItemInMainHand().getType().name());
                 player.put("OffHandItemID", ply.getInventory().getItemInOffHand().getType().name());
@@ -115,7 +117,7 @@ public JSONObject serializeItemStack(ItemStack itemStack) throws JSONException {
                     Enchantment cur = enchIter.next();
                     JSONObject enchantment = new JSONObject();
                     {
-                        enchantment.put("Name", cur.getName());
+                        enchantment.put("Name", cur.getKey());
                         enchantment.put("Level", itemStack.getEnchantmentLevel(cur));
                     }
                     enchantments.put(enchantment);
@@ -132,9 +134,9 @@ public JSONObject serializeMetaData(ItemMeta meta) throws JSONException {
         JSONObject result = null;
         try {
             result = serializeMetaCustom(meta);
-            if(result != null){
-                //Is custom item implemented by subclass
-            }else if (meta instanceof BookMeta) {
+            if (result != null) {
+                // Is custom item implemented by subclass
+            } else if (meta instanceof BookMeta) {
                 result = serializeMetaBook((BookMeta) meta);
             } else if (meta instanceof FireworkEffectMeta) {
                 result = serializeMetaFireworkEffect((FireworkEffectMeta) meta);
@@ -157,18 +159,13 @@ public JSONObject serializeMetaData(ItemMeta meta) throws JSONException {
             }
         } catch (Exception ex) {
             if (Main.getSettings().isDebugMode()) {
-                Main.getMainLogger().log(
-                        Level.WARNING,
-                        "Exception while serializing item meta data. "
-                        + "This may be caused by a mismatch between the Bukkit and "
-                        + "Websend versions.",
-                        ex);
+                Main.getMainLogger().log(Level.WARNING, "Exception while serializing item meta data. "
+                        + "This may be caused by a mismatch between the Bukkit and " + "Websend versions.", ex);
             } else {
-                Main.getMainLogger().log(
-                        Level.WARNING,
+                Main.getMainLogger().log(Level.WARNING,
                         "Exception while serializing item meta data. "
-                        + "This may be caused by a mismatch between the Bukkit and "
-                        + "Websend versions. Enable debug mode for stack trace.");
+                                + "This may be caused by a mismatch between the Bukkit and "
+                                + "Websend versions. Enable debug mode for stack trace.");
             }
         }
         addNameAndLore(result, meta);
@@ -196,8 +193,7 @@ public void addEnchantments(JSONObject obj, ItemMeta meta) throws JSONException
                 Enchantment enchantment = set.getKey();
                 JSONObject enchantmentObj = new JSONObject();
                 {
-                    enchantmentObj.put("Type", enchantment.getId());
-                    enchantmentObj.put("Name", enchantment.getName());
+                    enchantmentObj.put("Name", enchantment.getKey());
                     enchantmentObj.put("MaxLevel", enchantment.getMaxLevel());
                     enchantmentObj.put("StartLevel", enchantment.getStartLevel());
                     enchantmentObj.put("Level", meta.getEnchantLevel(enchantment));
@@ -249,7 +245,8 @@ public JSONObject serializeMetaFirework(FireworkMeta fireworkMeta) throws JSONEx
         return metaObj;
     }
 
-    public JSONObject serializeMetaEnchantmentStorage(EnchantmentStorageMeta enchantmentStorageMeta) throws JSONException {
+    public JSONObject serializeMetaEnchantmentStorage(EnchantmentStorageMeta enchantmentStorageMeta)
+            throws JSONException {
         JSONObject metaObj = new JSONObject();
         {
             JSONArray enchantArray = new JSONArray();
@@ -258,8 +255,7 @@ public JSONObject serializeMetaEnchantmentStorage(EnchantmentStorageMeta enchant
                     Enchantment enchantment = set.getKey();
                     JSONObject enchantmentObj = new JSONObject();
                     {
-                        enchantmentObj.put("Type", enchantment.getId());
-                        enchantmentObj.put("Name", enchantment.getName());
+                        enchantmentObj.put("Name", enchantment.getKey());
                         enchantmentObj.put("MaxLevel", enchantment.getMaxLevel());
                         enchantmentObj.put("StartLevel", enchantment.getStartLevel());
                         enchantmentObj.put("Level", set.getValue());
@@ -300,7 +296,7 @@ public JSONObject serializeMetaPotion(PotionMeta potionMeta) throws JSONExceptio
             }
 
             PotionData data = potionMeta.getBasePotionData();
-            if(data != null){
+            if (data != null) {
                 JSONObject potionTypeObj = new JSONObject();
                 {
                     potionTypeObj.put("Name", data.getType().name());

src/main/java/net/voidteam/websend/WebsendConsoleCommandSender.java

@@ -13,10 +13,12 @@
 import org.bukkit.plugin.Plugin;
 
 public class WebsendConsoleCommandSender implements ConsoleCommandSender {
-    /* This class allows tapping into command output from plugins
-     * if the output is sent through the commandsender.
+    /*
+     * This class allows tapping into command output from plugins if the output is
+     * sent through the commandsender.
      *
-     * Tap this method(1.6.4): sendRawMessage, sendMessage(String), sendMessage(String[])
+     * Tap this method(1.6.4): sendRawMessage, sendMessage(String),
+     * sendMessage(String[])
      */
 
     private final ConsoleCommandSender parent;