Skip to content
This repository was archived by the owner on Mar 15, 2024. It is now read-only.

Commit 6bd70ca

Browse files
rettichlprettichlp
authored
Merge pull request #865 from UnicacityAddon/hotfix/2-4-1
hotfix/2-4-1
2 parents dc56fb5 + c5b7331 commit 6bd70ca

31 files changed

Lines changed: 124 additions & 103 deletions

‎.github/ISSUE_TEMPLATE/bug.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ assignees: ''
1111
Describe this bug with all information you have... How can it be reproduced? Do you have a crash log? What have you done
1212
before the bug occurred? What did you expect? Do you have screenshots?
1313

14-
LabyMod version: `3` `4`
14+
LabyMod version: `4`
1515

1616
Minecraft version: `1.12.2`
1717

18-
Addon version: `2.4.0`
18+
Addon version: `2.4.1`
1919

2020
<hr>
2121

‎.github/workflows/build.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@ name: Build LabyAddon
22

33
on:
44
push:
5-
branches: [ "develop" ]
5+
branches:
6+
- 'develop'
7+
- 'hotfix/**'
68
pull_request:
7-
branches: [ "develop" ]
9+
branches:
10+
- 'main'
11+
- 'develop'
12+
- 'hotfix/**'
813
workflow_dispatch:
914

1015
jobs:

‎.github/workflows/wiki.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@ name: Build Wiki
22

33
on:
44
push:
5-
branches: [ "develop" ]
5+
branches:
6+
- 'develop'
7+
- 'hotfix/**'
68
pull_request:
7-
branches: [ "develop" ]
9+
branches:
10+
- 'main'
11+
- 'develop'
12+
- 'hotfix/**'
813
workflow_dispatch:
914

1015
jobs:

‎build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
}
66

77
group = "com.rettichlp.unicacityaddon"
8-
version = "2.4.0"
8+
version = "2.4.1"
99

1010
java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
1111

@@ -17,7 +17,7 @@ labyMod {
1717
author = "RettichLP & Dimiikou"
1818
description = "UnicacityAddon is a LabyMod addon written for the Minecraft server Unicacity and provides specialized, nice-to-have features and utilities for everyday gameplay."
1919
minecraftVersion = "1.12.2<*"
20-
version = System.getenv().getOrDefault("VERSION", "2.4.0")
20+
version = System.getenv().getOrDefault("VERSION", "2.4.1")
2121
}
2222

