Merge branch 'master' into autorejoin2

10 files changed, 12 insertions, 9 deletions

diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index 3889777c..fc632560 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -27,6 +27,8 @@
   "text.autoconfig.skyblocker.option.general.acceptReparty": "Auto accept Reparty",
   "text.autoconfig.skyblocker.option.general.fishing": "Fishing Helper",
   "text.autoconfig.skyblocker.option.general.fishing.enableFishingHelper": "Enable Fishing Helper",
+  "text.autoconfig.skyblocker.option.general.fairySouls": "Fairy Souls Helper",
+  "text.autoconfig.skyblocker.option.general.fairySouls.enableFairySoulsHelper": "Enable Fairy Souls Helper",
   "text.autoconfig.skyblocker.option.general.quicknav": "Quicknav",
   "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "Enable Quicknav",
   "text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift": "View backpack preview without holding Shift",
@@ -227,5 +229,7 @@
 
   "skyblocker.api.got_key": "§b[§6Skyblocker§b] §2Automatically set your API key!",
 
-  "skyblocker.fishing.reelNow": "Reel in now!"
+  "skyblocker.fishing.reelNow": "Reel in now!",
+  "skyblocker.fairySouls.markAllFound": "Marked all fairy souls in the current island as found",
+  "skyblocker.fairySouls.markAllMissing": "Marked all fairy souls in the current island as missing"
 }
diff --git a/src/main/resources/assets/skyblocker/lang/es_ES.json b/src/main/resources/assets/skyblocker/lang/es_es.json
index 7c5ea062..7c5ea062 100644
--- a/src/main/resources/assets/skyblocker/lang/es_ES.json
+++ b/src/main/resources/assets/skyblocker/lang/es_es.json
diff --git a/src/main/resources/assets/skyblocker/lang/ja_JP.json b/src/main/resources/assets/skyblocker/lang/ja_jp.json
index 954647c7..954647c7 100644
--- a/src/main/resources/assets/skyblocker/lang/ja_JP.json
+++ b/src/main/resources/assets/skyblocker/lang/ja_jp.json
diff --git a/src/main/resources/assets/skyblocker/lang/ko_KR.json b/src/main/resources/assets/skyblocker/lang/ko_kr.json
index 93930cc1..93930cc1 100644
--- a/src/main/resources/assets/skyblocker/lang/ko_KR.json
+++ b/src/main/resources/assets/skyblocker/lang/ko_kr.json
diff --git a/src/main/resources/assets/skyblocker/lang/nb_NO.json b/src/main/resources/assets/skyblocker/lang/nb_no.json
index 0f96ebb6..0f96ebb6 100644
--- a/src/main/resources/assets/skyblocker/lang/nb_NO.json
+++ b/src/main/resources/assets/skyblocker/lang/nb_no.json
diff --git a/src/main/resources/assets/skyblocker/lang/nn_NO.json b/src/main/resources/assets/skyblocker/lang/nn_no.json
index cd7ed912..cd7ed912 100644
--- a/src/main/resources/assets/skyblocker/lang/nn_NO.json
+++ b/src/main/resources/assets/skyblocker/lang/nn_no.json
diff --git a/src/main/resources/assets/skyblocker/lang/tr_TR.json b/src/main/resources/assets/skyblocker/lang/tr_tr.json
index 1b07aff8..1b07aff8 100644
--- a/src/main/resources/assets/skyblocker/lang/tr_TR.json
+++ b/src/main/resources/assets/skyblocker/lang/tr_tr.json
diff --git a/src/main/resources/assets/skyblocker/lang/zh_Hant.json b/src/main/resources/assets/skyblocker/lang/zh_tw.json
index 3613757e..3613757e 100644
--- a/src/main/resources/assets/skyblocker/lang/zh_Hant.json
+++ b/src/main/resources/assets/skyblocker/lang/zh_tw.json
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 2044b170..ead46adc 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"],
+  "contributors": ["ExternalTime", "Zailer43", "TacoMonkey", "KonaeAkira", "Fix3dll", "null2264", "HyperSoop", "edgarogh", "TheColdPot", "Julienraptor01", "ADON15c", "catandA", "kevinthegreat1", "AzureAaron", "msg-programs", "lantice3720"],
   "contact": {
     "homepage": "https://hysky.de",
     "sources": "https://github.com/SkyblockerMod/Skyblocker",
@@ -29,10 +29,10 @@
     "skyblocker.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.14.19",
-    "fabric-api": ">=0.81.0+1.19.4",
+    "fabricloader": ">=0.14.21",
+    "fabric-api": ">=0.83.0+1.20",
     "cloth-config2": "*",
-    "minecraft": "~1.19.4"
+    "minecraft": "~1.20"
   },
   "custom": {
     "modmenu": {
diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json
index 6fa2596a..253e42d7 100644
--- a/src/main/resources/skyblocker.mixins.json
+++ b/src/main/resources/skyblocker.mixins.json
@@ -6,20 +6,19 @@
     "AccessorWorldRenderer",
     "ClientPlayerEntityMixin",
     "ClientPlayNetworkHandlerMixin",
+    "DrawContextMixin",
     "FarmlandBlockMixin",
     "GenericContainerScreenHandlerMixin",
     "HandledScreenAccessor",
     "HandledScreenMixin",
     "InGameHudMixin",
     "InventoryScreenMixin",
-    "ItemRendererMixin",
     "LeverBlockMixin",
     "MinecraftClientMixin",
-    "RecipeBookWidgetAccessor",
-    "HandledScreenAccessor",
     "PlayerListHudAccessor",
     "PlayerListHudMixin",
-    "ScreenMixin"
+    "RecipeBookWidgetAccessor",
+    "accessor.BeaconBlockEntityRendererInvoker"
   ],
   "injectors": {
     "defaultRequire": 1