Merge pull request #873 from UnicacityAddon/develop

Release v2.5.0

.github/workflows/build.yml

@@ -7,7 +7,6 @@ on:
       - 'hotfix/**'
   pull_request:
     branches:
-      - 'main'
       - 'develop'
       - 'hotfix/**'
   workflow_dispatch:

.github/workflows/wiki.yml

@@ -7,7 +7,6 @@ on:
       - 'hotfix/**'
   pull_request:
     branches:
-      - 'main'
       - 'develop'
       - 'hotfix/**'
   workflow_dispatch:

README.md

@@ -43,7 +43,7 @@ and on the other hand the support for Minecraft version 1.16.5+.
 ### Supported Versions
 
 > In LabyMod 3 there was no command implementation, so there was used Minecraft Forge for this. In LabyMod 4 is an own
-> command implementation so Minecraft Forge isn't longer needed.
+> command implementation so Minecraft Forge is no longer needed.
 
 #### LabyMod 3
 
@@ -60,12 +60,6 @@ Requires Minecraft Forge: ❌<br>
 Supported Minecraft versions:
 
 - `1.12.2`
-- `1.16.5`
-- `1.17.1`
-- `1.18.2`
-- `1.19.2`
-- `1.19.3`
-- `1.19.4`
 
 ## Installation
 

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "com.rettichlp.unicacityaddon"
-version = "2.4.1"
+version = "2.5.0"
 
 java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 
