add null check for modid when registering modmenu screens

build.gradle

@@ -1,18 +1,3 @@
-import java.nio.charset.StandardCharsets
-
-// this build.gradle is tweaked from CCA: https://github.com/OnyxStudios/Cardinal-Components-API/blob/master/build.gradle
-
-buildscript {
-    repositories {
-        mavenLocal()
-        google()
-    }
-
-    dependencies {
-        classpath 'com.guardsquare:proguard-gradle:7.1.0-beta4'
-    }
-}
-
 plugins {
     id "fabric-loom" version "0.10-SNAPSHOT"
     id "maven-publish"
@@ -25,218 +10,82 @@ archivesBaseName = "omega-config"
 subprojects {
     apply plugin: 'fabric-loom'
     apply plugin: 'maven-publish'
-    apply plugin: 'java-library'
 
     archivesBaseName = project.name
     group = "draylar.${project.group}"
 
-    // import utility functions
-    apply from: "https://raw.githubusercontent.com/NerdHubMC/Gradle-Scripts/master/scripts/utilities.gradle"
-
-    repositories {
-        mavenCentral()
-    }
-
-    compileJava {
-        options.encoding = StandardCharsets.UTF_8.name()
-    }
-
-    if (JavaVersion.current().isJava8Compatible()) {
-        allprojects {
-            tasks.withType(Javadoc) {
-                options.addStringOption("Xdoclint:none", "-quiet")
-            }
-        }
-    }
-
-    jar {
-        from "LICENSE.md"
-        from "LICENSE"
-        manifest.mainAttributes(
-                "Implementation-Title": project.archivesBaseName,
-                "Implementation-Version": mod_version,
-                "Maven-Artifact": "${project.group}:${project.name}:${mod_version}".toLowerCase(Locale.ROOT),
-                "Built-On-Minecraft": "${project.minecraft_version}",
-                "Built-On-Java": "${System.getProperty("java.vm.version")} (${System.getProperty("java.vm.vendor")})"
-        )
-    }
-
-    task sourcesJar(type: Jar, dependsOn: classes) {
-        from sourceSets.main.allSource
-        classifier = "sources"
-    }
-
-    task javadocJar(type: Jar, dependsOn: javadoc) {
-        from javadoc.destinationDir
-        classifier = "javadoc"
-    }
-    tasks.build.dependsOn javadocJar
-
+    // Only publish for submodules (not the root project)  - add standard jar, + sources & development jar
     publishing {
         publications {
             mavenJava(MavenPublication) {
-                artifact(remapJar) {
-                    builtBy remapJar
-                }
-
-                artifact(sourcesJar) {
-                    builtBy remapSourcesJar
-                }
-
-                artifact(file("${project.buildDir}/libs/${archivesBaseName}-${project.mod_version}-min.jar")) {
-                    builtBy(remapJar)
-                    classifier = 'min'
-                }
-
-                pom.withXml {
-                    def depsNode = asNode().appendNode("dependencies")
-                    subprojects.each {
-                        def depNode = depsNode.appendNode("dependency")
-                        depNode.appendNode("groupId", it.group)
-                        depNode.appendNode("artifactId", it.name)
-                        depNode.appendNode("version", it.version)
-                        depNode.appendNode("scope", "compile")
-                    }
-                }
+                from components.java
             }
         }
     }
 
-    tasks.publish.dependsOn build //stupid fix for maven/loom not publishing the main artifact
-
-    task('proguard', type: proguard.gradle.ProGuardTask) {
-        configuration './proguard.conf'
-        verbose
-        injars project.buildDir.toString() + '/libs/' + archivesBaseName + "-" + project.mod_version + ".jar"
-        outjars project.buildDir.toString() + '/libs/' + archivesBaseName + "-" + project.mod_version + "-min.jar"
-        printmapping 'out.map'
-        keepparameternames
-        renamesourcefileattribute 'SourceFile'
-        keepattributes 'Signature,Exceptions,InnerClasses,PermittedSubclasses,EnclosingMethod,Deprecated,SourceFile,LineNumberTable'
-        keepattributes '*Annotation*'
-
-        keep 'public class * { \
-        public protected *; \
-    }'
-        keepclassmembernames 'class * { \
-        java.lang.Class class$(java.lang.String); \
-        java.lang.Class class$(java.lang.String, boolean); \
-    }'
-
-        keepclassmembers 'class draylar.omegaconfig.mixin.* {\
-        <fields>;\
-        <init>();\
-        <methods>;\
-    }'
+    // Add sources & javadoc artifacts
+    java {
+        withSourcesJar()
+        withJavadocJar()
     }
-
-    remapJar.finalizedBy proguard
 }
 
 allprojects {
     apply plugin: "fabric-loom"
-
-    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_16
-    version = System.getenv("TRAVIS_TAG") ?: project.mod_version
+    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
+    version = project.mod_version + "-" + project.minecraft_version
 
     repositories {
         maven {
             name = "FabricMC"
             url = "https://maven.fabricmc.net"
         }
-
-        maven { url = "https://maven.terraformersmc.com/releases/" }
     }
 
     dependencies {
-        //to change the versions see the gradle.properties file
         minecraft "com.mojang:minecraft:${project.minecraft_version}"
         mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
         modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
         modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-
-        modRuntimeOnly "com.terraformersmc:modmenu:${project.modmenu_version}"
-        modCompileOnly "com.terraformersmc:modmenu:${project.modmenu_version}"
     }
 
-}
-
-jar {
-    from(rootProject.file("LICENSE.md")) {
-        rename { "LICENSE_${project.archivesBaseName.replace('-', '_')}" }
-    }
-}
-
-afterEvaluate {
     processResources {
-        // this will ensure that this task is redone when there"s a change
-        inputs.property "version", mod_version
+        inputs.property "version", project.version
 
-        // replace stuff in fabric.mod.json, nothing else
-        from(sourceSets.main.resources.srcDirs) {
-            include "fabric.mod.json"
-
-            // add mod metadata
-            expand "version": mod_version
+        filesMatching("fabric.mod.json") {
+            expand "version": project.version
         }
+    }
 
-        // copy everything else, that"s not the fabric.mod.json
-        from(sourceSets.main.resources.srcDirs) {
-            exclude "fabric.mod.json"
+    tasks.withType(JavaCompile) {
+        javadoc.options.addStringOption('Xdoclint:none', '-quiet')
+    }
+
+    jar {
+        from(rootProject.file("LICENSE")) {
+            rename { "LICENSE_${project.archivesBaseName.replace('-', '_')}" }
         }
     }
 }
 
+// Main project depends on the base & gui module for testing
+dependencies {
+    implementation project(path: ":omega-config-base", configuration: "namedElements")
+    implementation project(path: ":omega-config-gui", configuration: "namedElements")
+
+    afterEvaluate {
+        testmodImplementation sourceSets.main.output
+    }
+}
+
 sourceSets {
     testmod {
         compileClasspath += main.compileClasspath
         runtimeClasspath += main.runtimeClasspath
     }
+
     test {
         compileClasspath += main.compileClasspath
         runtimeClasspath += main.runtimeClasspath
     }
 }
-
-task licenseFormatAll
-subprojects { p -> licenseFormatAll.dependsOn("${p.path}:licenseFormat") }
-subprojects.each { remapJar.dependsOn("${it.path}:remapJar") }
-
-repositories {
-    maven {
-        name = "JitPack"
-        url = "https://jitpack.io"
-    }
-}
-
-dependencies {
-    implementation project(path: ":omega-config-base", configuration: "namedElements")
-    implementation project(path: ":omega-config-gui", configuration: "namedElements")
-    modRuntimeOnly "com.terraformersmc:modmenu:${project.modmenu_version}"
-    modCompileOnly "com.terraformersmc:modmenu:${project.modmenu_version}"
-
-    afterEvaluate {
-        testmodImplementation sourceSets.main.output
-    }
-}
-
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            from components.java
-
-            pom.withXml {
-                def depsNode = asNode().appendNode("dependencies")
-                subprojects.each {
-                    def depNode = depsNode.appendNode("dependency")
-                    depNode.appendNode("groupId", it.group)
-                    depNode.appendNode("artifactId", it.name)
-                    depNode.appendNode("version", it.version)
-                    depNode.appendNode("scope", "compile")
-                }
-            }
-        }
-    }
-}
-
-tasks.publish.dependsOn build //stupid fix for maven/loom not publishing the main artifact

gradle.properties

@@ -9,8 +9,8 @@ loader_version=0.12.11
 #Fabric api
 fabric_version=0.44.0+1.18
 # Mod Properties
-mod_version=1.1.0
+mod_version=1.2.1
 maven_group=draylar
 archives_base_name=omega-config
 
-modmenu_version=3.0.0
+modmenu_version=3.0.1

omega-config-base/proguard.conf

@@ -1,3 +0,0 @@
--ignorewarnings
-
--keep class net.fabricmc.api.** { *; }

omega-config-base/src/main/java/draylar/omegaconfig/OmegaConfig.java

@@ -6,6 +6,7 @@ import draylar.omegaconfig.api.Comment;
 import draylar.omegaconfig.api.Config;
 import draylar.omegaconfig.gson.SyncableExclusionStrategy;
 import io.netty.buffer.Unpooled;
+import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import net.fabricmc.loader.api.FabricLoader;
@@ -30,15 +31,16 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-public class OmegaConfig {
+public class OmegaConfig implements ModInitializer {
 
     public static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
     public static final Identifier CONFIG_SYNC_PACKET = new Identifier("omegaconfig", "sync");
     public static final Gson SYNC_ONLY_GSON = new GsonBuilder().addSerializationExclusionStrategy(new SyncableExclusionStrategy()).setPrettyPrinting().create();
-    private static final Logger LOGGER = LogManager.getLogger();
+    public static final Logger LOGGER = LogManager.getLogger();
     private static final List<Config> REGISTERED_CONFIGURATIONS = new ArrayList<>();
 
-    static {
+    @Override
+    public void onInitialize() {
         ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> server.execute(() -> {
             PacketByteBuf packet = new PacketByteBuf(Unpooled.buffer());
 
@@ -162,7 +164,7 @@ public class OmegaConfig {
         }
     }
 
-    private static List<Class<?>> flatten(Class<?>[] array) {
+    public static List<Class<?>> flatten(Class<?>[] array) {
         List<Class<?>> list = new ArrayList<>();
 
         for (Class<?> clazz : array) {

omega-config-base/src/main/resources/fabric.mod.json

@@ -8,6 +8,11 @@
     "Draylar",
     "Frqnny"
   ],
+  "entrypoints": {
+    "main": [
+      "draylar.omegaconfig.OmegaConfig"
+    ]
+  },
   "contact": {
       "homepage": "https://github.com/Draylar/omega-config",
       "sources": "https://github.com/Draylar/omega-config",

omega-config-gui/build.gradle

@@ -1,3 +1,29 @@
+repositories {
+    maven {
+        name = "Shedaniel's Maven"
+        url = "https://maven.shedaniel.me/"
+    }
+
+    maven {
+        name = "TerraformersMC"
+        url = "https://maven.terraformersmc.com/releases/"
+    }
+}
+
 dependencies {
     implementation project(":omega-config-base")
+
+    // Mod Menu
+    modCompileOnly ("com.terraformersmc:modmenu:${project.modmenu_version}") {
+        transitive(false)
+    }
+    modRuntime ("com.terraformersmc:modmenu:${project.modmenu_version}") {
+        transitive(false)
+    }
+
+    // Cloth Config Lite
+    include "me.shedaniel.cloth:cloth-config-lite-fabric:2.0.6"
+    modApi ("me.shedaniel.cloth:cloth-config-lite-fabric:2.0.6") {
+        exclude group: "net.fabricmc.fabric-api"
+    }
 }

omega-config-gui/proguard.conf

@@ -1,3 +0,0 @@
--ignorewarnings
-
--keep class net.fabricmc.api.** { *; }

omega-config-gui/src/main/java/draylar/omegaconfiggui/OmegaConfigGui.java

@@ -1,15 +1,27 @@
 package draylar.omegaconfiggui;
 
+import draylar.omegaconfig.OmegaConfig;
 import draylar.omegaconfig.api.Config;
-import draylar.omegaconfiggui.api.screen.ModMenuHelper;
-import draylar.omegaconfiggui.api.screen.OmegaConfigScreen;
+import draylar.omegaconfiggui.api.screen.OmegaModMenu;
+import draylar.omegaconfiggui.api.screen.OmegaScreenFactory;
+import me.shedaniel.clothconfiglite.api.ConfigScreen;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.text.LiteralText;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+import java.util.Map;
 
 @Environment(EnvType.CLIENT)
 public class OmegaConfigGui {
 
+    private static final Map<Config, OmegaScreenFactory<Screen>> REGISTERED_CONFIGURATIONS = new HashMap<>();
+    public static boolean modMenuInitialized = false;
+
     /**
      * Registers a ModMenu configuration screen for the given {@link Config} instance.
      *
@@ -17,8 +29,70 @@ public class OmegaConfigGui {
      * @param <T>    config type
      */
     public static <T extends Config> void registerConfigScreen(T config) {
-        if (FabricLoader.getInstance().isModLoaded("modmenu")) {
-            ModMenuHelper.injectScreen(config, parent -> new OmegaConfigScreen<>(config, parent));
+        if(FabricLoader.getInstance().isModLoaded("modmenu")) {
+            // Ensure the config has a valid modid.
+            if(config.getModid() != null) {
+                OmegaScreenFactory<Screen> factory = OmegaConfigGui.getConfigScreenFactory(config);
+
+                if(modMenuInitialized) {
+                    OmegaModMenu.injectScreen(config, factory);
+                } else {
+                    REGISTERED_CONFIGURATIONS.put(config, factory);
+                }
+            } else {
+                OmegaConfig.LOGGER.warn(String.format("Skipping config screen registration for '%s' - you must implement getModid() in your config class!", config.getName()));
+            }
         }
     }
+
+    /**
+     * Returns a factory which provides new Cloth Config Lite {@link Screen} instances for the given {@link Config}.
+     *
+     * @param config Omega Config instance to create the screen factory for
+     * @return a factory which provides new Cloth Config Lite {@link Screen} instances for the given {@link Config}.
+     */
+    public static OmegaScreenFactory<Screen> getConfigScreenFactory(Config config) {
+        return parent -> {
+            try {
+                Config defaultConfig = config.getClass().getDeclaredConstructor().newInstance();
+                ConfigScreen screen = ConfigScreen.create(new LiteralText(config.getName()), parent);
+
+                // Fields
+                for (Field field : config.getClass().getDeclaredFields()) {
+                    try {
+                        screen.add(new LiteralText(field.getName()), field.get(config), () -> {
+                            try {
+                                return field.get(defaultConfig);
+                            } catch (IllegalAccessException e) {
+                                e.printStackTrace();
+                            }
+
+                            return 0.0d;
+                        }, newValue -> {
+                            try {
+                                field.set(config, newValue);
+                            } catch (IllegalAccessException e) {
+                                e.printStackTrace();
+                            }
+
+                            config.save();
+                        });
+                    } catch (IllegalAccessException | IllegalArgumentException exception) {
+                        // ignored
+                    }
+                }
+
+                return screen.get();
+            } catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException exception) {
+                OmegaConfig.LOGGER.error(String.format("Configuration class for mod %s must have a no-argument constructor for retrieving default values.", config.getModid()));
+            }
+
+            // todo: is this a bad idea
+            return null;
+        };
+    }
+
+    public static Map<Config, OmegaScreenFactory<Screen>> getConfigScreenFactories() {
+        return REGISTERED_CONFIGURATIONS;
+    }
 }

omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/OmegaConfigScreen.java

@@ -1,142 +0,0 @@
-package draylar.omegaconfiggui.api.screen;
-
-import com.mojang.blaze3d.systems.RenderSystem;
-import draylar.omegaconfig.api.Config;
-import draylar.omegaconfiggui.api.screen.widget.LabelWidget;
-import draylar.omegaconfiggui.api.screen.widget.TypeWidgets;
-import draylar.omegaconfiggui.api.screen.widget.WidgetSupplier;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.gui.widget.ClickableWidget;
-import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.client.render.BufferBuilder;
-import net.minecraft.client.render.Tessellator;
-import net.minecraft.client.render.VertexFormat;
-import net.minecraft.client.render.VertexFormats;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.LiteralText;
-import net.minecraft.util.Pair;
-
-import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-public class OmegaConfigScreen<T extends Config> extends Screen {
-
-    private static final List<Class<?>> validClasses = Arrays.asList(Double.class, String.class, Boolean.class);
-    private final T config;
-    private final Screen parent;
-    private final Map<Field, Pair<WidgetSupplier<Object, ClickableWidget>, ClickableWidget>> fieldWidgets = new HashMap<>();
-
-    public OmegaConfigScreen(T config, Screen parent) {
-        super(new LiteralText(""));
-        this.config = config;
-        this.parent = parent;
-    }
-
-    @Override
-    public void init() {
-        super.init();
-
-        try {
-            // add label & button for each config entry
-            // TODO: SUB-CLASS SUPPORT
-            List<Field> collect = Arrays.stream(config.getClass().getDeclaredFields()).filter(field -> validClasses.contains(TypeWidgets.unbox(field.getType()))).collect(Collectors.toList());
-            int over = 0;
-
-            for (Field field : collect) {
-                Class<?> unbox = TypeWidgets.unbox(field.getType());
-
-                // label
-                addDrawable(new LabelWidget(150, 15 + height / 6 + 20 * over, new LiteralText(field.getName())));
-
-                // get value
-                field.setAccessible(true);
-                Object value = field.get(config);
-
-                // button / interact
-                ClickableWidget button;
-                WidgetSupplier<Object, ClickableWidget> widgetSupplier = (WidgetSupplier<Object, ClickableWidget>) TypeWidgets.get(unbox);
-                if (widgetSupplier != null) {
-                    button = widgetSupplier.create(this, 250, 5 + height / 6 + 25 * over, 100, 20, new LiteralText(field.getName()), value);
-                } else {
-                    button = new TextFieldWidget(client.textRenderer, 250, 5 + height / 6 + 25 * over, 100, 20, new LiteralText(field.getName()));
-                }
-
-                fieldWidgets.put(field, new Pair<>(widgetSupplier, button));
-
-                addSelectableChild(button);
-
-                over++;
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        // save and exit
-        ButtonWidget exit = new ButtonWidget(width - 60, height - 30, 50, 20, new LiteralText("Exit"), widget -> onClose());
-        ButtonWidget save = new ButtonWidget(10, height - 30, 50, 20, new LiteralText("Save"), widget -> {
-            fieldWidgets.forEach((field, pair) -> {
-                try {
-                    field.set(config, pair.getLeft().get(pair.getRight()));
-                } catch (IllegalAccessException e) {
-                    e.printStackTrace();
-                }
-            });
-
-            config.save();
-        });
-        addSelectableChild(save);
-        addSelectableChild(exit);
-    }
-
-    @Override
-    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
-        renderBackground(matrices);
-
-        //TODO make this work. for Drawables (children) it works in parent method
-        /*
-        for (ClickableWidget button : this.) {
-            button.render(matrices, mouseX, mouseY, delta);
-        }
-
-        for (Element element : this.children) {
-            if (element instanceof Drawable && !buttons.contains(element)) {
-                ((Drawable) element).render(matrices, mouseX, mouseY, delta);
-            }
-        }
-
-         */
-    }
-
-    @Override
-    public void onClose() {
-        client.setScreen(parent);
-    }
-
-    @Override
-    public void renderBackground(MatrixStack matrices) {
-        // TODO: option for transparent BG
-//        this.fillGradient(matrices, 0, 0, this.width, this.height, -1072689136, -804253680);
-        renderCustomBackgroundTexture(0, 64, 64, 64, 0, 0, this.height, this.width);
-        renderCustomBackgroundTexture(0, 32, 32, 32, 0, this.height / 8, this.height / 8 * 6, this.width);
-        textRenderer.draw(matrices, config.getName(), width / 2f - textRenderer.getWidth(config.getName()) / 2f, 10, 0xffffff);
-    }
-
-    public void renderCustomBackgroundTexture(int vOffset, int r, int g, int b, int x, int y, int height, int width) {
-        Tessellator tessellator = Tessellator.getInstance();
-        BufferBuilder bufferBuilder = tessellator.getBuffer();
-        this.client.getTextureManager().bindTexture(OPTIONS_BACKGROUND_TEXTURE);
-        RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
-
-        bufferBuilder.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_TEXTURE_COLOR);
-        bufferBuilder.vertex(x, height + y, 0.0D).texture(0.0F, (float) height / 32.0F + (float) vOffset).color(r, g, b, 255).next();
-        bufferBuilder.vertex(width + x, height + y, 0.0D).texture((float) width / 32.0F, (float) height / 32.0F + (float) vOffset).color(r, g, b, 255).next();
-        bufferBuilder.vertex(width + x, y, 0.0D).texture((float) width / 32.0F, (float) vOffset).color(r, g, b, 255).next();
-        bufferBuilder.vertex(x, y, 0.0D).texture(0.0F, (float) vOffset).color(r, g, b, 255).next();
-        tessellator.draw();
-    }
-}

omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/OmegaConfigScreenSupplier.java

@@ -1,8 +0,0 @@
-package draylar.omegaconfiggui.api.screen;
-
-import draylar.omegaconfig.api.Config;
-import net.minecraft.client.gui.screen.Screen;
-
-public interface OmegaConfigScreenSupplier<T extends Config> {
-    OmegaConfigScreen<T> get(Screen parent);
-}

omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/OmegaModMenu.java

@@ -3,14 +3,15 @@ package draylar.omegaconfiggui.api.screen;
 import com.google.common.collect.ImmutableMap;
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import draylar.omegaconfig.api.Config;
-import draylar.omegaconfiggui.mixin.ModMenuAccessor;
+import draylar.omegaconfiggui.mixin.modmenu.ModMenuAccessor;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.client.gui.screen.Screen;
 
 @Environment(EnvType.CLIENT)
-public class ModMenuHelper {
+public class OmegaModMenu {
 
-    public static <T extends Config> void injectScreen(T config, OmegaConfigScreenSupplier<T> factory) {
+    public static <T extends Config> void injectScreen(T config, OmegaScreenFactory<Screen> factory) {
         // they will suspect nothing
         ModMenuAccessor.setConfigScreenFactories(
                 new ImmutableMap.Builder<String, ConfigScreenFactory<?>>()

omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/OmegaScreenFactory.java

@@ -0,0 +1,10 @@
+package draylar.omegaconfiggui.api.screen;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.gui.screen.Screen;
+
+@Environment(EnvType.CLIENT)
+public interface OmegaScreenFactory<T extends Screen> {
+    T get(Screen parent);
+}

omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/BaseTextFieldWidget.java

@@ -1,30 +0,0 @@
-package draylar.omegaconfiggui.api.screen.widget;
-
-import draylar.omegaconfiggui.mixin.ClickableWidgetInvoker;
-import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.ClickableWidget;
-import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.text.Text;
-
-public class BaseTextFieldWidget extends TextFieldWidget {
-
-    protected final Screen parent;
-
-    public BaseTextFieldWidget(Screen parent, TextRenderer textRenderer, int x, int y, int width, int height, Text text) {
-        super(textRenderer, x, y, width, height, text);
-        this.parent = parent;
-    }
-
-    @Override
-    public void setTextFieldFocused(boolean focused) {
-        // unfocus all others
-        parent.children().forEach(element -> {
-            if (element instanceof ClickableWidget) {
-                ((ClickableWidgetInvoker) element).callSetFocused(false);
-            }
-        });
-
-        super.setFocused(focused);
-    }
-}

omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/DoubleFieldWidget.java

@@ -1,25 +0,0 @@
-package draylar.omegaconfiggui.api.screen.widget;
-
-import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.text.Text;
-
-public class DoubleFieldWidget extends BaseTextFieldWidget {
-
-    public DoubleFieldWidget(Screen parent, TextRenderer textRenderer, int x, int y, int width, int height, Text text) {
-        super(parent, textRenderer, x, y, width, height, text);
-    }
-
-    @Override
-    public void write(String string) {
-        try {
-            if (!string.equals(".") || getText().contains(".")) {
-                Double.parseDouble(string);
-            }
-            super.write(string);
-
-        } catch (NumberFormatException ignored) {
-
-        }
-    }
-}

omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/LabelWidget.java

@@ -1,26 +0,0 @@
-package draylar.omegaconfiggui.api.screen.widget;
-
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.Drawable;
-import net.minecraft.client.gui.DrawableHelper;
-import net.minecraft.client.gui.Element;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.Text;
-
-public class LabelWidget extends DrawableHelper implements Drawable, Element {
-
-    private final int x;
-    private final int y;
-    private final Text message;
-
-    public LabelWidget(int x, int y, Text message) {
-        this.x = x;
-        this.y = y;
-        this.message = message;
-    }
-
-    @Override
-    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
-        drawTextWithShadow(matrices, MinecraftClient.getInstance().textRenderer, message, x, y, 0xffffff);
-    }
-}

omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/TypeWidgets.java

@@ -1,45 +0,0 @@
-package draylar.omegaconfiggui.api.screen.widget;
-
-import draylar.omegaconfiggui.api.screen.widget.supplier.BooleanWidgetSupplier;
-import draylar.omegaconfiggui.api.screen.widget.supplier.DoubleWidgetSupplier;
-import draylar.omegaconfiggui.api.screen.widget.supplier.StringWidgetSupplier;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class TypeWidgets {
-
-    public static final Map<Class<?>, WidgetSupplier<?, ?>> CLASS_WIDGETS = new HashMap<>();
-    public static final Map<Class<?>, Class<?>> PRIMITIVE_TO_BOXED = new HashMap<>();
-
-    static {
-        CLASS_WIDGETS.put(Double.class, new DoubleWidgetSupplier());
-        CLASS_WIDGETS.put(Boolean.class, new BooleanWidgetSupplier());
-        CLASS_WIDGETS.put(String.class, new StringWidgetSupplier());
-
-        // primitive -> boxed
-        PRIMITIVE_TO_BOXED.put(boolean.class, Boolean.class);
-        PRIMITIVE_TO_BOXED.put(byte.class, Byte.class);
-        PRIMITIVE_TO_BOXED.put(char.class, Character.class);
-        PRIMITIVE_TO_BOXED.put(double.class, Double.class);
-        PRIMITIVE_TO_BOXED.put(float.class, Float.class);
-        PRIMITIVE_TO_BOXED.put(int.class, Integer.class);
-        PRIMITIVE_TO_BOXED.put(long.class, Long.class);
-        PRIMITIVE_TO_BOXED.put(short.class, Short.class);
-        PRIMITIVE_TO_BOXED.put(void.class, Void.class);
-    }
-
-    private TypeWidgets() {
-        // NO-OP
-    }
-
-    @Nullable
-    public static <T> WidgetSupplier<T, ?> get(Class<T> typeClass) {
-        return (WidgetSupplier<T, ?>) CLASS_WIDGETS.get(unbox(typeClass));
-    }
-
-    public static Class<?> unbox(Class<?> c) {
-        return PRIMITIVE_TO_BOXED.getOrDefault(c, c);
-    }
-}

omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/WidgetSupplier.java

@@ -1,11 +0,0 @@
-package draylar.omegaconfiggui.api.screen.widget;
-
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.ClickableWidget;
-import net.minecraft.text.LiteralText;
-
-public interface WidgetSupplier<T, A extends ClickableWidget> {
-    ClickableWidget create(Screen parent, int x, int y, int width, int height, LiteralText prompt, T value);
-
-    T get(A widget);
-}

omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/supplier/BooleanWidgetSupplier.java

@@ -1,19 +0,0 @@
-package draylar.omegaconfiggui.api.screen.widget.supplier;
-
-import draylar.omegaconfiggui.api.screen.widget.WidgetSupplier;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.CheckboxWidget;
-import net.minecraft.text.LiteralText;
-
-public class BooleanWidgetSupplier implements WidgetSupplier<Boolean, CheckboxWidget> {
-
-    @Override
-    public CheckboxWidget create(Screen parent, int x, int y, int width, int height, LiteralText prompt, Boolean value) {
-        return new CheckboxWidget(x, y, 20, 20, new LiteralText(""), value);
-    }
-
-    @Override
-    public Boolean get(CheckboxWidget widget) {
-        return widget.isChecked();
-    }
-}

omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/supplier/DoubleWidgetSupplier.java

@@ -1,35 +0,0 @@
-package draylar.omegaconfiggui.api.screen.widget.supplier;
-
-import draylar.omegaconfiggui.api.screen.widget.DoubleFieldWidget;
-import draylar.omegaconfiggui.api.screen.widget.WidgetSupplier;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.text.LiteralText;
-
-public class DoubleWidgetSupplier implements WidgetSupplier<Double, DoubleFieldWidget> {
-
-    @Override
-    public DoubleFieldWidget create(Screen parent, int x, int y, int width, int height, LiteralText prompt, Double value) {
-        LiteralText text = new LiteralText(String.valueOf(value));
-        DoubleFieldWidget widget = new DoubleFieldWidget(parent, MinecraftClient.getInstance().textRenderer, x, y, width, height, text);
-        widget.setText(text.asString());
-        return widget;
-    }
-
-    @Override
-    public Double get(DoubleFieldWidget widget) {
-        String message = widget.getText();
-
-        // if it is just a . or empty, return 0
-        if (message.equals(".") || message.isEmpty()) {
-            return 0.0;
-        }
-
-        // trim potential trailing .
-        if (message.indexOf(".") == message.length()) {
-            message = message.substring(0, message.length() - 1);
-        }
-
-        return Double.parseDouble(message);
-    }
-}

omega-config-gui/src/main/java/draylar/omegaconfiggui/api/screen/widget/supplier/StringWidgetSupplier.java

@@ -1,24 +0,0 @@
-package draylar.omegaconfiggui.api.screen.widget.supplier;
-
-import draylar.omegaconfiggui.api.screen.widget.BaseTextFieldWidget;
-import draylar.omegaconfiggui.api.screen.widget.WidgetSupplier;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.text.LiteralText;
-
-public class StringWidgetSupplier implements WidgetSupplier<String, TextFieldWidget> {
-
-    @Override
-    public TextFieldWidget create(Screen parent, int x, int y, int width, int height, LiteralText prompt, String value) {
-        LiteralText text = new LiteralText(value);
-        TextFieldWidget textField = new BaseTextFieldWidget(parent, MinecraftClient.getInstance().textRenderer, x, y, width, height, text);
-        textField.setText(value);
-        return textField;
-    }
-
-    @Override
-    public String get(TextFieldWidget widget) {
-        return widget.getText();
-    }
-}

omega-config-gui/src/main/java/draylar/omegaconfiggui/mixin/ClickableWidgetInvoker.java

@@ -1,11 +0,0 @@
-package draylar.omegaconfiggui.mixin;
-
-import net.minecraft.client.gui.widget.ClickableWidget;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Invoker;
-
-@Mixin(ClickableWidget.class)
-public interface ClickableWidgetInvoker {
-    @Invoker
-    void callSetFocused(boolean focused);
-}

omega-config-gui/src/main/java/draylar/omegaconfiggui/mixin/ModMenuMixin.java

@@ -0,0 +1,24 @@
+package draylar.omegaconfiggui.mixin;
+
+import com.terraformersmc.modmenu.ModMenu;
+import draylar.omegaconfiggui.OmegaConfigGui;
+import draylar.omegaconfiggui.api.screen.OmegaModMenu;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Environment(EnvType.CLIENT)
+@Mixin(ModMenu.class)
+public class ModMenuMixin {
+
+    @Inject(method = "onInitializeClient", at = @At("RETURN"), remap = false)
+    private void addOmegaConfigurationScreens(CallbackInfo ci) {
+        OmegaConfigGui.modMenuInitialized = true;
+
+        // Add loaded configuration screens to mod menu.
+        OmegaConfigGui.getConfigScreenFactories().forEach(OmegaModMenu::injectScreen);
+    }
+}

omega-config-gui/src/main/java/draylar/omegaconfiggui/mixin/OmegaConfigMixinPlugin.java

@@ -0,0 +1,51 @@
+package draylar.omegaconfiggui.mixin;
+
+import net.fabricmc.loader.api.FabricLoader;
+import org.objectweb.asm.tree.ClassNode;
+import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
+import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
+
+import java.util.List;
+import java.util.Set;
+
+public class OmegaConfigMixinPlugin implements IMixinConfigPlugin {
+
+    @Override
+    public void onLoad(String mixinPackage) {
+
+    }
+
+    @Override
+    public String getRefMapperConfig() {
+        return null;
+    }
+
+    @Override
+    public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
+        if(targetClassName.contains("ModMenu")) {
+            return FabricLoader.getInstance().isModLoaded("modmenu");
+        }
+
+        return true;
+    }
+
+    @Override
+    public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {
+
+    }
+
+    @Override
+    public List<String> getMixins() {
+        return null;
+    }
+
+    @Override
+    public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+
+    }
+
+    @Override
+    public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+
+    }
+}

omega-config-gui/src/main/java/draylar/omegaconfiggui/mixin/modmenu/ModMenuAccessor.java

@@ -1,20 +1,24 @@
-package draylar.omegaconfiggui.mixin;
+package draylar.omegaconfiggui.mixin.modmenu;
 
 import com.google.common.collect.ImmutableMap;
 import com.terraformersmc.modmenu.ModMenu;
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
+@Environment(EnvType.CLIENT)
 @Mixin(ModMenu.class)
 public interface ModMenuAccessor {
+
     @Accessor
     static ImmutableMap<String, ConfigScreenFactory<?>> getConfigScreenFactories() {
         throw new UnsupportedOperationException();
     }
 
     @Accessor
-    static void setConfigScreenFactories(ImmutableMap<String, ConfigScreenFactory<?>> configScreenFactories) {
+    static void setConfigScreenFactories(ImmutableMap<String, ConfigScreenFactory<?>> factories) {
         throw new UnsupportedOperationException();
     }
 }

omega-config-gui/src/main/resources/fabric.mod.json

@@ -2,7 +2,7 @@
   "schemaVersion": 1,
   "id": "omega-config-gui",
   "version": "${version}",
-  "name": "OmegaConfigGui",
+  "name": "Omega Config GUI",
   "description": "GUI support for Omega Config.",
   "authors": [
     "Draylar"
@@ -21,6 +21,9 @@
     "fabricloader": "*",
     "fabric": "*",
     "minecraft": "*"
+  },
+  "recommends": {
+    "modmenu": "3.0.1"
   },
    "custom": {
        "modmenu": {

omega-config-gui/src/main/resources/omega-config-gui.mixins.json

@@ -2,12 +2,11 @@
   "required": true,
   "minVersion": "0.8",
   "package": "draylar.omegaconfiggui.mixin",
-  "compatibilityLevel": "JAVA_16",
-  "mixins": [
-    "ClickableWidgetInvoker",
-    "ModMenuAccessor"
-  ],
+  "compatibilityLevel": "JAVA_17",
+  "plugin": "draylar.omegaconfiggui.mixin.OmegaConfigMixinPlugin",
   "client": [
+    "modmenu.ModMenuAccessor",
+    "ModMenuMixin"
   ],
   "injectors": {
     "defaultRequire": 1

proguard.conf

@@ -1,3 +0,0 @@
--ignorewarnings
-
--keep class net.fabricmc.api.** { *; }