Compare commits

..

10 Commits

Author SHA1 Message Date
Martin Prokoph
a1ad6dd1f0 chore: bump version 2025-05-13 12:05:21 +02:00
Martin Prokoph
7ddfadd4ec clean: some code cleanup 2025-05-13 12:05:07 +02:00
Martin Prokoph
6bbaf1ab5d optimize: remove unchanged translations in es_ar 2025-05-12 22:58:22 +02:00
Martin Prokoph
f1fe868192 feat: remove checkbox widgets
- As voted on in a recent MidnightDust Discord Poll
2025-05-12 22:57:15 +02:00
Martin Prokoph
74d8800fa5 Merge pull request #102 from Texaliuz/patch-1
🌐 add Argentine Spanish localization (for example)
2025-05-12 22:48:52 +02:00
Martin Prokoph
3e2ceb09c6 Merge pull request #103 from Texaliuz/patch-2
🌐 add Argentine Spanish localization
2025-05-12 22:48:05 +02:00
Martin Prokoph
f1a3b2c634 Merge pull request #101 from joriskleiber/architectury-1.21.4
Respect TranslatableOption on enums
2025-05-12 22:47:11 +02:00
Texaliuz
3eb345ce3c Update es_ar.json
Minor corrections
2025-05-04 13:10:32 -03:00
Texaliuz
f986d10e1f Translation into Argentine Spanish (es_ar) for MidnightLib
Hello, I would appreciate if you could add the translation to my language (es_ar) for version 1.21.1 please and thank you.
2025-04-29 19:45:28 -03:00
Texaliuz
03223b8d9b Translation into Argentine Spanish (es_ar) for MidnightLib
Hello, I would appreciate if you could add the translation to my language (es_ar) for version 1.21.1 please and thank you.
2025-04-29 19:41:32 -03:00
5 changed files with 71 additions and 40 deletions

View File

