diff options
author | Yasin <LifeIsAParadox@users.noreply.github.com> | 2024-03-24 20:35:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-24 20:35:03 +0100 |
commit | 126f13afaf08c0a3c303793266da572447de4bfe (patch) | |
tree | fb9c6068b20d492f0a2e241776b2881c37ca2f09 | |
parent | 04ffc8b5ca96df1dbf294a2ef2984d0c5cb2a80e (diff) | |
parent | 569467b214a77db69b312e5f25a76e0941ea52ae (diff) | |
download | Skyblocker-126f13afaf08c0a3c303793266da572447de4bfe.tar.gz Skyblocker-126f13afaf08c0a3c303793266da572447de4bfe.tar.bz2 Skyblocker-126f13afaf08c0a3c303793266da572447de4bfe.zip |
Merge pull request #612 from LifeIsAParadox/update-mod-to-1.19.0
Update mod to 1.19.0
-rw-r--r-- | .github/ISSUE_TEMPLATE/bug_report.yml | 2 | ||||
-rw-r--r-- | .github/ISSUE_TEMPLATE/crash_report.yml | 2 | ||||
-rw-r--r-- | .github/workflows/buildrelease.yml | 4 | ||||
-rw-r--r-- | CHANGELOG.md | 39 | ||||
-rw-r--r-- | FEATURES.md | 5 | ||||
-rw-r--r-- | README.md | 11 | ||||
-rw-r--r-- | gradle.properties | 2 | ||||
-rw-r--r-- | gradle/wrapper/gradle-wrapper.jar | bin | 63721 -> 43453 bytes | |||
-rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
-rwxr-xr-x | gradlew.bat | 20 | ||||
-rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipInfoType.java | 4 | ||||
-rw-r--r-- | src/main/resources/fabric.mod.json | 4 |
12 files changed, 72 insertions, 23 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index a5226bb2..6ffca898 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -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.17.0+1.20.4.jar + placeholder: ex. skyblocker-1.19.0+1.20.4.jar validations: required: true - type: textarea diff --git a/.github/ISSUE_TEMPLATE/crash_report.yml b/.github/ISSUE_TEMPLATE/crash_report.yml index e29e0950..7135848d 100644 --- a/.github/ISSUE_TEMPLATE/crash_report.yml +++ b/.github/ISSUE_TEMPLATE/crash_report.yml @@ -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.17.0+1.20.4.jar + placeholder: ex. skyblocker-1.19.0+1.20.4.jar validations: required: true - type: textarea diff --git a/.github/workflows/buildrelease.yml b/.github/workflows/buildrelease.yml index 8dca761f..e2c5fe9f 100644 --- a/.github/workflows/buildrelease.yml +++ b/.github/workflows/buildrelease.yml @@ -46,7 +46,7 @@ jobs: delimiter="$(openssl rand -hex 8)" { echo "changelog<<${delimiter}" - echo "$CHANGELOGtmp" + echo "$CHANGELOG" echo "${delimiter}" } >> $GITHUB_OUTPUT @@ -54,7 +54,7 @@ jobs: changelog="${CHANGELOG}" highlight_section=$(echo "$changelog" | awk '/## Highlight/{flag=1;next}/^$/{flag=0}flag') - highlight_section="# Highlight\n$highlight_section\n\nhttps://hysky.de/" + highlight_section=$'# Highlight\n'"$highlight_section"$'\n\nhttps://hysky.de/' # Format highlight_section with printf highlight_section=$(printf "%s" "$highlight_section") diff --git a/CHANGELOG.md b/CHANGELOG.md index e359df54..4ea73c37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,42 @@ +# Release 1.19.0 + +## Highlight +* Fix dungeon detection when holding bow +* Farming HUD: shows counter, crops/min, blocks/s, farming level, farming xp/h, and yaw and pitch +* Custom Chat Rules: create custom filters for certain chat messages and then hide, announce, play sound or change the output +* Croesus profit calculator: highlights the chest with the highest outcome + +## What's Changed +* Custom Chat Rules by @olim88 in https://github.com/SkyblockerMod/Skyblocker/pull/560 +* Automatic Labeling by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/574 +* Remove no longer used Fetchur riddles by @alexiayaa in https://github.com/SkyblockerMod/Skyblocker/pull/571 +* Tweak particle direction detection by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/573 +* Croesus profit calculator by @Fluboxer in https://github.com/SkyblockerMod/Skyblocker/pull/565 +* Fix chat spam by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/576 +* Image Repo Loader by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/578 +* Fix VisitorHelper crash by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/579 +* One more creeper beam by @Fluboxer in https://github.com/SkyblockerMod/Skyblocker/pull/583 +* 32 TAPs for kuudra default by @Fluboxer in https://github.com/SkyblockerMod/Skyblocker/pull/591 +* Fixes error when the directory doesn't exist by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/593 +* Add breaks for force close world loading screen mod by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/587 +* Farming HUD & HUD Refactor by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/589 +* Fix potential stack overflow with chat rules by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/592 +* Add Yang Glyph Notification by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/594 +* Dungeonmap fix + rewrite by @Julienraptor01 in https://github.com/SkyblockerMod/Skyblocker/pull/595 +* Fix fairy and enigma souls profile loading and add chat profile detection by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/596 +* Fix bugs with secret detection by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/597 +* Refactor Dwarven, Crystals, and Backpack Preview by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/601 +* Tab hud quick fix by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/608 +* Fix #609 by viciscat in https://github.com/SkyblockerMod/Skyblocker/pull/610 + +## Translation update +* https://github.com/SkyblockerMod/Skyblocker/pull/582 +* Chinese (Simplified) by AC19970 and PumpkinXD +* French by maDU59 +* Russian by wilson-wtf, Ghost-3 and R2kip + +**Full Changelog**: https://github.com/SkyblockerMod/Skyblocker/compare/v1.18.1...v1.19.0 +___ # Release 1.18.1 ## Highlight diff --git a/FEATURES.md b/FEATURES.md index 987c4fd9..4b9a15f0 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -4,6 +4,8 @@ - **Minimap & Score** - **Starred Mob Glow** - **Croesus Helper** + - highlight not opened chests + - profit calculator - **Puzzle Solver:** - *Three Weirdos* - *Blaze* @@ -83,9 +85,11 @@ - Steak Stake Indicator - **Enderman:** - Beacon Highlighting + - Yang Glyph Notification - Nukekubi Head Highlighting ### Garden Features: +- **Farming HUD** - **Visitor Helper** - buy items that visitors require from bazaar by clicking the text - **Disable title and chat messages for Melon/Pumpkin Dicer** @@ -133,6 +137,7 @@ - *Hungry Hiker* ### Chat Features: +- **Custom Chat Rules** - **Hide Messages:** - *Ability Cooldown* - *Heal* @@ -24,6 +24,8 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in - **Minimap & Score** - **Starred Mob Glow** - **Croesus Helper** + - highlight not opened chests + - profit calculator - **Puzzle Solver:** - *Three Weirdos* - *Blaze* @@ -103,9 +105,11 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in - Steak Stake Indicator - **Enderman:** - Beacon Highlighting + - Yang Glyph Notification - Nukekubi Head Highlighting ### Garden Features: +- **Farming HUD** - **Visitor Helper** - buy items that visitors require from bazaar by clicking the text - **Disable title and chat messages for Melon/Pumpkin Dicer** @@ -153,6 +157,7 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in - *Hungry Hiker* ### Chat Features: +- **Custom Chat Rules** - **Hide Messages:** - *Ability Cooldown* - *Heal* @@ -267,11 +272,11 @@ information. 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) & [CrimsonIsle](https://github.com/CrimsonIsle) & [Ghost-3](https://github.com/Ghost-3))\ -French ([edgarogh](https://github.com/edgarogh) & [Julienraptor01](https://github.com/Julienraptor01) & [viciscat](https://github.com/viciscat) & [Kiverty](https://github.com/Kiverty)) \ +Russian ([HyperSoop](https://github.com/HyperSoop) & [CrimsonIsle](https://github.com/CrimsonIsle) & [Ghost-3](https://github.com/Ghost-3) & [wilson-wtf](https://github.com/wilson-wtf) & [R2kip](https://github.com/R2kip))\ +French ([edgarogh](https://github.com/edgarogh) & [Julienraptor01](https://github.com/Julienraptor01) & [viciscat](https://github.com/viciscat) & [Kiverty](https://github.com/Kiverty) & [maDU59](https://github.com/maDU59)) \ Japanese ([hirochisan](https://github.com/hirochisan)) \ Chinese ([catandA](https://github.com/catandA)) \ -Chinese (Simplified) ([catandA](https://github.com/catandA) & [PumpkinXD](https://github.com/PumpkinXD) & [user123321111](https://github.com/user123321111) & [sunnytia](https://github.com/sunnytia)) \ +Chinese (Simplified) ([catandA](https://github.com/catandA) & [PumpkinXD](https://github.com/PumpkinXD) & [user123321111](https://github.com/user123321111) & [sunnytia](https://github.com/sunnytia) & [AC19970](https://github.com/AC19970)) \ Korean ([lantice3720](https://github.com/lantice3720)) \ Spanish ([IngeSebastian](https://github.com/IngeSebastian)) \ Norwegian Bokmål ([KdGaming0](https://github.com/KdGaming0)) \ diff --git a/gradle.properties b/gradle.properties index 5bdfca1a..702a292b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -34,7 +34,7 @@ jgit_version = 6.8.0.202311291450-r commons_math_version = 3.6.1 # Mod Properties -mod_version = 1.18.1 +mod_version = 1.19.0 maven_group = de.hysky archives_base_name = skyblocker modrinth_id=y6DuFGwJ diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex 7f93135c..e6441136 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3fa8f862..b82aa23a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 6689b85b..7101f8e4 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
goto fail
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
goto fail
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipInfoType.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipInfoType.java index d798451e..4aba040d 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipInfoType.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipInfoType.java @@ -17,8 +17,8 @@ public enum TooltipInfoType implements Runnable { NPC("https://hysky.de/api/npcprice", itemTooltip -> itemTooltip.enableNPCPrice, true), BAZAAR("https://hysky.de/api/bazaar", itemTooltip -> itemTooltip.enableBazaarPrice || SkyblockerConfigManager.get().locations.dungeons.dungeonChestProfit.enableProfitCalculator || SkyblockerConfigManager.get().locations.dungeons.dungeonChestProfit.croesusProfit || SkyblockerConfigManager.get().general.chestValue.enableChestValue, itemTooltip -> itemTooltip.enableBazaarPrice, false), LOWEST_BINS("https://hysky.de/api/auctions/lowestbins", itemTooltip -> itemTooltip.enableLowestBIN || SkyblockerConfigManager.get().locations.dungeons.dungeonChestProfit.enableProfitCalculator || SkyblockerConfigManager.get().locations.dungeons.dungeonChestProfit.croesusProfit || SkyblockerConfigManager.get().general.chestValue.enableChestValue, itemTooltip -> itemTooltip.enableLowestBIN, false), - ONE_DAY_AVERAGE("https://moulberry.codes/auction_averages_lbin/1day.json", itemTooltip -> itemTooltip.enableAvgBIN, false), - THREE_DAY_AVERAGE("https://moulberry.codes/auction_averages_lbin/3day.json", itemTooltip -> itemTooltip.enableAvgBIN || SkyblockerConfigManager.get().general.searchOverlay.enableAuctionHouse, itemTooltip -> itemTooltip.enableAvgBIN, false), + ONE_DAY_AVERAGE("https://hysky.de/api/auctions/lowestbins/average/1day.json", itemTooltip -> itemTooltip.enableAvgBIN, false), + THREE_DAY_AVERAGE("https://hysky.de/api/auctions/lowestbins/average/3day.json", itemTooltip -> itemTooltip.enableAvgBIN || SkyblockerConfigManager.get().general.searchOverlay.enableAuctionHouse, itemTooltip -> itemTooltip.enableAvgBIN, false), MOTES("https://hysky.de/api/motesprice", itemTooltip -> itemTooltip.enableMotesPrice, itemTooltip -> itemTooltip.enableMotesPrice && Utils.isInTheRift(), true), OBTAINED(itemTooltip -> itemTooltip.enableObtainedDate), MUSEUM("https://hysky.de/api/museum", itemTooltip -> itemTooltip.enableMuseumInfo, true), diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index c5d05fed..ee93e5b5 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -4,8 +4,8 @@ "version": "${version}", "name": "Skyblocker", "description": "Hypixel Skyblock Mod", - "authors": ["xMrVizzy", "d3dx9", "LifeIsAParadox"], - "contributors": ["ExternalTime", "Zailer43", "TacoMonkey", "KonaeAkira", "Fix3dll", "null2264", "HyperSoop", "edgarogh", "TheColdPot", "Julienraptor01", "ADON15c", "catandA", "kevinthegreat1", "AzureAaron", "msg-programs", "lantice3720", "Futuremappermydud", "koloiyolo", "viciscat", "Grayray75", "alexiayaa"], + "authors": ["LifeIsAParadox/wohlhabend", "kevinthegreat1", "AzureAaron"], + "contributors": ["xMrVizzy", "d3dx9", "ExternalTime", "Zailer43", "TacoMonkey", "KonaeAkira", "Fix3dll", "null2264", "HyperSoop", "edgarogh", "TheColdPot", "Julienraptor01", "ADON15c", "catandA", "msg-programs", "lantice3720", "Futuremappermydud", "koloiyolo", "viciscat", "Grayray75", "alexiayaa", "KhafraDev", "btwonion", "Kaluub", "Emirlol", "LegendaryLilac", "olim88", "Ghost-3", "esteban4567890", "Fluboxer"], "contact": { "homepage": "https://hysky.de", "sources": "https://github.com/SkyblockerMod/Skyblocker", |