1.0.6

.github/README.md

@@ -32,7 +32,7 @@ Then add the dependency
         <dependency>
             <groupId>com.github.Despical</groupId>
             <artifactId>OITC</artifactId>
-            <version>1.0.5</version>
+            <version>1.0.6</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

CHANGELOG.md

@@ -1,17 +1,29 @@
 ### 1.0.6 Release (29.09.2020)
 * Added more in-game tips.
+* Added missing 1.14, 1.15 and 1.16 items.
 * Added arena selector.
+* Added new death reward.
 * Added death prefix.
 * Added support for 1.16 hex colors
 * Fixed wrong order in bow trails.
 * Fixed NPE when trying to teleport players to lobby location.
 * Fixed update links.
 * Fixed plugin version for PAPI.
+* Fixed player skulls on spectator menu.
 * Fixed update checker.
 * Fixed separate chat.
 * Fixed prefix is not updating on reload with plugin command.
+* Removed system message options.
+* Removed unnecessary command exceptions.
 * Changed MySQL updates to do only one instead of more than nearly 15.
 * Changed message delay of "Waiting for players" from 15 to 45 seconds.
+* Reworked on update checker.
+* Reworked on tab completion.
+* Reworked on spectator settings menu.
+  * Added no speed option.
+  * Added disable night vision option.
+  * Added hide spectators option.
+* Updated dependencies to latest versions.
 * So many improvements for newer version of Java.
 * Made code more readable.
 

pom.xml

@@ -60,13 +60,13 @@
 		<dependency>
 			<groupId>com.github.Despical</groupId>
 			<artifactId>commons-box</artifactId>
-			<version>1.1.2</version>
+			<version>1.1.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.github.Despical</groupId>
 			<artifactId>InventoryFramework</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>me.clip</groupId>
@@ -87,6 +87,7 @@
 			<scope>compile</scope>
 		</dependency>
 	</dependencies>
+
 	<build>
 		<resources>
 			<resource>

src/main/java/me/despical/oitc/ConfigPreferences.java

