aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/ISSUE_TEMPLATE/bug_report.yml2
-rw-r--r--.github/ISSUE_TEMPLATE/crash_report.yml2
-rw-r--r--.github/ISSUE_TEMPLATE/feature_request.yml2
-rw-r--r--CHANGELOG.md56
-rw-r--r--FEATURES.md150
-rw-r--r--MRREADME.md513
-rw-r--r--README.md185
-rw-r--r--build.gradle22
-rw-r--r--gradle.properties21
-rw-r--r--src/main/java/de/hysky/skyblocker/SkyblockerMod.java29
-rw-r--r--src/main/java/de/hysky/skyblocker/compatibility/MixinPlugin.java15
-rw-r--r--src/main/java/de/hysky/skyblocker/compatibility/emi/SkyblockEmiRecipe.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/compatibility/emi/SkyblockerEMIPlugin.java6
-rw-r--r--src/main/java/de/hysky/skyblocker/compatibility/rei/SkyblockCraftingDisplayGenerator.java6
-rw-r--r--src/main/java/de/hysky/skyblocker/compatibility/rei/SkyblockerREIClientPlugin.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java60
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java51
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java15
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java96
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/LocationsCategory.java15
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java168
-rw-r--r--src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java12
-rw-r--r--src/main/java/de/hysky/skyblocker/mixin/HandledScreenMixin.java19
-rw-r--r--src/main/java/de/hysky/skyblocker/mixin/InGameOverlayRendererMixin.java22
-rw-r--r--src/main/java/de/hysky/skyblocker/mixin/ItemMixin.java13
-rw-r--r--src/main/java/de/hysky/skyblocker/mixin/ItemStackMixin.java70
-rw-r--r--src/main/java/de/hysky/skyblocker/mixin/yacl/DoubleFieldControllerMixin.java27
-rw-r--r--src/main/java/de/hysky/skyblocker/mixin/yacl/FloatFieldControllerMixin.java27
-rw-r--r--src/main/java/de/hysky/skyblocker/mixin/yacl/IntegerFieldControllerMixin.java31
-rw-r--r--src/main/java/de/hysky/skyblocker/mixin/yacl/LongFieldControllerMixin.java31
-rw-r--r--src/main/java/de/hysky/skyblocker/mixin/yacl/NumberFieldControllerMixin.java43
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/FairySouls.java33
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/TeleportOverlay.java11
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/diana/MythologicalRitual.java213
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/CreeperBeams.java8
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonBlaze.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonChestProfit.java9
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java1
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/TicTacToe.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonMapUtils.java3
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonSecrets.java238
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/Room.java127
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/SecretWaypoint.java144
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/secrets/SecretsTracker.java174
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java1
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/BackpackPreview.java235
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorDyeColors.java15
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorTrims.java23
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/CustomItemNames.java11
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/ItemProtection.java9
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/MuseumItemCache.java144
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/WikiLookup.java30
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/BackpackPreview.java204
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/CompactorDeletorPreview.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/item/CompactorDeletorPreview.java)6
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/CompactorPreviewTooltipComponent.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/item/CompactorPreviewTooltipComponent.java)2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ExoticTooltip.java96
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/item/PriceInfoTooltip.java)285
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipInfoType.java145
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemListWidget.java10
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemRegistry.java129
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemRepository.java137
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemStackBuilder.java90
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/itemlist/SearchResultsWidget.java28
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/itemlist/SkyblockCraftingRecipe.java51
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/rift/EnigmaSouls.java183
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/rift/MirrorverseWaypoints.java62
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/rift/TheRift.java9
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/spidersden/Relics.java5
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/DungeonPlayerWidget.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/GardenSkillsWidget.java23
-rw-r--r--src/main/java/de/hysky/skyblocker/utils/ApiUtils.java53
-rw-r--r--src/main/java/de/hysky/skyblocker/utils/Constants.java48
-rw-r--r--src/main/java/de/hysky/skyblocker/utils/Http.java68
-rw-r--r--src/main/java/de/hysky/skyblocker/utils/ItemUtils.java79
-rw-r--r--src/main/java/de/hysky/skyblocker/utils/NEURepoManager.java (renamed from src/main/java/de/hysky/skyblocker/utils/NEURepo.java)32
-rw-r--r--src/main/java/de/hysky/skyblocker/utils/Utils.java49
-rw-r--r--src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java114
-rw-r--r--src/main/java/de/hysky/skyblocker/utils/render/title/TitleContainerConfigScreen.java21
-rw-r--r--src/main/java/de/hysky/skyblocker/utils/waypoint/Waypoint.java99
-rw-r--r--src/main/resources/assets/skyblocker/dungeons/secretlocations.json123
-rw-r--r--src/main/resources/assets/skyblocker/lang/en_ca.json29
-rw-r--r--src/main/resources/assets/skyblocker/lang/en_us.json230
-rw-r--r--src/main/resources/assets/skyblocker/lang/es_es.json70
-rw-r--r--src/main/resources/assets/skyblocker/lang/fr_fr.json104
-rw-r--r--src/main/resources/assets/skyblocker/lang/id_id.json2
-rw-r--r--src/main/resources/assets/skyblocker/lang/ja_jp.json73
-rw-r--r--src/main/resources/assets/skyblocker/lang/ko_kr.json100
-rw-r--r--src/main/resources/assets/skyblocker/lang/nb_no.json98
-rw-r--r--src/main/resources/assets/skyblocker/lang/pt_br.json242
-rw-r--r--src/main/resources/assets/skyblocker/lang/ru_ru.json111
-rw-r--r--src/main/resources/assets/skyblocker/lang/tr_tr.json6
-rw-r--r--src/main/resources/assets/skyblocker/lang/zh_cn.json115
-rw-r--r--src/main/resources/assets/skyblocker/lang/zh_tw.json10
-rw-r--r--src/main/resources/assets/skyblocker/rift/enigma_soul_waypoints.json215
-rw-r--r--src/main/resources/assets/skyblocker/rift/mirrorverse_waypoints.json (renamed from src/main/resources/assets/skyblocker/mirrorverse_waypoints.json)1
-rw-r--r--src/main/resources/assets/skyblocker/textures/gui/inventory_background.pngbin577 -> 0 bytes
-rw-r--r--src/main/resources/fabric.mod.json4
-rw-r--r--src/main/resources/skyblocker.mixins.json8
-rw-r--r--src/test/java/de/hysky/skyblocker/skyblock/item/ArmorTrimIdSerializationTest.java19
99 files changed, 4595 insertions, 2145 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 13f9e756..72f0fc8c 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -37,7 +37,7 @@ body:
options:
- 1.20.2
- 1.20.1
- - 1.20.0
+ - 1.20
validations:
required: true
- type: input
diff --git a/.github/ISSUE_TEMPLATE/crash_report.yml b/.github/ISSUE_TEMPLATE/crash_report.yml
index 31828e76..ae477210 100644
--- a/.github/ISSUE_TEMPLATE/crash_report.yml
+++ b/.github/ISSUE_TEMPLATE/crash_report.yml
@@ -18,7 +18,7 @@ body:
options:
- 1.20.2
- 1.20.1
- - 1.20.0
+ - 1.20
validations:
required: true
- type: input
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index cb42e124..4ec65bed 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,6 +1,6 @@
name: Feature Request
description: Ask for new feature
-labels: [enhancement]
+labels: [new feature]
body:
- type: markdown
attributes:
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