2323
minecraft {

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,22 @@
3939
* user-friendliness, an update should not always have to be created for changes to content-related data. I utilize an
4040
* API to provide data, leveraging a private server. Data is available for the following purposes:
4141
* <ul>
42-
* <li>activity check <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/activitycheck/LEMILIEU/add">API</a> (unauthorized)</li>
43-
* <li>auto nc <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/autonc">API</a> (unauthorized)</li>
44-
* <li>addon groups <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/player">API</a></li>
45-
* <li>banners <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/banner">API</a></li>
46-
* <li>blacklist reasons <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/blacklistreason/LEMILIEU">API</a> (unauthorized)</li>
47-
* <li>blackmarket locations <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/blackmarket">API</a></li>
48-
* <li>events <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/event">API</a></li>
49-
* <li>house bans <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/houseban?advanced=false">API</a> (unauthorized for <code>advanced=true</code>)</li>
50-
* <li>house ban reasons <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/housebanreason">API</a></li>
51-
* <li>users <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/mgmt/users">API</a></li>
52-
* <li>navi points <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/navipoint">API</a></li>
53-
* <li>revives <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/revive">API</a> (unauthorized)</li>
54-
* <li>roleplay <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/roleplay">API</a></li>
55-
* <li>statistics <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/statistic/RettichLP">API</a></li>
56-
* <li>wanted reasons <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/wantedreason">API</a></li>
57-
* <li>yasin <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/yasin">API</a></li>
42+
* <li>activity check <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/activitycheck/LEMILIEU/add">API</a> (unauthorized)</li>
43+
* <li>auto nc <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/autonc">API</a> (unauthorized)</li>
44+
* <li>addon groups <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/player">API</a></li>
45+
* <li>banners <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/banner">API</a></li>
46+
* <li>blacklist reasons <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/blacklistreason/LEMILIEU">API</a> (unauthorized)</li>
47+
* <li>blackmarket locations <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/blackmarket">API</a></li>
48+
* <li>events <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/event">API</a></li>
49+
* <li>house bans <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/houseban?advanced=false">API</a> (unauthorized for <code>advanced=true</code>)</li>
50+
* <li>house ban reasons <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/housebanreason">API</a></li>
51+
* <li>users <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/mgmt/users">API</a></li>
52+
* <li>navi points <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/navipoint">API</a></li>
53+
* <li>revives <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/revive">API</a> (unauthorized)</li>
54+
* <li>roleplay <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/roleplay">API</a></li>
55+
* <li>statistics <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/statistic/RettichLP">API</a></li>
56+
* <li>wanted reasons <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/wantedreason">API</a></li>
57+
* <li>yasin <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/yasin">API</a></li>
5858
* </ul>
5959
* This data can change constantly. Therefore, it cannot be statically entered into the code.
6060
* <p>

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -61,22 +61,22 @@
6161
* user-friendliness, an update should not always have to be created for changes to content-related data. I utilize an
6262
* API to provide data, leveraging a private server. Data is available for the following purposes:
6363
* <ul>
64-
* <li>activity check <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/activitycheck/LEMILIEU/add">API</a> (unauthorized)</li>
65-
* <li>auto nc <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/autonc">API</a> (unauthorized)</li>
66-
* <li>addon groups <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/player">API</a></li>
67-
* <li>banners <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/banner">API</a></li>
68-
* <li>blacklist reasons <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/blacklistreason/LEMILIEU">API</a> (unauthorized)</li>
69-
* <li>blackmarket locations <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/blackmarket">API</a></li>
70-
* <li>events <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/event">API</a></li>
71-
* <li>house bans <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/houseban?advanced=false">API</a> (unauthorized for <code>advanced=true</code>)</li>
72-
* <li>house ban reasons <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/housebanreason">API</a></li>
73-
* <li>users <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/mgmt/users">API</a></li>
74-
* <li>navi points <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/navipoint">API</a></li>
75-
* <li>revives <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/revive">API</a> (unauthorized)</li>
76-
* <li>roleplay <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/roleplay">API</a></li>
77-
* <li>statistics <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/statistic/RettichLP">API</a></li>
78-
* <li>wanted reasons <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/wantedreason">API</a></li>
79-
* <li>yasin <a href="http://rettichlp.de:8888/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/yasin">API</a></li>
64+
* <li>activity check <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/activitycheck/LEMILIEU/add">API</a> (unauthorized)</li>
65+
* <li>auto nc <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/autonc">API</a> (unauthorized)</li>
66+
* <li>addon groups <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/player">API</a></li>
67+
* <li>banners <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/banner">API</a></li>
68+
* <li>blacklist reasons <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/blacklistreason/LEMILIEU">API</a> (unauthorized)</li>
69+
* <li>blackmarket locations <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/blackmarket">API</a></li>
70+
* <li>events <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/event">API</a></li>
71+
* <li>house bans <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/houseban?advanced=false">API</a> (unauthorized for <code>advanced=true</code>)</li>
72+
* <li>house ban reasons <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/housebanreason">API</a></li>
73+
* <li>users <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/mgmt/users">API</a></li>
74+
* <li>navi points <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/navipoint">API</a></li>
75+
* <li>revives <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/revive">API</a> (unauthorized)</li>
76+
* <li>roleplay <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/roleplay">API</a></li>
77+
* <li>statistics <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/statistic/RettichLP">API</a></li>
78+
* <li>wanted reasons <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/wantedreason">API</a></li>
79+
* <li>yasin <a href="https://rettichlp.de:8443/unicacityaddon/v1/dhgpsklnag2354668ec1d905xcv34d9bdee4b877/yasin">API</a></li>
8080
* </ul>
8181
* This data can change constantly. Therefore, it cannot be statically entered into the code.
8282
* <p>
@@ -155,11 +155,14 @@ public void sync(AddonPlayer addonPlayer) {
155155

156156
new Thread(() -> {
157157
try {
158+
// load faction data before api data (it is loaded even if api data loading fails)
159+
this.loadFactionData();
160+
161+
// load token for api requests
158162
this.createToken();
159163

160-
this.loadFactionData();
164+
// load api data
161165
this.loadPlayerData();
162-
163166
this.autoNCList = this.sendAutoNCRequest();
164167
this.blacklistReasonList = this.sendBlacklistReasonRequest();
165168
this.blackMarketLocationList = this.sendBlackMarketLocationRequest();
@@ -186,6 +189,7 @@ private void loadFactionData() {
186189
playerFactionMap.clear();
187190
playerRankMap.clear();
188191
for (Faction faction : Faction.values()) {
192+
long loadTime = System.currentTimeMillis();
189193
String factionWebsiteSource = this.unicacityAddon.factionService().getWebsiteSource(faction);
190194
List<String> nameList = this.unicacityAddon.utilService().list().getAllMatchesFromString(PatternHandler.NAME_PATTERN, factionWebsiteSource);
191195
List<String> rankList = this.unicacityAddon.utilService().list().getAllMatchesFromString(PatternHandler.RANK_PATTERN, factionWebsiteSource);
@@ -196,6 +200,8 @@ private void loadFactionData() {
196200
.replace("<strong>Rang ", "")
197201
.charAt(0))));
198202
});
203+
204+
this.unicacityAddon.logger().info("Loaded faction data for faction {} in {}ms", faction, System.currentTimeMillis() - loadTime);
199205
}
200206
}
201207

@@ -724,10 +730,4 @@ public static <T> T find(Collection<T> elements, Predicate<T> predicate) {
724730
.findFirst()
725731
.orElse(null);
726732
}
727-
728-
private enum Type {
729-
STARTED,
730-
SUCCESS,
731-
FAILURE
732-
}
733733
}

