Adds a custom GUI for the Party Finder in dungeons. Is it good? Debatable.

6 files changed, 39 insertions, 2 deletions

diff --git a/src/main/resources/assets/skyblocker/dungeons/catacombs/floorskulls.json b/src/main/resources/assets/skyblocker/dungeons/catacombs/floorskulls.json
new file mode 100644
index 00000000..4bb52026
--- /dev/null
+++ b/src/main/resources/assets/skyblocker/dungeons/catacombs/floorskulls.json
@@ -0,0 +1,22 @@
+{
+  "normal": {
+    "entrance": "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNWEyZjY3NTAwYTY1ZjNjZTc5ZDM0ZWMxNTBkZTkzZGY4ZjYwZWJlNTJlMjQ4ZjVlMWNkYjY5YjA3MjYyNTZmNyJ9fX0K",
+    "floor i": "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTcyMDkxN2NkYTA1Njc0NDI2MTdmMjcyMWU4OGJlOWQyZmZiYjBiMjZhM2Y0YzJmZTIxNjU1ODE0ZDRmNDQ3NiJ9fX0K",
+    "floor ii": "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTcyMDkxN2NkYTA1Njc0NDI2MTdmMjcyMWU4OGJlOWQyZmZiYjBiMjZhM2Y0YzJmZTIxNjU1ODE0ZDRmNDQ3NiJ9fX0K",
+    "floor iii": "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvM2NlNjlkMmRkY2M4MWM5ZmMyZTk5NDhjOTIwMDNlYjBmN2ViZjBlN2U5NTJlODAxYjdmMjA2OWRjZWU3NmQ4NSJ9fX0K",
+    "floor iv": "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzY5NjVlM2ZkNjE5ZGU2YjBhN2NlMTY3MzA3MjUyMGE5MzYwMzc4ZTFjYjhjMTlkNGJhZjBjODY3NjlkMzc2NCJ9fX0K",
+    "floor v": "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMzNhMDI0NmQ1MTM1MGI3NzBkZTI3ZjFhMTkyNWIxMWNlY2U1N2IzYzliMjA5ZTJiNmJmMjc1ZDMyZDAxNTRjMyJ9fX0K",
+    "floor vi": "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYTFhODFmOWIwYTEzNzU2ODFhZTdkOWRmNjVlNGQzNzIzYjFmMGZhNzQ0M2U3NmRkM2JjNjNkZDM4NjRmZjM0MyJ9fX0K",
+    "floor vii": "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNmE0MDY3NWQzMzNhZGNjYTc1YjM1YjZiYTI5YjRmZDdlNWVhZWI5OTgzOTUyOTUzODViNDk0MTI4NzE1ZGFiMyJ9fX0K"
+  },
+  "master": {
+    "entrance": "ewogICJ0aW1lc3RhbXAiIDogMTYxNzExMDU1MDEyNSwKICAicHJvZmlsZUlkIiA6ICI5ZDQyNWFiOGFmZjg0MGU1OWM3NzUzZjc5Mjg5YjMyZSIsCiAgInByb2ZpbGVOYW1lIiA6ICJUb21wa2luNDIiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMWViNWIyMWFmMzMwYWYxMjJiMjY4YjdhYTM5MDczM2JkMWI2OTliNGQwOTIzMjMzZWNkMjRmODFlMDhiOWJjZSIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9",
+    "floor i": "ewogICJ0aW1lc3RhbXAiIDogMTYxNzExMDU1MDEyNSwKICAicHJvZmlsZUlkIiA6ICI5ZDQyNWFiOGFmZjg0MGU1OWM3NzUzZjc5Mjg5YjMyZSIsCiAgInByb2ZpbGVOYW1lIiA6ICJUb21wa2luNDIiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMWViNWIyMWFmMzMwYWYxMjJiMjY4YjdhYTM5MDczM2JkMWI2OTliNGQwOTIzMjMzZWNkMjRmODFlMDhiOWJjZSIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9",
+    "floor ii": "ewogICJ0aW1lc3RhbXAiIDogMTYxNzExMDcxNzIxMywKICAicHJvZmlsZUlkIiA6ICI5MzZmMTA3MTEzOGM0YjMyYTg0OGY2NmE5Nzc2NDJhMiIsCiAgInByb2ZpbGVOYW1lIiA6ICIwMDAwMDAwMDAwMDAwMDB4IiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzMyMjkyZTRlMGZhNjI2NjcyNTZlZjhkYTBmMDE5ODJhOTk2NDk5ZjRkNWQ4OTRiZDA1OGMzZTZmM2QyZmIyZDkiCiAgICB9CiAgfQp9",
+    "floor iii": "ewogICJ0aW1lc3RhbXAiIDogMTYxNzExMDczNDE2NiwKICAicHJvZmlsZUlkIiA6ICJjMGYzYjI3YTUwMDE0YzVhYjIxZDc5ZGRlMTAxZGZlMiIsCiAgInByb2ZpbGVOYW1lIiA6ICJDVUNGTDEzIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2M5NjlmNmIxNDg2NDhhYThkMDI3MjI4YTUyZmI1YTNjYTFlZTg0ZGM3NmU0Nzg1MWYxNGRiMDI5YTczMGE4YTMiCiAgICB9CiAgfQp9",
+    "floor iv": "ewogICJ0aW1lc3RhbXAiIDogMTYxNzExMDc1MDAxMiwKICAicHJvZmlsZUlkIiA6ICI1N2IzZGZiNWY4YTY0OWUyOGI1NDRlNGZmYzYzMjU2ZiIsCiAgInByb2ZpbGVOYW1lIiA6ICJYaWthcm8iLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZDdiNjkwMjFmOWMwOTY0N2RmZDliMzRkZjNkZWFmZjcwY2ZjNzQwZjZhMjZmNjEyZGQ0NzUwM2ZjMzRjOTdmMCIKICAgIH0KICB9Cn0",
+    "floor v": "ewogICJ0aW1lc3RhbXAiIDogMTYxNzExMDc2NTU5OCwKICAicHJvZmlsZUlkIiA6ICI3NzI3ZDM1NjY5Zjk0MTUxODAyM2Q2MmM2ODE3NTkxOCIsCiAgInByb2ZpbGVOYW1lIiA6ICJsaWJyYXJ5ZnJlYWsiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZDY1Y2JjZTQwZTYwZTdhNTlhODdmYThmNGVjYjZjY2ZjMTUxNDMzOGMyNjI2MTRiZjMzNzM5YTYyNjNmNTQwNSIKICAgIH0KICB9Cn0",
+    "floor vi": "ewogICJ0aW1lc3RhbXAiIDogMTYxNzExMDc4MTM4OCwKICAicHJvZmlsZUlkIiA6ICJmZDYwZjM2ZjU4NjE0ZjEyYjNjZDQ3YzJkODU1Mjk5YSIsCiAgInByb2ZpbGVOYW1lIiA6ICJSZWFkIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2FjM2Q0NWZmNjcyOTg4YjQ2MzU4MTM3YmUzMmMzYzlhZGZkOWE2MjkxOTVjMmI2NDgxNGE5MzQ5OWRkNjYwNiIKICAgIH0KICB9Cn0",
+    "floor vii": "ewogICJ0aW1lc3RhbXAiIDogMTYxNzExMDc5MzYwNSwKICAicHJvZmlsZUlkIiA6ICIxZDUyMzNkMzg4NjI0YmFmYjAwZTMxNTBhN2FhM2E4OSIsCiAgInByb2ZpbGVOYW1lIiA6ICIwMDAwMDAwMDAwMDAwMDBKIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2YwYzY4N2EyMDI2YjY5MzQ0YjVhZGRiYmVmYTM4MWQxNTRkNmJjODBjOGMwMTc0NTMxMWJmYmJmOGJiZjAwOWMiCiAgICB9CiAgfQp9"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index d6f09de9..e9ce9ffc 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -127,9 +127,10 @@
   "text.autoconfig.skyblocker.option.general.flameOverlay": "Flame Overlay",
   "text.autoconfig.skyblocker.option.general.flameOverlay.flameHeight": "Flame Height",
   "text.autoconfig.skyblocker.option.general.flameOverlay.flameOpacity": "Flame Opacity",
+  "text.autoconfig.skyblocker.option.general.betterPartyFinder": "Better Party Finder",
   "skyblocker.itemTooltip.nullMessage": "§cItem price information on tooltip will renew in max 60 seconds. If not, check latest.log",
   "skyblocker.itemTooltip.noData": "§cNo Data",
-  
+
   "skyblocker.wikiLookup.noArticleFound": "§rUnable to locate a wiki article for this item...",
 
   "text.autoconfig.skyblocker.category.richPresence": "Discord Rich Presence",
@@ -420,5 +421,15 @@
   "skyblocker.tips.fairySoulsEnigmaSoulsRelics": "Don't know where to find Fairy Souls, Enigma Souls, or Relics? Enable the helpers to aid your exploration, they'll remember which souls you've already found.",
   "skyblocker.tips.quickNav": "You can customize the QuickNav buttons in the config.",
 
+  "skyblocker.partyFinder.tabs.partyFinder": "Party Finder",
+  "skyblocker.partyFinder.tabs.searchSettings": "Search Filters",
+  "skyblocker.partyFinder.tabs.createParty": "Create Party",
+  "skyblocker.partyFinder.partyCard.minClassLevel": "Min class level required: %d",
+  "skyblocker.partyFinder.partyCard.minDungeonLevel": "Min dungeon level required: %d",
+  "skyblocker.partyFinder.noParties": "No parties found. Big sad :(",
+  "skyblocker.partyFinder.error.name" : "Party Finder error!",
+  "skyblocker.partyFinder.error.message": "An error occurred so you've been sent to the vanilla party finder",
+  "skyblocker.partyFinder.loadingError": "If you see this for more than 5 seconds, something probably went wrong...",
+
   "emi.category.skyblocker.skyblock": "Skyblock"
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/skyblocker/textures/gui/party_card.png b/src/main/resources/assets/skyblocker/textures/gui/party_card.png
new file mode 100644
index 00000000..191200c8
--- /dev/null
+++ b/src/main/resources/assets/skyblocker/textures/gui/party_card.png
diff --git a/src/main/resources/assets/skyblocker/textures/gui/party_card_hover.png b/src/main/resources/assets/skyblocker/textures/gui/party_card_hover.png
new file mode 100644
index 00000000..05aace37
--- /dev/null
+++ b/src/main/resources/assets/skyblocker/textures/gui/party_card_hover.png
diff --git a/src/main/resources/skyblocker.accesswidener b/src/main/resources/skyblocker.accesswidener
index 16130ceb..156ced34 100644
--- a/src/main/resources/skyblocker.accesswidener
+++ b/src/main/resources/skyblocker.accesswidener
@@ -1,2 +1,3 @@
 accessWidener v2 named
 
+extendable method net/minecraft/client/gui/widget/ScrollableWidget drawScrollbar (Lnet/minecraft/client/gui/DrawContext;)V
diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json
index 22480cc7..d56f6317 100644
--- a/src/main/resources/skyblocker.mixins.json
+++ b/src/main/resources/skyblocker.mixins.json
@@ -16,6 +16,7 @@
     "FarmlandBlockMixin",
     "GenericContainerScreenHandlerMixin",
     "HandledScreenMixin",
+    "HandledScreensMixin",
     "InGameHudMixin",
     "InGameOverlayRendererMixin",
     "InventoryScreenMixin",
@@ -33,7 +34,6 @@
     "YggdrasilMinecraftSessionServiceMixin",
     "YggdrasilServicesKeyInfoMixin",
     "accessor.BeaconBlockEntityRendererInvoker",
-    "accessor.DrawContextInvoker",
     "accessor.FrustumInvoker",
     "accessor.HandledScreenAccessor",
     "accessor.ItemStackAccessor",
@@ -41,6 +41,9 @@
     "accessor.RecipeBookWidgetAccessor",
     "accessor.ScreenAccessor",
     "accessor.WorldRendererAccessor",
+    "accessor.SkullBlockEntityAccessor",
+    "accessor.DrawContextInvoker",
+    "accessor.WorldRendererAccessor",
     "discordipc.ConnectionMixin"
   ],
   "injectors": {