Merge pull request #23 from CubeCrafter/development

1.1.14

Author: CubeCrafter72

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'me.cubecrafter'
-version = '1.1.13'
+version = '1.1.14'
 
 repositories {
     mavenCentral()
@@ -25,7 +25,7 @@ dependencies {
     implementation 'org.bstats:bstats-bukkit:3.0.0'
     implementation 'de.tr7zw:item-nbt-api:2.11.1'
     implementation 'fr.mrmicky:fastboard:1.2.1'
-    implementation 'com.github.cubecrafter:XUtils:1.0.8'
+    implementation 'com.github.cubecrafter:XUtils:1.0.9'
 
     compileOnly 'org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT'
     compileOnly 'me.clip:placeholderapi:2.11.3'

src/main/java/me/cubecrafter/woolwars/WoolWars.java

@@ -22,7 +22,7 @@
 import lombok.Setter;
 import me.cubecrafter.woolwars.arena.ArenaManager;
 import me.cubecrafter.woolwars.arena.TabHandler;
-import me.cubecrafter.woolwars.commands.CommandManager;
+import me.cubecrafter.woolwars.commands.WoolCommand;
 import me.cubecrafter.woolwars.config.Config;
 import me.cubecrafter.woolwars.config.ConfigManager;
 import me.cubecrafter.woolwars.hooks.PlaceholderHook;
@@ -48,7 +48,6 @@ public final class WoolWars extends JavaPlugin {
 
     private ArenaManager arenaManager;
     private ConfigManager configManager;
-    private CommandManager commandManager;
     private Database storage;
     private KitManager kitManager;
     private PlayerManager playerManager;
@@ -75,12 +74,13 @@ public void onEnable() {
         configManager = new ConfigManager(this);
         storage = Config.MYSQL_ENABLED.asBoolean() ? new MySQL() : new SQLite();
         arenaManager = new ArenaManager(this);
-        commandManager = new CommandManager(this);
         kitManager = new KitManager(this);
         playerManager = new PlayerManager(this);
         powerupManager = new PowerUpManager();
         tabHandler = new TabHandler();
 
+        WoolCommand.register();
+
         arenaManager.load();
         kitManager.load();
         powerupManager.load();

src/main/java/me/cubecrafter/woolwars/api/WoolWarsAPI.java

@@ -35,51 +35,51 @@
 @UtilityClass
 public class WoolWarsAPI {
 
-    public Location getLobbyLocation() {
+    public static Location getLobbyLocation() {
         return Config.LOBBY_LOCATION.asLocation();
     }
 
-    public List<Arena> getArenas() {
+    public static List<Arena> getArenas() {
         return ArenaUtil.getArenas();
     }
 
-    public Arena getArenaByPlayer(WoolPlayer player) {
+    public static Arena getArenaByPlayer(WoolPlayer player) {
         return ArenaUtil.getArenaByPlayer(player);
     }
 
-    public Arena getArenaById(String id) {
+    public static Arena getArenaById(String id) {
         return ArenaUtil.getArenaById(id);
     }
 
-    public List<Arena> getArenasByGroup(String group) {
+    public static List<Arena> getArenasByGroup(String group) {
         return ArenaUtil.getArenasByGroup(group);
     }
 
-    public List<String> getGroups() {
+    public static List<String> getGroups() {
         return ArenaUtil.getGroups();
     }
 
-    public Kit getKitById(String id) {
+    public static Kit getKitById(String id) {
         return WoolWars.get().getKitManager().getKit(id);
     }
 
-    public List<Kit> getKits() {
+    public static List<Kit> getKits() {
         return new ArrayList<>(WoolWars.get().getKitManager().getKits());
     }
 
-    public WoolPlayer getPlayer(Player player) {
+    public static WoolPlayer getPlayer(Player player) {
         return PlayerManager.get(player);
     }
 
-    public boolean isPlaying(WoolPlayer player) {
+    public static boolean isPlaying(WoolPlayer player) {
         return ArenaUtil.isPlaying(player);
     }
 
-    public void joinRandomArena(WoolPlayer player) {
+    public static void joinRandomArena(WoolPlayer player) {
         ArenaUtil.joinRandomArena(player);
     }
 
-    public void joinRandomArena(WoolPlayer player, String group) {
+    public static void joinRandomArena(WoolPlayer player, String group) {
         ArenaUtil.joinRandomArena(player, group);
     }
 

src/main/java/me/cubecrafter/woolwars/arena/TabHandler.java

@@ -31,35 +31,17 @@
 
 public class TabHandler {
 
+    private final Scoreboard scoreboard;
     private final BiFunction<String, Team, String> formatter = (tag, team) -> TextUtil.color(tag)
             .replace("{team}", team.getName())
             .replace("{team_color}", team.getTeamColor().getChatColor().toString())
             .replace("{team_letter}", team.getLetter());
 
-    public void applyTags(Team team) {
-        for (Player online : Bukkit.getOnlinePlayers()) {
-            setNameTags(online, team);
-        }
-    }
-
-    public void removeTags(Team team) {
-        for (Player online : Bukkit.getOnlinePlayers()) {
-            team.getMembers().forEach(member -> removeTags(online, member.getPlayer(), team));
-        }
-    }
-
-    public void removeTags(Player player, Team team) {
-        for (Player online : Bukkit.getOnlinePlayers()) {
-            removeTags(online, player, team);
-        }
+    public TabHandler() {
+        this.scoreboard = Bukkit.getScoreboardManager().getNewScoreboard();
     }
 
-    public void onQuit(Player player) {
-        player.getScoreboard().getTeams().forEach(org.bukkit.scoreboard.Team::unregister);
-    }
-
-    private void setNameTags(Player viewer, Team team) {
-        Scoreboard scoreboard = viewer.getScoreboard();
+    public void applyTags(Team team) {
         org.bukkit.scoreboard.Team scoreboardTeam = scoreboard.getTeam(getTeamName(team));
         // Team doesn't exist, create it
         if (scoreboardTeam == null) {
@@ -79,8 +61,12 @@ private void setNameTags(Player viewer, Team team) {
         }
     }
 
-    private void removeTags(Player viewer, Player player, Team team) {
-        org.bukkit.scoreboard.Team scoreboardTeam = viewer.getScoreboard().getTeam(getTeamName(team));
+    public void removeTags(Team team) {
+        team.getMembers().forEach(member -> removeTags(member.getPlayer(), team));
+    }
+
+    public void removeTags(Player player, Team team) {
+        org.bukkit.scoreboard.Team scoreboardTeam = scoreboard.getTeam(getTeamName(team));
         if (scoreboardTeam == null) return;
         scoreboardTeam.removeEntry(player.getName());
         // Remove team if empty
@@ -89,6 +75,10 @@ private void removeTags(Player viewer, Player player, Team team) {
         }
     }
 
+    public void onJoin(Player player) {
+        player.setScoreboard(scoreboard);
+    }
+
     private String getTeamName(Team team) {
         return resize(team.getArena().getTeams().indexOf(team) + "_" + team.getArena().getId());
     }

src/main/java/me/cubecrafter/woolwars/arena/tasks/PreRoundTask.java

@@ -37,7 +37,7 @@
 
 public class PreRoundTask extends ArenaTask {
 
-    private static final KitManager kitManager = WoolWars.get().getKitManager();
+    private static final KitManager KIT_MANAGER = WoolWars.get().getKitManager();
 
     public PreRoundTask(Arena arena) {
         super(arena, Config.PRE_ROUND_DURATION.asInt());
@@ -57,11 +57,12 @@ public void start() {
             player.reset(GameMode.SURVIVAL);
             player.setAbilityUsed(false);
             arena.getPlayers().forEach(other -> player.setVisibility(other, true));
-            // Give previous kit if available, otherwise give random kit
-            Kit kit = player.getSelectedKit() == null ? kitManager.getRandomKit() : player.getSelectedKit();
+            // Give previous kit if available, otherwise give random kit (and also check if the kit can be used)
+            Kit kit = player.getSelectedKit();
+            if (kit == null || !kit.canUse(player)) {
+                kit = KIT_MANAGER.getKits().stream().filter(available -> available.canUse(player)).findAny().orElse(null);
+            }
             kit.addToPlayer(player, arena.getTeam(player));
-            // Update selected kit
-            player.getData().setSelectedKit(kit.getId());
 
             TextUtil.sendActionBarWhile(player.getPlayer(), Messages.SHIFT_TO_SELECT_KIT.asString(), () -> arena.getState() == GameState.PRE_ROUND);
         }

…/commands/subcommands/ArenasCommand.java …ter/woolwars/commands/ArenasCommand.javasrc/main/java/me/cubecrafter/woolwars/commands/subcommands/ArenasCommand.java renamed to src/main/java/me/cubecrafter/woolwars/commands/ArenasCommand.java src/main/java/me/cubecrafter/woolwars/commands/subcommands/ArenasCommand.java renamed to src/main/java/me/cubecrafter/woolwars/commands/ArenasCommand.java

@@ -16,17 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package me.cubecrafter.woolwars.commands.subcommands;
+package me.cubecrafter.woolwars.commands;
 
-import me.cubecrafter.woolwars.commands.SubCommand;
 import me.cubecrafter.woolwars.menu.game.ArenasMenu;
 import me.cubecrafter.woolwars.storage.player.PlayerManager;
 import me.cubecrafter.woolwars.storage.player.WoolPlayer;
+import me.cubecrafter.xutils.commands.SubCommand;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.util.List;
-
 public class ArenasCommand implements SubCommand {
 
     @Override
@@ -35,11 +33,6 @@ public void execute(CommandSender sender, String[] args) {
         new ArenasMenu(player).open();
     }
 
-    @Override
-    public List<String> tabComplete(CommandSender sender, String[] args) {
-        return null;
-    }
-
     @Override
     public String getLabel() {
         return "arenas";