@@ -1,5 +1,6 @@
 package me.despical.oitc;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -29,9 +30,7 @@ public boolean getOption(Option option) {
 	}
 
 	private void loadOptions() {
-		for (Option option : Option.values()) {
-			options.put(option, plugin.getConfig().getBoolean(option.getPath(), option.getDefault()));
-		}
+		Arrays.stream(Option.values()).forEach(option -> options.put(option, plugin.getConfig().getBoolean(option.getPath(), option.getDefault())));
 	}
 
 	public enum Option {

src/main/java/me/despical/oitc/Main.java

@@ -16,22 +16,18 @@
 import me.despical.oitc.handlers.*;
 import me.despical.oitc.handlers.items.SpecialItem;
 import me.despical.oitc.handlers.rewards.RewardsFactory;
-import me.despical.oitc.handlers.sign.ArenaSign;
 import me.despical.oitc.handlers.sign.SignManager;
 import me.despical.oitc.user.User;
 import me.despical.oitc.user.UserManager;
 import me.despical.oitc.user.data.MysqlManager;
 import me.despical.oitc.utils.*;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.potion.PotionEffect;
 
 import java.io.File;
-import java.util.ArrayList;
 import java.util.Arrays;
 
 /**
@@ -42,7 +38,6 @@
 public class Main extends JavaPlugin {
 
 	private ExceptionLogHandler exceptionLogHandler;
-	private VersionResolver.ServerVersion version;
 	private boolean forceDisable = false;
 	private BungeeManager bungeeManager;	
 	private RewardsFactory rewardsFactory;
@@ -68,7 +63,7 @@ public void onEnable() {
 		if (getConfig().getBoolean("Developer-Mode", false)) {
 			Debugger.deepDebug(true);
 			Debugger.debug("Deep debug enabled");
-			for (String listenable : new ArrayList<>(getConfig().getStringList("Listenable-Performances"))) {
+			for (String listenable : getConfig().getStringList("Listenable-Performances")) {
 				Debugger.monitorPerformance(listenable);
 			}
 		}
@@ -88,21 +83,19 @@ public void onEnable() {
 	}
 
 	private boolean validateIfPluginShouldStart() {
-		version = VersionResolver.resolveVersion();
-
-		if (VersionResolver.isBefore(VersionResolver.ServerVersion.v1_12_R1)) {
+		if (VersionResolver.isCurrentLower(VersionResolver.ServerVersion.v1_12_R1)) {
 			MessageUtils.thisVersionIsNotSupported();
-			Bukkit.getConsoleSender().sendMessage(ChatColor.RED + "Your server version is not supported by One in the Chamber!");
-			Bukkit.getConsoleSender().sendMessage(ChatColor.RED + "Sadly, we must shut off. Maybe you consider changing your server version?");
+			Debugger.sendConsoleMessage("&cYour server version is not supported by One in the Chamber!");
+			Debugger.sendConsoleMessage("&cSadly, we must shut off. Maybe you consider changing your server version?");
 			forceDisable = true;
 			getServer().getPluginManager().disablePlugin(this);
 			return false;
 		} try {
 			Class.forName("org.spigotmc.SpigotConfig");
 		} catch (Exception e) {
 			MessageUtils.thisVersionIsNotSupported();
-			Bukkit.getConsoleSender().sendMessage(ChatColor.RED + "Your server software is not supported by One in the Chamber!");
-			Bukkit.getConsoleSender().sendMessage(ChatColor.RED + "We support only Spigot and Spigot forks only! Shutting off...");
+			Debugger.sendConsoleMessage("&cYour server software is not supported by One in the Chamber!");
+			Debugger.sendConsoleMessage("&cWe support only Spigot and Spigot forks only! Shutting off...");
 			forceDisable = true;
 			getServer().getPluginManager().disablePlugin(this);
 			return false;
@@ -129,19 +122,18 @@ public void onDisable() {
 
 		for (Arena arena : ArenaRegistry.getArenas()) {
 			arena.getScoreboardManager().stopAllScoreboards();
+
 			for (Player player : arena.getPlayers()) {
 				arena.doBarAction(Arena.BarAction.REMOVE, player);
 				arena.teleportToEndLocation(player);
 				player.setFlySpeed(0.1f);
+
 				if (configPreferences.getOption(ConfigPreferences.Option.INVENTORY_MANAGER_ENABLED)) {
 					InventorySerializer.loadInventory(this, player);
 				} else {
 					player.getInventory().clear();
 					player.getInventory().setArmorContents(null);
-					for (PotionEffect pe : player.getActivePotionEffects()) {
-						player.removePotionEffect(pe.getType());
-					}
-
+					player.getActivePotionEffects().forEach(effect -> player.removePotionEffect(effect.getType()));
 					player.setWalkSpeed(0.2f);
 				}
 			}
@@ -167,7 +159,6 @@ private void initializeClasses() {
 
 		userManager = new UserManager(this);
 		Utils.init(this);
-		ArenaSign.init(this);
 		SpecialItem.loadAll();
 		PermissionsManager.init();
 		new SpectatorEvents(this);
@@ -227,47 +218,30 @@ private void checkUpdate() {
 			}
 			if (result.getNewestVersion().contains("b")) {
 				if (getConfig().getBoolean("Update-Notifier.Notify-Beta-Versions", true)) {
-					Bukkit.getConsoleSender().sendMessage("[OITC] Found a new beta version available: v" + result.getNewestVersion());
-					Bukkit.getConsoleSender().sendMessage("[OITC] Download it on SpigotMC:");
-					Bukkit.getConsoleSender().sendMessage("[OITC] https://www.spigotmc.org/resources/one-in-the-chamber-1-12-1-16-3.81185/");
+					Debugger.sendConsoleMessage("[OITC] Found a new beta version available: v" + result.getNewestVersion());
+					Debugger.sendConsoleMessage("[OITC] Download it on SpigotMC:");
+					Debugger.sendConsoleMessage("[OITC] https://www.spigotmc.org/resources/one-in-the-chamber-1-12-1-16-3.81185/");
 				}
+
 				return;
 			}
+
 			MessageUtils.updateIsHere();
-			Bukkit.getConsoleSender().sendMessage("[OITC] Found a new version available: v" + result.getNewestVersion());
-			Bukkit.getConsoleSender().sendMessage("[OITC] Download it SpigotMC:");
-			Bukkit.getConsoleSender().sendMessage("[OITC] https://www.spigotmc.org/resources/one-in-the-chamber-1-12-1-16-3.81185/");
+			Debugger.sendConsoleMessage("[OITC] Found a new version available: v" + result.getNewestVersion());
+			Debugger.sendConsoleMessage("[OITC] Download it SpigotMC:");
+			Debugger.sendConsoleMessage("[OITC] https://www.spigotmc.org/resources/one-in-the-chamber-1-12-1-16-3.81185/");
 		});
 	}
-	
+
 	private void setupFiles() {
 		for (String fileName : Arrays.asList("arenas", "bungee", "rewards", "stats", "lobbyitems", "mysql", "messages")) {
 			File file = new File(getDataFolder() + File.separator + fileName + ".yml");
+
 			if (!file.exists()) {
 				saveResource(fileName + ".yml", false);
 			}
 		}
 	}
-
-	public boolean is1_12_R1() {
-		return version == VersionResolver.ServerVersion.v1_12_R1;
-	}
-
-	public boolean is1_14_R1() {
-		return version == VersionResolver.ServerVersion.v1_14_R1;
-	}
-
-	public boolean is1_15_R1() {
-		return version == VersionResolver.ServerVersion.v1_15_R1;
-	}
-
-	public boolean is1_16_R1() {
-		return version == VersionResolver.ServerVersion.v1_16_R1;
-	}
-
-	public boolean is1_16_R2() {
-		return version == VersionResolver.ServerVersion.v1_16_R2;
-	}
 
 	public RewardsFactory getRewardsFactory() {
 		return rewardsFactory;

src/main/java/me/despical/oitc/api/StatsStorage.java

@@ -5,8 +5,8 @@
 import me.despical.oitc.ConfigPreferences;
 import me.despical.oitc.Main;
 import me.despical.oitc.user.data.MysqlManager;
+import me.despical.oitc.utils.Debugger;
 import me.despical.oitc.utils.MessageUtils;
-import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -47,25 +47,30 @@ public static Map<UUID, Integer> getStats(StatisticType stat) {
 				Map<UUID, Integer> column = new LinkedHashMap<>();
 
 				while (set.next()) {
-					column.put(java.util.UUID.fromString(set.getString("UUID")), set.getInt(stat.getName()));
+					column.put(UUID.fromString(set.getString("UUID")), set.getInt(stat.getName()));
 				}
+
 				return column;
 			} catch (SQLException e) {
 				plugin.getLogger().log(Level.WARNING, "SQL Exception occurred! " + e.getSQLState() + " (" + e.getErrorCode() + ")");
 				MessageUtils.errorOccurred();
-				Bukkit.getConsoleSender().sendMessage("Cannot get contents from MySQL database!");
-				Bukkit.getConsoleSender().sendMessage("Check configuration of mysql.yml file or disable mysql option in config.yml");
+				Debugger.sendConsoleMessage("Cannot get contents from MySQL database!");
+				Debugger.sendConsoleMessage("Check configuration of mysql.yml file or disable mysql option in config.yml");
 				return Collections.emptyMap();
 			}
 		}
+
 		FileConfiguration config = ConfigUtils.getConfig(plugin, "stats");
 		Map<UUID, Integer> stats = new TreeMap<>();
+
 		for (String string : config.getKeys(false)) {
 			if (string.equals("data-version")) {
 				continue;
 			}
+
 			stats.put(UUID.fromString(string), config.getInt(string + "." + stat.getName()));
 		}
+
 		return SortUtils.sortByValue(stats);
 	}
 

src/main/java/me/despical/oitc/api/events/game/OITCGameJoinAttemptEvent.java

@@ -40,6 +40,7 @@ public Player getPlayer() {
 		return player;
 	}
 
+	@Override
 	public HandlerList getHandlers() {
 		return HANDLERS;
 	}

src/main/java/me/despical/oitc/api/events/game/OITCGameLeaveAttemptEvent.java

@@ -29,6 +29,7 @@ public Player getPlayer() {
 		return player;
 	}
 
+	@Override
 	public HandlerList getHandlers() {
 		return HANDLERS;
 	}

src/main/java/me/despical/oitc/api/events/game/OITCGameStartEvent.java

@@ -22,6 +22,7 @@ public static HandlerList getHandlerList() {
 		return HANDLERS;
 	}
 
+	@Override
 	public HandlerList getHandlers() {
 		return HANDLERS;
 	}

src/main/java/me/despical/oitc/api/events/game/OITCGameStateChangeEvent.java

@@ -25,6 +25,7 @@ public static HandlerList getHandlerList() {
 		return HANDLERS;
 	}
 
+	@Override
 	public HandlerList getHandlers() {
 		return HANDLERS;
 	}

src/main/java/me/despical/oitc/api/events/game/OITCGameStopEvent.java

@@ -22,6 +22,7 @@ public static HandlerList getHandlerList() {
 		return HANDLERS;
 	}
 
+	@Override
 	public HandlerList getHandlers() {
 		return HANDLERS;
 	}

src/main/java/me/despical/oitc/api/events/player/OITCPlayerStatisticChangeEvent.java

@@ -31,6 +31,7 @@ public static HandlerList getHandlerList() {
 		return HANDLERS;
 	}
 
+	@Override
 	public HandlerList getHandlers() {
 		return HANDLERS;
 	}