Merge pull request #17 from MrButtersDEV/UpgradableHoppers-Patch

Upgradable hoppers patch

Author: MrButtersDEV

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>us.thezircon.play</groupId>
     <artifactId>AutoPickup</artifactId>
-    <version>1.1.4-SNAPSHOT</version>
+    <version>1.1.6-DEVBUILD.1</version>
     <packaging>jar</packaging>
 
     <name>AutoPickup</name>

src/main/java/us/thezircon/play/autopickup/AutoPickup.java

@@ -26,6 +26,8 @@ public final class AutoPickup extends JavaPlugin {
     public boolean UP2Date = true;
     public TallCrops crops;
 
+    public static boolean usingUpgradableHoppers = false; // UpgradableHoppers Patch
+
     @Override
     public void onEnable() {
         // Plugin startup logic
@@ -34,6 +36,12 @@ public void onEnable() {
         getConfig().options().copyDefaults();
         saveDefaultConfig();
         createBlacklist();
+        createPlayerDataDir();
+
+        // UpgradableHoppers Patch
+        if ((getServer().getPluginManager().getPlugin("UpgradeableHoppers") != null)) {
+            usingUpgradableHoppers = true;
+        }
 
         messages = new Messages();
 
@@ -96,6 +104,13 @@ private void createBlacklist() {
         }
     }
 
+    public void createPlayerDataDir() {
+        File dir = new File(getDataFolder(), "PlayerData");
+        if (!dir.exists()) {
+            dir.mkdirs();
+        }
+    }
+
     public TallCrops getCrops() {
         return crops;
     }

src/main/java/us/thezircon/play/autopickup/listeners/BlockBreakEventListener.java

@@ -1,9 +1,6 @@
 package us.thezircon.play.autopickup.listeners;
 
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.Material;
+import org.bukkit.*;
 import org.bukkit.block.*;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
@@ -66,6 +63,15 @@ public void onBreak(BlockBreakEvent e) {
                 return;
             }
 
+            // Upgradable Hoppers Patch
+            if (block.getState() instanceof Hopper && AutoPickup.usingUpgradableHoppers) {
+                NamespacedKey upgHoppers = new NamespacedKey(PLUGIN.getServer().getPluginManager().getPlugin("UpgradeableHoppers"), "upgradeablehoppers");
+                Container con = (Container) block.getState();
+                if (con.getPersistentDataContainer().getKeys().contains(upgHoppers)) {
+                    return;
+                }
+            }
+
             e.setDropItems(false); // Cancel drops
 
             if (((Container) block.getState()).getInventory() instanceof DoubleChestInventory) {

target/classes/plugin.yml

@@ -1,5 +1,5 @@
 name: AutoPickup
-version: 1.1.4-SNAPSHOT
+version: 1.1.6-DEVBUILD.1
 main: us.thezircon.play.autopickup.AutoPickup
 prefix: AutoPickup
 authors: [BUTTERFIELD8]