MidnightLib 0.2.4 - 1.17

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

gradle.properties

@@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=21w19a
+	minecraft_version=1.17-pre1
-    yarn_mappings=21w19a+build.9
+    yarn_mappings=1.17-pre1+build.4
     loader_version=0.11.3
 
 # Mod Properties
-	mod_version = 0.2.1
+	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.4+1.17
+	fabric_version=0.34.8+1.17
-	mod_menu_version = 2.0.0-beta.4
+	mod_menu_version = 2.0.2

src/main/java/eu/midnightdust/core/mixin/MixinOptionsScreen.java

@@ -25,6 +25,6 @@ public class MixinOptionsScreen extends Screen {
     @Inject(at = @At("HEAD"),method = "init")
     private void midnightlib$init(CallbackInfo ci) {
         if (MidnightLibConfig.config_screen_list)
-        this.addButton(new TexturedButtonWidget(this.width / 2 + 158, this.height / 6 - 12, 20, 20, 0, 0, 20, MIDNIGHTLIB_ICON_TEXTURE, 32, 64, (buttonWidget) -> Objects.requireNonNull(client).openScreen(new MidnightConfigOverviewScreen(this)), new TranslatableText("narrator.button.midnightlib")));
+        this.addDrawableChild(new TexturedButtonWidget(this.width / 2 + 158, this.height / 6 - 12, 20, 20, 0, 0, 20, MIDNIGHTLIB_ICON_TEXTURE, 32, 64, (buttonWidget) -> Objects.requireNonNull(client).openScreen(new MidnightConfigOverviewScreen(this)), new TranslatableText("narrator.button.midnightlib")));
     }
 }

src/main/java/eu/midnightdust/core/screen/MidnightConfigOverviewScreen.java

@@ -6,6 +6,7 @@ import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 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.*;
@@ -25,19 +26,16 @@ public class MidnightConfigOverviewScreen extends Screen {
 
     @Override
     protected void init() {
-        super.init();
+        this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).openScreen(parent)));
-
-        this.addButton(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, ScreenTexts.DONE, (button) -> {
-            Objects.requireNonNull(client).openScreen(parent);
-        }));
 
         this.list = new MidnightOverviewListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
-        this.children.add(this.list);
+        this.addSelectableChild(this.list);
         MidnightConfig.configClass.forEach((modid, configClass) -> {
             list.addButton(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, new TranslatableText(modid +".midnightconfig.title"), (button) -> {
                 Objects.requireNonNull(client).openScreen(MidnightConfig.getScreen(this,modid));
             }));
         });
+        super.init();
     }
     @Override
     public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
