MidnightLib 0.2.4 - 1.17

MidnightConfig v1.0.4:
- Number field length is now configurable
- Fixed number fields being empty

gradle.properties

@@ -8,11 +8,11 @@ org.gradle.jvmargs=-Xmx1G
     loader_version=0.11.3
 
 # Mod Properties
-	mod_version = 0.2.2
+	mod_version = 0.2.4
 	maven_group = eu.midnightdust
 	archives_base_name = midnightlib
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
 	fabric_version=0.34.8+1.17
-	mod_menu_version = 2.0.0-mnd
+	mod_menu_version = 2.0.2

src/main/java/eu/midnightdust/hats/config/ModMenuIntegration.java

@@ -1,16 +0,0 @@
-package eu.midnightdust.hats.config;
-
-import com.terraformersmc.modmenu.api.ConfigScreenFactory;
-import com.terraformersmc.modmenu.api.ModMenuApi;
-import eu.midnightdust.lib.config.MidnightConfig;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-
-@Environment(EnvType.CLIENT)
-public class ModMenuIntegration implements ModMenuApi {
-
-    @Override
-    public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return parent -> MidnightConfig.getScreen(parent, "midnightlib");
-    }
-}

src/main/java/eu/midnightdust/lib/config/AutoModMenu.java

@@ -0,0 +1,23 @@
+package eu.midnightdust.lib.config;
+
+import com.google.common.collect.ImmutableMap;
+import com.terraformersmc.modmenu.api.ConfigScreenFactory;
+import com.terraformersmc.modmenu.api.ModMenuApi;
+import eu.midnightdust.core.config.MidnightLibConfig;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class AutoModMenu implements ModMenuApi {
+    @Override
+    public ConfigScreenFactory<?> getModConfigScreenFactory() {
+        return parent -> MidnightLibConfig.getScreen(parent,"midnightlib");
+    }
+
+    @Override
+    public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
+        HashMap<String, ConfigScreenFactory<?>> map = new HashMap<>();
+        MidnightConfig.configClass.forEach((modid, cClass) -> map.put(modid, parent -> MidnightConfig.getScreen(parent, modid)));
+        return map;
+    }
+}

src/main/java/eu/midnightdust/lib/config/MidnightConfig.java

@@ -14,13 +14,21 @@ import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.Selectable;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ScreenTexts;
-import net.minecraft.client.gui.widget.*;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.widget.ClickableWidget;
+import net.minecraft.client.gui.widget.ElementListWidget;
+import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.*;
+import net.minecraft.text.LiteralText;
+import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Formatting;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.nio.file.Files;
@@ -31,9 +39,15 @@ import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-// MidnightConfig v1.0.2
+// MidnightConfig v1.0.4
 // Single class config library - feel free to copy!
 // Changelog:
+// - 1.0.4:
+// - Number field length is now configurable
+// - Fixed number fields being empty
+// - 1.0.3:
+// - Text field length is now configurable
+// - Better separation of client and server
 // - 1.0.2:
 // - Update to 21w20a
 // - 1.0.1:
