aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFluboxer <36457056+Fluboxer@users.noreply.github.com>2024-02-22 14:58:43 +0300
committerGitHub <noreply@github.com>2024-02-22 14:58:43 +0300
commitb15c407a0afb72185b02ba8a1a40a42b5a4f0c0e (patch)
treea63be63ec9c3ae54154e04530a16ff444a7510cf
parent66d352114f5c318d8415e607856bf17d8163f1f3 (diff)
parentc0f134392958edf0b507a479dac7e85efa0cab80 (diff)
downloadSkyblocker-b15c407a0afb72185b02ba8a1a40a42b5a4f0c0e.tar.gz
Skyblocker-b15c407a0afb72185b02ba8a1a40a42b5a4f0c0e.tar.bz2
Skyblocker-b15c407a0afb72185b02ba8a1a40a42b5a4f0c0e.zip
Merge branch 'SkyblockerMod:master' into Croesus-chest-highlight
-rw-r--r--.github/workflows/buildrelease.yml22
-rw-r--r--CHANGELOG.md76
-rw-r--r--FEATURES.md105
-rw-r--r--README.md68
-rw-r--r--gradle.properties2
-rw-r--r--src/main/java/de/hysky/skyblocker/SkyblockerMod.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java10
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java17
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/LocationsCategory.java7
-rw-r--r--src/main/java/de/hysky/skyblocker/mixin/HandledScreenMixin.java176
-rw-r--r--src/main/java/de/hysky/skyblocker/mixin/InGameHudMixin.java12
-rw-r--r--src/main/java/de/hysky/skyblocker/mixin/InGameOverlayRendererMixin.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/mixin/MinecraftClientMixin.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/experiment/UltrasequencerSolver.java3
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/garden/VisitorHelper.java32
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/ItemProtection.java54
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/DungeonSecretWidget.java18
-rw-r--r--src/main/java/de/hysky/skyblocker/utils/Http.java14
-rw-r--r--src/main/java/de/hysky/skyblocker/utils/render/gui/ContainerSolverManager.java2
-rw-r--r--src/main/resources/assets/skyblocker/lang/en_ca.json3
-rw-r--r--src/main/resources/assets/skyblocker/lang/en_us.json3
-rw-r--r--src/main/resources/assets/skyblocker/lang/es_es.json1
-rw-r--r--src/main/resources/assets/skyblocker/lang/fr_fr.json41
-rw-r--r--src/main/resources/assets/skyblocker/lang/ja_jp.json1
-rw-r--r--src/main/resources/assets/skyblocker/lang/ko_kr.json1
-rw-r--r--src/main/resources/assets/skyblocker/lang/pt_br.json8
-rw-r--r--src/main/resources/assets/skyblocker/lang/ru_ru.json1
-rw-r--r--src/main/resources/assets/skyblocker/lang/tr_tr.json1
-rw-r--r--src/main/resources/assets/skyblocker/lang/zh_cn.json30
-rw-r--r--src/main/resources/assets/skyblocker/textures/gui/item_protection.pngbin0 -> 235 bytes
31 files changed, 532 insertions, 186 deletions
diff --git a/.github/workflows/buildrelease.yml b/.github/workflows/buildrelease.yml
index b062d079..8dca761f 100644
--- a/.github/workflows/buildrelease.yml
+++ b/.github/workflows/buildrelease.yml
@@ -42,12 +42,13 @@ jobs:
CHANGELOG=$(sed '/___/Q' CHANGELOG.md)
CHANGELOG=$(echo "$CHANGELOG" | sed 1d)
- CHANGELOGtmp="${CHANGELOG//'%'/'%25'}"
- CHANGELOGtmp="${CHANGELOGtmp//$'\n'/'%0A'}"
- CHANGELOGtmp="${CHANGELOGtmp//$'\r'/'%0D'}"
-
# changelog for Github release
- echo "changelog=$CHANGELOGtmp" >> $GITHUB_OUTPUT
+ delimiter="$(openssl rand -hex 8)"
+ {
+ echo "changelog<<${delimiter}"
+ echo "$CHANGELOGtmp"
+ echo "${delimiter}"
+ } >> $GITHUB_OUTPUT
#echo "Changelog:\n$CHANGELOG" # for debugging
@@ -61,12 +62,13 @@ jobs:
# Store the highlight_section in the CHANGELOG variable
CHANGELOG=$(echo -n "$highlight_section")
- CHANGELOG="${CHANGELOG//'%'/'%25'}"
- CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
- CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
-
# changelog for rest
- echo "changelog_highlight=$CHANGELOG" >> $GITHUB_OUTPUT
+ delimiter="$(openssl rand -hex 8)"
+ {
+ echo "changelog_highlight<<${delimiter}"
+ echo "$CHANGELOG"
+ echo "${delimiter}"
+ } >> $GITHUB_OUTPUT
- uses: actions/github-script@v7
id: fname
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b05e805..19e396b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,79 @@
+# Release 1.18.0
+
+## Highlight
+* **New Dungeon Solvers**:
+ * Silverfish Solvers by @kevinthegreat1
+ * Ice Fill Solvers by @kevinthegreat1
+ * Boulder Solver by @LifeIsAParadox
+* **Crystal Hollows Feature**:
+ * Crystal Hollows Map by @olim88 and @AzureAaron
+ * Waypoints for special locations by @olim88 and @AzureAaron
+ * Powder HUD by @olim88 and @AzureAaron
+ * Mithril
+ * Gemstone
+* **Kuudra Features** by @AzureAaron
+ * Kuudra waypoints
+ * No arrow poison warning
+ * Low arrow poison warning
+* **Search overlays for bz and ah** by @olim88
+* **End HUD Widget** by @viciscat
+ * Zealots
+ * *Since last eye*
+ * *Total zealots kills*
+ * *Avg kills per eye*
+ * Endstone Protector
+ * *stage*
+ * *Location*
+* **Garden Features**:
+ * Visitor helper by @esteban4567890
+ * easy way to buy items that visitors require from bazaar by clicking the text
+ * Disable title and chat messages for Melon/Pumpkin Dicer by @Ghost-3
+* **Improve Item Protection feature** by @LifeIsAParadox
+ * protect item with shortcut "v"
+ * indicator in form of a star
+
+## What's Changed
+* Nothing to see here by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/526
+* Crystal hollows fetures by @olim88 in https://github.com/SkyblockerMod/Skyblocker/pull/523
+* Beacon Highlighter performance fix + Fix fire sales widget by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/521
+* Fix chest value not getting price data under certain circumstances by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/522
+* Update mayor cache every 20 minutes by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/525
+* Update IF conflict by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/529
+* Remove 1.20.2 from version selection menu in issue templates by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/530
+* Add the missing starter commission to the Dwarven HUD. by @Kaluub in https://github.com/SkyblockerMod/Skyblocker/pull/532
+* Kuudra Features by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/519
+* Disable title and chat messages for Melon/Pumpkin Dicer by @Ghost-3 in https://github.com/SkyblockerMod/Skyblocker/pull/534
+* Add Visitor helper by @esteban4567890 in https://github.com/SkyblockerMod/Skyblocker/pull/535
+* Search overlays for bz and ah by @olim88 in https://github.com/SkyblockerMod/Skyblocker/pull/537
+* Add End HUD Widget by @viciscat in https://github.com/SkyblockerMod/Skyblocker/pull/524
+* Boulder Solver by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/540
+* Item Quality (dungeon drops) by @Fluboxer in https://github.com/SkyblockerMod/Skyblocker/pull/541
+* Treasure Hoarder Puncher Commission fix by @Ghost-3 in https://github.com/SkyblockerMod/Skyblocker/pull/542
+* center table components in tabhud by @btwonion in https://github.com/SkyblockerMod/Skyblocker/pull/543
+* Check all door blocks and fix fairy room door by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/536
+* Show the diff in the Powders widget by @Ghost-3 in https://github.com/SkyblockerMod/Skyblocker/pull/544
+* Add Item Floor Tier to tooltip by @Fluboxer in https://github.com/SkyblockerMod/Skyblocker/pull/546
+* Better location management by @Ghost-3 in https://github.com/SkyblockerMod/Skyblocker/pull/547
+* Small search overlay changes by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/548
+* Fix powder hud not updating when commissions hud is disabled by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/550
+* Improve secrets caching behaviour by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/545
+* Spider's Den Server Widget by @Ghost-3 in https://github.com/SkyblockerMod/Skyblocker/pull/553
+* Fix beacon highlights persisting after the boss dies by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/554
+* use mod-publish-plugin by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/556
+* Add Silverfish and Ice Fill Solvers by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/533
+* Fix discoveries index by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/557
+* Support the local memory cache for the API by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/558
+* 4 small changes by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/561
+* Improve Item Protection feature by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/562
+
+## New Contributors
+* @olim88 made their first contribution in https://github.com/SkyblockerMod/Skyblocker/pull/523
+* @Ghost-3 made their first contribution in https://github.com/SkyblockerMod/Skyblocker/pull/534
+* @esteban4567890 made their first contribution in https://github.com/SkyblockerMod/Skyblocker/pull/535
+* @Fluboxer made their first contribution in https://github.com/SkyblockerMod/Skyblocker/pull/541
+
+**Full Changelog**: https://github.com/SkyblockerMod/Skyblocker/compare/v1.17.0...v1.18.0
+___
# Release 1.17.0
## Highlight
diff --git a/FEATURES.md b/FEATURES.md
index b442a56f..987c4fd9 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -5,16 +5,19 @@
- **Starred Mob Glow**
- **Croesus Helper**
- **Puzzle Solver:**
- - *Three Weirdos*
- - *Blaze*
- - *Creeper Beams*
- - *Quiz - Ouro the Omniscient*
- - *Tic Tac Toe*
- - *Waterboard*
- - *Terminal:*
- - *Order*
- - *Coloured Items*
- - *Item Name*
+ - *Three Weirdos*
+ - *Blaze*
+ - *Creeper Beams*
+ - *Quiz - Ouro the Omniscient*
+ - *Tic Tac Toe*
+ - *Waterboard*
+ - *Silverfish*
+ - *Ice Fill*
+ - *Boulder*
+ - Terminal:
+ - *Order*
+ - *Coloured Items*
+ - *Item Name*
- **Rare Drop Special Effects**
- **Chest Profit Calculator**
- **F3/M3 Fire Freeze Staff Timer**
@@ -27,6 +30,16 @@
- **resourcepack recoloring textures in dungeons**
- **score title and sound**
+### Kuudra Features
+- **Kuudra waypoints**
+ - *Supplies*
+ - *Supply Piles*
+ - *Fuel Cells*
+ - *Safe Spots*
+ - *Pearl*
+- **No arrow poison warning**
+- **Low arrow poison warning**
+
### Item and Armor Customization:
- *Item Renaming*
- *Custom Armor Dye Colors*
@@ -34,17 +47,25 @@
### Health and Status Bars:
- **Bars:**
- - *Health and absorption*
- - *Mana*
- - *Defense*
- - *XP*
+ - *Health and absorption*
+ - *Mana*
+ - *Defense*
+ - *XP*
-### Dwarven Mines:
+### Dwarven Mines / Crystal Hollows:
- **Dwarven Mines Solver:**
- - *Fetchur*
- - *Puzzler*
+ - Fetchur
+ - Puzzler
+- **Crystal Hollows**
+ - Crystal Hollows Map
+ - *Shows players location in Crystal Hollows*
+ - *Highlights important waypoints in Crystal Hollows*
+ - Crystal Hollows Waypoints
+ - *Shows waypoints for special locations*
+ - *Find locations in chat messages*
- **Commission HUD**
- - *Provides information on Dwarven Mines quests*
+ - *Provides information on Dwarven Mines quests*
+- **Powder HUD**
### Rift Features:
- **Mirrorverse Waypoints**
@@ -64,6 +85,11 @@
- Beacon Highlighting
- Nukekubi Head Highlighting
+### Garden Features:
+- **Visitor Helper**
+ - buy items that visitors require from bazaar by clicking the text
+- **Disable title and chat messages for Melon/Pumpkin Dicer**
+
### Visual Enhancements:
- **Fancy Tab HUD:** Fully configurable with a resource pack.
- **1.8 Hitbox for Lever and Farmland**
@@ -74,37 +100,48 @@
- Circle or Square
- **Item Cooldown Display**
- **Configure Fire-Overlay Height**
+- **End HUD Widget**
+ - Zealots
+ - *Since last eye*
+ - *Total zealots kills*
+ - *Avg kills per eye*
+ - Endstone Protector
+ - *stage*
+ - *Location*
### User Interface Enhancements:
+- **Search overlays for bz and ah**
- **Attribute Shard Info Display**
- **Drill Fuel and Pickonimbus 2000 in Item Durability Bar**
- **Hotbar Slot Lock Keybind:** Select the hotbar slot you want to lock/unlock and press the lock button.
- **Item Tooltip:** (Provides information on)
- - *NPC Prices*
- - *Motes Prices*
- - *bazaar (average, lowest bin)*
- - *Auction House*
- - *Museum*
- - *Exotic Armor Identifier*
+ - *NPC Sell Prices*
+ - *Motes Prices*
+ - *bazaar (average, lowest bin)*
+ - *Auction House*
+ - *Museum*
+ - *Exotic Armor Identifier*
+ - *Item Quality*
+ - **
- **Quicknav:** (Fully customizeable) Fast navigation between pets, armor, enderchest, skill, collection, crafting, enchant, anvil, warp dungeon, and warp hub.
- **Recipe Book:** Lists all Skyblock items in the vanilla recipe book, allowing you to see the recipe of the item.
- **Backpack Preview:** After clicking your backpack or enderchest once, you can hover over the backpack or enderchest and hold Shift to preview its contents.
### Barn Features:
- **Barn Solver:**
- - *Treasure Hunter*
- - *Hungry Hiker*
+ - *Treasure Hunter*
+ - *Hungry Hiker*
### Chat Features:
- **Hide Messages:**
- - *Ability Cooldown*
- - *Heal*
- - *Aspect of the End (AOTE)*
- - *Implosion*
- - *Molten Wave*
- - *`/show command`*
- - *Teleport Pad Messages*
- - *Sky Mall*
+ - *Ability Cooldown*
+ - *Heal*
+ - *Aspect of the End (AOTE)*
+ - *Implosion*
+ - *Molten Wave*
+ - *`/show command`*
+ - *Teleport Pad Messages*
+ - *Sky Mall*
### Miscellaneous Solvers:
- **Experiments Solvers**
diff --git a/README.md b/README.md
index bee317ba..5e9cee0f 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,10 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in
- *Quiz - Ouro the Omniscient*
- *Tic Tac Toe*
- *Waterboard*
- - *Terminal:*
+ - *Silverfish*
+ - *Ice Fill*
+ - *Boulder*
+ - Terminal:
- *Order*
- *Coloured Items*
- *Item Name*
@@ -47,6 +50,16 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in
- **resourcepack recoloring textures in dungeons**
- **score title and sound**
+### Kuudra Features
+- **Kuudra waypoints**
+ - *Supplies*
+ - *Supply Piles*
+ - *Fuel Cells*
+ - *Safe Spots*
+ - *Pearl*
+- **No arrow poison warning**
+- **Low arrow poison warning**
+
### Item and Armor Customization:
- *Item Renaming*
- *Custom Armor Dye Colors*
@@ -59,19 +72,20 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in
- *Defense*
- *XP*
-### Dwarven Mines:
+### Dwarven Mines / Crystal Hollows:
- **Dwarven Mines Solver:**
- - *Fetchur*
- - *Puzzler*
-- **Commission/Powder HUD**
+ - Fetchur
+ - Puzzler
+- **Crystal Hollows**
+ - Crystal Hollows Map
+ - *Shows players location in Crystal Hollows*
+ - *Highlights important waypoints in Crystal Hollows*
+ - Crystal Hollows Waypoints
+ - *Shows waypoints for special locations*
+ - *Find locations in chat messages*
+- **Commission HUD**
- *Provides information on Dwarven Mines quests*
- - *Provides information on powder amounts*
-- **Crystal Hollows Waypoints**
- - *show waypoints for special location*
- - *find locations in chat messages*
-- **Crystal Hollows Map HUD**
- - *Shows players location in crystal hollows*
- - *Shows important waypoints in crystal hollows*
+- **Powder HUD**
### Rift Features:
- **Mirrorverse Waypoints**
@@ -91,6 +105,11 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in
- Beacon Highlighting
- Nukekubi Head Highlighting
+### Garden Features:
+- **Visitor Helper**
+ - buy items that visitors require from bazaar by clicking the text
+- **Disable title and chat messages for Melon/Pumpkin Dicer**
+
### Visual Enhancements:
- **Fancy Tab HUD:** Fully configurable with a resource pack.
- **1.8 Hitbox for Lever and Farmland**
@@ -101,18 +120,29 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in
- Circle or Square
- **Item Cooldown Display**
- **Configure Fire-Overlay Height**
+- **End HUD Widget**
+ - Zealots
+ - *Since last eye*
+ - *Total zealots kills*
+ - *Avg kills per eye*
+ - Endstone Protector
+ - *stage*
+ - *Location*
### User Interface Enhancements:
+- **Search overlays for bz and ah**
- **Attribute Shard Info Display**
- **Drill Fuel and Pickonimbus 2000 in Item Durability Bar**
- **Hotbar Slot Lock Keybind:** Select the hotbar slot you want to lock/unlock and press the lock button.
- **Item Tooltip:** (Provides information on)
- - *NPC Prices*
+ - *NPC Sell Prices*
- *Motes Prices*
- *bazaar (average, lowest bin)*
- *Auction House*
- *Museum*
- *Exotic Armor Identifier*
+ - *Item Quality*
+ - **
- **Quicknav:** (Fully customizeable) Fast navigation between pets, armor, enderchest, skill, collection, crafting, enchant, anvil, warp dungeon, and warp hub.
- **Recipe Book:** Lists all Skyblock items in the vanilla recipe book, allowing you to see the recipe of the item.
- **Backpack Preview:** After clicking your backpack or enderchest once, you can hover over the backpack or enderchest and hold Shift to preview its contents.
@@ -223,9 +253,15 @@ information.
|:--------------------------------------------------------------------------------------------------------:|:--------------------------------------------------------------------------------------------------------:|----------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------|
| [Grayray75](https://github.com/Grayray75) | [alexiayaa](https://github.com/alexiayaa) | [KhafraDev](https://github.com/KhafraDev) | [btwonion](https://github.com/btwonion) |
-| [<img alt="KhafraDev" src="https://github.com/Kaluub.png" width="100">](https://github.com/Kaluub) | [<img alt="KhafraDev" src="https://github.com/Emirlol.png" width="100">](https://github.com/Emirlol) | [<img alt="KhafraDev" src="https://github.com/Thsgun.png" width="100">](https://github.com/Thsgun) |
-|----------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------|
-| [Kaluub](https://github.com/Kaluub) | [Emirlol](https://github.com/Emirlol) | [Thsgun](https://github.com/Thsgun) |
+
+| [<img alt="KhafraDev" src="https://github.com/Kaluub.png" width="100">](https://github.com/Kaluub) | [<img alt="KhafraDev" src="https://github.com/Emirlol.png" width="100">](https://github.com/Emirlol) | [<img alt="KhafraDev" src="https://github.com/LegendaryLilac.png" width="100">](https://github.com/LegendaryLilac) | [<img alt="KhafraDev" src="https://github.com/olim88.png" width="100">](https://github.com/olim88) |
+|----------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------|
+| [Kaluub](https://github.com/Kaluub) | [Emirlol](https://github.com/Emirlol) | [LegendaryLilac](https://github.com/LegendaryLilac) | [olim88](https://github.com/olim88) |
+
+| [<img alt="Ghost-3" src="https://github.com/Ghost-3.png" width="100">](https://github.com/Ghost-3) | [<img alt="esteban4567890" src="https://github.com/esteban4567890.png" width="100">](https://github.com/esteban4567890) | [<img alt="Fluboxer" src="https://github.com/Fluboxer.png" width="100">](https://github.com/Fluboxer) |
+|----------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------|
+| [Ghost-3](https://github.com/Ghost-3) | [esteban4567890](https://github.com/esteban4567890) | [Fluboxer](https://github.com/Fluboxer) |
+
### Translators
diff --git a/gradle.properties b/gradle.properties
index 07340c99..6cf73016 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.17.0
+mod_version = 1.18.0
maven_group = de.hysky
archives_base_name = skyblocker
modrinth_id=y6DuFGwJ
diff --git a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
index dca41bd1..36ef5a4f 100644
--- a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
+++ b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
@@ -18,6 +18,7 @@ import de.hysky.skyblocker.skyblock.dwarven.CrystalsLocationsManager;
import de.hysky.skyblocker.skyblock.dwarven.DwarvenHud;
import de.hysky.skyblocker.skyblock.end.BeaconHighlighter;
import de.hysky.skyblocker.skyblock.end.TheEnd;
+import de.hysky.skyblocker.skyblock.garden.VisitorHelper;
import de.hysky.skyblocker.skyblock.item.*;
import de.hysky.skyblocker.skyblock.item.tooltip.BackpackPreview;
import de.hysky.skyblocker.skyblock.item.tooltip.ItemTooltip;
@@ -139,6 +140,7 @@ public class SkyblockerMod implements ClientModInitializer {
ItemProtection.init();
CreeperBeams.init();
Boulder.init();
+ VisitorHelper.init();
ItemRarityBackgrounds.init();
MuseumItemCache.init();
SecretsTracker.init();
diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
index 713a9fbd..b4e520e2 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
@@ -178,9 +178,6 @@ public class SkyblockerConfig {
public boolean dungeonQuality = true;
@SerialEntry
- public boolean visitorHelper = true;
-
- @SerialEntry
public TabHudConf tabHud = new TabHudConf();
@SerialEntry
@@ -468,10 +465,10 @@ public class SkyblockerConfig {
public static class FlameOverlay {
@SerialEntry
- public float flameHeight = 0f;
+ public int flameHeight = 100;
@SerialEntry
- public float flameOpacity = 0f;
+ public int flameOpacity = 100;
}
public static class SearchOverlay {
@@ -1094,6 +1091,9 @@ public class SkyblockerConfig {
public static class Garden {
@SerialEntry
public boolean dicerTitlePrevent = true;
+
+ @SerialEntry
+ public boolean visitorHelper = true;
}
public static class Slayer {
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
index 8a7d832c..afd688d8 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
@@ -86,13 +86,6 @@ public class GeneralCategory {
newValue -> config.general.dungeonQuality = newValue)
.controller(ConfigUtils::createBooleanController)
.build())
- .option(Option.<Boolean>createBuilder()
- .name(Text.translatable("text.autoconfig.skyblocker.option.general.visitorHelper"))
- .binding(defaults.general.visitorHelper,
- () -> config.general.visitorHelper,
- newValue -> config.general.visitorHelper = newValue)
- .controller(ConfigUtils::createBooleanController)
- .build())
//Tab Hud
.group(OptionGroup.createBuilder()
@@ -642,19 +635,21 @@ public class GeneralCategory {
.group(OptionGroup.createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.general.flameOverlay"))
.collapsed(true)
- .option(Option.<Float>createBuilder()
+ .option(Option.<Integer>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.general.flameOverlay.flameHeight"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.general.flameOverlay.flameHeight.@Tooltip")))
.binding(defaults.general.flameOverlay.flameHeight,
() -> config.general.flameOverlay.flameHeight,
newValue -> config.general.flameOverlay.flameHeight = newValue)
- .controller(opt -> FloatSliderControllerBuilder.create(opt).range(0.0f, 0.5f).step(0.01f))
+ .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(0, 100).step(1))
.build())
- .option(Option.<Float>createBuilder()
+ .option(Option.<Integer>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.general.flameOverlay.flameOpacity"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.general.flameOverlay.flameOpacity.@Tooltip")))
.binding(defaults.general.flameOverlay.flameOpacity,
() -> config.general.flameOverlay.flameOpacity,
newValue -> config.general.flameOverlay.flameOpacity = newValue)
- .controller(opt -> FloatSliderControllerBuilder.create(opt).range(0.0f, 0.8f).step(0.1f))
+ .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(0, 100).step(1))
.build())
.build())
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/LocationsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/LocationsCategory.java
index 75c83a9b..d97513f8 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/LocationsCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/LocationsCategory.java
@@ -153,6 +153,13 @@ public class LocationsCategory {
newValue -> config.locations.garden.dicerTitlePrevent = newValue)
.controller(ConfigUtils::createBooleanController)
.build())
+ .option(Option.<Boolean>createBuilder()
+ .name(Text.translatable("text.autoconfig.skyblocker.option.general.visitorHelper"))
+ .binding(defaults.locations.garden.visitorHelper,
+ () -> config.locations.garden.visitorHelper,
+ newValue -> config.locations.garden.visitorHelper = newValue)
+ .controller(ConfigUtils::createBooleanController)
+ .build())
.build())
.build();
}
diff --git a/src/main/java/de/hysky/skyblocker/mixin/HandledScreenMixin.java b/src/main/java/de/hysky/skyblocker/mixin/HandledScreenMixin.java
index 8a1af570..7d2f849e 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/HandledScreenMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/HandledScreenMixin.java
@@ -1,6 +1,7 @@
package de.hysky.skyblocker.mixin;
import com.llamalad7.mixinextras.sugar.Local;
+import com.mojang.blaze3d.systems.RenderSystem;
import de.hysky.skyblocker.SkyblockerMod;
import de.hysky.skyblocker.config.SkyblockerConfigManager;
import de.hysky.skyblocker.skyblock.experiment.ChronomatronSolver;
@@ -16,11 +17,9 @@ import de.hysky.skyblocker.skyblock.item.tooltip.CompactorDeletorPreview;
import de.hysky.skyblocker.utils.ItemUtils;
import de.hysky.skyblocker.utils.Utils;
import de.hysky.skyblocker.utils.render.gui.ContainerSolver;
-import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.screen.ingame.HandledScreen;
-import net.minecraft.client.item.TooltipContext;
import net.minecraft.inventory.SimpleInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -29,6 +28,7 @@ import net.minecraft.screen.ScreenHandler;
import net.minecraft.screen.slot.Slot;
import net.minecraft.screen.slot.SlotActionType;
import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.Final;
@@ -42,6 +42,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.util.Map;
+import java.util.Set;
import java.util.regex.Matcher;
@Mixin(HandledScreen.class)
@@ -52,6 +53,34 @@ public abstract class HandledScreenMixin<T extends ScreenHandler> extends Screen
@Unique
private static final int OUT_OF_BOUNDS_SLOT = -999;
+ @Unique
+ private static final Identifier ITEM_PROTECTION = new Identifier(SkyblockerMod.NAMESPACE, "textures/gui/item_protection.png");
+
+ @Unique
+ private static final Set<String> FILLER_ITEMS = Set.of(
+ " ", // Empty menu item
+ "Locked Page",
+ "Quick Crafting Slot",
+ "Locked Backpack Slot 2", //Regular expressions won't be utilized here since the search by contains is based on plain text rather than regex syntax
+ "Locked Backpack Slot 3",
+ "Locked Backpack Slot 4",
+ "Locked Backpack Slot 5",
+ "Locked Backpack Slot 6",
+ "Locked Backpack Slot 7",
+ "Locked Backpack Slot 8",
+ "Locked Backpack Slot 9",
+ "Locked Backpack Slot 10",
+ "Locked Backpack Slot 11",
+ "Locked Backpack Slot 12",
+ "Locked Backpack Slot 13",
+ "Locked Backpack Slot 14",
+ "Locked Backpack Slot 15",
+ "Locked Backpack Slot 16",
+ "Locked Backpack Slot 17",
+ "Locked Backpack Slot 18",
+ "Preparing"
+ );
+
@Shadow
@Nullable
pro