Merge branch 'refs/heads/1.20.4' into 1.20.2

CHANGELOG.md

@@ -3,10 +3,4 @@ Thank you!
 
 -----------------
 
-- Fixed Shelf Fungi crashing the game upon being interacted with on 1.20.2 and 1.20.1.
-- Removed the sound events for the previously removed discs.
-- Ostrich attacks can now damage and break Armor Stands.
-- Fixed the death message from an Ostrich's attack not displaying properly.
-- Fixed shears not snipping Glory of the Snow blocks
-- Cleaned up `SonicBoomMixin`
-- Updated zh_CN (Simplified Chinese) translation (Thanks to ioococ)
+- Fixed Warden related crash on 1.20.1-1.20.4

gradle.properties

@@ -17,7 +17,7 @@
 
 # Mod Properties
 	mod_id = wilderwild
-	mod_version = 2.3.1
+	mod_version = 2.3.2
     # protocol version must be changed after each update with dual env changes
     protocol_version = 3
 	mod_loader = Fabric

src/main/java/net/frozenblock/wilderwild/mixin/warden/SonicBoomMixin.java

@@ -65,10 +65,10 @@ public class SonicBoomMixin implements WilderSonicBoom {
 			value = "INVOKE",
 			target = "Lnet/minecraft/server/level/ServerLevel;sendParticles(Lnet/minecraft/core/particles/ParticleOptions;DDDIDDDD)I"
 		),
-		ordinal = 1
+		ordinal = 0
 	)
-	private static int wilderWild$modifyInt(int original, @Local(ordinal = 0) int particleEnd) {
-		return ((WilderSonicBoom) wilderWild$currentBoom).wilderWild$particlesEnded() ? particleEnd : original;
+	private static int wilderWild$modifyInt(int original, @Local(ordinal = 1) Vec3 positionOffset) {
+		return ((WilderSonicBoom) wilderWild$currentBoom).wilderWild$particlesEnded() ? Integer.MAX_VALUE : original;
 	}
 
 	@Inject(
@@ -80,7 +80,7 @@ public class SonicBoomMixin implements WilderSonicBoom {
 		),
 		locals = LocalCapture.CAPTURE_FAILHARD
 	)
-	private static void wilderWild$stopParticles(Warden warden, ServerLevel serverLevel, LivingEntity livingEntity, CallbackInfo info, Vec3 vec3, Vec3 vec32, Vec3 vec33, int i, int j, Vec3 vec34) {
+	private static void wilderWild$stopParticles(Warden warden, ServerLevel serverLevel, LivingEntity livingEntity, CallbackInfo info, Vec3 vec3, Vec3 vec32, Vec3 vec33, int i, Vec3 vec34) {
 		BlockPos hitPos = wilderWild$isOccluded(serverLevel, vec3, vec34);
 		if (hitPos != null) {
 			((WilderSonicBoom) wilderWild$currentBoom).wilderWild$endParticles();