Release 2.6

Author: poma123

src/config.yml

@@ -1,4 +1,3 @@
-#Integer. Set 0 to disable.
-daily-broke-limit: 0
-
-update-check: true
+daily-broke-limit: 5
+update-check: true
+item: {}

src/me/poma123/spawners/Command.java

@@ -1,8 +1,10 @@
 package me.poma123.spawners;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
+import org.apache.commons.lang.RandomStringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.EntityType;
@@ -14,6 +16,15 @@ public class Command extends JavaPlugin implements org.bukkit.event.Listener {
 	public static List<String> entities = new ArrayList<String>();
 	public int ID = 62455;
 
+	public static String generateRandomString(int length) {
+
+		boolean useLetters = true;
+		boolean useNumbers = true;
+		String generatedString = RandomStringUtils.random(length, useLetters, useNumbers);
+
+		return generatedString;
+	}
+
 	@Override
 	public void onEnable() {
 		getLogger().info("-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-");
@@ -51,6 +62,13 @@ public void onEnable() {
 			Updater updater = new Updater(this, ID, this.getFile(), Updater.UpdateType.VERSION_CHECK, true);
 		}
 
+		if (s.getConfig().getConfigurationSection("item").getKeys(false).isEmpty()) {
+
+			s.getConfig().set("item.default.material", "DIAMOND_PICKAXE");
+			s.getConfig().set("item.default.enchants", Arrays.asList("SILK_TOUCH"));
+			s.saveConfig();
+		}
+
 	}
 
 	private String getVersion() {

src/me/poma123/spawners/Listener.java

@@ -1,14 +1,17 @@
 package me.poma123.spawners;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.regex.Pattern;
 
+import org.apache.commons.lang.RandomStringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.CreatureSpawner;
-import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -44,6 +47,14 @@ public static TextComponent getHoverClick(String message, String hover, String c
 				new ComponentBuilder(hover).create()));
 		return text;
 	}
+	public static TextComponent getHoverClickcmd(String message, String hover, String click) {
+		TextComponent text = new TextComponent(message);
+		text.setClickEvent(
+				new net.md_5.bungee.api.chat.ClickEvent(net.md_5.bungee.api.chat.ClickEvent.Action.RUN_COMMAND, click));
+		text.setHoverEvent(new net.md_5.bungee.api.chat.HoverEvent(HoverEvent.Action.SHOW_TEXT,
+				new ComponentBuilder(hover).create()));
+		return text;
+	}
 
 	@EventHandler
 	public void onOpJoin(PlayerJoinEvent e) {
@@ -69,13 +80,15 @@ public void onOpJoin(PlayerJoinEvent e) {
 			}
 		}
 	}
+	
+
 
 	@EventHandler(ignoreCancelled = true, priority = EventPriority.HIGH)
 	public void onSpawnerBreak(BlockBreakEvent e) {
 		Block s = e.getBlock();
 		String lang = getLang(e.getPlayer());
 		Object limitcount1 = sett.getConfig().get("daily-broke-limit");
-
+		ItemStack item = e.getPlayer().getInventory().getItemInMainHand();
 		try {
 			int limitcount = (int) limitcount1;
 			if (limitcount > 0) {
@@ -100,8 +113,55 @@ public void onSpawnerBreak(BlockBreakEvent e) {
 					"§c[PickupSpawners-ERROR] The daily limit is not an integer in the config.yml. Please fix it. Daily limit skipped.");
 		}
 
-		if (e.getPlayer().getInventory().getItemInMainHand().getType().equals(Material.DIAMOND_PICKAXE) && e.getPlayer()
-				.getInventory().getItemInMainHand().getEnchantments().containsKey(Enchantment.SILK_TOUCH)) {
+		boolean isGoodItem = false;
+
+		for (String string : sett.getConfig().getConfigurationSection("item").getKeys(false)) {
+			Material mat = Material
+					.matchMaterial(sett.getConfig().getString("item." + string + ".material").toUpperCase());
+			List<String> enchants = new ArrayList<String>();
+			if (sett.getConfig().getStringList("item." + string + ".enchants") != null) {
+				enchants = sett.getConfig().getStringList("item." + string + ".enchants");
+			}
+
+			if (enchants.isEmpty()) {
+				if (item.getType().equals(mat)) {
+					isGoodItem = true;
+				}
+			} else {
+
+				boolean containsAllEnchants = false;
+
+				String enchantments = "";
+
+				for (String ench : sett.getConfig().getStringList("item." + string + ".enchants")) {
+
+					if (ench.contains(":")) {
+						enchantments = enchantments + "(?=.*" + ench.split(":")[0].toUpperCase() + "]="+ ench.split(":")[1] + ")";
+					} else {
+						enchantments = enchantments + "(?=.*" + ench.toUpperCase() + "]=1" + ")";
+					}
+				}
+
+				Pattern pattern = Pattern.compile(enchantments);
+				if (pattern.matcher(item.getEnchantments().toString()).find()) {
+					containsAllEnchants = true;
+				}
+
+				if (item.getType().equals(mat) && containsAllEnchants) {
+					isGoodItem = true;
+				}
+
+			}
+
+			if (isGoodItem == true) {
+				break;
+
+			}
+		}
+
+		// if (item.getType().equals(Material.DIAMOND_PICKAXE)&&
+		// item.getEnchantments().containsKey(Enchantment.SILK_TOUCH)) {
+		if (isGoodItem) {
 			if (s.getType().equals(material)) {
 
 				CreatureSpawner cs = (CreatureSpawner) s.getState();