Merge b7c9d83078 into 9602736335

build.gradle

@@ -3,7 +3,7 @@ import groovy.json.JsonOutput
 
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.11-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
     id "me.shedaniel.unified-publishing" version "0.1.+" apply false
     id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
 }

common/build.gradle

@@ -1,7 +1,3 @@
-plugins {
-    id 'java'
-}
-
 architectury {
     common(rootProject.enabled_platforms.split(","))
 }
@@ -25,16 +21,3 @@ publishing {
         // Add repositories to publish to here.
     }
 }
-
-configurations {
-    testOutput.extendsFrom(testImplementation)
-}
-
-tasks.register('testJar', Jar) {
-    from sourceSets.test.output
-    archiveClassifier = 'tests'
-}
-
-artifacts {
-    testOutput testJar
-}

common/src/main/java/eu/midnightdust/core/MidnightLib.java

@@ -3,7 +3,8 @@ package eu.midnightdust.core;
 import eu.midnightdust.core.config.MidnightLibConfig;
 import eu.midnightdust.lib.config.AutoCommand;
 import eu.midnightdust.lib.config.MidnightConfig;
-import net.minecraft.util.Util;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -12,23 +13,24 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
+import static net.minecraft.client.MinecraftClient.IS_SYSTEM_MAC;
+
 public class MidnightLib {
     public static List<String> hiddenMods = new ArrayList<>();
     public static final String MOD_ID = "midnightlib";
     public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
 
+    @Environment(EnvType.CLIENT)
     public static void onInitializeClient() {
-        try {
+        try { if (!IS_SYSTEM_MAC) {
-            if (Util.getOperatingSystem() != Util.OperatingSystem.OSX) {
+            System.setProperty("java.awt.headless", "false");
-                System.setProperty("java.awt.headless", "false");
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+        }} catch (Exception | Error e) { LOGGER.error("Error setting system look and feel", e); }
-            }
-        } catch (Exception | Error e) { LOGGER.error("Error setting system look and feel", e); }
         MidnightLibConfig.init(MOD_ID, MidnightLibConfig.class);
     }
     public static void registerAutoCommand() {
-        MidnightConfig.configInstances.forEach((modid, config) -> {
+        MidnightConfig.configClass.forEach((modid, config) -> {
-            for (Field field : config.configClass.getFields()) {
+            for (Field field : config.getFields()) {
                 if (field.isAnnotationPresent(MidnightConfig.Entry.class) && !field.isAnnotationPresent(MidnightConfig.Client.class) && !field.isAnnotationPresent(MidnightConfig.Hidden.class))
                     new AutoCommand(field, modid);
             }

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

@@ -2,6 +2,8 @@ package eu.midnightdust.core.screen;
 
 import eu.midnightdust.core.MidnightLib;
 import eu.midnightdust.lib.config.MidnightConfig;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
@@ -13,8 +15,9 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
-import eu.midnightdust.lib.config.MidnightConfigListWidget;
+import static eu.midnightdust.lib.config.MidnightConfig.MidnightConfigListWidget;
 
+@Environment(EnvType.CLIENT)
 public class MidnightConfigOverviewScreen extends Screen {
 
     public MidnightConfigOverviewScreen(Screen parent) {
@@ -29,7 +32,7 @@ public class MidnightConfigOverviewScreen extends Screen {
         this.addDrawableChild(ButtonWidget.builder(ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)).dimensions(this.width / 2 - 100, this.height - 26, 200, 20).build());
 
         this.addSelectableChild(this.list = new MidnightConfigListWidget(this.client, this.width, this.height - 57, 24, 25));
-        List<String> sortedMods = new ArrayList<>(MidnightConfig.configInstances.keySet());
+        List<String> sortedMods = new ArrayList<>(MidnightConfig.configClass.keySet());
         Collections.sort(sortedMods);
         sortedMods.forEach((modid) -> {
             if (!MidnightLib.hiddenMods.contains(modid)) {

common/src/main/java/eu/midnightdust/lib/config/ButtonEntry.java

@@ -1,78 +0,0 @@
-package eu.midnightdust.lib.config;
-
-import com.google.common.collect.Lists;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.Click;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.Element;
-import net.minecraft.client.gui.Selectable;
-import net.minecraft.client.gui.screen.ConfirmLinkScreen;
-import net.minecraft.client.gui.widget.ClickableWidget;
-import net.minecraft.client.gui.widget.ElementListWidget;
-import net.minecraft.client.gui.widget.MultilineTextWidget;
-import net.minecraft.registry.Registries;
-import net.minecraft.text.Text;
-import net.minecraft.util.Identifier;
-
-import java.util.List;
-
-public class ButtonEntry extends ElementListWidget.Entry<ButtonEntry> {
-    private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
-    public final Text text;
-    public final List<ClickableWidget> buttons;
-    public final EntryInfo info;
-    public boolean centered = false;
-    public MultilineTextWidget title;
-
-    public ButtonEntry(List<ClickableWidget> buttons, Text text, EntryInfo info) {
-        this.buttons = buttons;
-        this.text = text;
-        this.info = info;
-        if (info != null && info.comment != null)
-            this.centered = info.comment.centered();
-        int scaledWidth = MinecraftClient.getInstance().getWindow().getScaledWidth();
-
-        if (text != null && (!text.getString().contains("spacer") || !buttons.isEmpty())) {
-            title = new MultilineTextWidget(12, 0, Text.of(text), textRenderer).setCentered(centered);
-            if (info != null)
-                title.setTooltip(info.getTooltip(false));
-            title.setMaxWidth(!buttons.isEmpty() ? buttons.get(buttons.size() > 2 ? buttons.size() - 1 : 0).getX() - 16 : scaledWidth - 24);
-            if (centered) title.setX(scaledWidth / 2 - (title.getWidth() / 2));
-        }
-    }
-
-    public void render(DrawContext context, int mouseX, int mouseY, boolean hovered, float tickDelta) {
-        buttons.forEach(b -> {
-            b.setY(this.getY());
-            b.render(context, mouseX, mouseY, tickDelta);
-        });
-        if (title != null) {
-            title.setY(this.getY() + 5);
-            title.render(context, mouseX, mouseY, tickDelta);
-
-            if (info.entry != null && !this.buttons.isEmpty() && this.buttons.getFirst() instanceof ClickableWidget widget) {
-                int idMode = this.info.entry.idMode();
-                if (idMode != -1) context.drawItem(idMode == 0 ?
-                                Registries.ITEM.get(Identifier.tryParse(this.info.tempValue)).getDefaultStack()
-                                : Registries.BLOCK.get(Identifier.tryParse(this.info.tempValue)).asItem().getDefaultStack(),
-                        widget.getX() + widget.getWidth() - 18, this.getY() + 2);
-            }
-        }
-    }
-
-    @Override
-    public boolean mouseClicked(Click click, boolean doubled) {
-        if (this.info != null && this.info.comment != null && !this.info.comment.url().isBlank())
-            ConfirmLinkScreen.open(MinecraftClient.getInstance().currentScreen, this.info.comment.url(), true);
-        return super.mouseClicked(click, doubled);
-    }
-
-    public List<? extends Element> children() {
-        return Lists.newArrayList(buttons);
-    }
-
-    public List<? extends Selectable> selectableChildren() {
-        return Lists.newArrayList(buttons);
-    }
-}

common/src/main/java/eu/midnightdust/lib/config/EntryInfo.java

@@ -1,104 +0,0 @@
-package eu.midnightdust.lib.config;
-
-import eu.midnightdust.lib.util.PlatformFunctions;
-import net.minecraft.client.gui.tab.Tab;
-import net.minecraft.client.gui.tooltip.Tooltip;
-import net.minecraft.client.gui.widget.ClickableWidget;
-import net.minecraft.client.resource.language.I18n;
-import net.minecraft.text.Text;
-
-import java.lang.reflect.Field;
-import java.util.List;
-
-public class EntryInfo {
-    public MidnightConfig.Entry entry;
-    public MidnightConfig.Comment comment;
-    public MidnightConfig.Condition[] conditions;
-    public final Field field;
-    public final Class<?> dataType;
-    public final String modid, fieldName, translationKey;
-    int listIndex;
-    Object defaultValue, value, function;
-    String tempValue;   // The value visible in the config screen
-    boolean inLimits = true;
-    Text error;
-    ClickableWidget actionButton; // color picker button / explorer button
-    Tab tab;
-    boolean conditionsMet = true;
-
-    public EntryInfo(Field field, String modid) {
-        this.field = field;
-        this.modid = modid;
-        if (field != null) {
-            this.fieldName = field.getName();
-            this.dataType = MidnightConfig.getUnderlyingType(field);
-            this.entry = field.getAnnotation(MidnightConfig.Entry.class);
-            this.comment = field.getAnnotation(MidnightConfig.Comment.class);
-            this.conditions = field.getAnnotationsByType(MidnightConfig.Condition.class);
-        } else {
-            this.fieldName = "";
-            this.dataType = null;
-        }
-
-        if (entry != null && !entry.name().isEmpty())
-            this.translationKey = entry.name();
-        else if (comment != null && !comment.name().isEmpty())
-            this.translationKey = comment.name();
-        else this.translationKey = modid + ".midnightconfig." + fieldName;
-    }
-
-    public void setValue(Object value) {
-        if (this.field.getType() != List.class) {
-            this.value = value;
-            this.tempValue = value.toString();
-        } else {
-            writeList(this.listIndex, value);
-            this.tempValue = toTemporaryValue();
-        }
-    }
-
-    public String toTemporaryValue() {
-        if (this.field.getType() != List.class) return this.value.toString();
-        else try {
-            return ((List<?>) this.value).get(this.listIndex).toString();
-        } catch (Exception ignored) {
-            return "";
-        }
-    }
-
-    public void updateFieldValue() {
-        try {
-            if (this.field.get(null) != value) MidnightConfig.entries.values().forEach(EntryInfo::updateConditions);
-            this.field.set(null, this.value);
-        } catch (IllegalAccessException ignored) {
-        }
-    }
-
-    public void updateConditions() {
-        boolean prevConditionState = this.conditionsMet;
-        if (this.conditions.length > 0) this.conditionsMet = true;    // reset conditions
-        for (MidnightConfig.Condition condition : this.conditions) {
-            //noinspection ConstantValue
-            if (!condition.requiredModId().isEmpty() && !PlatformFunctions.isModLoaded(condition.requiredModId()))
-                this.conditionsMet = false;
-            String requiredOption = condition.requiredOption().contains(":") ? condition.requiredOption() : (this.modid + ":" + condition.requiredOption());
-            if (MidnightConfig.entries.get(requiredOption) instanceof EntryInfo info)
-                this.conditionsMet &= List.of(condition.requiredValue()).contains(info.tempValue);
-            if (!this.conditionsMet) break;
-        }
-        if (prevConditionState != this.conditionsMet) MidnightConfig.configInstances.get(modid).reloadScreen = true;
-    }
-
-    public <T> void writeList(int index, T value) {
-        //noinspection unchecked
-        var list = (List<T>) this.value;
-        if (index >= list.size())
-            list.add(value);
-        else list.set(index, value);
-    }
-
-    public Tooltip getTooltip(boolean isButton) {
-        String key = translationKey + (!isButton ? ".label" : "") + ".tooltip";
-        return Tooltip.of(isButton && this.error != null ? this.error : I18n.hasTranslation(key) ? Text.translatable(key) : Text.empty());
-    }
-}

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

@@ -1,34 +1,40 @@
 package eu.midnightdust.lib.config;
 
-import com.google.gson.*;
+import com.google.common.collect.Lists;
-import com.google.gson.stream.*;
+import com.google.gson.*; import com.google.gson.stream.*;
 import eu.midnightdust.lib.util.PlatformFunctions;
-import net.minecraft.client.gui.screen.Screen;
+import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment;
-import net.minecraft.client.gui.widget.*;
+import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gl.RenderPipelines;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.Element; import net.minecraft.client.gui.Selectable;
+import net.minecraft.client.gui.screen.ConfirmLinkScreen; import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.tab.GridScreenTab; import net.minecraft.client.gui.tab.Tab; import net.minecraft.client.gui.tab.TabManager;
+import net.minecraft.client.gui.tooltip.Tooltip; import net.minecraft.client.gui.widget.*;
 import net.minecraft.client.resource.language.I18n;
-import net.minecraft.text.Style;
+import net.minecraft.registry.Registries;
-import net.minecraft.text.Text;
+import net.minecraft.screen.ScreenTexts;
-import net.minecraft.util.*;
+import net.minecraft.text.Style; import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableTextContent;
+import net.minecraft.util.Formatting; import net.minecraft.util.Identifier;
+import net.minecraft.util.TranslatableOption;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
+import javax.swing.*; import javax.swing.filechooser.FileNameExtensionFilter;
 import java.awt.Color;
 import java.io.IOException;
 import java.lang.annotation.*;
-import java.lang.reflect.Field;
+import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Modifier;
+import java.nio.file.Files; import java.nio.file.Path;
-import java.lang.reflect.ParameterizedType;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.*;
-import java.util.function.BiFunction;
+import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.Predicate;
-import java.util.function.Function;
-import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
+import static net.minecraft.client.MinecraftClient.IS_SYSTEM_MAC;
+
 /** MidnightConfig by Martin "Motschen" Prokoph
- *  Minimalist config library - feel free to copy!
+ *  Single class config library - feel free to copy!
- *  Originally based on <a href="https://github.com/Minenash/TinyConfig">...</a>
+ *  Based on <a href="https://github.com/Minenash/TinyConfig">...</a>
  *  Credits to Minenash */
 
 @SuppressWarnings("unchecked")
@@ -36,53 +42,122 @@ public abstract class MidnightConfig {
     private static final Pattern INTEGER_ONLY = Pattern.compile("(-?[0-9]*)");
     private static final Pattern DECIMAL_ONLY = Pattern.compile("-?(\\d+\\.?\\d*|\\d*\\.?\\d+|\\.)");
     private static final Pattern HEXADECIMAL_ONLY = Pattern.compile("(-?[#0-9a-fA-F]*)");
+
+    private static final LinkedHashMap<String, EntryInfo> entries = new LinkedHashMap<>();    // modid:fieldName -> EntryInfo
+    private static boolean reloadScreen = false;
+
+    public static class EntryInfo {
+        public Entry entry;
+        public Comment comment;
+        public Condition[] conditions;
+        public final Field field;
+        public final Class<?> dataType;
+        public final String modid, fieldName;
+        int listIndex;
+        Object defaultValue, value, function;
+        String tempValue;   // The value visible in the config screen
+        boolean inLimits = true;
+        Text name, error;
+        ClickableWidget actionButton; // color picker button / explorer button
+        Tab tab;
+        boolean conditionsMet = true;
+
+        public EntryInfo(Field field, String modid) {
+            this.field = field; this.modid = modid;
+            if (field != null) {
+                this.fieldName = field.getName();
+                this.dataType = getUnderlyingType(field);
+                this.entry = field.getAnnotation(Entry.class);
+                this.comment = field.getAnnotation(Comment.class);
+                this.conditions = field.getAnnotationsByType(Condition.class);
+            } else { this.fieldName = ""; this.dataType = null; }
+            if (entry != null && !entry.name().isEmpty()) this.name = Text.translatable(entry.name());
+            else if (comment != null && !comment.name().isEmpty()) this.name = Text.translatable(comment.name());
+        }
+        public void setValue(Object value) {
+            if (this.field.getType() != List.class) { this.value = value;
+                this.tempValue = value.toString();
+            } else { writeList(this.listIndex, value);
+                this.tempValue = toTemporaryValue(); }
+        }
+        public String toTemporaryValue() {
+            if (this.field.getType() != List.class) return this.value.toString();
+            else try { return ((List<?>) this.value).get(this.listIndex).toString(); } catch (Exception ignored) {return "";}
+        }
+        public void updateFieldValue() {
+            try {
+                if (this.field.get(null) != value) entries.values().forEach(EntryInfo::updateConditions);
+                this.field.set(null, this.value);
+            } catch (IllegalAccessException ignored) {}
+        }
+        @SuppressWarnings("ConstantValue") //pertains to requiredModLoaded
+        public void updateConditions() {
+            boolean prevConditionState = this.conditionsMet;
+            if (this.conditions.length > 0) this.conditionsMet = true;    // reset conditions
+            for (Condition condition : this.conditions) {
+                if (!condition.requiredModId().isEmpty() && !PlatformFunctions.isModLoaded(condition.requiredModId()))
+                    this.conditionsMet = false;
+                String requiredOption = condition.requiredOption().contains(":") ? condition.requiredOption() : (this.modid + ":" + condition.requiredOption());
+                if (entries.get(requiredOption) instanceof EntryInfo info)
+                    this.conditionsMet &= List.of(condition.requiredValue()).contains(info.tempValue);
+                if (!this.conditionsMet) break;
+            }
+            if (prevConditionState != this.conditionsMet) reloadScreen = true;
+        }
+        public <T> void writeList(int index, T value) {
+            var list = (List<T>) this.value;
+            if (index >= list.size()) list.add(value);
+            else list.set(index, value);
+        }
+        public Tooltip getTooltip(boolean isButton) {
+            String key = this.modid + ".midnightconfig."+this.fieldName+(!isButton ? ".label" : "" )+".tooltip";
+            return Tooltip.of(isButton && this.error != null ? this.error : I18n.hasTranslation(key) ? Text.translatable(key) : Text.empty());
+        }
+    }
+
+    public static final Map<String, Class<? extends MidnightConfig>> configClass = new HashMap<>();
+    private static Path path;
+
     private static final Gson gson = new GsonBuilder()
-            .excludeFieldsWithModifiers(Modifier.TRANSIENT).excludeFieldsWithModifiers(Modifier.PRIVATE).excludeFieldsWithModifiers(Modifier.FINAL)
+            .excludeFieldsWithModifiers(Modifier.TRANSIENT).excludeFieldsWithModifiers(Modifier.PRIVATE)
-            .addSerializationExclusionStrategy(new ExclusionStrategy() {
+            .addSerializationExclusionStrategy(new NonEntryExclusionStrategy())
-                public boolean shouldSkipClass(Class<?> clazz) { return false; }
-                public boolean shouldSkipField(FieldAttributes fieldAttributes) { return fieldAttributes.getAnnotation(Entry.class) == null; }
-            })
             .registerTypeAdapter(Identifier.class, new TypeAdapter<Identifier>() {
                 public void write(JsonWriter out, Identifier id) throws IOException { out.value(id.toString()); }
                 public Identifier read(JsonReader in) throws IOException { return Identifier.of(in.nextString()); }
             }).setPrettyPrinting().create();
 
-    protected static final LinkedHashMap<String, EntryInfo> entries = new LinkedHashMap<>();    // modid:fieldName -> EntryInfo
+    public static void loadValuesFromJson(String modid) {
-
+        try { gson.fromJson(Files.newBufferedReader(path), configClass.get(modid)); }
-    public static final Map<String, MidnightConfig> configInstances = new HashMap<>();
+        catch (Exception e) { write(modid); }
-
+        entries.values().forEach(info -> {
-    protected String modid;
+            if (info.field != null && info.entry != null) {
-    protected boolean reloadScreen = false;
+                try {
-    public Class<? extends MidnightConfig> configClass;
+                    info.value = info.field.get(null) == null ? info.defaultValue : info.field.get(null);
-
+                    info.tempValue = info.toTemporaryValue();
-    public static <T extends MidnightConfig> T createInstance(String modid, Class<? extends MidnightConfig> configClass) { // This is basically an argumented constructor without the requirement of having one in each config class
+                    info.updateConditions();
-        try {
+                } catch (IllegalAccessException ignored) {}
-            T instance = (T) configClass.getDeclaredConstructor().newInstance();
+            }
-            instance.modid = modid;
+        });
-            instance.configClass = configClass;
-            configInstances.put(modid, instance);
-            return instance;
-        }
-        catch (Exception e) { throw new RuntimeException(e); }
     }
-
     public static void init(String modid, Class<? extends MidnightConfig> config) {
-        MidnightConfig instance = createInstance(modid, config);
+        path = PlatformFunctions.getConfigDirectory().resolve(modid + ".json");
+        configClass.put(modid, config);
 
         for (Field field : config.getFields()) {
-            //noinspection ConstantValue
+            EntryInfo info = new EntryInfo(field, modid);
-            if ((field.isAnnotationPresent(Entry.class) || field.isAnnotationPresent(Comment.class))
+            if ((field.isAnnotationPresent(Entry.class) || field.isAnnotationPresent(Comment.class)) && !field.isAnnotationPresent(Server.class) && !field.isAnnotationPresent(Hidden.class) && PlatformFunctions.isClientEnv())
-                    && !field.isAnnotationPresent(Server.class)
+                initClient(modid, field, info);
-                    && !field.isAnnotationPresent(Hidden.class)
+            if (field.isAnnotationPresent(Entry.class))
-                    && PlatformFunctions.isClientEnv())
+                try { info.defaultValue = field.get(null);
-                instance.addClientEntry(field, new EntryInfo(field, modid));
+                } catch (IllegalAccessException ignored) {}
         }
-        instance.loadValuesFromJson();
+        loadValuesFromJson(modid);
     }
-
+    @Environment(EnvType.CLIENT)
-    public void addClientEntry(Field field, EntryInfo info) {
+    private static void initClient(String modid, Field field, EntryInfo info) {
         Entry e = info.entry;
-        if (e != null && info.dataType != null) {
+        String key = modid + ":" + field.getName();
+        if (e != null) {
             if (info.dataType == int.class) textField(info, Integer::parseInt, INTEGER_ONLY, (int) e.min(), (int) e.max(), true);
             else if (info.dataType == float.class) textField(info, Float::parseFloat, DECIMAL_ONLY, (float) e.min(), (float) e.max(), false);
             else if (info.dataType == double.class) textField(info, Double::parseDouble, DECIMAL_ONLY, e.min(), e.max(), false);
@@ -94,20 +169,16 @@ public abstract class MidnightConfig {
                 }, func);
             } else if (info.dataType.isEnum()) {
                 List<?> values = Arrays.asList(field.getType().getEnumConstants());
-                Function<Object, Text> func = value -> getEnumTranslatableText(value, info);
+                Function<Object, Text> func = value -> getEnumTranslatableText(value, modid, info);
                 info.function = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object, Text>>(button -> {
                     int index = values.indexOf(info.value) + 1;
                     info.setValue(values.get(index >= values.size() ? 0 : index));
                     button.setMessage(func.apply(info.value));
                 }, func);
             }
-
-            try { info.defaultValue = field.get(null);
-            } catch (IllegalAccessException ignored) {}
         }
-        entries.put(modid + ":" + field.getName(), info);
+        entries.put(key, info);
     }
-
     public static Class<?> getUnderlyingType(Field field) {
         Class<?> rawType = field.getType();
         if (field.getType() == List.class)
@@ -116,6 +187,13 @@ public abstract class MidnightConfig {
         } catch (NoSuchFieldException | IllegalAccessException ignored) { return rawType; }
     }
 
+    private static Text getEnumTranslatableText(Object value, String modid, EntryInfo info) {
+        if (value instanceof TranslatableOption translatableOption) return translatableOption.getText();
+
+        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());
+    }
+
     private static void textField(EntryInfo info, Function<String,Number> f, Pattern pattern, double min, double max, boolean cast) {
         boolean isNumber = pattern != null;
         info.function = (BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) (t, b) -> s -> {
@@ -139,8 +217,7 @@ public abstract class MidnightConfig {
             b.active = entries.values().stream().allMatch(e -> e.inLimits);
 
             if (inLimits) {
-                if (info.dataType == Identifier.class)
+                if (info.dataType == Identifier.class) info.setValue(Identifier.tryParse(s));
-                    info.setValue(Identifier.tryParse(s));
                 else info.setValue(isNumber ? value : s);
             }
 
@@ -153,70 +230,306 @@ public abstract class MidnightConfig {
             return true;
         };
     }
-
+    public static MidnightConfig getClass(String modid) {
-    protected Text getEnumTranslatableText(Object value, EntryInfo info) {
+        try { return configClass.get(modid).getDeclaredConstructor().newInstance(); } catch (Exception e) {throw new RuntimeException(e);}
-        if (value instanceof TranslatableOption translatableOption) return translatableOption.getText();
-
-        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());
     }
+    public static void write(String modid) { getClass(modid).writeChanges(modid); }
 
-    public void loadValuesFromJson() {
-        try {
-            gson.fromJson(Files.newBufferedReader(getJsonFilePath()), configClass);
-        } catch (Exception e) {
-            write(modid);
-        }
-
-        entries.values().forEach(info -> {
-            if (info.field != null && info.entry != null) {
-                try {
-                    info.value = info.field.get(null) == null ? info.defaultValue : info.field.get(null);
-                    info.tempValue = info.toTemporaryValue();
-                    info.updateConditions();
-                } catch (IllegalAccessException ignored) {}
-            }
-        });
-    }
-
-    public static void write(String modid) {
-        configInstances.get(modid).writeChanges(modid);
-    }
-
-    @Deprecated
     public void writeChanges(String modid) {
-        this.writeChanges();
+        try { if (!Files.exists(path = PlatformFunctions.getConfigDirectory().resolve(modid + ".json"))) Files.createFile(path);
-    }
+              Files.write(path, gson.toJson(getClass(modid)).getBytes());
-
-    public void writeChanges() {
-        try {
-            Path path;
-            if (!Files.exists(path = getJsonFilePath()))
-                Files.createFile(path);
-            Files.write(path, gson.toJson(this).getBytes());
         } catch (Exception e) { e.fillInStackTrace(); }
     }
 
-    public Path getJsonFilePath() {
-        return PlatformFunctions.getConfigDirectory().resolve(modid + ".json");
-    }
-
     @SuppressWarnings("unused") // Utility for mod authors
     public static @Nullable Object getDefaultValue(String modid, String entry) {
         String key = modid + ":" + entry;
         return entries.containsKey(key) ? entries.get(key).defaultValue : null;
     }
 
-    // Overridable method
+    public void onTabInit(String tabName, MidnightConfigListWidget list, MidnightConfigScreen screen) {}
-    public void onTabInit(String tabName, MidnightConfigListWidget list, MidnightConfigScreen screen) {
-    }
 
-    public static MidnightConfigScreen getScreen(Screen parent, String modid) {
+    @Environment(EnvType.CLIENT)
-        return configInstances.get(modid).getScreen(parent);
+    public static Screen getScreen(Screen parent, String modid) {
-    }
-    public MidnightConfigScreen getScreen(Screen parent) {
         return new MidnightConfigScreen(parent, modid);
     }
+    @Environment(EnvType.CLIENT)
+    public static class MidnightConfigScreen extends Screen {
+        protected MidnightConfigScreen(Screen parent, String modid) {
+            super(Text.translatable(modid + ".midnightconfig.title"));
+            this.parent = parent; this.modid = modid;
+            this.translationPrefix = modid + ".midnightconfig.";
+            loadValuesFromJson(modid);
+            entries.values().forEach(info -> {
+                if (info.modid.equals(modid)) {
+                    String tabId = info.entry != null ? info.entry.category() : info.comment.category();
+                    String name = translationPrefix + "category." + tabId;
+                    if (!I18n.hasTranslation(name) && tabId.equals("default"))
+                        name = translationPrefix + "title";
+                    if (!tabs.containsKey(name)) {
+                        Tab tab = new GridScreenTab(Text.translatable(name));
+                        info.tab = tab; tabs.put(name, tab);
+                    } else info.tab = tabs.get(name);
+                }
+            });
+            tabNavigation = TabNavigationWidget.builder(tabManager, this.width).tabs(tabs.values().toArray(new Tab[0])).build();
+            tabNavigation.selectTab(0, false);
+            tabNavigation.init();
+            prevTab = tabManager.getCurrentTab();
+        }
+        public final String translationPrefix, modid;
+        public final Screen parent;
+        public MidnightConfigListWidget list;
+        public TabManager tabManager = new TabManager(a -> {}, a -> {});
+        public Map<String, Tab> tabs = new LinkedHashMap<>();
+        public Tab prevTab;
+        public TabNavigationWidget tabNavigation;
+        public ButtonWidget done;
+        public double scrollProgress = 0d;
+
+        // Real Time config update //
+        @Override
+        public void tick() {
+            super.tick();
+            if (prevTab != null && prevTab != tabManager.getCurrentTab()) {
+                prevTab = tabManager.getCurrentTab();
+                updateList(); list.setScrollY(0);
+            }
+            scrollProgress = list.getScrollY();
+            for (EntryInfo info : entries.values()) info.updateFieldValue();
+            updateButtons();
+            if (reloadScreen) { updateList(); reloadScreen = false; }
+        }
+        public void updateButtons() {
+            if (this.list != null) {
+                for (ButtonEntry entry : this.list.children()) {
+                    if (entry.buttons != null && entry.buttons.size() > 1 && entry.info.field != null) {
+                        if (entry.buttons.get(0) instanceof ClickableWidget widget)
+                            if (widget.isFocused() || widget.isHovered()) widget.setTooltip(entry.info.getTooltip(true));
+                        if (entry.buttons.get(1) instanceof ButtonWidget button)
+                            button.active = !Objects.equals(String.valueOf(entry.info.value), String.valueOf(entry.info.defaultValue)) && entry.info.conditionsMet;
+        }}}}
+        @Override
+        public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
+            if (this.tabNavigation.trySwitchTabsWithKey(keyCode)) return true;
+            return super.keyPressed(keyCode, scanCode, modifiers);
+        }
+        @Override
+        public void close() {
+            loadValuesFromJson(modid); cleanup();
+            Objects.requireNonNull(client).setScreen(parent);
+        }
+        private void cleanup() {
+            entries.values().forEach(info -> {
+                info.error = null; info.value = null; info.tempValue = null; info.actionButton = null; info.listIndex = 0; info.tab = null; info.inLimits = true;
+            });
+        }
+        @Override
+        public void init() {
+            super.init();
+            tabNavigation.setWidth(this.width); tabNavigation.init();
+            if (tabs.size() > 1) this.addDrawableChild(tabNavigation);
+
+            this.addDrawableChild(ButtonWidget.builder(ScreenTexts.CANCEL, button -> this.close()).dimensions(this.width / 2 - 154, this.height - 26, 150, 20).build());
+            done = this.addDrawableChild(ButtonWidget.builder(ScreenTexts.DONE, (button) -> {
+                for (EntryInfo info : entries.values()) if (info.modid.equals(modid)) info.updateFieldValue();
+                write(modid); cleanup();
+                Objects.requireNonNull(client).setScreen(parent);
+            }).dimensions(this.width / 2 + 4, this.height - 26, 150, 20).build());
+
+            this.list = new MidnightConfigListWidget(this.client, this.width, this.height - 57, 24, 25);
+            this.addSelectableChild(this.list); fillList();
+            if (tabs.size() > 1) list.renderHeaderSeparator = false;
+        }
+        public void updateList() {
+            this.list.clear(); fillList();
+        }
+        public void fillList() {
+            MidnightConfig.getClass(modid).onTabInit(prevTab.getTitle().getContent() instanceof TranslatableTextContent translatable ? translatable.getKey().replace("%s.midnightconfig.category.".formatted(modid), "") : prevTab.getTitle().toString(), list, this);
+            for (EntryInfo info : entries.values()) {
+                info.updateConditions();
+                if (!info.conditionsMet) {
+                    boolean visibleButLocked = false;
+                    for (Condition condition : info.conditions) {
+                        visibleButLocked |= condition.visibleButLocked();
+                    }
+                    if (!visibleButLocked) continue;
+                }
+                if (info.modid.equals(modid) && (info.tab == null || info.tab == tabManager.getCurrentTab())) {
+                    Text name = Objects.requireNonNullElseGet(info.name, () -> Text.translatable(translationPrefix + info.fieldName));
+                    TextIconButtonWidget resetButton = TextIconButtonWidget.builder(Text.translatable("controls.reset"), (button -> {
+                        info.value = info.defaultValue; info.listIndex = 0;
+                        info.tempValue = info.toTemporaryValue();
+                        updateList();
+                    }), true).texture(Identifier.of("midnightlib","icon/reset"), 12, 12).dimension(20, 20).build();
+                    resetButton.setPosition(width - 205 + 150 + 25, 0);
+
+                    if (info.function != null) {
+                        ClickableWidget widget;
+                        Entry e = info.entry;
+                        if (info.function instanceof Map.Entry) { // Enums & booleans
+                            var values = (Map.Entry<ButtonWidget.PressAction, Function<Object, Text>>) info.function;
+                            if (info.dataType.isEnum()) {
+                                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();
+                        } 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);
+                        else widget = new TextFieldWidget(textRenderer, width - 185, 0, 150, 20, Text.empty());
+                        if (widget instanceof TextFieldWidget textField) {
+                            textField.setMaxLength(e.width()); textField.setText(info.tempValue);
+                            Predicate<String> processor = ((BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) info.function).apply(textField, done);
+                            textField.setTextPredicate(processor);
+                        }
+                        widget.setTooltip(info.getTooltip(true));
+
+                        ButtonWidget cycleButton = null;
+                        if (info.field.getType() == List.class) {
+                            cycleButton = ButtonWidget.builder(Text.literal(String.valueOf(info.listIndex)).formatted(Formatting.GOLD), (button -> {
+                                var values = (List<?>) info.value;
+                                values.remove("");
+                                info.listIndex = info.listIndex + 1;
+                                if (info.listIndex > values.size()) info.listIndex = 0;
+                                info.tempValue = info.toTemporaryValue();
+                                if (info.listIndex == values.size()) info.tempValue = "";
+                                updateList();
+                            })).dimensions(width - 185, 0, 20, 20).build();
+                        }
+                        if (e.isColor()) {
+                            ButtonWidget colorButton = ButtonWidget.builder(Text.literal("⬛"),
+                                    button -> new Thread(() -> {
+                                        Color newColor = JColorChooser.showDialog(null, Text.translatable("midnightconfig.colorChooser.title").getString(), Color.decode(!Objects.equals(info.tempValue, "") ? info.tempValue : "#FFFFFF"));
+                                        if (newColor != null) {
+                                            info.setValue("#" + Integer.toHexString(newColor.getRGB()).substring(2));
+                                            updateList();
+                                        }
+                                    }).start()
+                            ).dimensions(width - 185, 0, 20, 20).build();
+                            try { colorButton.setMessage(Text.literal("⬛").setStyle(Style.EMPTY.withColor(Color.decode(info.tempValue).getRGB())));
+                            } catch (Exception ignored) {}
+                            info.actionButton = colorButton;
+                        } else if (e.selectionMode() > -1) {
+                            ButtonWidget explorerButton = TextIconButtonWidget.builder(Text.empty(),
+                                    button -> new Thread(() -> {
+                                        JFileChooser fileChooser = new JFileChooser(info.tempValue);
+                                        fileChooser.setFileSelectionMode(e.selectionMode()); fileChooser.setDialogType(e.fileChooserType());
+                                        fileChooser.setDialogTitle(Text.translatable(translationPrefix + info.fieldName + ".fileChooser").getString());
+                                        if ((e.selectionMode() == JFileChooser.FILES_ONLY || e.selectionMode() == JFileChooser.FILES_AND_DIRECTORIES) && Arrays.stream(e.fileExtensions()).noneMatch("*"::equals))
+                                            fileChooser.setFileFilter(new FileNameExtensionFilter(
+                                                    Text.translatable(translationPrefix + info.fieldName + ".fileFilter").getString(), e.fileExtensions()));
+                                        if (fileChooser.showDialog(null, null) == JFileChooser.APPROVE_OPTION) {
+                                            info.setValue(fileChooser.getSelectedFile().getAbsolutePath());
+                                            updateList();
+                                        }
+                                    }).start(), true
+                            ).texture(Identifier.of("midnightlib", "icon/explorer"), 12, 12).dimension(20, 20).build();
+                            explorerButton.setPosition(width - 185, 0);
+                            info.actionButton = explorerButton;
+                        }
+                        List<ClickableWidget> widgets = Lists.newArrayList(widget, resetButton);
+                        if (info.actionButton != null) {
+                            if (IS_SYSTEM_MAC) info.actionButton.active = false;
+                            widget.setWidth(widget.getWidth() - 22); widget.setX(widget.getX() + 22);
+                            widgets.add(info.actionButton);
+                        } if (cycleButton != null) {
+                            if (info.actionButton != null) info.actionButton.setX(info.actionButton.getX() + 22);
+                            widget.setWidth(widget.getWidth() - 22); widget.setX(widget.getX() + 22);
+                            widgets.add(cycleButton);
+                        }
+                        if (!info.conditionsMet) widgets.forEach(w -> w.active = false);
+                        this.list.addButton(widgets, name, info);
+                    } else this.list.addButton(List.of(), name, info);
+                } list.setScrollY(scrollProgress);
+                updateButtons();
+            }
+        }
+        @Override
+        public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+            super.render(context, mouseX, mouseY, delta);
+            this.list.render(context, mouseX, mouseY, delta);
+            if (tabs.size() < 2) context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 10, 0xFFFFFFFF);
+        }
+    }
+    @Environment(EnvType.CLIENT)
+    public static class MidnightConfigListWidget extends ElementListWidget<ButtonEntry> {
+        public boolean renderHeaderSeparator = true;
+        public  MidnightConfigListWidget(MinecraftClient client, int width, int height, int y, int itemHeight) { super(client, width, height, y, itemHeight); }
+        @Override public int getScrollbarX() { return this.width -7; }
+
+        @Override
+        protected void drawHeaderAndFooterSeparators(DrawContext context) {
+            if (renderHeaderSeparator) super.drawHeaderAndFooterSeparators(context);
+            else context.drawTexture(RenderPipelines.GUI_TEXTURED, this.client.world == null ? Screen.FOOTER_SEPARATOR_TEXTURE : Screen.INWORLD_FOOTER_SEPARATOR_TEXTURE, this.getX(), this.getBottom(), 0, 0, this.getWidth(), 2, 32, 2);
+        }
+        public void addButton(List<ClickableWidget> buttons, Text text, EntryInfo info) { this.addEntry(new ButtonEntry(buttons, text, info)); }
+        public void clear() { this.clearEntries(); }
+        @Override public int getRowWidth() { return 10000; }
+    }
+    public static class ButtonEntry extends ElementListWidget.Entry<ButtonEntry> {
+        private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
+        public final Text text;
+        public final List<ClickableWidget> buttons;
+        public final EntryInfo info;
+        public boolean centered = false;
+        public MultilineTextWidget title;
+
+        public ButtonEntry(List<ClickableWidget> buttons, Text text, EntryInfo info) {
+            this.buttons = buttons; this.text = text; this.info = info;
+            if (info != null && info.comment != null) this.centered = info.comment.centered();
+            int scaledWidth = MinecraftClient.getInstance().getWindow().getScaledWidth();
+
+            if (text != null && (!text.getString().contains("spacer") || !buttons.isEmpty())) {
+                title = new MultilineTextWidget((centered) ? (scaledWidth / 2 - (textRenderer.getWidth(text) / 2)) : 12, 0, Text.of(text), textRenderer);
+                title.setCentered(centered);
+                if (info != null) title.setTooltip(info.getTooltip(false));
+                title.setMaxWidth(!buttons.isEmpty() ? buttons.get(buttons.size() > 2 ? buttons.size()-1 : 0).getX() - 16 : scaledWidth - 24);
+            }
+        }
+        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.render(context, mouseX, mouseY, tickDelta);});
+            if (title != null) {
+                title.setY(y+5);
+                title.render(context, mouseX, mouseY, tickDelta);
+
+                if (info.entry != null && !this.buttons.isEmpty() && this.buttons.getFirst() instanceof ClickableWidget widget) {
+                    int idMode = this.info.entry.idMode();
+                    if (idMode != -1) context.drawItem(idMode == 0 ? Registries.ITEM.get(Identifier.tryParse(this.info.tempValue)).getDefaultStack() : Registries.BLOCK.get(Identifier.tryParse(this.info.tempValue)).asItem().getDefaultStack(), widget.getX() + widget.getWidth() - 18, y + 2);
+                }
+            }
+        }
+
+        @Override
+        public boolean mouseClicked(double mouseX, double mouseY, int button) {
+            if (this.info != null && this.info.comment != null && !this.info.comment.url().isBlank())
+                ConfirmLinkScreen.open(MinecraftClient.getInstance().currentScreen, this.info.comment.url(), true);
+            return super.mouseClicked(mouseX, mouseY, button);
+        }
+
+        public List<? extends Element> children() {return Lists.newArrayList(buttons);}
+        public List<? extends Selectable> selectableChildren() {return Lists.newArrayList(buttons);}
+    }
+    public static class MidnightSliderWidget extends SliderWidget {
+        private final EntryInfo info; private final Entry e;
+        public MidnightSliderWidget(int x, int y, int width, int height, Text text, double value, EntryInfo info) {
+            super(x, y, width, height, text, value);
+            this.e = info.entry;
+            this.info = info;
+        }
+
+        @Override
+        public void updateMessage() { this.setMessage(Text.of(info.tempValue)); }
+
+        @Override
+        public void applyValue() {
+            if (info.dataType == int.class) info.setValue(((Number) (e.min() + value * (e.max() - e.min()))).intValue());
+            else if (info.dataType == double.class) info.setValue(Math.round((e.min() + value * (e.max() - e.min())) * (double) e.precision()) / (double) e.precision());
+            else if (info.dataType == float.class) info.setValue(Math.round((e.min() + value * (e.max() - e.min())) * (float) e.precision()) / (float) e.precision());
+        }
+    }
+    public static class NonEntryExclusionStrategy implements ExclusionStrategy {
+        public boolean shouldSkipClass(Class<?> clazz) { return false; }
+        public boolean shouldSkipField(FieldAttributes fieldAttributes) { return fieldAttributes.getAnnotation(Entry.class) == null; }
+    }
 
     /**
      * Entry Annotation<br>
@@ -257,25 +570,19 @@ public abstract class MidnightConfig {
         @Deprecated String requiredMod() default "";
     }
 
-    @Retention(RetentionPolicy.RUNTIME)
+    @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Client {}
-    @Target(ElementType.FIELD)
-    public @interface Client {}
 
     /**
      * Hides the entry in config screens, but still makes it accessible through the command {@code /midnightconfig MOD_ID ENTRY} and directly editing the config file.
      */
-    @Retention(RetentionPolicy.RUNTIME)
+    @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Server {}
-    @Target(ElementType.FIELD)
-    public @interface Server {}
 
     /**
      * Hides the entry entirely.
      * Accessible only through directly editing the config file.
      * Perfect for saving persistent internal data.
      */
-    @Retention(RetentionPolicy.RUNTIME)
+    @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Hidden {}
-    @Target(ElementType.FIELD)
-    public @interface Hidden {}
 
     /**
      * Comment Annotation<br>
@@ -284,9 +591,7 @@ public abstract class MidnightConfig {
      * - <b>{@link Comment#name()}</b>: Will be used instead of the default translation key, if not empty<br>
      * - <b>{@link Comment#url()}</b>: The url of the comment should link to in the config screen (none if left empty)<br>
      * */
-    @Retention(RetentionPolicy.RUNTIME)
+    @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Comment {
-    @Target(ElementType.FIELD)
-    public @interface Comment {
         boolean centered() default false;
         String category() default "default";
         String name() default "";

common/src/main/java/eu/midnightdust/lib/config/MidnightConfigListWidget.java

@@ -1,45 +0,0 @@
-package eu.midnightdust.lib.config;
-
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gl.RenderPipelines;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.ClickableWidget;
-import net.minecraft.client.gui.widget.ElementListWidget;
-import net.minecraft.text.Text;
-
-import java.util.List;
-
-public class MidnightConfigListWidget extends ElementListWidget<ButtonEntry> {
-    public boolean renderHeaderSeparator = true;
-
-    public MidnightConfigListWidget(MinecraftClient client, int width, int height, int y, int itemHeight) {
-        super(client, width, height, y, itemHeight);
-    }
-
-    @Override
-    public int getScrollbarX() {
-        return this.width - 7;
-    }
-
-    @Override
-    public void drawHeaderAndFooterSeparators(DrawContext context) {
-        if (renderHeaderSeparator)
-            super.drawHeaderAndFooterSeparators(context);
-        else
-            context.drawTexture(RenderPipelines.GUI_TEXTURED, this.client.world == null ? Screen.FOOTER_SEPARATOR_TEXTURE : Screen.INWORLD_FOOTER_SEPARATOR_TEXTURE, this.getX(), this.getBottom(), 0, 0, this.getWidth(), 2, 32, 2);
-    }
-
-    public void addButton(List<ClickableWidget> buttons, Text text, EntryInfo info) {
-        this.addEntry(new ButtonEntry(buttons, text, info));
-    }
-
-    public void clear() {
-        this.clearEntries();
-    }
-
-    @Override
-    public int getRowWidth() {
-        return 10000;
-    }
-}

common/src/main/java/eu/midnightdust/lib/config/MidnightConfigScreen.java

@@ -1,261 +0,0 @@
-package eu.midnightdust.lib.config;
-
-import com.google.common.collect.Lists;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.tab.GridScreenTab;
-import net.minecraft.client.gui.tab.Tab;
-import net.minecraft.client.gui.tab.TabManager;
-import net.minecraft.client.gui.tooltip.Tooltip;
-import net.minecraft.client.gui.widget.*;
-import net.minecraft.client.input.KeyInput;
-import net.minecraft.client.resource.language.I18n;
-import net.minecraft.screen.ScreenTexts;
-import net.minecraft.text.Style;
-import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableTextContent;
-import net.minecraft.util.Formatting;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.Util;
-
-import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import java.awt.*;
-import java.util.*;
-import java.util.List;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-import java.util.function.Predicate;
-
-public class MidnightConfigScreen extends Screen {
-    public MidnightConfig instance;
-    public final String translationPrefix, modid;
-    public final Screen parent;
-    public MidnightConfigListWidget list;
-    public TabManager tabManager = new TabManager(a -> {}, a -> {});
-    public Map<String, Tab> tabs = new LinkedHashMap<>();
-    public Tab prevTab;
-    public TabNavigationWidget tabNavigation;
-    public ButtonWidget done;
-    public double scrollProgress = 0d;
-
-    public MidnightConfigScreen(Screen parent, String modid) {
-        super(Text.translatable(modid + ".midnightconfig.title"));
-        this.parent = parent;
-        this.modid = modid;
-        this.translationPrefix = modid + ".midnightconfig.";
-        this.instance = MidnightConfig.configInstances.get(modid);
-        instance.loadValuesFromJson();
-        MidnightConfig.entries.values().forEach(info -> {
-            if (Objects.equals(info.modid, modid)) {
-                String tabId = info.entry != null ? info.entry.category() : info.comment.category();
-                String name = translationPrefix + "category." + tabId;
-                if (!I18n.hasTranslation(name) && tabId.equals("default"))
-                    name = translationPrefix + "title";
-                if (!tabs.containsKey(name)) {
-                    info.tab = new GridScreenTab(Text.translatable(name));
-                    tabs.put(name, info.tab);
-                } else info.tab = tabs.get(name);
-            }
-        });
-        tabNavigation = TabNavigationWidget.builder(tabManager, this.width).tabs(tabs.values().toArray(new Tab[0])).build();
-        tabNavigation.selectTab(0, false);
-        tabNavigation.init();
-        prevTab = tabManager.getCurrentTab();
-    }
-
-    // Real Time config update //
-    @Override
-    public void tick() {
-        super.tick();
-        if (prevTab != null && prevTab != tabManager.getCurrentTab()) {
-            prevTab = tabManager.getCurrentTab();
-            updateList();
-            list.setScrollY(0);
-        }
-        scrollProgress = list.getScrollY();
-        for (EntryInfo info : MidnightConfig.entries.values())
-            if (Objects.equals(modid, info.modid)) info.updateFieldValue();
-        updateButtons();
-        if (instance.reloadScreen) {
-            updateList();
-            instance.reloadScreen = false;
-        }
-    }
-
-    public void updateButtons() {
-        if (this.list == null) return;
-
-        for (ButtonEntry entry : this.list.children()) {
-            if (entry.buttons != null && entry.buttons.size() > 1 && entry.info.field != null) {
-                if (entry.buttons.get(0) instanceof ClickableWidget widget)
-                    if (widget.isFocused() || widget.isHovered())
-                        widget.setTooltip(entry.info.getTooltip(true));
-                if (entry.buttons.get(1) instanceof ButtonWidget button)
-                    button.active = !Objects.equals(String.valueOf(entry.info.value), String.valueOf(entry.info.defaultValue)) && entry.info.conditionsMet;
-            }
-        }
-    }
-
-    @Override
-    public boolean keyPressed(KeyInput input) {
-        return this.tabNavigation.keyPressed(input) || super.keyPressed(input);
-    }
-
-    @Override
-    public void close() {
-        instance.loadValuesFromJson();
-        MidnightConfig.entries.values().forEach(info -> {
-            info.error = null;
-            info.value = null;
-            info.tempValue = null;
-            info.actionButton = null;
-            info.listIndex = 0;
-            info.tab = null;
-            info.inLimits = true;
-        });
-        Objects.requireNonNull(client).setScreen(parent);
-    }
-
-    @Override
-    public void init() {
-        super.init();
-        tabNavigation.setWidth(this.width);
-        tabNavigation.init();
-        if (tabs.size() > 1)
-            this.addDrawableChild(tabNavigation);
-
-        this.addDrawableChild(ButtonWidget.builder(ScreenTexts.CANCEL, button -> this.close()).dimensions(this.width / 2 - 154, this.height - 26, 150, 20).build());
-        done = this.addDrawableChild(ButtonWidget.builder(ScreenTexts.DONE, (button) -> {
-            for (EntryInfo info : MidnightConfig.entries.values())
-                if (info.modid.equals(modid))
-                    info.updateFieldValue();
-            MidnightConfig.write(modid);
-            close();
-        }).dimensions(this.width / 2 + 4, this.height - 26, 150, 20).build());
-
-        this.list = new MidnightConfigListWidget(this.client, this.width, this.height - 57, 24, 25);
-        this.addSelectableChild(this.list);
-        updateList();
-        if (tabs.size() > 1)
-            list.renderHeaderSeparator = false;
-    }
-
-    public void updateList() {
-        this.list.clear();
-        instance.onTabInit(prevTab.getTitle().getContent() instanceof TranslatableTextContent translatable ?
-                translatable.getKey().substring(translatable.getKey().lastIndexOf('.') + 1) : prevTab.getTitle().toString(), list, this);
-        for (EntryInfo info : MidnightConfig.entries.values()) {
-            info.updateConditions();
-            if (!info.conditionsMet) {
-                boolean visibleButLocked = false;
-                for (MidnightConfig.Condition condition : info.conditions)
-                    visibleButLocked |= condition.visibleButLocked();
-                if (!visibleButLocked) continue;
-            }
-            if (info.modid.equals(modid) && (info.tab == null || info.tab == tabManager.getCurrentTab())) {
-                TextIconButtonWidget resetButton = TextIconButtonWidget.builder(Text.translatable("controls.reset"), (button -> {
-                    info.value = info.defaultValue;
-                    info.listIndex = 0;
-                    info.tempValue = info.toTemporaryValue();
-                    updateList();
-                }), true).texture(Identifier.of("midnightlib", "icon/reset"), 12, 12).dimension(20, 20).build();
-                resetButton.setPosition(width - 205 + 150 + 25, 0);
-
-                if (info.function != null) {
-                    ClickableWidget widget;
-                    MidnightConfig.Entry e = info.entry;
-                    if (info.function instanceof Map.Entry) { // Enums & booleans
-                        var values = (Map.Entry<ButtonWidget.PressAction, Function<Object, Text>>) info.function;
-                        if (info.dataType.isEnum()) {
-                            values.setValue(value -> instance.getEnumTranslatableText(value, info));
-                        }
-                        widget = ButtonWidget.builder(values.getValue().apply(info.value), values.getKey()).dimensions(width - 185, 0, 150, 20).tooltip(info.getTooltip(true)).build();
-                    } 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);
-                    else
-                        widget = new TextFieldWidget(textRenderer, width - 185, 0, 150, 20, Text.empty());
-
-                    if (widget instanceof TextFieldWidget textField) {
-                        textField.setMaxLength(e.width());
-                        textField.setText(info.tempValue);
-                        Predicate<String> processor = ((BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) info.function).apply(textField, done);
-                        textField.setTextPredicate(processor);
-                    }
-                    widget.setTooltip(info.getTooltip(true));
-
-                    ButtonWidget cycleButton = null;
-                    if (info.field.getType() == List.class) {
-                        cycleButton = ButtonWidget.builder(Text.literal(String.valueOf(info.listIndex)).formatted(Formatting.GOLD), (button -> {
-                            var values = (List<?>) info.value;
-                            values.remove("");
-                            info.listIndex = info.listIndex != values.size() ? info.listIndex + 1 : 0;
-                            info.tempValue = info.listIndex != values.size() ? info.toTemporaryValue() : "";
-                            updateList();
-                        })).dimensions(width - 185, 0, 20, 20).tooltip(Tooltip.of(Text.translatable("midnightconfig.action.list_index", info.listIndex))).build();
-                    }
-                    if (e.isColor()) {
-                        ButtonWidget colorButton = ButtonWidget.builder(Text.literal("⬛"),
-                                button -> new Thread(() -> {
-                                    Color newColor = JColorChooser.showDialog(null, Text.translatable("midnightconfig.colorChooser.title").getString(), Color.decode(!Objects.equals(info.tempValue, "") ? info.tempValue : "#FFFFFF"));
-                                    if (newColor != null) {
-                                        info.setValue("#" + Integer.toHexString(newColor.getRGB()).substring(2));
-                                        updateList();
-                                    }
-                                }).start()
-                        ).dimensions(width - 185, 0, 20, 20).tooltip(Tooltip.of(Text.translatable("midnightconfig.action.color_chooser"))).build();
-                        try {
-                            colorButton.setMessage(Text.literal("⬛").setStyle(Style.EMPTY.withColor(Color.decode(info.tempValue).getRGB())));
-                        } catch (Exception ignored) {
-                        }
-                        info.actionButton = colorButton;
-                    } else if (e.selectionMode() > -1) {
-                        ButtonWidget explorerButton = TextIconButtonWidget.builder(Text.empty(),
-                                button -> new Thread(() -> {
-                                    JFileChooser fileChooser = new JFileChooser(info.tempValue);
-                                    fileChooser.setFileSelectionMode(e.selectionMode());
-                                    fileChooser.setDialogType(e.fileChooserType());
-                                    fileChooser.setDialogTitle(Text.translatable(translationPrefix + info.fieldName + ".fileChooser").getString());
-                                    if ((e.selectionMode() == JFileChooser.FILES_ONLY || e.selectionMode() == JFileChooser.FILES_AND_DIRECTORIES) && Arrays.stream(e.fileExtensions()).noneMatch("*"::equals))
-                                        fileChooser.setFileFilter(new FileNameExtensionFilter(
-                                                Text.translatable(translationPrefix + info.fieldName + ".fileFilter").getString(), e.fileExtensions()));
-                                    if (fileChooser.showDialog(null, null) == JFileChooser.APPROVE_OPTION) {
-                                        info.setValue(fileChooser.getSelectedFile().getAbsolutePath());
-                                        updateList();
-                                    }
-                                }).start(), true
-                        ).texture(Identifier.of("midnightlib", "icon/explorer"), 12, 12).dimension(20, 20).build();
-                        explorerButton.setTooltip(Tooltip.of(Text.translatable("midnightconfig.action.file_chooser")));
-                        explorerButton.setPosition(width - 185, 0);
-                        info.actionButton = explorerButton;
-                    }
-                    List<ClickableWidget> widgets = Lists.newArrayList(widget, resetButton);
-
-                    if (info.actionButton != null) {
-                        if (Util.getOperatingSystem() == Util.OperatingSystem.OSX) info.actionButton.active = false;
-                        widget.setWidth(widget.getWidth() - 22);
-                        widget.setX(widget.getX() + 22);
-                        widgets.add(info.actionButton);
-                    }
-                    if (cycleButton != null) {
-                        if (info.actionButton != null) info.actionButton.setX(info.actionButton.getX() + 22);
-                        widget.setWidth(widget.getWidth() - 22);
-                        widget.setX(widget.getX() + 22);
-                        widgets.add(cycleButton);
-                    }
-                    if (!info.conditionsMet) widgets.forEach(w -> w.active = false);
-                    this.list.addButton(widgets, Text.translatable(info.translationKey), info);
-                } else this.list.addButton(List.of(), Text.translatable(info.translationKey), info);
-            }
-            list.setScrollY(scrollProgress);
-            updateButtons();
-        }
-    }
-
-    @Override
-    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
-        super.render(context, mouseX, mouseY, delta);
-        this.list.render(context, mouseX, mouseY, delta);
-        if (tabs.size() < 2) context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 10, 0xFFFFFFFF);
-    }
-}

common/src/main/java/eu/midnightdust/lib/config/MidnightSliderWidget.java

@@ -1,29 +0,0 @@
-package eu.midnightdust.lib.config;
-
-import net.minecraft.client.gui.widget.SliderWidget;
-import net.minecraft.text.Text;
-
-public class MidnightSliderWidget extends SliderWidget {
-    private final EntryInfo info;
-    private final MidnightConfig.Entry e;
-
-    public MidnightSliderWidget(int x, int y, int width, int height, Text text, double value, EntryInfo info) {
-        super(x, y, width, height, text, value);
-        this.e = info.entry;
-        this.info = info;
-    }
-
-    @Override
-    public void updateMessage() {
-        this.setMessage(Text.of(info.tempValue));
-    }
-
-    @Override
-    public void applyValue() {
-        if (info.dataType == int.class) info.setValue(((Number) (e.min() + value * (e.max() - e.min()))).intValue());
-        else if (info.dataType == double.class)
-            info.setValue(Math.round((e.min() + value * (e.max() - e.min())) * (double) e.precision()) / (double) e.precision());
-        else if (info.dataType == float.class)
-            info.setValue(Math.round((e.min() + value * (e.max() - e.min())) * (float) e.precision()) / (float) e.precision());
-    }
-}

common/src/main/resources/assets/midnightlib/lang/de_de.json

@@ -3,8 +3,5 @@
 	"midnightlib.midnightconfig.title":"MidnightLib Konfiguration",
 	"midnightlib.midnightconfig.config_screen_list":"Konfigurationsübersicht",
 	"modmenu.summaryTranslation.midnightlib": "Code-Bibliothek für einfache Konfiguration.",
-	"midnightconfig.colorChooser.title": "Wähle eine Farbe",
+	"midnightconfig.colorChooser.title": "Wähle eine Farbe"
-    "midnightconfig.action.list_index": "Bearbeite Liste an Index %s",
-    "midnightconfig.action.color_chooser": "Öffne Farbauswahl",
-    "midnightconfig.action.file_chooser": "Öffne Dateiauswahl"
 }

common/src/main/resources/assets/midnightlib/lang/en_us.json

@@ -9,8 +9,5 @@
 	"midnightlib.curseforge":"CurseForge",
 	"midnightlib.wiki":"Wiki",
 	"modmenu.summaryTranslation.midnightlib": "Common Library for easy configuration.",
-	"midnightconfig.colorChooser.title": "Choose a color",
+	"midnightconfig.colorChooser.title": "Choose a color"
-    "midnightconfig.action.list_index": "Editing list at index %s",
-    "midnightconfig.action.color_chooser": "Open color chooser",
-    "midnightconfig.action.file_chooser": "Open file chooser"
 }

common/src/main/resources/assets/midnightlib/lang/es_ar.json

@@ -1,13 +1,8 @@
 {
-  "midnightlib.overview.title": "Visión general de MidnightConfig",
+	"midnightlib.overview.title": "Visión general de MidnightConfig",
-  "midnightlib.midnightconfig.title": "Configuración de MidnightLib",
+	"midnightlib.midnightconfig.title": "Configuración de MidnightLib",
-  "midnightlib.midnightconfig.config_screen_list": "Habilitar lista de pantallas de configuración",
+	"midnightlib.midnightconfig.config_screen_list": "Habilitar lista de pantallas de configuración",
-  "midnightlib.midnightconfig.enum.ConfigButton.TRUE":"§aSí",
+	"midnightlib.midnightconfig.enum.ConfigButton.TRUE": "§aSí",
-  "midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§cNo",
+	"modmenu.summaryTranslation.midnightlib": "Librería común para facilitar la configuración.",
-  "midnightlib.midnightconfig.enum.ConfigButton.MODMENU":"§bMenú del Mod",
+	"midnightconfig.colorChooser.title": "Elegí un color"
-  "midnightlib.modrinth":"Modrinth",
-  "midnightlib.curseforge":"CurseForge",
-  "midnightlib.wiki":"Wiki",
-  "modmenu.summaryTranslation.midnightlib": "Librería común para facilitar la configuración.",
-  "midnightconfig.colorChooser.title": "Elegí un color"
 }

fabric/build.gradle

@@ -11,32 +11,7 @@ architectury {
     fabric()
 }
 
-sourceSets {
-    test {
-        compileClasspath += main.compileClasspath
-        runtimeClasspath += main.runtimeClasspath
-        java {
-            srcDirs.add('src/test/java' as File)
-        }
-        resources {
-            srcDirs.add('src/test/resources' as File)
-        }
-    }
-}
-
 loom {
-    runs {
-        testClient {
-            client()
-            configName = "Test Minecraft Client"
-            source sourceSets.test
-        }
-        testServer {
-            server()
-            configName = "Test Minecraft Server"
-            source sourceSets.test
-        }
-    }
 }
 
 configurations {
@@ -52,12 +27,10 @@ configurations {
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
-    modCompileOnly("com.terraformersmc:modmenu:${rootProject.mod_menu_version}")
+    modCompileOnly ("com.terraformersmc:modmenu:${rootProject.mod_menu_version}")
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
-
-    testImplementation common(project(path: ':common', configuration: 'testOutput'))
 }
 
 processResources {
@@ -68,14 +41,6 @@ processResources {
     }
 }
 
-processTestResources {
-    inputs.property "version", rootProject.version
-
-    filesMatching("fabric.mod.json") {
-        expand "version": rootProject.version
-    }
-}
-
 shadowJar {
     exclude "architectury.common.json"
 
@@ -106,7 +71,7 @@ unifiedPublishing {
         releaseType = "$project.release_type"
         changelog = releaseChangelog()
         gameVersions = []
-        gameLoaders = ["fabric", "quilt"]
+        gameLoaders = ["fabric","quilt"]
         mainPublication remapJar
         relations {
             depends {

fabric/src/main/java/eu/midnightdust/fabric/core/MidnightLibFabric.java

@@ -1,11 +1,10 @@
 package eu.midnightdust.fabric.core;
 
 import eu.midnightdust.core.MidnightLib;
-import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.api.*;
-import net.fabricmc.api.DedicatedServerModInitializer;
 
 public class MidnightLibFabric implements DedicatedServerModInitializer, ClientModInitializer {
-    @Override
+    @Override @Environment(EnvType.CLIENT)
     public void onInitializeClient() {
         MidnightLib.onInitializeClient();
         MidnightLib.registerAutoCommand();

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

@@ -18,10 +18,9 @@ public class AutoModMenu implements ModMenuApi {
     @Override
     public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
         HashMap<String, ConfigScreenFactory<?>> map = new HashMap<>();
-        MidnightConfig.configInstances.forEach((modid, cClass) -> {
+        MidnightConfig.configClass.forEach((modid, cClass) -> {
             if (!MidnightLib.hiddenMods.contains(modid))
                 map.put(modid, parent -> MidnightConfig.getScreen(parent, modid));
-        });
+        }); return map;
-        return map;
     }
 }

fabric/src/test/java/eu/midnightdust/test/fabric/MLExampleFabric.java

@@ -1,12 +0,0 @@
-package eu.midnightdust.test.fabric;
-
-import eu.midnightdust.test.config.MidnightConfigExample;
-import eu.midnightdust.lib.config.MidnightConfig;
-import net.fabricmc.api.ModInitializer;
-
-public class MLExampleFabric implements ModInitializer {
-    @Override
-    public void onInitialize() {
-        MidnightConfig.init("modid", MidnightConfigExample.class);
-    }
-}

gradle.properties

@@ -1,21 +1,21 @@
-org.gradle.jvmargs=-Xmx3172M
+org.gradle.jvmargs=-Xmx4096M
 
-minecraft_version=1.21.9
+minecraft_version=1.21.6
 supported_versions=
-yarn_mappings=1.21.9+build.1
+yarn_mappings=1.21.6+build.1
 enabled_platforms=fabric,neoforge
 
 archives_base_name=midnightlib
-mod_version=1.8.3
+mod_version=1.7.6-rc.1
 maven_group=eu.midnightdust
 release_type=release
 curseforge_id=488090
 modrinth_id=codAaoxh
 
-fabric_loader_version=0.17.2
+fabric_loader_version=0.16.14
-fabric_api_version=0.133.14+1.21.9
+fabric_api_version=0.127.0+1.21.6
 
-neoforge_version=21.9.9-beta
+neoforge_version=21.6.0-beta
 yarn_mappings_patch_neoforge_version = 1.21+build.4
 
 mod_menu_version = 9.0.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
 #
@@ -57,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -82,11 +80,13 @@ do
     esac
 done
 
-# This is normally unused
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-# shellcheck disable=SC2034
+
+APP_NAME="Gradle"
 APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,6 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -132,29 +133,22 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -171,6 +165,7 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -198,19 +193,16 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-
+# Collect all arguments for the java command;
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+#     shell script including quotes and variable substitutions, so put them in
-
+#     double quotes to make sure that they get re-expanded; and
-# Collect all arguments for the java command:
+#   * put everything else in single quotes, so that it's not re-expanded.
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -13,8 +13,6 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -28,7 +26,6 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -45,11 +42,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo. 1>&2
+echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo. 1>&2
+echo.
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation. 1>&2
+echo location of your Java installation.
 
 goto fail
 
@@ -59,21 +56,22 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo. 1>&2
+echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo. 1>&2
+echo.
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation. 1>&2
+echo location of your Java installation.
 
 goto fail
 
 :execute
 @rem Setup the command line
 
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

neoforge/build.gradle

@@ -13,58 +13,11 @@ repositories {
 
 architectury {
     platformSetupLoomIde()
-    neoForge {
+    neoForge()
-        platformPackage = "neoforge"
-    }
-}
-
-sourceSets {
-    test {
-        compileClasspath += main.compileClasspath
-        runtimeClasspath += main.runtimeClasspath
-        java {
-            srcDirs.add('src/test/java' as File)
-        }
-        resources {
-            srcDirs.add('src/test/resources' as File)
-        }
-    }
 }
 
 loom {
     accessWidenerPath = project(":common").loom.accessWidenerPath
-
-    runs {
-        testClient {
-            client()
-            name = "Test Minecraft Client"
-
-            mods {
-                create('midnightlib') {
-                    sourceSet sourceSets.main
-                }
-                create('modid') {      // test mod
-                    sourceSet sourceSets.test
-                }
-            }
-            source sourceSets.test
-        }
-        testServer {
-            server()
-            name = "Test Minecraft Server"
-
-            mods {
-                create('midnightlib') {
-                    sourceSet sourceSets.main
-                }
-                create('modid') {      // test mod
-                    sourceSet sourceSets.test
-                }
-            }
-            source sourceSets.test
-        }
-    }
-
 }
 
 configurations {
@@ -91,10 +44,6 @@ dependencies {
 
     common(project(path: ':common', configuration: 'namedElements')) { transitive false }
     shadowBundle project(path: ':common', configuration: 'transformProductionNeoForge')
-
-//    testImplementation common(project(path: ':common', configuration: 'namedElements')) { transitive false }
-    testImplementation common(project(path: ':common', configuration: 'testOutput')) { transitive false }
-    testImplementation sourceSets.main.output
 }
 
 processResources {
@@ -105,14 +54,6 @@ processResources {
     }
 }
 
-processTestResources {
-    inputs.property 'version', rootProject.version
-
-    filesMatching('META-INF/neoforge.mods.toml') {
-        expand version: rootProject.version
-    }
-}
-
 shadowJar {
     configurations = [project.configurations.shadowBundle]
     archiveClassifier = 'dev-shadow'
@@ -164,4 +105,4 @@ unifiedPublishing {
             }
         }
     }
-}
+}

neoforge/src/main/java/eu/midnightdust/lib/util/neoforge/PlatformFunctionsImpl.java

@@ -22,7 +22,7 @@ public class PlatformFunctionsImpl {
         return FMLPaths.CONFIGDIR.get();
     }
     public static boolean isClientEnv() {
-        return FMLEnvironment.getDist().isClient();
+        return FMLEnvironment.dist.isClient();
     }
     public static boolean isModLoaded(String modid) {
         return ModList.get().isLoaded(modid);

neoforge/src/main/java/eu/midnightdust/neoforge/MidnightLibNeoForge.java

@@ -23,15 +23,15 @@ public class MidnightLibNeoForge {
     public static List<LiteralArgumentBuilder<ServerCommandSource>> commands = new ArrayList<>();
 
     public MidnightLibNeoForge() {
-        if (FMLEnvironment.getDist() == Dist.CLIENT) MidnightLib.onInitializeClient();
+        if (FMLEnvironment.dist == Dist.CLIENT) MidnightLib.onInitializeClient();
     }
 
-    @EventBusSubscriber(modid = "midnightlib", value = Dist.CLIENT)
+    @EventBusSubscriber(modid = "midnightlib", bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
     public static class MidnightLibBusEvents {
         @SubscribeEvent
         public static void onPostInit(FMLClientSetupEvent event) {
             ModList.get().forEachModContainer((modid, modContainer) -> {
-                if (MidnightConfig.configInstances.containsKey(modid) && !MidnightLib.hiddenMods.contains(modid)) {
+                if (MidnightConfig.configClass.containsKey(modid) && !MidnightLib.hiddenMods.contains(modid)) {
                     modContainer.registerExtensionPoint(IConfigScreenFactory.class, (minecraftClient, screen) -> MidnightConfig.getScreen(screen, modid));
                 }
             });

neoforge/src/test/java/eu/midnightdust/test/neoforge/MLExampleNeoForge.java

@@ -1,12 +0,0 @@
-package eu.midnightdust.test.neoforge;
-
-import eu.midnightdust.test.config.MidnightConfigExample;
-import net.neoforged.fml.common.Mod;
-
-@Mod(MLExampleNeoForge.MODID)
-public class MLExampleNeoForge {
-    public static final String MODID = "modid";
-    public MLExampleNeoForge() {
-        MidnightConfigExample.init(MODID, MidnightConfigExample.class);
-    }
-}

neoforge/src/test/resources/META-INF/neoforge.mods.toml

@@ -1,34 +0,0 @@
-modLoader = "javafml"
-loaderVersion = "[2,)"
-#issueTrackerURL = ""
-license = "MIT License"
-
-[[mods]]
-modId = "modid"
-version = "${version}"
-displayName = "MidnightLib Test Mod"
-authors = "TeamMidnightDust, Motschen"
-description = '''
-Example Mod for Team MidnightDust's mods.
-'''
-
-[[dependencies.modid]]
-modId = "neoforge"
-mandatory = true
-versionRange = "[20.5,)"
-ordering = "NONE"
-side = "BOTH"
-
-[[dependencies.modid]]
-modId = "minecraft"
-mandatory = true
-versionRange = "[1.20.5,)"
-ordering = "NONE"
-side = "BOTH"
-
-[[dependencies.modid]]
-modId = "midnightlib"
-mandatory = true
-versionRange = "[1.0,)"
-ordering = "NONE"
-side = "BOTH"

settings.gradle

@@ -9,7 +9,9 @@ pluginManagement {
 
 include("common")
 include("fabric")
+include("test-fabric")
 include("neoforge")
+include("test-neoforge")
 //include("quilt")
 
-rootProject.name = "midnightlib"
+rootProject.name = "midnightlib"

test-fabric/build.gradle

@@ -0,0 +1,32 @@
+plugins {
+    id 'com.github.johnrengelman.shadow'
+    id "me.shedaniel.unified-publishing"
+}
+repositories {
+    maven { url "https://maven.terraformersmc.com/releases" }
+}
+
+architectury {
+    platformSetupLoomIde()
+    fabric()
+}
+
+loom {
+}
+
+configurations {
+    common
+    shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
+    compileClasspath.extendsFrom common
+    runtimeClasspath.extendsFrom common
+    developmentFabric.extendsFrom common
+    archivesBaseName = rootProject.archives_base_name + "-fabric"
+}
+
+dependencies {
+    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+    modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
+
+    implementation project(path: ":fabric", configuration: "namedElements")
+    common(project(path: ":common", configuration: "namedElements")) { transitive false }
+}

test-fabric/src/main/java/eu/midnightdust/fabric/example/MLExampleFabric.java

@@ -0,0 +1,11 @@
+package eu.midnightdust.fabric.example;
+
+import eu.midnightdust.fabric.example.config.MidnightConfigExample;
+import net.fabricmc.api.ModInitializer;
+
+public class MLExampleFabric implements ModInitializer {
+    @Override
+    public void onInitialize() {
+        MidnightConfigExample.init("modid", MidnightConfigExample.class);
+    }
+}

test-fabric/src/main/java/eu/midnightdust/fabric/example/MidnightLibExtras.java

@@ -1,15 +1,12 @@
-package eu.midnightdust.test;
+package eu.midnightdust.fabric.example;
 
 import com.google.common.collect.Lists;
-import eu.midnightdust.lib.config.EntryInfo;
+import eu.midnightdust.lib.config.MidnightConfig;
-import eu.midnightdust.lib.config.MidnightConfigListWidget;
-import eu.midnightdust.lib.config.MidnightConfigScreen;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.tooltip.Tooltip;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.client.gui.widget.TextIconButtonWidget;
-import net.minecraft.client.input.KeyInput;
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.InputUtil;
 import net.minecraft.text.MutableText;
@@ -27,7 +24,7 @@ public class MidnightLibExtras {
     public static class KeybindButton extends ButtonWidget {
         public static ButtonWidget focusedButton;
 
-        public static void add(KeyBinding binding, MidnightConfigListWidget list, MidnightConfigScreen screen) {
+        public static void add(KeyBinding binding, MidnightConfig.MidnightConfigListWidget list, MidnightConfig.MidnightConfigScreen screen) {
             KeybindButton editButton = new KeybindButton(screen.width - 185, 0, 150, 20, binding);
             TextIconButtonWidget resetButton = TextIconButtonWidget.builder(Text.translatable("controls.reset"), (button -> {
                 binding.setBoundKey(binding.getDefaultKey());
@@ -36,9 +33,9 @@ public class MidnightLibExtras {
             resetButton.setPosition(screen.width - 205 + 150 + 25, 0);
             editButton.resetButton = resetButton;
             editButton.updateMessage(false);
-            EntryInfo info = new EntryInfo(null, screen.modid);
+            MidnightConfig.EntryInfo info = new MidnightConfig.EntryInfo(null, screen.modid);
 
-            list.addButton(Lists.newArrayList(editButton, resetButton), Text.translatable(binding.getId()), info);
+            list.addButton(Lists.newArrayList(editButton, resetButton), Text.translatable(binding.getTranslationKey()), info);
         }
 
         private final KeyBinding binding;
@@ -47,24 +44,24 @@ public class MidnightLibExtras {
             super(x, y, width, height, binding.getBoundKeyLocalizedText(), (button) -> {
                 ((KeybindButton) button).updateMessage(true);
                 focusedButton = button;
-            }, (textSupplier) -> binding.isUnbound() ? Text.translatable("narrator.controls.unbound", binding.getId()) : Text.translatable("narrator.controls.bound", binding.getId(), textSupplier.get()));
+            }, (textSupplier) -> binding.isUnbound() ? Text.translatable("narrator.controls.unbound", binding.getTranslationKey()) : Text.translatable("narrator.controls.bound", binding.getTranslationKey(), textSupplier.get()));
             this.binding = binding;
             updateMessage(false);
         }
         @Override
-        public boolean keyPressed(KeyInput input) {
+        public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
             if (focusedButton == this) {
-                if (input.key() == GLFW.GLFW_KEY_ESCAPE) {
+                if (keyCode == GLFW.GLFW_KEY_ESCAPE) {
                     this.binding.setBoundKey(InputUtil.UNKNOWN_KEY);
                 } else {
-                    this.binding.setBoundKey(InputUtil.fromKeyCode(input));
+                    this.binding.setBoundKey(InputUtil.fromKeyCode(keyCode, scanCode));
                 }
                 updateMessage(false);
 
                 focusedButton = null;
                 return true;
             }
-            return super.keyPressed(input);
+            return super.keyPressed(keyCode, scanCode, modifiers);
         }
 
         public void updateMessage(boolean focused) {
@@ -80,7 +77,7 @@ public class MidnightLibExtras {
                             if (hasConflicts) conflictingBindings.append(", ");
 
                             hasConflicts = true;
-                            conflictingBindings.append(Text.translatable(keyBinding.getId()));
+                            conflictingBindings.append(Text.translatable(keyBinding.getTranslationKey()));
                         }
                     }
                 }

test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java

@@ -1,9 +1,7 @@
-package eu.midnightdust.test.config;
+package eu.midnightdust.fabric.example.config;
 
 import com.google.common.collect.Lists;
-import eu.midnightdust.lib.config.MidnightConfigListWidget;
+import eu.midnightdust.fabric.example.MidnightLibExtras;
-import eu.midnightdust.lib.config.MidnightConfigScreen;
-import eu.midnightdust.test.MidnightLibExtras;
 import eu.midnightdust.lib.config.MidnightConfig;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;

test-fabric/src/main/resources/fabric.mod.json

@@ -1,10 +1,10 @@
 {
     "schemaVersion": 1,
-    "id": "modid",
+    "id": "midnightlib-example",
     "version": "${version}",
 
-    "name": "MidnightLib Test Mod",
+    "name": "MidnightLib Example",
-    "description": "Example Mod for Team MidnightDust's mods.",
+    "description": "Wow, you can do so much.",
     "authors": [ "MidnightDust" ],
 
     "license": "CC0",
@@ -13,7 +13,7 @@
     "environment": "*",
     "entrypoints": {
         "main": [
-            "eu.midnightdust.test.fabric.MLExampleFabric"
+            "eu.midnightdust.fabric.example.MLExampleFabric"
         ]
     },
     "depends": {