24w07a & Mixin Extras update

9 files changed, 13 insertions, 14 deletions

diff --git a/gradle.properties b/gradle.properties
index a9c66d48..9543d5cc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,13 +3,13 @@ org.gradle.parallel=true
 
 # Fabric Properties (https://fabricmc.net/versions.html)
 ## 1.20
-minecraft_version=24w05b
-yarn_mappings=24w05b+build.2
-loader_version=0.15.6
+minecraft_version=24w07a
+yarn_mappings=24w07a+build.4
+loader_version=0.15.7
 
 #Fabric api
 ## 1.20
-fabric_api_version=0.95.5+1.20.5
+fabric_api_version=0.96.2+1.20.5
 
 # Minecraft Mods
 ## YACL (https://github.com/isXander/YetAnotherConfigLib)
diff --git a/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java
index 743f949f..b3471972 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java
@@ -1,7 +1,7 @@
 package de.hysky.skyblocker.mixin;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import com.llamalad7.mixinextras.injector.WrapWithCondition;
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.llamalad7.mixinextras.sugar.Local;
 import de.hysky.skyblocker.skyblock.FishingHelper;
 import de.hysky.skyblocker.skyblock.dungeon.DungeonScore;
diff --git a/src/main/java/de/hysky/skyblocker/mixin/FarmlandBlockMixin.java b/src/main/java/de/hysky/skyblocker/mixin/FarmlandBlockMixin.java
index dfa886c4..84467c9b 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/FarmlandBlockMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/FarmlandBlockMixin.java
@@ -30,7 +30,6 @@ public abstract class FarmlandBlockMixin extends Block {
         return Utils.isOnSkyblock() && SkyblockerConfigManager.get().general.hitbox.oldFarmlandHitbox ? VoxelShapes.fullCube() : original;
     }
 
-    @SuppressWarnings("deprecation")
     @Override
     public VoxelShape getCullingShape(BlockState state, BlockView world, BlockPos pos) {
         return SHAPE;
diff --git a/src/main/java/de/hysky/skyblocker/mixin/PlayerSkinProviderMixin.java b/src/main/java/de/hysky/skyblocker/mixin/PlayerSkinProviderMixin.java
index dd38e15a..b6c44072 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/PlayerSkinProviderMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/PlayerSkinProviderMixin.java
@@ -4,7 +4,7 @@ import org.slf4j.Logger;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
-import com.llamalad7.mixinextras.injector.WrapWithCondition;
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 
 import de.hysky.skyblocker.utils.Utils;
 
diff --git a/src/main/java/de/hysky/skyblocker/mixin/PlayerSkinTextureMixin.java b/src/main/java/de/hysky/skyblocker/mixin/PlayerSkinTextureMixin.java
index 50f478b8..44f39d21 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/PlayerSkinTextureMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/PlayerSkinTextureMixin.java
@@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import com.llamalad7.mixinextras.injector.WrapWithCondition;
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.skyblock.item.PlayerHeadHashCache;
diff --git a/src/main/java/de/hysky/skyblocker/mixin/ScoreboardMixin.java b/src/main/java/de/hysky/skyblocker/mixin/ScoreboardMixin.java
index 2cfb658a..40b6995a 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/ScoreboardMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/ScoreboardMixin.java
@@ -1,6 +1,6 @@
 package de.hysky.skyblocker.mixin;
 
-import com.llamalad7.mixinextras.injector.WrapWithCondition;
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import de.hysky.skyblocker.utils.Utils;
 import net.minecraft.scoreboard.Scoreboard;
 import org.slf4j.Logger;
diff --git a/src/main/java/de/hysky/skyblocker/mixin/YggdrasilMinecraftSessionServiceMixin.java b/src/main/java/de/hysky/skyblocker/mixin/YggdrasilMinecraftSessionServiceMixin.java
index 47c8780f..d6863b18 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/YggdrasilMinecraftSessionServiceMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/YggdrasilMinecraftSessionServiceMixin.java
@@ -4,7 +4,7 @@ import org.slf4j.Logger;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
-import com.llamalad7.mixinextras.injector.WrapWithCondition;
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService;
 
 import de.hysky.skyblocker.utils.Utils;
diff --git a/src/main/java/de/hysky/skyblocker/mixin/YggdrasilServicesKeyInfoMixin.java b/src/main/java/de/hysky/skyblocker/mixin/YggdrasilServicesKeyInfoMixin.java
index 78c4bac1..5df018e4 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/YggdrasilServicesKeyInfoMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/YggdrasilServicesKeyInfoMixin.java
@@ -1,6 +1,6 @@
 package de.hysky.skyblocker.mixin;
 
-import com.llamalad7.mixinextras.injector.WrapWithCondition;
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.mojang.authlib.yggdrasil.YggdrasilServicesKeyInfo;
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index f45a6a91..451cd684 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -33,10 +33,10 @@
   ],
   "accessWidener": "skyblocker.accesswidener",
   "depends": {
-    "fabricloader": ">=0.15.6",
-    "fabric-api": ">=0.95.5+1.20.5",
+    "fabricloader": ">=0.15.7",
+    "fabric-api": ">=0.96.2+1.20.5",
     "yet_another_config_lib_v3": ">=3.3.2+1.20.4",
-    "minecraft": "~1.20.5-alpha.24.5.a"
+    "minecraft": "~1.20.5-alpha.24.7.a"
   },
   "conflicts": {
     "immediatelyfast": "<=1.2.11+1.20.4"