2.9.0

+ Fixed change issues in lower versions than 1.13 + Added permission support to breaker items
poma123 · Dec 4, 2018 · 6f72f48 · 6f72f48
1 parent f379a1d
commit 6f72f48
Show file tree

Hide file tree

Showing 11 changed files with 457 additions and 109 deletions.
diff --git a/.idea/libraries/Maven__com_destroystokyo_paper_paper_api_1_13_2_R0_1_SNAPSHOT.xml b/.idea/libraries/Maven__com_destroystokyo_paper_paper_api_1_13_2_R0_1_SNAPSHOT.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -4,7 +4,7 @@
   <groupId>me.poma123</groupId>
   <artifactId>pickupspawners</artifactId>
   <name>PickupSpawners</name>
-  <version>2.9-pre2</version>
+  <version>2.9.0</version>
   <build>
     <defaultGoal>clean package</defaultGoal>
     <resources>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>me.poma123</groupId>
     <artifactId>pickupspawners</artifactId>
-    <version>2.9-pre2</version>
+    <version>2.9.0</version>
     <packaging>jar</packaging>
 
     <name>PickupSpawners</name>
@@ -90,13 +90,13 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.13.2-R0.1-SNAPSHOT</version>
+            <version>1.12.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.12-R0.1-SNAPSHOT</version>
+            <version>1.13.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/src/main/java/me/poma123/spawners/Listener.java b/src/main/java/me/poma123/spawners/Listener.java
@@ -20,6 +20,7 @@
 import me.poma123.spawners.gui.PickupGui;
 import me.poma123.spawners.language.Language;
 import me.poma123.spawners.language.Language.LocalePath;
+import net.md_5.bungee.api.chat.ClickEvent;
 import net.md_5.bungee.api.chat.ComponentBuilder;
 import net.md_5.bungee.api.chat.HoverEvent;
 import net.md_5.bungee.api.chat.TextComponent;
@@ -80,6 +81,15 @@ public static TextComponent getHoverClick(String message, String hover, String c
         return text;
     }
 
+    public static TextComponent getHoverSuggest(String message, String hover, String suggestedcommand) {
+        TextComponent text = new TextComponent(message);
+        text.setClickEvent(
+                new net.md_5.bungee.api.chat.ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, ChatColor.stripColor(suggestedcommand)));
+        text.setHoverEvent(new net.md_5.bungee.api.chat.HoverEvent(HoverEvent.Action.SHOW_TEXT,
+                new ComponentBuilder(hover).create()));
+        return text;
+    }
+
     public static TextComponent getHoverClickcmd(String message, String hover, String click) {
         TextComponent text = new TextComponent(message);
         text.setClickEvent(
@@ -139,10 +149,17 @@ public void onInventoryClick(InventoryClickEvent e) {
             if ((items == null) || (!items.hasItemMeta())) {
                 return;
             }
+
+
+            if (items.getItemMeta().getLore().toString().contains("BreakerID")) {
+
+                String str = ChatColor.stripColor(items.getItemMeta().getLore().get(items.getItemMeta().getLore().size()-1)).replace("BreakerID: ", "");
+                player.closeInventory();
+                sendBreakerItemCommands(player, str);
+            }
             if (!items.getItemMeta().hasDisplayName()) {
                 return;
             }
-
             if (items.getItemMeta().getDisplayName().contains("Back")) {
 
                 PickupGui gui = new PickupGui();
@@ -243,6 +260,23 @@ public void onInventoryClick(InventoryClickEvent e) {
         }
     }
 
+    /**
+     *
+     * @param player
+     * @param breakerID
+     */
+    private void sendBreakerItemCommands(Player player, String breakerID) {
+        player.sendMessage("§b#------------§6PickupSpawners§b------------#\n\n§cBreaker item commands:\n ");
+        player.spigot().sendMessage(getHoverSuggest("§e [*] §6Edit item §8§o(Click here)", "§7/pspawners §bupdateitem " + breakerID, "/pspawners updateitem " + breakerID));
+        player.spigot().sendMessage(getHoverSuggest("§e [*] §3Set permission §8§o(Click here)", "§7/pspawners §bsetitempermission " + breakerID + " <permission>", "/pspawners setitempermission " + breakerID + " <permission>"));
+        if (sett.getConfig().get("item." + breakerID + ".permission") != null) {
+            player.spigot().sendMessage(getHoverSuggest("§c [-] Remove permission §8§o(Click here)", "§7/pspawners §bremoveitempermission " + breakerID , "/pspawners removeitempermission " + breakerID));
+        }
+        player.spigot().sendMessage(getHoverSuggest("§c [-] Remove item §8§o(Click here)", "§7/pspawners §bremoveitem " + breakerID, "/pspawners removeitem " + breakerID));
+
+                player.sendMessage("\n\n§b#-------------------------------------#\n");
+    }
+
 
     @EventHandler
     public void onOpJoin(PlayerJoinEvent e) {
@@ -315,7 +349,18 @@ public void onSpawnerBreak(BlockBreakEvent e) {
 
             if (enchants.isEmpty()) {
                 if (item.getType().equals(mat)) {
-                    isGoodItem = true;
+                    if (sett.getConfig().get("item." + string + ".permission") != null) {
+                        if (e.getPlayer().hasPermission(sett.getConfig().getString("item." + string + ".permission"))) {
+                            isGoodItem = true;
+                        } else {
+                            isGoodItem = false;
+                            e.setCancelled(true);
+                            e.getPlayer().sendMessage(Language.getLocale(e.getPlayer(), LocalePath.NO_PERM));
+                            break;
+                        }
+                    } else {
+                        isGoodItem = true;
+                    }
                 }
             } else {
 
@@ -339,7 +384,18 @@ public void onSpawnerBreak(BlockBreakEvent e) {
                 }
 
                 if (item.getType().equals(mat) && containsAllEnchants) {
-                    isGoodItem = true;
+                    if (sett.getConfig().get("item." + string + ".permission") != null) {
+                        if (e.getPlayer().hasPermission(sett.getConfig().getString("item." + string + ".permission"))) {
+                            isGoodItem = true;
+                        } else {
+                            isGoodItem = false;
+                            e.setCancelled(true);
+                            e.getPlayer().sendMessage(Language.getLocale(e.getPlayer(), LocalePath.NO_PERM));
+                            break;
+                        }
+                    } else {
+                        isGoodItem = true;
+                    }
                 }
 
             }