Merge 0d2c952a54 into 9602736335

common/src/main/java/eu/midnightdust/lib/util/MidnightColorUtil.java

@@ -1,14 +0,0 @@
-package eu.midnightdust.lib.util;
-
-import java.awt.Color;
-
-public class MidnightColorUtil {
-    /**
-     * @param colorStr e.g. "FFFFFF" or "#FFFFFF"
-     * @return Color as RGB
-     */
-    public static Color hex2Rgb(String colorStr) {
-        try { return Color.decode("#" + colorStr.replace("#", ""));
-        } catch (Exception ignored) { return Color.BLACK; }
-    }
-}

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

@@ -1,10 +1,10 @@
 {
     "schemaVersion": 1,
-    "id": "testmod",
+    "id": "modid",
     "version": "${version}",
 
-    "name": "MidnightLib Example",
+    "name": "MidnightLib Test Mod",
-    "description": "Wow, you can do so much.",
+    "description": "Example Mod for Team MidnightDust's mods.",
     "authors": [ "MidnightDust" ],
 
     "license": "CC0",

neoforge/build.gradle

@@ -43,7 +43,7 @@ loom {
                 create('midnightlib') {
                     sourceSet sourceSets.main
                 }
-                create('testmod') {
+                create('modid') {      // test mod
                     sourceSet sourceSets.test
                 }
             }

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

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

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

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