From 91c94d0e4c573cfba585abd26a5962b69e2eaa8a Mon Sep 17 00:00:00 2001 From: Yasin Date: Sat, 22 Jun 2024 09:40:06 +0200 Subject: [PATCH 1/7] update --- .github/ISSUE_TEMPLATE/bug_report.yml | 4 ++-- .github/ISSUE_TEMPLATE/crash_report.yml | 4 ++-- CHANGELOG.md | 13 +++++++++++++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 42b083d4b9..b71044a80f 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -35,7 +35,7 @@ body: label: Minecraft Version description: What version of Minecraft are you running? If you do not know what version you are using, look in the bottom left corner of the main menu in game. options: - - "1.20.6" + - "1.21.0" validations: required: true - type: input @@ -43,7 +43,7 @@ body: attributes: label: Skyblocker Version description: What version of Skyblocker are you running? Every part is important! If you do not know what version you are using, look at the file name in your "mods" folder. - placeholder: ex. skyblocker-1.20.3+1.20.6.jar + placeholder: ex. skyblocker-1.21.0+1.21.0.jar validations: required: true - type: textarea diff --git a/.github/ISSUE_TEMPLATE/crash_report.yml b/.github/ISSUE_TEMPLATE/crash_report.yml index 142e131451..44d6b91bc8 100644 --- a/.github/ISSUE_TEMPLATE/crash_report.yml +++ b/.github/ISSUE_TEMPLATE/crash_report.yml @@ -16,7 +16,7 @@ body: label: Minecraft Version description: What version of Minecraft are you running? If you do not know what version you are using, look in the bottom left corner of the main menu in game. options: - - "1.20.6" + - "1.21.0" validations: required: true - type: input @@ -24,7 +24,7 @@ body: attributes: label: Skyblocker Version description: What version of Skyblocker are you running? Every part is important! If you do not know what version you are using, look at the file name in your "mods" folder. - placeholder: ex. skyblocker-1.20.3+1.20.6.jar + placeholder: ex. skyblocker-1.21.0+1.21.0.jar validations: required: true - type: textarea diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b7abf9889..25a813daa5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,17 @@ +# Release 1.21.0 for 1.21.0 + +## Highlight +- Updated to mc 1.21.0 + +## What's Changed +* 1.21 by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/769 +* Api changes the Aaron of the Azure color made by @viciscat in https://github.com/SkyblockerMod/Skyblocker/pull/783 + + +**Full Changelog**: https://github.com/SkyblockerMod/Skyblocker/compare/v1.21.0...v1.21.0+1.21.0 +___ # Release 1.21.0 +mc version 1.20.6 ## Highlight * Chocolate factory helper From b3de949d0ea4a9b03c908ea6ae244923b8a05f29 Mon Sep 17 00:00:00 2001 From: Yasin Date: Sat, 22 Jun 2024 11:20:48 +0200 Subject: [PATCH 2/7] Update ItemStackMixin.java midas sword/staff --- .../de/hysky/skyblocker/mixins/ItemStackMixin.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java b/src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java index 3abbfbcd04..dfee0d24e7 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 String getNeuName() { 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; } From 0e04f586f0b79f5bf4fe5136f6a0d7c243cee1dd Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sat, 22 Jun 2024 14:18:05 -0400 Subject: [PATCH 3/7] Add access wideners for RenderLayer stuff --- src/main/resources/skyblocker.accesswidener | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/resources/skyblocker.accesswidener b/src/main/resources/skyblocker.accesswidener index 2464d6d519..9fcdfa45a3 100644 --- a/src/main/resources/skyblocker.accesswidener +++ b/src/main/resources/skyblocker.accesswidener @@ -1 +1,20 @@ -accessWidener v2 named \ No newline at end of file +accessWidener v2 named + +accessible class net/minecraft/client/render/RenderLayer$MultiPhase +accessible class net/minecraft/client/render/RenderLayer$MultiPhaseParameters +accessible class net/minecraft/client/render/RenderPhase$Transparency +accessible class net/minecraft/client/render/RenderPhase$ShaderProgram +accessible class net/minecraft/client/render/RenderPhase$Texture +accessible class net/minecraft/client/render/RenderPhase$TextureBase +accessible class net/minecraft/client/render/RenderPhase$Texturing +accessible class net/minecraft/client/render/RenderPhase$Lightmap +accessible class net/minecraft/client/render/RenderPhase$Overlay +accessible class net/minecraft/client/render/RenderPhase$Cull +accessible class net/minecraft/client/render/RenderPhase$DepthTest +accessible class net/minecraft/client/render/RenderPhase$WriteMaskState +accessible class net/minecraft/client/render/RenderPhase$Layering +accessible class net/minecraft/client/render/RenderPhase$Target +accessible class net/minecraft/client/render/RenderPhase$LineWidth +accessible class net/minecraft/client/render/RenderPhase$ColorLogic +accessible class net/minecraft/client/render/RenderPhase$OffsetTexturing +accessible class net/minecraft/client/render/RenderPhase$Textures From f31efc991f816a38ee1cd5fe8794f7768a2114b2 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sat, 22 Jun 2024 14:19:59 -0400 Subject: [PATCH 4/7] Add missing Accept header Doesn't affect functionality, but it's more compliant with how HTTP works --- src/main/java/de/hysky/skyblocker/utils/Http.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/de/hysky/skyblocker/utils/Http.java b/src/main/java/de/hysky/skyblocker/utils/Http.java index 99db03163e..361bab1416 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 static HttpHeaders sendHeadRequest(String url) throws IOException, Interr 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) From eec3a969787699862e0aeb392bc34c356474a323 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sat, 22 Jun 2024 14:23:13 -0400 Subject: [PATCH 5/7] Map Midas Sword and Midas staff to original ids for NEU --- .../de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java | 1 + 1 file changed, 1 insertion(+) 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 cc3d20994d..49d170b973 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 static String getNeuName(String id, String apiId) { 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; From b85dec58af3f86647750a8bde3fca7880109d2b3 Mon Sep 17 00:00:00 2001 From: Yasin Date: Sat, 22 Jun 2024 23:39:13 +0200 Subject: [PATCH 6/7] Update en_us.json Added text from biglobot https://discord.com/channels/879732108745125969/950163141482926111/1253977876810829835 --- src/main/resources/assets/skyblocker/lang/en_us.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index a73d523d1f..fcef08d771 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -686,7 +686,7 @@ "skyblocker.api.cache.HIT": "This data was cached!\nIt's %d seconds old.", "skyblocker.api.cache.MISS": "This data wasn't cached!", "skyblocker.api.token.authFailure": "Failed to refresh your Skyblocker API token, some features may not work temporarily!", - "skyblocker.api.token.noProfileKeys": "Failed to get your profile keys! Some features of the mod may not work temporarily :( (Has your game been open for more than 24 hours?)", + "skyblocker.api.token.noProfileKeys": "Failed to get your profile keys! Some features of the mod may not work temporarily :( (Has your game been open for more than 24 hours?). To reactivate these features restart the game", "skyblocker.exotic.crystal": "CRYSTAL", "skyblocker.exotic.fairy": "FAIRY", From 4df60642e16ac22b640c09fd9c16cc24c4b90f9c Mon Sep 17 00:00:00 2001 From: Yasin Date: Sat, 22 Jun 2024 23:53:59 +0200 Subject: [PATCH 7/7] Update en_us.json --- src/main/resources/assets/skyblocker/lang/en_us.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index fcef08d771..a814718ec0 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -686,7 +686,7 @@ "skyblocker.api.cache.HIT": "This data was cached!\nIt's %d seconds old.", "skyblocker.api.cache.MISS": "This data wasn't cached!", "skyblocker.api.token.authFailure": "Failed to refresh your Skyblocker API token, some features may not work temporarily!", - "skyblocker.api.token.noProfileKeys": "Failed to get your profile keys! Some features of the mod may not work temporarily :( (Has your game been open for more than 24 hours?). To reactivate these features restart the game", + "skyblocker.api.token.noProfileKeys": "Failed to get your profile keys! Some features of the mod may not work temporarily :( (Has your game been open for more than 24 hours?). To reactivate these features restart the game.", "skyblocker.exotic.crystal": "CRYSTAL", "skyblocker.exotic.fairy": "FAIRY",