diff options
| author | Yasin <LifeIsAParadox@users.noreply.github.com> | 2024-06-23 11:52:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-23 11:52:24 +0200 |
| commit | c87ad261a1c6ce976573b660a65e71ab03bdc106 (patch) | |
| tree | 207e57ef8b50578273a2a3655231c03a9f993291 /src/main/java/de/hysky | |
| parent | d12504ef9992a72de9eb3c3a930c9f3c855c0acc (diff) | |
| parent | 4df60642e16ac22b640c09fd9c16cc24c4b90f9c (diff) | |
| download | Skyblocker-c87ad261a1c6ce976573b660a65e71ab03bdc106.tar.gz Skyblocker-c87ad261a1c6ce976573b660a65e71ab03bdc106.tar.bz2 Skyblocker-c87ad261a1c6ce976573b660a65e71ab03bdc106.zip | |
Merge pull request #794 from LifeIsAParadox/update-mod-to-1.21.0-for-mc1.21.0
1.21.0 for 1.21.0
Diffstat (limited to 'src/main/java/de/hysky')
3 files changed, 14 insertions, 0 deletions
diff --git a/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java b/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java index 3abbfbcd..dfee0d24 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java @@ -252,6 +252,18 @@ public abstract class ItemStackMixin implements ComponentHolder, SkyblockerStack return customDataString + "-LIFELINE-MANA_POOL"; } } + + case "MIDAS_SWORD" -> { + if (customData.getInt("winning_bid") >= 50000000) { + return customDataString + "_50M"; + } + } + + case "MIDAS_STAFF" -> { + if (customData.getInt("winning_bid") >= 100000000) { + return customDataString + "_100M"; + } + } } return customDataString; } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java index cc3d2099..49d170b9 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java @@ -57,6 +57,7 @@ public class ItemTooltip { case "CRIMSON_HELMET", "CRIMSON_CHESTPLATE", "CRIMSON_LEGGINGS", "CRIMSON_BOOTS", "AURORA_HELMET", "AURORA_CHESTPLATE", "AURORA_LEGGINGS", "AURORA_BOOTS", "TERROR_HELMET", "TERROR_CHESTPLATE", "TERROR_LEGGINGS", "TERROR_BOOTS" -> apiId = id; + case "MIDAS_SWORD", "MIDAS_STAFF" -> apiId = id; default -> apiId = apiId.replace(":", "-"); } return apiId; diff --git a/src/main/java/de/hysky/skyblocker/utils/Http.java b/src/main/java/de/hysky/skyblocker/utils/Http.java index 99db0316..361bab14 100644 --- a/src/main/java/de/hysky/skyblocker/utils/Http.java +++ b/src/main/java/de/hysky/skyblocker/utils/Http.java @@ -91,6 +91,7 @@ public class Http { public static String sendPostRequest(String url, String requestBody, String contentType) throws IOException, InterruptedException { HttpRequest request = HttpRequest.newBuilder() .POST(BodyPublishers.ofString(requestBody)) + .header("Accept", contentType) .header("Accept-Encoding", "gzip, deflate") .header("Content-Type", contentType) .header("User-Agent", USER_AGENT) |