➖➕ throw yacl like a motherf'er, hi midnightlib

Author: asoji

build.gradle.kts

@@ -19,7 +19,6 @@ repositories {
 	maven("https://maven.parchmentmc.org")
 	maven("https://mvn.devos.one/snapshots")
 	maven("https://maven.bawnorton.com/releases") // MixinSquared
-	maven("https://maven.isxander.dev/releases") // YetAnotherConfigLib
 }
 
 //All dependencies and their versions are in ./gradle/libs.versions.toml
@@ -32,25 +31,25 @@ dependencies {
 		parchment("org.parchmentmc.data:parchment-1.21.1:2024.11.17@zip")
 	})
 
-	//Fabric
+	// Fabric
 	modImplementation(libs.fabric.loader)
 	modImplementation(libs.fabric.api)
 	modImplementation(libs.fabric.language.kotlin)
 
-	//Mods
+	// Mods
 	modImplementation(libs.bundles.dependencies)
 	modLocalRuntime(libs.bundles.dev.mods)
 
 	// Config
-	modImplementation(libs.yacl)
+	include(modImplementation(libs.midnightlib.get())!!)
 
 	modImplementation(files("localLibs/centered-crosshair+1.21-1.0.8.jar"))
 	modImplementation(files("localLibs/limits_grapple-0.7.3-1.21.1.jar"))
 	modImplementation(files("localLibs/trinkets-3.10.0.jar"))
 
-	include(modImplementation("gay.asoji:fmw:1.0.0+build.8")!!) // just to avoid the basic long metadata calls
-	include(implementation(annotationProcessor("com.github.bawnorton.mixinsquared:mixinsquared-fabric:0.3.3")!!)!!)
-	include(implementation("com.moulberry:mixinconstraints:1.0.9")!!)
+	include(modImplementation(libs.fmw.get())!!) // just to avoid the basic long metadata calls
+	include(implementation(annotationProcessor(libs.mixinsquared.get())!!)!!)
+	include(implementation(libs.mixinconstraints.get())!!)
 }
 
 // Write the version to the fabric.mod.json

gradle/libs.versions.toml

@@ -1,27 +1,30 @@
 [versions]
-# The latest versions are available at https://fabricmc.net/develop
 minecraft = "1.21.1"
-#quilt_mappings = "1.21+build.18"
 fabric_loader = "0.16.14"
 fabric_api = "0.116.4+1.21.1"
 fabric_language_kotlin = "1.13.4+kotlin.2.2.0"
-sodium = "mc1.21.1-0.6.13-fabric"
+fmw = "1.0.0+build.8"
+midnightlib = "1.7.5+1.21.1-fabric"
+mixinconstraints = "1.0.9"
+mixinsquared = "0.3.3"
 modmenu = "11.0.3"
-yacl = "3.7.1+1.21.1-fabric"
+sodium = "mc1.21.1-0.6.13-fabric"
 
 [libraries]
-minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
-fabric_loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric_loader" }
 fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric_api" }
 fabric_language_kotlin = { module = "net.fabricmc:fabric-language-kotlin", version.ref = "fabric_language_kotlin" }
-sodium = { module = "maven.modrinth:sodium", version.ref = "sodium" }
+fabric_loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric_loader" }
+fmw = { module = "gay.asoji:fmw", version.ref = "fmw" }
+midnightlib = { module = "maven.modrinth:midnightlib", version.ref = "midnightlib" }
+mixinconstraints = { module = "com.moulberry:mixinconstraints", version.ref = "mixinconstraints" }
+mixinsquared = { module = "com.github.bawnorton.mixinsquared:mixinsquared-fabric", version.ref = "mixinsquared" }
+minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
 modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu" }
-yacl = { module = "dev.isxander:yet-another-config-lib", version.ref = "yacl" }
+sodium = { module = "maven.modrinth:sodium", version.ref = "sodium" }
 
-# If you have multiple similar dependencies, you can declare a dependency bundle and reference it on the build script with "libs.bundles.example".
 [bundles]
-dev_mods = [ "sodium" ]
-dependencies = ["modmenu"]
+dev_mods = [ "sodium", "modmenu" ]
+dependencies = [ "midnightlib" ]
 
 [plugins]
 grgit = { id = "org.ajoberstar.grgit", version = "5.2.2"}

src/main/java/one/devos/nautical/winterssummerfixes/config/Config.java

@@ -0,0 +1,14 @@
+package one.devos.nautical.winterssummerfixes.config;
+
+import eu.midnightdust.lib.config.MidnightConfig;
+
+public class Config extends MidnightConfig {
+    @Comment(category = "client", centered = true)
+    public static String limitsGrapple;
+
+    @Entry(category = "client", isColor = true)
+    public static String limitsGrappleHitColor = "#3333ff";
+
+    @Entry(category = "client", isColor = true)
+    public static String limitsGrappleMissColor = "#99994c";
+}

src/main/java/one/devos/nautical/winterssummerfixes/mixin/compat/client/LimitsGrappleInGameHudColorMixin.java

