Merge pull request #669 from SkyblockerMod/1.20.5

1.20.5 & 1.20.6

4 files changed, 27 insertions, 24 deletions

diff --git a/src/main/resources/assets/skyblocker/lang/en_ca.json b/src/main/resources/assets/skyblocker/lang/en_ca.json
index b7a6450f..5d8afbe9 100644
--- a/src/main/resources/assets/skyblocker/lang/en_ca.json
+++ b/src/main/resources/assets/skyblocker/lang/en_ca.json
@@ -41,5 +41,6 @@
     "skyblocker.bars.config.defense": "Defence",
     "skyblocker.bars.config.mainColor": "Main Colour",
     "skyblocker.bars.config.overflowColor": "Overflow Colour",
-    "skyblocker.bars.config.textColor": "Text Colour"
+    "skyblocker.bars.config.textColor": "Text Colour",
+    "skyblocker.debug.toggledShowingInvisibleArmorStands": "Toggled showing invisible armour stands to %s"
 }
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index 96d3d6d8..53b66257 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -195,6 +195,7 @@
   "text.autoconfig.skyblocker.option.quickNav.button.item.itemName": "Item ID",
   "text.autoconfig.skyblocker.option.quickNav.button.item.count": "Item Count",
   "text.autoconfig.skyblocker.option.quickNav.button.item.nbt": "NBT",
+  "text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip": "§c§lWARNING: THIS MUST BE CONFIGURED WITH ITEM NBT NOT ITEM COMPONENTS! \n\n§fIn the future we will automatically migrate your config to use item components!",
   "text.autoconfig.skyblocker.option.quickNav.button.uiTitle": "UI Title",
   "text.autoconfig.skyblocker.option.quickNav.button.clickEvent": "Click event",
 
@@ -490,6 +491,8 @@
   "text.autoconfig.skyblocker.option.general.dontStripSkinAlphaValues": "Correct Transparent Skin Pixels",
   "text.autoconfig.skyblocker.option.general.dontStripSkinAlphaValues.@Tooltip": "When enabled, the alpha values of pixels in skin textures are no longer stripped while in Skyblock.\n\nThis results in the \"filler\" pixels on items using Player Heads to now be completely transparent, although this may have some side effects in odd cases.",
 
+  "skyblocker.debug.toggledShowingInvisibleArmorStands": "Toggled showing invisible armor stands to %s",
+
   "skyblocker.bars.config.health": "Health",
   "skyblocker.bars.config.defense": "Defense",
   "skyblocker.bars.config.intelligence": "Intelligence",
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index dd6c2cd4..645eda34 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -33,13 +33,14 @@
   ],
   "accessWidener": "skyblocker.accesswidener",
   "depends": {
-    "fabricloader": ">=0.15.0",
-    "fabric-api": ">=0.92.0+1.20.4",
-    "yet_another_config_lib_v3": ">=3.3.2+1.20.4",
-    "minecraft": "~1.20.3"
+    "fabricloader": ">=0.15.10",
+    "fabric-api": ">=0.97.8+1.20.6",
+    "yet_another_config_lib_v3": ">=3.4.1+1.20.5",
+    "minecraft": "~1.20.5",
+    "java": ">=21"
   },
   "conflicts": {
-    "immediatelyfast": "<=1.2.11+1.20.4"
+    "immediatelyfast": "<=1.2.12+1.20.5"
   },
   "breaks": {
     "forcecloseworldloadingscreen": "<=2.2.0"
diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json
index 8169c0c4..0032a557 100644
--- a/src/main/resources/skyblocker.mixins.json
+++ b/src/main/resources/skyblocker.mixins.json
@@ -1,18 +1,18 @@
 {
   "required": true,
-  "package": "de.hysky.skyblocker.mixin",
+  "package": "de.hysky.skyblocker.mixins",
   "plugin": "de.hysky.skyblocker.compatibility.MixinPlugin",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "client": [
     "AbstractInventoryScreenMixin",
-    "ArmorTrimMixin",
     "BatEntityMixin",
     "ClientPlayerEntityMixin",
     "ClientPlayNetworkHandlerMixin",
     "CommandTreeS2CPacketMixin",
+    "ComponentHolderMixin",
     "DataTrackerMixin",
     "DrawContextMixin",
-    "DyeableItemMixin",
+    "DyedColorComponentMixin",
     "EntityRenderDispatcherMixin",
     "FarmlandBlockMixin",
     "GenericContainerScreenHandlerMixin",
@@ -21,7 +21,6 @@
     "InGameHudMixin",
     "InGameOverlayRendererMixin",
     "InventoryScreenMixin",
-    "ItemMixin",
     "ItemStackMixin",
     "LeverBlockMixin",
     "LivingEntityRendererMixin",
@@ -38,19 +37,18 @@
     "WorldRendererMixin",
     "YggdrasilMinecraftSessionServiceMixin",
     "YggdrasilServicesKeyInfoMixin",
-    "accessor.BeaconBlockEntityRendererInvoker",
-    "accessor.DrawContextInvoker",
-    "accessor.EndermanEntityAccessor",
-    "accessor.FrustumInvoker",
-    "accessor.HandledScreenAccessor",
-    "accessor.ItemStackAccessor",
-    "accessor.MessageHandlerAccessor",
-    "accessor.PlayerListHudAccessor",
-    "accessor.RecipeBookWidgetAccessor",
-    "accessor.ScreenAccessor",
-    "accessor.SkullBlockEntityAccessor",
-    "accessor.SlotAccessor",
-    "accessor.WorldRendererAccessor",
+    "accessors.BeaconBlockEntityRendererInvoker",
+    "accessors.DrawContextInvoker",
+    "accessors.EndermanEntityAccessor",
+    "accessors.FrustumInvoker",
+    "accessors.HandledScreenAccessor",
+    "accessors.MessageHandlerAccessor",
+    "accessors.PlayerListHudAccessor",
+    "accessors.RecipeBookWidgetAccessor",
+    "accessors.ScreenAccessor",
+    "accessors.SkullBlockEntityAccessor",
+    "accessors.SlotAccessor",
+    "accessors.WorldRendererAccessor",
     "discordipc.ConnectionMixin"
   ],
   "injectors": {