1.20.1 update without Omega Config GUI

README.md

@@ -1,9 +1,8 @@
-# ΩConfig
+<h1 align="center">Omega Config Ω </h1>
+<p align="center">A configuration library by <a href="https://github.com/Draylar">Draylar</a></p>
 
 ---
 
-*The last config library you will ever use.*
-
 ΩConfig is a hyper-minimal config library based on [Auto Config](https://github.com/shedaniel/AutoConfig). It aims to
 achieve the following goals:
 
@@ -20,6 +19,10 @@ public class TestConfig implements Config {
     @Comment(value = "Hello!")
     boolean value = false;
 
+    @Syncing
+    @Comment(value = "This value will sync to the client!")
+    boolean syncableValue = false;
+
     @Override
     public String getFileName() {
         return "test-config";
@@ -63,12 +66,12 @@ you can use the following gradle declarations:
 
 ```groovy
 repositories {
-    maven { url 'https://jitpack.io' }
+    maven { url 'https://maven.draylar.dev/releases' }
 }
 
+// 1.19.2 version: 1.3.0+1.19.2
 dependencies {
-    include("com.github.Draylar.omega-config:omega-config-base:${project.omega_config_version}")
+    modImplementation include("dev.draylar.omega-config:omega-config-base:${project.omega_config_version}")
-    modImplementation("com.github.Draylar.omega-config:omega-config-base:${project.omega_config_version}")
 }
 ```
 
@@ -95,8 +98,7 @@ repositories {
 dependencies {
     ... (including the base declarations)
     
-    include("com.github.Draylar.omega-config:omega-config-gui:${project.omega_config_version}")
+    modImplementation include("dev.draylar.omega-config:omega-config-gui:${project.omega_config_version}")
-    modImplementation("com.github.Draylar.omega-config:omega-config-gui:${project.omega_config_version}")
     modRuntimeOnly ("com.terraformersmc:modmenu:${project.modmenu_version}") // 3.0.1 for 1.18.1
 }
 ```
@@ -115,7 +117,7 @@ MyModInitializer.CONFIG.value=false;
 ```
 
 
-**@Syncing** - *configuration options marked with this annotation will automatically sync to the client when they join a server.*
+`@Syncing` - *configuration options marked with this annotation will automatically sync to the client when they join a server.*
 
 ---
 

build.gradle

@@ -1,10 +1,10 @@
 plugins {
-    id "fabric-loom" version "0.10-SNAPSHOT"
+    id "fabric-loom" version "1.1-SNAPSHOT"
     id "maven-publish"
     id "java-library"
 }
 
-group = "draylar"
+group = "dev.draylar"
 archivesBaseName = "omega-config"
 
 subprojects {
@@ -12,10 +12,21 @@ subprojects {
     apply plugin: 'maven-publish'
 
     archivesBaseName = project.name
-    group = "draylar.${project.group}"
+    group = "dev.draylar.${project.group}"
 
     // Only publish for submodules (not the root project)  - add standard jar, + sources & development jar
     publishing {
+        repositories {
+            maven {
+                name = "draylarRepository"
+                url = "https://maven.draylar.dev/releases"
+                credentials(PasswordCredentials)
+                authentication {
+                    basic(BasicAuthentication)
+                }
+            }
+        }
+
         publications {
             mavenJava(MavenPublication) {
                 from components.java
@@ -33,7 +44,7 @@ subprojects {
 allprojects {
     apply plugin: "fabric-loom"
     sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
-    version = project.mod_version + "-" + project.minecraft_version
+    version = project.mod_version + "+" + project.minecraft_version
 
     repositories {
         maven {
@@ -71,7 +82,6 @@ allprojects {
 // 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

gradle.properties

@@ -1,16 +1,15 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx2G
+
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
-minecraft_version=1.18.1
+minecraft_version=1.20.1
-yarn_mappings=1.18.1+build.12
+yarn_mappings=1.20.1+build.9
-loader_version=0.12.12
+loader_version=0.14.21
+fabric_version=0.84.0+1.20.1
 
-#Fabric api
-fabric_version=0.45.0+1.18
 # Mod Properties
-mod_version=1.2.3
+mod_version=1.4.0
-maven_group=draylar
+maven_group=dev.draylar
 archives_base_name=omega-config
-
+modmenu_version=7.1.0
-modmenu_version=3.0.1

omega-config-gui/build.gradle

@@ -1,29 +0,0 @@
-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)
-    }
-    modRuntimeOnly ("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/src/main/java/draylar/omegaconfiggui/OmegaConfigGui.java

@@ -1,99 +0,0 @@
-package draylar.omegaconfiggui;
-
-import draylar.omegaconfig.OmegaConfig;
-import draylar.omegaconfig.api.Config;
-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 net.minecraft.text.TranslatableText;
-
-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.
-     *
-     * @param config registered config to create a ModMenu screen for
-     * @param <T>    config type
-     */
-    public static <T extends Config> void registerConfigScreen(T config) {
-        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 TranslatableText(String.format("config.%s.%s", config.getModid(), 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/OmegaModMenu.java

@@ -1,22 +0,0 @@
-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.modmenu.ModMenuAccessor;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.client.gui.screen.Screen;
-
-@Environment(EnvType.CLIENT)
-public class OmegaModMenu {
-
-    public static <T extends Config> void injectScreen(T config, OmegaScreenFactory<Screen> factory) {
-        // they will suspect nothing
-        ModMenuAccessor.setConfigScreenFactories(
-                new ImmutableMap.Builder<String, ConfigScreenFactory<?>>()
-                        .putAll(ModMenuAccessor.getConfigScreenFactories())
-                        .put(config.getModid(), factory::get)
-                        .build());
-    }
-}

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

@@ -1,10 +0,0 @@
-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/mixin/ModMenuMixin.java

@@ -1,24 +0,0 @@
-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

@@ -1,51 +0,0 @@
-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,24 +0,0 @@
-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<?>> factories) {
-        throw new UnsupportedOperationException();
-    }
-}

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

@@ -1,33 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "omega-config-gui",
-  "version": "${version}",
-  "name": "Omega Config GUI",
-  "description": "GUI support for Omega Config.",
-  "authors": [
-    "Draylar"
-  ],
-  "contact": {
-      "homepage": "https://github.com/Draylar/omega-config",
-      "sources": "https://github.com/Draylar/omega-config",
-      "issues": "https://github.com/Draylar/omega-config/issues"
-    },
-  "license": "MIT",
-  "environment": "*",
-  "mixins": [
-    "omega-config-gui.mixins.json"
-  ],
-  "depends": {
-    "fabricloader": "*",
-    "fabric": "*",
-    "minecraft": "*"
-  },
-  "recommends": {
-    "modmenu": "3.0.1"
-  },
-   "custom": {
-       "modmenu": {
-           "badges": [ "library" ]
-        }
-    }
-}

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

@@ -1,14 +0,0 @@
-{
-  "required": true,
-  "minVersion": "0.8",
-  "package": "draylar.omegaconfiggui.mixin",
-  "compatibilityLevel": "JAVA_17",
-  "plugin": "draylar.omegaconfiggui.mixin.OmegaConfigMixinPlugin",
-  "client": [
-    "modmenu.ModMenuAccessor",
-    "ModMenuMixin"
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  }
-}

settings.gradle

@@ -12,4 +12,3 @@ pluginManagement {
 rootProject.name = 'omega-config'
 
 include 'omega-config-base'
-include 'omega-config-gui'

src/testmod/java/draylar/omegatest/OmegaTestClient.java

@@ -1,20 +1,19 @@
 package draylar.omegatest;
 
-import draylar.omegaconfiggui.OmegaConfigGui;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.text.LiteralText;
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.text.Text;
 
 public class OmegaTestClient implements ClientModInitializer {
 
     @Override
     public void onInitializeClient() {
-        OmegaConfigGui.registerConfigScreen(OmegaTestMain.CONFIG);
+        HudRenderCallback.EVENT.register((context, delta) -> {
-
+            TextRenderer tr = MinecraftClient.getInstance().textRenderer;
-        HudRenderCallback.EVENT.register((stack, delta) -> {
+            context.drawText(tr, Text.literal(String.valueOf(OmegaTestMain.CONFIG.v)), 15, 15, 0xffffff, true);
-            MinecraftClient.getInstance().textRenderer.draw(stack, new LiteralText(String.valueOf(OmegaTestMain.CONFIG.v)), 15, 15, 0xffffff);
+            context.drawText(tr, Text.literal(String.valueOf(OmegaTestMain.CONFIG.doubleTest)), 15, 25, 0xffffff, true);
-            MinecraftClient.getInstance().textRenderer.draw(stack, new LiteralText(String.valueOf(OmegaTestMain.CONFIG.doubleTest)), 15, 30, 0xffffff);
         });
     }
 }