@@ -1,13 +1,11 @@
 package one.devos.nautical.winterssummerfixes.mixin.compat.client;
 
 import com.bawnorton.mixinsquared.TargetHandler;
-import com.moulberry.mixinconstraints.annotations.IfModLoaded;
 import net.minecraft.client.gui.Gui;
+import net.minecraft.util.FastColor;
 import one.devos.nautical.winterssummerfixes.config.Config;
-import org.joml.Vector4f;
-import org.spongepowered.asm.mixin.Final;
+import one.devos.nautical.winterssummerfixes.utils.ConversionKt;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyArgs;
 import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
@@ -18,24 +16,22 @@ public class LimitsGrappleInGameHudColorMixin {
     @TargetHandler(mixin = "io.github.moonlight_maya.limits_grapple.mixin.render.InGameHudMixin", name = "limits_grapple$drawHitResult")
     @ModifyArgs(method = "@MixinSquared:Handler", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;setColor(FFFF)V", ordinal = 0))
     private void modifyHitColor(Args args) {
-        float[] hitColorFromConfig = Config.INSTANCE.getLimitsGrappleHitColor().getColorComponents(null);
-        Vector4f hitColor = new Vector4f(hitColorFromConfig[0], hitColorFromConfig[1], hitColorFromConfig[2], 1f);
+        int hitColor = ConversionKt.convertHexStringAsAnInt(Config.limitsGrappleHitColor);
 
-        args.set(0, hitColor.x);
-        args.set(1, hitColor.y);
-        args.set(2, hitColor.z);
-        args.set(3, hitColor.w);
+        args.set(0, FastColor.ARGB32.red(hitColor) / 255f);
+        args.set(1, FastColor.ARGB32.green(hitColor) / 255f);
+        args.set(2, FastColor.ARGB32.blue(hitColor) / 255f);
+        args.set(3, FastColor.ARGB32.alpha(hitColor) / 255f);
     }
 
     @TargetHandler(mixin = "io.github.moonlight_maya.limits_grapple.mixin.render.InGameHudMixin", name = "limits_grapple$drawHitResult")
     @ModifyArgs(method = "@MixinSquared:Handler", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;setColor(FFFF)V", ordinal = 1))
     private void modifyMissColor(Args args) {
-        float[] missColorFromConfig = Config.INSTANCE.getLimitsGrappleMissColor().getColorComponents(null);
-        Vector4f missColor = new Vector4f(missColorFromConfig[0], missColorFromConfig[1], missColorFromConfig[2], 1f);
+        int missColor = ConversionKt.convertHexStringAsAnInt(Config.limitsGrappleMissColor);
 
-        args.set(0, missColor.x);
-        args.set(1, missColor.y);
-        args.set(2, missColor.z);
-        args.set(3, missColor.w);
+        args.set(0, FastColor.ARGB32.red(missColor) / 255f);
+        args.set(1, FastColor.ARGB32.green(missColor) / 255f);
+        args.set(2, FastColor.ARGB32.blue(missColor) / 255f);
+        args.set(3, FastColor.ARGB32.alpha(missColor) / 255f);
     }
 }

src/main/kotlin/one/devos/nautical/winterssummerfixes/WintersSummerFixes.kt

@@ -1,7 +1,9 @@
 package one.devos.nautical.winterssummerfixes
 
+import eu.midnightdust.lib.config.MidnightConfig
 import gay.asoji.fmw.FMW
 import net.fabricmc.api.ModInitializer
+import one.devos.nautical.winterssummerfixes.config.Config
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
@@ -11,6 +13,7 @@ object WintersSummerFixes : ModInitializer {
     val MOD_NAME: String = FMW.getName(MOD_ID)
 
     override fun onInitialize() {
+        MidnightConfig.init(MOD_ID, Config::class.java)
         LOGGER.info("[${MOD_NAME}] Winter's Summer Fixes v${FMW.getVersion(MOD_ID)} loaded!")
         LOGGER.info("[${MOD_NAME}] Who let the gay cat furry into the server room? Get them out! Oh wait they have a wrench.")
     }

src/main/kotlin/one/devos/nautical/winterssummerfixes/config/Config.kt

@@ -0,0 +1,5 @@
+package one.devos.nautical.winterssummerfixes.utils
+
+fun convertHexStringAsAnInt(hexString: String): Int {
+    return hexString.removePrefix("#").toInt(16)
+}

src/main/kotlin/one/devos/nautical/winterssummerfixes/config/ConfigModMenuIntegration.kt

@@ -0,0 +1,6 @@
+{
+  "winterssummerfixes.midnightconfig.title": "Winter's Summer Fixes",
+  "winterssummerfixes.midnightconfig.limitsGrapple" : "Limits' Grapple",
+  "winterssummerfixes.midnightconfig.limitsGrappleHitColor": "Hit Color",
+  "winterssummerfixes.midnightconfig.limitsGrappleMissColor": "Miss Color"
+}