From db7ac245bfe118c733c3604bbe68966137a48000 Mon Sep 17 00:00:00 2001
From: boosik <lordboos@gmail.com>
Date: Mon, 22 Jul 2019 08:54:55 +0200
Subject: [PATCH] Update for 1.14.4

---
 .gitignore                                    |  3 +++
 jar/pom.xml                                   |  2 +-
 plugin/pom.xml                                |  9 ++++----
 .../mcapi/json/JSONHoverAction.java           |  4 ++--
 .../boosCooldown/BoosCoolDownListener.java    |  2 +-
 .../Listeners/BoosSignInteractListener.java   | 23 +++++++++++++++++--
 plugin/src/main/resources/plugin.yml          |  2 +-
 pom.xml                                       |  6 ++---
 8 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index efa077f..1e22aa0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,6 @@
 /.classpath
 /.project
 /.settings/
+/plugin/target/
+/.idea/
+/jar/target/
diff --git a/jar/pom.xml b/jar/pom.xml
index 2127a70..b622704 100644
--- a/jar/pom.xml
+++ b/jar/pom.xml
@@ -25,7 +25,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.6</version>
+                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <id>package-all</id>
diff --git a/plugin/pom.xml b/plugin/pom.xml
index f8667b6..08629cc 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -23,25 +23,26 @@
         <dependency> <!-- Spigot (this includes Spigot API, Bukkit API, Craftbukkit and NMS) -->
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.12-R0.1-SNAPSHOT</version>
+            <version>${minecraft.version}-${bukkit.version}-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>craftbukkit</artifactId>
-            <version>1.12-R0.1-SNAPSHOT</version>
+            <version>${minecraft.version}-${bukkit.version}-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.milkbowl.vault</groupId>
             <artifactId>Vault</artifactId>
-            <version>1.6.6</version>
+            <version>LATEST</version>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.black_ixx</groupId>
             <artifactId>PlayerPoints</artifactId>
-            <version>2.1.3</version>
+            <version>LATEST</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/plugin/src/main/java/com/coloredcarrot/mcapi/json/JSONHoverAction.java b/plugin/src/main/java/com/coloredcarrot/mcapi/json/JSONHoverAction.java
index 8b4ee42..03aa47d 100644
--- a/plugin/src/main/java/com/coloredcarrot/mcapi/json/JSONHoverAction.java
+++ b/plugin/src/main/java/com/coloredcarrot/mcapi/json/JSONHoverAction.java
@@ -255,9 +255,9 @@ public interface JSONHoverAction<T> {
                 int size = value.getItemMeta().getEnchants().keySet().size();
                 for (Enchantment ench : value.getItemMeta().getEnchants().keySet()) {
                     if (i + 1 == size) {
-                        value2 += "{lvl:" + value.getItemMeta().getEnchants().get(ench) + "s,id:" + ench.getId() + "s}";
+                        value2 += "{lvl:" + value.getItemMeta().getEnchants().get(ench) + "s,id:" + ench.getKey() + "s}";
                     } else {
-                        value2 += "{lvl:" + value.getItemMeta().getEnchants().get(ench) + "s,id:" + ench.getId() + "s},";
+                        value2 += "{lvl:" + value.getItemMeta().getEnchants().get(ench) + "s,id:" + ench.getKey() + "s},";
                     }
                     i++;
                 }
diff --git a/plugin/src/main/java/cz/boosik/boosCooldown/BoosCoolDownListener.java b/plugin/src/main/java/cz/boosik/boosCooldown/BoosCoolDownListener.java
index 3661ccb..23c4ad6 100644
--- a/plugin/src/main/java/cz/boosik/boosCooldown/BoosCoolDownListener.java
+++ b/plugin/src/main/java/cz/boosik/boosCooldown/BoosCoolDownListener.java
@@ -187,7 +187,7 @@ public class BoosCoolDownListener implements Listener {
         }
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.HIGHEST)
     private void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
         Player player = event.getPlayer();
         UUID uuid = player.getUniqueId();
diff --git a/plugin/src/main/java/cz/boosik/boosCooldown/Listeners/BoosSignInteractListener.java b/plugin/src/main/java/cz/boosik/boosCooldown/Listeners/BoosSignInteractListener.java
index 7a596b7..c8caed4 100644
--- a/plugin/src/main/java/cz/boosik/boosCooldown/Listeners/BoosSignInteractListener.java
+++ b/plugin/src/main/java/cz/boosik/boosCooldown/Listeners/BoosSignInteractListener.java
@@ -28,8 +28,27 @@ public class BoosSignInteractListener implements Listener {
         }
 
         if (event.hasBlock() && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
-            if (event.getClickedBlock().getType() == Material.SIGN_POST
-                    || event.getClickedBlock().getType() == Material.WALL_SIGN) {
+            if (event.getClickedBlock().getType() == Material.LEGACY_SIGN
+                    || event.getClickedBlock().getType() == Material.LEGACY_SIGN_POST
+                    || event.getClickedBlock().getType() == Material.LEGACY_WALL_SIGN
+
+                    || event.getClickedBlock().getType() == Material.ACACIA_SIGN
+                    || event.getClickedBlock().getType() == Material.ACACIA_WALL_SIGN
+
+                    || event.getClickedBlock().getType() == Material.DARK_OAK_SIGN
+                    || event.getClickedBlock().getType() == Material.DARK_OAK_WALL_SIGN
+
+                    || event.getClickedBlock().getType() == Material.JUNGLE_SIGN
+                    || event.getClickedBlock().getType() == Material.JUNGLE_WALL_SIGN
+
+                    || event.getClickedBlock().getType() == Material.OAK_SIGN
+                    || event.getClickedBlock().getType() == Material.OAK_WALL_SIGN
+
+                    || event.getClickedBlock().getType() == Material.SPRUCE_SIGN
+                    || event.getClickedBlock().getType() == Material.SPRUCE_WALL_SIGN
+
+                    || event.getClickedBlock().getType() == Material.BIRCH_SIGN
+                    || event.getClickedBlock().getType() == Material.BIRCH_WALL_SIGN) {
                 Sign s = (Sign) event.getClickedBlock().getState();
                 String line1 = s.getLine(0);
                 String line2 = s.getLine(1);
diff --git a/plugin/src/main/resources/plugin.yml b/plugin/src/main/resources/plugin.yml
index 7da738a..a41c62f 100644
--- a/plugin/src/main/resources/plugin.yml
+++ b/plugin/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: boosCooldowns
 main: cz.boosik.boosCooldown.BoosCoolDown
-version: 3.14.3
+version: 3.14.5
 authors: [LordBoos (boosik)]
 softdepend: [Vault, PlayerPoints]
 description: >
diff --git a/pom.xml b/pom.xml
index 89025a5..f3701c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,12 +11,12 @@
     <packaging>pom</packaging>
 	<url>http://maven.apache.org</url>
 	<properties>
-		<boosCooldowns.version>3.14.3</boosCooldowns.version>
+		<boosCooldowns.version>3.14.5</boosCooldowns.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<minecraft.version>1.12</minecraft.version>
+		<minecraft.version>1.14.2</minecraft.version>
 		<bukkit.version>R0.1</bukkit.version>
-		<bukkit.packet>v1_12_R1</bukkit.packet>
+		<bukkit.packet>v1_14_R1</bukkit.packet>
 	</properties>
 	<pluginRepositories>
 		<pluginRepository>