Selaa lähdekoodia

Using of Interfaces for data type

RedstoneFuture 1 vuosi sitten
vanhempi
sitoutus
f5d93014b0

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

@@ -30,10 +30,12 @@ import org.bukkit.Bukkit;
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.Map;
 
 public class Arenas {
 
-    @Getter private static final HashMap<String, Arena> ARENAS = new HashMap<>();
+    @Getter
+    private static final Map<String, Arena> ARENAS = new HashMap<>();
 
     public static void load() {
         ARENAS.clear();

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

@@ -83,7 +83,7 @@ public class Game {
     private final Map<UUID, MWPlayer> players = new HashMap<>();
     private final MapVoting mapVoting = new MapVoting(this);
     private final Lobby lobby;
-    private final HashMap<UUID, BukkitTask> playerTasks = new HashMap<>();
+    private final Map<UUID, BukkitTask> playerTasks = new HashMap<>();
     private GameState state = GameState.LOBBY;
     private Team team1;
     private Team team2;

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

@@ -24,19 +24,21 @@ import de.butzlabben.missilewars.configuration.Config;
 import de.butzlabben.missilewars.configuration.Lobby;
 import de.butzlabben.missilewars.util.geometry.GameArea;
 import de.butzlabben.missilewars.util.serialization.Serializer;
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
 @Getter
 public class GameManager {
 
     @Getter
     private static final GameManager instance = new GameManager();
-    private final HashMap<String, Game> games = new HashMap<>();
+    private final Map<String, Game> games = new HashMap<>();
 
 
     public void disableAll() {

+ 2 - 1
missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/misc/ScoreboardManager.java

@@ -34,6 +34,7 @@ import org.bukkit.scoreboard.Scoreboard;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 // Scoreboard Management: https://www.spigotmc.org/wiki/making-scoreboard-with-teams-no-flicker
 
@@ -61,7 +62,7 @@ public class ScoreboardManager {
 
     @Getter private Scoreboard board;
     private Objective obj;
-    private HashMap<Integer, org.bukkit.scoreboard.Team> teams = new HashMap<>();
+    private Map<Integer, org.bukkit.scoreboard.Team> teams = new HashMap<>();
     private static final String[] COLOR_CODES = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f"};
 
     /**

+ 6 - 4
missilewars-plugin/src/main/java/de/butzlabben/missilewars/inventory/OrcInventory.java

@@ -19,20 +19,22 @@
 package de.butzlabben.missilewars.inventory;
 
 import de.butzlabben.missilewars.Logger;
-import java.util.HashMap;
-import java.util.Map.Entry;
-import java.util.Objects;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.Inventory;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
+
 @Getter
 public abstract class OrcInventory {
 
     protected String title;
-    protected HashMap<Integer, OrcItem> items = new HashMap<>();
+    protected Map<Integer, OrcItem> items = new HashMap<>();
     private int rows;
     private InventoryType type;
     private boolean fill = false;

+ 5 - 3
missilewars-plugin/src/main/java/de/butzlabben/missilewars/inventory/OrcListener.java

@@ -19,8 +19,6 @@
 package de.butzlabben.missilewars.inventory;
 
 import de.butzlabben.missilewars.MissileWars;
-import java.util.HashMap;
-import java.util.UUID;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -28,6 +26,10 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
 /**
  * @author Butzlabben
  * @since 10.06.2018
@@ -36,7 +38,7 @@ public class OrcListener implements Listener {
 
     private static OrcListener instance;
 
-    private final HashMap<UUID, OrcInventory> invs = new HashMap<>();
+    private final Map<UUID, OrcInventory> invs = new HashMap<>();
 
     private OrcListener() {
         Bukkit.getPluginManager().registerEvents(this, MissileWars.getInstance());

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

@@ -21,16 +21,18 @@ 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.Map;
 import java.util.UUID;
-import org.bukkit.GameMode;
-import org.bukkit.entity.Player;
 
 public class PlayerDataProvider {
 
     private static final PlayerDataProvider instance = new PlayerDataProvider();
-    private final HashMap<UUID, PlayerData> data = new HashMap<>();
+    private final Map<UUID, PlayerData> data = new HashMap<>();
     private final File playerDataDirectory;
 
     private PlayerDataProvider() {

+ 6 - 17
missilewars-plugin/src/main/java/de/butzlabben/missilewars/util/stats/GameProfileBuilder.java

@@ -18,32 +18,21 @@
 
 package de.butzlabben.missilewars.util.stats;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
+import com.google.gson.*;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;
 import com.mojang.authlib.properties.PropertyMap;
 import com.mojang.util.UUIDTypeAdapter;
+import lombok.Getter;
+import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.lang.reflect.Type;
 import java.net.URL;
 import java.net.URLConnection;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import lombok.Getter;
-import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
+import java.util.*;
 
 /**
  * @author Butzlabben
@@ -56,7 +45,7 @@ public class GameProfileBuilder {
             .registerTypeAdapter(GameProfile.class, new GameProfileSerializer())
             .registerTypeAdapter(PropertyMap.class, new PropertyMap.Serializer()).create();
     @Getter
-    private static final HashMap<UUID, CachedProfile> cache = new HashMap<>();
+    private static final Map<UUID, CachedProfile> cache = new HashMap<>();
     private static final Object sync = new Object();
     private static long cacheTime = -1L;