1.13 support

.gitignore

@@ -60,3 +60,49 @@
 \.idea/workspace\.xml
 
 EpicBuckets\.iml
+
+target/classes/com/songoda/epicbuckets/commands/GenbucketAdminCommand\.class
+
+target/classes/com/songoda/epicbuckets/EpicBuckets\.class
+
+target/classes/com/songoda/epicbuckets/genbuckets/Genbucket\.class
+
+target/classes/com/songoda/epicbuckets/genbuckets/types/Horizontal\.class
+
+target/classes/com/songoda/epicbuckets/genbuckets/types/Horizontal\$1\.class
+
+target/classes/com/songoda/epicbuckets/genbuckets/types/Infused\.class
+
+target/classes/com/songoda/epicbuckets/genbuckets/types/Infused\$1\.class
+
+target/classes/com/songoda/epicbuckets/genbuckets/types/PsuedoVertical\.class
+
+target/classes/com/songoda/epicbuckets/genbuckets/types/PsuedoVertical\$1\.class
+
+target/classes/com/songoda/epicbuckets/genbuckets/types/Vertical\.class
+
+target/classes/com/songoda/epicbuckets/genbuckets/types/Vertical\$1\.class
+
+target/classes/com/songoda/epicbuckets/genbuckets/types/Vertical\$2\.class
+
+target/classes/com/songoda/epicbuckets/genbuckets/types/Vertical\$3\.class
+
+target/classes/com/songoda/epicbuckets/genbuckets/types/Vertical\$4\.class
+
+target/classes/com/songoda/epicbuckets/listeners/GenbucketPlaceListener\.class
+
+target/classes/com/songoda/epicbuckets/listeners/GenbucketPlaceListener\$1\.class
+
+target/classes/com/songoda/epicbuckets/listeners/InventoryClickListener\.class
+
+target/classes/com/songoda/epicbuckets/util/ServerVersion\.class
+
+target/classes/en_US\.lang
+
+target/EpicBuckets-1\.jar
+
+target/maven-archiver/pom\.properties
+
+target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles\.lst
+
+target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles\.lst

src/main/java/com/songoda/epicbuckets/EpicBuckets.java

@@ -6,9 +6,11 @@ import com.songoda.epicbuckets.filehandler.files.ShopFile;
 import com.songoda.epicbuckets.listeners.GenbucketPlaceListener;
 import com.songoda.epicbuckets.listeners.InventoryClickListener;
 import com.songoda.epicbuckets.util.ChatUtil;
+import com.songoda.epicbuckets.util.ServerVersion;
 import net.milkbowl.vault.chat.Chat;
 import net.milkbowl.vault.economy.Economy;
 import net.milkbowl.vault.permission.Permission;