@@ -164,9 +164,6 @@ public abstract class MidnightConfig {
else if (info.dataType == boolean.class) { else if (info.dataType == boolean.class) {
Function<Object, Text> func = value -> Text.translatable((Boolean) value ? "gui.yes" : "gui.no").formatted((Boolean) value ? Formatting.GREEN : Formatting.RED); Function<Object, Text> func = value -> Text.translatable((Boolean) value ? "gui.yes" : "gui.no").formatted((Boolean) value ? Formatting.GREEN : Formatting.RED);
info.function = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object, Text>>(button -> { info.function = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object, Text>>(button -> {
if (info.actionButton instanceof CheckboxWidget checkbox && checkbox.isChecked() == (Boolean) info.value) {
checkbox.onPress(); return;
}
info.setValue(!(Boolean) info.value); button.setMessage(func.apply(info.value)); info.setValue(!(Boolean) info.value); button.setMessage(func.apply(info.value));
}, func); }, func);
} else if (info.dataType.isEnum()) { } else if (info.dataType.isEnum()) {
@@ -190,11 +187,9 @@ public abstract class MidnightConfig {
} }
private static Text getEnumTranslatableText(Object value, String modid, EntryInfo info) { private static Text getEnumTranslatableText(Object value, String modid, EntryInfo info) {
if (value instanceof TranslatableOption translatableOption) { if (value instanceof TranslatableOption translatableOption) return translatableOption.getText();
return translatableOption.getText();
}
String translationKey = modid + ".midnightconfig.enum." + info.dataType.getSimpleName() + "." + info.toTemporaryValue(); String translationKey = "%s.midnightconfig.enum.%s.%s".formatted(modid, info.dataType.getSimpleName(), info.toTemporaryValue());
return I18n.hasTranslation(translationKey) ? Text.translatable(translationKey) : Text.literal(info.toTemporaryValue()); return I18n.hasTranslation(translationKey) ? Text.translatable(translationKey) : Text.literal(info.toTemporaryValue());
} }
@@ -260,7 +255,7 @@ public abstract class MidnightConfig {
@Environment(EnvType.CLIENT) @Environment(EnvType.CLIENT)
public static class MidnightConfigScreen extends Screen { public static class MidnightConfigScreen extends Screen {
protected MidnightConfigScreen(Screen parent, String modid) { protected MidnightConfigScreen(Screen parent, String modid) {
super(Text.translatable(modid + ".midnightconfig." + "title")); super(Text.translatable(modid + ".midnightconfig.title"));
this.parent = parent; this.modid = modid; this.parent = parent; this.modid = modid;
this.translationPrefix = modid + ".midnightconfig."; this.translationPrefix = modid + ".midnightconfig.";
loadValuesFromJson(modid); loadValuesFromJson(modid);
@@ -377,7 +372,6 @@ public abstract class MidnightConfig {
values.setValue(value -> getEnumTranslatableText(value, modid, info)); values.setValue(value -> getEnumTranslatableText(value, modid, info));
} }
widget = ButtonWidget.builder(values.getValue().apply(info.value), values.getKey()).dimensions(width - 185, 0, 150, 20).tooltip(info.getTooltip(true)).build(); widget = ButtonWidget.builder(values.getValue().apply(info.value), values.getKey()).dimensions(width - 185, 0, 150, 20).tooltip(info.getTooltip(true)).build();
if (info.dataType == boolean.class) info.actionButton = CheckboxWidget.builder(Text.empty(), textRenderer).callback((checkbox, checked) -> values.getKey().onPress((ButtonWidget) widget)).checked((Boolean) info.value).pos(widget.getX(), 1).build();
} else if (e.isSlider()) } else if (e.isSlider())
widget = new MidnightSliderWidget(width - 185, 0, 150, 20, Text.of(info.tempValue), (Double.parseDouble(info.tempValue) - e.min()) / (e.max() - e.min()), info); widget = new MidnightSliderWidget(width - 185, 0, 150, 20, Text.of(info.tempValue), (Double.parseDouble(info.tempValue) - e.min()) / (e.max() - e.min()), info);
else widget = new TextFieldWidget(textRenderer, width - 185, 0, 150, 20, Text.empty()); else widget = new TextFieldWidget(textRenderer, width - 185, 0, 150, 20, Text.empty());
@@ -490,7 +484,7 @@ public abstract class MidnightConfig {
} }
} }
public void render(DrawContext context, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) { public void render(DrawContext context, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
buttons.forEach(b -> { b.setY(y + (b instanceof CheckboxWidget ? 1 : 0)); b.render(context, mouseX, mouseY, tickDelta);}); buttons.forEach(b -> { b.setY(y); b.render(context, mouseX, mouseY, tickDelta);});
if (title != null) { if (title != null) {
title.setY(y+5); title.setY(y+5);
title.renderWidget(context, mouseX, mouseY, tickDelta); title.renderWidget(context, mouseX, mouseY, tickDelta);

View File

@@ -0,0 +1,8 @@
{
"midnightlib.overview.title": "Visión general de MidnightConfig",
"midnightlib.midnightconfig.title": "Configuración de MidnightLib",
"midnightlib.midnightconfig.config_screen_list": "Habilitar lista de pantallas de configuración",
"midnightlib.midnightconfig.enum.ConfigButton.TRUE": "§aSí",
"modmenu.summaryTranslation.midnightlib": "Librería común para facilitar la configuración.",
"midnightconfig.colorChooser.title": "Elegí un color"
}

View File

@@ -6,7 +6,7 @@ yarn_mappings=1.21.4+build.1
enabled_platforms=fabric,neoforge enabled_platforms=fabric,neoforge
archives_base_name=midnightlib archives_base_name=midnightlib
mod_version=1.7.2 mod_version=1.7.3
maven_group=eu.midnightdust maven_group=eu.midnightdust
release_type=release release_type=release
curseforge_id=488090 curseforge_id=488090

View File

@@ -40,35 +40,6 @@ public class MidnightConfigExample extends MidnightConfig {
QUILT, FABRIC, FORGE, NEOFORGE, VANILLA QUILT, FABRIC, FORGE, NEOFORGE, VANILLA
} }
@Entry(category = TEXT) public static GraphicsSteps graphicsSteps = GraphicsSteps.FABULOUS; // Example for an enum option with TranslatableOption @Entry(category = TEXT) public static GraphicsSteps graphicsSteps = GraphicsSteps.FABULOUS; // Example for an enum option with TranslatableOption
public enum GraphicsSteps implements TranslatableOption {
FAST(0, "options.graphics.fast"),
FANCY(1, "options.graphics.fancy"),
FABULOUS(2, "options.graphics.fabulous");
private final int id;
private final String translationKey;
GraphicsSteps(int id, String translationKey) {
this.id = id;
this.translationKey = translationKey;
}
@Override
public Text getText() {
MutableText mutableText = Text.translatable(this.getTranslationKey());
return this == GraphicsSteps.FABULOUS ? mutableText.formatted(Formatting.ITALIC).formatted(Formatting.AQUA) : mutableText;
}
@Override
public int getId() {
return this.id;
}
@Override
public String getTranslationKey() {
return this.translationKey;
}
}
@Comment(category = TEXT, name = "§nMidnightLib Wiki", centered = true, url = "https://www.midnightdust.eu/wiki/midnightlib/") public static Comment wiki; // Example for a comment with a url @Comment(category = TEXT, name = "§nMidnightLib Wiki", centered = true, url = "https://www.midnightdust.eu/wiki/midnightlib/") public static Comment wiki; // Example for a comment with a url
@@ -155,6 +126,36 @@ public class MidnightConfigExample extends MidnightConfig {
public static int imposter = 16777215; // - Entries without an @Entry or @Comment annotation are ignored public static int imposter = 16777215; // - Entries without an @Entry or @Comment annotation are ignored
public enum GraphicsSteps implements TranslatableOption {
FAST(0, "options.graphics.fast"),
FANCY(1, "options.graphics.fancy"),
FABULOUS(2, "options.graphics.fabulous");
private final int id;
private final String translationKey;
GraphicsSteps(int id, String translationKey) {
this.id = id;
this.translationKey = translationKey;
}
@Override
public Text getText() {
MutableText mutableText = Text.translatable(this.getTranslationKey());
return this == GraphicsSteps.FABULOUS ? mutableText.formatted(Formatting.ITALIC).formatted(Formatting.AQUA) : mutableText;
}
@Override
public int getId() {
return this.id;
}
@Override
public String getTranslationKey() {
return this.translationKey;
}
}
@Condition(requiredModId = "thismoddoesnotexist") @Condition(requiredModId = "thismoddoesnotexist")
@Comment(category = EXTRAS) public static Comment iAmJustADummy; // We only have this to initialize an empty tab for the keybinds below @Comment(category = EXTRAS) public static Comment iAmJustADummy; // We only have this to initialize an empty tab for the keybinds below

View File

@@ -0,0 +1,28 @@
{
"modid.midnightconfig.title": "Soy un título",
"modid.midnightconfig.text1": "Soy un comentario *u*",
"modid.midnightconfig.text2": "Soy un comentario centrado (╯°□°)╯︵ ┻━┻",
"modid.midnightconfig.name": "¡Soy una cadena de texto!",
"modid.midnightconfig.name.label.tooltip": "Soy el tooltip de una etiqueta \n¡Wujuu!",
"modid.midnightconfig.name.tooltip": "Soy un tooltip uwu \nY una nueva línea",
"modid.midnightconfig.fabric": "Soy un entero",
"modid.midnightconfig.world": "Soy un número decimal",
"modid.midnightconfig.showInfo": "Soy un booleano",
"modid.midnightconfig.hello": "¡Soy un entero limitado!",
"modid.midnightconfig.id": "¡Soy un identificador de ítem!",
"modid.midnightconfig.modPlatform": "¡Soy un enumerador!",
"modid.midnightconfig.enum.ModPlatform.FORGE": "Forge",
"modid.midnightconfig.enum.ModPlatform.FABRIC": "Fabric",
"modid.midnightconfig.enum.ModPlatform.QUILT": "Quilt",
"modid.midnightconfig.enum.ModPlatform.NEOFORGE": "NeoForge",
"modid.midnightconfig.enum.ModPlatform.VANILLA": "Vanilla",
"modid.midnightconfig.myFileOrDirectory.fileChooser": "Seleccioná una imagen o carpeta",
"modid.midnightconfig.myFileOrDirectory.fileFilter": "Imágenes compatibles (.png, .jpg, .jpeg)",
"modid.midnightconfig.category.numbers": "Números",
"modid.midnightconfig.category.text": "Texto",
"modid.midnightconfig.category.sliders": "Deslizadores",
"modid.midnightconfig.category.lists": "Listas",
"modid.midnightconfig.category.files": "Archivos",
"modid.midnightconfig.category.conditions": "Cuestionario",
"modid.midnightconfig.category.multiConditions": "Condiciones múltiples"
}