From 5db74864e574e2f215744628ab6355afa1144168 Mon Sep 17 00:00:00 2001 From: Madis Date: Sat, 18 Nov 2023 19:18:04 +0100 Subject: [PATCH 1/3] Update IrisSodiumOptions.java --- .../iris/compat/sodium/impl/options/IrisSodiumOptions.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sodiumCompatibility/java/net/coderbot/iris/compat/sodium/impl/options/IrisSodiumOptions.java b/src/sodiumCompatibility/java/net/coderbot/iris/compat/sodium/impl/options/IrisSodiumOptions.java index 300f8635b4..537393c022 100644 --- a/src/sodiumCompatibility/java/net/coderbot/iris/compat/sodium/impl/options/IrisSodiumOptions.java +++ b/src/sodiumCompatibility/java/net/coderbot/iris/compat/sodium/impl/options/IrisSodiumOptions.java @@ -22,7 +22,7 @@ public static OptionImpl createMaxShadowDistanceSlider(Minecra OptionImpl maxShadowDistanceSlider = OptionImpl.createBuilder(int.class, vanillaOpts) .setName(new TranslatableComponent("options.iris.shadowDistance")) .setTooltip(new TranslatableComponent("options.iris.shadowDistance.sodium_tooltip")) - .setControl(option -> new SliderControl(option, 0, 32, 1, ControlValueFormatter.quantityOrDisabled("Chunks", "Disabled"))) + .setControl(option -> new SliderControl(option, 0, 32, 1, ControlValueFormatter.quantityOrDisabled(Text.translatable("options.chunks", "placeholder").getString().replace("placeholder ", ""), Text.translatable("options.off").getString()))) .setBinding((options, value) -> { IrisVideoSettings.shadowDistance = value; try { @@ -70,7 +70,7 @@ public static OptionImpl createLimitedVideoSetti // TODO: State that Fabulous Graphics is incompatible with Shader Packs in the tooltip .setTooltip(new TranslatableComponent("sodium.options.graphics_quality.tooltip")) .setControl(option -> new CyclingControl<>(option, SupportedGraphicsMode.class, - new Component[] { new TextComponent("Fast"), new TextComponent("Fancy") })) + new Component[] { Component.literal(Text.translatable("options.graphics.fast").getString()), Component.literal(Text.translatable("options.graphics.fancy").getString()) })) .setBinding( (opts, value) -> opts.graphicsMode = value.toVanilla(), opts -> SupportedGraphicsMode.fromVanilla(opts.graphicsMode)) From fb44864237bf1844006a3f1e1e4d856c41dd44b9 Mon Sep 17 00:00:00 2001 From: Madis Date: Sat, 18 Nov 2023 19:27:28 +0100 Subject: [PATCH 2/3] 1.18 style --- .../iris/compat/sodium/impl/options/IrisSodiumOptions.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sodiumCompatibility/java/net/coderbot/iris/compat/sodium/impl/options/IrisSodiumOptions.java b/src/sodiumCompatibility/java/net/coderbot/iris/compat/sodium/impl/options/IrisSodiumOptions.java index 537393c022..a81cbd8e20 100644 --- a/src/sodiumCompatibility/java/net/coderbot/iris/compat/sodium/impl/options/IrisSodiumOptions.java +++ b/src/sodiumCompatibility/java/net/coderbot/iris/compat/sodium/impl/options/IrisSodiumOptions.java @@ -22,7 +22,7 @@ public static OptionImpl createMaxShadowDistanceSlider(Minecra OptionImpl maxShadowDistanceSlider = OptionImpl.createBuilder(int.class, vanillaOpts) .setName(new TranslatableComponent("options.iris.shadowDistance")) .setTooltip(new TranslatableComponent("options.iris.shadowDistance.sodium_tooltip")) - .setControl(option -> new SliderControl(option, 0, 32, 1, ControlValueFormatter.quantityOrDisabled(Text.translatable("options.chunks", "placeholder").getString().replace("placeholder ", ""), Text.translatable("options.off").getString()))) + .setControl(option -> new SliderControl(option, 0, 32, 1, ControlValueFormatter.quantityOrDisabled(new TranslatableText("options.chunks", "placeholder").getString().replace("placeholder ", ""), new TranslatableText("options.off").getString()))) .setBinding((options, value) -> { IrisVideoSettings.shadowDistance = value; try { @@ -70,7 +70,7 @@ public static OptionImpl createLimitedVideoSetti // TODO: State that Fabulous Graphics is incompatible with Shader Packs in the tooltip .setTooltip(new TranslatableComponent("sodium.options.graphics_quality.tooltip")) .setControl(option -> new CyclingControl<>(option, SupportedGraphicsMode.class, - new Component[] { Component.literal(Text.translatable("options.graphics.fast").getString()), Component.literal(Text.translatable("options.graphics.fancy").getString()) })) + new Component[] { Component.literal(new TranslatableText("options.graphics.fast").getString()), Component.literal(new TranslatableText("options.graphics.fancy").getString()) })) .setBinding( (opts, value) -> opts.graphicsMode = value.toVanilla(), opts -> SupportedGraphicsMode.fromVanilla(opts.graphicsMode)) From 28a4e9ae3080773f5007ff8632ad19bc3a07d9ab Mon Sep 17 00:00:00 2001 From: Madis Date: Sat, 18 Nov 2023 19:42:08 +0100 Subject: [PATCH 3/3] Fix --- .../iris/compat/sodium/impl/options/IrisSodiumOptions.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sodiumCompatibility/java/net/coderbot/iris/compat/sodium/impl/options/IrisSodiumOptions.java b/src/sodiumCompatibility/java/net/coderbot/iris/compat/sodium/impl/options/IrisSodiumOptions.java index a81cbd8e20..0ee78a0fc5 100644 --- a/src/sodiumCompatibility/java/net/coderbot/iris/compat/sodium/impl/options/IrisSodiumOptions.java +++ b/src/sodiumCompatibility/java/net/coderbot/iris/compat/sodium/impl/options/IrisSodiumOptions.java @@ -22,7 +22,7 @@ public static OptionImpl createMaxShadowDistanceSlider(Minecra OptionImpl maxShadowDistanceSlider = OptionImpl.createBuilder(int.class, vanillaOpts) .setName(new TranslatableComponent("options.iris.shadowDistance")) .setTooltip(new TranslatableComponent("options.iris.shadowDistance.sodium_tooltip")) - .setControl(option -> new SliderControl(option, 0, 32, 1, ControlValueFormatter.quantityOrDisabled(new TranslatableText("options.chunks", "placeholder").getString().replace("placeholder ", ""), new TranslatableText("options.off").getString()))) + .setControl(option -> new SliderControl(option, 0, 32, 1, ControlValueFormatter.quantityOrDisabled(new TranslatableTextContent("options.chunks", "placeholder").getString().replace("placeholder ", ""), new TranslatableTextContent("options.off").getString()))) .setBinding((options, value) -> { IrisVideoSettings.shadowDistance = value; try { @@ -70,7 +70,7 @@ public static OptionImpl createLimitedVideoSetti // TODO: State that Fabulous Graphics is incompatible with Shader Packs in the tooltip .setTooltip(new TranslatableComponent("sodium.options.graphics_quality.tooltip")) .setControl(option -> new CyclingControl<>(option, SupportedGraphicsMode.class, - new Component[] { Component.literal(new TranslatableText("options.graphics.fast").getString()), Component.literal(new TranslatableText("options.graphics.fancy").getString()) })) + new Component[] { Component.literal(new TranslatableTextContent("options.graphics.fast").getString()), Component.literal(new TranslatableTextContent("options.graphics.fancy").getString()) })) .setBinding( (opts, value) -> opts.graphicsMode = value.toVanilla(), opts -> SupportedGraphicsMode.fromVanilla(opts.graphicsMode))