Merge pull request #72 from tylermurphy534/1.6.0

1.6.0

1 files changed, 28 insertions, 35 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/Main.java b/src/main/java/net/tylermurphy/hideAndSeek/Main.java
index 69619f1..4d8581f 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/Main.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/Main.java
@@ -23,11 +23,9 @@ import net.tylermurphy.hideAndSeek.configuration.Config;
 import net.tylermurphy.hideAndSeek.configuration.Items;
 import net.tylermurphy.hideAndSeek.configuration.Localization;
 import net.tylermurphy.hideAndSeek.database.Database;
-import net.tylermurphy.hideAndSeek.game.Board;
-import net.tylermurphy.hideAndSeek.game.PlayerLoader;
+import net.tylermurphy.hideAndSeek.game.*;
 import net.tylermurphy.hideAndSeek.game.util.Status;
 import net.tylermurphy.hideAndSeek.util.CommandHandler;
-import net.tylermurphy.hideAndSeek.game.Game;
 import net.tylermurphy.hideAndSeek.game.listener.*;
 import net.tylermurphy.hideAndSeek.util.PAPIExpansion;
 import net.tylermurphy.hideAndSeek.util.TabCompleter;
@@ -36,9 +34,7 @@ import org.bukkit.Location;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.event.Listener;
-import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.plugin.java.JavaPluginLoader;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
@@ -54,43 +50,24 @@ public class Main extends JavaPlugin implements Listener {
 	private static Main instance;
 	private static int version;
 
-	private final Database database;
-	private final Board board;
-
+	private Database database;
+	private Board board;
+	private Disguiser disguiser;
+	private EntityHider entityHider;
 	private Game game;
 
-	public Main() {
-		super();
-		onConstructed();
-		board = new Board();
-		database = new Database();
-	}
-
-	protected Main(JavaPluginLoader loader, PluginDescriptionFile description, File dataFolder, File file) {
-		super(loader, description, dataFolder, file);
-		onConstructed();
-		board = new Board();
-		database = new Database();
-	}
-
-	private void onConstructed(){
-
-		instance = this;
-
-		Matcher matcher = Pattern.compile("MC: \\d\\.(\\d+)").matcher(Bukkit.getVersion());
-		if (matcher.find()) {
-			version = Integer.parseInt(matcher.group(1));
-		} else {
-			throw new IllegalArgumentException("Failed to parse server version from: " + Bukkit.getVersion());
-		}
+	public void onEnable() {
+		Main.instance = this;
+		this.updateVersion();
 
 		Config.loadConfig();
 		Localization.loadLocalization();
 		Items.loadItems();
-	}
-
-	public void onEnable() {
 
+		this.board = new Board();
+		this.database = new Database();
+		this.disguiser = new Disguiser();
+		this.entityHider = new EntityHider(this, EntityHider.Policy.BLACKLIST);
 		this.registerListeners();
 
 		CommandHandler.registerCommands();
@@ -118,17 +95,20 @@ public class Main extends JavaPlugin implements Listener {
 
 		Bukkit.getServer().getMessenger().unregisterOutgoingPluginChannel(this);
 		board.cleanup();
+		disguiser.cleanUp();
 	}
 
 	private void onTick() {
 		if(game.getStatus() == Status.ENDED) game = new Game(board);
 		game.onTick();
+		disguiser.check();
 	}
 
 	private void registerListeners() {
 		getServer().getPluginManager().registerEvents(new BlockedCommandHandler(), this);
 		getServer().getPluginManager().registerEvents(new ChatHandler(), this);
 		getServer().getPluginManager().registerEvents(new DamageHandler(), this);
+		getServer().getPluginManager().registerEvents(new DisguiseHandler(), this);
 		getServer().getPluginManager().registerEvents(new InteractHandler(), this);
 		getServer().getPluginManager().registerEvents(new InventoryHandler(), this);
 		getServer().getPluginManager().registerEvents(new JoinLeaveHandler(), this);
@@ -136,6 +116,15 @@ public class Main extends JavaPlugin implements Listener {
 		getServer().getPluginManager().registerEvents(new PlayerHandler(), this);
 		getServer().getPluginManager().registerEvents(new RespawnHandler(), this);
 	}
+
+	private void updateVersion(){
+		Matcher matcher = Pattern.compile("MC: \\d\\.(\\d+)").matcher(Bukkit.getVersion());
+		if (matcher.find()) {
+			version = Integer.parseInt(matcher.group(1));
+		} else {
+			throw new IllegalArgumentException("Failed to parse server version from: " + Bukkit.getVersion());
+		}
+	}
 	
 	public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, String[] args) {
 		return CommandHandler.handleCommand(sender, args);
@@ -165,6 +154,10 @@ public class Main extends JavaPlugin implements Listener {
 		return game;
 	}
 
+	public Disguiser getDisguiser() { return disguiser; }
+
+	public EntityHider getEntityHider() { return entityHider; }
+
 	public boolean supports(int v){
 		return version >= v;
 	}