diff --git a/gradle.properties b/gradle.properties index 8565a20..7e95e6b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ yarn_mappings=1.21.10+build.2 loader_version=0.17.3 loom_version=1.13-SNAPSHOT -library_version=1.0 +library_version=1.1 maven_group=com.kasetoatz archives_base_name=dacl diff --git a/src/main/java/com/kasetoatz/dacl/options/AbstractButtonOption.java b/src/main/java/com/kasetoatz/dacl/options/AbstractButtonOption.java index 5e727a1..b41cf29 100644 --- a/src/main/java/com/kasetoatz/dacl/options/AbstractButtonOption.java +++ b/src/main/java/com/kasetoatz/dacl/options/AbstractButtonOption.java @@ -5,7 +5,7 @@ import net.minecraft.text.Text; public abstract class AbstractButtonOption extends AbstractOption { - public AbstractButtonOption(String text, String key, T defaultValue) + public AbstractButtonOption(Text text, String key, T defaultValue) { super(text, key, defaultValue); } diff --git a/src/main/java/com/kasetoatz/dacl/options/AbstractInputOption.java b/src/main/java/com/kasetoatz/dacl/options/AbstractInputOption.java index d073e9d..dd8b89f 100644 --- a/src/main/java/com/kasetoatz/dacl/options/AbstractInputOption.java +++ b/src/main/java/com/kasetoatz/dacl/options/AbstractInputOption.java @@ -14,13 +14,13 @@ public abstract class AbstractInputOption extends AbstractOption public InputField textField; private AbstractValidator validator; - public AbstractInputOption(String text, String key, T defaultValue, AbstractValidator validator) + public AbstractInputOption(Text text, String key, T defaultValue, AbstractValidator validator) { super(text, key, defaultValue); this.validator = validator; } - public AbstractInputOption(String text, String key, T defaultValue) + public AbstractInputOption(Text text, String key, T defaultValue) { super(text, key, defaultValue); } diff --git a/src/main/java/com/kasetoatz/dacl/options/AbstractOption.java b/src/main/java/com/kasetoatz/dacl/options/AbstractOption.java index c9b5ee4..553f815 100644 --- a/src/main/java/com/kasetoatz/dacl/options/AbstractOption.java +++ b/src/main/java/com/kasetoatz/dacl/options/AbstractOption.java @@ -10,9 +10,9 @@ public abstract class AbstractOption private final T defaultValue; private T value; - public AbstractOption(String text, String key, T defaultValue) + public AbstractOption(Text text, String key, T defaultValue) { - this.text = Text.of(text); + this.text = text; this.key = key; this.defaultValue = defaultValue; this.value = defaultValue; diff --git a/src/main/java/com/kasetoatz/dacl/options/BoolOption.java b/src/main/java/com/kasetoatz/dacl/options/BoolOption.java index 2b074ca..0b4380c 100644 --- a/src/main/java/com/kasetoatz/dacl/options/BoolOption.java +++ b/src/main/java/com/kasetoatz/dacl/options/BoolOption.java @@ -9,7 +9,7 @@ import static com.kasetoatz.dacl.DumbassConfig.BOOLEAN_TRUE_COLOR; public class BoolOption extends AbstractButtonOption { - public BoolOption(String text, String key, boolean defaultValue) + public BoolOption(Text text, String key, boolean defaultValue) { super(text, key, defaultValue); } @@ -17,7 +17,7 @@ public class BoolOption extends AbstractButtonOption @Override public Text getButtonText() { - return this.getValue() ? Text.literal("True").withColor(BOOLEAN_TRUE_COLOR) : Text.literal("False").withColor(BOOLEAN_FALSE_COLOR); + return this.getValue() ? Text.translatable("text.button.true").withColor(BOOLEAN_TRUE_COLOR) : Text.translatable("text.button.false").withColor(BOOLEAN_FALSE_COLOR); } @Override diff --git a/src/main/java/com/kasetoatz/dacl/options/FloatOption.java b/src/main/java/com/kasetoatz/dacl/options/FloatOption.java index 121bd80..7fb1af2 100644 --- a/src/main/java/com/kasetoatz/dacl/options/FloatOption.java +++ b/src/main/java/com/kasetoatz/dacl/options/FloatOption.java @@ -2,15 +2,16 @@ package com.kasetoatz.dacl.options; import com.google.gson.JsonElement; import com.kasetoatz.dacl.options.validators.AbstractValidator; +import net.minecraft.text.Text; public class FloatOption extends AbstractInputOption { - public FloatOption(String text, String key, Float defaultValue, AbstractValidator validator) + public FloatOption(Text text, String key, Float defaultValue, AbstractValidator validator) { super(text, key, defaultValue, validator); } - public FloatOption(String text, String key, Float defaultValue) + public FloatOption(Text text, String key, Float defaultValue) { super(text, key, defaultValue); } diff --git a/src/main/java/com/kasetoatz/dacl/options/IntOption.java b/src/main/java/com/kasetoatz/dacl/options/IntOption.java index 7e13eb6..d41d3b0 100644 --- a/src/main/java/com/kasetoatz/dacl/options/IntOption.java +++ b/src/main/java/com/kasetoatz/dacl/options/IntOption.java @@ -2,15 +2,16 @@ package com.kasetoatz.dacl.options; import com.google.gson.JsonElement; import com.kasetoatz.dacl.options.validators.AbstractValidator; +import net.minecraft.text.Text; public class IntOption extends AbstractInputOption { - public IntOption(String text, String key, Integer defaultValue, AbstractValidator validator) + public IntOption(Text text, String key, Integer defaultValue, AbstractValidator validator) { super(text, key, defaultValue, validator); } - public IntOption(String text, String key, Integer defaultValue) + public IntOption(Text text, String key, Integer defaultValue) { super(text, key, defaultValue); } diff --git a/src/main/java/com/kasetoatz/dacl/options/SubOption.java b/src/main/java/com/kasetoatz/dacl/options/SubOption.java index 6d2fa21..694b0a3 100644 --- a/src/main/java/com/kasetoatz/dacl/options/SubOption.java +++ b/src/main/java/com/kasetoatz/dacl/options/SubOption.java @@ -17,7 +17,7 @@ public class SubOption extends AbstractButtonOption private final Gson gson = new GsonBuilder().setPrettyPrinting().create(); private ConfigScreen ui; - private SubOption(String text, String key) + private SubOption(Text text, String key) { super(text, key, null); } @@ -25,7 +25,7 @@ public class SubOption extends AbstractButtonOption @Override public Text getButtonText() { - return Text.literal("Open"); + return Text.translatable("text.button.suboption"); } @Override @@ -56,7 +56,7 @@ public class SubOption extends AbstractButtonOption } } - public static Builder builder(String text, String key) + public static Builder builder(Text text, String key) { return new Builder(text, key); } @@ -65,7 +65,7 @@ public class SubOption extends AbstractButtonOption { private final SubOption option; - private Builder(String text, String key) + private Builder(Text text, String key) { this.option = new SubOption(text, key); } diff --git a/src/main/java/com/kasetoatz/dacl/options/validators/RangeValidator.java b/src/main/java/com/kasetoatz/dacl/options/validators/RangeValidator.java index 58f3ff0..eae64cc 100644 --- a/src/main/java/com/kasetoatz/dacl/options/validators/RangeValidator.java +++ b/src/main/java/com/kasetoatz/dacl/options/validators/RangeValidator.java @@ -1,5 +1,7 @@ package com.kasetoatz.dacl.options.validators; +import net.minecraft.text.Text; + public class RangeValidator> extends AbstractValidator { private final T min; @@ -28,19 +30,14 @@ public class RangeValidator> extends AbstractVa @Override public String getErrorMessage() { - String error = "Number must be "; if (min == null && max != null) { - error += "smaller than " + max; + return Text.translatable("error.range.smaller", max).toString(); } - else if (min != null && max == null) + if (min != null && max == null) { - error += "larger than " + min; + return Text.translatable("error.range.larger", min).toString(); } - else - { - error += "between " + min + " and " + max; - } - return error; + return Text.translatable("error.range.between", min, max).toString(); } } diff --git a/src/main/resources/assets/dacl/lang/en_us.json b/src/main/resources/assets/dacl/lang/en_us.json new file mode 100644 index 0000000..4195ad1 --- /dev/null +++ b/src/main/resources/assets/dacl/lang/en_us.json @@ -0,0 +1,8 @@ +{ + "text.button.true": "True", + "text.button.false": "False", + "error.range.smaller": "Number must be smaller than %s", + "error.range.larger": "Number must be larger than %s", + "error.range.between": "Number must be between %s and %s", + "text.button.suboption": "Open" +} \ No newline at end of file