From 6f80c149e6a3c3d01ea14123198de4a78ac411d5 Mon Sep 17 00:00:00 2001 From: AViewFromTheTop <87103914+AViewFromTheTop@users.noreply.github.com> Date: Tue, 28 Nov 2023 23:19:31 -0500 Subject: [PATCH] only gargle bubbles if gargling is enabled --- CHANGELOG.md | 3 ++- .../wilderwild/mixin/sculk/SculkShriekerBlockEntityMixin.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12fff66e44..f2de5822dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,7 +29,7 @@ Bug Fixes & Changes - Removed the custom distance detection from Palm Crowns - Added Palm Crowns to tags it was missing from - Added a translation string for Coconut projectiles -- Fixed compatibility between Wilder Wild's stripped logs and Create +- Fixed compatibility between Wilder Wild's Stripped Logs and Create - Milkweed now plays a sound when rustled - Milkweed can now be sheared with a Dispenser @@ -49,6 +49,7 @@ Bug Fixes & Changes - Osseous Sculk will now cover their branches in Sculk Veins when its base is converted to Sculk - Increased the chances of larger Oseeous Sculk generating during worldgen +- Sculk Shriekers will now only create Sculk Bubbles underwater if the Shrieker Gargling config is enabled - Stone Chests will now interact with Redstone Comparators, outputting a signal based on how high their lid is lifted ([#319](https://github.com/FrozenBlock/WilderWild/issues/319)) - The config will now sync between server and client diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/sculk/SculkShriekerBlockEntityMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/sculk/SculkShriekerBlockEntityMixin.java index d84ece341b..2fa262b71a 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/sculk/SculkShriekerBlockEntityMixin.java +++ b/src/main/java/net/frozenblock/wilderwild/mixin/sculk/SculkShriekerBlockEntityMixin.java @@ -19,6 +19,7 @@ package net.frozenblock.wilderwild.mixin.sculk; import net.frozenblock.lib.math.api.AdvancedMath; +import net.frozenblock.wilderwild.config.BlockConfig; import net.frozenblock.wilderwild.misc.interfaces.SculkShriekerTickInterface; import net.frozenblock.wilderwild.networking.WilderNetworking; import net.frozenblock.wilderwild.registry.RegisterProperties; @@ -70,7 +71,7 @@ public abstract class SculkShriekerBlockEntityMixin implements SculkShriekerTick if (shrieker.getBlockState().getValue(RegisterProperties.SOULS_TAKEN) == 2) { info.cancel(); } else { - if (shrieker.getBlockState().getValue(BlockStateProperties.WATERLOGGED)) { + if (BlockConfig.get().shriekerGargling && shrieker.getBlockState().getValue(BlockStateProperties.WATERLOGGED)) { this.wilderWild$bubbles = 50; } }