Merge pull request #598 from rettichlp/develop

Release v1.9.0
UnicacityAddon · Mar 12, 2023 · fce72a7 · fce72a7
2 parents e6863a3 + f51ba45
commit fce72a7
Show file tree

Hide file tree

Showing 100 changed files with 3,644 additions and 1,604 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-oder-fehler.md b/.github/ISSUE_TEMPLATE/bug-oder-fehler.md
@@ -25,4 +25,4 @@ Füge gegebenenfalls Screenshots hinzu, um das Problem zu erläutern.
 
 **Weitere Informationen (bitte ausfüllen):**
 Minecraft Version: `1.12.2`
-Addon Version: `1.8.4`
+Addon Version: `1.9.0`
diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'idea'
 apply plugin: 'maven-publish'
 
-version = '1.8.4'
+version = '1.9.0'
 group = 'com.rettichlp' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'UnicacityAddon'
 

diff --git a/src/main/java/com/rettichlp/unicacityaddon/UnicacityAddon.java b/src/main/java/com/rettichlp/unicacityaddon/UnicacityAddon.java
@@ -1,20 +1,22 @@
 package com.rettichlp.unicacityaddon;
 
+import com.rettichlp.unicacityaddon.base.abstraction.AbstractionLayer;
 import com.rettichlp.unicacityaddon.base.api.Syncer;
 import com.rettichlp.unicacityaddon.base.api.TokenManager;
-import com.rettichlp.unicacityaddon.base.api.checks.BroadcastChecker;
 import com.rettichlp.unicacityaddon.base.config.Config;
 import com.rettichlp.unicacityaddon.base.manager.FileManager;
 import com.rettichlp.unicacityaddon.base.registry.CommandRegistry;
 import com.rettichlp.unicacityaddon.base.registry.EventRegistry;
 import com.rettichlp.unicacityaddon.base.registry.KeyBindRegistry;
 import com.rettichlp.unicacityaddon.base.registry.ModuleRegistry;
 import com.rettichlp.unicacityaddon.base.teamspeak.TSClientQuery;
+import com.rettichlp.unicacityaddon.base.text.ColorCode;
+import com.rettichlp.unicacityaddon.base.text.Message;
 import com.rettichlp.unicacityaddon.base.utils.UpdateUtils;
-import com.rettichlp.unicacityaddon.events.chatlog.ChatLogReceiveChatEventHandler;
-import com.rettichlp.unicacityaddon.events.chatlog.ChatLogSendChatEventHandler;
 import com.rettichlp.unicacityaddon.events.RenderTagEventHandler;
 import com.rettichlp.unicacityaddon.events.TabListEventHandler;
+import com.rettichlp.unicacityaddon.events.chatlog.ChatLogReceiveChatEventHandler;
+import com.rettichlp.unicacityaddon.events.chatlog.ChatLogSendChatEventHandler;
 import net.labymod.api.LabyModAddon;
 import net.labymod.ingamegui.ModuleCategoryRegistry;
 import net.labymod.settings.elements.SettingsElement;
