fix: a lot of style issues found by intellij

Signed-off-by: Daniel Nägele <info@naegele.dev>

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

@@ -53,9 +53,18 @@ import de.butzlabben.missilewars.util.geometry.GameArea;
 import de.butzlabben.missilewars.util.geometry.Geometry;
 import de.butzlabben.missilewars.util.serialization.Serializer;
 import de.butzlabben.missilewars.util.version.VersionUtil;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.function.Consumer;
 import lombok.Getter;
 import lombok.ToString;
-import org.bukkit.*;
+import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Fireball;
 import org.bukkit.entity.Player;
@@ -67,12 +76,6 @@ import org.bukkit.scheduler.BukkitTask;
 import org.bukkit.scoreboard.Scoreboard;
 import org.bukkit.util.Vector;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.function.Consumer;
-
 /**
  * @author Butzlabben
  * @since 01.01.2018
@@ -441,8 +444,7 @@ public class Game {
      * @return true, if it's in the Lobby-Area
      */
     public boolean isInLobbyArea(Location location) {
-        if (!Geometry.isInsideIn(location, lobby.getArea())) return false;
-        return true;
+        return Geometry.isInsideIn(location, lobby.getArea());
     }
 
     /**
@@ -452,8 +454,7 @@ public class Game {
      * @return true, if it's in the Game-Area
      */
     public boolean isInGameArea(Location location) {
-        if (!Geometry.isInsideIn(location, gameArea)) return false;
-        return true;
+        return Geometry.isInsideIn(location, gameArea);
     }
 
     /**
@@ -465,8 +466,7 @@ public class Game {
      * @return true, if it's in the Inner Game-Area
      */
     public boolean isInInnerGameArea(Location location) {
-        if (!Geometry.isInsideIn(location, innerGameArea)) return false;
-        return true;
+        return Geometry.isInsideIn(location, innerGameArea);
     }
 
     /**
@@ -476,8 +476,7 @@ public class Game {
      * @return true, if it's in the game world
      */
     public boolean isInGameWorld(Location location) {
-        if (!Geometry.isInWorld(location, gameArea.getWorld())) return false;
-        return true;
+        return Geometry.isInWorld(location, gameArea.getWorld());
     }
 
     /**

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/misc/MotdManager.java

@@ -57,8 +57,8 @@ public class MotdManager {
             int players = game.getPlayers().values().size();
             int maxPlayers = game.getLobby().getMaxSize();
             motd = ChatColor.translateAlternateColorCodes('&', newMotd)
-                    .replace("%max_players%", "" + maxPlayers)
-                    .replace("%players%", "" + players)
+                    .replace("%max_players%", Integer.toString(maxPlayers))
+                    .replace("%players%", Integer.toString(players))
                     .replace("%prefix%", Messages.getPrefix());
         }
     }

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/misc/RespawnGoldBlock.java

@@ -24,6 +24,9 @@ import de.butzlabben.missilewars.game.Game;
 import de.butzlabben.missilewars.game.enums.GameState;
 import de.butzlabben.missilewars.util.version.BlockSetterProvider;
 import de.butzlabben.missilewars.util.version.VersionUtil;
+import java.util.AbstractMap;
+import java.util.HashMap;
+import java.util.Map;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
@@ -35,10 +38,6 @@ import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerToggleSneakEvent;
 
-import java.util.AbstractMap;
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * @author Butzlabben
  * @since 14.01.2018
@@ -139,7 +138,7 @@ public class RespawnGoldBlock implements Listener {
     private void sendFallProtectionMessage() {
         double seconds = (double) duration / 20;
         if ((seconds == Math.floor(seconds)) && !Double.isInfinite(seconds)) {
-            player.sendMessage(Messages.getMessage("fall_protection").replace("%seconds%", "" + (int) seconds));
+            player.sendMessage(Messages.getMessage("fall_protection").replace("%seconds%", Integer.toString((int) seconds)));
         }
     }
 

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/missile/Missile.java

@@ -24,6 +24,7 @@ import de.butzlabben.missilewars.configuration.Config;
 import de.butzlabben.missilewars.game.Game;
 import de.butzlabben.missilewars.game.missile.paste.PasteProvider;
 import de.butzlabben.missilewars.util.version.VersionUtil;
+import java.io.File;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.bukkit.Location;
@@ -35,8 +36,6 @@ import org.bukkit.inventory.meta.SpawnEggMeta;
 import org.bukkit.material.SpawnEgg;
 import org.bukkit.util.Vector;
 
-import java.io.File;
-
 /**
  * @author Butzlabben
  * @since 06.01.2018
@@ -85,8 +84,7 @@ public class Missile {
 
     public File getSchematic() {
         File missilesFolder = new File(Config.getMissilesFolder());
-        File file = new File(missilesFolder, getSchematicName(false));
-        return file;
+        return new File(missilesFolder, getSchematicName(false));
     }
 
     public String getSchematicName(boolean withoutExtension) {

missilewars-plugin/src/main/java/de/butzlabben/missilewars/util/MoneyUtil.java

@@ -20,14 +20,13 @@ package de.butzlabben.missilewars.util;
 
 import de.butzlabben.missilewars.Logger;
 import de.butzlabben.missilewars.configuration.Messages;
+import java.util.UUID;
 import net.milkbowl.vault.economy.Economy;
 import net.milkbowl.vault.economy.EconomyResponse;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.plugin.RegisteredServiceProvider;
 
-import java.util.UUID;
-
 /**
  * @author Butzlabben
  * @since 13.08.2018
@@ -68,7 +67,7 @@ public class MoneyUtil {
             Logger.WARN.log("Message: " + r.errorMessage);
         } else {
             if (Bukkit.getPlayer(uuid) != null)
-                Bukkit.getPlayer(uuid).sendMessage(Messages.getMessage("money").replace("%money%", money + ""));
+                Bukkit.getPlayer(uuid).sendMessage(Messages.getMessage("money").replace("%money%", Integer.toString(money)));
         }
     }
 }

missilewars-plugin/src/main/java/de/butzlabben/missilewars/util/PlayerDataProvider.java

@@ -21,12 +21,11 @@ package de.butzlabben.missilewars.util;
 import de.butzlabben.missilewars.Logger;
 import de.butzlabben.missilewars.MissileWars;
 import de.butzlabben.missilewars.player.PlayerData;
-import org.bukkit.GameMode;
-import org.bukkit.entity.Player;
-
 import java.io.File;
 import java.util.HashMap;
 import java.util.UUID;
+import org.bukkit.GameMode;
+import org.bukkit.entity.Player;
 
 public class PlayerDataProvider {
 
@@ -77,7 +76,7 @@ public class PlayerDataProvider {
         }
 
         // deleting old data
-        if (data.containsKey(uuid)) data.remove(uuid);
+        data.remove(uuid);
         if (file.exists()) file.delete();
     }
 

missilewars-plugin/src/main/java/de/butzlabben/missilewars/util/SetupUtil.java

@@ -23,10 +23,14 @@ import de.butzlabben.missilewars.MissileWars;
 import de.butzlabben.missilewars.configuration.Config;
 import de.butzlabben.missilewars.configuration.arena.Arena;
 import de.butzlabben.missilewars.game.Arenas;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import java.io.*;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -35,6 +39,8 @@ import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.plugin.java.JavaPlugin;
 
 /**
  * @author Butzlabben
@@ -205,8 +211,7 @@ public class SetupUtil {
      * Extracts a zip entry (file entry)
      *
      * @param zipIn    the input stream
-     * @param filePath
-     * @throws IOException
+     * @param filePath the path to extract it to
      */
     private static void extractFile(ZipInputStream zipIn, String filePath) throws IOException {
         BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(filePath));

