Added more Dungeon Party Finder related features

- clearer party indicators
- size of parties
- 'carry' parties
- lookup party members when joining another party
- Added active pet + found dungeon secrets to dungeon player lookup

2 files changed, 19 insertions, 0 deletions

diff --git a/src/main/java/de/cowtipper/cowlection/data/HyPlayerData.java b/src/main/java/de/cowtipper/cowlection/data/HyPlayerData.java
index 96c3325..5a7c168 100644
--- a/src/main/java/de/cowtipper/cowlection/data/HyPlayerData.java
+++ b/src/main/java/de/cowtipper/cowlection/data/HyPlayerData.java
@@ -2,6 +2,8 @@ package de.cowtipper.cowlection.data;
 
 import net.minecraft.util.EnumChatFormatting;
 
+import java.util.Map;
+
 @SuppressWarnings("unused")
 public class HyPlayerData {
     private String displayname;
@@ -14,6 +16,7 @@ public class HyPlayerData {
     private long lastLogin;
     private long lastLogout;
     private String mostRecentGameType;
+    private Map<String, Integer> achievements;
 
     /**
      * No-args constructor for GSON
@@ -41,6 +44,13 @@ public class HyPlayerData {
         return DataHelper.GameType.getFancyName(mostRecentGameType);
     }
 
+    public int getAchievement(String achievementName) {
+        if (achievements != null) {
+            return achievements.getOrDefault(achievementName, 0);
+        }
+        return 0;
+    }
+
     public boolean hasNeverJoinedHypixel() {
         // example player that has never joined Hypixel (as of April 2020): Joe
         return rank == null && lastLogin == 0;
diff --git a/src/main/java/de/cowtipper/cowlection/data/HySkyBlockStats.java b/src/main/java/de/cowtipper/cowlection/data/HySkyBlockStats.java
index 7ebd894..242c0c3 100644
--- a/src/main/java/de/cowtipper/cowlection/data/HySkyBlockStats.java
+++ b/src/main/java/de/cowtipper/cowlection/data/HySkyBlockStats.java
@@ -200,6 +200,15 @@ public class HySkyBlockStats {
                 return pets;
             }
 
+            public Pet getActivePet() {
+                for (Pet pet : pets) {
+                    if (pet.isActive()) {
+                        return pet;
+                    }
+                }
+                return null;
+            }
+
             public List<String> getArmor() {
                 NBTTagCompound nbt = inv_armor.getDecodedData();
                 List<String> armorList = new ArrayList<>();