diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinInGameHud.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinInGameHud.java index 21bbcbbd3..93a971209 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinInGameHud.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/hud/MixinInGameHud.java @@ -52,14 +52,14 @@ public abstract class MixinInGameHud { @Inject(method = "playBurstSound", at = @At("HEAD"), cancellable = true) private void disableBubblePopSound(int bubble, PlayerEntity player, int burstBubbles, CallbackInfo ci) { - if (VisualSettings.global().removeBubblePopSound.isEnabled()) { + if (VisualSettings.global().removeBubblePopSound.getValue()) { ci.cancel(); } } @WrapWithCondition(method = "renderAirBubbles", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIII)V", ordinal = 2)) private boolean disableEmptyBubbles(DrawContext instance, Function renderLayers, Identifier sprite, int x, int y, int width, int height) { - return !VisualSettings.global().hideEmptyBubbleIcons.isEnabled(); + return !VisualSettings.global().hideEmptyBubbleIcons.getValue(); } @Redirect(method = "renderCrosshair", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/option/Perspective;isFirstPerson()Z")) diff --git a/src/main/java/de/florianmichael/viafabricplus/settings/impl/VisualSettings.java b/src/main/java/de/florianmichael/viafabricplus/settings/impl/VisualSettings.java index 48afc9100..5230a2ab3 100644 --- a/src/main/java/de/florianmichael/viafabricplus/settings/impl/VisualSettings.java +++ b/src/main/java/de/florianmichael/viafabricplus/settings/impl/VisualSettings.java @@ -40,7 +40,6 @@ public class VisualSettings extends SettingGroup { Text.translatable("base.viafabricplus.off") ); public final BooleanSetting filterNonExistingGlyphs = new BooleanSetting(this, Text.translatable("visual_settings.viafabricplus.filter_non_existing_glyphs"), true) { - @Override public void onValueChanged() { final MinecraftClient client = MinecraftClient.getInstance(); @@ -54,9 +53,9 @@ public void onValueChanged() { }; public final BooleanSetting hideModernJigsawScreenFeatures = new BooleanSetting(this, Text.translatable("visual_settings.viafabricplus.hide_modern_jigsaw_screen_features"), true); - // 1.21.2 -> 1.21.1 - public final VersionedBooleanSetting removeBubblePopSound = new VersionedBooleanSetting(this, Text.translatable("visual_settings.viafabricplus.remove_bubble_pop_sound"), VersionRange.andOlder(ProtocolVersion.v1_21)); - public final VersionedBooleanSetting hideEmptyBubbleIcons = new VersionedBooleanSetting(this, Text.translatable("visual_settings.viafabricplus.hide_empty_bubble_icons"), VersionRange.andOlder(ProtocolVersion.v1_21)); + public final BooleanSetting removeBubblePopSound = new BooleanSetting(this, Text.translatable("visual_settings.viafabricplus.remove_bubble_pop_sound"), false); + + public final BooleanSetting hideEmptyBubbleIcons = new BooleanSetting(this, Text.translatable("visual_settings.viafabricplus.hide_empty_bubble_icons"), false); // 1.21 -> 1.20.5 public final VersionedBooleanSetting hideDownloadTerrainScreenTransitionEffects = new VersionedBooleanSetting(this, Text.translatable("visual_settings.viafabricplus.hide_download_terrain_screen_transition_effects"), VersionRange.andOlder(ProtocolVersion.v1_20_5));