diff options
73 files changed, 2109 insertions, 678 deletions
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index d7447766..3dac97b4 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -15,9 +15,9 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - - uses: actions/github-script@v2 + - uses: actions/github-script@v6 with: result-encoding: string script: | @@ -27,18 +27,29 @@ jobs: fs.writeFileSync("./gradle.properties", file); - name: Set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: - distribution: 'adopt' + distribution: 'microsoft' java-version: '17' + - name: Initialize caches + uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/loom-cache + ~/.gradle/wrapper + key: ${{ runner.os }}-build-external-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-build-external- + - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle run: ./gradlew build - - uses: actions/github-script@v2 + - uses: actions/github-script@v6 id: fname with: result-encoding: string @@ -46,7 +57,7 @@ jobs: const fs = require("fs") return fs.readdirSync("build/libs/").filter(e => !e.endsWith("dev.jar") && !e.endsWith("sources.jar") && e.endsWith(".jar"))[0].replace(".jar", ""); - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: ${{ steps.fname.outputs.result }} path: build/libs/
\ No newline at end of file diff --git a/.github/workflows/buildrelease.yml b/.github/workflows/buildrelease.yml index d79c40e8..2428e2b5 100644 --- a/.github/workflows/buildrelease.yml +++ b/.github/workflows/buildrelease.yml @@ -17,11 +17,11 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: - distribution: 'adopt' + distribution: 'microsoft' java-version: '17' - name: Grant execute permission for gradlew @@ -30,7 +30,7 @@ jobs: - name: Build with Gradle run: ./gradlew build - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: Artifacts path: build/libs/ @@ -40,6 +40,14 @@ jobs: shell: bash run: | CHANGELOG=$(sed '/___/Q' CHANGELOG.md) + CHANGELOG=$(echo "$CHANGELOG" | sed 1d) + + CHANGELOGtmp="${CHANGELOG//'%'/'%25'}" + CHANGELOGtmp="${CHANGELOGtmp//$'\n'/'%0A'}" + CHANGELOGtmp="${CHANGELOGtmp//$'\r'/'%0D'}" + + echo "::set-output name=changelog::$CHANGELOGtmp" + echo "Changelog:\n$CHANGELOG" changelog="${CHANGELOG}" @@ -84,9 +92,9 @@ jobs: CHANGELOG="${CHANGELOG//$'\n'/'%0A'}" CHANGELOG="${CHANGELOG//$'\r'/'%0D'}" - echo "::set-output name=changelog::$CHANGELOG" + echo "::set-output name=changelog_discord::$CHANGELOG" - - uses: actions/github-script@v2 + - uses: actions/github-script@v6 id: fname with: result-encoding: string @@ -121,13 +129,11 @@ jobs: uses: Ilshidur/action-discord@master with: args: | - "@here" - "Skyblocker ${{ steps.version_tag.outputs.value }}" + "<@&1134565945482948638>" + "## Skyblocker ${{ steps.version_tag.outputs.value }}" + "" + "${{ steps.read_changelog.outputs.changelog_discord }}" "" - "Changelog" - "```md" - "${{ steps.read_changelog.outputs.changelog }}" - "```" ":inbox_tray: Download latest version on Modrinth or Github:" "<:modrinth:900697862206287882> <${{ steps.modrinth.outputs.url }}>" "<:github:900697885706952725> <${{ steps.uploadrelease.outputs.url }}>" diff --git a/CHANGELOG.md b/CHANGELOG.md index 59b3fd68..2957090f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,54 @@ +# Release 1.11.0 + +## Highlight +* Crimson Isle, Rift, Garden visitor Tab Hud Improvements by @AzureAaron +* Fairy Souls Helper by @kevinthegreat1 +* Experiments Solvers by @kevinthegreat1 +* Mirrorverse Waypoints by @AzureAaron +* Implement Vampire Slayer Features by @Futuremappermydud + +## What's Changed +* Rename zh_Hant.json to zh_tw.json by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/178 +* Add sound notification to fishing helper by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/179 +* 1.20 Port by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/150 +* Crimson Isle Tab Hud Improvements by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/183 +* DiscordRPC bug fixes and improvements by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/184 +* Fairy Souls Helper by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/167 +* Added Rift Tab Hud + 1 Rift related fix by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/185 +* Fix recipe book search field not being selectable by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/187 +* Fix chat ad filter by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/188 +* Workflow fix discord character limit by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/180 +* Experiments Solvers by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/186 +* Add Mirrorverse Waypoints + Rift Fixes by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/189 +* Implement Vampire Slayer Features by @Futuremappermydud in https://github.com/SkyblockerMod/Skyblocker/pull/191 +* Add Reparty Auto Rejoin by @koloiyolo in https://github.com/SkyblockerMod/Skyblocker/pull/176 +* Add Motes Price Tooltip by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/192 +* Fix dragged items not rendering by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/193 +* Add Vampire Minion by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/194 +* Title container by @Futuremappermydud in https://github.com/SkyblockerMod/Skyblocker/pull/196 +* Loom 1.3 by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/197 +* Clean up by @TacoMonkey11 in https://github.com/SkyblockerMod/Skyblocker/pull/151 +* Truncate text in the recipe book by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/198 +* Sort + Colourize Blessings by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/200 +* Skyblock Levels fixes + Tab Hud improvements by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/201 +* Rendering Improvements, Fixes + Occlusion Culling by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/204 +* Item fixer upper rewrite by @Julienraptor01 in https://github.com/SkyblockerMod/Skyblocker/pull/203 +* Shortcuts by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/195 +* Add Dark Auction Tab Hud by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/205 +* Fix ads filter triggering when it shouldn't by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/206 +* Add show off message filter by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/207 +* Garden Tab Hud Improvements by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/208 +* Hide spammed warnings by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/209 +* Fix hotbar lock rendering mixin by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/211 +* Add new trophy fishing emblem by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/212 + +## New Contributors +* @Futuremappermydud made their first contribution in https://github.com/SkyblockerMod/Skyblocker/pull/191 +* @koloiyolo made their first contribution in https://github.com/SkyblockerMod/Skyblocker/pull/176 + +**Full Changelog**: https://github.com/SkyblockerMod/Skyblocker/compare/v1.10.0...v1.11.0 + +___ # Release 1.10.0 ## Highlight diff --git a/FEATURES.md b/FEATURES.md index 3db3c2a5..b80da7fa 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -2,19 +2,22 @@ * Hide Messages: Ability Cooldown, Heal, AOTE, Implosion, Molten Wave, Teleport Pad Messages * Dungeon Minimap * Dungeon Puzzle Solver: - * Three Weirdos - * Blaze - * Croesus - * Terminal: - * Order - * Coloured Items - * Item Name + * Three Weirdos + * Blaze + * Croesus + * Terminal: + * Order + * Coloured Items + * Item Name * Dwarven Mines Solver: Fetchur, Puzzler * Barn Solver: Treasure Hunter, Hungry Hiker +* Experiments Solvers +* Slayer helper: + * Vampire : Effigy Waypoints, Healing Melon Indicator, Twinclaws Ice Indicator, Steak Stake Indicator * Drill Fuel in Item Durability Bar * Hotbar Slot Lock Keybind (Select the hotbar slot you want to lock/unlock and press the lockbutton) -* Price tooltip: npc, bazaar (avg, lbin), ah, museum -* reparty: write /rp to reparty +* Price tooltip: npc, motes, bazaar (avg, lbin), ah, museum +* reparty: write /rp to reparty + auto rejoin * Wiki Lookup: press f4 to open the wiki page about the held item * Discord Rich Presence: Allows user to show either their Piggy, Bits, or location. Along with a custom message * Quicknav: fast navigate between pets, armor, enderchest, skill, collection, crafting, enchant, envil, warp dungeon, @@ -27,4 +30,5 @@ * 1.8 hitbox for lever and farmland * Custom Tab HUD * Roughly enough items (REI) Support -* Fishing Helper
\ No newline at end of file +* Fishing Helper + sound notification +* Mirrorverse Waypoints
\ No newline at end of file @@ -21,19 +21,22 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in * Hide Messages: Ability Cooldown, Heal, AOTE, Implosion, Molten Wave, Teleport Pad Messages * Dungeon Minimap * Dungeon Puzzle Solver: - * Three Weirdos - * Blaze - * Croesus - * Terminal: - * Order - * Coloured Items - * Item Name + * Three Weirdos + * Blaze + * Croesus + * Terminal: + * Order + * Coloured Items + * Item Name * Dwarven Mines Solver: Fetchur, Puzzler * Barn Solver: Treasure Hunter, Hungry Hiker +* Experiments Solvers +* Slayer helper: + * Vampire : Effigy Waypoints, Healing Melon Indicator, Twinclaws Ice Indicator, Steak Stake Indicator * Drill Fuel in Item Durability Bar * Hotbar Slot Lock Keybind (Select the hotbar slot you want to lock/unlock and press the lockbutton) -* Price tooltip: npc, bazaar (avg, lbin), ah, museum -* reparty: write /rp to reparty +* Price tooltip: npc, motes, bazaar (avg, lbin), ah, museum +* reparty: write /rp to reparty + auto rejoin * Wiki Lookup: press f4 to open the wiki page about the held item * Discord Rich Presence: Allows user to show either their Piggy, Bits, or location. Along with a custom message * Quicknav: fast navigate between pets, armor, enderchest, skill, collection, crafting, enchant, envil, warp dungeon, @@ -46,20 +49,24 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in * 1.8 hitbox for lever and farmland * Custom Tab HUD * Roughly enough items (REI) Support -* Fishing Helper +* Fishing Helper + sound notification +* Mirrorverse Waypoints </details> ___ + ## Commands -| command | option | comment | -|:----------------------------:|:--------------------:|:--------------------------------------| -| /skyblocker config | | open config menu (modMenu not needed) | -| /skyblocker options | | open config menu (modMenu not needed) | -| /skyblocker hud | dwarven / dungeonmap | move dwarven or dungeonmap | +| command | option | comment | +|:---------------------:|:-----------------------:|:-------------------------------------------| +| /skyblocker config | | open config menu (modMenu not needed) | +| /skyblocker options | | open config menu (modMenu not needed) | +| /skyblocker hud | dwarven / dungeonmap / titleContainer | move dwarven, dungeonmap or titleContainer | +| /skyblocker shortcuts | | add/edit shortcuts | --- + ## Images <details open> @@ -103,16 +110,16 @@ information. |:--------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------:| | [catandA](https://github.com/catandA) | [kevinthegreat1](https://github.com/kevinthegreat1) | [AzureAaron](https://github.com/AzureAaron) | [msg-programs](https://github.com/msg-programs) | -| [<img alt="lantice3720" src="https://github.com/lantice3720.png" width="100">](https://github.com/lantice3720) | -|:-----------------------------------------------------------------------------------------------------| -| [lantice3720](https://github.com/lantice3720) | +| [<img alt="lantice3720" src="https://github.com/lantice3720.png" width="100">](https://github.com/lantice3720) | [<img alt="lantice3720" src="https://github.com/koloiyolo.png" width="100">](https://github.com/koloiyolo) | [<img alt="lantice3720" src="https://github.com/Futuremappermydud.png" width="100">](https://github.com/Futuremappermydud) | +|:--------------------------------------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------------------------------:|:--------------------------------------------------------------------------------------------------------------------------:| +| [lantice3720](https://github.com/lantice3720) | [koloiyolo](https://github.com/koloiyolo) | [Futuremappermydud](https://github.com/Futuremappermydud) | ### Translators German ([LifeIsAParadox](https://github.com/LifeIsAParadox) & [msg-programs](https://github.com/msg-programs)) \ Indonesian ([null2264](https://github.com/null2264)) \ -Russian ([HyperSoop](https://github.com/HyperSoop) & [Azuremane](https://github.com/Azuremane)) \ -French ([edgarogh](https://github.com/edgarogh) & [Julienraptor01](https://github.com/Julienraptor01)) \ +Russian ([HyperSoop](https://github.com/HyperSoop) & [Azuremane](https://github.com/Azuremane) & [CrimsonIsle](https://github.com/CrimsonIsle))\ +French ([edgarogh](https://github.com/edgarogh) & [Julienraptor01](https://github.com/Julienraptor01) & [viciscat](https://github.com/viciscat)) \ Japanese ([hirochisan](https://github.com/hirochisan)) \ Chinese ([catandA](https://github.com/catandA |