diff options
38 files changed, 1319 insertions, 1040 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index b9eb2efc..e6930a81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,59 @@ +# Release 1.15.0 + +## Highlight +* New configuration frontend (YACL) by @AzureAaron +* Item Protection (`/skyblocker protectItem`) by @AzureAaron +* Item Rarity Backgrounds by @AzureAaron +* Item cooldown display by @Grayray75 +* Creeper beam puzzle solver by @msg-programs +* Configure Flame height by @LifeIsAParadox +* Secret Waypoint Rendering Customization by @AzureAaron +* Optimize Drill Fuel and Picko Durability with Caching by @kevinthegreat1 + +## What's Changed +* 1.20.2 by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/324 +* YACL Config by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/328 +* Config Tweaks by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/334 +* Item Protection by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/335 +* Use standardised license identifier by @Grayray75 in https://github.com/SkyblockerMod/Skyblocker/pull/320 +* Update shortcuts description by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/342 +* Item Rarity Backgrounds by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/340 +* sync MRREADME.md with modrinth description by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/338 +* Fix recipe book slot textures by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/343 +* Add Support for Custom toString Function for Enum Dropdowns by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/344 +* Item cooldown display by @Grayray75 in https://github.com/SkyblockerMod/Skyblocker/pull/332 +* Update Loom and Gradle by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/345 +* Hook actual durability for Pickonimbus/Drills by @alexiayaa in https://github.com/SkyblockerMod/Skyblocker/pull/341 +* Optimize Scoreboard Stuff by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/346 +* me.xrmvizzy -> de.hysky by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/348 +* Fix potential NPE by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/352 +* fix blaze by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/356 +* Fix Golden Goblin Slayer showing up as Goblin Slayer on commission HUD by @alexiayaa in https://github.com/SkyblockerMod/Skyblocker/pull/347 +* Refactor Utils by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/354 +* Refactor NBT Parsing by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/350 +* fix quick nav background texture by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/359 +* update issue template by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/360 +* Creeper beam puzzle solver by @msg-programs in https://github.com/SkyblockerMod/Skyblocker/pull/355 +* Scheduler Multithreaded Support + Refactor by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/361 +* Update Fetchur solver by @alexiayaa in https://github.com/SkyblockerMod/Skyblocker/pull/363 +* Codec-based Test by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/367 +* Optimize Drill Fuel and Picko Durability with Caching by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/366 +* fix issue_template by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/369 +* Refactor NEU Repo by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/364 +* change flame height by @LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/370 +* Secret Waypoint Rendering Customization by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/371 +* Translations update from hysky translate by @Weblate-LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/325 +* New Message Feedback Prefix by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/373 +* Remove unused quicknav translation strings by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/374 +* Fix some HUD options resetting sometimes by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/337 +* Patch Float/Double Field Controller Bug by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/377 + +## New Contributors +* @alexiayaa made their first contribution in https://github.com/SkyblockerMod/Skyblocker/pull/341 + +**Full Changelog**: https://github.com/SkyblockerMod/Skyblocker/compare/v1.14.0...v1.15.0 +___ + # Release 1.14.0 ## Highlight diff --git a/FEATURES.md b/FEATURES.md index 66e5a15f..a8c8ae79 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -1,49 +1,101 @@ -* Bars: Health and absorption, Mana, Defense, XP (moving fancy bars) -* Hide Messages: Ability Cooldown, Heal, AOTE, Implosion, Molten Wave, Teleport Pad Messages -* Dungeon Minimap -* Dungeon Secrets -* Starred Mob Glow -* Dungeon Puzzle Solver: - * Three Weirdos - * Blaze - * Tic Tac Toe - * 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 and Pickonimbus 2000 in Item Durability Bar -* Hotbar Slot Lock Keybind (Select the hotbar slot you want to lock/unlock and press the lockbutton) -* 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, - warp hub -* Recipe book: in the vanilla recipe book all skyblock items are listed, and you can see the recipe of the item -* Backpack preview: after you clicked your backpack or enderchest once you can hover over the backpack or enderchest and - hold shift to preview -* Update notification -* Commission HUD: Dwarven Mines quests -* 1.8 hitbox for lever and farmland -* Custom Tab HUD + Fully configureable with ressourcepack -* Roughly enough items (REI) and Emi Support -* Fishing Helper + sound notification -* Mirrorverse Waypoints -* Attribute Shard Info Display -* Item and Armour customisation: - * Item Renaming - * Custom Armour Dye Colours - * Custom Armour Trims -* OptiFabric Compatibility -* Rare Drop Special Effects! Dungeon chest -* Dungeon Chest Profit Calculator -* Hide Status Effect Overlay -* Personal Compactor/Deletor preview -* Hide fake players in social interactions screen -* hidden relic helper
\ No newline at end of file +### Dungeon Features: +- **Secrets Waypoint Highlight:** Fully configurable +- **Minimap** +- **Starred Mob Glow** +- **Croesus Helper** +- **Puzzle Solver:** + - *Three Weirdos* + - *Blaze* + - *Creeper Beams* + - *Quiz - Ouro the Omniscient* + - *Tic Tac Toe* + - *Terminal:* + - *Order* + - *Coloured Items* + - *Item Name* +- **Rare Drop Special Effects** +- **Chest Profit Calculator** +- **Livid Color Helper** +- **Reparty:** Type /rp to reparty and enable auto-rejoin. + +### Item and Armor Customization: +- *Item Renaming* +- *Custom Armor Dye Colors* +- *Custom Armor Trims* + +### Health and Status Bars: +- **Bars:** + - *Health and absorption* + - *Mana* + - *Defense* + - *XP* + +### Dwarven Mines: +- **Dwarven Mines Solver:** + - *Fetchur* + - *Puzzler* +- **Commission HUD** + - *Provides information on Dwarven Mines quests* + +### Rift Features: +- **Mirrorverse Waypoints** + +### Spider's Den Features: +- **Hidden Relic Helper** + +### Slayer Helper: +- **Vampire:** + - *Effigy Waypoints* + - *Healing Melon Indicator* + - *Twinclaws Ice Indicator* + - *Steak Stake Indicator* + +### Visual Enhancements: +- **Fancy Tab HUD:** Fully configurable with a resource pack. +- **1.8 Hitbox for Lever and Farmland** +- **Hide Status Effect Overlay** +- **Personal Compactor/Deletor Preview** +- **Hide Fake Players in Social Interactions Screen** +- **Item Rarity Backgrounds** +- **Item Cooldown Display** +- **Configure Fire-Overlay Height** + +### User Interface Enhancements: +- **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. +- **Price Tooltip:** (Provides information on) + - *NPC Prices* + - *Motes Prices* + - *bazaar (average, lowest bin)* + - *Auction House* + - *Museum* +- **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* + +### Chat Features: +- **Hide Messages:** + - *Ability Cooldown* + - *Heal* + - *Aspect of the End (AOTE)* + - *Implosion* + - *Molten Wave* + - *`/show command`* + - *Teleport Pad Messages* + +### Miscellaneous Solvers: +- **Experiments Solvers** +- **Fishing Helper:** Includes sound notifications. + +### Miscellaneous Features: +- **Roughly Enough Items (REI) and EMI Support** +- **Item Protection** +- **Discord Rich Presence:** Allows users to show their Piggy, Bits, or location, along with a custom message. +- **Wiki Lookup:** Press F4 to open the wiki page about the held item. +- **OptiFabric Compatibility**
\ No newline at end of file diff --git a/MRREADME.md b/MRREADME.md index 7e1e68ad..67dd29b2 100644 --- a/MRREADME.md +++ b/MRREADME.md @@ -2,7 +2,7 @@ ## Skyblocker -Hypixel Skyblock Mod for Minecraft 1.17.x + 1.18.x + 1.19.x + 1.20.x +Hypixel Skyblock Mod for Minecraft 1.20.2 ## 🔧 Configuration - [Mod Menu](https://modrinth.com/mod/modmenu) not required open config with modmenu \ @@ -10,17 +10,31 @@ or **/skyblocker config** Skyblocker has a variety of configurations. \ To access the configuration menu, you must install [Mod Menu](https://modrinth.com/mod/modmenu). -<figure><a href="https://cdn-raw.modrinth.com/data/y6DuFGwJ/images/7a284adbbdc9cbad48c627e3898dc8cfb9f54a64.png"><img src="https://cdn.modrinth.com/data/y6DuFGwJ/images/7a284adbbdc9cbad48c627e3898dc8cfb9f54a64.png" alt="Mod Menu" style="width:100%"></a><figcaption align = "center"><b>Mod Menu - Skyblocker config</b></figcaption></figure> +<figure><a href="https://cdn.discordapp.com/attachments/895564321520750602/1165269183429361674/Bildschirmfoto_vom_2023-10-21_14-43-26.png"><img src="https://cdn.discordapp.com/attachments/895564321520750602/1165269183429361674/Bildschirmfoto_vom_2023-10-21_14-43-26.png" alt="Mod Menu" style="width:100%"></a><figcaption align = "center"><b>Skyblocker config</b></figcaption></figure> ### List of Configuration <details> <summary> General </summary> -|Config option|Description| -|---|---| -| Update Notification | Get notified when there is a new update | -| View [backpack preview](https://cdn-raw.modrinth.com/data/y6DuFGwJ/images/ef33e34b79c1615bcb23f3a395b29b793ef32e34.png) without holding shift | Preview on hover | +| Config option | Description | +|-----------------------------------------------------------------------------------------------------------------------------------------------|---------------------| +| Auto accept Reparty | Auto accept Reparty | +| View [backpack preview](https://cdn-raw.modrinth.com/data/y6DuFGwJ/images/ef33e34b79c1615bcb23f3a395b29b793ef32e34.png) without holding shift | Preview on hover | +| Enable Comactor/Deletor Preview | Preview on hover | +| Hide empty item tooltips in menus | | +| Hide Status Effect Overlay | | + +<details> +<summary> Fancy tab HUD </summary> + +| Config option | Description | +|-------------------------------|---------------------------------------------------------------------------| +| Enable fancy tab HUD | | +| Scale factor of fancy tab HUD | | +| Plain Player Names | display names without any special formatting | +| Player Name Sorty Method | default has no particular order. Alphabetical sort names alphabetically | +</details> <details> <summary> Health, Mana, Defence & XP Bars </summary> @@ -32,11 +46,74 @@ To access the configuration menu, you must install [Mod Menu](https://modrinth.c </details> <details> +<summary> Experiments Solver </summary> + +| Config option | Description | +|------------------------------|-------------| +| Enable Chromatron Solver | | +| Enable Superpairs Solver | | +| Enable Ultrasequencer Solver | | + +</details> + +<details> +<summary> Fishing Helper </summary> + +| Config option | Description | +|-----------------------|-------------| +| Enable Fishing Helper | | + +</details> + +<details> +<summary> Fairy Souls Helper </summary> + +| Config option | Description | +|-----------------------------------|---------------------| +| Enable Fairy Souls Helper | | +| Highlight found fairy souls | | +| Only highlight nearby fairy souls | radius of 50 blocks | + +</details> + +<details> +<summary> Item Cooldown </summary> + +| Config option | Description | +|----------------------|---------------------| +| Enable Item Cooldown | | + +</details> + +<details> +<summary> Shortcuts </summary> + +| Config option | Description | +|-----------------------------------|----------------------------------------| +| Enable Shortcuts | | +| Enable Command Shortcuts | | +| Enable Command Argument Shortcuts | | +| Shortcuts Config | Open new window to configure shortcuts | + +</details> + +<details> +<summary> Quiver Warning </summary> + +| Config option | Description | +|---------------------------------------|----------------------------------------| +| Enable Quiver Warning | | +| Enable Quiver Warning In Dungeons | | +| Enable Quiver Warning After a Dungeon | | + +</details> + +<details> <summary> Item List </summary> -|Config option|Description| -|---|---| -|Enable Item List| Acitvate [recipe viewer](https://cdn-raw.modrinth.com/data/y6DuFGwJ/images/cf9f8077067b9781686f23116f163d529c21c404.png)| +| Config option | Description | +|------------------|--------------------------------------------------------------------------------------------------------------------------| +| Enable Item List | Acitvate [recipe viewer](https://cdn-raw.modrinth.com/data/y6DuFGwJ/images/cf9f8077067b9781686f23116f163d529c21c404.png) | </details> <details> @@ -44,54 +121,244 @@ To access the configuration menu, you must install [Mod Menu](https://modrinth.c Customize [Item tooltip](https://cdn-raw.modrinth.com/data/y6DuFGwJ/images/12903f3f839d769fac48a4e74e04bee9aa1657d5.png) +| Config option | Description | +|------------------------------|----------------------------------------| +| Enable NPC Price | | +| Enable Motes Price | | +| Enable Avg. BIN Price | | +| Average Type | | +| Enable Lowest BIN Price | | +| Enable Bazaar buy/sell Price | | +| Enable Museum & Date | | + +</details> + +<details> +<summary> Item Info Display </summary> + +| Config option | Description | +|--------------------------------|-------------| +| Attribute Shard Info | | +| Item Rarity Backgrounds | | +| Item Rarity Background Opacity | | +</details> + +<details> +<summary> Wiki Lookup </summary> + +| Config option | Description | +|--------------------|-----------------------------------------------------| +| Enable Wiki Lookup | press f4 to open the wiki page pof the hovered item | +| Use Official Wiki | | +</details> + +<details> +<summary> Special Effects </summary> + +| Config option | Description | +|---------------------------|-------------| +| Rare Dungeon Drop Effects | | </details> <details> <summary> Hitboxes </summary> -|Config option|Description| -|---|---| -|Enable 1.8 farmland hitbox| Change hitbox to the 1.8 one | -|Enable 1.8 lever hitbox| Change hitbox to the 1.8 one | +| Config option | Description | +|----------------------------|------------------------------| +| Enable 1.8 farmland hitbox | Change hitbox to the 1.8 one | +| Enable 1.8 lever hitbox | Change hitbox to the 1.8 one | </details> + +<details> +<summary> Title Container </summary> + +Used to display multiple titles at once, Example use: Vampire Slayer + +| Config option | Description | +|----------------------------------|-------------| +| Title Container Scale | | +| Title Container Placement Config | | </details> <details> -<summary> Locations </summary> +<summary> Teleport Overlay </summary> + +| Config option | Description | +|---------------------------------------|-------------| +| Enable Teleport Overlays | | +| Enable Weird Transmission Overlay | | +| Enable Instant Transmission Overlay | | +| Enable Ether Transmission Overlay | | +| Enable Sinrecall Transmission Overlay | | +| Enable Wither Impact Overlay | | +</details> + +<details> +<summary> Flame Overlay </summary> + +| Config option | Description | +|---------------|-------------| +| Flame Height | | +| Flame Opacity | | +</details> + +</details> <details> <summary> Dungeons </summary> -|Config option|Description| -|---|---| -|Croseus Helper|Gray out chests that have already been opened| -|Enable Map| [Map](https://cdn-raw.modrinth.com/data/y6DuFGwJ/images/43243429b1c4d17236ae3e5a9836ecd7d905644b.png)| -|Solve Three Weirdos Puzzle|Solver usefull in Dungeons| -|Solve Blaze Puzzle|Solver usefull in Dungeons| -|Solve Trivia Puzzle|Solver usefull in Dungeons| +| Config option | Description | +|------------------------------|--------------------------------------------------------------------------------------------------------| +| Croseus Helper | Gray out chests that have already been opened | +| Enable Map | [Map](https://cdn-raw.modrinth.com/data/y6DuFGwJ/images/43243429b1c4d17236ae3e5a9836ecd7d905644b.png) | +| Dungeon Map Placement Config | | +| Map Scaling | | +| Starred Mob Glow | | +| Solve Three Weirdos Puzzle | Solver usefull in Dungeons | +| Solve Blaze Puzzle | Solver usefull in Dungeons | +| Solve Creeper Beams Puzzle | | +| Solve Trivia Puzzle | Solver usefull in Dungeons | +| Solve Tic Tac Toe Puzzle | | <details> -<summary> Terminal </summary> +<summary> Dungeon Secret Waypoints </summary> + +| Config option | Description | +|------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| Enable Dungeon Secret Waypoints | | +| Do Not Initialize Secret Waypoints | | +| Waypoint Type | Waypoint: Displays a highkught and beam <br/>Outlined Waypoint: Displays both a waypoint and an outline <br/> Highlight: Only displays a highlight <br/> Outlined Highlight: Displays both a highlight and an outline <br/> Outline: Outlines the secret in a box. | +| Show Secret Text | | +| Enable Entrance Waypoints | | +| Enable Superboom Waypoints | | +| Enable Chest Waypoints | | +| Enable Item Waypoints | | +| Enable Bat Waypoints | | +| Enable Wither Essence Waypoints | | +| Enable Lever Waypoints | | +| Enable Fairy Soul Waypoints | | +| Enable Stonk Waypoints | | +| Enable Default Waypoints | | +</details> -|Config option|Description| -|---|---| -|Solve Selectect Colored|Solver usefull in Dungeons 7| -|Solve Click In Order|Solver usefull in Dungeons 7| -|Solve Starts With|Solver usefull in Dungeons 7| +<details> +<summary> Dungeon Chest Profit Calculator </summary> + +| Config option | Description | +|--------------------------|-------------| +| Enable Profit Calculator | | +| Include Kismet Price | | +| Include Essence | | +| Neutral Threshold | | +| Neutral Color | | +| Profit Color | | +| Loss Color | | +| Incomplete Color | | +</details> + +<details> +<summary> Livid Color </summary> + +| Config option | Description | +|--------------------|----------------------------------------------------------| +| Enable Livid Color | Send the livid color in chat during the Livid boss fight | +| Livid Color Text | text wich will be sent in the chat | +</details> + +<details> +<summary> Terminal Solvers </summary> + +| Config option | Description | +|-------------------------|------------------------------| +| Solve Selectect Colored | Solver usefull in Dungeons 7 | +| Solve Click In Order | Solver usefull in Dungeons 7 | +| Solve Starts With | Solver usefull in Dungeons 7 | </details> + </details> + <details> <summary> Dwarven Mines </summary> -|Config option|Description| -|---|---| -|Enable Drill Fuel|[Drill icon](https://cdn-raw.modrinth.com/data/y6DuFGwJ/images/43c7ab7aa7c90fcf833c7cddbf73e6644c6ce5fa.png)| -|Solve Fetchur| Solver usefull in Mines| -|Solve Puzzler Puzzle| Solver usefull in Mines | -|Dwarven Hud| [Commision Hud](https://cdn.discordapp.com/attachments/905867886428565565/950513333478494248/Screen_Shot_2022-03-07_at_4.58.12_PM.png)| +| Config option | Description | +|----------------------|----------------------------------------------------------------------------------------------------------------------------------------| +| Enable Drill Fuel | [Drill icon](https://cdn-raw.modrinth.com/data/y6DuFGwJ/images/43c7ab7aa7c90fcf833c7cddbf73e6644c6ce5fa.png) | +| Solve Fetchur | Solver usefull in Mines | +| Solve Puzzler Puzzle | Solver usefull in Mines | + +<details> +<summary> Dwarven HUD </summary> + +| Config option | Description | +|-----------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------| +| Enabled | | +| Style for HUD | Simple: Shows name and percentage<br/> Fancy: Shows name, percentage, progress bar and an icon <br/> Classic: Shows name and percentage in a very simple box | +| Dwarven HUD Config... | | +| Enable Background | | + +</details> + +</details> + +<details> +<summary> Locations </summary> + +<details> +<summary> Barn </summary> + +| Config option | Description | +|:----------------------|:------------| +| Solve Hungry Hiker | | +| Solve Treasure Hunter | | + +</details> + +<details> +<summary> The Rift </summary> + +| Config option | Description | +|:-----------------------------|:---------------------------------------| +| Enable Mirrorverse Waypoints | | +| McGrubber Sacks | Used for calculating Motes sell prices | + +</details> + +<details> +<summary> Spider's Den </summary> + +| Config option | Description | +|:----------------------------|:------------| +| Enable Hidden Relics Helper | | +| Highlight found relics | | + </details> + </details> +<details> +<summary> Slayers </summary> + +<details> +<summary> Vampire Slayer </summary> + +| Config option | Description | +|:-----------------------------------------------|:------------| +| Enable Effigy Waypoints | | +| Compact Effigy Waypoints | | +| Effigy Waypoints Update Frequency (Ticks) | | +| Enable Holy Ice Indicator | | +| Holy Ice Indicator Delay (Ticks) | | +| Holy Ice Indicator Update Frequency (Ticks) | | +| Enable Healing Melon Indicator | | +| Healing Melon Indicator Threshold (Hearts) | | +| Enable Steak Stake Indicator | | +| Steak Stake Indicator Update Frequency (Ticks) | | +| Enable Mania Block Indicator | | +| Mania Indicator Update Frequency (Ticks) | | + +</details> + +</details> <details> <summary> Quick Navigation </summary> @@ -112,25 +379,24 @@ Customize [Item tooltip](https://cdn-raw.modrinth.com/data/y6DuFGwJ/images/12903 </details> </details> - <details> <summary> Messages </summary> -|Config option|Description| -|---|---| -|Hide Ability Cooldown|Disable,Filter or Move to action bar| -|Hide Heal Messages|Disable,Filter or Move to action bar| -|Hide AOTE Messages|Disable,Filter or Move to action bar| -|Hide Implosion Message|Disable,Filter or Move to action bar| -|Hide Molten Wave Message|Disable,Filter or Move to action bar| -|Hide Ads from Public Chat|Disable,Filter or Move to action bar| -|Hide Teleport Pad Messages|Disable,Filter or Move to action bar| -|Hide Combo Messages|Disable,Filter or Move to action bar| -|Hide Autopet Messages|Disable,Filter or Move to action bar| -|Hide Mana Consumption Messages from Action Bar|Activate or deactivate| +| Config option | Description | +|------------------------------------------------|-----------------------------------------| +| Hide Ability Cooldown | Disable,Filter or Move to action bar | +| Hide Heal Messages | Disable,Filter or Move to action bar | +| Hide AOTE Messages | Disable,Filter or Move to action bar | +| Hide Implosion Message | Disable,Filter or Move to action bar | +| Hide Molten Wave Message | Disable,Filter or Move to action bar | +| Hide Ads from Public Chat | Disable,Filter or Move to action bar | +| Hide Teleport Pad Messages | Disable,Filter or Move to action bar | +| Hide Combo Messages | Disable,Filter or Move to action bar | +| Hide Autopet Messages | Disable,Filter or Move to action bar | +| Hide Show Off Messages | Filters messages from the `/show command` | +| Hide Mana Consumption Messages from Action Bar | Activate or deactivate | </details> - <details> <summary> Discord Rich Presence </summary> @@ -146,58 +412,111 @@ Customize [Item tooltip](https://cdn-raw.modrinth.com/data/y6DuFGwJ/images/12903 Click [#Gallery](https://modrinth.com/mod/skyblocker-liap/gallery) for images to this mod ## 📖Features -<details open> +<details open> <summary>open</summary> -* Bars: Health and absorption, Mana, Defense, XP (moving fancy bars) -* Hide Messages: Ability Cooldown, Heal, AOTE, Implosion, Molten Wave, Teleport Pad Messages -* Dungeon Minimap -* Dungeon Secrets -* Starred Mob Glow -* Dungeon Puzzle Solver: - * Three Weirdos - * Blaze - * Tic Tac Toe - * 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 and Pickonimbus 2000 in Item Durability Bar -* Hotbar Slot Lock Keybind (Select the hotbar slot you want to lock/unlock and press the lockbutton) -* 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, - warp hub -* Recipe book: in the vanilla recipe book all skyblock items are listed, and you can see the recipe of the item -* Backpack preview: after you clicked your backpack or enderchest once you can hover over the backpack or enderchest and - hold shift to preview -* Update notification -* Commission HUD: Dwarven Mines quests -* 1.8 hitbox for lever and farmland -* Custom Tab HUD + Fully configureable with ressourcepack -* Roughly enough items (REI) and Emi Support -* Fishing Helper + sound notification -* Mirrorverse Waypoints -* Attribute Shard Info Display -* Item and Armour customisation: - * Item Renaming - * Custom Armour Dye Colours - * Custom Armour Trims -* OptiFabric Compatibility -* Rare Drop Special Effects! Dungeon chest -* Dungeon Chest Profit Calculator -* Hide Status Effect Overlay -* Personal Compactor/Deletor preview -* Hide fake players in social interactions screen -* hidden relic helper +### Dungeon Features: +- **Secrets Highlight:** Fully configurable +- **Minimap** +- **Starred Mob Glow** +- **Puzzle Helper:** + - *Croesus* + - *Three Weirdos* + - *Blaze* + - *Creeper Beams* + - *Trivia* + - *Tic Tac Toe* + - *Terminal:* + - *Order* + - *Coloured Items* + - *Item Name* +- **Rare Drop Special Effects** +- **Chest Profit Calculator** +- **Livid Color Helper** +- **Reparty:** Type /rp to reparty and enable auto-rejoin. + +### Item and Armor Customization: +- *Item Renaming* +- *Custom Armor Dye Colors* +- *Custom Armor Trims* + +### Health and Status Bars: +- **Bars:** + - *Health and absorption* + - *Mana* + - *Defense* + - *XP* + +### Dwarven Mines: +- **Dwarven Mines Solver:** + - *Fetchur* + - *Puzzler* +- **Commission HUD** + - *Provides information on Dwarven Mines quests* + +### Rift Features: +- **Mirrorverse Waypoints** + +### Spider's Den Features: +- **Hidden Relic Helper** + +### Slayer Helper: +- **Vampire:** + - *Effigy Waypoints* + - *Healing Melon Indicator* + - *Twinclaws Ice Indicator* + - *Steak Stake Indicator* + +### Visual Enhancements: +- **Fancy Tab HUD:** Fully configurable with a resource pack. +- **1.8 Hitbox for Lever and Farmland** +- **Hide Status Effect Overlay** +- **Personal Compactor/Deletor Preview** +- **Hide Fake Players in Social Interactions Screen** +- **Item Rarity Backgrounds** +- **Item Cooldown Display** +- **Configure Fire-Overlay Height** + +### User Interface Enhancements: +- **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. +- **Price Tooltip:** (Provides information on) + - *NPC Prices* + - *Motes Prices* + - *bazaar (average, lowest bin)* + - *Auction House* + - *Museum* +- **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* + +### Chat Features: +- **Hide Messages:** + - *Ability Cooldown* + - *Heal* + - *Aspect of the End (AOTE)* + - *Implosion* + - *Molten Wave* + - *`/show command`* + - *Teleport Pad Messages* + +### Miscellaneous Solvers: +- **Experiments Solvers** +- **Fishing Helper:** Includes sound notifications. + +### Miscellaneous Features: +- **Roughly Enough Items (REI) and EMI Support** +- **Item Protection** +- **Discord Rich Presence:** Allows users to show their Piggy, Bits, or location, along with a custom message. +- **Wiki Lookup:** Press F4 to open the wiki page about the held item. +- **OptiFabric Compatibility** + </details> @@ -17,55 +17,107 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in <details open> <summary>open</summary> -* Bars: Health and absorption, Mana, Defense, XP (moving fancy bars) -* Hide Messages: Ability Cooldown, Heal, AOTE, Implosion, Molten Wave, Teleport Pad Messages -* Dungeon Minimap -* Dungeon Secrets -* Starred Mob Glow -* Dungeon Puzzle Solver: - * Three Weirdos - * Blaze - * Tic Tac Toe - * 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 and Pickonimbus 2000 in Item Durability Bar -* Hotbar Slot Lock Keybind (Select the hotbar slot you want to lock/unlock and press the lockbutton) -* 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, - warp hub -* Recipe book: in the vanilla recipe book all skyblock items are listed, and you can see the recipe of the item -* Backpack preview: after you clicked your backpack or enderchest once you can hover over the backpack or enderchest and - hold shift to preview -* Update notification -* Commission HUD: Dwarven Mines quests -* 1.8 hitbox for lever and farmland -* Custom Tab HUD + Fully configureable with ressourcepack -* Roughly enough items (REI) and Emi Support -* Fishing Helper + sound notification -* Mirrorverse Waypoints -* Attribute Shard Info Display -* Item and Armour customisation: - * Item Renaming - * Custom Armour Dye Colours - * Custom Armour Trims -* OptiFabric Compatibility -* Rare Drop Special Effects! Dungeon chest -* Dungeon Chest Profit Calculator -* Hide Status Effect Overlay -* Personal Compactor/Deletor preview -* Hide fake players in social interactions screen -* hidden relic helper +### Dungeon Features: +- **Secrets Highlight:** Fully configurable +- **Minimap** +- **Starred Mob Glow** +- **Puzzle Helper:** + - *Croesus* + - *Three Weirdos* + - *Blaze* + - *Creeper Beams* + - *Trivia* + - *Tic Tac Toe* + - *Terminal:* + - *Order* + - *Coloured Items* + - *Item Name* +- **Rare Drop Special Effects** +- **Chest Profit Calculator** +- **Livid Color Helper** +- **Reparty:** Type /rp to reparty and enable auto-rejoin. + +### Item and Armor Customization: +- *Item Renaming* +- *Custom Armor Dye Colors* +- *Custom Armor Trims* + +### Health and Status Bars: +- **Bars:** + - *Health and absorption* + - *Mana* + - *Defense* + - *XP* + +### Dwarven Mines: +- **Dwarven Mines Solver:** + - *Fetchur* + - *Puzzler* +- **Commission HUD** + - *Provides information on Dwarven Mines quests* + +### Rift Features: +- **Mirrorverse Waypoints** + +### Spider's Den Features: +- **Hidden Relic Helper** + +### Slayer Helper: +- **Vampire:** + - *Effigy Waypoints* + - *Healing Melon Indicator* + - *Twinclaws Ice Indicator* + - *Steak Stake Indicator* + +### Visual Enhancements: +- **Fancy Tab HUD:** Fully configurable with a resource pack. +- **1.8 Hitbox for Lever and Farmland** +- **Hide Status Effect Overlay** +- **Personal Compactor/Deletor Preview** +- **Hide Fake Players in Social Interactions Screen** +- **Item Rarity Backgrounds** +- **Item Cooldown Display** +- **Configure Fire-Overlay Height** + +### User Interface Enhancements: +- **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. +- **Price Tooltip:** (Provides information on) + - *NPC Prices* + - *Motes Prices* + - *bazaar (average, lowest bin)* + - *Auction House* + - *Museum* +- **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* + +### Chat Features: +- **Hide Messages:** + - *Ability Cooldown* + - *Heal* + - *Aspect of the End (AOTE)* + - *Implosion* + - *Molten Wave* + - *`/show command`* + - *Teleport Pad Messages* + +### Miscellaneous Solvers: +- **Experiments Solvers** +- **Fishing Helper:** Includes sound notifications. + +### Miscellaneous Features: +- **Roughly Enough Items (REI) and EMI Support** +- **Item Protection** +- **Discord Rich Presence:** Allows users to show their Piggy, Bits, or location, along with a custom message. +- **Wiki Lookup:** Press F4 to open the wiki page about the held item. +- **OptiFabric Compatibility** </details> @@ -73,13 +125,14 @@ ___ ## Commands -| 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 | -| /skyblocker custom | renameItem / armorTrim / dyeColor | Item and Armour customisation | +| 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 | +| /skyblocker custom | renameItem / armorTrim / dyeColor | Item and Armour customisation | +| /skyblocker protectItem | | When an item is protected it's safe from: <br /> - Being dropped while holding it, regardless of the slot being locked <br /> - Being dropped from picking it up in your inventory then clicking outside the screen <br /> - Being dropped via hovering over it and pressing the drop key | --- @@ -110,6 +163,8 @@ information. ## Credits +### Contributor + | [<img alt="Kraineff" src="https://github.com/Kraineff.png" width="100">](https://github.com/Kraineff) | [<img alt="d3dx9" src="https://github.com/d3dx9.png" width="100">](https://github.com/d3dx9) | [<img alt="LifeIsAParadox" src="https://github.com/LifeIsAParadox.png" width="100">](https://github.com/LifeIsAParadox) | [<img alt="ExternalTime" src="https://github.com/ExternalTime.png" width="100">](https://github.com/ExternalTime) | |:-----------------------------------------------------------------------------------------------------:|:--------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------:| | [Kraineff](https://github.com/Kraineff) | [d3dx9](https://github.com/d3dx9) | [LifeIsAParadox](https://github.com/LifeIsAParadox) | [ExternalTime](https://github.com/ExternalTime) | @@ -126,18 +181,19 @@ 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) | [<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) |[<img alt="viciscat" src="https://github.com/viciscat.png" width="100">](https://github.com/Futuremappermydud) | -|:--------------------------------------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------------------------------:|:--------------------------------------------------------------------------------------------------------------------------:|:--------------------------------------------------------------------------------------------------------------------------:| -| [lantice3720](https://github.com/lantice3720) | [koloiyolo](https://github.com/koloiyolo) | [Futuremappermydud](https://github.com/Futuremappermydud) | [viciscat](https://github.com/Futuremappermydud) | +| [<img alt="lantice3720" src="https://github.com/lantice3720.png" width="100">](https://github.com/lantice3720) | [<img alt="koloiyolo" src="https://github.com/koloiyolo.png" width="100">](https://github.com/koloiyolo) | [<img alt="Futuremappermydud" src="https://github.com/Futuremappermydud.png" width="100">](https://github.com/Futuremappermydud) | [<img alt="viciscat" src="https://github.com/viciscat.png" width="100">](https://github.com/viciscat) | +|:--------------------------------------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------------------------------:|:--------------------------------------------------------------------------------------------------------------------------:|:--------------------------------------------------------------------------------------------------------------:| +| [lantice3720](https://github.com/lantice3720) | [koloiyolo](https://github.com/koloiyolo) | [Futuremappermydud](https://github.com/Futuremappermydud) | [viciscat](https://github.com/viciscat) | + +| [<img alt="Grayray75" src="https://github.com/Grayray75.png" width="100">](https://github.com/Grayray75) | [<img alt="alexiayaa" src="https://github.com/alexiayaa.png" width="100">](https://github.com/alexiayaa) | +|:----------------------------------------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------------------------------------:| +| [Grayray75](https://github.com/Grayray75) | [alexiayaa](https://github.com/alexiayaa) | -| [<img alt="Grayray75" src="https://github.com/Grayray75.png" width="100">](https://github.com/Futuremappermydud) | -|:--------------------------------------------------------------------------------------------------------------:| -| [Grayray75](https://github.com/lantice3720) | ### 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) & [CrimsonIsle](https://github.com/CrimsonIsle))\ +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)) \ Japanese ([hirochisan](https://github.com/hirochisan)) \ Chinese ([catandA](https://github.com/catandA)) \ @@ -147,4 +203,5 @@ Spanish ([IngeSebastian](https://github.com/IngeSebastian)) \ Norwegian Bokmål ([KdGaming0](https://github.com/KdGaming0)) \ Norwegian Nynorsk ([KdGaming0](https://github.com/KdGaming0)) \ Turkish ([Fix3dll](https://github.com/Fix3dll)) \ -Canadian English ([AzureAaron](https://github.com/AzureAaron))
\ No newline at end of file +Canadian English ([AzureAaron](https://github.com/AzureAaron)) \ +Portuguese (Brazil) ([OhRetro](https://github.com/OhRetro))
\ No newline at end of file diff --git a/build.gradle b/build.gradle index 66c56e21..fde768d5 100644 --- a/build.gradle +++ b/build.gradle @@ -72,14 +72,17 @@ dependencies { // BetterInject (https://github.com/caoimhebyrne/BetterInject) include implementation(annotationProcessor("com.github.cbyrneee:BetterInject:${project.betterinject_version}")) - // https://mvnrepository.com/artifact/org.eclipse.jgit/org.eclipse.jgit used pull data from the NEU item repo - include implementation("org.eclipse.jgit:org.eclipse.jgit:6.4.0.202211300538-r") - // Occlusion Culling (https://github.com/LogisticsCraft/OcclusionCulling) include implementation("com.logisticscraft:occlusionculling:${project.occlusionculling_version}") // NEU RepoParser include implementation("moe.nea:neurepoparser:${project.repoparser_version}") + + // JGit used pull data from the NEU item repo + include implementation("org.eclipse.jgit:org.eclipse.jgit:${project.jgit_version}") + + // Apache Commons Math + include implementation("org.apache.commons:commons-math3:${project.commons_math_version}") } loom { diff --git a/gradle.properties b/gradle.properties index abe5d2f7..42529261 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ loader_version=0.14.22 ## 1.20 fabric_api_version=0.89.1+1.20.2 -# Dependencies +# Minecraft Mods ## YACL (https://github.com/isXander/YetAnotherConfigLib) yacl_version=3.2.1+1.20.2 ## Mod Menu (https://modrinth.com/mod/modmenu/versions) @@ -23,6 +23,7 @@ emi_version = 1.0.22+1.20.2 ## Renderer (https://github.com/0x3C50/Renderer) renderer_version = master-SNAPSHOT +# Minecraft and Related Libraries ## Mixin Extras (https://github.com/LlamaLad7/MixinExtras) mixin_extras_version = 0.2.0 ## Better Inject (https://github.com/caoimhebyrne/BetterInject) @@ -32,8 +33,14 @@ occlusionculling_version = 0.0.7-SNAPSHOT ## neu repoparser (https://repo.nea.moe/#/releases/moe/nea/neurepoparser/) repoparser_version = 1.4.0 +# Other Libraries +## JGit (https://mvnrepository.com/artifact/org.eclipse.jgit/org.eclipse.jgit) +jgit_version = 6.7.0.202309050840-r +## Apache Commons Math (https://mvnrepository.com/artifact/org.apache.commons/commons-math3) +commons_math_version = 3.6.1 + # Mod Properties -mod_version = 1.14.0 +mod_version = 1.15.0 maven_group = de.hysky archives_base_name = skyblocker modrinth_id=y6DuFGwJ
\ No newline at end of file diff --git a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java index 115f90ec..dc8896cf 100644 --- a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java +++ b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java @@ -2,13 +2,13 @@ package de.hysky.skyblocker; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.skyblock.*; +import de.hysky.skyblocker.skyblock.diana.MythologicalRitual; import de.hysky.skyblocker.skyblock.dungeon.*; import de.hysky.skyblocker.skyblock.dungeon.secrets.DungeonSecrets; -import de.hysky.skyblocker.skyblock.item.*; -import de.hysky.skyblocker.skyblock.tabhud.screenbuilder.ScreenMaster; -import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.skyblock.dwarven.DwarvenHud; +import de.hysky.skyblocker.skyblock.item.*; import de.hysky.skyblocker.skyblock.itemlist.ItemRepository; import de.hysky.skyblocker.skyblock.quicknav.QuickNav; import de.hysky.skyblocker.skyblock.rift.TheRift; @@ -16,6 +16,7 @@ import de.hysky.skyblocker.skyblock.shortcut.Shortcuts; import de.hysky.skyblocker.skyblock.special.SpecialEffects; import de.hysky.skyblocker.skyblock.spidersden.Relics; import de.hysky.skyblocker.skyblock.tabhud.TabHud; +import de.hysky.skyblocker.skyblock.tabhud.screenbuilder.ScreenMaster; import de.hysky.skyblocker.skyblock.tabhud.util.PlayerListMgr; import de.hysky.skyblocker.utils.NEURepoManager; import de.hysky.skyblocker.utils.Utils; @@ -39,7 +40,7 @@ import java.nio.file.Path; * this class. */ public class SkyblockerMod implements ClientModInitializer { - public static final String VERSION = FabricLoader.getInstance().getModContainer("skyblocker").get().getMetadata().getVersion().getFriendlyString(); + public static final String VERSION = FabricLoader.getInstance().getModContainer("skyblocker").orElseThrow().getMetadata().getVersion().getFriendlyString(); public static final String NAMESPACE = "skyblocker"; public static final Path CONFIG_DIR = FabricLoader.getInstance().getConfigDir().resolve(NAMESPACE); public static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); @@ -76,6 +77,7 @@ public class SkyblockerMod implements ClientModInitializer { WikiLookup.init(); FairySouls.init(); Relics.init(); + MythologicalRitual.init(); BackpackPreview.init(); QuickNav.init(); ItemCooldowns.init(); diff --git a/src/main/java/de/hysky/skyblocker/compatibility/MixinPlugin.java b/src/main/java/de/hysky/skyblocker/compatibility/MixinPlugin.java index c7fc6973..145f7ec4 100644 --- a/src/main/java/de/hysky/skyblocker/compatibility/MixinPlugin.java +++ b/src/main/java/de/hysky/skyblocker/compatibility/MixinPlugin.java @@ -4,13 +4,17 @@ import java.util.List; import java.util.Set; import org.objectweb.asm.tree.ClassNode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.extensibility.IMixinInfo; import net.fabricmc.loader.api.FabricLoader; public class MixinPlugin implements IMixinConfigPlugin { + private static final Logger LOGGER = LoggerFactory.getLogger(MixinPlugin.class); private static final boolean OPTIFABRIC_LOADED = FabricLoader.getInstance().isModLoaded("optifabric"); + private static final String YACL_VERSION = FabricLoader.getInstance().getModContainer("yet_another_config_lib_v3").get().getMetadata().getVersion().getFriendlyString(); @Override public void onLoad(String mixinPackage) { @@ -26,6 +30,17 @@ public class MixinPlugin implements IMixinConfigPlugin { public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { //OptiFabric Compatibility if (mixinClassName.endsWith("WorldRendererMixin") && OPTIFABRIC_LOADED) return false; + + //YACL#103 Patch + if (mixinClassName.endsWith("DoubleFieldControllerMixin") || mixinClassName.endsWith("FloatFieldControllerMixin") || mixinClassName.endsWith("IntegerFieldControllerMixin") || mixinClassName.endsWith("LongFieldControllerMixin") || mixinClassName.endsWith("NumberFieldControllerMixin")) { + if (YACL_VERSION.equals("3.2.1+1.20.2")) { + LOGGER.info("[Skyblocker] Applying patch for " + targetClassName + " from " + mixinClassName); + } else { + LOGGER.info("[Skyblocker] Skipping patch on " + targetClassName + " due to an Unknown YACL version being found! Version: {}", YACL_VERSION); + + return false; + } + } return true; } diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index 3f39c933..001c7506 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -1,11 +1,11 @@ package de.hysky.skyblocker.config; +import de.hysky.skyblocker.skyblock.item.CustomArmorTrims; +import de.hysky.skyblocker.utils.chat.ChatFilterResult; import dev.isxander.yacl3.config.v2.api.SerialEntry; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; -import de.hysky.skyblocker.skyblock.item.CustomArmorTrims; -import de.hysky.skyblocker.utils.chat.ChatFilterResult; import net.minecraft.client.resource.language.I18n; import net.minecraft.text.Text; import net.minecraft.util.Formatting; @@ -177,6 +177,9 @@ public class SkyblockerConfig { public FairySouls fairySouls = new FairySouls(); @SerialEntry + public MythologicalRitual mythologicalRitual = new MythologicalRitual(); + + @SerialEntry public ItemCooldown itemCooldown = new ItemCooldown(); @SerialEntry @@ -322,6 +325,11 @@ public class SkyblockerConfig { public boolean highlightOnlyNearbySouls = false; } + public static class MythologicalRitual { + @SerialEntry + public boolean enableMythologicalRitualHelper = true; + } + public static class ItemCooldown { @SerialEntry public boolean enableItemCooldowns = true; @@ -659,7 +667,6 @@ public class SkyblockerConfig { @SerialEntry public Formatting incompleteColor = Formatting.BLUE; - } public static class LividColor { diff --git a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java index 0101eccf..2cdde89d 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java @@ -241,20 +241,6 @@ public class DungeonsCategory { newValue -> config.locations.dungeons.mapScaling = newValue) .controller(FloatFieldControllerBuilder::create) .build()) - .option(Option.<Integer>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.mapX")) - .binding(defaults.locations.dungeons.mapX, - () -> config.locations.dungeons.mapX, - newValue -> config.locations.dungeons.mapX = newValue) - .controller(IntegerFieldControllerBuilder::create) - .build()) - .option(Option.<Integer>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.mapY")) - .binding(defaults.locations.dungeons.mapY, - () -> config.locations.dungeons.mapY, - newValue -> config.locations.dungeons.mapY = newValue) - .controller(IntegerFieldControllerBuilder::create) - .build()) .option(Option.<Boolean>createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.starredMobGlow")) .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.starredMobGlow.@Tooltip"))) diff --git a/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java index 35c91d64..719cbd79 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java @@ -7,7 +7,6 @@ import dev.isxander.yacl3.api.ConfigCategory; import dev.isxander.yacl3.api.Option; import dev.isxander.yacl3.api.OptionDescription; import dev.isxander.yacl3.api.OptionGroup; -import dev.isxander.yacl3.api.controller.IntegerFieldControllerBuilder; import de.hysky.skyblocker.skyblock.dwarven.DwarvenHudConfigScreen; import net.minecraft.client.MinecraftClient; import net.minecraft.text.Text; @@ -74,20 +73,6 @@ public class DwarvenMinesCategory { newValue -> config.locations.dwarvenMines.dwarvenHud.enableBackground = newValue) .controller(ConfigUtils::createBooleanController) .build()) - .option(Option.<Integer>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x")) - .binding(defaults.locations.dwarvenMines.dwarvenHud.x, - () -> config.locations.dwarvenMines.dwarvenHud.x, - newValue -> config.locations.dwarvenMines.dwarvenHud.x = newValue) - .controller(IntegerFieldControllerBuilder::create) - .build()) - .option(Option.<Integer>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y")) - .binding(defaults.locations.dwarvenMines.dwarvenHud.y, - () -> config.locations.dwarvenMines.dwarvenHud.y, - newValue -> config.locations.dwarvenMines.dwarvenHud.y = newValue) - .controller(IntegerFieldControllerBuilder::create) - .build()) .build()) .build(); } 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 635d192f..10b21891 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -2,13 +2,12 @@ package de.hysky.skyblocker.config.categories; import de.hysky.skyblocker.config.ConfigUtils; import de.hysky.skyblocker.config.SkyblockerConfig; +import de.hysky.skyblocker.skyblock.shortcut.ShortcutsConfigScreen; +import de.hysky.skyblocker.utils.render.title.TitleContainerConfigScreen; import dev.isxander.yacl3.api.*; import dev.isxander.yacl3.api.controller.FloatFieldControllerBuilder; import dev.isxander.yacl3.api.controller.FloatSliderControllerBuilder; -import dev.isxander.yacl3.api.controller.IntegerFieldControllerBuilder; import dev.isxander.yacl3.api.controller.IntegerSliderControllerBuilder; -import de.hysky.skyblocker.skyblock.shortcut.ShortcutsConfigScreen; -import de.hysky.skyblocker.utils.render.title.TitleContainerConfigScreen; import net.minecraft.client.MinecraftClient; import net.minecraft.text.Text; @@ -201,6 +200,19 @@ public class GeneralCategory { .build()) .build()) + //Mythological Ritual + .group(OptionGroup.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.mythologicalRitual")) + .collapsed(true) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.mythologicalRitual.enableMythologicalRitualHelper")) + .binding(defaults.general.mythologicalRitual.enableMythologicalRitualHelper, + () -> config.general.mythologicalRitual.enableMythologicalRitualHelper, + newValue -> config.general.mythologicalRitual.enableMythologicalRitualHelper = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .build()) + //Item Cooldown .group(OptionGroup.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.general.itemCooldown")) @@ -443,34 +455,6 @@ public class GeneralCategory { newValue -> config.general.titleContainer.titleContainerScale = newValue) .controller(opt -> FloatFieldControllerBuilder.create(opt).range(30f, 140f)) .build()) - .option(Option.<Integer>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.general.titleContainer.x")) - .binding(defaults.general.titleContainer.x, - () -> config.general.titleContainer.x, - newValue -> config.general.titleContainer.x = newValue) - .controller(IntegerFieldControllerBuilder::create) - .build()) - .option(Option.<Integer>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.general.titleContainer.y")) - .binding(defaults.general.titleContainer.y, - () -> config.general.titleContainer.y, - newValue -> config.general.titleContainer.y = newValue) - .controller(IntegerFieldControllerBuilder::create) - .build()) - .option(Option.<SkyblockerConfig.Direction>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.general.titleContainer.direction")) - .binding(defaults.general.titleContainer.direction, - () -> config.general.titleContainer.direction, - newValue -> config.general.titleContainer.direction = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) - .option(Option.<SkyblockerConfig.Alignment>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.general.titleContainer.alignment")) - .binding(defaults.general.titleContainer.alignment, - () -> config.general.titleContainer.alignment, - newValue -> config.general.titleContainer.alignment = newValue) - .controller(ConfigUtils::createEnumCyclingListController) - .build()) .option(ButtonOption.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.general.titleContainer.config")) .text(Text.translatable("text.skyblocker.open")) diff --git a/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java index fff534b2..f68a4e94 100644 --- a/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java @@ -2,14 +2,16 @@ package de.hysky.skyblocker.mixin; import com.llamalad7.mixinextras.injector.WrapWithCondition; import com.llamalad7.mixinextras.sugar.Local; -import de.hysky.skyblocker.skyblock.dungeon.secrets.DungeonSecrets; -import dev.cbyrne.betterinject.annotations.Inject; import de.hysky.skyblocker.skyblock.FishingHelper; +import de.hysky.skyblocker.skyblock.diana.MythologicalRitual; +import de.hysky.skyblocker.skyblock.dungeon.secrets.DungeonSecrets; import de.hysky.skyblocker.utils.Utils; +import dev.cbyrne.betterinject.annotations.Inject; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.entity.ItemEntity; import net.minecraft.entity.LivingEntity; +import net.minecraft.network.packet.s2c.play.ParticleS2CPacket; import net.minecraft.network.packet.s2c.play.PlaySoundS2CPacket; import org.slf4j.Logger; import org.spongepowered.asm.mixin.Mixin; @@ -24,7 +26,6 @@ public abstract class ClientPlayNetworkHandlerMixin { FishingHelper.onSound(packet); } - @SuppressWarnings("resource") @ModifyVariable(method = "onItemPickupAnimation", at = @At(value = "STORE", ordinal = 0)) private ItemEntity skyblocker$onItemPickup(ItemEntity itemEntity, @Local LivingEntity collector) { DungeonSecrets.onItemPickup(itemEntity, collector, collector == MinecraftClient.getInstance().player); @@ -45,4 +46,9 @@ public abstract class ClientPlayNetworkHandlerMixin { private boolean skyblocker$cancelTeamWarning(Logger instance, String format, Object... arg) { return !Utils.isOnHypixel(); } + + @Inject(method = "onParticle", at = @At("RETURN")) + private void skyblocker$onParticle(ParticleS2CPacket packet) { + MythologicalRitual.onParticle(packet); + } } diff --git a/src/main/java/de/hysky/skyblocker/mixin/yacl/DoubleFieldControllerMixin.java b/src/main/java/de/hysky/skyblocker/mixin/yacl/DoubleFieldControllerMixin.java new file mode 100644 index 00000000..ac24c09f --- /dev/null +++ b/src/main/java/de/hysky/skyblocker/mixin/yacl/DoubleFieldControllerMixin.java @@ -0,0 +1,27 @@ +package de.hysky.skyblocker.mixin.yacl; + +import java.text.NumberFormat; +import java.util.function.Function; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +import dev.isxander.yacl3.api.Option; +import dev.isxander.yacl3.gui.controllers.string.number.DoubleFieldController; +import dev.isxander.yacl3.gui.controllers.string.number.NumberFieldController; +import net.minecraft.text.Text; + +@Mixin(value = DoubleFieldController.class, remap = false) +public abstract class DoubleFieldControllerMixin extends NumberFieldController<Double> { + private static final NumberFormat NUMBER_FORMAT = NumberFormat.getInstance(); + + + public DoubleFieldControllerMixin(Option<Double> option, Function<Double, Text> displayFormatter) { + super(option, displayFormatter); + } + + @Overwrite + public String getString() { + return NUMBER_FORMAT.format(option().pendingValue()); + } +} diff --git a/src/main/java/de/hysky/skyblocker/mixin/yacl/FloatFieldControllerMixin.java b/src/main/java/de/hysky/skyblocker/mixin/yacl/FloatFieldControllerMixin.java new file mode 100644 index 00000000..d67993c2 --- /dev/null +++ b/src/main/java/de/hysky/skyblocker/mixin/yacl/FloatFieldControllerMixin.java @@ -0,0 +1,27 @@ +package de.hysky.skyblocker.mixin.yacl; + +import java.text.NumberFormat; +import java.util.function.Function; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +import dev.isxander.yacl3.api.Option; +import dev.isxander.yacl3.gui.controllers.string.number.FloatFieldController; +import dev.isxander.yacl3.gui.controllers.string.number.NumberFieldController; +import net.minecraft.text.Text; + +@Mixin(value = FloatFieldController.class, remap = false) +public abstract class FloatFieldControllerMixin extends NumberFieldController<Float> { + private static final NumberFormat NUMBER_FORMAT = NumberFormat.getInstance(); + + + public FloatFieldControllerMixin(Option<Float> option, Function<Float, Text> displayFormatter) { + super(option, displayFormatter); + } + + @Overwrite + public String getString() { + return NUMBER_FORMAT.format(option().pendingValue()); + } +} diff --git a/src/main/java/de/hysky/skyblocker/mixin/yacl/IntegerFieldControllerMixin.java b/src/main/java/de/hysky/skyblocker/mixin/yacl/IntegerFieldControllerMixin.java new file mode 100644 index 00000000..b95cbef7 --- /dev/null +++ b/src/main/java/de/hysky/skyblocker/mixin/yacl/IntegerFieldControllerMixin.java @@ -0,0 +1,31 @@ +package de.hysky.skyblocker.mixin.yacl; + +import java.text.NumberFormat; +import java.util.function.Function; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +import dev.isxander.yacl3.api.Option; +import dev.isxander.yacl3.gui.controllers.string.number.IntegerFieldController; +import dev.isxander.yacl3.gui.controllers.string.number.NumberFieldController; +import net.minecraft.text.Text; + +@Mixin(value = IntegerFieldController.class, remap = false) +public abstract class IntegerFieldControllerMixin extends NumberFieldController<Integer> { + private static final NumberFormat NUMBER_FORMAT = NumberFormat.getInstance(); + + public IntegerFieldControllerMixin(Option<Integer> option, Function<Integer, Text> displayFormatter) { + super(option, displayFormatter); + } + + @Overwrite + public String getString() { + return NUMBER_FORMAT.format(option().pendingValue()); + } + + @Overwrite + public boolean isInputValid(String input) { + return super.isInputValid(input); + } +} diff --git a/src/main/java/de/hysky/skyblocker/mixin/yacl/LongFieldControllerMixin.java b/src/main/java/de/hysky/skyblocker/mixin/yacl/LongFieldControllerMixin.java new file mode 100644 index 00000000..99871e2e --- /dev/null +++ b/src/main/java/de/hysky/skyblocker/mixin/yacl/LongFieldControllerMixin.java @@ -0,0 +1,31 @@ +package de.hysky.skyblocker.mixin.yacl; + +import java.text.NumberFormat; +import java.util.function.Function; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +import dev.isxander.yacl3.api.Option; +import dev.isxander.yacl3.gui.controllers.string.number.LongFieldController; +import dev.isxander.yacl3.gui.controllers.string.number.NumberFieldController; +import net.minecraft.text.Text; + +@Mixin(value = LongFieldController.class, remap = false) +public abstract class LongFieldControllerMixin extends NumberFieldController<Long> { + private static final NumberFormat NUMBER_FORMAT = NumberFormat.getInstance(); + + public LongFieldControllerMixin(Option<Long> option, Function<Long, Text> displayFormatter) { + super(option, displayFormatter); + } + + @Overwrite + public String getString() { + return NUMBER_FORMAT.format(option().pendingValue()); + } + + @Overwrite + public boolean isInputValid(String input) { + return super.isInputValid(input); + } +} diff --git a/src/main/java/de/hysky/skyblocker/mixin/yacl/NumberFieldControllerMixin.java b/src/main/java/de/hysky/skyblocker/mixin/yacl/NumberFieldControllerMixin.java new file mode 100644 index 00000000..17a99cfd --- /dev/null +++ b/src/main/java/de/hysky/skyblocker/mixin/yacl/NumberFieldControllerMixin.java @@ -0,0 +1,43 @@ +package de.hysky.skyblocker.mixin.yacl; + +import java.text.DecimalFormatSymbols; +import java.text.NumberFormat; +import java.text.ParseException; +import java.text.ParsePosition; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +import dev.isxander.yacl3.gui.controllers.slider.ISliderController; +import dev.isxander.yacl3.gui.controllers.string.number.NumberFieldController; +import dev.isxander.yacl3.impl.utils.YACLConstants; +import net.minecraft.util.math.MathHelper; + +@Mixin(value = NumberFieldController.class, remap = false) +public abstract class NumberFieldControllerMixin<T extends Number> implements ISliderController<T> { + private static final NumberFormat NUMBER_FORMAT = NumberFormat.getInstance(); + private static final DecimalFormatSymbols DECIMAL_FORMAT_SYMBOLS = DecimalFormatSymbols.getInstance(); + + @Overwrite + public void setFromString(String value) { + try { + setPendingValue(MathHelper.clamp(NUMBER_FORMAT.parse(value).doubleValue(), min(), max())); + } catch (ParseException ignore) { + YACLConstants.LOGGER.warn("Failed to parse number: {}", value); + } + } + + @Overwrite + public boolean isInputValid(String input) { + input = input.replace(DECIMAL_FORMAT_SYMBOLS.getGroupingSeparator() + "", ""); + ParsePosition parsePosition = new ParsePosition(0); + NUMBER_FORMAT.parse(input, parsePosition); + + return parsePosition.getIndex() == input.length(); + } + + @Overwrite + protected String cleanupNumberString(String number) { + throw new UnsupportedOperationException("This method should no longer be called."); + } +} diff --git a/src/main/java/de/hysky/skyblocker/skyblock/diana/MythologicalRitual.java b/src/main/java/de/hysky/skyblocker/skyblock/diana/MythologicalRitual.java new file mode 100644 index 00000000..ea7b39cf --- /dev/null +++ b/src/main/java/de/hysky/skyblocker/skyblock/diana/MythologicalRitual.java @@ -0,0 +1,187 @@ +package de.hysky.skyblocker.skyblock.diana; + +import com.mojang.brigadier.Command; +import de.hysky.skyblocker.SkyblockerMod; +import de.hysky.skyblocker.config.SkyblockerConfigManager; +import de.hysky.skyblocker.utils.Utils; +import de.hysky.skyblocker.utils.render.RenderHelper; +import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; +import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents; +import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext; +import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents; +import net.fabricmc.fabric.api.event.player.AttackBlockCallback; +import net.fabricmc.fabric.api.event.player.UseBlockCallback; +import net.fabricmc.fabric.api.util.TriState; +import net.minecraft.block.Blocks; +import net.minecraft.client.MinecraftClient; +import net.minecraft.command.argument.BlockPosArgumentType; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.network.packet.s2c.play.ParticleS2CPacket; +import net.minecraft.particle.ParticleTypes; +import net.minecraft.text.Text; +import net.minecraft.util.ActionResult; +import net.minecraft.util.DyeColor; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.World; +import org.apache.commons.math3.stat.regression.SimpleRegression; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.HashMap; +import java.util.Map; +import java.util.regex.Pattern; + +import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument; +import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal; + +public class MythologicalRitual { + private static final Pattern GRIFFIN_BURROW_DUG = Pattern.compile("(?<message>You dug out a Griffin Burrow!|You finished the Griffin burrow chain!) \\((?<index>\\d)/4\\)"); + private static final float[] ORANGE_COLOR_COMPONENTS = DyeColor.ORANGE.getColorComponents(); + private static final Map<BlockPos, GriffinBurrow> griffinBurrows = new HashMap<>(); + @Nullable + private static BlockPos lastDugBurrowPos; + private static GriffinBurrow previousBurrow = new GriffinBurrow(); + + public static void init() { + WorldRenderEvents.AFTER_TRANSLUCENT.register(MythologicalRitual::render); + AttackBlockCallback.EVENT.register(MythologicalRitual::onAttackBlock); + UseBlockCallback.EVENT.register(MythologicalRitual::onUseBlock); + ClientReceiveMessageEvents.GAME.register(MythologicalRitual::onChatMessage); + ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> dispatcher.register(literal(SkyblockerMod.NAMESPACE).then(literal("diana") + .then(literal("clearGriffinBurrows").executes(context -> { + griffinBurrows.clear(); + return Command.SINGLE_SUCCESS; + })) + .then(literal("clearGriffinBurrow") + .then(argument("pos", BlockPosArgumentType.blockPos()).executes(context -> { + griffinBurrows.remove(context.getArgument("pos", BlockPos.class)); + return Command.SINGLE_SUCCESS; + })) + ) + ))); + + // Put a root burrow so echo detection works without a previous burrow + previousBurrow.confirmed = TriState.DEFAULT; + griffinBurrows.put(BlockPos.ORIGIN, previousBurrow); + } + + public static void onParticle(ParticleS2CPacket packet) { + if (isActive()) { + if (ParticleTypes.CRIT.equals(packet.getParameters().getType()) || ParticleTypes.ENCHANT.equals(packet.getParameters().getType())) { + BlockPos pos = BlockPos.ofFloored(packet.getX(), packet.getY(), packet.getZ()).down(); + if (MinecraftClient.getInstance().world == null || !MinecraftClient.getInstance().world.getBlockState(pos).isOf(Blocks.GRASS_BLOCK)) { + return; + } + GriffinBurrow burrow = griffinBurrows.computeIfAbsent(pos, pos1 -> new GriffinBurrow()); + if (ParticleTypes.CRIT.equals(packet.getParameters().getType())) burrow.critParticle++; + if (ParticleTypes.ENCHANT.equals(packet.getParameters().getType())) burrow.enchantParticle++; + if (burrow.critParticle >= 5 && burrow.enchantParticle >= 5 && burrow.confirmed == TriState.FALSE) { + griffinBurrows.get(pos).init(); + } + } else if (ParticleTypes.DUST.equals(packet.getParameters().getType())) { + BlockPos pos = BlockPos.ofFloored(packet.getX(), packet.getY(), packet.getZ()).down(2); + GriffinBurrow burrow = griffinBurrows.get(pos); + if (burrow == null) { + return; + } + burrow.regression.addData(packet.getX(), packet.getZ()); + double slope = burrow.regression.getSlope(); + if (Double.isNaN(slope)) { + return; + } + Vec3d nextBurrowDirection = new Vec3d(100, 0, slope * 100).normalize().multiply(100); + if (burrow.nextBurrowPlane == null) { + burrow.nextBurrowPlane = new Vec3d[4]; + } + burrow.nextBurrowPlane[0] = Vec3d.of(pos).add(nextBurrowDirection).subtract(0, 50, 0); + burrow.nextBurrowPlane[1] = Vec3d.of(pos).subtract(nextBurrowDirection).subtract(0, 50, 0); + burrow.nextBurrowPlane[2] = burrow.nextBurrowPlane[1].add(0, 100, 0); + burrow.nextBurrowPlane[3] = burrow.nextBurrowPlane[0].add(0, 100, 0); + } else if (ParticleTypes.DRIPPING_LAVA.equals(packet.getParameters().getType())) { + if (previousBurrow.echoBurrowDirection == null) { + previousBurrow.echoBurrowDirection = new Vec3d[2]; + } + previousBurrow.echoBurrowDirection[0] = previousBurrow.echoBurrowDirection[1]; + previousBurrow.echoBurrowDirection[1] = new Vec3d(packet.getX(), packet.getY(), packet.getZ()); + if (previousBurrow.echoBurrowDirection[0] == null || previousBurrow.echoBurrowDirection[1] == null) { + return; + } + Vec3d echoBurrowDirection = previousBurrow.echoBurrowDirection[1].subtract(previousBurrow.echoBurrowDirection[0]).normalize().multiply(100); + if (previousBurrow.echoBurrowPlane == null) { + previousBurrow.echoBurrowPlane = new Vec3d[4]; + } + previousBurrow.echoBurrowPlane[0] = previousBurrow.echoBurrowDirection[0].add(echoBurrowDirection).subtract(0, 50, 0); + previousBurrow.echoBurrowPlane[1] = previousBurrow.echoBurrowDirection[0].subtract(echoBurrowDirection).subtract(0, 50, 0); + previousBurrow.echoBurrowPlane[2] = previousBurrow.echoBurrowPlane[0].add(0, 100, 0); + previousBurrow.echoBurrowPlane[3] = previousBurrow.echoBurrowPlane[1].add(0, 100, 0); + } + } + } + + public static void render(WorldRenderContext context) { + if (isActive()) { + for (Map.Entry<BlockPos, GriffinBurrow> burrowEntry : griffinBurrows.entrySet()) { + GriffinBurrow burrow = burrowEntry.getValue(); + if (burrow.confirmed == TriState.TRUE) { + RenderHelper.renderFilledThroughWallsWithBeaconBeam(context, burrowEntry.getKey(), ORANGE_COLOR_COMPONENTS, 0.25F); + } + if (burrow.confirmed != TriState.FALSE) { + if (burrow.nextBurrowPlane != null) { + RenderHelper.renderQuad(context, burrow.nextBurrowPlane, ORANGE_COLOR_COMPONENTS, 0.25F, true); + } + if (burrow.echoBurrowPlane != null) { + RenderHelper.renderQuad(context, burrow.echoBurrowPlane, ORANGE_COLOR_COMPONENTS, 0.25F, true); + } + } + } + } + } + + public static ActionResult onAttackBlock(PlayerEntity player, World world, Hand hand, BlockPos pos, Direction direction) { + return onInteractBlock(pos); + } + + public static ActionResult onUseBlock(PlayerEntity player, World world, Hand hand, BlockHitResult hitResult) { + return onInteractBlock(hitResult.getBlockPos()); + } + + @NotNull + private static ActionResult onInteractBlock(BlockPos pos) { + if (isActive() && griffinBurrows.containsKey(pos)) { + lastDugBurrowPos = pos; + } + return ActionResult.PASS; + } + + public static void onChatMessage(Text message, boolean overlay) { + if (isActive() && GRIFFIN_BURROW_DUG.matcher(message.getString()).matches()) { + previousBurrow.confirmed = TriState.FALSE; + previousBurrow = griffinBurrows.get(lastDugBurrowPos); + previousBurrow.confirmed = TriState.DEFAULT; + } + } + + private static boolean isActive() { + return SkyblockerConfigManager.get().general.mythologicalRitual.enableMythologicalRitualHelper && Utils.getLocationRaw().equals("hub"); + } + + private static class GriffinBurrow { + private int critParticle; + private int enchantParticle; + private TriState confirmed = TriState.FALSE; + private final SimpleRegression regression = new SimpleRegression(); + private Vec3d[] nextBurrowPlane; + @Nullable + private Vec3d[] echoBurrowDirection; + private Vec3d[] echoBurrowPlane; + + private void init() { + confirmed = TriState.TRUE; + regression.clear(); + } + } +} diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java index 145ee2bc..df5f36ce 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java @@ -57,6 +57,7 @@ public class DungeonMapConfigScreen extends Screen { SkyblockerConfigManager.get().locations.dungeons.mapX = hudX; SkyblockerConfigManager.get().locations.dungeons.mapY = hudY; SkyblockerConfigManager.save(); + this.client.setScreen(parent); } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java index 2bb21568..9bd6bef1 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java @@ -62,6 +62,7 @@ public class DwarvenHudConfigScreen extends Screen { SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.x = hudX; SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.y = hudY; SkyblockerConfigManager.save(); + client.setScreen(parent); } } diff --git a/src/main/java/de/hysky/skyblocker/utils/ItemUtils.java b/src/main/java/de/hysky/skyblocker/utils/ItemUtils.java index 50a9bcd1..ed46677d 100644 --- a/src/main/java/de/hysky/skyblocker/utils/ItemUtils.java +++ b/src/main/java/de/hysky/skyblocker/utils/ItemUtils.java @@ -12,34 +12,34 @@ import net.minecraft.util.Formatting; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Optional; +import java.util.function.Predicate; import java.util.regex.Pattern; public class ItemUtils { - private final static Pattern WHITESPACES = Pattern.compile("^\\s*$"); public static final String EXTRA_ATTRIBUTES = "ExtraAttributes"; public static final String ID = "id"; public static final String UUID = "uuid"; + public static final Pattern NOT_DURABILITY = Pattern.compile("[^0-9 /]"); + public static final Predicate<String> FUEL_PREDICATE = line -> line.contains("Fuel: "); - public static List<Text> getTooltip(ItemStack item) { + public static List<Text> getTooltips(ItemStack item) { MinecraftClient client = MinecraftClient.getInstance(); return client.player == null || item == null ? Collections.emptyList() : item.getTooltip(client.player, TooltipContext.Default.BASIC); } - public static List<String> getTooltipStrings(ItemStack item) { - List<Text> lines = getTooltip(item); - List<String> list = new ArrayList<>(); - - for (Text line : lines) { + @Nullable + public static String getTooltip(ItemStack item, Predicate<String> predicate) { + for (Text line : getTooltips(item)) { String string = line.getString(); - if (!WHITESPACES.matcher(string).matches()) - list.add(string); + if (predicate.test(string)) { + return string; + } } - return list; + return null; } /** @@ -98,7 +98,7 @@ public class ItemUtils { * Gets the UUID of the item stack from the {@code ExtraAttributes} NBT tag. * * @param stack the item stack to get the UUID from - * @return the UUID of the item stack, or null if the item stack is null or does not have a UUID + * @return the UUID of the item stack, or an empty string if the item stack is null or does not have a UUID */ public static String getItemUuid(@NotNull ItemStack stack) { NbtCompound extraAttributes = getExtraAttributes(stack); @@ -112,32 +112,21 @@ public class ItemUtils { @Nullable public static IntIntPair getDurability(@NotNull ItemStack stack) { - int current = 0; - int max = 0; - String clearFormatting; - - for (String line : getTooltipStrings(stack)) { - clearFormatting = Formatting.strip(line); - if (line.contains("Fuel: ")) { - if (clearFormatting != null) { - String clear = Pattern.compile("[^0-9 /]").matcher(clearFormatting).replaceAll("").trim(); - String[] split = clear.split("/"); - current = Integer.parseInt(split[0]); - max = Integer.parseInt(split[1]) * 1000; - return IntIntPair.of(current, max); - } - } else if (line.contains("uses.")) { - if (clearFormatting != null) { - int startIndex = clearFormatting.lastIndexOf("after") + 6; - int endIndex = clearFormatting.indexOf("uses", startIndex); - if (startIndex >= 0 && endIndex > startIndex) { - String usesString = clearFormatting.substring(startIndex, endIndex).trim(); - current = Integer.parseInt(usesString); - max = 5000; - } - return IntIntPair.of(current, max); - } - } + NbtCompound extraAttributes = getExtraAttributes(stack); + if (extraAttributes == null) return null; + + // TODO Calculate drill durability based on the drill_fuel flag, fuel_tank flag, and hotm level + // TODO Cache the max durability and only update the current durability on inventory tick + + int pickonimbusDurability = extraAttributes.getInt("pickonimbus_durability"); + if (pickonimbusDurability > 0) { + return IntIntPair.of(pickonimbusDurability, 5000); + } + + String drillFuel = Formatting.strip(getTooltip(stack, FUEL_PREDICATE)); + if (drillFuel != null) { + String[] drillFuelStrings = NOT_DURABILITY.matcher(drillFuel).replaceAll("").trim().split("/"); + return IntIntPair.of(Integer.parseInt(drillFuelStrings[0]), Integer.parseInt(drillFuelStrings[1]) * 1000); } return null; diff --git a/src/main/java/de/hysky/skyblocker/utils/Utils.java b/src/main/java/de/hysky/skyblocker/utils/Utils.java index c1b4223f..bbfd1101 100644 --- a/src/main/java/de/hysky/skyblocker/utils/Utils.java +++ b/src/main/java/de/hysky/skyblocker/utils/Utils.java @@ -19,6 +19,7 @@ import net.minecraft.client.network.PlayerListEntry; import net.minecraft.scoreboard.*; import net.minecraft.text.Text; import net.minecraft.util.Formatting; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,10 +41,15 @@ public class Utils { * The following fields store data returned from /locraw: {@link #profile}, {@link #server}, {@link #gameType}, {@link #locationRaw}, and {@link #map}. */ @SuppressWarnings("JavadocDeclaration") + @NotNull private static String profile = ""; + @NotNull private static String server = ""; + @NotNull private static String gameType = ""; + @NotNull private static String locationRaw = ""; + @NotNull private static String map = ""; private static long clientWorldJoinTime = 0; private static boolean sentLocRaw = false; @@ -78,6 +84,7 @@ public class Utils { /** * @return the profile parsed from the player list. */ + @NotNull public static String getProfile() { return profile; } @@ -85,6 +92,7 @@ public class Utils { /** * @return the server parsed from /locraw. */ + @NotNull public static String getServer() { return server; } @@ -92,6 +100,7 @@ public class Utils { /** * @return the game type parsed from /locraw. */ + @NotNull public static String getGameType() { return gameType; } @@ -99,6 +108,7 @@ public class Utils { /** * @return the location raw parsed from /locraw. */ + @NotNull public static String getLocationRaw() { return locationRaw; } @@ -106,6 +116,7 @@ public class Utils { /** * @return the map parsed from /locraw. */ + @NotNull public static String getMap() { return map; } diff --git a/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java b/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java index 5ab698a7..4cfaef8f 100644 --- a/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java +++ b/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java @@ -1,13 +1,11 @@ package de.hysky.skyblocker.utils.render; -import com.mojang.blaze3d.platform.GlStateManager.DstFactor; -import com.mojang.blaze3d.platform.GlStateManager.SrcFactor; import com.mojang.blaze3d.systems.RenderSystem; import de.hysky.skyblocker.mixin.accessor.BeaconBlockEntityRendererInvoker; -import me.x150.renderer.render.Renderer3d; import de.hysky.skyblocker.utils.render.culling.OcclusionCulling; import de.hysky.skyblocker.utils.render.title.Title; import de.hysky.skyblocker.utils.render.title.TitleContainer; +import me.x150.renderer.render.Renderer3d; import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; @@ -22,7 +20,6 @@ import net.minecraft.util.math.Box; import net.minecraft.util.math.Vec3d; import org.joml.Matrix3f; import org.joml.Matrix4f; -import org.joml.Vector3f; import org.lwjgl.opengl.GL11; import java.awt.*; @@ -111,6 +108,8 @@ public class RenderHelper { * Draws lines from point to point.<br><br> * <p> * Tip: To draw lines from the center of a block, offset the X, Y and Z each by 0.5 + * <p> + * Note: This is super messed up when drawing long lines. Tried different normals and {@link DrawMode#LINES} but nothing worked. * * @param context The WorldRenderContext which supplies the matrices and tick delta * @param points The points from which to draw lines between @@ -127,7 +126,7 @@ public class RenderHelper { Tessellator tessellator = RenderSystem.renderThreadTesselator(); BufferBuilder buffer = tessellator.getBuffer(); - Matrix4f projectionMatrix = matrices.peek().getPositionMatrix(); + Matrix4f positionMatrix = matrices.peek().getPositionMatrix(); Matrix3f normalMatrix = matrices.peek().getNormalMatrix(); GL11.glEnable(GL11.GL_LINE_SMOOTH); @@ -137,21 +136,18 @@ public class RenderHelper { RenderSystem.setShaderColor(1f, 1f, 1f, 1f); RenderSystem.lineWidth(lineWidth); RenderSystem.enableBlend(); - RenderSystem.blendFunc(SrcFactor.SRC_ALPHA, DstFactor.ONE_MINUS_SRC_ALPHA); + RenderSystem.defaultBlendFunc(); RenderSystem.disableCull(); RenderSystem.enableDepthTest(); buffer.begin(DrawMode.LINE_STRIP, VertexFormats.LINES); for (int i = 0; i < points.length; i++) { - Vec3d point = points[i]; - Vec3d nextPoint = (i + 1 == points.length) ? points[i - 1] : points[i + 1]; - Vector3f normalVec = new Vector3f((float) nextPoint.getX(), (float) nextPoint.getY(), (float) nextPoint.getZ()).sub((float) point.getX(), (float) point.getY(), (float) point.getZ()).normalize(); - + Vec3d normalVec = points[(i + 1) % points.length].subtract(points[i]).normalize(); buffer - .vertex(projectionMatrix, (float) point.getX(), (float) point.getY(), (float) point.getZ()) + .vertex(positionMatrix, (float) points[i].getX(), (float) points[i].getY(), (float) points[i].getZ()) .color(colorComponents[0], colorComponents[1], colorComponents[2], alpha) - .normal(normalMatrix, normalVec.x, normalVec.y, normalVec.z) + .normal(normalMatrix, (float) normalVec.x, (float) normalVec.y, (float) normalVec.z) .next(); } @@ -160,30 +156,57 @@ public class RenderHelper { matrices.pop(); GL11.glDisable(GL11.GL_LINE_SMOOTH); RenderSystem.lineWidth(1f); - RenderSystem.disableBlend(); + RenderSystem.enableCull(); + } + + public static void renderQuad(WorldRenderContext context, Vec3d[] points, float[] colorComponents, float alpha, boolean throughWalls) { + Vec3d camera = context.camera().getPos(); + MatrixStack matrices = context.matrixStack(); + + matrices.push(); + matrices.translate(-camera.x, -camera.y, -camera.z); + + Tessellator tessellator = RenderSystem.renderThreadTesselator(); + BufferBuilder buffer = tessellator.getBuffer(); + Matrix4f positionMatrix = matrices.peek().getPositionMatrix(); + + RenderSystem.setShader(GameRenderer::getPositionColorProgram); + RenderSystem.setShaderColor(1f, 1f, 1f, 1f); + RenderSystem.enableBlend(); RenderSystem.defaultBlendFunc(); + RenderSystem.disableCull(); + RenderSystem.depthFunc(throughWalls ? GL11.GL_ALWAYS : GL11.GL_LEQUAL); + + buffer.begin(DrawMode.QUADS, VertexFormats.POSITION_COLOR); + for (int i = 0; i < 4; i++) { + buffer.vertex(positionMatrix, (float) points[i].getX(), (float) points[i].getY(), (float) points[i].getZ()).color(colorComponents[0], colorComponents[1], colorComponents[2], alpha).next(); + } + tessellator.draw(); + RenderSystem.enableCull(); - RenderSystem.disableDepthTest(); + RenderSystem.depthFunc(GL11.GL_LEQUAL); + + matrices.pop(); } - public static void renderText(WorldRenderContext context, Text text, Vec3d pos, boolean seeThrough) { - renderText(context, text, pos, 1, seeThrough); + public static void renderText(WorldRenderContext context, Text text, Vec3d pos, boolean throughWalls) { + renderText(context, text, pos, 1, throughWalls); } - public static void renderText(WorldRenderContext context, Text text, Vec3d pos, float scale, boolean seeThrough) { - renderText(context, text, pos, scale, 0, seeThrough); + public static void renderText(WorldRenderContext context, Text text, Vec3d pos, float scale, boolean throughWalls) { + renderText(context, text, pos, scale, 0, throughWalls); } - public static void renderText(WorldRenderContext context, Text text, Vec3d pos, float scale, float yOffset, boolean seeThrough) { - renderText(context, text.asOrderedText(), pos, scale, yOffset, seeThrough); + public static void renderText(WorldRenderContext context, Text text, Vec3d pos, float scale, float yOffset, boolean throughWalls) { + renderText(context, text.asOrderedText(), pos, scale, yOffset, throughWalls); } /** * Renders text in the world space. * - * @param seeThrough Whether the text should be able to be seen through walls or not. + * @param throughWalls whether the text should be able to be seen through walls or not. */ - public static void renderText(WorldRenderContext context, OrderedText text, Vec3d pos, float scale, float yOffset, boolean seeThrough) { + public static void renderText(WorldRenderContext context, OrderedText text, Vec3d pos, float scale, float yOffset, boolean throughWalls) { MatrixStack matrices = context.matrixStack(); Vec3d camera = context.camera().getPos(); TextRenderer textRenderer = client.textRenderer; @@ -203,7 +226,7 @@ public class RenderHelper { BufferBuilder buffer = tessellator.getBuffer(); VertexConsumerProvider.Immediate consumers = VertexConsumerProvider.immediate(buffer); - RenderSystem.depthFunc(seeThrough ? GL11.GL_ALWAYS : GL11.GL_LEQUAL); + RenderSystem.depthFunc(throughWalls ? GL11.GL_ALWAYS : GL11.GL_LEQUAL); textRenderer.draw(text, xOffset, yOffset, 0xFFFFFFFF, false, positionMatrix, consumers, TextRenderer.TextLayerType.SEE_THROUGH, 0, LightmapTextureManager.MAX_LIGHT_COORDINATE); consumers.draw(); diff --git a/src/main/java/de/hysky/skyblocker/utils/render/title/TitleContainerConfigScreen.java b/src/main/java/de/hysky/skyblocker/utils/render/title/TitleContainerConfigScreen.java index 5a42eeb4..19d41c91 100644 --- a/src/main/java/de/hysky/skyblocker/utils/render/title/TitleContainerConfigScreen.java +++ b/src/main/java/de/hysky/skyblocker/utils/render/title/TitleContainerConfigScreen.java @@ -3,8 +3,13 @@ package de.hysky.skyblocker.utils.render.title; import de.hysky.skyblocker.config.SkyblockerConfig; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.utils.render.RenderHelper; +import dev.isxander.yacl3.api.ConfigCategory; +import dev.isxander.yacl3.api.Option; +import dev.isxander.yacl3.api.OptionGroup; +import dev.isxander.yacl3.gui.YACLScreen; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.resource.language.I18n; import net.minecraft.client.util.math.Vector2f; import net.minecraft.text.Text; import net.minecraft.util.Formatting; @@ -21,6 +26,7 @@ public class TitleContainerConfigScreen extends Screen { private float hudX = SkyblockerConfigManager.get().general.titleContainer.x; private float hudY = SkyblockerConfigManager.get().general.titleContainer.y; private final Screen parent; + private boolean changedScale; protected TitleContainerConfigScreen() { this(null); @@ -153,17 +159,32 @@ public class TitleContainerConfigScreen extends Screen { } if (keyCode == GLFW.GLFW_KEY_EQUAL) { SkyblockerConfigManager.get().general.titleContainer.titleContainerScale += 10; + changedScale = true; } if (keyCode == GLFW.GLFW_KEY_MINUS) { SkyblockerConfigManager.get().general.titleContainer.titleContainerScale -= 10; + changedScale = true; } return super.keyPressed(keyCode, scanCode, modifiers); } + @Override public void close() { SkyblockerConfigManager.get().general.titleContainer.x = (int) hudX; SkyblockerConfigManager.get().general.titleContainer.y = (int) hudY; + + //TODO Come up with a better, less hacky solution for this in the future (: + if (parent instanceof YACLScreen yaclScreen) { + ConfigCategory category = yaclScreen.config.categories().stream().filter(cat -> cat.name().getString().equals(I18n.translate("text.autoconfig.skyblocker.category.general"))).findFirst().orElseThrow(); + OptionGroup group = category.groups().stream().filter(grp -> grp.name().getString().equals(I18n.translate("text.autoconfig.skyblocker.option.general.titleContainer"))).findFirst().orElseThrow(); + + Option<?> scaleOpt = group.options().get(0); + + // Refresh the value in the config with the bound value + if (changedScale) scaleOpt.forgetPendingValue(); + } + SkyblockerConfigManager.save(); this.client.setScreen(parent); } diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index b6edb5f8..a37e5d37 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -38,6 +38,8 @@ "text.autoconfig.skyblocker.option.general.fairySouls.highlightFoundSouls": "Highlight found fairy souls", "text.autoconfig.skyblocker.option.general.fairySouls.highlightOnlyNearbySouls": "Only highlight nearby fairy souls", "text.autoconfig.skyblocker.option.general.fairySouls.highlightOnlyNearbySouls.@Tooltip": "When enabled only fairy souls in a radius of 50 blocks are highlighted", + "text.autoconfig.skyblocker.option.general.mythologicalRitual": "Mythological Ritual Helper", + "text.autoconfig.skyblocker.option.general.mythologicalRitual.enableMythologicalRitualHelper": "Enable Mythological Ritual Helper", "text.autoconfig.skyblocker.option.general.itemCooldown": "Item Cooldown", "text.autoconfig.skyblocker.option.general.itemCooldown.enableItemCooldowns": "Enable Item Cooldown", "text.autoconfig.skyblocker.option.general.shortcuts": "Shortcuts", @@ -95,10 +97,6 @@ "text.autoconfig.skyblocker.option.general.titleContainer": "Title Container", "text.autoconfig.skyblocker.option.general.titleContainer.@Tooltip": "Used to display multiple titles at once, Example use: Vampire Slayer", "text.autoconfig.skyblocker.option.general.titleContainer.titleContainerScale": "Title Container Scale", - "text.autoconfig.skyblocker.option.general.titleContainer.x": "Title Container X Position", - "text.autoconfig.skyblocker.option.general.titleContainer.y": "Title Container Y Position", - "text.autoconfig.skyblocker.option.general.titleContainer.direction": "Title Container Orientation", - "text.autoconfig.skyblocker.option.general.titleContainer.alignment": "Title Container Horizontal Alignment", "text.autoconfig.skyblocker.option.general.titleContainer.config": "Title Container Placement Config...", "text.autoconfig.skyblocker.option.general.teleportOverlay": "Teleport Overlay", "text.autoconfig.skyblocker.option.general.teleportOverlay.enableTeleportOverlays": "Enable Teleport Overlays", @@ -188,8 +186,6 @@ "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Enable Map", "text.autoconfig.skyblocker.option.locations.dungeons.mapScreen": "Dungeon Map Placement Config...", "text.autoconfig.skyblocker.option.locations.dungeons.mapScaling": "Map Scaling", - "text.autoconfig.skyblocker.option.locations.dungeons.mapX": "Map X", - "text.autoconfig.skyblocker.option.locations.dungeons.mapY": "Map Y", "text.autoconfig.skyblocker.option.locations.dungeons.starredMobGlow": "Starred Mob Glow", "text.autoconfig.skyblocker.option.locations.dungeons.starredMobGlow.@Tooltip": "Applies the glowing effect to starred mobs that are visible.", "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Solve Three Weirdos Puzzle", @@ -221,8 +217,6 @@ "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[2]": "\nClassic: Shows name and percentage in a very simple box.", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.screen": "Dwarven HUD Config...", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enableBackground": "Enable Background", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x": "X", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y": "Y", "text.autoconfig.skyblocker.option.locations.rift": "The Rift", "text.autoconfig.skyblocker.option.locations.rift.mirrorverseWaypoints": "Enable Mirrorverse Waypoints", diff --git a/src/main/resources/assets/skyblocker/lang/es_es.json b/src/main/resources/assets/skyblocker/lang/es_es.json index 7ec449aa..87de5ab2 100644 --- a/src/main/resources/assets/skyblocker/lang/es_es.json +++ b/src/main/resources/assets/skyblocker/lang/es_es.json @@ -40,14 +40,6 @@ "text.autoconfig.skyblocker.option.richPresence.customMessage": "Mensaje Personalizado", "text.autoconfig.skyblocker.category.quickNav": "Navegación Rápida", "text.autoconfig.skyblocker.option.quickNav.enableQuickNav": "Habilitar Navegación Rápida", - "text.autoconfig.skyblocker.option.quickNav.button1": "Botón 1", - "text.autoconfig.skyblocker.option.quickNav.button2.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button2.uiTitle": "Titulo de la Interfaz", - "text.autoconfig.skyblocker.option.quickNav.button3": "Botón 3", - "text.autoconfig.skyblocker.option.quickNav.button4": "Botón 4", - "text.autoconfig.skyblocker.option.quickNav.button5": "Botón 5", - "text.autoconfig.skyblocker.option.quickNav.button6": "Botón 6", - "text.autoconfig.skyblocker.option.quickNav.button7": "Botón 7", "text.autoconfig.skyblocker.option.messages.hideImplosion": "Ocultar el mensaje de Implosion", "text.autoconfig.skyblocker.option.messages.hideCombo": "Ocultar Mensajes de Combos", "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper.@Tooltip": "Obscurece los cofres que ya han sido abiertos.", @@ -55,15 +47,6 @@ "text.autoconfig.skyblocker.option.general.itemTooltip": "Información extra de los objetos", "skyblocker.itemTooltip.nullMessage": "§cEl precio en la información en los objetos se actualiza cada 60 segundos. De lo contrario revisa lastest.log", "text.autoconfig.skyblocker.option.richPresence.info.@Tooltip": "Este valor no importa si estas ciclando", - "text.autoconfig.skyblocker.option.quickNav.button1.item": "Objeto", - "text.autoconfig.skyblocker.option.quickNav.button1.item.itemName": "Nombre del objeto", - "text.autoconfig.skyblocker.option.quickNav.button1.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button1.uiTitle": "Titulo de la Interfaz", - "text.autoconfig.skyblocker.option.quickNav.button2": "Botón 2", - "text.autoconfig.skyblocker.option.quickNav.button2.item": "Objeto", - "text.autoconfig.skyblocker.option.quickNav.button2.item.itemName": "Nombre del objeto", - "text.autoconfig.skyblocker.option.quickNav.button3.item": "Objeto", - "text.autoconfig.skyblocker.option.quickNav.button3.item.itemName": "Nombre del objeto", "text.autoconfig.skyblocker.option.messages.hideAds": "Ocultar anuncios del Chat Publico", "text.autoconfig.skyblocker.option.messages.hideTeleportPad": "Ocultar mensajes del Pad de Teletransporte", "text.autoconfig.skyblocker.option.messages.hideAutopet": "Ocultar mensajes del Autopet", @@ -82,8 +65,6 @@ "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "Resolver Fetchur", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud": "Interfaz de Dwarven", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled": "Habilitado", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x": "X", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y": "Y", "text.autoconfig.skyblocker.category.messages": "Mensajes", "text.autoconfig.skyblocker.option.messages.chatFilterResult.PASS": "Deshabilitado", "text.autoconfig.skyblocker.option.messages.chatFilterResult.FILTER": "Filtro", @@ -94,49 +75,6 @@ "text.autoconfig.skyblocker.option.messages.hideMana": "Ocultar los Mensajes del Consumo de Maná de la Barra de Acción", "text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "Da una mejor experiencia con FancyBar", "skyblocker.updaterepository.failed": "§cLa actualización del repositorio local fallo. Elimina los archivos manualmente y reinicia el juego.", - "text.autoconfig.skyblocker.option.quickNav.button11": "Botón 11", - "text.autoconfig.skyblocker.option.quickNav.button9.item.itemName": "Nombre del objeto", - "text.autoconfig.skyblocker.option.quickNav.button3.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button3.uiTitle": "Titulo de la Interfaz", - "text.autoconfig.skyblocker.option.quickNav.button4.item": "Objeto", - "text.autoconfig.skyblocker.option.quickNav.button4.item.itemName": "Nombre del objeto", - "text.autoconfig.skyblocker.option.quickNav.button4.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button4.uiTitle": "Titulo de la Interfaz", - "text.autoconfig.skyblocker.option.quickNav.button5.item": "Objeto", - "text.autoconfig.skyblocker.option.quickNav.button5.item.itemName": "Nombre del objeto", - "text.autoconfig.skyblocker.option.quickNav.button5.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button5.uiTitle": "Titulo de la Interfaz", - "text.autoconfig.skyblocker.option.quickNav.button6.item": "Objeto", - "text.autoconfig.skyblocker.option.quickNav.button6.item.itemName": "Nombre del objeto", - "text.autoconfig.skyblocker.option.quickNav.button6.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button8": "Botón 8", - "text.autoconfig.skyblocker.option.quickNav.button9": "Botón 9", - "text.autoconfig.skyblocker.option.quickNav.button10": "Botón 10", - "text.autoconfig.skyblocker.option.quickNav.button6.uiTitle": "Titulo de la Interfaz", - "text.autoconfig.skyblocker.option.quickNav.button7.item": "Objeto", - "text.autoconfig.skyblocker.option.quickNav.button7.item.itemName": "Nombre del objeto", - "text.autoconfig.skyblocker.option.quickNav.button7.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button7.uiTitle": "Titulo de la Interfaz", - "text.autoconfig.skyblocker.option.quickNav.button8.item": "Objeto", - "text.autoconfig.skyblocker.option.quickNav.button8.item.itemName": "Nombre del objeto", - "text.autoconfig.skyblocker.option.quickNav.button8.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button8.uiTitle": "Titulo de la Interfaz", - "text.autoconfig.skyblocker.option.quickNav.button9.item": "Objeto", - "text.autoconfig.skyblocker.option.quickNav.button9.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button9.uiTitle": "Titulo de la Interfaz", - "text.autoconfig.skyblocker.option.quickNav.button10.item": "Objeto", - "text.autoconfig.skyblocker.option.quickNav.button10.item.itemName": "Nombre del objeto", - "text.autoconfig.skyblocker.option.quickNav.button10.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button10.uiTitle": "Titulo de la Interfaz", - "text.autoconfig.skyblocker.option.quickNav.button11.item": "Objeto", - "text.autoconfig.skyblocker.option.quickNav.button11.item.itemName": "Nombre del objeto", - "text.autoconfig.skyblocker.option.quickNav.button11.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button11.uiTitle": "Titulo de la Interfaz", - "text.autoconfig.skyblocker.option.quickNav.button12": "Botón 12", - "text.autoconfig.skyblocker.option.quickNav.button12.item": "Objeto", - "text.autoconfig.skyblocker.option.quickNav.button12.item.itemName": "Nombre del objeto", - "text.autoconfig.skyblocker.option.quickNav.button12.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button12.uiTitle": "Titulo de la Interfaz", "text.autoconfig.skyblocker.option.general.shortcuts.enableShortcuts": "Habilitar atajos", "text.autoconfig.skyblocker.option.general.shortcuts.enableShortcuts.@Tooltip": "Solo funciona en Hypixel. Edita atajos ejecutando \"/skyblocker shortcuts\". Al menos una de las siguientes opciones debe ser activada para surgir efecto.", "text.autoconfig.skyblocker.option.general.shortcuts": "Atajos", diff --git a/src/main/resources/assets/skyblocker/lang/fr_fr.json b/src/main/resources/assets/skyblocker/lang/fr_fr.json index dae2de9a..207852ac 100644 --- a/src/main/resources/assets/skyblocker/lang/fr_fr.json +++ b/src/main/resources/assets/skyblocker/lang/fr_fr.json @@ -52,8 +52,6 @@ "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud": "ATH mine des nains", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled": "Activé", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enableBackground": "Activer l'arrière-plan", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x": "X", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y": "Y", "text.autoconfig.skyblocker.category.messages": "Messages", "text.autoconfig.skyblocker.option.messages.hideAbility": "Cacher le rechargement des capacités", "text.autoconfig.skyblocker.option.messages.hideHeal": "Cacher les messages de soin", @@ -67,7 +65,6 @@ "text.autoconfig.skyblocker.option.messages.hideMana": "Cacher les messages de consommation de mana de la barre d'action", "text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "Permet une meilleure expérience avec les barres", "text.autoconfig.skyblocker.option.locations.dungeons.mapScaling": "Taille de la Carte", - "text.autoconfig.skyblocker.option.quickNav.button1.render": "Render", "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.lividColorText.@Tooltip": "Texte qui sera envoyé dans le chat lors du boss Livid. Le string \"[color]\" sera remplacé par la couleur Livid.", "text.autoconfig.skyblocker.option.locations.dungeons.lividColor": "Couleur Livid", "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.enableLividColor": "Activer la Couleur Livid", @@ -78,8 +75,6 @@ "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER2": "Couche 2", "text.autoconfig.skyblocker.option.general.bars.barpositions.RIGHT": "Droite", "text.autoconfig.skyblocker.option.general.itemTooltip.avg.ONE_DAY": "Prix pour 1 jour", - "text.autoconfig.skyblocker.option.locations.dungeons.mapX": "Carte X", - "text.autoconfig.skyblocker.option.locations.dungeons.mapY": "Carte Y", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style": "Style du HUD", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[0]": "Simple : Montre le nom et le pourcentage.", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[1]": "Détaillé : Montre le nom, pourcentage, barre de progression et une icone.", @@ -99,14 +94,6 @@ "text.autoconfig.skyblocker.option.richPresence.info.LOCATION": "LIEU", "text.autoconfig.skyblocker.category.quickNav": "Navigation rapide", "text.autoconfig.skyblocker.option.quickNav.enableQuickNav": "Activer la navigation rapide", - "text.autoconfig.skyblocker.option.quickNav.button1": "Bouton 1", - "text.autoconfig.skyblocker.option.quickNav.button1.item": "Item", - "text.autoconfig.skyblocker.option.quickNav.button1.item.itemName": "Nom de l'item", - "text.autoconfig.skyblocker.option.quickNav.button1.item.count": "Nombre d'items", - "text.autoconfig.skyblocker.option.quickNav.button1.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button1.uiTitle": "Titre du menu", - "text.autoconfig.skyblocker.option.quickNav.button1.clickEvent": "Evènement de clic", - "text.autoconfig.skyblocker.option.quickNav.button2": "Bouton 2", "skyblocker.updaterepository.failed": "§cLa mise à jour de la repository a échoué. Supprimez les fichiers manuellement et relancez le jeu.", "skyblocker.fishing.reelNow": "Enroulez la ligne !", "text.autoconfig.skyblocker.option.general.fishing.enableFishingHelper": "Activer l'assistant de pêche", @@ -115,93 +102,6 @@ "text.autoconfig.skyblocker.option.general.itemTooltip.avg.BOTH": "Les deux", "text.autoconfig.skyblocker.option.richPresence.info.PURSE": "PORTE-MONNAIE", "text.autoconfig.skyblocker.option.richPresence.info.BITS": "BITS", - "text.autoconfig.skyblocker.option.quickNav.button4.render": "Render", - "text.autoconfig.skyblocker.option.quickNav.button4.item": "Item", - "text.autoconfig.skyblocker.option.quickNav.button7": "Bouton 7", - "text.autoconfig.skyblocker.option.quickNav.button2.render": "Render", - "text.autoconfig.skyblocker.option.quickNav.button2.item": "Item", - "text.autoconfig.skyblocker.option.quickNav.button2.item.itemName": "Nom de l'item", - "text.autoconfig.skyblocker.option.quickNav.button2.item.count": "Nombre d'items", - "text.autoconfig.skyblocker.option.quickNav.button2.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button9.render": "Render", - "text.autoconfig.skyblocker.option.quickNav.button9.item": "Item", - "text.autoconfig.skyblocker.option.quickNav.button9.item.itemName": "Nom de l'item", - "text.autoconfig.skyblocker.option.quickNav.button9.item.count": "Nombre d'items", - "text.autoconfig.skyblocker.option.quickNav.button9.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button9.uiTitle": "Titre du menu", - "text.autoconfig.skyblocker.option.quickNav.button9.clickEvent": "Evènement de clic", - "text.autoconfig.skyblocker.option.quickNav.button10": "Bouton 10", - "text.autoconfig.skyblocker.option.quickNav.button10.render": "Render", - "text.autoconfig.skyblocker.option.quickNav.button10.item": "Item", - "text.autoconfig.skyblocker.option.quickNav.button10.item.itemName": "Nom de l'item", - "text.autoconfig.skyblocker.option.quickNav.button10.item.count": "Nombre d'items", - "text.autoconfig.skyblocker.option.quickNav.button10.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button10.uiTitle": "Titre du menu", - "text.autoconfig.skyblocker.option.quickNav.button3.item": "Item", - "text.autoconfig.skyblocker.option.quickNav.button3.item.itemName": "Nom de l'item", - "text.autoconfig.skyblocker.option.quickNav.button3.item.count": "Nombre d'items", - "text.autoconfig.skyblocker.option.quickNav.button3.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button2.uiTitle": "Titre du menu", - "text.autoconfig.skyblocker.option.quickNav.button2.clickEvent": "Evènement de clic", - "text.autoconfig.skyblocker.option.quickNav.button3": "Bouton 3", - "text.autoconfig.skyblocker.option.quickNav.button3.render": "Render", - "text.autoconfig.skyblocker.option.quickNav.button3.uiTitle": "Titre du menu", - "text.autoconfig.skyblocker.option.quickNav.button3.clickEvent": "Evènement de clic", - "text.autoconfig.skyblocker.option.quickNav.button4": "Bouton 4", - "text.autoconfig.skyblocker.option.quickNav.button4.item.itemName": "Nom de l'item", - "text.autoconfig.skyblocker.option.quickNav.button4.item.count": "Nombre d'items", - "text.autoconfig.skyblocker.option.quickNav.button4.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button4.uiTitle": "Titre du menu", - "text.autoconfig.skyblocker.option.quickNav.button4.clickEvent": "Evènement de clic", - "text.autoconfig.skyblocker.option.quickNav.button5": "Bouton 5", - "text.autoconfig.skyblocker.option.quickNav.button5.render": "Render", - "text.autoconfig.skyblocker.option.quickNav.button5.item": "Item", - "text.autoconfig.skyblocker.option.quickNav.button5.item.itemName": "Nom de l'item", - "text.autoconfig.skyblocker.option.quickNav.button5.item.count": "Nombre d'items", - "text.autoconfig.skyblocker.option.quickNav.button5.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button5.uiTitle": "Titre du menu", - "text.autoconfig.skyblocker.option.quickNav.button5.clickEvent": "Evènement de clic", - "text.autoconfig.skyblocker.option.quickNav.button6": "Bouton 6", - "text.autoconfig.skyblocker.option.quickNav.button6.render": "Render", - "text.autoconfig.skyblocker.option.quickNav.button6.item": "Item", - "text.autoconfig.skyblocker.option.quickNav.button6.item.itemName": "Nom de l'item", - "text.autoconfig.skyblocker.option.quickNav.button6.item.count": "Nombre d'items", - "text.autoconfig.skyblocker.option.quickNav.button6.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button6.uiTitle": "Titre du menu", - "text.autoconfig.skyblocker.option.quickNav.button6.clickEvent": "Evènement de clic", - "text.autoconfig.skyblocker.option.quickNav.button7.render": "Render", - "text.autoconfig.skyblocker.option.quickNav.button7.item": "Item", - "text.autoconfig.skyblocker.option.quickNav.button7.item.itemName": "Nom de l'item", - "text.autoconfig.skyblocker.option.quickNav.button7.item.count": "Nombre d'items", - "text.autoconfig.skyblocker.option.quickNav.button7.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button7.uiTitle": "Titre du menu", - "text.autoconfig.skyblocker.option.quickNav.button7.clickEvent": "Evènement de clic", - "text.autoconfig.skyblocker.option.quickNav.button8": "Bouton 8", - "text.autoconfig.skyblocker.option.quickNav.button8.render": "Render", - "text.autoconfig.skyblocker.option.quickNav.button8.item": "Item", - "text.autoconfig.skyblocker.option.quickNav.button8.item.itemName": "Nom de l'item", - "text.autoconfig.skyblocker.option.quickNav.button8.item.count": "Nombre d'items", - "text.autoconfig.skyblocker.option.quickNav.button8.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button8.uiTitle": "Titre du menu", - "text.autoconfig.skyblocker.option.quickNav.button8.clickEvent": "Evènement de clic", - "text.autoconfig.skyblocker.option.quickNav.button9": "Bouton 9", - "text.autoconfig.skyblocker.option.quickNav.button10.clickEvent": "Evènement de clic", - "text.autoconfig.skyblocker.option.quickNav.button11": "Bouton 11", - "text.autoconfig.skyblocker.option.quickNav.button11.render": "Render", - "text.autoconfig.skyblocker.option.quickNav.button11.item": "Item", - "text.autoconfig.skyblocker.option.quickNav.button11.item.itemName": "Nom de l'item", - "text.autoconfig.skyblocker.option.quickNav.button11.item.count": "Nombre d'items", - "text.autoconfig.skyblocker.option.quickNav.button11.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button11.uiTitle": "Titre du menu", - "text.autoconfig.skyblocker.option.quickNav.button11.clickEvent": "Evènement de clic", - "text.autoconfig.skyblocker.option.quickNav.button12": "Bouton 12", - "text.autoconfig.skyblocker.option.quickNav.button12.render": "Render", - "text.autoconfig.skyblocker.option.quickNav.button12.item": "Item", - "text.autoconfig.skyblocker.option.quickNav.button12.item.itemName": "Nom de l'item", - "text.autoconfig.skyblocker.option.quickNav.button12.item.count": "Nombre d'items", - "text.autoconfig.skyblocker.option.quickNav.button12.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button12.uiTitle": "Titre du menu", - "text.autoconfig.skyblocker.option.quickNav.button12.clickEvent": "Evènement de clic", "text.autoconfig.skyblocker.option.general.experiments": "Aide aux expériences de la table d'expérimentation", "text.autoconfig.skyblocker.option.general.experiments.enableChronomatronSolver": "Activer l'aide au Chronomatron", "text.autoconfig.skyblocker.option.general.experiments.enableSuperpairsSolver": "Activer l'aide aux Superpairs", diff --git a/src/main/resources/assets/skyblocker/lang/ja_jp.json b/src/main/resources/assets/skyblocker/lang/ja_jp.json index 0d62361f..629bc1de 100644 --- a/src/main/resources/assets/skyblocker/lang/ja_jp.json +++ b/src/main/resources/assets/skyblocker/lang/ja_jp.json @@ -49,8 +49,6 @@ "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud": "ドワーフマインでのHUD", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled": "有効", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enableBackground": "バックグラウンド表示を有効にする", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x": "X", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y": "Y", "text.autoconfig.skyblocker.category.messages": "メッセージ", "text.autoconfig.skyblocker.option.messages.hideAbility": "アビリティのクールダウンを非表示にする", "text.autoconfig.skyblocker.option.messages.hideHeal": "回復メッセージを非表示にする", @@ -85,7 +83,6 @@ "text.autoconfig.skyblocker.option.general.tabHud.plainPlayerNames": "そのままのプレイヤー名", "text.autoconfig.skyblocker.option.general.itemTooltip.avg.ONE_DAY": "今日の平均の値段", "text.autoconfig.skyblocker.option.general.itemTooltip.avg.BOTH": "両方", - "text.autoconfig.skyblocker.option.general.titleContainer.alignment": "タイトルコンテナの水平での位置合わせ", "text.autoconfig.skyblocker.option.general.titleContainer.config": "タイトルコンテナの置き方の設定...", "text.autoconfig.skyblocker.option.general.experiments.enableSuperpairsSolver": "Superpairsのソルバーを有効にするか", "text.autoconfig.skyblocker.option.general.experiments.enableUltrasequencerSolver": "Ultrasequencerのソルバーを有効にするか", @@ -93,7 +90,6 @@ "text.autoconfig.skyblocker.option.general.experiments.enableChronomatronSolver": "chronomatronのソルバーを有効にするか", "text.autoconfig.skyblocker.option.general.titleContainer.@Tooltip": "いくつかの表示を一度に表示するときに使います。(例:Vampire Slayer)", "text.autoconfig.skyblocker.option.general.titleContainer": "画面に表示するタイトルコンテナ", - "text.autoconfig.skyblocker.option.general.titleContainer.x": "X座標での表示位置", "text.autoconfig.skyblocker.option.general.titleContainer.titleContainerScale": "タイトルコンテナの大きさ", "text.autoconfig.skyblocker.option.general.fairySouls.highlightFoundSouls": "見つけたフェアリーソウルもハイライトする", "text.autoconfig.skyblocker.option.general.fairySouls.highlightOnlyNearbySouls": "近くにあるフェアリーソウルだけをハイライトする", @@ -109,8 +105,6 @@ "text.autoconfig.skyblocker.option.general.fairySouls.enableFairySoulsHelper": "フェアリーソウルヘルパーを有効にするか", "text.autoconfig.skyblocker.option.general.itemTooltip.enableMotesPrice.@Tooltip": "The Riftディメンションにいるときにアイテムの売値をmotesで表示する。", "text.autoconfig.skyblocker.option.general.itemTooltip.enableMotesPrice": "売値をmotesで表示", - "text.autoconfig.skyblocker.option.general.titleContainer.direction": "タイトルコンテナの向き", - "text.autoconfig.skyblocker.option.general.titleContainer.y": "Y座標での表示位置", "text.autoconfig.skyblocker.option.general.etherwarpOverlay": "Etherwarp移動先の表示", "text.autoconfig.skyblocker.option.general.quiverWarning": "Quiverの通知", "text.autoconfig.skyblocker.option.general.quiverWarning.enableQuiverWarning": "Quiverの通知を有効にする", diff --git a/src/main/resources/assets/skyblocker/lang/ko_kr.json b/src/main/resources/assets/skyblocker/lang/ko_kr.json index fb890c33..7834ca4c 100644 --- a/src/main/resources/assets/skyblocker/lang/ko_kr.json +++ b/src/main/resources/assets/skyblocker/lang/ko_kr.json @@ -43,102 +43,6 @@ "text.autoconfig.skyblocker.option.richPresence.customMessage": "사용자 지정 메시지", "text.autoconfig.skyblocker.category.quickNav": "즐겨찾기", "text.autoconfig.skyblocker.option.quickNav.enableQuickNav": "즐겨찾기 활성화", - "text.autoconfig.skyblocker.option.quickNav.button1": "버튼 1", - "text.autoconfig.skyblocker.option.quickNav.button1.render": "렌더", - "text.autoconfig.skyblocker.option.quickNav.button1.item": "아이템", - "text.autoconfig.skyblocker.option.quickNav.button1.item.itemName": "아이템 이름", - "text.autoconfig.skyblocker.option.quickNav.button1.item.count": "아이템 개수", - "text.autoconfig.skyblocker.option.quickNav.button1.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button1.uiTitle": "UI 제목", - "text.autoconfig.skyblocker.option.quickNav.button1.clickEvent": "클릭 이벤트", - "text.autoconfig.skyblocker.option.quickNav.button2": "버튼 2", - "text.autoconfig.skyblocker.option.quickNav.button2.render": "렌더", - "text.autoconfig.skyblocker.option.quickNav.button2.item": "아이템", - "text.autoconfig.skyblocker.option.quickNav.button2.item.itemName": "아이템 이름", - "text.autoconfig.skyblocker.option.quickNav.button2.item.count": "아이템 개수", - "text.autoconfig.skyblocker.option.quickNav.button2.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button2.uiTitle": "UI 제목", - "text.autoconfig.skyblocker.option.quickNav.button2.clickEvent": "클릭 이벤트", - "text.autoconfig.skyblocker.option.quickNav.button3": "버튼 3", - "text.autoconfig.skyblocker.option.quickNav.button3.render": "렌더", - "text.autoconfig.skyblocker.option.quickNav.button3.item": "아이템", - "text.autoconfig.skyblocker.option.quickNav.button3.item.itemName": "아이템 이름", - "text.autoconfig.skyblocker.option.quickNav.button3.item.count": "아이템 개수", - "text.autoconfig.skyblocker.option.quickNav.button3.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button3.uiTitle": "UI 제목", - "text.autoconfig.skyblocker.option.quickNav.button3.clickEvent": "클릭 이벤트", - "text.autoconfig.skyblocker.option.quickNav.button4": "버튼 4", - "text.autoconfig.skyblocker.option.quickNav.button4.render": "렌더", - "text.autoconfig.skyblocker.option.quickNav.button4.item": "아이템", - "text.autoconfig.skyblocker.option.quickNav.button4.item.itemName": "아이템 이름", - "text.autoconfig.skyblocker.option.quickNav.button4.item.count": "아이템 개수", - "text.autoconfig.skyblocker.option.quickNav.button4.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button4.uiTitle": "UI 제목", - "text.autoconfig.skyblocker.option.quickNav.button4.clickEvent": "클릭 이벤트", - "text.autoconfig.skyblocker.option.quickNav.button5": "버튼 5", - "text.autoconfig.skyblocker.option.quickNav.button5.render": "렌더", - "text.autoconfig.skyblocker.option.quickNav.button5.item": "아이템", - "text.autoconfig.skyblocker.option.quickNav.button5.item.itemName": "아이템 이름", - "text.autoconfig.skyblocker.option.quickNav.button5.item.count": "아이템 개수", - "text.autoconfig.skyblocker.option.quickNav.button5.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button5.uiTitle": "UI 제목", - "text.autoconfig.skyblocker.option.quickNav.button5.clickEvent": "클릭 이벤트", - "text.autoconfig.skyblocker.option.quickNav.button6": "버튼 6", - "text.autoconfig.skyblocker.option.quickNav.button6.render": "렌더", - "text.autoconfig.skyblocker.option.quickNav.button6.item": "아이템", - "text.autoconfig.skyblocker.option.quickNav.button6.item.itemName": "아이템 이름", - "text.autoconfig.skyblocker.option.quickNav.button6.item.count": "아이템 개수", - "text.autoconfig.skyblocker.option.quickNav.button6.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button6.uiTitle": "UI 제목", - "text.autoconfig.skyblocker.option.quickNav.button6.clickEvent": "클릭 이벤트", - "text.autoconfig.skyblocker.option.quickNav.button7": "버튼 7", - "text.autoconfig.skyblocker.option.quickNav.button7.render": "렌더", - "text.autoconfig.skyblocker.option.quickNav.button7.item": "아이템", - "text.autoconfig.skyblocker.option.quickNav.button7.item.itemName": "아이템 이름", - "text.autoconfig.skyblocker.option.quickNav.button7.item.count": "아이템 개수", - "text.autoconfig.skyblocker.option.quickNav.button7.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button7.uiTitle": "UI 제목", - "text.autoconfig.skyblocker.option.quickNav.button7.clickEvent": "클릭 이벤트", - "text.autoconfig.skyblocker.option.quickNav.button8": "버튼 8", - "text.autoconfig.skyblocker.option.quickNav.button8.render": "렌더", - "text.autoconfig.skyblocker.option.quickNav.button8.item": "아이템", - "text.autoconfig.skyblocker.option.quickNav.button8.item.itemName": "아이템 이름", - "text.autoconfig.skyblocker.option.quickNav.button8.item.count": "아이템 개수", - "text.autoconfig.skyblocker.option.quickNav.button8.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button8.uiTitle": "UI 제목", - "text.autoconfig.skyblocker.option.quickNav.button8.clickEvent": "클릭 이벤트", - "text.autoconfig.skyblocker.option.quickNav.button9": "버튼 9", - "text.autoconfig.skyblocker.option.quickNav.button9.render": "렌더", - "text.autoconfig.skyblocker.option.quickNav.button9.item": "아이템", - "text.autoconfig.skyblocker.option.quickNav.button9.item.itemName": "아이템 이름", - "text.autoconfig.skyblocker.option.quickNav.button9.item.count": "아이템 개수", - "text.autoconfig.skyblocker.option.quickNav.button9.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button9.uiTitle": "UI 제목", - "text.autoconfig.skyblocker.option.quickNav.button9.clickEvent": "클릭 이벤트", - "text.autoconfig.skyblocker.option.quickNav.button10": "버튼 10", - "text.autoconfig.skyblocker.option.quickNav.button10.render": "렌더", - "text.autoconfig.skyblocker.option.quickNav.button10.item": "아이템", - "text.autoconfig.skyblocker.option.quickNav.button10.item.itemName": "아이템 이름", - "text.autoconfig.skyblocker.option.quickNav.button10.item.count": "아이템 개수", - "text.autoconfig.skyblocker.option.quickNav.button10.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button10.uiTitle": "UI 제목", - "text.autoconfig.skyblocker.option.quickNav.button10.clickEvent": "클릭 이벤트", - "text.autoconfig.skyblocker.option.quickNav.button11": "버튼 11", - "text.autoconfig.skyblocker.option.quickNav.button11.render": "렌더", - "text.autoconfig.skyblocker.option.quickNav.button11.item": "아이템", - "text.autoconfig.skyblocker.option.quickNav.button11.item.itemName": "아이템 이름", - "text.autoconfig.skyblocker.option.quickNav.button11.item.count": "아이템 개수", - "text.autoconfig.skyblocker.option.quickNav.button11.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button11.uiTitle": "UI 제목", - "text.autoconfig.skyblocker.option.quickNav.button11.clickEvent": "클릑 이벤트", - "text.autoconfig.skyblocker.option.quickNav.button12": "버튼 12", - "text.autoconfig.skyblocker.option.quickNav.button12.render": "렌더", - "text.autoconfig.skyblocker.option.quickNav.button12.item": "아이템", - "text.autoconfig.skyblocker.option.quickNav.button12.item.itemName": "아이템 이름", - "text.autoconfig.skyblocker.option.quickNav.button12.item.count": "아이템 개수", - "text.autoconfig.skyblocker.option.quickNav.button12.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button12.uiTitle": "UI 제목", - "text.autoconfig.skyblocker.option.quickNav.button12.clickEvent": "클릭 이벤트", "text.autoconfig.skyblocker.option.general.itemList": "아이템 목록", "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "아이템 목록 활성화", "text.autoconfig.skyblocker.category.locations": "위치", @@ -161,8 +65,6 @@ "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud": "Dwarven HUD", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled": "활성화됨", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enableBackground": "배경 활성화", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x": "X", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y": "Y", "text.autoconfig.skyblocker.category.messages": "메시지", "text.autoconfig.skyblocker.option.messages.chatFilterResult.PASS": "비활성화됨", "text.autoconfig.skyblocker.option.messages.chatFilterResult.FILTER": "필터", diff --git a/src/main/resources/assets/skyblocker/lang/nb_no.json b/src/main/resources/assets/skyblocker/lang/nb_no.json index 3bbd67dd..44d95570 100644 --- a/src/main/resources/assets/skyblocker/lang/nb_no.json +++ b/src/main/resources/assets/skyblocker/lang/nb_no.json @@ -36,40 +36,6 @@ "text.autoconfig.skyblocker.option.richPresence.customMessage": "Egendefinert melding", "text.autoconfig.skyblocker.category.quickNav": "Rask navigering", "text.autoconfig.skyblocker.option.quickNav.enableQuickNav": "Aktiver hurtignavigering", - "text.autoconfig.skyblocker.option.quickNav.button1.render": "Rendering", - "text.autoconfig.skyblocker.option.quickNav.button1.item": "Gjenstand", - "text.autoconfig.skyblocker.option.quickNav.button1.item.count": "Gjenstand Teller", - "text.autoconfig.skyblocker.option.quickNav.button1.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button1.uiTitle": "UI Tittel", - "text.autoconfig.skyblocker.option.quickNav.button1.clickEvent": "Klikk hendelse", - "text.autoconfig.skyblocker.option.quickNav.button2": "Knapp 2", - "text.autoconfig.skyblocker.option.quickNav.button2.render": "Rendering", - "text.autoconfig.skyblocker.option.quickNav.button2.item": "Gjenstand", - "text.autoconfig.skyblocker.option.quickNav.button2.item.itemName": "Gjenstand navn", - "text.autoconfig.skyblocker.option.quickNav.button2.item.count": "Gjenstand Teller", - "text.autoconfig.skyblocker.option.quickNav.button2.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button2.uiTitle": "UI Tittel", - "text.autoconfig.skyblocker.option.quickNav.button2.clickEvent": "Klikk hendelse", - "text.autoconfig.skyblocker.option.quickNav.button3": "Knapp 3", - "text.autoconfig.skyblocker.option.quickNav.button3.item": "Gjenstand", - "text.autoconfig.skyblocker.option.quickNav.button3.item.itemName": "Gjenstand Navn", - "text.autoconfig.skyblocker.option.quickNav.button3.item.count": "Gjenstand Teller", - "text.autoconfig.skyblocker.option.quickNav.button3.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button3.uiTitle": "UI Tittel", - "text.autoconfig.skyblocker.option.quickNav.button3.clickEvent": "Klikk hendelse", - "text.autoconfig.skyblocker.option.quickNav.button4": "Knapp 4", - "text.autoconfig.skyblocker.option.quickNav.button4.render": "Rendering", - "text.autoconfig.skyblocker.option.quickNav.button4.item": "Gjenstand", - "text.autoconfig.skyblocker.option.quickNav.button4.item.itemName": "Gjenstand Navn", - "text.autoconfig.skyblocker.option.quickNav.button4.item.count": "Gjenstand Teller", - "text.autoconfig.skyblocker.option.quickNav.button4.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button4.clickEvent": "Klikk hendelse", - "text.autoconfig.skyblocker.option.quickNav.button5": "Knapp 5", - "text.autoconfig.skyblocker.option.quickNav.button5.render": "Rendering", - "text.autoconfig.skyblocker.option.quickNav.button5.item": "Gjenstand", - "text.autoconfig.skyblocker.option.quickNav.button5.item.itemName": "Gjenstand Navn", - "text.autoconfig.skyblocker.option.quickNav.button5.item.count": "Gjenstand Teller", - "text.autoconfig.skyblocker.option.quickNav.button5.item.nbt": "NBT", "key.categories.skyblocker": "SkyBlocker", "key.hotbarSlotLock": "Slot lås (Hotbar)", "text.autoconfig.skyblocker.category.general": "Generelt", @@ -77,70 +43,8 @@ "text.autoconfig.skyblocker.option.general.bars.barpositions.experienceBarPosition": "Experience Bar stilling", "text.autoconfig.skyblocker.option.general.itemTooltip.avg.@Tooltip": "Du kan velge hvor mange dager med gjennomsnittspris som skal være", "skyblocker.itemTooltip.nullMessage": "§cVareprisinformasjon på verktøytips fornyes om maks 60 sekunder. Hvis ikke, sjekk latest.log", - "text.autoconfig.skyblocker.option.quickNav.button1": "Knapp 1", - "text.autoconfig.skyblocker.option.quickNav.button1.item.itemName": "Gjenstand navn", - "text.autoconfig.skyblocker.option.quickNav.button3.render": "Rendering", - "text.autoconfig.skyblocker.option.quickNav.button4.uiTitle": "UI Tittel", - "text.autoconfig.skyblocker.option.quickNav.button6.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button6.clickEvent": "Klikk hendelse", - "text.autoconfig.skyblocker.option.quickNav.button8.clickEvent": "Klikk hendelse", - "text.autoconfig.skyblocker.option.quickNav.button10.clickEvent": "Klikk hendelse", - "text.autoconfig.skyblocker.option.quickNav.button12.item": "Gjenstand", "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "Aktiver gjenstad liste", "text.autoconfig.skyblocker.option.locations.dungeons.blazeSolver": "Løs Blaze-puslespillet", - "text.autoconfig.skyblocker.option.quickNav.button5.uiTitle": "UI Tittel", - "text.autoconfig.skyblocker.option.quickNav.button5.clickEvent": "Klikk hendelse", - "text.autoconfig.skyblocker.option.quickNav.button6": "Knapp 6", - "text.autoconfig.skyblocker.option.quickNav.button6.render": "Rendering", - "text.autoconfig.skyblocker.option.quickNav.button6.item": "Gjenstand", - "text.autoconfig.skyblocker.option.quickNav.button6.item.itemName": "Gjenstand navn", - "text.autoconfig.skyblocker.option.quickNav.button6.item.count": "Gjenstand mengde", - "text.autoconfig.skyblocker.option.quickNav.button6.uiTitle": "UI Tittel", - "text.autoconfig.skyblocker.option.quickNav.button7": "Knapp 7", - "text.autoconfig.skyblocker.option.quickNav.button7.render": "Rendering", - "text.autoconfig.skyblocker.option.quickNav.button7.item": "Gjenstand", - "text.autoconfig.skyblocker.option.quickNav.button7.item.itemName": "Gjenstand navn", - "text.autoconfig.skyblocker.option.quickNav.button7.item.count": "Gjenstand navn", - "text.autoconfig.skyblocker.option.quickNav.button7.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button7.uiTitle": "UI Tittel", - "text.autoconfig.skyblocker.option.quickNav.button7.clickEvent": "Klikk hendelse", - "text.autoconfig.skyblocker.option.quickNav.button8": "Knapp 8", - "text.autoconfig.skyblocker.option.quickNav.button8.render": "Rendering", - "text.autoconfig.skyblocker.option.quickNav.button8.item": "Gjenstand", - "text.autoconfig.skyblocker.option.quickNav.button8.item.itemName": "Gjenstand navn", - "text.autoconfig.skyblocker.option.quickNav.button8.item.count": "Gjenstand navn", - "text.autoconfig.skyblocker.option.quickNav.button8.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button8.uiTitle": "UI Tittel", - "text.autoconfig.skyblocker.option.quickNav.button9": "Knapp 8", - "text.autoconfig.skyblocker.option.quickNav.button9.render": "Rendering", - "text.autoconfig.skyblocker.option.quickNav.button9.item": "Gjenstand", - "text.autoconfig.skyblocker.option.quickNav.button9.item.itemName": "Gjenstand Navn", - "text.autoconfig.skyblocker.option.quickNav.button9.item.count": "Gjenstand navn", - "text.autoconfig.skyblocker.option.quickNav.button9.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button9.uiTitle": "UI Tittel", - "text.autoconfig.skyblocker.option.quickNav.button9.clickEvent": "Klikk hendelse", - "text.autoconfig.skyblocker.option.quickNav.button10": "Knapp 1", - "text.autoconfig.skyblocker.option.quickNav.button10.render": "Rendering", - "text.autoconfig.skyblocker.option.quickNav.button10.item": "Gjenstand", - "text.autoconfig.skyblocker.option.quickNav.button10.item.itemName": "Gjenstand Navn", - "text.autoconfig.skyblocker.option.quickNav.button10.item.count": "Gjenstand Mengde", - "text.autoconfig.skyblocker.option.quickNav.button10.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button10.uiTitle": "UI Tittel", - "text.autoconfig.skyblocker.option.quickNav.button11": "Knapp 1", - "text.autoconfig.skyblocker.option.quickNav.button11.render": "Rendering", - "text.autoconfig.skyblocker.option.quickNav.button11.item": "Gjenstand", - "text.autoconfig.skyblocker.option.quickNav.button11.item.itemName": "Gjenstand Navn", - "text.autoconfig.skyblocker.option.quickNav.button11.item.count": "Gjenstand Mengde", - "text.autoconfig.skyblocker.option.quickNav.button11.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button11.uiTitle": "UI Tittel", - "text.autoconfig.skyblocker.option.quickNav.button11.clickEvent": "Klikk hendelse", - "text.autoconfig.skyblocker.option.quickNav.button12": "Knapp 1", - "text.autoconfig.skyblocker.option.quickNav.button12.render": "Rendering", - "text.autoconfig.skyblocker.option.quickNav.button12.item.itemName": "Gjenstand Navn", - "text.autoconfig.skyblocker.option.quickNav.button12.item.count": "Gjenstand Mengde", - "text.autoconfig.skyblocker.option.quickNav.button12.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button12.uiTitle": "UI Tittel", - "text.autoconfig.skyblocker.option.quickNav.button12.clickEvent": "Klikk hendelse", "text.autoconfig.skyblocker.option.general.itemList": "Gjenstand liste", "text.autoconfig.skyblocker.option.locations.dungeons": "Dungeons", "text.autoconfig.skyblocker.category.locations": "Lokasjoner", diff --git a/src/main/resources/assets/skyblocker/lang/pt_br.json b/src/main/resources/assets/skyblocker/lang/pt_br.json index 2361d7bd..d0371642 100644 --- a/src/main/resources/assets/skyblocker/lang/pt_br.json +++ b/src/main/resources/assets/skyblocker/lang/pt_br.json @@ -24,9 +24,6 @@ "text.autoconfig.skyblocker.option.general.hitbox.oldLeverHitbox": "Ativar hitbox de alavanca do 1.8", "text.autoconfig.skyblocker.option.general.titleContainer": "Contêiner de Título", "text.autoconfig.skyblocker.option.general.titleContainer.titleContainerScale": "Escala de Contêiner de Título", - "text.autoconfig.skyblocker.option.general.titleContainer.x": "Posição X do Contêiner de Título", - "text.autoconfig.skyblocker.option.general.titleContainer.y": "Posição Y do Contêiner de Título", - "text.autoconfig.skyblocker.option.general.titleContainer.alignment": "Alinhamento Horizontal do Contêiner de Título", "text.autoconfig.skyblocker.option.general.teleportOverlay": "Overlay de Teleporte", "text.autoconfig.skyblocker.option.general.teleportOverlay.enableWeirdTransmission": "Ativar Overlay de Transmissão Estranho", "text.autoconfig.skyblocker.option.general.teleportOverlay.enableInstantTransmission": "Ativar Overlay de Transmissão Instantâneo", @@ -40,8 +37,6 @@ "text.autoconfig.skyblocker.option.richPresence.enableRichPresence": "Ativado", "text.autoconfig.skyblocker.option.richPresence.customMessage": "Mensagem Personalizada", "text.autoconfig.skyblocker.option.quickNav.enableQuickNav": "Ativar Navegação Rápida", - "text.autoconfig.skyblocker.option.quickNav.button1": "Botão 1", - "text.autoconfig.skyblocker.option.quickNav.button1.render": "Renderizar", "key.hotbarSlotLock": "Trancar Slot (Hotbar)", "text.autoconfig.skyblocker.title": "Configurações do Skyblocker", "text.autoconfig.skyblocker.option.general.bars.barpositions": "Configurar Posições das Barras", @@ -55,13 +50,11 @@ "text.autoconfig.skyblocker.option.general.specialEffects": "Efeitos Especial", "text.autoconfig.skyblocker.option.general.specialEffects.rareDungeonDropEffects": "Efeito de Drop Raro de Dungeon", "text.autoconfig.skyblocker.option.general.titleContainer.@Tooltip": "Usado para mostrar vários títulos de uma vez, Exemplo de uso: Vampire Slayer", - "text.autoconfig.skyblocker.option.general.titleContainer.direction": "Orientação do Contêiner de Título", "text.autoconfig.skyblocker.option.general.teleportOverlay.enableTeleportOverlays": "Ativar Overlays de Teleporte", "text.autoconfig.skyblocker.option.general.teleportOverlay.enableEtherTransmission": "Ativar Overlay de Transmissão Éter", "skyblocker.itemTooltip.nullMessage": "§cA Informação do preço do item no tooltip irá se renovar no máximo 60 segundos. Caso contrário, cheque \"latest.log\"", "text.autoconfig.skyblocker.option.richPresence.info.LOCATION": "LOCALIZAÇÃO", "text.autoconfig.skyblocker.category.quickNav": "Navegação Rápida", - "text.autoconfig.skyblocker.option.quickNav.button1.item.itemName": "Nome do Item", "key.categories.skyblocker": "Skyblocker", "text.autoconfig.skyblocker.option.general.etherwarpOverlay": "Overlay de Etherwarp", "text.autoconfig.skyblocker.option.general.fishing": "Assistente de Pesca", @@ -70,7 +63,7 @@ "text.autoconfig.skyblocker.option.general.fairySouls.highlightFoundSouls": "Destacar alma das fadas encontradas", "text.autoconfig.skyblocker.option.general.fairySouls.highlightOnlyNearbySouls": "Apenas destacar alma das fadas por perto", "text.autoconfig.skyblocker.option.general.shortcuts.enableCommandShortcuts": "Ativar Atalhos de Comando", - "text.autoconfig.skyblocker.option.general.shortcuts.enableShortcuts.@Tooltip": "Apenas funciona no Hypixel, Edite atalhos com \"/skyblocker shortcuts\". Pelo menos uma das opções tem que está ativo para tomar efeito.", + "text.autoconfig.skyblocker.option.general.shortcuts.enableShortcuts.@Tooltip": "Funciona em qualquer lugar, até mesmo no vanilla! Edite atalhos com \"/skyblocker shortcuts\". Pelo menos uma das opções tem que está ativo para tomar efeito.", "text.autoconfig.skyblocker.option.general.tabHud": "HUD do tab Bonito", "text.autoconfig.skyblocker.option.general.tabHud.tabHudEnabled": "Ativar HUD do tab Bonito", "text.autoconfig.skyblocker.option.general.itemTooltip": "Tooltip do Item", @@ -83,17 +76,6 @@ "text.autoconfig.skyblocker.option.general.itemInfoDisplay.attributeShardInfo": "Informação de Fragmento de Atributo", "text.autoconfig.skyblocker.category.richPresence": "Discord Rich Presence", "text.autoconfig.skyblocker.option.richPresence.info.BITS": "BITS", - "text.autoconfig.skyblocker.option.quickNav.button1.item": "Item", - "text.autoconfig.skyblocker.option.quickNav.button1.uiTitle": "Título de UI", - "text.autoconfig.skyblocker.option.quickNav.button1.clickEvent": "Evento de Click", - "text.autoconfig.skyblocker.option.quickNav.button2": "Botão 2", - "text.autoconfig.skyblocker.option.quickNav.button2.render": "Renderizar", - "text.autoconfig.skyblocker.option.quickNav.button1.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button2.item.count": "Contagem de itens", - "text.autoconfig.skyblocker.option.quickNav.button2.uiTitle": "Título de UI", - "text.autoconfig.skyblocker.option.quickNav.button3": "Botão 3", - "text.autoconfig.skyblocker.option.quickNav.button3.render": "Renderizar", - "text.autoconfig.skyblocker.option.quickNav.button3.item": "Item", "text.autoconfig.skyblocker.category.messages": "Mensagens", "text.autoconfig.skyblocker.option.messages.hideImplosion": "Esconder Mensagem de Implosão", "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "Esconder Mensagem do Molten Wave", @@ -108,13 +90,10 @@ "text.autoconfig.skyblocker.option.slayer.vampireSlayer.effigyUpdateFrequency.@Tooltip": "Quanto menor o valor, maior será a frequência de atualizações, o que irá talvez causa lag.", "text.autoconfig.skyblocker.option.slayer.vampireSlayer.enableHolyIceIndicator": "Ativar Indicador de Gelo Santo", "text.autoconfig.skyblocker.option.slayer.vampireSlayer.holyIceIndicatorTickDelay": "Atraso (Ticks) do Indicador de Gelo Santo", - "skyblocker.shortcuts.config": "Configurações de Atalhos", + "skyblocker.shortcuts.config": "Configurações de atalhos", "skyblocker.shortcuts.new": "Novo Atalho", "skyblocker.shortcuts.deleteQuestion": "Você tem certeza que quer remover esse atalho?", "emi.category.skyblocker.skyblock": "Skyblock", - "text.autoconfig.skyblocker.option.quickNav.button1.item.count": "Contagem de Itens", - "text.autoconfig.skyblocker.option.quickNav.button2.item.itemName": "Nome do Item", - "text.autoconfig.skyblocker.option.quickNav.button2.clickEvent": "Evento de Click", "text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift": "Ver preview da mochila sem segurar Shift", "skyblocker.shortcuts.commandSuggestionTooltip": "Devido às limitações do Minecraft, sugestões de comando vai apenas funcionar após o reiniciamento do jogo.", "skyblocker.shortcuts.deleteWarning": "Atalho '%s' vai ser perdido para sempre! (Por um longo tempo!)", @@ -141,11 +120,11 @@ "text.autoconfig.skyblocker.option.general.tabHud.tabHudScale": "Fator de escala do HUD de tab Bonito", "text.autoconfig.skyblocker.option.general.tabHud.tabHudScale.@Tooltip": "Valor em %, relativo a sua escala vanilla do GUI", "text.autoconfig.skyblocker.option.general.hitbox": "Hitboxes", - "skyblocker.relics.markAllFound": "§rTodas as relíquias foram marcados como encontrado", - "skyblocker.shortcuts.command.target": "Comando Alvo", - "skyblocker.shortcuts.command.replacement": "Comando de Reposição", - "skyblocker.shortcuts.commandArg.target": "Argumento do Comando Alvo", - "skyblocker.shortcuts.commandArg.replacement": "Argumento do Comando de Reposição", + "skyblocker.relics.markAllFound": "§rTodas as relíquias foram marcadas como encontradas", + "skyblocker.shortcuts.command.target": "Comando alvo", + "skyblocker.shortcuts.command.replacement": "Comando de substituição", + "skyblocker.shortcuts.commandArg.target": "Argumento do comando alvo", + "skyblocker.shortcuts.commandArg.replacement": "Argumento do comando de substituição", "skyblocker.customDyeColors.invalidHex": "§cCódigo de cor HEX invalido!", "skyblocker.customItemNames.unableToSetName": "§cNão foi possível colocar um nome personalizado no item :( (Você está no skyblock?, Você está segurando um item?)", "skyblocker.customDyeColors.notDyeable": "§cEsse item não é uma peça de armadura pintável!", @@ -160,9 +139,9 @@ "skyblocker.customArmorTrims.notAnArmorPiece": "§cEsse item não é uma peça de armadura!", "skyblocker.customArmorTrims.added": "§fColoque um acabamento personalizado de armadura para o item que você está segurando!", "skyblocker.customItemNames.neverHad": "§fEsse item ainda não tem um nome personalizado colocado, por que não colocar um? ;)", - "skyblocker.relics.markAllMissing": "§rTodas as relíquias foram marcados como faltando", - "skyblocker.dungeons.secrets.markSecretFound": "§r#%d secreto marcado como encontrado.", - "skyblocker.dungeons.secrets.markSecretMissing": "§r#%d secreto marcado como faltando.", + "skyblocker.relics.markAllMissing": "§rTodas as relíquias foram marcadas como pendentes", + "skyblocker.dungeons.secrets.markSecretFound": "§r#%d segredo marcado como encontrado.", + "skyblocker.dungeons.secrets.markSecretMissing": "§r#%d segredo marcado como pendente.", "skyblocker.customArmorTrims.noItemUuid": "§cVocê tem que tá segurando um item que tenha um uuid para poder colocar um acabamento personalizado na armadura!", "text.autoconfig.skyblocker.option.general.shortcuts.enableCommandArgShortcuts.@Tooltip": "Atalhos que trocam uma ou mais palavra(s)/argumento(s) de um comando com múltiplas palavras/argumentos. Edite atalhos com \"/skyblocker shortcuts\". Atalhos tem que está ativos para tomar efeito.", "text.autoconfig.skyblocker.option.general.compactorDeletorPreview": "Ativar Preview do Compactador/Deletador", @@ -172,90 +151,92 @@ "text.autoconfig.skyblocker.category.slayer": "Slayers", "skyblocker.updaterepository.failed": "§cAtualização do repositório local falhou. Remova os arquivos manualmente e reinicie o jogo.", "text.autoconfig.skyblocker.option.general.hideStatusEffectOverlay": "Esconder Overlay de Status de Efeitos", - "text.autoconfig.skyblocker.option.quickNav.button2.item": "Item", - "text.autoconfig.skyblocker.option.quickNav.button2.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button3.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button3.uiTitle": "Título de UI", - "text.autoconfig.skyblocker.option.quickNav.button3.clickEvent": "Evento de Click", - "text.autoconfig.skyblocker.option.quickNav.button4": "Botão 4", - "text.autoconfig.skyblocker.option.quickNav.button4.item": "Item", - "text.autoconfig.skyblocker.option.quickNav.button4.item.itemName": "Nome do Item", - "text.autoconfig.skyblocker.option.quickNav.button4.item.count": "Contagem de Itens", - "text.autoconfig.skyblocker.option.quickNav.button4.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button4.uiTitle": "Título de UI", - "text.autoconfig.skyblocker.option.quickNav.button4.clickEvent": "Evento de Click", - "text.autoconfig.skyblocker.option.quickNav.button5": "Botão 5", - "text.autoconfig.skyblocker.option.quickNav.button5.render": "Renderizar", - "text.autoconfig.skyblocker.option.quickNav.button5.item.itemName": "Nome do Item", - "text.autoconfig.skyblocker.option.quickNav.button5.item.count": "Contagem de Itens", - "text.autoconfig.skyblocker.option.quickNav.button5.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button5.clickEvent": "Evento de Click", - "text.autoconfig.skyblocker.option.quickNav.button6": "Botão 6", - "text.autoconfig.skyblocker.option.quickNav.button6.item": "Item", - "text.autoconfig.skyblocker.option.quickNav.button6.item.itemName": "Nome do Item", - "text.autoconfig.skyblocker.option.quickNav.button6.item.count": "Contagem de Itens", - "text.autoconfig.skyblocker.option.quickNav.button6.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button6.uiTitle": "Título de UI", - "text.autoconfig.skyblocker.option.quickNav.button6.clickEvent": "Evento de Click", - "text.autoconfig.skyblocker.option.quickNav.button7.render": "Renderizar", - "text.autoconfig.skyblocker.option.quickNav.button7.item": "Item", - "text.autoconfig.skyblocker.option.quickNav.button7.item.itemName": "Nome do Item", - "text.autoconfig.skyblocker.option.quickNav.button7.item.count": "Contagem de Itens", - "text.autoconfig.skyblocker.option.quickNav.button7.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button3.item.itemName": "Nome do Item", - "text.autoconfig.skyblocker.option.quickNav.button3.item.count": "Contagem de Itens", - "text.autoconfig.skyblocker.option.quickNav.button4.render": "Renderizar", - "text.autoconfig.skyblocker.option.quickNav.button5.item": "Item", - "text.autoconfig.skyblocker.option.quickNav.button5.uiTitle": "Título de UI", - "text.autoconfig.skyblocker.option.quickNav.button6.render": "Renderizar", - "text.autoconfig.skyblocker.option.quickNav.button7": "Botão 7", - "text.autoconfig.skyblocker.option.quickNav.button7.uiTitle": "Título de UI", - "text.autoconfig.skyblocker.option.quickNav.button7.clickEvent": "Evento de Click", "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "Ativar Lista de Itens", - "text.autoconfig.skyblocker.option.quickNav.button8.render": "Renderizar", - "text.autoconfig.skyblocker.option.quickNav.button8": "Botão 8", - "text.autoconfig.skyblocker.option.quickNav.button8.item": "Item", - "text.autoconfig.skyblocker.option.quickNav.button8.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button8.uiTitle": "Título de UI", - "text.autoconfig.skyblocker.option.quickNav.button8.clickEvent": "Evento de Click", - "text.autoconfig.skyblocker.option.quickNav.button8.item.itemName": "Nome do Item", - "text.autoconfig.skyblocker.option.quickNav.button8.item.count": "Contagem de Itens", - "text.autoconfig.skyblocker.option.quickNav.button9.render": "Renderizar", - "text.autoconfig.skyblocker.option.quickNav.button9.item": "Item", - "text.autoconfig.skyblocker.option.quickNav.button9.item.itemName": "Nome do Item", - "text.autoconfig.skyblocker.option.quickNav.button9.item.count": "Contagem de Itens", - "text.autoconfig.skyblocker.option.quickNav.button10.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button10.uiTitle": "Título de UI", - "text.autoconfig.skyblocker.option.quickNav.button11": "Botão 11", - "text.autoconfig.skyblocker.option.quickNav.button10.render": "Renderizar", - "text.autoconfig.skyblocker.option.quickNav.button10.item": "Item", - "text.autoconfig.skyblocker.option.quickNav.button10.item.itemName": "Nome do Item", - "text.autoconfig.skyblocker.option.quickNav.button10.item.count": "Contagem de Itens", - "text.autoconfig.skyblocker.option.quickNav.button11.item.itemName": "Nome do Item", - "text.autoconfig.skyblocker.option.quickNav.button11.item.count": "Contagem de Itens", - "text.autoconfig.skyblocker.option.quickNav.button11.item": "Item", - "text.autoconfig.skyblocker.option.quickNav.button11.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button11.uiTitle": "Título de UI", - "text.autoconfig.skyblocker.option.quickNav.button12.render": "Renderizar", - "text.autoconfig.skyblocker.option.quickNav.button12.item": "Item", - "text.autoconfig.skyblocker.option.quickNav.button11.clickEvent": "Evento de Click", - "text.autoconfig.skyblocker.option.quickNav.button12": "Botão 12", - "text.autoconfig.skyblocker.option.quickNav.button12.item.itemName": "Nome do Item", - "text.autoconfig.skyblocker.option.quickNav.button12.item.count": "Contagem de Itens", - "text.autoconfig.skyblocker.option.quickNav.button12.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button12.uiTitle": "Título de UI", - "text.autoconfig.skyblocker.option.quickNav.button12.clickEvent": "Evento de Click", - "text.autoconfig.skyblocker.option.quickNav.button11.render": "Renderizar", - "text.autoconfig.skyblocker.option.quickNav.button9": "Botão 9", - "text.autoconfig.skyblocker.option.quickNav.button9.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button9.uiTitle": "Título de UI", - "text.autoconfig.skyblocker.option.quickNav.button9.clickEvent": "Evento de Click", - "text.autoconfig.skyblocker.option.quickNav.button10": "Botão 10", - "text.autoconfig.skyblocker.option.quickNav.button10.clickEvent": "Evento de Click", "text.autoconfig.skyblocker.option.general.itemList": "Lista de Itens", "text.skyblocker.open": "Abrir", "text.skyblocker.quit_config": "Mudanças Não Salvas", "text.skyblocker.quit_config_sure": "Você tem certeza que quer sair de editar as configurações? Mudanças não vão ser salvas!", "text.skyblocker.quit_discard": "Sair & Descartar Mudanças", - "text.autoconfig.skyblocker.option.general.shortcuts.config": "Configurações de Atalhos..." + "text.autoconfig.skyblocker.option.general.shortcuts.config": "Configurações de Atalhos...", + "text.autoconfig.skyblocker.option.general.flameOverlay": "Overlay de Chama", + "text.autoconfig.skyblocker.option.general.flameOverlay.flameHeight": "Altura da Chama", + "text.autoconfig.skyblocker.option.general.flameOverlay.flameOpacity": "Opacidade da Chama", + "text.autoconfig.skyblocker.option.general.itemCooldown": "Cooldown de Item", + "text.autoconfig.skyblocker.option.general.itemCooldown.enableItemCooldowns": "Ativar Cooldown de Item", + "text.autoconfig.skyblocker.option.general.titleContainer.config": "Configuração de Colocação do Contêiner de Título...", + "text.autoconfig.skyblocker.option.general.itemInfoDisplay.itemRarityBackgroundsOpacity": "Opacidade do Fundos de Raridade de Item", + "text.autoconfig.skyblocker.option.general.wikiLookup": "Olhar na Wiki", + "text.autoconfig.skyblocker.option.general.wikiLookup.enableWikiLookup": "Ativar Olhar na Wiki", + "text.autoconfig.skyblocker.option.general.wikiLookup.enableWikiLookup.@Tooltip": "Abrir a pagina da wiki do item com o mouse em cima com F4.", + "text.autoconfig.skyblocker.option.general.wikiLookup.officialWiki": "Usar Wiki Oficial", + "text.autoconfig.skyblocker.option.general.wikiLookup.officialWiki.@Tooltip": "Usar a wiki oficial em vez da wiki do Fandom.", + "text.autoconfig.skyblocker.option.general.itemInfoDisplay.itemRarityBackgrounds": "Fundos de Raridade de Item", + "text.autoconfig.skyblocker.option.general.itemInfoDisplay.itemRarityBackgrounds.@Tooltip": "Mostra um fundo colorido atrás de um item, a cor representa a raridade do item.", + "text.autoconfig.skyblocker.option.locations.dungeons.mapScreen": "Configuração da posição do mapa da dungeon...", + "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Guia para Puzzle dos Three Weridos", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[0]": "Simples: Exibe nome e porcentagem.", + "text.autoconfig.skyblocker.option.locations.dungeons.dungeonChestProfit.neutralThreshold": "Limite neutro", + "text.autoconfig.skyblocker.option.locations.dungeons.dungeonChestProfit.profitColor": "Cor do lucro", + "text.autoconfig.skyblocker.option.locations.dungeons.dungeonChestProfit.lossColor": "Cor de prejuízo", + "text.autoconfig.skyblocker.option.locations.dungeons.dungeonChestProfit.incompleteColor": "Cor incompleta", + "text.autoconfig.skyblocker.option.locations.dungeons.dungeonChestProfit.incompleteColor.@Tooltip": "A cor exibida quando a data de preço é incompleta.", + "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper.@Tooltip": "Acinzentar os baús que já foram abertos.", + "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Ativar mapa", + "text.autoconfig.skyblocker.option.locations.dungeons.mapScaling": "Tamanho do mapa", + "text.autoconfig.skyblocker.option.locations.dungeons.lividColor": "Cor do Livid", + "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.enableLividColor": "Ativar cor para Livid", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals": "Guia dos terminais", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "Guia de seleção colorido", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "Guia de clique em ordem", + "text.autoconfig.skyblocker.option.slayer.vampireSlayer.holyIceUpdateFrequency": "Frequência de atualização de indicador do Holy Ice (Em Ticks)", + "text.autoconfig.skyblocker.option.slayer.vampireSlayer.enableManiaIndicator": "Ativar indicador de Mania Block", + "skyblocker.dungeons.secrets.markSecretFoundUnable": "§cImpossibilitado de marcar segredo #%d como encontrado.", + "skyblocker.dungeons.secrets.markSecretMissingUnable": "§cImpossibilitado de marcar segredo #%d como pendente.", + "skyblocker.rift.healNow": "Cure agora!", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "Ativar combustível da broca", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "Guia para Fetchur", + "text.autoconfig.skyblocker.option.locations.rift": "A fenda", + "text.autoconfig.skyblocker.option.locations.rift.mirrorverseWaypoints": "Ativar marcadores do Mirrorverse", + "text.autoconfig.skyblocker.option.locations.dungeons.blazeSolver": "Guia para puzzle do Blaze", + "text.autoconfig.skyblocker.option.locations.dungeons.blazeSolver.@Tooltip": "Cria uma caixa em cor verde para o blaze correto além de desenhar uma linha, e cria uma caixa para o próximo blaze a ser morto em cor branca.", + "text.autoconfig.skyblocker.option.locations.dungeons.creeperSolver": "Guia para puzzle dos feixes de Creeper", + "text.autoconfig.skyblocker.option.locations.dungeons.creeperSolver.@Tooltip": "Contornar os melhores feixes para fazer o alvo atingir.", + "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.lividColorText": "Texto da cor do Livid", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "Guia para puzzle do Puzzler", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud": "Interface da mina dos anões", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled": "Ativado", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style": "Estilo para a interface", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[2]": "\nClássico: Exibe nome e porcentagem em uma caixa super simples.", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enableBackground": "Ativar fundo", + "text.autoconfig.skyblocker.option.locations.rift.mcGrubberStacks": "Pilhas de McGrubber", + "text.autoconfig.skyblocker.option.messages.chatFilterResult.PASS": "Desativado", + "text.autoconfig.skyblocker.option.messages.chatFilterResult.FILTER": "Filtro", + "text.autoconfig.skyblocker.option.messages.chatFilterResult.ACTION_BAR": "Mover para Action Bar", + "text.autoconfig.skyblocker.option.messages.hideAbility": "Esconder tempo de espera de habilidade", + "text.autoconfig.skyblocker.option.messages.hideHeal": "Esconder mensagens de cura", + "text.autoconfig.skyblocker.option.slayer.vampireSlayer.enableSteakStakeIndicator": "Ativar indicador estaca de carne", + "text.autoconfig.skyblocker.option.slayer.vampireSlayer.steakStakeUpdateFrequency": "Frequência de atualização de estanca de carne (Em Ticks)", + "skyblocker.rift.iceNow": "Gelo agora!", + "skyblocker.rift.mania": "Mania!", + "skyblocker.rift.stakeNow": "Estaca agora!", + "skyblocker.fairySouls.markAllFound": "§rMarcada todas as almas de fadas na ilha atual como encontradas", + "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper": "Guia para Croesus", + "text.autoconfig.skyblocker.option.locations.dungeons.dungeonChestProfit.neutralColor": "Cor do neutro", + "text.autoconfig.skyblocker.option.locations.dungeons.dungeonChestProfit.neutralThreshold.@Tooltip": "O limite abaixo do qual o lucro é declarado neutro.", + "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "Guia para puzzle do Trivia", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveStartsWith": "Guia de \"começa com\"", + "text.autoconfig.skyblocker.option.slayer.vampireSlayer": "Caçador de Vampiros", + "text.autoconfig.skyblocker.option.slayer.vampireSlayer.enableHealingMelonIndicator": "Ativar indicador de Healing Melon", + "skyblocker.fishing.reelNow": "Entre agora!", + "text.autoconfig.skyblocker.option.locations.dungeons.solveTicTacToe.@Tooltip": "Coloca uma caixa vermelha em volta do próximo melhor movimento para você fazer!", + "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.lividColorText.@Tooltip": "Texto o qual será mandado no chat durante a luta contra Livid. A linha \"[cor]\" vai ser preenchida com a cor do Livid.", + "text.autoconfig.skyblocker.option.locations.dwarvenMines": "Mina dos anões", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[1]": "\nBonito: Exibe nome, porcentagem, barra de progresso e um ícone.", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.screen": "Configurações da interface da mina dos anões...", + "text.autoconfig.skyblocker.option.locations.rift.mcGrubberStacks.@Tooltip": "Usado para calcular preço de venda de Motes.", + "skyblocker.fairySouls.markAllMissing": "§rMarcada todas as almas de fadas na ilha atual como pendentes", + "text.autoconfig.skyblocker.option.locations.dungeons.starredMobGlow": "Brilho em Mobs com estrela", + "text.autoconfig.skyblocker.option.locations.dungeons.starredMobGlow.@Tooltip": "Aplicar o efeito de brilho para Mobs estrelados que estão visíveis.", + "text.autoconfig.skyblocker.option.locations.dungeons.solveTicTacToe": "Guia para o Puzzle do jogo da velha", + "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.enableLividColor.@Tooltip": "Mandar a cor do Livid no chat durante a luta contra Livid." } diff --git a/src/main/resources/assets/skyblocker/lang/ru_ru.json b/src/main/resources/assets/skyblocker/lang/ru_ru.json index c35e15a0..980c130a 100644 --- a/src/main/resources/assets/skyblocker/lang/ru_ru.json +++ b/src/main/resources/assets/skyblocker/lang/ru_ru.json @@ -55,7 +55,6 @@ "text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift": "Просматривать содержимое рюкзаков без удержания кнопки Shift", "text.autoconfig.skyblocker.option.general.bars.barpositions.NONE": "Выключена", "text.autoconfig.skyblocker.option.general.bars.barpositions.manaBarPosition": "Расположение полоски маны", - "text.autoconfig.skyblocker.option.quickNav.button1.item": "Предмет", "skyblocker.fishing.reelNow": "Тяни!", "text.autoconfig.skyblocker.option.messages.hideAutopet": "Скрывать сообщения Autopet", "text.autoconfig.skyblocker.option.messages.hideMana": "Скрывать сообщения о расходе маны из Action Bar", @@ -74,51 +73,27 @@ "text.autoconfig.skyblocker.option.richPresence.info.LOCATION": "LOCATION", "text.autoconfig.skyblocker.category.quickNav": "Быстрый Доступ", "text.autoconfig.skyblocker.option.quickNav.enableQuickNav": "Включить Быстрый Доступ", - "text.autoconfig.skyblocker.option.quickNav.button1": "Кнопка 1", - "text.autoconfig.skyblocker.option.quickNav.button2": "Кнопка 2", - "text.autoconfig.skyblocker.option.quickNav.button3": "Кнопка 3", "text.autoconfig.skyblocker.option.general.tabHud": "Красивое TAB меню", "key.skyblocker.defaultTgl": "Показывать стандартное меню TAB", "text.autoconfig.skyblocker.option.general.tabHud.tabHudEnabled": "Включить красивое TAB меню", "text.autoconfig.skyblocker.option.general.tabHud.tabHudScale": "Размер TAB меню", "text.autoconfig.skyblocker.option.general.tabHud.tabHudScale.@Tooltip": "Значение в %, по отношению к размеру интерфейса игры", - "text.autoconfig.skyblocker.option.quickNav.button2.clickEvent": "Команда по щелчку", - "text.autoconfig.skyblocker.option.quickNav.button3.render": "Отображать", - "text.autoconfig.skyblocker.option.quickNav.button5.uiTitle": "Название Кнопки", - "text.autoconfig.skyblocker.option.quickNav.button6.item.count": "Количество", - "text.autoconfig.skyblocker.option.quickNav.button7.item.itemName": "ID Предмета", - "text.autoconfig.skyblocker.option.quickNav.button8.item": "Предмет", - "text.autoconfig.skyblocker.option.quickNav.button11.render": "Отображать", - "text.autoconfig.skyblocker.option.quickNav.button11.clickEvent": "Команда по щелчку", - "text.autoconfig.skyblocker.option.quickNav.button12.clickEvent": "Команда по щелчку", "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper.@Tooltip": "Уже открытые сундуки будут закрашены серым.", "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.lividColorText.@Tooltip": "Текст, который будет отправлен в чат во время боя с Livid. Вместо \"[color]\" отправится цвет босса.", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[1]": "\nКрасивый: Показывает название, процент и шкалу выполнения, а также иконку.", "text.autoconfig.skyblocker.option.locations.dungeons.mapScaling": "Размер Карты", - "text.autoconfig.skyblocker.option.quickNav.button4.item.itemName": "ID Предмета", - "text.autoconfig.skyblocker.option.quickNav.button5.item": "Предмет", "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.enableLividColor": "Включить Цвет Босса Livid", "text.autoconfig.skyblocker.option.locations.dungeons.lividColor": "Цвет Босса Livid", "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.enableLividColor.@Tooltip": "Отправляет в чат информацию о том, какого цвета босс Livid.", "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.lividColorText": "Текст О Цвете Livid", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x": "X", - "text.autoconfig.skyblocker.option.locations.dungeons.mapX": "Карта по X", - "text.autoconfig.skyblocker.option.locations.dungeons.mapY": "Карта по Y", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style": "Стиль HUD", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[0]": "Упрощенный: Показывает название и процент выполнения.", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[2]": "\nКлассический: Показывает название и процент выполнения в простом тёмном квадрате.", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enableBackground": "Включить Фон", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled": "Включить", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y": "Y", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud": "Dwarven HUD (Интерфейс Гномьих Шахт)", "text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "Выглядит лучше, когда включены полоски Skyblocker (здоровья, маны и т.д.)", - "text.autoconfig.skyblocker.option.quickNav.button1.clickEvent": "Команда по щелчку", "text.autoconfig.skyblocker.option.locations.barn": "Barn (Ферма)", - "text.autoconfig.skyblocker.option.quickNav.button1.item.itemName": "ID Предмета", - "text.autoconfig.skyblocker.option.quickNav.button1.item.count": "Количество", - "text.autoconfig.skyblocker.option.quickNav.button1.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button1.render": "Отображать", - "text.autoconfig.skyblocker.option.quickNav.button1.uiTitle": "Название Кнопки", "text.autoconfig.skyblocker.option.messages.chatFilterResult.ACTION_BAR": "Переместить в action bar", "text.autoconfig.skyblocker.option.locations.barn.solveHungryHiker": "Показывать Решение Hungry Hiker", "text.autoconfig.skyblocker.option.locations.barn.solveTreasureHunter": "Показывать Решение Treasure Hunter", @@ -126,81 +101,6 @@ "text.autoconfig.skyblocker.option.messages.chatFilterResult.PASS": "Не скрывать", "skyblocker.updaterepository.failed": "§cОшибка в обновлении местного репозитория. Перезапустите игру, удалив файлы вручную.", "text.autoconfig.skyblocker.option.richPresence.info.BITS": "BITS", - "text.autoconfig.skyblocker.option.quickNav.button2.item": "Предмет", - "text.autoconfig.skyblocker.option.quickNav.button2.item.itemName": "ID Предмета", - "text.autoconfig.skyblocker.option.quickNav.button2.item.count": "Количество", - "text.autoconfig.skyblocker.option.quickNav.button2.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button2.uiTitle": "Название Кнопки", - "text.autoconfig.skyblocker.option.quickNav.button2.render": "Отображать", - "text.autoconfig.skyblocker.option.quickNav.button3.item": "Предмет", - "text.autoconfig.skyblocker.option.quickNav.button3.item.itemName": "ID Предмета", - "text.autoconfig.skyblocker.option.quickNav.button3.item.count": "Количество", - "text.autoconfig.skyblocker.option.quickNav.button3.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button3.uiTitle": "Название Кнопки", - "text.autoconfig.skyblocker.option.quickNav.button5.item.count": "Количество", - "text.autoconfig.skyblocker.option.quickNav.button5.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button5.clickEvent": "Команда по щелчку", - "text.autoconfig.skyblocker.option.quickNav.button6": "Кнопка 6", - "text.autoconfig.skyblocker.option.quickNav.button6.item": "Предмет", - "text.autoconfig.skyblocker.option.quickNav.button6.item.itemName": "ID Предмета", - "text.autoconfig.skyblocker.option.quickNav.button6.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button6.uiTitle": "Название Кнопки", - "text.autoconfig.skyblocker.option.quickNav.button6.clickEvent": "Команда по щелчку", - "text.autoconfig.skyblocker.option.quickNav.button7": "Кнопка 7", - "text.autoconfig.skyblocker.option.quickNav.button7.item": "Предмет", - "text.autoconfig.skyblocker.option.quickNav.button7.item.count": "Количество", - "text.autoconfig.skyblocker.option.quickNav.button7.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button7.uiTitle": "Название Кнопки", - "text.autoconfig.skyblocker.option.quickNav.button7.clickEvent": "Команда по щелчку", - "text.autoconfig.skyblocker.option.quickNav.button8": "Кнопка 8", - "text.autoconfig.skyblocker.option.quickNav.button8.item.itemName": "ID Предмета", - "text.autoconfig.skyblocker.option.quickNav.button8.item.count": "Количество", - "text.autoconfig.skyblocker.option.quickNav.button6.render": "Отображать", - "text.autoconfig.skyblocker.option.quickNav.button7.render": "Отображать", - "text.autoconfig.skyblocker.option.quickNav.button8.render": "Отображать", - "text.autoconfig.skyblocker.option.quickNav.button3.clickEvent": "Команда по щелчку", - "text.autoconfig.skyblocker.option.quickNav.button4": "Кнопка 4", - "text.autoconfig.skyblocker.option.quickNav.button4.render": "Отображать", - "text.autoconfig.skyblocker.option.quickNav.button4.item": "Предмет", - "text.autoconfig.skyblocker.option.quickNav.button4.item.count": "Количество", - "text.autoconfig.skyblocker.option.quickNav.button4.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button4.uiTitle": "Название Кнопки", - "text.autoconfig.skyblocker.option.quickNav.button4.clickEvent": "Команда по щелчку", - "text.autoconfig.skyblocker.option.quickNav.button5": "Кнопка 5", - "text.autoconfig.skyblocker.option.quickNav.button5.render": "Отображать", - "text.autoconfig.skyblocker.option.quickNav.button5.item.itemName": "ID Предмета", - "text.autoconfig.skyblocker.option.quickNav.button8.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button8.uiTitle": "Название Кнопки", - "text.autoconfig.skyblocker.option.quickNav.button8.clickEvent": "Команда по щелчку", - "text.autoconfig.skyblocker.option.quickNav.button9": "Кнопка 9", - "text.autoconfig.skyblocker.option.quickNav.button9.item": "Предмет", - "text.autoconfig.skyblocker.option.quickNav.button9.item.itemName": "ID Предмета", - "text.autoconfig.skyblocker.option.quickNav.button9.item.count": "Количество", - "text.autoconfig.skyblocker.option.quickNav.button9.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button9.uiTitle": "Название Кнопки", - "text.autoconfig.skyblocker.option.quickNav.button9.clickEvent": "Команда по щелчку", - "text.autoconfig.skyblocker.option.quickNav.button10": "Кнопка 10", - "text.autoconfig.skyblocker.option.quickNav.button9.render": "Отображать", - "text.autoconfig.skyblocker.option.quickNav.button10.render": "Отображать", - "text.autoconfig.skyblocker.option.quickNav.button10.item": "Предмет", - "text.autoconfig.skyblocker.option.quickNav.button10.item.itemName": "ID Предмета", - "text.autoconfig.skyblocker.option.quickNav.button10.item.count": "Количество", - "text.autoconfig.skyblocker.option.quickNav.button10.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button10.uiTitle": "Название Кнопки", - "text.autoconfig.skyblocker.option.quickNav.button10.clickEvent": "Команда по щелчку", - "text.autoconfig.skyblocker.option.quickNav.button11": "Кнопка 11", - "text.autoconfig.skyblocker.option.quickNav.button11.item": "Предмет", - "text.autoconfig.skyblocker.option.quickNav.button11.item.itemName": "ID Предмета", - "text.autoconfig.skyblocker.option.quickNav.button11.item.count": "Количество", - "text.autoconfig.skyblocker.option.quickNav.button11.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button11.uiTitle": "Название Кнопки", - "text.autoconfig.skyblocker.option.quickNav.button12": "Кнопка 12", - "text.autoconfig.skyblocker.option.quickNav.button12.render": "Отображать", - "text.autoconfig.skyblocker.option.quickNav.button12.item": "Предмет", - "text.autoconfig.skyblocker.option.quickNav.button12.item.itemName": "ID Предмета", - "text.autoconfig.skyblocker.option.quickNav.button12.item.count": "Количество", - "text.autoconfig.skyblocker.option.quickNav.button12.item.nbt": "NBT", - "text.autoconfig.skyblocker.option.quickNav.button12.uiTitle": "Название Кнопки", "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper": "Помощь в меню Croesus", "text.autoconfig.skyblocker.option.general.experiments": "Помощь в Экспериментах", "text.autoconfig.skyblocker.option.general.experiments.enableUltrasequencerSolver": "Решать Ultrasequencer", diff --git a/src/main/resources/assets/skyblocker/lang/tr_tr.json b/src/main/resources/assets/skyblocker/lang/tr_tr.json index 2441570a..f6b31dec 100644 --- a/src/main/resources/assets/skyblocker/lang/tr_tr.json +++ b/src/main/resources/assets/skyblocker/lang/tr_tr.json @@ -39,8 +39,6 @@ "text.autoconfig.skyblocker.option.messages.hideMana": "Aksiyon barındaki mana tüketimlerini gizle", "text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "FancyBar ile daha iyi bir deneyim sunar", "text.autoconfig.skyblocker.option.general.hideEmptyTooltips": "Menülerdeki boş eşya açıklamalarını gizle", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y": "Y", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x": "X", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enableBackground": "Arka planı göster", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled": "Etkinleştir", "text.autoconfig.skyblocker.option.general.itemTooltip.avg.@Tooltip": "Kaç günlük ortalamanın gösterileceğini seçebilirsiniz", diff --git a/src/main/resources/assets/skyblocker/lang/zh_cn.json b/src/main/resources/assets/skyblocker/lang/zh_cn.json index 622e012e..4a3abde3 100644 --- a/src/main/resources/assets/skyblocker/lang/zh_cn.json +++ b/src/main/resources/assets/skyblocker/lang/zh_cn.json @@ -43,18 +43,6 @@ "text.autoconfig.skyblocker.option.richPresence.customMessage": "自定义消息", "text.autoconfig.skyblocker.category.quickNav": "快速导航", "text.autoconfig.skyblocker.option.quickNav.enableQuickNav": "启用快速导航", - "text.autoconfig.skyblocker.option.quickNav.button1": "热键1", - "text.autoconfig.skyblocker.option.quickNav.button2": "热键2", - "text.autoconfig.skyblocker.option.quickNav.button3": "热键3", - "text.autoconfig.skyblocker.option.quickNav.button4": "热键4", - "text.autoconfig.skyblocker.option.quickNav.button5": "热键5", - "text.autoconfig.skyblocker.option.quickNav.button6": "热键6", - "text.autoconfig.skyblocker.option.quickNav.button7": "热键7", - "text.autoconfig.skyblocker.option.quickNav.button8": "热键8", - "text.autoconfig.skyblocker.option.quickNav.button9": "热键9", - "text.autoconfig.skyblocker.option.quickNav.button10": "热键10", - "text.autoconfig.skyblocker.option.quickNav.button11": "热键11", - "text.autoconfig.skyblocker.option.quickNav.button12": "热键12", "text.autoconfig.skyblocker.option.general.itemList": "物品列表", "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "启用物品列表", "text.autoconfig.skyblocker.category.locations": "位置", @@ -79,8 +67,6 @@ "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud": "矮人矿井 HUD", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled": "启用", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enableBackground": "启用背景", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x": "HUD所在横向位置", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y": "HUD所在纵向位置", "text.autoconfig.skyblocker.category.messages": "消息", "text.autoconfig.skyblocker.option.messages.chatFilterResult.PASS": "禁用", "text.autoconfig.skyblocker.option.messages.chatFilterResult.FILTER": "启用", @@ -96,93 +82,9 @@ "text.autoconfig.skyblocker.option.messages.hideAutopet": "隐藏自动宠物消息", "text.autoconfig.skyblocker.option.messages.hideMana": "在动作栏中隐藏法力消耗信息", "text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "已被更好的属性条代替", - "text.autoconfig.skyblocker.option.quickNav.button1.item.nbt": "物品NBT", - "text.autoconfig.skyblocker.option.quickNav.button4.item.nbt": "物品NBT", "text.autoconfig.skyblocker.option.general.hideEmptyTooltips": "隐藏菜单中分隔符的物品信息", "text.autoconfig.skyblocker.option.locations.dungeons.mapScaling": "地图界面大小", "skyblocker.updaterepository.failed": "§c更新本地数据存储库失败，请手动删库并重启游戏", - "text.autoconfig.skyblocker.option.quickNav.button1.item": "热键所显示物品", - "text.autoconfig.skyblocker.option.quickNav.button1.uiTitle": "快捷界面标题", - "text.autoconfig.skyblocker.option.quickNav.button1.item.itemName": "物品ID", - "text.autoconfig.skyblocker.option.quickNav.button1.clickEvent": "点击时所执行的命令", - "text.autoconfig.skyblocker.option.quickNav.button1.render": "是否显示该热键", - "text.autoconfig.skyblocker.option.quickNav.button2.render": "是否显示该热键", - "text.autoconfig.skyblocker.option.quickNav.button2.item": "热键所显示物品", - "text.autoconfig.skyblocker.option.quickNav.button2.item.itemName": "物品ID", - "text.autoconfig.skyblocker.option.quickNav.button2.item.count": "物品数量", - "text.autoconfig.skyblocker.option.quickNav.button1.item.count": "物品数量", - "text.autoconfig.skyblocker.option.quickNav.button2.item.nbt": "物品NBT", - "text.autoconfig.skyblocker.option.quickNav.button2.uiTitle": "快捷界面标题", - "text.autoconfig.skyblocker.option.quickNav.button2.clickEvent": "点击时所执行的命令", - "text.autoconfig.skyblocker.option.quickNav.button3.render": "是否显示该热键", - "text.autoconfig.skyblocker.option.quickNav.button3.item.itemName": "物品ID", - "text.autoconfig.skyblocker.option.quickNav.button3.item.count": "物品数量", - "text.autoconfig.skyblocker.option.quickNav.button3.item.nbt": "物品NBT", - "text.autoconfig.skyblocker.option.quickNav.button3.uiTitle": "快捷界面标题", - "text.autoconfig.skyblocker.option.quickNav.button3.clickEvent": "点击时所执行的命令", - "text.autoconfig.skyblocker.option.quickNav.button4.render": "是否显示该热键", - "text.autoconfig.skyblocker.option.quickNav.button4.item": "热键所显示物品", - "text.autoconfig.skyblocker.option.quickNav.button4.item.itemName": "物品ID", - "text.autoconfig.skyblocker.option.quickNav.button4.uiTitle": "快捷界面标题", - "text.autoconfig.skyblocker.option.quickNav.button4.clickEvent": "点击时所执行的命令", - "text.autoconfig.skyblocker.option.quickNav.button5.render": "是否显示该热键", - "text.autoconfig.skyblocker.option.quickNav.button5.item": "热键所显示物品", - "text.autoconfig.skyblocker.option.quickNav.button5.item.itemName": "物品ID", - "text.autoconfig.skyblocker.option.quickNav.button5.item.count": "物品数量", - "text.autoconfig.skyblocker.option.quickNav.button5.item.nbt": "物品NBT", - "text.autoconfig.skyblocker.option.quickNav.button5.uiTitle": "快捷界面标题", - "text.autoconfig.skyblocker.option.quickNav.button5.clickEvent": "点击时所执行的命令", - "text.autoconfig.skyblocker.option.quickNav.button6.render": "是否显示该热键", - "text.autoconfig.skyblocker.option.quickNav.button6.item": "热键所显示物品", - "text.autoconfig.skyblocker.option.quickNav.button6.item.itemName": "物品ID", - "text.autoconfig.skyblocker.option.quickNav.button6.item.count": "物品数量", - "text.autoconfig.skyblocker.option.quickNav.button6.uiTitle": "快捷界面标题", - "text.autoconfig.skyblocker.option.quickNav.button6.clickEvent": "点击时所执行的命令", - "text.autoconfig.skyblocker.option.quickNav.button7.render": "是否显示该热键", - "text.autoconfig.skyblocker.option.quickNav.button7.item": "热键所显示物品", - "text.autoconfig.skyblocker.option.quickNav.button7.item.itemName": "物品ID", - "text.autoconfig.skyblocker.option.quickNav.button7.item.count": "热键物品显示数量", - "text.autoconfig.skyblocker.option.quickNav.button7.item.nbt": "物品NBT", - "text.autoconfig.skyblocker.option.quickNav.button7.uiTitle": "快捷界面标题", - "text.autoconfig.skyblocker.option.quickNav.button8.render": "是否显示该热键", - "text.autoconfig.skyblocker.option.quickNav.button8.item": "热键所显示物品", - "text.autoconfig.skyblocker.option.quickNav.button8.item.itemName": "物品ID", - "text.autoconfig.skyblocker.option.quickNav.button8.item.count": "热键物品显示数量", - "text.autoconfig.skyblocker.option.quickNav.button8.item.nbt": "物品NBT", - "text.autoconfig.skyblocker.option.quickNav.button8.uiTitle": "快捷界面标题", - "text.autoconfig.skyblocker.option.quickNav.button8.clickEvent": "点击时所执行的命令", - "text.autoconfig.skyblocker.option.quickNav.button9.render": "是否显示该热键", - "text.autoconfig.skyblocker.option.quickNav.button9.item": "热键所显示物品", - "text.autoconfig.skyblocker.option.quickNav.button9.item.count": "物品数量", - "text.autoconfig.skyblocker.option.quickNav.button9.item.nbt": "物品NBT", - "text.autoconfig.skyblocker.option.quickNav.button9.uiTitle": "快捷界面标题", - "text.autoconfig.skyblocker.option.quickNav.button9.clickEvent": "点击时所执行的命令", - "text.autoconfig.skyblocker.option.quickNav.button10.render": "是否显示该热键", - "text.autoconfig.skyblocker.option.quickNav.button10.item": "热键所显示物品", - "text.autoconfig.skyblocker.option.quickNav.button10.item.itemName": "物品ID", - "text.autoconfig.skyblocker.option.quickNav.button10.item.count": "物品数量", - "text.autoconfig.skyblocker.option.quickNav.button10.item.nbt": "物品NBT", - "text.autoconfig.skyblocker.option.quickNav.button10.uiTitle": "快捷界面标题", - "text.autoconfig.skyblocker.option.quickNav.button12.clickEvent": "点击时所执行的命令", - "text.autoconfig.skyblocker.option.quickNav.button11.render": "是否显示该热键", - "text.autoconfig.skyblocker.option.quickNav.button11.item": "热键所显示物品", - "text.autoconfig.skyblocker.option.quickNav.button11.item.itemName": "物品ID", - "text.autoconfig.skyblocker.option.quickNav.button11.item.count": "物品数量", - "text.autoconfig.skyblocker.option.quickNav.button11.item.nbt": "物品NBT", - "text.autoconfig.skyblocker.option.quickNav.button11.uiTitle": "快捷界面标题", - "text.autoconfig.skyblocker.option.quickNav.button11.clickEvent": "点击时所执行的命令", - "text.autoconfig.skyblocker.option.quickNav.button12.render": "是否显示该热键", - "text.autoconfig.skyblocker.option.quickNav.button12.item": "热键所显示物品", - "text.autoconfig.skyblocker.option.quickNav.button12.item.itemName": "物品ID", - "text.autoconfig.skyblocker.option.quickNav.button12.item.count": "物品数量", - "text.autoconfig.skyblocker.option.quickNav.button12.item.nbt": "物品NBT", - "text.autoconfig.skyblocker.option.quickNav.button12.uiTitle": "快捷界面标题", - "text.autoconfig.skyblocker.option.quickNav.button3.item": "热键所显示物品", - "text.autoconfig.skyblocker.option.quickNav.button4.item.count": "物品数量", - "text.autoconfig.skyblocker.option.quickNav.button6.item.nbt": "物品NBT", - "text.autoconfig.skyblocker.option.quickNav.button7.clickEvent": "点击时所执行的命令", - "text.autoconfig.skyblocker.option.quickNav.button9.item.itemName": "物品ID", - "text.autoconfig.skyblocker.option.quickNav.button10.clickEvent": "点击时所执行的命令", "text.autoconfig.skyblocker.option.general.fishing": "钓鱼助手", "text.autoconfig.skyblocker.option.general.fishing.enableFishingHelper": "启用钓鱼助手", "skyblocker.fishing.reelNow": "收竿！", @@ -193,8 +95,6 @@ "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.lividColorText.@Tooltip": "Livid Boss战时发送到聊天栏的信息， 字段 “[color]” 将被替换为真 Livid 的颜色", "key.skyblocker.defaultTgl": "将tab键所显示的列表改为默认空岛生存列表", "text.autoconfig.skyblocker.option.general.tabHud.tabHudEnabled": "启用更好的Tab HUD", - "text.autoconfig.skyblocker.option.locations.dungeons.mapX": "地图所在横向位置", - "text.autoconfig.skyblocker.option.locations.dungeons.mapY": "地图所在纵向位置", "text.autoconfig.skyblocker.option.general.tabHud": "更好的Tab HUD", "text.autoconfig.skyblocker.option.general.tabHud.tabHudScale": "更好的Tab HUD缩放大小", "text.autoconfig.skyblocker.option.general.tabHud.tabHudScale.@Tooltip": "相对于原版 GUI 的百分比大小", diff --git a/src/main/resources/assets/skyblocker/lang/zh_tw.json b/src/main/resources/assets/skyblocker/lang/zh_tw.json index 44b5d9d6..d412de9c 100644 --- a/src/main/resources/assets/skyblocker/lang/zh_tw.json +++ b/src/main/resources/assets/skyblocker/lang/zh_tw.json @@ -37,9 +37,6 @@ "text.autoconfig.skyblocker.option.general.hitbox.oldFarmlandHitbox": "啟用1.8的耕地判定箱", "text.autoconfig.skyblocker.category.quickNav": "快速導航", "text.autoconfig.skyblocker.option.quickNav.enableQuickNav": "啟用快速導航", - "text.autoconfig.skyblocker.option.quickNav.button1": "熱鍵1", - "text.autoconfig.skyblocker.option.quickNav.button1.render": "是否顯示該熱鍵", - "text.autoconfig.skyblocker.option.quickNav.button1.item": "熱鍵所顯示物品", "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "啟用 Dungeon 地圖", "text.autoconfig.skyblocker.option.locations.barn.solveTreasureHunter": "Treasure Hunter 助手", "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "顯示電鑽燃料", @@ -51,11 +48,6 @@ "text.autoconfig.skyblocker.option.richPresence.info.LOCATION": "位置", "text.autoconfig.skyblocker.option.richPresence.info.@Tooltip": "如果您正在循環模式，這個值將不會生效", "text.autoconfig.skyblocker.option.richPresence.customMessage": "自訂訊息", - "text.autoconfig.skyblocker.option.quickNav.button1.item.itemName": "物品ID", - "text.autoconfig.skyblocker.option.quickNav.button1.item.count": "物品數量", - "text.autoconfig.skyblocker.option.quickNav.button1.item.nbt": "物品NBT", - "text.autoconfig.skyblocker.option.quickNav.button1.uiTitle": "快捷介面標題", - "text.autoconfig.skyblocker.option.quickNav.button1.clickEvent": "點擊時所執行的指令", "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "Fetchur 所需物品提示", "text.autoconfig.skyblocker.option.messages.chatFilterResult.ACTION_BAR": "移至動作欄", "text.autoconfig.skyblocker.option.messages.chatFilterResult.PASS": "關閉", diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 86481bf3..b55214d5 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -5,7 +5,7 @@ "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"], + "contributors": ["ExternalTime", "Zailer43", "TacoMonkey", "KonaeAkira", "Fix3dll", "null2264", "HyperSoop", "edgarogh", "TheColdPot", "Julienraptor01", "ADON15c", "catandA", "kevinthegreat1", "AzureAaron", "msg-programs", "lantice3720", "Futuremappermydud", "koloiyolo", "viciscat", "Grayray75", "alexiayaa"], "contact": { "homepage": "https://hysky.de", "sources": "https://github.com/SkyblockerMod/Skyblocker", @@ -38,7 +38,7 @@ "depends": { "fabricloader": ">=0.14.22", "fabric-api": ">=0.89.1+1.20.2", - "yet_another_config_lib_v3": ">=3.2.0+1.20.2", + "yet_another_config_lib_v3": ">=3.2.1+1.20.2", "minecraft": "~1.20.2" }, "conflicts": { diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json index 4e7bfe16..5bafb324 100644 --- a/src/main/resources/skyblocker.mixins.json +++ b/src/main/resources/skyblocker.mixins.json @@ -36,7 +36,12 @@ "accessor.PlayerListHudAccessor", "accessor.RecipeBookWidgetAccessor", "accessor.ScreenAccessor", - "accessor.WorldRendererAccessor" + "accessor.WorldRendererAccessor", + "yacl.DoubleFieldControllerMixin", + "yacl.FloatFieldControllerMixin", + "yacl.IntegerFieldControllerMixin", + "yacl.LongFieldControllerMixin", + "yacl.NumberFieldControllerMixin" ], "injectors": { "defaultRequire": 1 |