refactoring, command restructure, bug fixes, glow rewrite

5 files changed, 0 insertions, 416 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/manager/CommandManager.java b/src/main/java/net/tylermurphy/hideAndSeek/manager/CommandManager.java
deleted file mode 100644
index b50247a..0000000
--- a/src/main/java/net/tylermurphy/hideAndSeek/manager/CommandManager.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package net.tylermurphy.hideAndSeek.manager;
-
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import net.tylermurphy.hideAndSeek.ICommand;
-import net.tylermurphy.hideAndSeek.commands.*;
-
-import static net.tylermurphy.hideAndSeek.Store.*;
-
-public class CommandManager implements CommandExecutor {
-
-	public static Map<String,ICommand> COMMAND_REGISTER = new LinkedHashMap<String,ICommand>();
-	
-	private static void registerCommand(ICommand command) {
-		if(!COMMAND_REGISTER.containsKey(command.getLabel())) {
-			COMMAND_REGISTER.put(command.getLabel().toLowerCase(), command);
-		}
-	}
-	
-	public static void registerCommands() {
-		registerCommand(new About());
-		registerCommand(new Help());
-		registerCommand(new Start());
-		registerCommand(new Stop());
-		registerCommand(new SetSeeker());
-		registerCommand(new SetSpawnLocation());
-		registerCommand(new SetBorder());
-		registerCommand(new EnableBorder());
-	}
-	
-	public static boolean handleCommand(CommandSender sender, Command cmd, String label, String[] args) {
-		if(sender instanceof Player == false) {
-			sender.sendMessage(errorPrefix + "This command can only be run as a player.");
-		} else if(args.length < 1) {
-			COMMAND_REGISTER.get("about").execute(sender, new String[0]);
-		} else if(!COMMAND_REGISTER.containsKey(args[0].toLowerCase())) {
-			COMMAND_REGISTER.get("about").execute(sender, Arrays.copyOfRange(args, 1, args.length));
-		} else {
-			try {
-				COMMAND_REGISTER.get(args[0].toLowerCase()).execute(sender,Arrays.copyOfRange(args, 1, args.length));
-			} catch (Exception e) {
-				sender.sendMessage(errorPrefix + "An error has occured.");
-				e.printStackTrace();
-			}
-		}
-		return true;
-	}
-
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		return CommandManager.handleCommand(sender, command, label, args);
-	}
-	
-}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/manager/EventManager.java b/src/main/java/net/tylermurphy/hideAndSeek/manager/EventManager.java
deleted file mode 100644
index 26a41f1..0000000
--- a/src/main/java/net/tylermurphy/hideAndSeek/manager/EventManager.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package net.tylermurphy.hideAndSeek.manager;
-
-import static net.tylermurphy.hideAndSeek.Store.*;
-
-import org.bukkit.Bukkit;
-import org.bukkit.GameMode;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.Sound;
-import org.bukkit.attribute.Attribute;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Snowball;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.entity.EntityRegainHealthEvent;
-import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
-import org.bukkit.event.entity.FoodLevelChangeEvent;
-import org.bukkit.event.entity.ProjectileLaunchEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.potion.PotionEffect;
-
-import net.md_5.bungee.api.ChatColor;
-import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.util.Functions;
-
-public class EventManager implements Listener {
-	
-	@EventHandler
-	public void onPlayerJoin(PlayerJoinEvent event) {
-		if(status.equals("Playing") || status.equals("Starting")) {
-			Spectator.addEntry(event.getPlayer().getName());
-			event.getPlayer().sendMessage(messagePrefix + "You have joined mid game, and thus have been placed on the spectator team.");
-			event.getPlayer().setGameMode(GameMode.SPECTATOR);
-			event.getPlayer().getInventory().clear();
-			for(PotionEffect effect : event.getPlayer().getActivePotionEffects()){
-				event.getPlayer().removePotionEffect(effect.getType());
-			}
-			event.getPlayer().teleport(new Location(event.getPlayer().getWorld(), spawnPosition.getX(),spawnPosition.getY(),spawnPosition.getZ()));
-		} else if(status.equals("Setup") || status.equals("Standby")) {
-			Hider.addEntry(event.getPlayer().getName());
-		}
-		playerList.put(event.getPlayer().getName(), event.getPlayer());
-	}
-	
-	@EventHandler
-	public void onQuit(PlayerQuitEvent event) {
-		playerList.remove(event.getPlayer().getName());
-		Hider.removeEntry(event.getPlayer().getName());
-		Seeker.removeEntry(event.getPlayer().getName());
-		Spectator.removeEntry(event.getPlayer().getName());
-	}
-	
-	@EventHandler
-	public void onPlayerDamage(EntityDamageEvent event) {
-		if(event.getEntity() instanceof Player) {
-			if(!status.equals("Playing")) {
-				event.setCancelled(true);
-				return;
-			}
-			Player player = (Player) event.getEntity();
-			if(player.getHealth()-event.getDamage() < 0) {
-				if(spawnPosition == null) return;
-				event.setCancelled(true);
-				player.setHealth(player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue());
-				player.teleport(new Location(player.getWorld(), spawnPosition.getX(), spawnPosition.getY(), spawnPosition.getZ()));
-				Functions.playSound(player, Sound.ENTITY_PLAYER_DEATH, 1, 1);
-				if(Hider.hasEntry(event.getEntity().getName())) {
-					Bukkit.broadcastMessage(String.format(messagePrefix + "%s%s%s has died and become a seeker", ChatColor.GOLD, event.getEntity().getName(), ChatColor.WHITE));
-				}
-				if(Seeker.hasEntry(event.getEntity().getName())) {
-					Bukkit.broadcastMessage(String.format(messagePrefix + "%s%s%s has been beat by a hider", ChatColor.RED, event.getEntity().getName(), ChatColor.WHITE));
-				}
-				Seeker.addEntry(player.getName());
-				Functions.resetPlayer(player);
-			}
-		}
-		
-	}
-	
-	@EventHandler
-	public void onProjectile(ProjectileLaunchEvent event) {
-		if(!status.equals("Playing")) return;
-		if(event.getEntity() instanceof Snowball) {
-			Snowball snowball = (Snowball) event.getEntity();
-			if(snowball.getShooter() instanceof Player) {
-				Player player = (Player) snowball.getShooter();
-				if(Hider.hasEntry(player.getName())) {
-					glowTime++;
-					snowball.remove();
-					player.getInventory().remove(Material.SNOWBALL);
-					int temp = gameId;
-					Bukkit.getServer().getScheduler().runTaskLater(Main.plugin, new Runnable() {
-						public void run() {
-							if(temp != gameId) return;
-							glowTime--;
-						}
-					}, 20 * 30);
-				}
-			}
-		}
-	}
-	
-	@EventHandler
-	public void onFoodLevelChange(FoodLevelChangeEvent event) {
-		event.setCancelled(true);
-	}
-	
-	@EventHandler
-    public void onPlayerRegainHealth(EntityRegainHealthEvent event) {
-        if(event.getRegainReason() == RegainReason.SATIATED || event.getRegainReason() == RegainReason.REGEN)
-            event.setCancelled(true);
-    }
-}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/manager/TauntManager.java b/src/main/java/net/tylermurphy/hideAndSeek/manager/TauntManager.java
deleted file mode 100644
index 6465e44..0000000
--- a/src/main/java/net/tylermurphy/hideAndSeek/manager/TauntManager.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package net.tylermurphy.hideAndSeek.manager;
-
-import static net.tylermurphy.hideAndSeek.Store.*;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
-
-import net.tylermurphy.hideAndSeek.Main;
-
-public class TauntManager {
-
-public static void schedule() {
-		
-		Bukkit.getServer().getScheduler().runTaskAsynchronously(Main.plugin, new Runnable(){
-
-			public void run() {
-				int temp = gameId;
-				while(true) {
-					if(tauntPlayer != null && !tauntPlayer.equals("")) {
-						try { Thread.sleep(1000); } catch (InterruptedException e) {}
-						if(gameId != temp) break;
-						continue;
-					}
-					try { Thread.sleep(1000*60); } catch (InterruptedException e) {}
-					if(gameId != temp) break;
-					if(Math.random() > .9) {
-						Player taunted = null;
-						int rand = (int) (Math.random()*Hider.getEntries().size());
-						for(Player player : playerList.values()) {
-							if(Hider.hasEntry(player.getName())) {
-								rand--;
-								if(rand==0) {
-									taunted = player;
-									break;
-								}
-							}
-						}
-						if(taunted != null) {
-							taunted.sendMessage(ChatColor.RED + "" + ChatColor.ITALIC + "Oh no! You have been chosed to be taunted.");
-							Bukkit.getServer().broadcastMessage(ChatColor.YELLOW + "Taunt >" + ChatColor.WHITE + " A random hider will be taunted in the next 30s");
-							try { Thread.sleep(1000*30); } catch (InterruptedException e) {}
-							if(gameId != temp) break;
-							tauntPlayer = taunted.getName();
-						}
-					}
-				}
-			}
-		});
-	}
-	
-}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/manager/TickManager.java b/src/main/java/net/tylermurphy/hideAndSeek/manager/TickManager.java
deleted file mode 100644
index 9172b0b..0000000
--- a/src/main/java/net/tylermurphy/hideAndSeek/manager/TickManager.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package net.tylermurphy.hideAndSeek.manager;
-
-import static net.tylermurphy.hideAndSeek.Store.*;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Color;
-import org.bukkit.FireworkEffect;
-import org.bukkit.Location;
-import org.bukkit.Sound;
-import org.bukkit.World;
-import org.bukkit.WorldBorder;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Firework;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.meta.FireworkMeta;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
-
-import net.tylermurphy.hideAndSeek.commands.Stop;
-import net.tylermurphy.hideAndSeek.util.Functions;
-
-public class TickManager {
-
-	static int tick = 0;
-	
-	public static void onTick() {
-		
-		if(board == null) {
-			Functions.loadScoreboard();
-		}
-		
-		Functions.emptyOfflinePlayers();
-
-		if(status.equals("Starting")) {
-			onStarting();
-		} else if(status.equals("Playing")) {
-			onPlaying();
-		}
-		
-		tick ++;
-		
-		if(( status.equals("Starting") || status.equals("Playing") ) && Hider.getSize() < 1) {
-			Bukkit.broadcastMessage(messagePrefix + "Game over! All hiders have been found.");
-			Stop.onStop();
-		}
-		if(( status.equals("Starting") || status.equals("Playing") ) && Seeker.getSize() < 1) {
-			Bukkit.broadcastMessage(messagePrefix + "Game has ended as all seekers have quit.");
-			Stop.onStop();
-		}
-	}
-	
-	private static void onStarting() {
-		for(String playerName : Seeker.getEntries()) {
-			Player player = playerList.get(playerName);
-			if(player != null) {
-				player.teleport(new Location(player.getWorld(), spawnPosition.getX(),spawnPosition.getY(),spawnPosition.getZ()));
-			}
-		}
-	}
-	
-	private static void onPlaying() {
-		if(decreaseBorder) {
-			World world = Bukkit.getWorld("world");
-			WorldBorder border = world.getWorldBorder();
-			border.setSize(border.getSize()-100,30);
-			decreaseBorder = false;
-		}
-		if(!tauntPlayer.equals("")) {
-			Player taunted = playerList.get(tauntPlayer);
-			if(taunted != null) {
-				Firework fw = (Firework) taunted.getLocation().getWorld().spawnEntity(taunted.getLocation(), EntityType.FIREWORK);
-				FireworkMeta fwm = fw.getFireworkMeta();
-				fwm.setPower(4);
-		        fwm.addEffect(FireworkEffect.builder()
-		        		.withColor(Color.BLUE)
-		        		.withColor(Color.RED)
-		        		.withColor(Color.YELLOW)
-		        		.with(FireworkEffect.Type.STAR)
-		        		.with(FireworkEffect.Type.BALL)
-		        		.with(FireworkEffect.Type.BALL_LARGE)
-		        		.flicker(true)
-		        		.withTrail()
-		        		.build());
-		        fw.setFireworkMeta(fwm);
-		        Bukkit.getServer().broadcastMessage(ChatColor.YELLOW + "Taunt >" + ChatColor.WHITE + " Taunt has been activated");
-			}
-			tauntPlayer = "";
-		}
-		for(Player player : playerList.values()) {
-			player.addPotionEffect(new PotionEffect(PotionEffectType.DOLPHINS_GRACE, 1000000, 1, false, false));
-		}
-		for(String playerName : Seeker.getEntries()) {
-			Player player = playerList.get(playerName);
-			if(player != null) {
-				player.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, 1000000, 2, false, false));
-				player.addPotionEffect(new PotionEffect(PotionEffectType.JUMP, 1000000, 1, false, false));
-				player.addPotionEffect(new PotionEffect(PotionEffectType.SLOW_FALLING, 1000000, 1, false, false));
-				player.addPotionEffect(new PotionEffect(PotionEffectType.WATER_BREATHING, 1000000, 10, false, false));
-			}
-			if(glowTime > 0) {
-				player.addPotionEffect(new PotionEffect(PotionEffectType.GLOWING, 1000000, 1, false, false));
-			} else {
-				player.removePotionEffect(PotionEffectType.GLOWING);
-			}
-		}
-		for(String playerName : Hider.getEntries()) {
-			Player player = playerList.get(playerName);
-			if(player != null) {
-				player.addPotionEffect(new PotionEffect(PotionEffectType.WATER_BREATHING, 1000000, 1, false, false));
-			}
-			int distance = 100;
-			for(String seekerName : Seeker.getEntries()) {
-				Player seeker = playerList.get(seekerName);
-				int temp = (int) player.getLocation().distance(seeker.getLocation());
-				if(distance > temp) {
-					distance = temp;
-				}
-			}
-			switch(tick%10) {
-				case 0:
-					if(distance < 30) Functions.playSound(player, Sound.BLOCK_NOTE_BLOCK_BASEDRUM, .5f, 1f);
-					if(distance < 10) Functions.playSound(player, Sound.BLOCK_NOTE_BLOCK_BIT, .3f, 1f);
-					break;
-				case 3:
-					if(distance < 30) Functions.playSound(player, Sound.BLOCK_NOTE_BLOCK_BASEDRUM, .3f, 1f);
-					if(distance < 10) Functions.playSound(player, Sound.BLOCK_NOTE_BLOCK_BIT, .3f, 1f);
-					break;
-				case 6:
-					if(distance < 10) Functions.playSound(player, Sound.BLOCK_NOTE_BLOCK_BIT, .3f, 1f);
-					break;
-				case 9:
-					if(distance < 20) Functions.playSound(player, Sound.BLOCK_NOTE_BLOCK_BIT, .3f, 1f);
-					break;
-			}
-		}
-	}
-	
-}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/manager/WorldborderManager.java b/src/main/java/net/tylermurphy/hideAndSeek/manager/WorldborderManager.java
deleted file mode 100644
index c695d1d..0000000
--- a/src/main/java/net/tylermurphy/hideAndSeek/manager/WorldborderManager.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package net.tylermurphy.hideAndSeek.manager;
-
-import static net.tylermurphy.hideAndSeek.Store.*;
-
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.WorldBorder;
-
-import net.md_5.bungee.api.ChatColor;
-import net.tylermurphy.hideAndSeek.Main;
-
-public class WorldborderManager {
-
-	public static void schedule() {
-		
-		Bukkit.getServer().getScheduler().runTaskAsynchronously(Main.plugin, new Runnable(){
-
-			public void run() {
-				int temp = gameId;
-				while(true) {
-					try { Thread.sleep(1000*60*worldborderDelay); } catch (InterruptedException e) {}
-					if(gameId != temp) break;
-					if(currentWorldborderSize-100 > 100) {
-						Bukkit.getServer().broadcastMessage(ChatColor.RED + "World Border> " + ChatColor.WHITE + "Worldborder decreacing by 100 blocks over the next 30s");
-						currentWorldborderSize -= 100;
-						decreaseBorder = true;
-					} else {
-						break;
-					}
-				}
-			}
-		});
-	}
-	
-	public static void reset() {
-		if(worldborderEnabled) {
-			World world = Bukkit.getWorld("world");
-			WorldBorder border = world.getWorldBorder();
-			border.setSize(worldborderSize);
-			border.setCenter(worldborderPosition.getX(), worldborderPosition.getZ());
-			currentWorldborderSize = worldborderSize;
-		} else {
-			World world = Bukkit.getWorld("world");
-			WorldBorder border = world.getWorldBorder();
-			border.setSize(30000000);
-			border.setCenter(0, 0);
-		}
-	}
-	
-}