diff --git a/src/main/java/org/betterx/bclib/client/gui/screens/UpdatesScreen.java b/src/main/java/org/betterx/bclib/client/gui/screens/UpdatesScreen.java index fa44493c..c5c59de8 100644 --- a/src/main/java/org/betterx/bclib/client/gui/screens/UpdatesScreen.java +++ b/src/main/java/org/betterx/bclib/client/gui/screens/UpdatesScreen.java @@ -21,8 +21,7 @@ import net.fabricmc.loader.api.ModContainer; @Environment(EnvType.CLIENT) public class UpdatesScreen extends BCLibLayoutScreen { - - public static final String DONATION_URL = "https://www.paypal.com/donate/?hosted_button_id=7VTXYRXBHZQZJ&item_name=BetterX%20Mods&cmd=_s-xclick"; + public static final String DONATION_URL = "https://www.paypal.com/donate/?hosted_button_id=7VTXYRXBHZQZJ"; public UpdatesScreen(Screen parent) { super(parent, Component.translatable("bclib.updates.title"), 10, 10, 10); diff --git a/src/main/java/org/betterx/bclib/client/gui/screens/WelcomeScreen.java b/src/main/java/org/betterx/bclib/client/gui/screens/WelcomeScreen.java index 88fe8c8a..9454aefb 100644 --- a/src/main/java/org/betterx/bclib/client/gui/screens/WelcomeScreen.java +++ b/src/main/java/org/betterx/bclib/client/gui/screens/WelcomeScreen.java @@ -1,9 +1,14 @@ package org.betterx.bclib.client.gui.screens; +import org.betterx.bclib.BCLib; import org.betterx.bclib.config.Configs; import org.betterx.bclib.networking.VersionChecker; +import org.betterx.bclib.registry.PresetsRegistry; import org.betterx.ui.ColorUtil; import org.betterx.ui.layout.components.*; +import org.betterx.ui.layout.values.Size; +import org.betterx.worlds.together.WorldsTogether; +import org.betterx.worlds.together.worldPreset.WorldPresets; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.gui.GuiComponent; @@ -11,8 +16,14 @@ import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Style; +import net.minecraft.resources.ResourceLocation; public class WelcomeScreen extends BCLibLayoutScreen { + static final ResourceLocation BETTERX_LOCATION = new ResourceLocation(BCLib.MOD_ID, "betterx.png"); + static final ResourceLocation BACKGROUND = new ResourceLocation(BCLib.MOD_ID, "header.jpg"); + static final ResourceLocation ICON_BETTERNETHER = new ResourceLocation(BCLib.MOD_ID, "icon_betternether.png"); + static final ResourceLocation ICON_BETTEREND = new ResourceLocation(BCLib.MOD_ID, "icon_betterend.png"); + public WelcomeScreen(Screen parent) { super(parent, translatable("bclib.welcome.title")); } @@ -20,13 +31,29 @@ public class WelcomeScreen extends BCLibLayoutScreen { @Override protected LayoutComponent initContent() { VerticalStack content = new VerticalStack(fill(), fit()).setDebugName("content"); + + content.addImage(fill(), fit(), BACKGROUND, new Size(427, 100)); + content.addHorizontalLine(1).setColor(ColorUtil.BLACK); + content.addSpacer(16); + HorizontalStack headerRow = content.addRow(fit(), fit()).setDebugName("title bar").centerHorizontal(); + headerRow.addIcon(icon, Size.of(512)).setDebugName("icon"); + headerRow.addSpacer(4); + headerRow.addText(fit(), fit(), title).centerHorizontal().setColor(ColorUtil.WHITE).setDebugName("title"); + headerRow.addImage(fixed(178 / 2), fixed(40 / 2), BETTERX_LOCATION, Size.of(178, 40)).setDebugName("betterx"); + content.addSpacer(16); + content.addMultilineText(fill(), fit(), MultiLineText.parse(translatable("bclib.welcome.description"))) .centerHorizontal(); + + Container padContainer = new Container(fill(), fit()).setPadding(10, 0, 10, 10).setDebugName("padContainer"); + VerticalStack innerContent = new VerticalStack(fill(), fit()).setDebugName("innerContent"); + padContainer.addChild(innerContent); + content.add(padContainer); if (Configs.CLIENT_CONFIG.isDonor()) { - content.addHorizontalSeparator(48); - HorizontalStack donationRow = content.addRow(relative(0.9), fit()) - .setDebugName("donationRow") - .centerHorizontal(); + addSeparator(innerContent, ICON_BETTEREND); + HorizontalStack donationRow = innerContent.addRow(relative(0.9), fit()) + .setDebugName("donationRow") + .centerHorizontal(); donationRow.addMultilineText(fill(), fit(), translatable("bclib.welcome.donation")) .alignLeft() @@ -39,36 +66,127 @@ public class WelcomeScreen extends BCLibLayoutScreen { .onPress((bt) -> openLink(UpdatesScreen.DONATION_URL)).centerVertical(); } - content.addHorizontalSeparator(48); - Checkbox check = content.addCheckbox( - fit(), - fit(), - translatable("bclib.welcome.updater.title"), - Configs.CLIENT_CONFIG.checkVersions() - ) - .onChange((cb, state) -> { - Configs.CLIENT_CONFIG.setCheckVersions(state); - }); - content.addSpacer(2); - HorizontalStack dscBox = content.indent(24); - dscBox.addMultilineText(fill(), fit(), translatable("bclib.welcome.updater.description")) + addSeparator(innerContent, ICON_BETTERNETHER); + + // Do Update Checks + Checkbox check = innerContent.addCheckbox( + fit(), + fit(), + translatable("title.config.bclib.client.ui.check"), + Configs.CLIENT_CONFIG.checkVersions() + ) + .onChange((cb, state) -> { + Configs.CLIENT_CONFIG.setCheckVersions(state); + }); + innerContent.addSpacer(2); + HorizontalStack dscBox = innerContent.indent(24); + dscBox.addMultilineText(fill(), fit(), translatable("description.config.bclib.client.ui.check")) .setColor(ColorUtil.GRAY); dscBox.addSpacer(8); - content.addSpacer(16); - content.addButton(fit(), fit(), CommonComponents.GUI_PROCEED).onPress((bt) -> { + // Hide Experimental Dialog + innerContent.addSpacer(8); + Checkbox experimental = innerContent.addCheckbox( + fit(), + fit(), + translatable("title.config.bclib.client.ui.suppressExperimentalDialogOnLoad"), + Configs.CLIENT_CONFIG.suppressExperimentalDialog() + ) + .onChange((cb, state) -> { + Configs.CLIENT_CONFIG.setSuppressExperimentalDialog(state); + }); + innerContent.addSpacer(2); + dscBox = innerContent.indent(24); + dscBox.addMultilineText( + fill(), + fit(), + translatable("description.config.bclib.client.ui.suppressExperimentalDialogOnLoad") + ) + .setColor(ColorUtil.GRAY); + dscBox.addSpacer(8); + + // Use BetterX WorldType + innerContent.addSpacer(8); + Checkbox betterx = innerContent.addCheckbox( + fit(), + fit(), + translatable("title.config.bclib.client.ui.forceBetterXPreset"), + Configs.CLIENT_CONFIG.forceBetterXPreset() + ) + .onChange((cb, state) -> { + Configs.CLIENT_CONFIG.setForceBetterXPreset(state); + }); + innerContent.addSpacer(2); + dscBox = innerContent.indent(24); + dscBox.addMultilineText( + fill(), fit(), + translatable("warning.config.bclib.client.ui.forceBetterXPreset") + .setStyle(Style.EMPTY + .withBold(true) + .withColor(ColorUtil.RED) + ) + .append(translatable( + "description.config.bclib.client.ui.forceBetterXPreset").setStyle( + Style.EMPTY + .withBold(false) + .withColor(ColorUtil.GRAY)) + ) + ) + .setColor(ColorUtil.GRAY); + dscBox.addSpacer(8); + + innerContent.addSpacer(16); + innerContent.addButton(fit(), fit(), CommonComponents.GUI_PROCEED).onPress((bt) -> { Configs.CLIENT_CONFIG.setDidShowWelcomeScreen(); Configs.CLIENT_CONFIG.setCheckVersions(check.isChecked()); + Configs.CLIENT_CONFIG.setSuppressExperimentalDialog(experimental.isChecked()); + Configs.CLIENT_CONFIG.setForceBetterXPreset(betterx.isChecked()); Configs.CLIENT_CONFIG.saveChanges(); + + WorldsTogether.SURPRESS_EXPERIMENTAL_DIALOG = Configs.CLIENT_CONFIG.suppressExperimentalDialog(); + if (Configs.CLIENT_CONFIG.forceBetterXPreset()) + WorldPresets.setDEFAULT(PresetsRegistry.BCL_WORLD); + else + WorldPresets.setDEFAULT(net.minecraft.world.level.levelgen.presets.WorldPresets.NORMAL); VersionChecker.startCheck(true); onClose(); }).alignRight(); - return VerticalScroll.create(fill(), fill(), content); + return VerticalScroll.create(fill(), fill(), content).setScrollerPadding(0); + } + + private void addSeparator(VerticalStack innerContent, ResourceLocation image) { + final int sepWidth = (int) (427 / 1.181) / 2; + HorizontalStack separator = new HorizontalStack(fit(), fit()).centerHorizontal(); + separator.addHLine(fixed((sepWidth - 32) / 2), fixed(32)).centerVertical(); + separator.addSpacer(1); + separator.addImage(fixed(32), fixed(32), image, Size.of(64)).alignBottom(); + separator.addHLine(fixed((sepWidth - 32) / 2), fixed(32)).centerVertical(); + innerContent.addSpacer(16); + innerContent.add(separator); + innerContent.addSpacer(4); + } + + @Override + protected LayoutComponent addTitle(LayoutComponent content) { + return content; } @Override protected void renderBackground(PoseStack poseStack, int i, int j, float f) { GuiComponent.fill(poseStack, 0, 0, width, height, 0xBD343444); +// Rectangle BANNER_UV = new Rectangle(0, 0, 427, 100); +// Size BANNER_RESOURCE_SIZE = BANNER_UV.size(); +// Size BANNER_SIZE = BANNER_UV.sizeFromWidth(this.width); +// +// RenderHelper.renderImage( +// poseStack, +// BANNER_SIZE.width(), +// BANNER_SIZE.height(), +// BACKGROUND, +// BANNER_UV, +// BANNER_RESOURCE_SIZE, +// 1.0f +// ); } } diff --git a/src/main/java/org/betterx/bclib/config/ClientConfig.java b/src/main/java/org/betterx/bclib/config/ClientConfig.java index fb298fdb..dba7bfa8 100644 --- a/src/main/java/org/betterx/bclib/config/ClientConfig.java +++ b/src/main/java/org/betterx/bclib/config/ClientConfig.java @@ -23,6 +23,13 @@ public class ClientConfig extends NamedPathConfig { "showUpdateInfo", "ui" ); + + @ConfigUI(hide = true) + public static final ConfigToken FORCE_BETTERX_PRESET = ConfigToken.Boolean( + true, + "forceBetterXPreset", + "ui" + ); public static final ConfigToken SUPPRESS_EXPERIMENTAL_DIALOG = ConfigToken.Boolean( false, "suppressExperimentalDialogOnLoad", @@ -134,6 +141,10 @@ public class ClientConfig extends NamedPathConfig { return get(SUPPRESS_EXPERIMENTAL_DIALOG); } + public void setSuppressExperimentalDialog(boolean newValue) { + set(ClientConfig.SUPPRESS_EXPERIMENTAL_DIALOG, newValue); + } + public boolean netherThickFog() { return get(NETHER_THICK_FOG); } @@ -170,4 +181,12 @@ public class ClientConfig extends NamedPathConfig { public void setDidShowWelcomeScreen() { set(ClientConfig.DID_SHOW_WELCOME, true); } + + public boolean forceBetterXPreset() { + return get(FORCE_BETTERX_PRESET); + } + + public void setForceBetterXPreset(boolean v) { + set(FORCE_BETTERX_PRESET, v); + } } diff --git a/src/main/java/org/betterx/bclib/registry/PresetsRegistry.java b/src/main/java/org/betterx/bclib/registry/PresetsRegistry.java index bcee77d5..3cd61b77 100644 --- a/src/main/java/org/betterx/bclib/registry/PresetsRegistry.java +++ b/src/main/java/org/betterx/bclib/registry/PresetsRegistry.java @@ -4,6 +4,7 @@ import org.betterx.bclib.BCLib; import org.betterx.bclib.api.v2.generator.config.BCLEndBiomeSourceConfig; import org.betterx.bclib.api.v2.generator.config.BCLNetherBiomeSourceConfig; import org.betterx.bclib.api.v2.levelgen.LevelGenUtil; +import org.betterx.bclib.config.Configs; import org.betterx.worlds.together.entrypoints.WorldPresetBootstrap; import org.betterx.worlds.together.levelgen.WorldGenUtil; import org.betterx.worlds.together.worldPreset.TogetherWorldPreset; @@ -45,7 +46,10 @@ public class PresetsRegistry implements WorldPresetBootstrap { false ); - WorldPresets.setDEFAULT(BCL_WORLD); + if (Configs.CLIENT_CONFIG.forceBetterXPreset()) + WorldPresets.setDEFAULT(BCL_WORLD); + else + WorldPresets.setDEFAULT(net.minecraft.world.level.levelgen.presets.WorldPresets.NORMAL); } public static TogetherWorldPreset buildPreset( diff --git a/src/main/java/org/betterx/ui/layout/components/Container.java b/src/main/java/org/betterx/ui/layout/components/Container.java index 04cb91b4..293d887d 100644 --- a/src/main/java/org/betterx/ui/layout/components/Container.java +++ b/src/main/java/org/betterx/ui/layout/components/Container.java @@ -255,4 +255,14 @@ public class Container extends LayoutComponent content) { + return create(Value.fit(), Value.fit(), content); + } + + public static Container create(Value width, Value height, LayoutComponent content) { + Container c = new Container(width, height); + c.addChild(content); + return c; + } } diff --git a/src/main/java/org/betterx/ui/layout/components/Image.java b/src/main/java/org/betterx/ui/layout/components/Image.java index da61f8f0..8525f805 100644 --- a/src/main/java/org/betterx/ui/layout/components/Image.java +++ b/src/main/java/org/betterx/ui/layout/components/Image.java @@ -1,14 +1,11 @@ package org.betterx.ui.layout.components; +import org.betterx.ui.layout.components.render.RenderHelper; import org.betterx.ui.layout.values.Rectangle; import org.betterx.ui.layout.values.Size; import org.betterx.ui.layout.values.Value; -import com.mojang.blaze3d.platform.GlStateManager; -import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.client.gui.GuiComponent; -import net.minecraft.client.renderer.GameRenderer; import net.minecraft.resources.ResourceLocation; import net.fabricmc.api.EnvType; @@ -82,35 +79,7 @@ public class Image extends CustomRenderComponent { Rectangle bounds, Rectangle clipRect ) { - renderImage(stack, bounds, location, uvRect, resourceSize, alpha); - } - - protected static void renderImage( - PoseStack stack, - Rectangle bounds, - ResourceLocation location, - Rectangle uvRect, - Size size, - float alpha - ) { - RenderSystem.setShader(GameRenderer::getPositionTexShader); - RenderSystem.setShaderTexture(0, location); - RenderSystem.enableBlend(); - RenderSystem.blendFunc( - GlStateManager.SourceFactor.SRC_ALPHA, - GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA - ); - RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, alpha); - GuiComponent.blit( - stack, - 0, 0, bounds.width, bounds.height, - uvRect.left, - uvRect.top, - uvRect.width, - uvRect.height, - size.width(), - size.height() - ); + RenderHelper.renderImage(stack, bounds.width, bounds.height, location, uvRect, resourceSize, alpha); } @Override diff --git a/src/main/java/org/betterx/ui/layout/components/VerticalScroll.java b/src/main/java/org/betterx/ui/layout/components/VerticalScroll.java index 7015aa97..9df4ffe8 100644 --- a/src/main/java/org/betterx/ui/layout/components/VerticalScroll.java +++ b/src/main/java/org/betterx/ui/layout/components/VerticalScroll.java @@ -28,11 +28,14 @@ public class VerticalScroll extends LayoutComponent protected int travel; protected int topOffset; + protected int scrollerPadding; + protected boolean keepSpaceForScrollbar = true; public VerticalScroll(Value width, Value height, RS scrollerRenderer) { super(width, height, new NullRenderer()); this.scrollerRenderer = scrollerRenderer; + this.scrollerPadding = scrollerRenderer.scrollerPadding(); } public static VerticalScroll create(LayoutComponent c) { @@ -61,6 +64,11 @@ public class VerticalScroll extends LayoutComponent return this; } + public VerticalScroll setScrollerPadding(int pad) { + this.scrollerPadding = pad; + return this; + } + public VerticalScroll setKeepSpaceForScrollbar(boolean value) { keepSpaceForScrollbar = value; return this; @@ -87,7 +95,7 @@ public class VerticalScroll extends LayoutComponent } protected int scrollerWidth() { - return scrollerRenderer.scrollerWidth() + scrollerRenderer.scrollerPadding(); + return scrollerRenderer.scrollerWidth() + scrollerPadding; } @Override diff --git a/src/main/java/org/betterx/ui/layout/components/render/RenderHelper.java b/src/main/java/org/betterx/ui/layout/components/render/RenderHelper.java index 5b57f4ad..46d3af4e 100644 --- a/src/main/java/org/betterx/ui/layout/components/render/RenderHelper.java +++ b/src/main/java/org/betterx/ui/layout/components/render/RenderHelper.java @@ -1,11 +1,16 @@ package org.betterx.ui.layout.components.render; import org.betterx.ui.ColorUtil; +import org.betterx.ui.layout.values.Rectangle; +import org.betterx.ui.layout.values.Size; +import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.*; import com.mojang.math.Matrix4f; +import net.minecraft.client.gui.GuiComponent; import net.minecraft.client.renderer.GameRenderer; +import net.minecraft.resources.ResourceLocation; public class RenderHelper { public static void outline(PoseStack poseStack, int x0, int y0, int x1, int y1, int color) { @@ -79,4 +84,32 @@ public class RenderHelper { RenderSystem.enableTexture(); RenderSystem.disableBlend(); } + + public static void renderImage( + PoseStack stack, + int width, int height, + ResourceLocation location, + Rectangle uvRect, + Size resourceSize, + float alpha + ) { + RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.setShaderTexture(0, location); + RenderSystem.enableBlend(); + RenderSystem.blendFunc( + GlStateManager.SourceFactor.SRC_ALPHA, + GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA + ); + RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, alpha); + GuiComponent.blit( + stack, + 0, 0, width, height, + uvRect.left, + uvRect.top, + uvRect.width, + uvRect.height, + resourceSize.width(), + resourceSize.height() + ); + } } diff --git a/src/main/java/org/betterx/ui/layout/values/Rectangle.java b/src/main/java/org/betterx/ui/layout/values/Rectangle.java index 43720720..2e5c667c 100644 --- a/src/main/java/org/betterx/ui/layout/values/Rectangle.java +++ b/src/main/java/org/betterx/ui/layout/values/Rectangle.java @@ -18,6 +18,26 @@ public class Rectangle { this.height = height; } + public float aspect() { + return (float) width / height; + } + + public Size sizeFromWidth(int width) { + return new Size(width, (int) (width / aspect())); + } + + public Size sizeFromHeight(int height) { + return new Size((int) (height * aspect()), height); + } + + public Size size(float scale) { + return new Size((int) (width * scale), (int) (height * scale)); + } + + public Size size() { + return new Size(width, height); + } + public int right() { return left + width; } diff --git a/src/main/resources/assets/bclib/betterx.png b/src/main/resources/assets/bclib/betterx.png new file mode 100644 index 00000000..5223d467 Binary files /dev/null and b/src/main/resources/assets/bclib/betterx.png differ diff --git a/src/main/resources/assets/bclib/header.jpg b/src/main/resources/assets/bclib/header.jpg new file mode 100644 index 00000000..14f30a77 Binary files /dev/null and b/src/main/resources/assets/bclib/header.jpg differ diff --git a/src/main/resources/assets/bclib/icon_betterend.png b/src/main/resources/assets/bclib/icon_betterend.png new file mode 100644 index 00000000..8f696087 Binary files /dev/null and b/src/main/resources/assets/bclib/icon_betterend.png differ diff --git a/src/main/resources/assets/bclib/icon_betternether.png b/src/main/resources/assets/bclib/icon_betternether.png new file mode 100644 index 00000000..215bc42f Binary files /dev/null and b/src/main/resources/assets/bclib/icon_betternether.png differ diff --git a/src/main/resources/assets/bclib/lang/de_de.json b/src/main/resources/assets/bclib/lang/de_de.json index cea9f3bc..13e0344e 100644 --- a/src/main/resources/assets/bclib/lang/de_de.json +++ b/src/main/resources/assets/bclib/lang/de_de.json @@ -72,12 +72,16 @@ "bclib.updates.donate_pre": "Gefallen Dir unsere Inhalte?\nDann erwäge eine kleine Spende :)", "bclib.updates.donate": "Spenden", "bclib.updates.description": "Einige der installierten Mods sind veraltet. Wir verbessern und erweitern ständig unseren Inhalt und stellen wichtige Fehlerbehebungen zur Verfügung.\nBitte aktualisiere Deine Mods über die unten angegebenen Links.", - "bclib.welcome.title": "Wilkommen bei BetterX", + "bclib.welcome.title": "Wilkommen bei ", "bclib.welcome.description": "... und ein riesiges herzliches **Dankeschön** für das Herunterladen und Spielen unserer Mods. Wir hoffen, dass sie euch genauso viel Spaß machen wie uns.\n\nBevor wir anfangen, gibt es ein paar Dinge, die wir einrichten müssen, also lest bitte den folgenden langweiligen Teil weiter.", "bclib.welcome.donation": "Wenn Dir unsere Mods so gut gefallen, wie wir hoffen, dann denken Sie bitte über eine kleine Spende nach :)", - "bclib.welcome.updater.description": "BCLib enthält eine einfache Versionsüberprüfung, die Dich benachrichtigen kann, wenn neue Updates unserer Mods verfügbar sind. Dazu müssen wir eine Ressource von einem unserer Webserver abrufen. Um die Anfrage zu bearbeiten versenden wir zusammen mit Deiner IP-Address (wir müssen ja wissen wohin die Antwort gehen soll) auch Deine Minecraft-Version (damit wir die richtige Mod-Version auswählen können). Die übertragenen Daten werden von uns niemals für andere Zwecke verwendet, verarbeitet oder weitergegeben, müssen aber aus rechtlichen Gründen für 4 Wochen in unseren Log-Dateien gespeichert werden.", - "bclib.welcome.updater.title": "Versionsprüfung erlauben", - "title.config.bclib.main.version.check": "Versionsprüfung erlauben", + "description.config.bclib.client.ui.check": "BCLib enthält eine einfache Versionsüberprüfung, die Dich benachrichtigen kann, wenn neue Updates unserer Mods verfügbar sind. Dazu müssen wir eine Ressource von einem unserer Webserver abrufen. Um die Anfrage zu bearbeiten versenden wir zusammen mit Deiner IP-Address (wir müssen ja wissen wohin die Antwort gehen soll) auch Deine Minecraft-Version (damit wir die richtige Mod-Version auswählen können). Die übertragenen Daten werden von uns niemals für andere Zwecke verwendet, verarbeitet oder weitergegeben, müssen aber aus rechtlichen Gründen für 4 Wochen in unseren Log-Dateien gespeichert werden.", + "title.config.bclib.client.client.ui.check": "Versionsprüfung erlauben", "title.config.bclib.client.ui.showUpdateInfo": "Anzeigen wenn neue Updates verfügabr sind", - "title.config.bclib.client.rendering.FogDensity": "Nebeldichte" + "title.config.bclib.client.rendering.FogDensity": "Nebeldichte", + "description.config.bclib.client.ui.suppressExperimentalDialogOnLoad": "Der Warnbildschirm wird immer dann angezeigt, wenn Deine Welt nicht die Einstellungen der Vanilla-Version verwendet. Dies kann passieren, wenn Du eine Welt in einer Vorschauversion startest, aber auch wenn Du Mods verwendest, um die Welterzeugung zu verändern. Wenn diese Option aktiviert ist, wird die Warnung übersprungen, wenn Du eine bestehende Welt lädst. Sie wird weiterhin angezeigt (als Erinnerung), wenn eine neue Welt erstellt wird.", + "title.config.bclib.client.ui.forceBetterXPreset": "BetterX als Standard-Welt-Typ verwenden", + "description.config.bclib.client.ui.forceBetterXPreset": "Der Welt-Typ bestimmt, wie eine Welt generiert wird. In den meisten Fällen solltet BetterX als Standardeinstellung beibehalten werden (Du kannst den Typ jederzeit im Welt-Erstellen-Bildschirm ändern). Dieser Typ ist für maximale Kompatibilität zwischen DataPacks, unserer Mod und anderen Fabric-Mods optimiert. Außerdem bietet er einige einzigartige Funktionen für BetterNether und BetterEnd. Du solltest diese Option nur deaktivieren, wenn Du einen Grund dazu hast!", + "title.config.bclib.client.ui.check": "Enable Version Check", + "warning.config.bclib.client.ui.forceBetterXPreset": "IN DEN MEISTEN FÄLLEN SOLLTE DIESE OPTION AKTIVIERT BLEIBEN.\n" } \ 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 5553ec6e..536168f9 100644 --- a/src/main/resources/assets/bclib/lang/en_us.json +++ b/src/main/resources/assets/bclib/lang/en_us.json @@ -72,12 +72,15 @@ "bclib.updates.donate_pre": "Like our Content?\nPlease consider a small Donation :)", "bclib.updates.donate": "Donate", "bclib.updates.description": "Some of the installed mods are outdated. We continually improve and extend our content as well as provide important bug-fixes.\nPlease consider updating your mods using the provided links below.", - "bclib.welcome.title": "Welcome to BetterX", + "bclib.welcome.title": "Welcome to ", "bclib.welcome.description": "... and a huge hearty **thank you** for downloading and playing our mods. We hope you enjoy them as much as we do.\n\nBefore we start, there are a few things we need to set up, so please continue reading the following boring part.", "bclib.welcome.donation": "If you enjoy our Mods as much as we hope you do, please consider a small Donation :)", - "bclib.welcome.updater.description": "BCLib includes a simple version checker that can notify you when new updates of our mods are available. To do this, we need to read a resource from one of our web servers. To process the request, together with your IP address (we need to know where to send the response) we also send your Minecraft version (so we can choose the right mod version). The transmitted data will never be used or processed by us for other purposes, but must be stored in our log files for 4 weeks for legal reasons.", - "bclib.welcome.updater.title": "Enable Version Check", - "title.config.bclib.main.version.check": "Enable Version Check", + "description.config.bclib.client.ui.check": "BCLib includes a simple version checker that can notify you when new updates of our mods are available. To do this, we need to read a resource from one of our web servers. To process the request, together with your IP address (we need to know where to send the response) we also send your Minecraft version (so we can choose the right mod version). The transmitted data will never be used or processed by us for other purposes, but must be stored in our log files for 4 weeks for legal reasons.", + "title.config.bclib.client.ui.check": "Enable Version Check", "title.config.bclib.client.ui.showUpdateInfo": "Allow Update Reminder Screen", - "title.config.bclib.client.rendering.FogDensity": "Fog Density" + "title.config.bclib.client.rendering.FogDensity": "Fog Density", + "description.config.bclib.client.ui.suppressExperimentalDialogOnLoad": "The warning screen appears whenever your world does not use the vanilla version settings. This can happen when you start a world in a preview version, but also when you use mods to change the world creation. If this option is enabled, the warning will be skipped when you load an existing world. It will still be displayed (as a reminder) when a new world is created.", + "title.config.bclib.client.ui.forceBetterXPreset": "Use BetterX as Default World-Type", + "warning.config.bclib.client.ui.forceBetterXPreset": "MOST LIKELY YOU WILL WANT TO KEEP THIS OPTION ENABLED.\n", + "description.config.bclib.client.ui.forceBetterXPreset": "The world type determines how a world is generated. In most cases, BetterX should be kept as the default (you can change the type at any time in the world creation screen). This type is optimized for maximum compatibility between DataPacks, our mod, and other Fabric mods. It also provides some unique features for BetterNether and BetterEnd. You should only disable this option if you have a reason to do so!" } \ No newline at end of file