‎core/src/main/java/com/rettichlp/unicacityaddon/base/services/UtilService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public UtilService(UnicacityAddon unicacityAddon) {
5353

5454
@SuppressWarnings("SameReturnValue")
5555
public String version() {
56-
return "2.4.0";
56+
return "2.4.1";
5757
}
5858

5959
public boolean isUnicacity() {

‎core/src/main/java/com/rettichlp/unicacityaddon/base/services/WebService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public String sendApiRequest(boolean nonProd, ApplicationPath applicationPath, S
5959
/**
6060
* Creates an url as {@link String}
6161
*
62-
* @param nonProd If <code>true</code> the url is created on production environment <a href="http://rettichlp.de:8888/unicacityaddon/v1/">http://rettichlp.de:8888/unicacityaddon/v1/</a> otherwise <a href="http://localhost:8888/unicacityaddon/v1/">http://localhost:8888/unicacityaddon/v1/</a>
62+
* @param nonProd If <code>true</code> the url is created on production environment <a href="https://rettichlp.de:8443/unicacityaddon/v1/">https://rettichlp.de:8443/unicacityaddon/v1/</a> otherwise <a href="http://localhost:8888/unicacityaddon/v1/">http://localhost:8888/unicacityaddon/v1/</a>
6363
* @param applicationPath The application type which is requested
6464
* @param subPath The ongoing path parameters for match application requirements
6565
* @param parameter Parameters as {@link Map}, will be mapped as query parameters
@@ -68,7 +68,7 @@ public String sendApiRequest(boolean nonProd, ApplicationPath applicationPath, S
6868
*/
6969
@NotNull
7070
private String createUrl(boolean nonProd, ApplicationPath applicationPath, String subPath, Map<String, String> parameter) {
71-
return (nonProd ? "http://localhost:8888/unicacityaddon/v1/" : "http://rettichlp.de:8888/unicacityaddon/v1/")
71+
return (nonProd ? "https://localhost:8443/unicacityaddon/v1/" : "https://rettichlp.de:8443/unicacityaddon/v1/")
7272
+ this.unicacityAddon.api().getToken()
7373
+ applicationPath.getApplicationPath()
7474
+ (subPath == null ? "" : "/" + subPath)

‎core/src/main/java/com/rettichlp/unicacityaddon/listener/EquipShopListener.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,26 @@ public void onHotkey(HotkeyEvent e) {
7878
this.slotNumber = ScreenRenderListener.lastHoveredSlotNumber;
7979

8080
if (this.slotNumber >= 0) {
81+
boolean lastHoveredSlotItemDisplayNameIsFertilizerOrWater = ScreenRenderListener.lastHoveredSlotItemDisplayName.equals("Dünger") || ScreenRenderListener.lastHoveredSlotItemDisplayName.equals("Wasser");
82+
8183
new Timer().scheduleAtFixedRate(new TimerTask() {
8284
@Override
8385
public void run() {
8486
if (EquipShopListener.this.amountLeft > 0) {
8587
EquipShopListener.this.unicacityAddon.guiController().inventoryClick(slotNumber);
8688
EquipShopListener.this.amountLeft--;
89+
90+
// If the last hovered item was "Dünger" or "Wasser" run "buy"-command
91+
// It isn't executed by Unicacity -> Bug: https://forum.unicacity.de/index.php?thread/109374-blumenladen-kaufverhalten-f%C3%BCr-d%C3%BCnger-und-wasser/
92+
if (EquipShopListener.this.amountLeft > 0 && lastHoveredSlotItemDisplayNameIsFertilizerOrWater) {
93+
p.sendServerMessage("/buy");
94+
}
8795
} else {
8896
this.cancel();
8997
EquipShopListener.this.slotNumber = -1;
9098
}
9199
}
92-
}, 0, period);
100+
}, 0, lastHoveredSlotItemDisplayNameIsFertilizerOrWater ? 1000 : period);
93101
}
94102
} else if (e.getKey().equals(e.hotkeyConfiguration().aEquip().get())) {
95103
this.amountLeft = aEquipAmount;

‎core/src/main/java/com/rettichlp/unicacityaddon/listener/GangwarListener.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ public void run() {
4141
}
4242
}
4343

44-
@Subscribe
44+
// disabled because gangwar score displaying functionality changed on Unicacity
45+
// @Subscribe
4546
public void onUnicacityAddonTick(UnicacityAddonTickEvent e) {
4647
if (e.isPhase(UnicacityAddonTickEvent.Phase.SECOND_30)) {
4748
AddonPlayer p = this.unicacityAddon.player();

0 commit comments

Comments
 (0)