Skip to content

Commit

Permalink
Merge pull request #794 from LifeIsAParadox/update-mod-to-1.21.0-for-…
Browse files Browse the repository at this point in the history
…mc1.21.0

1.21.0 for 1.21.0
  • Loading branch information
LifeIsAParadox authored Jun 23, 2024
2 parents d12504e + 4df6064 commit c87ad26
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ 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
id: skyblocker-version
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
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/crash_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ 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
id: skyblocker-version
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
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/de/hysky/skyblocker/mixins/ItemStackMixin.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/main/java/de/hysky/skyblocker/utils/Http.java
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/skyblocker/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
21 changes: 20 additions & 1 deletion src/main/resources/skyblocker.accesswidener
Original file line number Diff line number Diff line change
@@ -1 +1,20 @@
accessWidener v2 named
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

0 comments on commit c87ad26

Please sign in to comment.