@@ -34,7 +36,7 @@
 @Mod(name = "UnicacityAddon", modid = "unicacityaddon", version = UnicacityAddon.VERSION, clientSideOnly = true, acceptedMinecraftVersions = "[1.12,1.12.2]")
 public class UnicacityAddon extends LabyModAddon {
 
-    public static final String VERSION = "1.8.4";
+    public static final String VERSION = "1.9.0";
     public static final Minecraft MINECRAFT = Minecraft.getMinecraft();
     public static UnicacityAddon ADDON;
     public static final Logger LOGGER = LogManager.getLogger();
@@ -60,7 +62,6 @@ public void onEnable() {
         ADDON.getApi().getEventManager().register(new ChatLogSendChatEventHandler());
         ADDON.getApi().getEventManager().register(new ChatLogReceiveChatEventHandler());
 
-        BroadcastChecker.start();
         TokenManager.createToken();
         Syncer.syncAll();
 
@@ -92,4 +93,13 @@ public static boolean isUnicacity() {
 
         return ip.toLowerCase().endsWith("unicacity.de");
     }
+
+    public static void debug(String debugMessage) {
+        AbstractionLayer.getPlayer().sendMessage(Message.getBuilder()
+                .of("[").color(ColorCode.DARK_GRAY).advance()
+                .of("DEBUG").color(ColorCode.YELLOW).advance()
+                .of("]").color(ColorCode.DARK_GRAY).advance().space()
+                .add(debugMessage)
+                .createComponent());
+    }
 }
diff --git a/src/main/java/com/rettichlp/unicacityaddon/base/abstraction/UPlayer.java b/src/main/java/com/rettichlp/unicacityaddon/base/abstraction/UPlayer.java
@@ -73,4 +73,8 @@ public interface UPlayer {
     void copyToClipboard(String string);
 
     boolean isSuperUser();
+
+    boolean hasGangwar();
+
+    boolean isPrioritizedMember();
 }
diff --git a/src/main/java/com/rettichlp/unicacityaddon/base/abstraction/UPlayerImpl.java b/src/main/java/com/rettichlp/unicacityaddon/base/abstraction/UPlayerImpl.java
@@ -9,7 +9,9 @@
 import com.rettichlp.unicacityaddon.base.registry.SoundRegistry;
 import com.rettichlp.unicacityaddon.base.text.ColorCode;
 import com.rettichlp.unicacityaddon.base.text.Message;
+import com.rettichlp.unicacityaddon.base.utils.ForgeUtils;
 import com.rettichlp.unicacityaddon.base.utils.NavigationUtils;
+import com.rettichlp.unicacityaddon.base.utils.UpdateUtils;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.inventory.Container;
 import net.minecraft.scoreboard.Scoreboard;
@@ -23,7 +25,9 @@
 import java.awt.Toolkit;
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.StringSelection;
+import java.util.Map;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 /**
  * @author RettichLP
@@ -158,7 +162,9 @@ public Faction getFaction() {
     }
 
     @Override
-    public boolean inDuty() {return FactionManager.checkPlayerDuty(getName());}
+    public boolean inDuty() {
+        return FactionManager.checkPlayerDuty(getName());
+    }
 
     @Override
     public int getRank() {
@@ -203,4 +209,33 @@ public boolean isSuperUser() {
         String uuid = getUniqueID().toString().replace("-", "");
         return uuid.equals("25855f4d38744a7fa6ade9e4f3042e19") || uuid.equals("6e49e42eefca4d9389f9f395b887809e");
     }
+
+    @Override
+    public boolean hasGangwar() {
+        return getWorldScoreboard().getObjectiveNames().stream()
+                .anyMatch(s -> s.contains("Angreifer") || s.contains("Verteidiger"));
+    }
+
+    @Override
+    public boolean isPrioritizedMember() {
+        Map<String, Integer> filteredPlayerMap = Syncer.PLAYERFACTIONMAP.entrySet().stream()
+                .filter(e -> e.getValue().equals(getFaction())) // name and faction from faction
+                .map(Map.Entry::getKey) // name of players from faction
+                .filter(s -> ForgeUtils.getOnlinePlayers().contains(s)) // is online
+                .filter(UpdateUtils::hasPlayerLatestAddonVersion) // has supported addon version
+                .collect(Collectors.toMap(s -> s, Syncer.PLAYERRANKMAP::get)); // collect name and rank of players from faction
+
+        boolean hasAnyPlayerHigherRank = filteredPlayerMap.entrySet().stream()
+                .anyMatch(stringIntegerEntry -> stringIntegerEntry.getValue() > getRank()); // has a higher rank than himself
+
+        boolean hasRankPriority = filteredPlayerMap.entrySet().stream()
+                .filter(stringIntegerEntry -> stringIntegerEntry.getValue().equals(getRank()))
+                .map(Map.Entry::getKey)
+                .sorted()
+                .collect(Collectors.toList())
+                .get(0)
+                .equals(getName());
+
+        return !hasAnyPlayerHigherRank && hasRankPriority;
+    }
 }