diff --git a/src/main/java/net/frozenblock/wilderwild/entity/Butterfly.java b/src/main/java/net/frozenblock/wilderwild/entity/Butterfly.java index c984557f65..33352f5fe5 100644 --- a/src/main/java/net/frozenblock/wilderwild/entity/Butterfly.java +++ b/src/main/java/net/frozenblock/wilderwild/entity/Butterfly.java @@ -379,7 +379,7 @@ public void tick() { } if (this.level() instanceof ServerLevel serverLevel) { - Vec3 wind = WindManager.getOrCreateWindManager(serverLevel).getWindMovement(this.position(), 1D, 100D, 100D, serverLevel).scale(0.01D); + Vec3 wind = WindManager.getOrCreateWindManager(serverLevel).getWindMovement(this.position(), 1D, 100D, 100D).scale(0.01D); wind = wind.subtract(0D, wind.y * 0.7D, 0D); this.setDeltaMovement(this.getDeltaMovement().add(wind.scale(0.02D))); } diff --git a/src/main/java/net/frozenblock/wilderwild/entity/Firefly.java b/src/main/java/net/frozenblock/wilderwild/entity/Firefly.java index 428646c23a..5f88e13369 100644 --- a/src/main/java/net/frozenblock/wilderwild/entity/Firefly.java +++ b/src/main/java/net/frozenblock/wilderwild/entity/Firefly.java @@ -479,7 +479,7 @@ public void tick() { } if (this.level() instanceof ServerLevel serverLevel) { - Vec3 wind = WindManager.getOrCreateWindManager(serverLevel).getWindMovement(this.position(), 1D, 100D, 100D, serverLevel).scale(0.01D); + Vec3 wind = WindManager.getOrCreateWindManager(serverLevel).getWindMovement(this.position(), 1D, 100D, 100D).scale(0.01D); wind = wind.subtract(0D, wind.y * 0.7D, 0D); this.setDeltaMovement(this.getDeltaMovement().add(wind.scale(0.02D))); } diff --git a/src/main/java/net/frozenblock/wilderwild/entity/Tumbleweed.java b/src/main/java/net/frozenblock/wilderwild/entity/Tumbleweed.java index 438601c536..0aa649b9d9 100644 --- a/src/main/java/net/frozenblock/wilderwild/entity/Tumbleweed.java +++ b/src/main/java/net/frozenblock/wilderwild/entity/Tumbleweed.java @@ -278,7 +278,7 @@ private void moveWithWind(@NotNull ServerLevel serverLevel, double brightness, @ if (!(this.isTouchingStoppingBlock || this.isTouchingStickingBlock)) { Vec3 deltaMovement = this.getDeltaMovement(); WindManager windManager = WindManager.getOrCreateWindManager(serverLevel); - Vec3 windVec = windManager.getWindMovement(this.position(), WIND_MULTIPLIER, WIND_CLAMP, serverLevel).scale(this.wasTouchingWater ? 0.16777216D : 1D); + Vec3 windVec = windManager.getWindMovement(this.position(), WIND_MULTIPLIER, WIND_CLAMP).scale(this.wasTouchingWater ? 0.16777216D : 1D); double multiplier = (Math.max((brightness - (Math.max(15 - brightness, 0))), 0) * 0.0667D) * (this.wasTouchingWater ? 0.16777216D : 1D); deltaMovement = deltaMovement.add((windVec.x * 0.2D), 0D, (windVec.z * 0.2D)); deltaMovement = new Vec3(deltaMovement.x, deltaMovement.y < 0 ? deltaMovement.y * 0.88D : deltaMovement.y, deltaMovement.z); diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/entity/firework_rocket/FireworkRocketEntityMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/entity/firework_rocket/FireworkRocketEntityMixin.java index 836ea7f7b3..31781cffd3 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/entity/firework_rocket/FireworkRocketEntityMixin.java +++ b/src/main/java/net/frozenblock/wilderwild/mixin/entity/firework_rocket/FireworkRocketEntityMixin.java @@ -52,7 +52,7 @@ public class FireworkRocketEntityMixin { private void wilderWild$moveWithWind(FireworkRocketEntity instance, Vec3 vec3, Operation operation) { if (FireworkRocketEntity.class.cast(this).level() instanceof ServerLevel serverLevel) { double intensity = (Math.max(1, (double) (this.lifetime - this.life)) / Math.max(1, this.lifetime)) * 0.5D; - Vec3 wind = WindManager.getOrCreateWindManager(serverLevel).getWindMovement(BlockPos.containing(instance.getX(), instance.getY(), instance.getZ()), intensity, serverLevel) + Vec3 wind = WindManager.getOrCreateWindManager(serverLevel).getWindMovement(BlockPos.containing(instance.getX(), instance.getY(), instance.getZ()), intensity) .scale(WWAmbienceAndMiscConfig.getFireworkWindIntensity()); vec3 = vec3.add(wind.x() * 0.001D, wind.y() * 0.00005D, wind.z() * 0.001D); }