src/de/steamwar/misslewars/Config.java

@@ -48,6 +48,8 @@ public class Config {
 	public static final int ShieldFlyTime;
 	public static final int EndTime;
 
+	public static final double MissileChance;
+
 	static{
 		File configfile = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "config.yml");
 		if(!configfile.exists()){
@@ -62,6 +64,8 @@ public class Config {
 		ShieldFlyTime = config.getInt("ShieldFlyTime");
 		EndTime = config.getInt("EndTime");
 
+		MissileChance = config.getDouble("MissileChance");
+
 		ConfigurationSection arena = config.getConfigurationSection("Arena");
 		assert arena != null;
 		ArenaMinX = arena.getInt("MinX");

src/de/steamwar/misslewars/FightScoreboard.java

@@ -55,7 +55,7 @@ class FightScoreboard {
 
 
             Bukkit.getOnlinePlayers().forEach(player -> player.setScoreboard(scoreboard));
-        }, 0, 200);
+        }, 0, 50);
     }
 
     static Scoreboard getScoreboard() {

src/de/steamwar/misslewars/items/Missile.java

@@ -22,68 +22,49 @@ package de.steamwar.misslewars.items;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.bukkit.BukkitWorld;
-import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat;
 import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormats;
+import com.sk89q.worldedit.function.mask.BlockTypeMask;
 import com.sk89q.worldedit.function.operation.Operations;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.math.transform.AffineTransform;
 import com.sk89q.worldedit.session.ClipboardHolder;
 import com.sk89q.worldedit.world.World;
-import com.sk89q.worldedit.world.block.BaseBlock;
+import com.sk89q.worldedit.world.block.BlockType;
+import com.sk89q.worldedit.world.block.BlockTypes;
+import de.steamwar.misslewars.Config;
 import de.steamwar.misslewars.MissileWars;
-import io.netty.handler.logging.LogLevel;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.*;
-import java.util.logging.Level;
 
 public class Missile extends SpecialItem {
 
 	private static final World world = new BukkitWorld(Bukkit.getWorlds().get(0));
-
+	private static final BlockType TNT = BlockTypes.TNT;
-	private static Set<BaseBlock> tnt = new HashSet<>();
+	private static final int GRAPH_SIZE = 7;
-
+	private static final Random r = new Random();
-	static {
+	public static final List<String> specialMissiles = new ArrayList<>();
-		try {
-			tnt = WorldEdit.getInstance().getBlockFactory().parseFromListInput("tnt", new ParserContext());
-		} catch (Exception e) {
-			//Bukkit.getLogger().log(Level.SEVERE, e.getMessage(), e.getCause());
-		}
-	}
 
 	private final Clipboard clipboard;
 	private final ItemStack item;
+	private final int tntCount;
 
-	private Missile(File missileFile){
+	private Missile(File missileFile, boolean special) {
 		String[] strings = missileFile.getName().split("\\.");
 		String name = strings[0];
 		String material = strings[1];
-		if (!material.endsWith("_SPAWN_EGG")) {
+		if (!material.endsWith("_SPAWN_EGG")) material += "_SPAWN_EGG";
-			material += "_SPAWN_EGG";
-		}
 		Material itemType = Material.valueOf(material);
 
-		List<String> lore = new ArrayList<>();
-		if (strings.length > 3) {
-			try {
-				lore.add(graph(Integer.parseInt(strings[2]), 7) + " §7Speed");
-				lore.add(graph(Integer.parseInt(strings[3]), 7) + " §7Size");
-				// lore.add("§7TNT   §8: " + count());
-			} catch (NumberFormatException e) {
-
-			}
-		}
-
 		ClipboardFormat format = ClipboardFormats.findByFile(missileFile);
 		try {
 			assert format != null;
@@ -92,19 +73,41 @@ public class Missile extends SpecialItem {
 			throw new SecurityException("Corrupt missile");
 		}
 
-		item = new ItemStack(itemType, 1);
+		List<String> lore = new ArrayList<>();
-		ItemMeta meta = item.getItemMeta();
+		lore(lore, strings, 2, " §7Speed");
-		assert meta != null;
+		lore(lore, strings, 3, " §7Size");
-		meta.setDisplayName("§c" + name);
+		int count;
-		meta.setLore(lore);
+		try {
-		item.setItemMeta(meta);
+			count = count();
+		} catch (Exception e) {
+			count = 0;
+		}
+		tntCount = count;
+		lore.add("§7TNT §8: §e" + tntCount);
+
+		item = createItem(itemType, "§c" + name, 1, lore, special);
+		if (special) specialMissiles.add(name);
+	}
+
+	private void lore(List<String> lore, String[] args, int index, String tag) {
+		if (args.length > index) {
+			try {
+				lore.add(graph(Integer.parseInt(args[index]), GRAPH_SIZE) + tag);
+				return;
+			} catch (NumberFormatException e) {
+				// Ignored
+			}
+		}
+		lore.add(graph(0, GRAPH_SIZE) + tag);
 	}
 
 	private String graph(int index, int size) {
 		if (index > size) index = size;
 		StringBuilder st = new StringBuilder();
 		st.append("§8[§e");
-		st.append(repeat(index));
+		if (index > 0) {
+			st.append(repeat(index));
+		}
 		st.append("§7");
 		st.append(repeat(size - index));
 		st.append("§8]");
@@ -121,19 +124,18 @@ public class Missile extends SpecialItem {
 	}
 
 	private int count() {
-		if (tnt.isEmpty()) {
+		EditSession e = WorldEdit.getInstance().getEditSessionFactory().getEditSession(world, -1);
-			return 0;
+		BlockTypeMask blockTypeMask = new BlockTypeMask(clipboard, TNT);
-		}
+		return e.countBlocks(clipboard.getRegion(), blockTypeMask);
-		return WorldEdit.getInstance().getEditSessionFactory().getEditSession(world, -1).countBlocks(clipboard.getRegion(), tnt);
 	}
 
 	@Override
-	public ItemStack getItem(){
+	public ItemStack getItem() {
 		return item;
 	}
 
 	@Override
-	public boolean handleUse(Player p){
+	public boolean handleUse(Player p) {
 		BlockVector3 dimensions = clipboard.getDimensions();
 		Location location = p.getLocation();
 		BlockVector3 v = BlockVector3.ZERO;
@@ -141,11 +143,11 @@ public class Missile extends SpecialItem {
 		AffineTransform aT = new AffineTransform();
 
 		double yaw = (p.getLocation().getYaw() + 360f) % 360;
-		if(yaw > 45 && yaw <= 135) {
+		if (yaw > 45 && yaw <= 135) {
 			aT = aT.rotateY(270);
-		}else if(yaw > 135 && yaw <= 225) {
+		} else if (yaw > 135 && yaw <= 225) {
 			aT = aT.rotateY(180);
-		}else if(yaw > 225 && yaw <= 315) {
+		} else if (yaw > 225 && yaw <= 315) {
 			aT = aT.rotateY(90);
 		}
 
@@ -161,16 +163,20 @@ public class Missile extends SpecialItem {
 		return true;
 	}
 
-	public static void init(){
+	@Override
-		File missileFolder = new File(MissileWars.getPlugin().getDataFolder(), "missiles");
+	public boolean isMissile() {
-		if(!missileFolder.exists() || !missileFolder.canRead() || !missileFolder.isDirectory()){
+		return true;
+	}
+
+	public static void init() {
+		File missileFolder = new File(MissileWars.getPlugin().getDataFolder(), "default-missiles");
+		if (!missileFolder.exists() || !missileFolder.canRead() || !missileFolder.isDirectory()) {
 			throw new SecurityException("Missiles could not be loaded");
 		}
-		for(File missileFile : Objects.requireNonNull(missileFolder.listFiles())){
+		for (File missileFile : Objects.requireNonNull(missileFolder.listFiles())) {
-			if(!missileFile.canRead() || !missileFile.isFile())
+			if (!missileFile.canRead() || !missileFile.isFile()) continue;
-				continue;
+			new Missile(missileFile, false);
-
-			new Missile(missileFile);
 		}
 	}
+
 }

src/de/steamwar/misslewars/items/SpecialItem.java

@@ -19,8 +19,11 @@
 
 package de.steamwar.misslewars.items;
 
+import de.steamwar.misslewars.Config;
 import org.bukkit.Material;
+import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
@@ -30,34 +33,58 @@ public abstract class SpecialItem {
 
 	private static final Random random = new Random();
 
-	private static List<SpecialItem> items = new ArrayList<>();
+	private static List<SpecialItem> supportItems = new ArrayList<>();
+	private static List<SpecialItem> missileItems = new ArrayList<>();
 
-	SpecialItem(){
+	SpecialItem() {
-		items.add(this);
+		if (this.isMissile()) {
+			missileItems.add(this);
+			return;
+		}
+		supportItems.add(this);
 	}
 
 	public abstract ItemStack getItem();
 	public abstract boolean handleUse(Player p);
+	public boolean isMissile() {
+		return false;
+	}
 
 	public ItemStack createItem(Material material, String name, int amount) {
+		return createItem(material, name, amount, new ArrayList<>(), false);
+	}
+
+	public ItemStack createItem(Material material, String name, int amount, List<String> lore, boolean special) {
 		ItemStack item = new ItemStack(material, amount);
 		ItemMeta meta = item.getItemMeta();
 		assert meta != null;
+		meta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
+		meta.setLore(lore);
 		meta.setDisplayName(name);
 		item.setItemMeta(meta);
+		if (special) item.addUnsafeEnchantment(Enchantment.PROTECTION_FALL, 1);
 		return item;
 	}
 
-	public static boolean handleUse(ItemStack item, Player player){
+	public static boolean handleUse(ItemStack item, Player player) {
-		for(SpecialItem specialItem : items){
+		for (SpecialItem missileItem : missileItems) {
-			if(item.isSimilar(specialItem.getItem())){
+			if (item.isSimilar(missileItem.getItem())) {
+				return missileItem.handleUse(player);
+			}
+		}
+		for (SpecialItem specialItem : supportItems) {
+			if (item.isSimilar(specialItem.getItem())) {
 				return specialItem.handleUse(player);
 			}
 		}
 		return false;
 	}
 
-	public static ItemStack getRandomItem(){
+	public static ItemStack getRandomItem() {
-		return items.get(random.nextInt(items.size())).getItem();
+		if (random.nextDouble() > Config.MissileChance) {
+			return supportItems.get(random.nextInt(supportItems.size())).getItem();
+		} else {
+			return missileItems.get(random.nextInt(missileItems.size())).getItem();
+		}
 	}
 }