missilewars-plugin/src/main/java/de/butzlabben/missilewars/util/geometry/GameArea.java

@@ -37,8 +37,8 @@ public class GameArea {
     
     /**
      * This method creates a new GameArena object.
-     *
-     * The GameArena is a rectangular area. Its border (1 block wide) is 
+     * <p>
+     * The GameArena is a rectangular area. Its border (1 block wide) is
      * still part of the arena (= inside).
      *
      * @param pos1 (Location) one corner of the desired area border
@@ -59,7 +59,7 @@ public class GameArea {
 
     /**
      * This method creates a new GameArena object.
-     *
+     * <p>
      * The GameArena is a rectangular area. Its border (1 block wide) is 
      * still part of the arena (= inside).
      *
@@ -90,7 +90,7 @@ public class GameArea {
 
     /**
      * This method creates a new GameArena object.
-     *
+     * <p>
      * The GameArena is a rectangular area. Its border (1 block wide) is 
      * still part of the arena (= inside).
      *
@@ -154,15 +154,14 @@ public class GameArea {
     }
 
     public AreaConfiguration getAreaConfiguration() {
-        AreaConfiguration newAreaConfig = new AreaConfiguration(position1.getBlockX(), position1.getBlockY(), position1.getBlockZ(), 
+        return new AreaConfiguration(position1.getBlockX(), position1.getBlockY(), position1.getBlockZ(),
                 position2.getBlockX(), position2.getBlockY(), position2.getBlockZ());
-        return newAreaConfig;
     }
 
     /**
      * This method defines the horizontal direction / rotation of the 
      * area based on the alignment of the team spawn points.
-     * 
+     * <p>
      * NORTH-SOUTH = primarily along the Z axis
      * EAST-WEST = primarily along the X axis
      */

missilewars-plugin/src/main/java/de/butzlabben/missilewars/util/geometry/Geometry.java

@@ -55,9 +55,7 @@ public class Geometry {
         if (targetLocation.getBlockY() < area.getMinY()) return false;
 
         if (targetLocation.getBlockZ() > area.getMaxZ()) return false;
-        if (targetLocation.getBlockZ() < area.getMinZ()) return false;
-
-        return true;
+        return targetLocation.getBlockZ() >= area.getMinZ();
     }
 
     /**
@@ -69,8 +67,7 @@ public class Geometry {
      */
     public static boolean bothLocInSameWorld(Location pos1, Location pos2) {
         if ((pos1.getWorld() == null) || (pos2.getWorld() == null)) return false;
-        if (pos1.getWorld().getName().equals(pos2.getWorld().getName())) return true;
-        return false;
+        return pos1.getWorld().getName().equals(pos2.getWorld().getName());
     }
 
     /**

missilewars-plugin/src/main/java/de/butzlabben/missilewars/util/stats/PreFetcher.java

@@ -26,13 +26,17 @@ import de.butzlabben.missilewars.inventory.OrcItem;
 import de.butzlabben.missilewars.inventory.pages.InventoryPage;
 import de.butzlabben.missilewars.inventory.pages.PageGUICreator;
 import de.butzlabben.missilewars.util.version.VersionUtil;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.SkullMeta;
 
-import java.util.*;
-
 public class PreFetcher {
 
     @Getter
@@ -112,7 +116,7 @@ public class PreFetcher {
         }
 
         private PageGUICreator<String> getPreFetchCreator(Collection<String> names) {
-            PageGUICreator<String> creator = new PageGUICreator<>("§ePlayer statistics", names, (item) -> {
+            return new PageGUICreator<>("§ePlayer statistics", names, (item) -> {
                 ItemStack itemStack = new ItemStack(VersionUtil.getPlayerSkullMaterial());
                 SkullMeta sm = (SkullMeta) itemStack.getItemMeta();
                 //noinspection deprecation
@@ -121,7 +125,6 @@ public class PreFetcher {
                 itemStack.setItemMeta(sm);
                 return new OrcItem(itemStack);
             });
-            return creator;
         }
     }
 }