Merge pull request #847 from UnicacityAddon/develop

Release v2.4.0

Author: rettichlp

.github/ISSUE_TEMPLATE/bug.md

@@ -15,7 +15,7 @@ LabyMod version: `3` `4`
 
 Minecraft version: `1.12.2`
 
-Addon version: `2.3.0`
+Addon version: `2.4.0`
 
 <hr>
 

api/src/main/java/com/rettichlp/unicacityaddon/api/Broadcast.java

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "com.rettichlp.unicacityaddon"
-version = "2.3.0"
+version = "2.4.0"
 
 java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 
@@ -17,7 +17,7 @@ labyMod {
         author = "RettichLP & Dimiikou"
         description = "UnicacityAddon is a LabyMod addon written for the Minecraft server Unicacity and provides specialized, nice-to-have features and utilities for everyday gameplay."
         minecraftVersion = "1.12.2<*"
-        version = System.getenv().getOrDefault("VERSION", "2.3.0")
+        version = System.getenv().getOrDefault("VERSION", "2.4.0")
     }
 
     minecraft {

build.gradle.kts

@@ -9,12 +9,14 @@
 import com.rettichlp.unicacityaddon.base.services.FileService;
 import com.rettichlp.unicacityaddon.base.services.NameTagService;
 import com.rettichlp.unicacityaddon.base.services.NavigationService;
+import com.rettichlp.unicacityaddon.base.services.NotificationService;
 import com.rettichlp.unicacityaddon.base.services.UtilService;
 import com.rettichlp.unicacityaddon.base.services.WebService;
 import com.rettichlp.unicacityaddon.base.teamspeak.TeamSpeakAPI;
 import com.rettichlp.unicacityaddon.controller.DeadBodyController;
 import com.rettichlp.unicacityaddon.controller.GuiController;
 import com.rettichlp.unicacityaddon.controller.PlayerListController;
+import com.rettichlp.unicacityaddon.controller.RenderController;
 import com.rettichlp.unicacityaddon.controller.ScreenshotController;
 import com.rettichlp.unicacityaddon.controller.SoundController;
 import com.rettichlp.unicacityaddon.controller.TransportController;
@@ -37,12 +39,12 @@
  * user-friendliness, an update should not always have to be created for changes to content-related data. I utilize an
  * API to provide data, leveraging a private server. Data is available for the following purposes:
  * <ul>
+ *     <li>activity check <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/activitycheck/LEMILIEU/add">API</a> (unauthorized)</li>
  *     <li>auto nc <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/autonc">API</a> (unauthorized)</li>
  *     <li>addon groups <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/player">API</a></li>
  *     <li>banners <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/banner">API</a></li>
  *     <li>blacklist reasons <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/blacklistreason/LEMILIEU">API</a> (unauthorized)</li>
  *     <li>blackmarket locations <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/blackmarket">API</a></li>
- *     <li>broadcasts <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/broadcast/queue">API</a></li>
  *     <li>events <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/event">API</a></li>
  *     <li>house bans <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/houseban?advanced=false">API</a> (unauthorized for <code>advanced=true</code>)</li>
  *     <li>house ban reasons <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/housebanreason">API</a></li>
@@ -102,6 +104,7 @@ public class UnicacityAddon extends LabyAddon<DefaultUnicacityAddonConfiguration
     private FileService fileService;
     private NameTagService nameTagService;
     private NavigationService navigationService;
+    private NotificationService notificationService;
     private UtilService utilService;
     private WebService webService;
 
@@ -116,6 +119,7 @@ public void load() {
         this.fileService = new FileService(this);
         this.nameTagService = new NameTagService(this);
         this.navigationService = new NavigationService(this);
+        this.notificationService = new NotificationService(this);
         this.utilService = new UtilService(this);
         this.webService = new WebService(this);
 
@@ -130,6 +134,7 @@ protected void enable() {
         this.registry.registerHudWidgets();
         this.registry.registerListeners();
         this.registry.registerCommands();
+        this.registry.registerGangzones();
 
         new Thread(this.teamSpeakAPI::initialize).start();
 
@@ -153,6 +158,10 @@ public PlayerListController playerListController() {
         return controller().getPlayerListController();
     }
 
+    public RenderController renderController() {
+        return controller().getRenderController();
+    }
+
     public ScreenshotController screenshotController() {
         return controller().getScreenshotController();
     }

core/src/main/java/com/rettichlp/unicacityaddon/UnicacityAddon.java

@@ -26,7 +26,7 @@ public NoPushBadge(UnicacityAddon unicacityAddon) {
 
     @Override
     public void render(Stack stack, float x, float y, NetworkPlayerInfo player) {
-        Icon icon = Icon.sprite16(ResourceLocation.create("unicacityaddon", "themes/vanilla/textures/badges.png"), 0, 0);
+        Icon icon = Icon.sprite16(ResourceLocation.create("unicacityaddon", "themes/vanilla/textures/sprite/badges.png"), 0, 0);
         icon.render(stack, x + 3, y + 1, 6);
     }
 

core/src/main/java/com/rettichlp/unicacityaddon/badge/NoPushBadge.java

@@ -0,0 +1,38 @@
+package com.rettichlp.unicacityaddon.badge;
+
+import com.rettichlp.unicacityaddon.UnicacityAddon;
+import com.rettichlp.unicacityaddon.base.enums.api.AddonGroup;
+import com.rettichlp.unicacityaddon.base.registry.annotation.UCBadge;
+import net.labymod.api.client.entity.player.badge.renderer.BadgeRenderer;
+import net.labymod.api.client.gui.icon.Icon;
+import net.labymod.api.client.network.NetworkPlayerInfo;
+import net.labymod.api.client.render.matrix.Stack;
+import net.labymod.api.client.resources.ResourceLocation;
+
+import java.util.Optional;
+
+/**
+ * @author RettichLP
+ */
+@UCBadge(name = "VipBadge")
+public class VipBadge extends BadgeRenderer {
+
+    private final UnicacityAddon unicacityAddon;
+
+    public VipBadge(UnicacityAddon unicacityAddon) {
+        this.unicacityAddon = unicacityAddon;
+    }
+
+    @Override
+    public void render(Stack stack, float x, float y, NetworkPlayerInfo player) {
+        Icon icon = Icon.sprite16(ResourceLocation.create("unicacityaddon", "themes/vanilla/textures/sprite/badges.png"), 1, 0);
+        icon.render(stack, x + 3, y + 1, 6);
+    }
+
+    @Override
+    public boolean isVisible(NetworkPlayerInfo player) {
+        return Optional.ofNullable(player.profile().getUsername())
+                .map(s -> AddonGroup.VIP.getMemberList().contains(s))
+                .orElse(false);
+    }
+}

core/src/main/java/com/rettichlp/unicacityaddon/badge/VipBadge.java

@@ -8,8 +8,8 @@
 import net.labymod.api.client.scoreboard.Scoreboard;
 import net.labymod.api.client.world.ClientWorld;
 import net.labymod.api.util.math.vector.FloatVector3;
+import org.jetbrains.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.UUID;
 
 /**
@@ -36,8 +36,6 @@ public interface AddonPlayer {
 
     void sendMessage(Component component);
 
-    void sendAPIMessage(String message, boolean success);
-
     void sendEmptyMessage();
 
     void sendErrorMessage(String message);

core/src/main/java/com/rettichlp/unicacityaddon/base/AddonPlayer.java

@@ -82,15 +82,6 @@ public void sendMessage(Component component) {
         this.unicacityAddon.displayMessage(component);
     }
 
-    @Override
-    public void sendAPIMessage(String message, boolean success) {
-        sendMessage(Message.getBuilder()
-                .prefix()
-                .of("API Response:").color(ColorCode.GRAY).advance().space()
-                .of(message).color(success ? ColorCode.GREEN : ColorCode.RED).advance()
-                .createComponent());
-    }
-
     @Override
     public void sendEmptyMessage() {
         sendMessage("");
@@ -193,7 +184,7 @@ public boolean isSuperUser() {
 
     @Override
     public boolean hasGangwar() {
-        return getScoreboard().getScores(getScoreboard().getObjective(DisplaySlot.SIDEBAR)).stream()
+        return this.unicacityAddon.configuration().gangwar().get() || getScoreboard().getScores(getScoreboard().getObjective(DisplaySlot.SIDEBAR)).stream()
                 .map(ScoreboardScore::getName)
                 .anyMatch(s -> s.contains("Angreifer") || s.contains("Verteidiger"));
     }

core/src/main/java/com/rettichlp/unicacityaddon/base/DefaultAddonPlayer.java

@@ -1,18 +1,23 @@
 package com.rettichlp.unicacityaddon.base.builder;
 
 import com.rettichlp.unicacityaddon.UnicacityAddon;
-import com.rettichlp.unicacityaddon.api.response.Success;
 import com.rettichlp.unicacityaddon.base.enums.Activity;
 import com.rettichlp.unicacityaddon.base.enums.faction.DrugPurity;
 import com.rettichlp.unicacityaddon.base.enums.faction.DrugType;
+import com.rettichlp.unicacityaddon.base.enums.faction.Faction;
 import lombok.NoArgsConstructor;
 
+import java.util.Collection;
+import java.util.List;
+
 /**
  * @author RettichLP
  */
 @NoArgsConstructor
 public class ActivityCheckBuilder {
 
+    private static final Collection<Faction> allowedFactions = List.of(Faction.LEMILIEU);
+
     public static Builder getBuilder(UnicacityAddon unicacityAddon) {
         return new Builder(unicacityAddon);
     }
@@ -68,15 +73,17 @@ public Builder screenshot(String screenshot) {
             return this;
         }
 
-        public Success send() {
-            return this.unicacityAddon.api().sendActivityCheckActivity(
-                    this.activity,
-                    this.type,
-                    this.value,
-                    this.drugType,
-                    this.drugPurity,
-                    this.date,
-                    this.screenshot);
+        public void send() {
+            if (allowedFactions.contains(this.unicacityAddon.player().getFaction())) {
+                this.unicacityAddon.api().sendActivityCheckActivity(
+                        this.activity,
+                        this.type,
+                        this.value,
+                        this.drugType,
+                        this.drugPurity,
+                        this.date,
+                        this.screenshot);
+            }
         }
     }
 }

core/src/main/java/com/rettichlp/unicacityaddon/base/builder/ActivityCheckBuilder.java

@@ -10,8 +10,10 @@
 import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
 import com.rettichlp.unicacityaddon.UnicacityAddon;
+import com.rettichlp.unicacityaddon.api.response.Success;
 import com.rettichlp.unicacityaddon.base.enums.api.ApplicationPath;
 import com.rettichlp.unicacityaddon.base.io.api.APIResponseException;
+import com.rettichlp.unicacityaddon.base.services.NotificationService;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -77,8 +79,7 @@ public Builder parameter(Map<String, String> parameter) {
         public JsonElement send() throws APIResponseException {
             this.preConditionList.removeIf(preCondition -> preCondition);
             if (this.preConditionList.isEmpty()) {
-                String urlString = this.unicacityAddon.webService().createUrl(this.nonProd, this.applicationPath, this.subPath, this.parameter);
-                String response = this.unicacityAddon.webService().sendRequest(urlString);
+                String response = this.unicacityAddon.webService().sendApiRequest(this.nonProd, this.applicationPath, this.subPath, this.parameter);
                 return new JsonParser().parse(response);
             }
             return JsonNull.INSTANCE;
@@ -87,36 +88,38 @@ public JsonElement send() throws APIResponseException {
         public void sendAsync() {
             new Thread(() -> {
                 try {
-                    send();
+                    JsonElement jsonElement = send();
+                    if (jsonElement.isJsonObject()) {
+                        Success success = parse(jsonElement.getAsJsonObject(), Success.class);
+                        this.unicacityAddon.notificationService().sendUnicacityAddonNotification(success.getInfo(), NotificationService.SendState.SUCCESS);
+                    }
                 } catch (APIResponseException e) {
                     e.sendNotification();
-                    this.unicacityAddon.logger().warn(e.getMessage());
+                    this.unicacityAddon.logger().error(e.getMessage());
                 }
             }).start();
         }
 
-        @SuppressWarnings("unchecked")
         public <T> T getAsJsonObjectAndParse(Class<T> responseSchemaClass) {
             try {
                 JsonElement jsonElement = send();
                 return parse(jsonElement.getAsJsonObject(), responseSchemaClass);
             } catch (APIResponseException e) {
+                this.unicacityAddon.logger().error(e.getMessage());
                 e.sendNotification();
-                this.unicacityAddon.logger().warn(e.getMessage());
-                return (T) e.failureResponse();
             } catch (IllegalStateException e) {
                 this.unicacityAddon.logger().info("Precondition(s) failed! Parsing of JSON response skipped for: {}", responseSchemaClass.getSimpleName());
-                return null;
             }
+            return null;
         }
 
         public <T> List<T> getAsJsonArrayAndParse(Class<T> responseSchemaClass) {
             try {
                 JsonElement jsonElement = send();
                 return parse(jsonElement.getAsJsonArray(), responseSchemaClass);
             } catch (APIResponseException e) {
+                this.unicacityAddon.logger().error(e.getMessage());
                 e.sendNotification();
-                this.unicacityAddon.logger().warn(e.getMessage());
             } catch (IllegalStateException e) {
                 this.unicacityAddon.logger().info("Precondition(s) failed! Parsing of JSON response skipped for: {}", responseSchemaClass.getSimpleName());
             }
@@ -129,7 +132,7 @@ private <T> T parse(JsonObject jsonObject, Class<T> responseSchemaClass) throws
             return gson.fromJson(jsonObject, typeToken.getType());
         }
 
-        public <T> List<T> parse(JsonArray jsonArray, Class<T> responseSchemaClass) throws JsonSyntaxException {
+        private <T> List<T> parse(JsonArray jsonArray, Class<T> responseSchemaClass) throws JsonSyntaxException {
             TypeToken<List<T>> typeToken = new TypeToken<List<T>>() {}.where(new TypeParameter<>() {}, responseSchemaClass);
             Gson gson = new Gson();
             return gson.fromJson(jsonArray, typeToken.getType());