Update to 1.21.5

Author: lowercasebtw

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.10-SNAPSHOT'
+    id 'fabric-loom' version "${loom_version}"
     id 'maven-publish'
     id "com.diffplug.spotless" version "7.0.2"
 }
@@ -37,11 +37,13 @@ dependencies {
     // Fabric API - Needs to be specified, otherwise an older version might be defaulted and cause issues.
     modImplementation("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
 
-    // YACL - TO BE REPLACED WITH LIGHTCONFIG
-    modImplementation("dev.isxander:yet-another-config-lib:${project.yacl_version}")
-
     // Animatium
-    modImplementation(files("./jars/animatium-${project.animatium_version}-${project.animatium_commit}.jar"))
+    modImplementation(files("./jars/animatium-${project.animatium_ext}.jar"))
+
+    // YACL - TO BE REPLACED WITH LIGHTCONFIG
+    modImplementation("dev.isxander:yet-another-config-lib:${project.yacl_version}") {
+        exclude group: 'net.fabricmc.fabric-api'
+    }
 
     // Mod Menu
     modImplementation("com.terraformersmc:modmenu:${project.modmenu_version}") {

gradle.properties

@@ -4,15 +4,15 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.4
-loader_version=0.16.10
+minecraft_version=1.21.5
+loader_version=0.16.14
+loom_version=1.10-SNAPSHOT
 
 # Dependencies
-fabric_version=0.119.0+1.21.4
-yacl_version=3.6.2+1.21.4-fabric
-modmenu_version=13.0.1
-animatium_version=2.0
-animatium_commit=458a0c5
+fabric_version=0.123.2+1.21.5
+yacl_version=3.6.6+1.21.5-fabric
+modmenu_version=14.0.0-rc.2
+animatium_ext=2.3+mc1.21.5
 
 # Mod Properties
 mod_version=1.0

src/main/java/btw/lowercase/animatium_extras/mixins/animatium/command/MixinAnimatiumCommand.java

@@ -32,12 +32,12 @@
 
 @Mixin(AnimatiumCommand.class)
 public abstract class MixinAnimatiumCommand {
-    @Inject(method = "lambda$register$2", at = @At(value = "INVOKE", target = "Lnet/fabricmc/fabric/api/client/command/v2/FabricClientCommandSource;sendFeedback(Lnet/minecraft/network/chat/Component;)V", shift = At.Shift.AFTER))
+    @Inject(method = "lambda$create$2", at = @At(value = "INVOKE", target = "Lnet/fabricmc/fabric/api/client/command/v2/FabricClientCommandSource;sendFeedback(Lnet/minecraft/network/chat/Component;)V", ordinal = 1, shift = At.Shift.AFTER))
     private static void animatium_extras$reloadOverlayTexture$onCommand(CommandContext<?> context, CallbackInfoReturnable<Integer> cir) {
         AnimatiumExtrasClient.SHOULD_RELOAD_OVERLAY_TEXTURE = true;
     }
 
-    @Inject(method = "lambda$register$3", at = @At(value = "INVOKE", target = "Lnet/fabricmc/fabric/api/client/command/v2/FabricClientCommandSource;sendFeedback(Lnet/minecraft/network/chat/Component;)V", shift = At.Shift.AFTER))
+    @Inject(method = "lambda$create$3", at = @At(value = "INVOKE", target = "Lnet/fabricmc/fabric/api/client/command/v2/FabricClientCommandSource;sendFeedback(Lnet/minecraft/network/chat/Component;)V", ordinal = 1, shift = At.Shift.AFTER))
     private static void animatium_extras$reloadOverlayTexture$offCommand(CommandContext<?> context, CallbackInfoReturnable<Integer> cir) {
         AnimatiumExtrasClient.SHOULD_RELOAD_OVERLAY_TEXTURE = true;
     }

src/main/java/btw/lowercase/animatium_extras/mixins/level/entity/MixinPlayer.java

@@ -31,7 +31,7 @@
 
 @Mixin(Player.class)
 public abstract class MixinPlayer {
-    @ModifyExpressionValue(method = "attack", at = @At(value = "CONSTANT", args = "floatValue=0.0", ordinal = 6))
+    @ModifyExpressionValue(method = "attack", at = @At(value = "CONSTANT", args = "floatValue=0.0", ordinal = 5))
     private float animatium_extras$alwaysShowSharpParticles(float original) {
         if (AnimatiumClient.isEnabled() && AnimatiumExtrasConfig.instance().alwaysSharpParticles) {
             return -1.0F;

…asts/MixinToastManagerToastInstance.java …components/toasts/MixinToastManager.javasrc/main/java/btw/lowercase/animatium_extras/mixins/screen/components/toasts/MixinToastManagerToastInstance.java renamed to src/main/java/btw/lowercase/animatium_extras/mixins/screen/components/toasts/MixinToastManager.java src/main/java/btw/lowercase/animatium_extras/mixins/screen/components/toasts/MixinToastManagerToastInstance.java renamed to src/main/java/btw/lowercase/animatium_extras/mixins/screen/components/toasts/MixinToastManager.java

@@ -26,24 +26,20 @@
 import btw.lowercase.animatium_extras.config.AnimatiumExtrasConfig;
 import btw.mixces.animatium.AnimatiumClient;
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
+import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.client.gui.components.toasts.RecipeToast;
 import net.minecraft.client.gui.components.toasts.Toast;
 import net.minecraft.client.gui.components.toasts.ToastManager;
 import net.minecraft.client.gui.components.toasts.TutorialToast;
 import net.minecraft.client.sounds.SoundManager;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 
-@Mixin(ToastManager.ToastInstance.class)
-public abstract class MixinToastManagerToastInstance<T extends Toast> {
-    @Shadow
-    @Final
-    private T toast;
-
-    @WrapWithCondition(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/components/toasts/Toast$Visibility;playSound(Lnet/minecraft/client/sounds/SoundManager;)V"))
-    private boolean animatium_extras$recipeAndTutorialToasts(Toast.Visibility instance, SoundManager soundManager) {
-        return !AnimatiumClient.isEnabled() || !AnimatiumExtrasConfig.instance().recipeAndTutorialToasts || (!(this.toast instanceof RecipeToast) && !(this.toast instanceof TutorialToast));
+@Mixin(ToastManager.class)
+public abstract class MixinToastManager {
+    @WrapWithCondition(method = "method_61991", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/components/toasts/Toast$Visibility;playSound(Lnet/minecraft/client/sounds/SoundManager;)V"))
+    private boolean animatium_extras$recipeAndTutorialToasts(Toast.Visibility instance, SoundManager soundManager, @Local(argsOnly = true) ToastManager.ToastInstance<?> toastInstance) {
+        final Toast toast = toastInstance.getToast();
+        return !AnimatiumClient.isEnabled() || !AnimatiumExtrasConfig.instance().recipeAndTutorialToasts || (!(toast instanceof RecipeToast) && !(toast instanceof TutorialToast));
     }
 }

src/main/resources/animatium_extras.mixins.json

@@ -16,7 +16,7 @@
 		"screen.components.MixinChatComponent",
 		"screen.components.MixinDebugScreenOverlay",
 		"screen.components.toasts.MixinRecipeToast",
-		"screen.components.toasts.MixinToastManagerToastInstance",
+		"screen.components.toasts.MixinToastManager",
 		"screen.components.toasts.MixinTutorialToast",
 		"animatium.command.MixinAnimatiumCommand",
 		"animatium.util.MixinPlayerUtils",

src/main/resources/fabric.mod.json

@@ -40,8 +40,8 @@
 	],
 	"depends": {
 		"fabricloader": ">=0.16.7",
-		"minecraft": ">=1.21.4 <1.21.5",
-		"yet_another_config_lib_v3": ">=3.6.2",
+		"minecraft": ">=1.21.5 <1.21.6",
+		"yet_another_config_lib_v3": ">=3.6.4",
 		"animatium": "*",
 		"fabric-api": "*"
 	},