From ba7489ee79b0238e2c7b5981f2f9c2ed603ea971 Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 18 Dec 2021 00:41:20 +0100 Subject: [PATCH] New config option to disable the experimental warning screen on level load --- src/main/java/ru/bclib/config/ClientConfig.java | 6 ++++++ src/main/java/ru/bclib/mixin/client/MinecraftMixin.java | 6 ++++++ src/main/resources/assets/bclib/lang/de_de.json | 4 +++- src/main/resources/assets/bclib/lang/en_us.json | 1 + 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/main/java/ru/bclib/config/ClientConfig.java b/src/main/java/ru/bclib/config/ClientConfig.java index 2d2b1c55..5cd5c3fc 100644 --- a/src/main/java/ru/bclib/config/ClientConfig.java +++ b/src/main/java/ru/bclib/config/ClientConfig.java @@ -4,6 +4,9 @@ import ru.bclib.BCLib; import ru.bclib.api.dataexchange.handler.autosync.AutoSync; public class ClientConfig extends NamedPathConfig { + public static final ConfigToken SUPPRESS_EXPERIMENTAL_DIALOG = ConfigToken.Boolean(false, "suppressExperimentalDialogOnLoad", "ui"); + + @ConfigUI(topPadding = 12) public static final ConfigToken ENABLED = ConfigToken.Boolean(true, "enabled", AutoSync.SYNC_CATEGORY); @ConfigUI(leftPadding = 8) @@ -46,4 +49,7 @@ public class ClientConfig extends NamedPathConfig { public boolean isShowingModInfo() { return get(DISPLAY_MOD_INFO) /*&& isAllowingAutoSync()*/; } + public boolean suppressExperimentalDialog() { + return get(SUPPRESS_EXPERIMENTAL_DIALOG); + } } diff --git a/src/main/java/ru/bclib/mixin/client/MinecraftMixin.java b/src/main/java/ru/bclib/mixin/client/MinecraftMixin.java index 462fbd2c..195075ef 100644 --- a/src/main/java/ru/bclib/mixin/client/MinecraftMixin.java +++ b/src/main/java/ru/bclib/mixin/client/MinecraftMixin.java @@ -26,6 +26,7 @@ import ru.bclib.api.LifeCycleAPI; import ru.bclib.api.biomes.BiomeAPI; import ru.bclib.api.dataexchange.DataExchangeAPI; import ru.bclib.api.datafixer.DataFixerAPI; +import ru.bclib.config.Configs; import ru.bclib.interfaces.CustomColorProvider; import java.util.function.Function; @@ -72,6 +73,11 @@ public abstract class MinecraftMixin { else { LifeCycleAPI._runBeforeLevelLoad(); } + + if (Configs.CLIENT_CONFIG.suppressExperimentalDialog()) { + this.doLoadLevel(levelID, RegistryAccess.builtin(), Minecraft::loadDataPacks, Minecraft::loadWorldData, false, ExperimentalDialogType.NONE); + ci.cancel(); + } } @Inject(method = "createLevel", at = @At("HEAD")) diff --git a/src/main/resources/assets/bclib/lang/de_de.json b/src/main/resources/assets/bclib/lang/de_de.json index 2c482b68..bd83c0c9 100644 --- a/src/main/resources/assets/bclib/lang/de_de.json +++ b/src/main/resources/assets/bclib/lang/de_de.json @@ -32,6 +32,7 @@ "title.config.bclib.generator.options.useOldBiomeGenerator": "Alten 1.17 Biome Generator verwenden", "title.config.bclib.main.patches.applyPatches": "Automatisches Anwenden von Patches beim Laden eines Levels", "title.config.bclib.main.patches.repairBiomesOnLoad": "Biomesource beim Laden eines Levels reparieren", + "title.config.bclib.client.ui.suppressExperimentalDialogOnLoad": "Experimenteller Warnbildschirm beim Laden deaktivieren", "title.bclib.syncfiles.modInfo": "Mod Info", "title.bclib.syncfiles.modlist": "Mod Information", @@ -50,5 +51,6 @@ "message.bclib.datafixer.progress": "Anwenden aller Änderungen", "title.bclib.datafixer.error": "Fehler beim Reparieren der Welt", "message.bclib.datafixer.error": "Es gab Fehler beim Reparieren der Welt. Das bedeutet, dass dieser Level wahrscheinlich in einem inkonsistenten Zustand ist und Sie ihn nicht spielen sollten. Bitte stellen Sie Ihr Backup wieder her und beheben Sie die unten aufgeführten Fehler, bevor Sie es erneut versuchen.", - "title.bclib.datafixer.error.continue": "Continue and Mark as Fixed" + "title.bclib.datafixer.error.continue": "Continue and Mark as Fixed", + "title.config.bclib.main.ui.suppressExperimentalDialogOnLoad": "Disable Experimental Warning Screen on Load" } \ No newline at end of file diff --git a/src/main/resources/assets/bclib/lang/en_us.json b/src/main/resources/assets/bclib/lang/en_us.json index 5da48919..569d5cc9 100644 --- a/src/main/resources/assets/bclib/lang/en_us.json +++ b/src/main/resources/assets/bclib/lang/en_us.json @@ -32,6 +32,7 @@ "title.config.bclib.generator.options.useOldBiomeGenerator": "Use legacy 1.17 Biome Generator", "title.config.bclib.main.patches.applyPatches": "Automatically apply patches when loading level", "title.config.bclib.main.patches.repairBiomesOnLoad": "Fix Biomesource on level load", + "title.config.bclib.client.ui.suppressExperimentalDialogOnLoad": "Disable Experimental Warning Screen on Load", "title.bclib.syncfiles.modInfo": "Mod Info", "title.bclib.syncfiles.modlist": "Mod Information",