RedstoneFuture 2 tahun lalu
induk
melakukan
dfc4f6c207

+ 3 - 3
missilewars-plugin/src/main/java/de/butzlabben/missilewars/MissileWars.java

@@ -61,7 +61,7 @@ public class MissileWars extends JavaPlugin {
     public PaperCommandManager commandManager;
 
     private boolean foundFAWE;
-    
+
     private PlayerListener playerListener;
     private SignListener signListener;
 
@@ -165,7 +165,7 @@ public class MissileWars extends JavaPlugin {
         // It simply lets it take advantage of Paper specific features if available,
         // such as Asynchronous Tab Completions.
         commandManager = new PaperCommandManager(this);
-        
+
         commandManager.registerCommand(new MWCommands());
         commandManager.registerCommand(new StatsCommands());
         commandManager.registerCommand(new UserCommands());
@@ -187,7 +187,7 @@ public class MissileWars extends JavaPlugin {
     private void deleteTempWorlds() {
         File[] dirs = Bukkit.getWorldContainer().listFiles();
         if (dirs == null) return;
-        
+
         for (File dir : dirs) {
             if (dir.getName().startsWith("mw-")) {
                 try {

+ 22 - 22
missilewars-plugin/src/main/java/de/butzlabben/missilewars/commands/MWCommands.java

@@ -47,16 +47,16 @@ public class MWCommands extends BaseCommand {
     public void mwCommand(CommandSender sender) {
 
         sender.sendMessage(Messages.getPrefix() + "MissileWars v" + MissileWars.getInstance().version + " by Butzlabben");
-        
+
         sendHelpMessage(sender, "mw.vote", "/mw vote", "Vote for a arena.");
         sendHelpMessage(sender, "mw.change", "/mw change <1|2>", "Changes your team.");
         sendHelpMessage(sender, "mw.quit", "/mw quit", "Quit a game.");
-        
+
         sendHelpMessage(sender, "mw.stats", "/mw stats [from] [arena]", "Shows stats.");
         sendHelpMessage(sender, "mw.stats.recommendations", "/mw stats recommendations [from] [arena]", "Shows recommendations.");
         sendHelpMessage(sender, "mw.stats.players", "/mw stats players [from] [arena]", "Shows player list.");
         sendHelpMessage(sender, "mw.stats.list", "/mw stats list [from] [arena]", "Lists history of games.");
-        
+
         sendHelpMessage(sender, "mw.listgames", "/mw listgames", "List the active games.");
         sendHelpMessage(sender, "mw.paste", "/mw paste <missile>", "Pastes a missile.");
         sendHelpMessage(sender, "mw.start", "/mw start [lobby]", "Starts the game.");
@@ -73,22 +73,22 @@ public class MWCommands extends BaseCommand {
     @CommandCompletion("@nothing")
     @CommandPermission("mw.listgames")
     public void listgamesCommand(CommandSender sender, String[] args) {
-        
+
         sender.sendMessage(Messages.getPrefix() + "Current games:");
-        
+
         for (Game game : GameManager.getInstance().getGames().values()) {
             sender.sendMessage("§e " + game.getLobby().getName() + "§7 -- Name: »" + game.getLobby().getDisplayName() + "§7« | Status: " + game.getState());
             sender.sendMessage("§8 - §f" + "Load with startup: §7" + game.getLobby().isAutoLoad());
             sender.sendMessage("§8 - §f" + "Current Arena: §7" + game.getArena().getName() + "§7 -- Name: »" + game.getArena().getDisplayName() + "§7«");
             sender.sendMessage("§8 - §f" + "Total players: §7" + game.getPlayers().size() + "x");
-            sender.sendMessage("§8 - §f" + "Team 1: §7" + game.getTeam1().getColor() + game.getTeam1().getName() 
+            sender.sendMessage("§8 - §f" + "Team 1: §7" + game.getTeam1().getColor() + game.getTeam1().getName()
                     + " §7with " + game.getTeam1().getMembers().size() + " players");
             sender.sendMessage("§8 - §f" + "Team 2: §7" + game.getTeam2().getColor() + game.getTeam2().getName()
                     + " §7with " + game.getTeam2().getMembers().size() + " players");
         }
-        
+
     }
-    
+
     @Subcommand("paste")
     @CommandCompletion("@nothing")
     @CommandPermission("mw.paste")
@@ -96,12 +96,12 @@ public class MWCommands extends BaseCommand {
 
         if (!senderIsPlayer(sender)) return;
         Player player = (Player) sender;
-        
+
         if (args.length < 1) {
             player.sendMessage(Messages.getPrefix() + "§cMissile needed.");
             return;
         }
-        
+
         if (args.length > 1) {
             player.sendMessage(Messages.getPrefix() + "§cToo many arguments.");
             return;
@@ -112,13 +112,13 @@ public class MWCommands extends BaseCommand {
             player.sendMessage(Messages.getMessage("not_in_arena"));
             return;
         }
-        
+
         Missile missile = game.getArena().getMissileConfiguration().getMissileFromName(args[0]);
         if (missile == null) {
             player.sendMessage(Messages.getPrefix() + "§cUnknown missile.");
             return;
         }
-        
+
         MissileFacing missileFacing = MissileFacing.getFacingPlayer(player, game.getArena().getMissileConfiguration());
         missile.paste(player, missileFacing, game);
     }
@@ -151,12 +151,12 @@ public class MWCommands extends BaseCommand {
                 return;
             }
         }
-        
+
         if (game.getState() != GameState.LOBBY) {
             player.sendMessage(Messages.getPrefix() + "§cGame already started");
             return;
         }
-        
+
         if (game.isReady())
             game.startGame();
         else {
@@ -208,12 +208,12 @@ public class MWCommands extends BaseCommand {
                 return;
             }
         }
-        
+
         game.getTeam1().setGameResult(GameResult.DRAW);
         game.getTeam2().setGameResult(GameResult.DRAW);
         if (game.getState() == GameState.INGAME) game.stopGame();
     }
-    
+
     @Subcommand("appendrestart")
     @CommandCompletion("@games")
     @CommandPermission("mw.appendrestart")
@@ -242,7 +242,7 @@ public class MWCommands extends BaseCommand {
                 return;
             }
         }
-        
+
         GameManager.getInstance().getGames().values().forEach(Game::appendRestart);
         sender.sendMessage(Messages.getMessage("restart_after_game"));
     }
@@ -259,7 +259,7 @@ public class MWCommands extends BaseCommand {
             player.sendMessage(Messages.getPrefix() + "§cToo many arguments.");
             return;
         }
-        
+
         Config.load();
         Messages.load();
         Arenas.load();
@@ -278,7 +278,7 @@ public class MWCommands extends BaseCommand {
             player.sendMessage(Messages.getPrefix() + "§cToo many arguments.");
             return;
         }
-        
+
         int i = 0;
         Logger.NORMAL.log("Starting to print debug information for MissileWars v" + MissileWars.getInstance().version);
         for (Game game : GameManager.getInstance().getGames().values()) {
@@ -300,19 +300,19 @@ public class MWCommands extends BaseCommand {
             player.sendMessage(Messages.getPrefix() + "§cToo many arguments.");
             return;
         }
-        
+
         sender.sendMessage(Messages.getPrefix() + "§cWarning - Restarting all games. This may take a while");
         GameManager.getInstance().restartAll();
         sender.sendMessage(Messages.getPrefix() + "Restarted all games.");
     }
-    
+
     static boolean senderIsPlayer(CommandSender sender) {
         if (sender instanceof Player) return true;
 
         sender.sendMessage(Messages.getPrefix() + "§cYou are not a player");
         return false;
     }
-    
+
     static void sendHelpMessage(CommandSender sender, String permission, String command, String description) {
         if (sender instanceof Player) {
             if (!sender.hasPermission(permission)) return;

+ 9 - 9
missilewars-plugin/src/main/java/de/butzlabben/missilewars/commands/SetupCommands.java

@@ -50,7 +50,7 @@ public class SetupCommands extends BaseCommand {
             @CommandCompletion("@nothing")
             public void set(CommandSender sender, String[] args) {
                 if (!senderIsPlayer(sender)) return;
-                
+
                 Config.setFallbackSpawn(player.getLocation());
                 player.sendMessage(Messages.getPrefix() + "§fSet new 'fallbackSpawn' to " + player.getLocation() + ".");
             }
@@ -59,14 +59,14 @@ public class SetupCommands extends BaseCommand {
             @CommandCompletion("@nothing")
             public void teleport(CommandSender sender, String[] args) {
                 if (!senderIsPlayer(sender)) return;
-                
+
                 player.teleport(Config.getFallbackSpawn());
                 player.sendMessage(Messages.getPrefix() + "§fTeleported to 'fallbackSpawn'.");
             }
 
         }
     }
-    
+
     @Subcommand("lobby")
     public class lobbySetupCommands extends BaseCommand {
 
@@ -122,7 +122,7 @@ public class SetupCommands extends BaseCommand {
 
         }
     }
-        
+
     @Subcommand("arena")
     public class arenaSetupCommands extends BaseCommand {
 
@@ -204,7 +204,7 @@ public class SetupCommands extends BaseCommand {
 
         }
     }
-    
+
     /**
      * This method checks if the command sender is a valid ingame player.
      * 
@@ -216,11 +216,11 @@ public class SetupCommands extends BaseCommand {
             player = (Player) sender;
             return true;
         }
-        
+
         sender.sendMessage(Messages.getPrefix() + "§cYou are not a player");
         return false;
     }
-    
+
     /**
      * This method checks if the player execute the command on a valid
      * game world (lobby or area).
@@ -228,7 +228,7 @@ public class SetupCommands extends BaseCommand {
      * @return true, if it's a MissileWars game world
      */
     private boolean isValidGame(String[] args) {
-        
+
         // Check optional game argument:
         if (args.length == 1) {
             game = GameManager.getInstance().getGame(args[0]);
@@ -243,7 +243,7 @@ public class SetupCommands extends BaseCommand {
                 return false;
             }
         }
-        
+
         return true;
     }
 }

+ 5 - 5
missilewars-plugin/src/main/java/de/butzlabben/missilewars/commands/UserCommands.java

@@ -40,7 +40,7 @@ import java.util.Optional;
 
 @CommandAlias("mw|missilewars")
 public class UserCommands extends BaseCommand {
-    
+
     @Subcommand("vote")
     @CommandCompletion("@nothing")
     @CommandPermission("mw.vote")
@@ -85,7 +85,7 @@ public class UserCommands extends BaseCommand {
         game.getVotes().put(arenaName, game.getVotes().get(arenaName) + 1);
         player.sendMessage(Messages.getMessage("vote.success").replace("%map%", arena.get().getDisplayName()));
     }
-    
+
     @Subcommand("change")
     @CommandCompletion("@range:1-2")
     @CommandPermission("mw.change")
@@ -109,7 +109,7 @@ public class UserCommands extends BaseCommand {
             player.sendMessage(Messages.getPrefix() + "§cThe game is not in the right state to change your team right now");
             return;
         }
-        
+
         try {
             MWPlayer mwPlayer = game.getPlayer(player);
             int teamNumber = Integer.parseInt(args[0]);
@@ -130,7 +130,7 @@ public class UserCommands extends BaseCommand {
             player.sendMessage(Messages.getPrefix() + "§c/mw change <1|2>");
         }
     }
-    
+
     @Subcommand("quit|leave")
     @CommandCompletion("@nothing")
     @CommandPermission("mw.quit")
@@ -149,7 +149,7 @@ public class UserCommands extends BaseCommand {
             player.sendMessage(Messages.getMessage("not_in_arena"));
             return;
         }
-        
+
         MissileWars.getInstance().getPlayerListener().registerPlayerArenaLeaveEvent(player, game);
         game.teleportToFallbackSpawn(player);
     }

+ 2 - 2
missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/Lobby.java

@@ -93,7 +93,7 @@ public class Lobby {
                 .map(Optional::get)
                 .collect(Collectors.toList());
     }
-    
+
     public void updateConfig() {
         try {
             Serializer.serialize(file, this);
@@ -101,7 +101,7 @@ public class Lobby {
             throw new RuntimeException(e);
         }
     }
-    
+
     public Location getAreaMinLocation() {
         return new Location(getBukkitWorld(), area.getMinX(), area.getMinY(), area.getMinZ());
     }

+ 1 - 1
missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/Arenas.java

@@ -59,7 +59,7 @@ public class Arenas {
                 Bukkit.getPluginManager().disablePlugin(MissileWars.getInstance());
                 return;
             }
-            files = new File[] {defaultArena};
+            files = new File[]{defaultArena};
         }
 
         for (File config : files) {

+ 4 - 4
missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/Game.java

@@ -242,7 +242,7 @@ public class Game {
 
     public void stopGame() {
         if (Config.isSetup()) return;
-        
+
         Logger.DEBUG.log("Stopping");
 
         for (BukkitTask bt : playerTasks.values()) {
@@ -277,7 +277,7 @@ public class Game {
 
     public void reset() {
         if (Config.isSetup()) return;
-        
+
         if (restart) {
             Bukkit.getServer().spigot().restart();
             return;
@@ -291,11 +291,11 @@ public class Game {
     }
 
     public void disableGameOnServerStop() {
-        
+
         for (MWPlayer mwPlayer : players.values()) {
             teleportToFallbackSpawn(mwPlayer.getPlayer());
         }
-        
+
         gameWorld.unload();
     }
 

+ 13 - 13
missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/GameManager.java

@@ -45,7 +45,7 @@ public class GameManager {
         games.values().forEach(Game::disableGameOnServerStop);
         games.clear();
     }
-    
+
     public void restartAll() {
         games.values().forEach(game -> restartGame(game.getLobby(), false));
     }
@@ -61,7 +61,7 @@ public class GameManager {
         } else {
             File file = new File(Config.getLobbiesFolder() + "/" + Config.getDefaultLobby());
             if (file.exists()) {
-                lobbyFiles = new File[] {file};
+                lobbyFiles = new File[]{file};
             }
         }
         if (lobbyFiles == null) lobbyFiles = new File[0];
@@ -79,7 +79,7 @@ public class GameManager {
                 Bukkit.getPluginManager().disablePlugin(MissileWars.getInstance());
                 return;
             }
-            lobbyFiles = new File[] {file};
+            lobbyFiles = new File[]{file};
         }
 
         for (File lobbyFile : lobbyFiles) {
@@ -98,23 +98,23 @@ public class GameManager {
      */
     private void debugStart(File lobbyFile) {
         Logger.BOOT.log("Try to loading lobby of \"" + lobbyFile.getName() + "\"");
-        
+
         try {
             Lobby lobby = Serializer.deserialize(lobbyFile, Lobby.class);
-            
+
             if (lobby == null) {
                 Logger.ERROR.log("Could not load lobby of \"" + lobbyFile.getName() + "\"");
                 return;
             }
-            
+
             if (getGame(lobby.getName()) != null) {
                 Logger.ERROR.log("A lobby with the same name was already loaded. Names of lobbies must be unique, this lobby will not be loaded");
                 return;
             }
-            
+
             lobby.setFile(lobbyFile);
             restartGame(lobby, false);
-            
+
         } catch (IOException exception) {
             Logger.ERROR.log("Could not load lobby of \"" + lobbyFile.getName() + "\"");
             exception.printStackTrace();
@@ -132,7 +132,7 @@ public class GameManager {
         if (!targetLobby.isAutoLoad() && !forceStart) return;
 
         String targetLobbyName = targetLobby.getName();
-        
+
         // reset the old game
         Game game = getGame(targetLobbyName);
         if (game != null) {
@@ -145,15 +145,15 @@ public class GameManager {
         }
 
         Logger.DEBUG.log("Old Game disabled.");
-        
+
         // read the game lobby configuration and build a new game and lobby from it
         try {
             Lobby lobby = Serializer.deserialize(targetLobby.getFile(), Lobby.class);
             lobby.setFile(targetLobby.getFile());
-            
+
             Logger.BOOTDONE.log("Reloaded lobby \"" + targetLobbyName + "\" (" + targetLobby.getFile().getName() + ")");
             addGame(targetLobbyName, new Game(lobby));
-            
+
         } catch (IOException exception) {
             Logger.ERROR.log("Could not load lobby of \"" + targetLobby.getFile().getName() + "\"");
             exception.printStackTrace();
@@ -163,7 +163,7 @@ public class GameManager {
     public Game getGame(String name) {
         return games.get(name);
     }
-    
+
     public void addGame(String name, Game game) {
         games.put(name, game);
         List<String> gameNames = new ArrayList<>(games.keySet());