From bd518275f79835adc3269481b84d92fa3422f677 Mon Sep 17 00:00:00 2001
From: Siphalor <info@siphalor.de>
Date: Mon, 3 Nov 2025 00:10:24 +0100
Subject: [PATCH] fix(minecraft): Fix testmod logging

---
 tweed5-minecraft/.gitignore                   |  1 +
 ...ed5.minecraft.mod.cross-version.gradle.kts | 27 +++++++++++++++++++
 .../testmod/TweedCoatBridgeTestMod.java       |  4 +--
 .../helper/testmod/FabricHelperTestMod.java   |  4 +--
 tweed5-minecraft/lombok.testmod.config        |  4 +++
 5 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 tweed5-minecraft/lombok.testmod.config

diff --git a/tweed5-minecraft/.gitignore b/tweed5-minecraft/.gitignore
index 85e23c9..1ed048c 100644
--- a/tweed5-minecraft/.gitignore
+++ b/tweed5-minecraft/.gitignore
@@ -1 +1,2 @@
 /*/run/
+/*/src/testmod/lombok.config
diff --git a/tweed5-minecraft/buildSrc/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.cross-version.gradle.kts b/tweed5-minecraft/buildSrc/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.cross-version.gradle.kts
index 105b7f8..255e3fd 100644
--- a/tweed5-minecraft/buildSrc/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.cross-version.gradle.kts
+++ b/tweed5-minecraft/buildSrc/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.cross-version.gradle.kts
@@ -1,4 +1,6 @@
 import de.siphalor.tweed5.gradle.plugin.minecraft.mod.MinecraftModded
+import java.nio.file.Files
+import java.nio.file.StandardCopyOption
 import java.util.Properties
 
 plugins {
@@ -93,6 +95,31 @@ lombok {
 	version = libs.versions.lombok.get()
 }
 
+val testmodLombokConfigSource = project.layout.settingsDirectory.file("lombok.testmod.config").asFile
+val testmodLombokConfigTarget = file("src/testmod/lombok.config")
+val copyTestmodLombokConfig by tasks.register("copyTestmodLombokConfig") {
+	val source = testmodLombokConfigSource
+	val target = testmodLombokConfigTarget
+	inputs.file(source)
+	outputs.file(target)
+
+	doFirst {
+		target.parentFile.mkdirs()
+		Files.copy(source.toPath(), target.toPath(), StandardCopyOption.REPLACE_EXISTING)
+	}
+}
+
+tasks.named("compileTestmodJava") {
+	inputs.file(testmodLombokConfigSource)
+	dependsOn(copyTestmodLombokConfig)
+}
+afterEvaluate {
+	tasks.named("generateTestmodEffectiveLombokConfig") {
+		inputs.file(testmodLombokConfigSource)
+		dependsOn(copyTestmodLombokConfig)
+	}
+}
+
 tasks.jar {
 	dependsOn(tasks.processMinecraftModResources)
 	from(project.layout.buildDirectory.dir("minecraftModResources"))
diff --git a/tweed5-minecraft/coat-bridge/src/testmod/java/de/siphalor/tweed5/coat/bridge/testmod/TweedCoatBridgeTestMod.java b/tweed5-minecraft/coat-bridge/src/testmod/java/de/siphalor/tweed5/coat/bridge/testmod/TweedCoatBridgeTestMod.java
index c74ddc1..be7bbef 100644
--- a/tweed5-minecraft/coat-bridge/src/testmod/java/de/siphalor/tweed5/coat/bridge/testmod/TweedCoatBridgeTestMod.java
+++ b/tweed5-minecraft/coat-bridge/src/testmod/java/de/siphalor/tweed5/coat/bridge/testmod/TweedCoatBridgeTestMod.java
@@ -10,7 +10,7 @@ import de.siphalor.tweed5.data.hjson.HjsonSerde;
 import de.siphalor.tweed5.data.hjson.HjsonWriter;
 import de.siphalor.tweed5.fabric.helper.api.FabricConfigContainerHelper;
 import de.siphalor.tweed5.weaver.pojo.impl.weaving.TweedPojoWeaverBootstrapper;
-import lombok.extern.apachecommons.CommonsLog;
+import lombok.CustomLog;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.client.KeyMapping;
@@ -20,7 +20,7 @@ import net.minecraft.network.chat.Component;
 
 import java.util.Arrays;
 
-@CommonsLog
+@CustomLog
 public class TweedCoatBridgeTestMod implements ClientModInitializer {
 	public static final String MOD_ID = "tweed5_coat_bridge_testmod";
 
diff --git a/tweed5-minecraft/fabric-helper/src/testmod/java/de/siphalor/tweed5/fabric/helper/testmod/FabricHelperTestMod.java b/tweed5-minecraft/fabric-helper/src/testmod/java/de/siphalor/tweed5/fabric/helper/testmod/FabricHelperTestMod.java
index 0223261..b800633 100644
--- a/tweed5-minecraft/fabric-helper/src/testmod/java/de/siphalor/tweed5/fabric/helper/testmod/FabricHelperTestMod.java
+++ b/tweed5-minecraft/fabric-helper/src/testmod/java/de/siphalor/tweed5/fabric/helper/testmod/FabricHelperTestMod.java
@@ -7,11 +7,11 @@ import de.siphalor.tweed5.data.hjson.HjsonWriter;
 import de.siphalor.tweed5.fabric.helper.api.FabricConfigCommentLoader;
 import de.siphalor.tweed5.fabric.helper.api.FabricConfigContainerHelper;
 import de.siphalor.tweed5.weaver.pojo.impl.weaving.TweedPojoWeaverBootstrapper;
-import lombok.extern.apachecommons.CommonsLog;
+import lombok.CustomLog;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 
-@CommonsLog
+@CustomLog
 public class FabricHelperTestMod implements ModInitializer {
 	public static final String MOD_ID = "tweed5_fabric_helper_testmod";
 
diff --git a/tweed5-minecraft/lombok.testmod.config b/tweed5-minecraft/lombok.testmod.config
new file mode 100644
index 0000000..ba35017
--- /dev/null
+++ b/tweed5-minecraft/lombok.testmod.config
@@ -0,0 +1,4 @@
+# Special configuration, so that the testmod can use the correct shadowed logging classes.
+lombok.log.apacheCommons.flagUsage=WARNING
+lombok.log.custom.declaration=de.siphalor.tweed5.shadowed.org.apache.commons.logging.Log de.siphalor.tweed5.shadowed.org.apache.commons.logging.LogFactory.getLog(TYPE)
+lombok.log.custom.flagUsage=ALLOW