@@ -16,21 +16,13 @@ labyMod {
         displayName = "UnicacityAddon"
         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.4.1")
+        minecraftVersion = "1.12.2"
+        version = System.getenv().getOrDefault("VERSION", "2.5.0")
     }
 
     minecraft {
         registerVersions(
-                "1.8.9",
-                "1.12.2",
-                "1.16.5",
-                "1.17.1",
-                "1.18.2",
-                "1.19.2",
-                "1.19.3",
-                "1.19.4",
-                "1.20.1"
+                "1.12.2"
         ) { version, provider ->
             configureRun(provider, version)
         }

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

@@ -39,8 +39,6 @@
  * 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="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/activitycheck/LEMILIEU/add">API</a> (unauthorized)</li>
- *     <li>auto nc <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/autonc">API</a> (unauthorized)</li>
  *     <li>addon groups <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/player">API</a></li>
  *     <li>banners <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/banner">API</a></li>
  *     <li>blacklist reasons <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/blacklistreason/LEMILIEU">API</a> (unauthorized)</li>

core/src/main/java/com/rettichlp/unicacityaddon/base/enums/api/ApplicationPath.java

@@ -10,8 +10,6 @@
 @AllArgsConstructor
 public enum ApplicationPath {
 
-    ACTIVITY_CHECK("/activitycheck"),
-    AUTO_NC("/autonc"),
     BANNER("/banner"),
     BLACKLISTREASON("/blacklistreason"),
     BLACKMARKETLOCATION("/blackmarket"),

core/src/main/java/com/rettichlp/unicacityaddon/base/io/api/API.java

@@ -1,7 +1,6 @@
 package com.rettichlp.unicacityaddon.base.io.api;
 
 import com.rettichlp.unicacityaddon.UnicacityAddon;
-import com.rettichlp.unicacityaddon.api.AutoNC;
 import com.rettichlp.unicacityaddon.api.BlackMarketLocation;
 import com.rettichlp.unicacityaddon.api.BlacklistReason;
 import com.rettichlp.unicacityaddon.api.NaviPoint;
@@ -17,15 +16,11 @@
 import com.rettichlp.unicacityaddon.api.player.Player;
 import com.rettichlp.unicacityaddon.api.player.PlayerEntry;
 import com.rettichlp.unicacityaddon.api.statistic.Statistic;
-import com.rettichlp.unicacityaddon.api.statisticTop.StatisticTop;
 import com.rettichlp.unicacityaddon.base.AddonPlayer;
 import com.rettichlp.unicacityaddon.base.builder.RequestBuilder;
-import com.rettichlp.unicacityaddon.base.enums.Activity;
 import com.rettichlp.unicacityaddon.base.enums.api.AddonGroup;
 import com.rettichlp.unicacityaddon.base.enums.api.ApplicationPath;
 import com.rettichlp.unicacityaddon.base.enums.api.StatisticType;
-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 com.rettichlp.unicacityaddon.base.services.NotificationService;
 import com.rettichlp.unicacityaddon.base.text.PatternHandler;
@@ -61,8 +56,6 @@
  * 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="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/activitycheck/LEMILIEU/add">API</a> (unauthorized)</li>
- *     <li>auto nc <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/autonc">API</a> (unauthorized)</li>
  *     <li>addon groups <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/player">API</a></li>
  *     <li>banners <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/banner">API</a></li>
  *     <li>blacklist reasons <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/blacklistreason/LEMILIEU">API</a> (unauthorized)</li>
@@ -120,8 +113,6 @@ public class API {
     private final Map<String, Faction> playerFactionMap = new HashMap<>();
     private final Map<String, Integer> playerRankMap = new HashMap<>();
 
-    @Setter
-    private List<AutoNC> autoNCList = new ArrayList<>();
     @Setter
     private List<BlacklistReason> blacklistReasonList = new ArrayList<>();
     @Setter
@@ -163,7 +154,6 @@ public void sync(AddonPlayer addonPlayer) {
 
                 // load api data
                 this.loadPlayerData();
-                this.autoNCList = this.sendAutoNCRequest();
                 this.blacklistReasonList = this.sendBlacklistReasonRequest();
                 this.blackMarketLocationList = this.sendBlackMarketLocationRequest();
                 this.houseBanList = this.sendHouseBanRequest(this.addonPlayer.getFaction().equals(Faction.RETTUNGSDIENST));
@@ -228,51 +218,6 @@ private void loadPlayerData() {
         }
     }
 
-    public List<AutoNC> sendAutoNCRequest() {
-        return RequestBuilder.getBuilder(this.unicacityAddon)
-                .preCondition(false) // deactivated because Unicacity guidelines
-                .nonProd(this.unicacityAddon.configuration().local().get())
-                .applicationPath(ApplicationPath.AUTO_NC)
-                .getAsJsonArrayAndParse(AutoNC.class);
-    }
-
-    public void sendAutoNCAddRequest(String words, String answer) {
-        RequestBuilder.getBuilder(this.unicacityAddon)
-                .nonProd(this.unicacityAddon.configuration().local().get())
-                .applicationPath(ApplicationPath.AUTO_NC)
-                .subPath(ADD_SUB_PATH)
-                .parameter(Map.of(
-                        "words", words,
-                        "answer", answer))
-                .sendAsync();
-    }
-
-    public void sendAutoNCRemoveRequest(Long id) {
-        RequestBuilder.getBuilder(this.unicacityAddon)
-                .nonProd(this.unicacityAddon.configuration().local().get())
-                .applicationPath(ApplicationPath.AUTO_NC)
-                .subPath(REMOVE_SUB_PATH)
-                .parameter(Map.of(
-                        "id", String.valueOf(id)))
-                .sendAsync();
-    }
-
-    public void sendActivityCheckActivity(Activity activity, String type, String value, DrugType drugType, DrugPurity drugPurity, Long date, String screenshot) {
-        RequestBuilder.getBuilder(this.unicacityAddon)
-                .nonProd(this.unicacityAddon.configuration().local().get())
-                .applicationPath(ApplicationPath.ACTIVITY_CHECK)
-                .subPath(this.addonPlayer.getFaction() + "/add")
-                .parameter(Map.of(
-                        "activity", String.valueOf(activity),
-                        "type", Optional.ofNullable(type).orElse("").replace(" ", "-"),
-                        "value", Optional.ofNullable(value).orElse("").replace(" ", "-"),
-                        "drugType", Optional.ofNullable(drugType).map(DrugType::name).orElse(""),
-                        "drugPurity", String.valueOf(Optional.ofNullable(drugPurity).map(DrugPurity::getPurity).orElse(-1)),
-                        "date", String.valueOf(Optional.ofNullable(date).orElse(0L)),
-                        "screenshot", Optional.ofNullable(screenshot).orElse("").replace(" ", "-")))
-                .sendAsync();
-    }
-
     public void sendBannerAddRequest(@NotNull Faction faction, int x, int y, int z, String naviPoint) {
         RequestBuilder.getBuilder(this.unicacityAddon)
                 .nonProd(this.unicacityAddon.configuration().local().get())
@@ -582,14 +527,6 @@ public void sendStatisticAddRequest(StatisticType statisticType) {
                 .sendAsync();
     }
 
-    public StatisticTop sendStatisticTopRequest() {
-        return RequestBuilder.getBuilder(this.unicacityAddon)
-                .nonProd(this.unicacityAddon.configuration().local().get())
-                .applicationPath(ApplicationPath.STATISTIC)
-                .subPath(TOP_SUB_PATH)
-                .getAsJsonObjectAndParse(StatisticTop.class);
-    }
-
     public void sendTokenCreateRequest(Token token) throws APIResponseException, IOException {
         File addonFile = getAddonFile();
         RequestBuilder.getBuilder(this.unicacityAddon)

core/src/main/java/com/rettichlp/unicacityaddon/base/io/file/Data.java

@@ -2,13 +2,10 @@
 
 import com.rettichlp.unicacityaddon.UnicacityAddon;
 import com.rettichlp.unicacityaddon.base.AddonPlayer;
-import com.rettichlp.unicacityaddon.base.builder.ActivityCheckBuilder;
-import com.rettichlp.unicacityaddon.base.enums.Activity;
 import com.rettichlp.unicacityaddon.base.enums.Weapon;
 import com.rettichlp.unicacityaddon.base.enums.faction.DrugPurity;
 import com.rettichlp.unicacityaddon.base.enums.faction.DrugType;
 import com.rettichlp.unicacityaddon.base.enums.faction.Equip;
-import com.rettichlp.unicacityaddon.base.enums.faction.Faction;
 import com.rettichlp.unicacityaddon.base.events.OfflineDataChangedEvent;
 import com.rettichlp.unicacityaddon.base.text.ColorCode;
 import com.rettichlp.unicacityaddon.base.text.Message;
@@ -181,7 +178,7 @@ public void setTimer(Integer timer) {
     }
 
     public List<TodolistEntry> getTodolist() {
-        return Optional.ofNullable(todolist).orElse(new ArrayList<>());
+        return Optional.ofNullable(this.todolist).orElse(new ArrayList<>());
     }
 
     /**
@@ -338,14 +335,6 @@ public void addEquipToEquipMap(Equip equip) {
         newEquipMap.put(equip, newEquipMap.getOrDefault(equip, 0) + 1);
         equipMap = newEquipMap;
         saveAndFireEvent();
-
-        if (unicacityAddon.player().getFaction().equals(Faction.LEMILIEU)) {
-            ActivityCheckBuilder.getBuilder(unicacityAddon)
-                    .activity(Activity.EQUIP_ADD)
-                    .type(equip.getEquipName())
-                    .value(String.valueOf(equip.getPrice(unicacityAddon.configuration())))
-                    .send();
-        }
     }
 
     /**