From 0935c49b8432f80350b4dd6c5a4d29e7626ccff7 Mon Sep 17 00:00:00 2001 From: SHsuperCM Date: Fri, 10 Jun 2022 08:57:05 +0300 Subject: Updated target version to 1.19 Using combined input from PRs #152 and #155 Thank you so much for your help @HarvelsX and @MeeniMc Co-Authored-By: MeeniMc <68366846+MeeniMC@users.noreply.github.com> Co-Authored-By: HarvelsX <90945793+harvelsx@users.noreply.github.com> --- .../config/CITResewnConfigScreenFactory.java | 37 +++++++++++----------- 1 file changed, 18 insertions(+), 19 deletions(-) (limited to 'src/main/java/shcm/shsupercm/fabric/citresewn/config') diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/config/CITResewnConfigScreenFactory.java b/src/main/java/shcm/shsupercm/fabric/citresewn/config/CITResewnConfigScreenFactory.java index c1c35b2..d00e9b0 100644 --- a/src/main/java/shcm/shsupercm/fabric/citresewn/config/CITResewnConfigScreenFactory.java +++ b/src/main/java/shcm/shsupercm/fabric/citresewn/config/CITResewnConfigScreenFactory.java @@ -6,8 +6,7 @@ import me.shedaniel.clothconfig2.api.ConfigEntryBuilder; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.text.LiteralText; -import net.minecraft.text.TranslatableText; +import net.minecraft.text.Text; import net.minecraft.util.Formatting; import java.util.function.Function; @@ -33,14 +32,14 @@ public class CITResewnConfigScreenFactory { ConfigBuilder builder = ConfigBuilder.create() .setParentScreen(parent) - .setTitle(new TranslatableText("config.citresewn.title")) + .setTitle(Text.translatable("config.citresewn.title")) .setSavingRunnable(currentConfig::write); - ConfigCategory category = builder.getOrCreateCategory(new LiteralText("")); + ConfigCategory category = builder.getOrCreateCategory(Text.empty()); ConfigEntryBuilder entryBuilder = builder.entryBuilder(); - category.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("config.citresewn.enabled.title"), currentConfig.enabled) - .setTooltip(new TranslatableText("config.citresewn.enabled.tooltip")) + category.addEntry(entryBuilder.startBooleanToggle(Text.translatable("config.citresewn.enabled.title"), currentConfig.enabled) + .setTooltip(Text.translatable("config.citresewn.enabled.tooltip")) .setSaveConsumer(newConfig -> { if (currentConfig.enabled != newConfig) { currentConfig.enabled = newConfig; @@ -52,8 +51,8 @@ public class CITResewnConfigScreenFactory { if (FabricLoader.getInstance().isModLoaded("citresewn-defaults")) { class CurrentScreen { boolean prevToggle = false; } final CurrentScreen currentScreen = new CurrentScreen(); - category.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("config.citresewn-defaults.title"), false) - .setTooltip(new TranslatableText("config.citresewn-defaults.tooltip")) + category.addEntry(entryBuilder.startBooleanToggle(Text.translatable("config.citresewn-defaults.title"), false) + .setTooltip(Text.translatable("config.citresewn-defaults.tooltip")) .setYesNoTextSupplier((b) -> { if (b != currentScreen.prevToggle) { @@ -63,30 +62,30 @@ public class CITResewnConfigScreenFactory { currentScreen.prevToggle = b; } - return new TranslatableText("config.citresewn.configure"); + return Text.translatable("config.citresewn.configure"); }) .build()); } - category.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("config.citresewn.mute_errors.title"), currentConfig.mute_errors) - .setTooltip(new TranslatableText("config.citresewn.mute_errors.tooltip")) + category.addEntry(entryBuilder.startBooleanToggle(Text.translatable("config.citresewn.mute_errors.title"), currentConfig.mute_errors) + .setTooltip(Text.translatable("config.citresewn.mute_errors.tooltip")) .setSaveConsumer(newConfig -> currentConfig.mute_errors = newConfig) .setDefaultValue(defaultConfig.mute_errors) .build()); - category.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("config.citresewn.mute_warns.title"), currentConfig.mute_warns) - .setTooltip(new TranslatableText("config.citresewn.mute_warns.tooltip")) + category.addEntry(entryBuilder.startBooleanToggle(Text.translatable("config.citresewn.mute_warns.title"), currentConfig.mute_warns) + .setTooltip(Text.translatable("config.citresewn.mute_warns.tooltip")) .setSaveConsumer(newConfig -> currentConfig.mute_warns = newConfig) .setDefaultValue(defaultConfig.mute_warns) .build()); - category.addEntry(entryBuilder.startIntSlider(new TranslatableText("config.citresewn.cache_ms.title"), currentConfig.cache_ms / 50, 0, 5 * 20) - .setTooltip(new TranslatableText("config.citresewn.cache_ms.tooltip")) + category.addEntry(entryBuilder.startIntSlider(Text.translatable("config.citresewn.cache_ms.title"), currentConfig.cache_ms / 50, 0, 5 * 20) + .setTooltip(Text.translatable("config.citresewn.cache_ms.tooltip")) .setSaveConsumer(newConfig -> currentConfig.cache_ms = newConfig * 50) .setDefaultValue(defaultConfig.cache_ms / 50) .setTextGetter(ticks -> { if (ticks <= 1) - return new TranslatableText("config.citresewn.cache_ms.ticks." + ticks).formatted(Formatting.AQUA); + return Text.translatable("config.citresewn.cache_ms.ticks." + ticks).formatted(Formatting.AQUA); Formatting color = Formatting.DARK_RED; @@ -95,12 +94,12 @@ public class CITResewnConfigScreenFactory { if (ticks <= 10) color = Formatting.DARK_GREEN; if (ticks <= 5) color = Formatting.GREEN; - return new TranslatableText("config.citresewn.cache_ms.ticks.any", ticks).formatted(color); + return Text.translatable("config.citresewn.cache_ms.ticks.any", ticks).formatted(color); }) .build()); - category.addEntry(entryBuilder.startBooleanToggle(new TranslatableText("config.citresewn.broken_paths.title"), currentConfig.broken_paths) - .setTooltip(new TranslatableText("config.citresewn.broken_paths.tooltip")) + category.addEntry(entryBuilder.startBooleanToggle(Text.translatable("config.citresewn.broken_paths.title"), currentConfig.broken_paths) + .setTooltip(Text.translatable("config.citresewn.broken_paths.tooltip")) .setSaveConsumer(newConfig -> currentConfig.broken_paths = newConfig) .setDefaultValue(defaultConfig.broken_paths) .requireRestart() -- cgit