4.0.1 (#22)

Removed debug messages Fixed external GroupManagers not being recognized
RoinujNosde · Dec 16, 2020 · d18bb00 · d18bb00
1 parent f1e6844
commit d18bb00
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 36 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>me.roinujnosde</groupId>
     <artifactId>TitansBattle</artifactId>
-    <version>4.0.0-beta</version>
+    <version>4.0.1-beta</version>
     <packaging>jar</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/src/main/java/me/roinujnosde/titansbattle/TitansBattle.java b/src/main/java/me/roinujnosde/titansbattle/TitansBattle.java
@@ -171,11 +171,9 @@ private void registerDependencies() {
 
     private void loadGroupsPlugin() {
         if (Bukkit.getPluginManager().getPlugin("SimpleClans") != null) {
-            groupManager = new SimpleClansGroupManager(this);
-            debug("SimpleClans found.", false);
+            setGroupManager(new SimpleClansGroupManager(this));
         } else if (Bukkit.getPluginManager().getPlugin("Factions") != null) {
-            groupManager = new FactionsGroupManager(this);
-            debug("Factions found.", false);
+            setGroupManager(new FactionsGroupManager(this));
         }
     }
 
@@ -228,6 +226,7 @@ public static TitansBattle getInstance() {
      */
     public void setGroupManager(@NotNull GroupManager groupManager) {
         this.groupManager = groupManager;
+        getLogger().info(String.format("Registered %s", groupManager.getClass().getSimpleName()));
     }
 
     public GameManager getGameManager() {

diff --git a/src/main/java/me/roinujnosde/titansbattle/managers/DatabaseManager.java b/src/main/java/me/roinujnosde/titansbattle/managers/DatabaseManager.java
@@ -25,9 +25,8 @@
 
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
-import me.roinujnosde.titansbattle.dao.GameConfigurationDao;
-import me.roinujnosde.titansbattle.types.Group;
 import me.roinujnosde.titansbattle.TitansBattle;
+import me.roinujnosde.titansbattle.dao.GameConfigurationDao;
 import me.roinujnosde.titansbattle.types.GameConfiguration;
 import me.roinujnosde.titansbattle.types.GroupData;
 import me.roinujnosde.titansbattle.types.Warrior;
@@ -43,7 +42,6 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.*;
-import java.util.function.Function;
 
 /**
  * @author RoinujNosde
@@ -334,12 +332,8 @@ public Warrior getWarrior(@NotNull UUID uuid) {
             }
         }
 
-        Function<UUID, Group> getGroup = null;
-        GroupManager groupManager = plugin.getGroupManager();
-        if (groupManager != null) {
-            getGroup = groupManager::getGroup;
-        }
-        Warrior warrior = new Warrior(player, getGroup, new HashMap<>(), new HashMap<>(), new HashMap<>());
+        Warrior warrior = new Warrior(player, plugin::getGroupManager, new HashMap<>(), new HashMap<>(),
+                new HashMap<>());
         warriors.add(warrior);
         return warrior;
     }
@@ -399,9 +393,7 @@ private void loopThroughWarriors() {
                 OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
                 HashMap<CountType, HashMap<String, Integer>> playerData = players.get(uuid);
 
-                Function<UUID, Group> getGroup = plugin.getGroupManager() != null ? plugin.getGroupManager()::getGroup
-                        : null;
-                Warrior warrior = new Warrior(player, getGroup, playerData.get(CountType.KILLS),
+                Warrior warrior = new Warrior(player, plugin::getGroupManager, playerData.get(CountType.KILLS),
                         playerData.get(CountType.DEATHS), playerData.get(CountType.VICTORIES));
                 warriors.add(warrior);
             }

diff --git a/src/main/java/me/roinujnosde/titansbattle/types/Group.java b/src/main/java/me/roinujnosde/titansbattle/types/Group.java
@@ -61,7 +61,7 @@ public GroupData getData() {
     @Override
     public boolean equals(Object other) {
         if (other instanceof Group) {
-            return getId().equals(((SimpleClansGroup) other).getId());
+            return getId().equals(((Group) other).getId());
         }
         return false;
     }

diff --git a/src/main/java/me/roinujnosde/titansbattle/types/Kit.java b/src/main/java/me/roinujnosde/titansbattle/types/Kit.java
@@ -51,24 +51,14 @@ public void set(@NotNull Player player) {
 
     public static boolean inventoryHasItems(@NotNull Player player) {
         ItemStack[] contents = player.getInventory().getContents();
-        for (int i = 0; i < contents.length; i++) {
-            ItemStack item = contents[i];
-            System.out.println("i = " + i);
+        for (ItemStack item : contents) {
             if (item == null) {
-                System.out.println("item é null");
                 continue;
             }
-            System.out.println("item.getType() = " + item.getType());
             if (item.getType() != Material.AIR) {
-                System.out.println("item não é AIR");
                 return true;
             }
         }
-//        for (ItemStack item : player.getInventory().getContents()) {
-//            if (item != null && !item.getType().toString().contains("AIR")) {
-//                return true;
-//            }
-//        }
         return false;
     }
 

diff --git a/src/main/java/me/roinujnosde/titansbattle/types/Warrior.java b/src/main/java/me/roinujnosde/titansbattle/types/Warrior.java
@@ -23,34 +23,34 @@
  */
 package me.roinujnosde.titansbattle.types;
 
+import me.roinujnosde.titansbattle.managers.GroupManager;
 import org.bukkit.OfflinePlayer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Map;
 import java.util.UUID;
-import java.util.function.Function;
+import java.util.function.Supplier;
 
 /**
  *
  * @author RoinujNosde
  */
 public class Warrior {
 
+    private final Supplier<GroupManager> groupManager;
     private final OfflinePlayer player;
-    // Using a Function here so the Group is always the current when needed
-    private final Function<UUID, Group> getGroup;
     private final Map<String, Integer> kills;
     private final Map<String, Integer> deaths;
     private final Map<String, Integer> victories;
 
     public Warrior(@NotNull OfflinePlayer player,
-                   @Nullable Function<UUID, Group> getGroup,
+                   @NotNull Supplier<GroupManager> groupManager,
                    @NotNull Map<String, Integer> kills,
                    @NotNull Map<String, Integer> deaths,
                    @NotNull Map<String, Integer> victories) {
+        this.groupManager = groupManager;
         this.player = player;
-        this.getGroup = getGroup;
         this.kills = kills;
         this.deaths = deaths;
         this.victories = victories;
@@ -78,10 +78,11 @@ public OfflinePlayer toPlayer() {
 
     @Nullable
     public Group getGroup() {
-        if (getGroup == null) {
+        GroupManager groupManager = this.groupManager.get();
+        if (groupManager == null) {
             return null;
         }
-        return getGroup.apply(player.getUniqueId());
+        return groupManager.getGroup(player.getUniqueId());
     }
 
     public int getKills(@NotNull String game) {