@@ -61,6 +75,7 @@ public class MidnightConfig {
         Field field;
         Object widget;
         int width;
+        int max;
         Map.Entry<TextFieldWidget,Text> error;
         Object defaultValue;
         Object value;
@@ -81,9 +96,7 @@ public class MidnightConfig {
         for (Field field : config.getFields()) {
             EntryInfo info = new EntryInfo();
             if (field.isAnnotationPresent(Entry.class) || field.isAnnotationPresent(Comment.class))
-                try {
-                    initClient(modid, field, info);
-                } catch (Exception e) {continue;}
+                if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) initClient(modid, field, info);
             if (field.isAnnotationPresent(Entry.class))
                 try {
                     info.defaultValue = field.get(null);
@@ -102,32 +115,35 @@ public class MidnightConfig {
         }
     }
     @Environment(EnvType.CLIENT)
-    public static void initClient(String modid, Field field, EntryInfo info) {
+    private static void initClient(String modid, Field field, EntryInfo info) {
         Class<?> type = field.getType();
         Entry e = field.getAnnotation(Entry.class);
         info.width = e != null ? e.width() : 0;
         info.field = field;
         info.id = modid;
 
-        if (e != null)
-            if (type == int.class)         textField(info, Integer::parseInt, INTEGER_ONLY, e.min(), e.max(), true);
-            else if (type == double.class) textField(info, Double::parseDouble, DECIMAL_ONLY, e.min(), e.max(),false);
-            else if (type == String.class) textField(info, String::length, null, Math.min(e.min(),0), Math.max(e.max(),1),true);
-            else if (type == boolean.class) {
-                Function<Object,Text> func = value -> new LiteralText((Boolean) value ? "True" : "False").formatted((Boolean) value ? Formatting.GREEN : Formatting.RED);
+        if (e != null) {
+            if (type == int.class) textField(info, Integer::parseInt, INTEGER_ONLY, e.min(), e.max(), true);
+            else if (type == double.class) textField(info, Double::parseDouble, DECIMAL_ONLY, e.min(), e.max(), false);
+            else if (type == String.class) {
+                info.max = e.max() == Double.MAX_VALUE ? Integer.MAX_VALUE : (int) e.max();
+                textField(info, String::length, null, Math.min(e.min(), 0), Math.max(e.max(), 1), true);
+            } else if (type == boolean.class) {
+                Function<Object, Text> func = value -> new LiteralText((Boolean) value ? "True" : "False").formatted((Boolean) value ? Formatting.GREEN : Formatting.RED);
                 info.widget = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object, Text>>(button -> {
                     info.value = !(Boolean) info.value;
                     button.setMessage(func.apply(info.value));
                 }, func);
             } else if (type.isEnum()) {
                 List<?> values = Arrays.asList(field.getType().getEnumConstants());
-                Function<Object,Text> func = value -> new TranslatableText(modid + ".midnightconfig." + "enum." + type.getSimpleName() + "." + info.value.toString());
-                info.widget = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object,Text>>( button -> {
+                Function<Object, Text> func = value -> new TranslatableText(modid + ".midnightconfig." + "enum." + type.getSimpleName() + "." + info.value.toString());
+                info.widget = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object, Text>>(button -> {
                     int index = values.indexOf(info.value) + 1;
-                    info.value = values.get(index >= values.size()? 0 : index);
+                    info.value = values.get(index >= values.size() ? 0 : index);
                     button.setMessage(func.apply(info.value));
                 }, func);
             }
+        }
         entries.add(info);
     }
 
@@ -171,16 +187,14 @@ public class MidnightConfig {
             e.printStackTrace();
         }
     }
-
     @Environment(EnvType.CLIENT)
     public static Screen getScreen(Screen parent, String modid) {
-        return new TinyConfigScreen(parent, modid);
+        return new MidnightConfigScreen(parent, modid);
     }
-
     @Environment(EnvType.CLIENT)
-    private static class TinyConfigScreen extends Screen {
+    private static class MidnightConfigScreen extends Screen {
 
-        protected TinyConfigScreen(Screen parent, String modid) {
+        protected MidnightConfigScreen(Screen parent, String modid) {
             super(new TranslatableText(modid + ".midnightconfig." + "title"));
             this.parent = parent;
             this.modid = modid;
@@ -246,10 +260,10 @@ public class MidnightConfig {
                     if (info.widget instanceof Map.Entry) {
                         Map.Entry<ButtonWidget.PressAction, Function<Object, Text>> widget = (Map.Entry<ButtonWidget.PressAction, Function<Object, Text>>) info.widget;
                         if (info.field.getType().isEnum()) widget.setValue(value -> new TranslatableText(translationPrefix + "enum." + info.field.getType().getSimpleName() + "." + info.value.toString()));
-                        this.list.addButton(new ButtonWidget(width - 110, 0, info.width, 20, widget.getValue().apply(info.value), widget.getKey()),resetButton,name);
+                        this.list.addButton(new ButtonWidget(width - 110, 0,100, 20, widget.getValue().apply(info.value), widget.getKey()),resetButton,name);
                     } else if (info.widget != null) {
-                        TextFieldWidget widget = new TextFieldWidget(textRenderer, width - 110, 0, info.width, 20, null);
-
+                        TextFieldWidget widget = new TextFieldWidget(textRenderer, width - 110, 0, 100, 20, null);
+                        widget.setMaxLength(info.width);
                         widget.setText(info.tempValue);
                         Predicate<String> processor = ((BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) info.widget).apply(widget, done);
                         widget.setTextPredicate(processor);
@@ -293,7 +307,7 @@ public class MidnightConfig {
         }
     }
     @Environment(EnvType.CLIENT)
-    public static class MidnightConfigListWidget extends ElementListWidget<MidnightConfig.ButtonEntry> {
+    public static class MidnightConfigListWidget extends ElementListWidget<ButtonEntry> {
         TextRenderer textRenderer;
 
         public MidnightConfigListWidget(MinecraftClient minecraftClient, int i, int j, int k, int l, int m) {

src/main/resources/fabric.mod.json

@@ -24,7 +24,7 @@
       "eu.midnightdust.core.MidnightLibClient"
     ],
     "modmenu": [
-      "eu.midnightdust.hats.config.ModMenuIntegration"
+      "eu.midnightdust.lib.config.AutoModMenu"
     ]
   },