Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2024-10-03 05:17:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Implement translations for setting groups (#110)

Browse Source 
* Fix #106

* a slight fix to the previous commit

* comply with Michael's complaints

* comply with Michael's complaints 2
This commit is contained in:
Blayung 2023-05-30 22:03:56 +02:00 committed by GitHub
parent e6085723cb
commit 515e81360e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/de/florianmichael/viafabricplus/base/settings/base/SettingGroup.java
View File

@ -19,12 +19,13 @@ package de.florianmichael.viafabricplus.base.settings.base;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.text.Text;
public class SettingGroup {
private final List<AbstractSetting<?>> settings = new ArrayList<>();
private final String name;
private final Text name;
public SettingGroup(String name) {
public SettingGroup(Text name) {
this.name = name;
}
@ -32,7 +33,7 @@ public class SettingGroup {
return settings;
}
public String getName() {
public Text getName() {
return name;
}
}

2
src/main/java/de/florianmichael/viafabricplus/base/settings/groups/AuthenticationSettings.java
View File

@ -85,6 +85,6 @@ public class AuthenticationSettings extends SettingGroup {
public AuthenticationSettings() {
super("Authentication");
super(Text.translatable("settings.viafabricplus.authentication"));
}
}

2
src/main/java/de/florianmichael/viafabricplus/base/settings/groups/DebugSettings.java
View File

@ -56,6 +56,6 @@ public class DebugSettings extends SettingGroup {
public final ProtocolSyncBooleanSetting legacyMiningSpeeds = new ProtocolSyncBooleanSetting(this, Text.translatable("debug.viafabricplus.legacypseeds"), VersionRange.andOlder(VersionEnum.r1_4_6tor1_4_7));
public DebugSettings() {
super("Debug");
super(Text.translatable("settings.viafabricplus.debug"));
}
}

2
src/main/java/de/florianmichael/viafabricplus/base/settings/groups/ExperimentalSettings.java
View File

@ -29,6 +29,6 @@ public class ExperimentalSettings extends SettingGroup {
public final BooleanSetting fixFontCache = new BooleanSetting(this, Text.translatable("experimental.viafabricplus.fontcachefix"), true);
public ExperimentalSettings() {
super("Experimental");
super(Text.translatable("settings.viafabricplus.experimental"));
}
}

2
src/main/java/de/florianmichael/viafabricplus/base/settings/groups/GeneralSettings.java
View File

@ -40,7 +40,7 @@ public class GeneralSettings extends SettingGroup {
public final BooleanSetting autoDetectVersion = new BooleanSetting(this, Text.translatable("general.viafabricplus.autodetect"), false);
public GeneralSettings() {
super("General");
super(Text.translatable("settings.viafabricplus.general"));
mainButtonOrientation.setValue(1); // Default value
}
}

2
src/main/java/de/florianmichael/viafabricplus/base/settings/groups/VisualSettings.java
View File

@ -57,6 +57,6 @@ public class VisualSettings extends SettingGroup {
public final ProtocolSyncBooleanSetting fixSodiumChunkRendering = new ProtocolSyncBooleanSetting(this, Text.translatable("visual.viafabricplus.sodium"), VersionRange.andOlder(VersionEnum.c0_28toc0_30));
public VisualSettings() {
super("Visual");
super(Text.translatable("settings.viafabricplus.visual"));
}
}

8
src/main/java/de/florianmichael/viafabricplus/screen/impl/settings/settingrenderer/meta/TitleRenderer.java
View File

@ -25,15 +25,15 @@ import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
public class TitleRenderer extends MappedSlotEntry {
private final String name;
private final Text name;
public TitleRenderer(String name) {
public TitleRenderer(Text name) {
this.name = name;
}
@Override
public Text getNarration() {
return Text.literal(this.name);
return this.name;
}
@Override
@ -48,6 +48,6 @@ public class TitleRenderer extends MappedSlotEntry {
public void mappedRender(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
textRenderer.drawWithShadow(matrices, Formatting.BOLD + this.name, 3, entryHeight / 2F - textRenderer.fontHeight / 2F, -1);
textRenderer.drawWithShadow(matrices, this.name.copy().formatted(Formatting.BOLD), 3, entryHeight / 2F - textRenderer.fontHeight / 2F, -1);
}
}

2
src/main/java/de/florianmichael/viafabricplus/screen/impl/thirdparty/BetaCraftScreen.java vendored
View File

@ -73,7 +73,7 @@ public class BetaCraftScreen extends VFPScreen {
for (BCVersion value : BCVersion.values()) {
final List<BCServerInfo> servers = SERVER_LIST.serversOfVersion(value);
if (servers.isEmpty()) continue;
addEntry(new TitleRenderer(value.name()));
addEntry(new TitleRenderer(Text.literal(value.name())));
for (BCServerInfo server : servers) {
addEntry(new ServerSlot(server));
}

2
src/main/resources/assets/viafabricplus/lang/de_de.json
View File

@ -49,4 +49,4 @@
"bedrocklogin.viafabricplus.error": "Ein Fehler ist aufgetreten! In der latest.log sind genauere Informationen;\bitte Melde den Fehler unter: \nhttps://github.com/FlorianMichael/ViaFabricPlus/issues",
"forceversion.viafabricplus.title": "Bitte wähle die Version, die beim Verbinden mit dem Server verwendet werden soll"
}
}

6
src/main/resources/assets/viafabricplus/lang/en_us.json
View File

@ -14,6 +14,12 @@
"words.viafabricplus.copy": "Copy code",
"words.viafabricplus.error": "Something went wrong! Please try again later",
"settings.viafabricplus.authentication": "Authentication",
"settings.viafabricplus.experimental": "Experimental",
"settings.viafabricplus.visual": "Visual",
"settings.viafabricplus.debug": "Debug",
"settings.viafabricplus.general": "General",
"general.viafabricplus.secret": "Show Super Secret Settings",
"general.viafabricplus.extrainformation": "Show extra information in Debug Hud",
"general.viafabricplus.classicloading": "Show classic loading progress in connect screen",

2
src/main/resources/assets/viafabricplus/lang/hu_hu.json
View File

@ -12,7 +12,7 @@
"words.viafabricplus.online": "Online Mód",
"words.viafabricplus.reset": "Visszaállítás",
"words.viafabricplus.copy": "Kód másolása",
"general.viafabricplus.secret": "Super Secret Settings mutatása",
"general.viafabricplus.extrainformation": "Extra információ mutatása a Debug HUD-ban",
"general.viafabricplus.classicloading": "Klasszikus folyamatjelző mutatása a csatlakozási képernyőn",

2
src/main/resources/assets/viafabricplus/lang/ja_jp.json
View File

@ -69,4 +69,4 @@
"betacraft.viafabricplus.warning": "このボタンを押すと、API リクエストが\"betacraft.uk/serverlist\"に送信されます。",
"betacraft.viafabricplus.error": "エラーが発生しました。 後でもう一度試してください。"
}
}

2
src/main/resources/assets/viafabricplus/lang/lb_lu.json
View File

@ -49,4 +49,4 @@
"bedrocklogin.viafabricplus.error": "En Fehler ist opgetrieden! An der latest.log sin genauer Informatiounen;\n.e.g. Meld den Fehler enner: \nhttps://github.com/FloriUnMichael/ViaFabricPlus/issues",
"forceversion.viafabricplus.title": "W.e.g. wähl die Versioun, die bäim Verbannen mat dem Server benotzt ginn soll"
}
}

6
src/main/resources/assets/viafabricplus/lang/pl_pl.json
View File

@ -14,6 +14,12 @@
"words.viafabricplus.copy": "Kopiuj kod",
"words.viafabricplus.error": "Coś poszło nie tak! Proszę, spróbuj ponownie później",
"settings.viafabricplus.authentication": "Uwierzytelnianie",
"settings.viafabricplus.experimental": "Eksperymenty",
"settings.viafabricplus.visual": "Wizualne",
"settings.viafabricplus.debug": "Debugowanie",
"settings.viafabricplus.general": "Ogólne",
"general.viafabricplus.secret": "Pokazuj Super Secret Settings",
"general.viafabricplus.extrainformation": "Pokazuj dodatkowe informacje w interfejsie debugowania",
"general.viafabricplus.classicloading": "Pokazuj klasyczny pasek ładowania w ekranie łączenia",