+import org.apache.commons.lang.ArrayUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -26,6 +28,8 @@ public class EpicBuckets extends JavaPlugin {
 
     private Locale locale;
 
+    private ServerVersion serverVersion = ServerVersion.fromPackageName(Bukkit.getServer().getClass().getPackage().getName());
+
     public static EpicBuckets getInstance() {
         return INSTANCE;
     }
@@ -141,6 +145,21 @@ public class EpicBuckets extends JavaPlugin {
         return (economy != null);
     }
 
+    public ServerVersion getServerVersion() {
+        return serverVersion;
+    }
+
+    public boolean isServerVersion(ServerVersion version) {
+        return serverVersion == version;
+    }
+    public boolean isServerVersion(ServerVersion... versions) {
+        return ArrayUtils.contains(versions, serverVersion);
+    }
+
+    public boolean isServerVersionAtLeast(ServerVersion version) {
+        return serverVersion.ordinal() >= version.ordinal();
+    }
+
     public Locale getLocale() {
         return locale;
     }

src/main/java/com/songoda/epicbuckets/genbuckets/types/Horizontal.java

@@ -8,6 +8,7 @@ import com.songoda.epicbuckets.genbuckets.GenbucketManager;
 import com.songoda.epicbuckets.genbuckets.GenbucketType;
 import com.songoda.epicbuckets.regionhandlers.RegionWBorder;
 import com.songoda.epicbuckets.util.ChatUtil;
+import com.songoda.epicbuckets.util.ServerVersion;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -126,7 +127,8 @@ public class Horizontal extends Genbucket {
                     //ChatUtil.debugMSG(player, genbucketItem.getType(), genbucketItem.getTypeDamage(), movedBlocks);
 
                     block.setType(genbucketItem.getType());
-                    block.setData(genbucketItem.getTypeDamage());
+                    if (!plugin.isServerVersionAtLeast(ServerVersion.V1_13))
+                        block.setData(genbucketItem.getTypeDamage());
                     movedBlocks++;
 
                 } else {

src/main/java/com/songoda/epicbuckets/genbuckets/types/Infused.java

@@ -6,6 +6,7 @@ import com.songoda.epicbuckets.genbuckets.GenbucketItem;
 import com.songoda.epicbuckets.genbuckets.GenbucketManager;
 import com.songoda.epicbuckets.genbuckets.GenbucketType;
 import com.songoda.epicbuckets.util.ChatUtil;
+import com.songoda.epicbuckets.util.ServerVersion;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
@@ -120,7 +121,8 @@ public class Infused extends Genbucket {
                 if (runPillarOne && runFirst && canPlace(player, blockOne.getLocation(), false)) {
 
                     blockOne.setType(genbucketItem.getType());
-                    blockOne.setData(genbucketItem.getTypeDamage());
+                    if (!plugin.isServerVersionAtLeast(ServerVersion.V1_13))
+                        blockOne.setData(genbucketItem.getTypeDamage());
 
                 } else
                     runPillarOne = false;
@@ -130,7 +132,8 @@ public class Infused extends Genbucket {
                 if (runPillarTwo && runSecond && canPlace(player, blockTwo.getLocation(), false)) {
 
                     blockTwo.setType(genbucketItem.getType());
-                    blockTwo.setData(genbucketItem.getTypeDamage());
+                    if (!plugin.isServerVersionAtLeast(ServerVersion.V1_13))
+                        blockTwo.setData(genbucketItem.getTypeDamage());
 
                 } else
                     runPillarTwo = false;

src/main/java/com/songoda/epicbuckets/genbuckets/types/PsuedoVertical.java

@@ -6,6 +6,7 @@ import com.songoda.epicbuckets.genbuckets.GenbucketItem;
 import com.songoda.epicbuckets.genbuckets.GenbucketManager;
 import com.songoda.epicbuckets.genbuckets.GenbucketType;
 import com.songoda.epicbuckets.util.ChatUtil;
+import com.songoda.epicbuckets.util.ServerVersion;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -156,11 +157,13 @@ public class PsuedoVertical extends Genbucket {
                 }
 
 
+
                 if (block.getType().equals(Material.AIR) || block.getType().equals(Material.WATER) || block.getType().equals(Material.STATIONARY_WATER)
                         || block.getType().equals(Material.LAVA) || block.getType().equals(Material.STATIONARY_LAVA)) {
 
                     block.setType(genbucketItem.getType());
-                    block.setData(genbucketItem.getTypeDamage());
+                    if (!plugin.isServerVersionAtLeast(ServerVersion.V1_13))
+                        block.setData(genbucketItem.getTypeDamage());
 
                 } else {
 

src/main/java/com/songoda/epicbuckets/genbuckets/types/Vertical.java

@@ -5,6 +5,7 @@ import com.songoda.epicbuckets.genbuckets.Genbucket;
 import com.songoda.epicbuckets.genbuckets.GenbucketItem;
 import com.songoda.epicbuckets.genbuckets.GenbucketManager;
 import com.songoda.epicbuckets.genbuckets.GenbucketType;
+import com.songoda.epicbuckets.util.ServerVersion;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -170,12 +171,14 @@ public class Vertical extends Genbucket {
                             return;
                         } else {
                             block.setType(genbucketItem.getType());
-                            block.setData(genbucketItem.getTypeDamage());
+                            if (!plugin.isServerVersionAtLeast(ServerVersion.V1_13))
+                                block.setData(genbucketItem.getTypeDamage());
                         }
 
                     } else {
                         block.setType(genbucketItem.getType());
-                        block.setData(genbucketItem.getTypeDamage());
+                        if (!plugin.isServerVersionAtLeast(ServerVersion.V1_13))
+                            block.setData(genbucketItem.getTypeDamage());
                     }
 
                     movedBlocks++;
@@ -258,12 +261,14 @@ public class Vertical extends Genbucket {
                             return;
                         } else {
                             block.setType(genbucketItem.getType());
-                            block.setData(genbucketItem.getTypeDamage());
+                            if (!plugin.isServerVersionAtLeast(ServerVersion.V1_13))
+                                block.setData(genbucketItem.getTypeDamage());
                         }
 
                     } else {
                         block.setType(genbucketItem.getType());
-                        block.setData(genbucketItem.getTypeDamage());
+                        if (!plugin.isServerVersionAtLeast(ServerVersion.V1_13))
+                            block.setData(genbucketItem.getTypeDamage());
                     }
 
                     movedBlocks++;
@@ -350,12 +355,14 @@ public class Vertical extends Genbucket {
                             return;
                         } else {
                             block.setType(genbucketItem.getType());
-                            block.setData(genbucketItem.getTypeDamage());
+                            if (!plugin.isServerVersionAtLeast(ServerVersion.V1_13))
+                                block.setData(genbucketItem.getTypeDamage());
                         }
 
                     } else {
                         block.setType(genbucketItem.getType());
-                        block.setData(genbucketItem.getTypeDamage());
+                        if (!plugin.isServerVersionAtLeast(ServerVersion.V1_13))
+                            block.setData(genbucketItem.getTypeDamage());
                     }
 
                     movedBlocks++;

src/main/java/com/songoda/epicbuckets/listeners/GenbucketPlaceListener.java

@@ -10,6 +10,7 @@ import com.songoda.epicbuckets.genbuckets.types.PsuedoVertical;
 import com.songoda.epicbuckets.genbuckets.types.Vertical;
 import com.songoda.epicbuckets.util.ChatUtil;
 import com.songoda.epicbuckets.util.ItemStackUtil;
+import com.songoda.epicbuckets.util.ServerVersion;
 import com.songoda.epicbuckets.util.Util;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -187,7 +188,7 @@ public class GenbucketPlaceListener implements Listener {
     @EventHandler
     public void onGenbucketPlace(GenbucketPlaceEvent event) {
 
-        ItemStack item = ItemStackUtil.createItemStack("§7" + event.getGenbucketUUID().toString(), Arrays.asList("", "§7Information:", " §eLeft click: §6Teleport to location", " §eRight click: §6Stop genbucket", " §ePlaced by §6SoFocused", " §eCordinates: §6" + ChatUtil.getCoordinatesFromLocation(event.getLocation()), " §eMaterial: §6" + event.getGenbucketItem().getType(), " §eDamage: §6" + event.getGenbucketItem().getTypeDamage()), Material.STAINED_GLASS_PANE, 1, 13, true);
+        ItemStack item = ItemStackUtil.createItemStack("§7" + event.getGenbucketUUID().toString(), Arrays.asList("", "§7Information:", " §eLeft click: §6Teleport to location", " §eRight click: §6Stop genbucket", " §ePlaced by §6SoFocused", " §eCordinates: §6" + ChatUtil.getCoordinatesFromLocation(event.getLocation()), " §eMaterial: §6" + event.getGenbucketItem().getType(), " §eDamage: §6" + event.getGenbucketItem().getTypeDamage()), Material.valueOf(plugin.isServerVersionAtLeast(ServerVersion.V1_13) ? "GRAY_STAINED_GLASS_PANE" : "STAINED_GLASS_PANE"), 1, 13, true);
 
         GenbucketManager.activeGenbucketItems.put(event.getGenbucketUUID(), item);
         GenbucketManager.activeGenbucketLocation.put(event.getGenbucketUUID(), event.getLocation());

src/main/java/com/songoda/epicbuckets/util/ServerVersion.java

@@ -0,0 +1,26 @@
+package com.songoda.epicbuckets.util;
+
+public enum ServerVersion {
+
+    UNKNOWN("unknown_server_version"),
+    V1_7("org.bukkit.craftbukkit.v1_7"),
+    V1_8("org.bukkit.craftbukkit.v1_8"),
+    V1_9("org.bukkit.craftbukkit.v1_9"),
+    V1_10("org.bukkit.craftbukkit.v1_10"),
+    V1_11("org.bukkit.craftbukkit.v1_11"),
+    V1_12("org.bukkit.craftbukkit.v1_12"),
+    V1_13("org.bukkit.craftbukkit.v1_13");
+
+
+    private final String packagePrefix;
+
+    private ServerVersion(String packagePrefix) {
+        this.packagePrefix = packagePrefix;
+    }
+
+    public static ServerVersion fromPackageName(String packageName) {
+        for (ServerVersion version : values())
+            if (packageName.startsWith(version.packagePrefix)) return version;
+        return ServerVersion.UNKNOWN;
+    }
+}

target/classes/en_US.lang

@@ -1,27 +1,30 @@
 #General Messages
 
-general.nametag.prefix = "&8[&6EpicBuckets8]"
+general.nametag.prefix = "&8[&6EpicBuckets&8]"
 
 #Command Messages
 
 command.reload.success = "&7You've reloaded the config"
+command.admin.on = "&7You have toggled admin-mode &aon"
+command.admin.off = "&7You have toggled admin-mode &coff"
+command.settings.modify = "&7You've set &e%setting%&7 to &e%value%"
+
+#Interface Messages
+
+interface.withdrawl.success = "&e$%amount%&7 was taken from your &eaccount&7!"
 
 #Event Messages
 
 event.general.nopermission = "&cYou do not have permission to do that."
 event.general.playercommand = "&c&lOnly players can use this"
 event.general.error = "&cAn error occurred, please contact an administrator"
-event.withdrawl.success = "&e$%amount%&7 was taken from your &eaccount&7!"
 event.purchase.notenoughmoney = "&7You need &e$%money% &7more to purchase this genbucket!"
 event.purchase.inventoryfull = "&7Your inventory is &efull&7!"
 event.place.nothere = "&7You're not &eallowed&7 to place a genbucket here!"
 event.place.wait = "&7You must &ewait&7 before your other gen(s) finishes!"
-event.admin.on = "&7You have toggled admin-mode &aon"
-event.admin.off = "&7You have toggled admin-mode &coff"
-event.admin.playerplaced = "&e%player% &7placed a &e%type% genbucket&7!"
-event.settings.modify = "&7You've set &e%setting%&7 to &e%value%"
 event.translate.directionup = "on top of blocks"
 event.translate.directionside = "on the side of blocks"
 event.genbucket.disabled = "&eGenbuckets &7are currently disabled!"
-event.genbucket.placedwrong = "&e%genbucket% &7can be placed %direction%" # %side% equals to TRANSLATE-DIRECTION-X
+event.genbucket.placedwrong = "&e%genbucket% &7can be placed %direction%"
 event.genbucket.wrongmaterialpsuedo = "&7You cannot use this genbucket on this &eblock!"
+event.admin.playerplaced = "&e%player% &7placed a &e%type% genbucket&7!"