@@ -45,9 +43,9 @@ public class MidnightConfigOverviewScreen extends Screen {
         this.list.render(matrices, mouseX, mouseY, delta);
 
         int stringWidth = title.getString().length() + 47;
-        super.render(matrices, mouseX, mouseY, delta);
         if (MidnightConfig.useTooltipForTitle) renderTooltip(matrices, title, width/2 - stringWidth, 27);
         else drawCenteredText(matrices, textRenderer, title, width / 2, 15, 0xFFFFFF);
+        super.render(matrices, mouseX, mouseY, delta);
     }
     @Environment(EnvType.CLIENT)
     public static class MidnightOverviewListWidget extends ElementListWidget<OverviewButtonEntry> {
@@ -61,19 +59,19 @@ public class MidnightConfigOverviewScreen extends Screen {
         @Override
         public int getScrollbarPositionX() { return this.width -7; }
 
-        public void addButton(AbstractButtonWidget button) {
+        public void addButton(ClickableWidget button) {
             this.addEntry(OverviewButtonEntry.create(button));
         }
         @Override
         public int getRowWidth() { return 400; }
     }
     public static class OverviewButtonEntry extends ElementListWidget.Entry<OverviewButtonEntry> {
-        private final List<AbstractButtonWidget> buttons = new ArrayList<>();
+        private final List<ClickableWidget> buttons = new ArrayList<>();
 
-        private OverviewButtonEntry(AbstractButtonWidget button) {
+        private OverviewButtonEntry(ClickableWidget button) {
             this.buttons.add(button);
         }
-        public static OverviewButtonEntry create(AbstractButtonWidget button) {
+        public static OverviewButtonEntry create(ClickableWidget button) {
             return new OverviewButtonEntry(button);
         }
         public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
@@ -85,5 +83,9 @@ public class MidnightConfigOverviewScreen extends Screen {
         public List<? extends Element> children() {
             return buttons;
         }
+
+        public List<? extends Selectable> method_37025() {
+            return buttons;
+        }
     }
 }

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

@@ -11,15 +11,24 @@ import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawableHelper;
 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;
@@ -30,9 +39,17 @@ import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-// MidnightConfig v1.0.1
+// 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:
 // - Fixed buttons not working in fullscreen
 // - 1.0.0:
@@ -43,7 +60,7 @@ import java.util.regex.Pattern;
 // - Fresh New Design
 
 /** Based on https://github.com/Minenash/TinyConfig
- * Credits to Minenash */
+ *  Credits to Minenash */
 
 @SuppressWarnings("unchecked")
 public class MidnightConfig {
@@ -58,6 +75,7 @@ public class MidnightConfig {
         Field field;
         Object widget;
         int width;
+        int max;
         Map.Entry<TextFieldWidget,Text> error;
         Object defaultValue;
         Object value;
@@ -78,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 {
+                if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) initClient(modid, field, info);
-                    initClient(modid, field, info);
-                } catch (Exception e) {continue;}
             if (field.isAnnotationPresent(Entry.class))
                 try {
                     info.defaultValue = field.get(null);
@@ -99,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 (e != null) {
-            if (type == int.class)         textField(info, Integer::parseInt, INTEGER_ONLY, e.min(), e.max(), true);
+            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 == 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 == String.class) {
-            else if (type == boolean.class) {
+                info.max = e.max() == Double.MAX_VALUE ? Integer.MAX_VALUE : (int) e.max();
-                Function<Object,Text> func = value -> new LiteralText((Boolean) value ? "True" : "False").formatted((Boolean) value ? Formatting.GREEN : Formatting.RED);
+                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());
+                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 -> {
+                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);
     }
 
@@ -168,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;
@@ -200,7 +217,7 @@ public class MidnightConfig {
         protected void init() {
             super.init();
 
-            this.addButton(new ButtonWidget(this.width / 2 - 154, this.height - 28, 150, 20, ScreenTexts.CANCEL, button -> {
+            this.addDrawableChild(new ButtonWidget(this.width / 2 - 154, this.height - 28, 150, 20, ScreenTexts.CANCEL, button -> {
                 try { gson.fromJson(Files.newBufferedReader(path), configClass.get(modid)); }
                 catch (Exception e) { write(modid); }
 
@@ -216,7 +233,7 @@ public class MidnightConfig {
                 Objects.requireNonNull(client).openScreen(parent);
             }));
 
-            ButtonWidget done = this.addButton(new ButtonWidget(this.width / 2 + 4, this.height - 28, 150, 20, ScreenTexts.DONE, (button) -> {
+            ButtonWidget done = this.addDrawableChild(new ButtonWidget(this.width / 2 + 4, this.height - 28, 150, 20, ScreenTexts.DONE, (button) -> {
                 for (EntryInfo info : entries)
                     if (info.id.equals(modid)) {
                         try {
@@ -228,7 +245,7 @@ public class MidnightConfig {
             }));
 
             this.list = new MidnightConfigListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
-            this.children.add(this.list);
+            this.addSelectableChild(this.list);
             for (EntryInfo info : entries) {
                 if (info.id.equals(modid)) {
                     TranslatableText name = new TranslatableText(translationPrefix + info.field.getName());
@@ -243,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);
@@ -265,14 +282,13 @@ public class MidnightConfig {
             this.list.render(matrices, mouseX, mouseY, delta);
 
             int stringWidth = (int) (title.getString().length() * 2.75f);
-            super.render(matrices, mouseX, mouseY, delta);
             if (useTooltipForTitle) renderTooltip(matrices, title, width/2 - stringWidth, 27);
             else drawCenteredText(matrices, textRenderer, title, width / 2, 15, 0xFFFFFF);
 
             for (EntryInfo info : entries) {
                 if (info.id.equals(modid)) {
                     if (list.getHoveredButton(mouseX,mouseY).isPresent()) {
-                        AbstractButtonWidget buttonWidget = list.getHoveredButton(mouseX,mouseY).get();
+                        ClickableWidget buttonWidget = list.getHoveredButton(mouseX,mouseY).get();
                         Text text = ButtonEntry.buttonsWithText.get(buttonWidget);
                         TranslatableText name = new TranslatableText(this.translationPrefix + info.field.getName());
                         String key = translationPrefix + info.field.getName() + ".tooltip";
@@ -287,10 +303,11 @@ public class MidnightConfig {
                     }
                 }
             }
+            super.render(matrices,mouseX,mouseY,delta);
         }
     }
     @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) {
@@ -301,16 +318,16 @@ public class MidnightConfig {
         @Override
         public int getScrollbarPositionX() { return this.width -7; }
 
-        public void addButton(AbstractButtonWidget button, AbstractButtonWidget resetButton, Text text) {
+        public void addButton(ClickableWidget button, ClickableWidget resetButton, Text text) {
             this.addEntry(ButtonEntry.create(button, text, resetButton));
         }
         @Override
         public int getRowWidth() { return 10000; }
-        public Optional<AbstractButtonWidget> getHoveredButton(double mouseX, double mouseY) {
+        public Optional<ClickableWidget> getHoveredButton(double mouseX, double mouseY) {
             for (ButtonEntry buttonEntry : this.children()) {
-                for (AbstractButtonWidget abstractButtonWidget : buttonEntry.buttons) {
+                for (ClickableWidget ClickableWidget : buttonEntry.buttons) {
-                    if (abstractButtonWidget.isMouseOver(mouseX, mouseY)) {
+                    if (ClickableWidget.isMouseOver(mouseX, mouseY)) {
-                        return Optional.of(abstractButtonWidget);
+                        return Optional.of(ClickableWidget);
                     }
                 }
             }
@@ -319,13 +336,13 @@ public class MidnightConfig {
     }
     public static class ButtonEntry extends ElementListWidget.Entry<ButtonEntry> {
         private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
-        private final List<AbstractButtonWidget> buttons = new ArrayList<>();
+        private final List<ClickableWidget> buttons = new ArrayList<>();
-        private final List<AbstractButtonWidget> resetButtons = new ArrayList<>();
+        private final List<ClickableWidget> resetButtons = new ArrayList<>();
         private final List<Text> texts = new ArrayList<>();
-        private final List<AbstractButtonWidget> buttonsWithResetButtons = new ArrayList<>();
+        private final List<ClickableWidget> buttonsWithResetButtons = new ArrayList<>();
-        public static final Map<AbstractButtonWidget, Text> buttonsWithText = new HashMap<>();
+        public static final Map<ClickableWidget, Text> buttonsWithText = new HashMap<>();
 
-        private ButtonEntry(AbstractButtonWidget button, Text text, AbstractButtonWidget resetButton) {
+        private ButtonEntry(ClickableWidget button, Text text, ClickableWidget resetButton) {
             buttonsWithText.put(button,text);
             this.buttons.add(button);
             this.resetButtons.add(resetButton);
@@ -333,15 +350,15 @@ public class MidnightConfig {
             this.buttonsWithResetButtons.add(button);
             this.buttonsWithResetButtons.add(resetButton);
         }
-        public static ButtonEntry create(AbstractButtonWidget button, Text text, AbstractButtonWidget resetButton) {
+        public static ButtonEntry create(ClickableWidget button, Text text, ClickableWidget resetButton) {
             return new ButtonEntry(button, text, resetButton);
         }
         public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
-            this.buttons.forEach((button) -> {
+            this.buttons.forEach(button -> {
                 button.y = y;
                 button.render(matrices, mouseX, mouseY, tickDelta);
             });
-            this.texts.forEach((text) -> DrawableHelper.drawTextWithShadow(matrices,textRenderer, text,12,y+5,0xFFFFFF));
+            this.texts.forEach(text -> DrawableHelper.drawTextWithShadow(matrices,textRenderer, text,12,y+5,0xFFFFFF));
             this.resetButtons.forEach((button) -> {
                 button.y = y;
                 button.render(matrices, mouseX, mouseY, tickDelta);
@@ -350,6 +367,10 @@ public class MidnightConfig {
         public List<? extends Element> children() {
             return buttonsWithResetButtons;
         }
+
+        public List<? extends Selectable> method_37025() {
+            return buttonsWithResetButtons;
+        }
     }
     @Retention(RetentionPolicy.RUNTIME)
     @Target(ElementType.FIELD)

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"
     ]
   },
 
@@ -34,7 +34,7 @@
   ],
 
   "depends": {
-    "fabric": "*"
+    "fabric-renderer-registries-v1": "*"
   },
 
   "custom": {

src/main/resources/midnightcore.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "eu.midnightdust.core.mixin",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "client": [
     "MixinOptionsScreen"
   ],

src/main/resources/midnighthats.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "eu.midnightdust.hats.mixin",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "client": [
     "PlayerEntityRendererMixin"
   ],