fix(minecraft): Fix testmod logging

This commit is contained in:
2025-11-03 00:10:24 +01:00
parent 2d071343be
commit bd518275f7
5 changed files with 36 additions and 4 deletions

View File

@@ -1 +1,2 @@
/*/run/ /*/run/
/*/src/testmod/lombok.config

View File

@@ -1,4 +1,6 @@
import de.siphalor.tweed5.gradle.plugin.minecraft.mod.MinecraftModded import de.siphalor.tweed5.gradle.plugin.minecraft.mod.MinecraftModded
import java.nio.file.Files
import java.nio.file.StandardCopyOption
import java.util.Properties import java.util.Properties
plugins { plugins {
@@ -93,6 +95,31 @@ lombok {
version = libs.versions.lombok.get() 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 { tasks.jar {
dependsOn(tasks.processMinecraftModResources) dependsOn(tasks.processMinecraftModResources)
from(project.layout.buildDirectory.dir("minecraftModResources")) from(project.layout.buildDirectory.dir("minecraftModResources"))

View File

@@ -10,7 +10,7 @@ import de.siphalor.tweed5.data.hjson.HjsonSerde;
import de.siphalor.tweed5.data.hjson.HjsonWriter; import de.siphalor.tweed5.data.hjson.HjsonWriter;
import de.siphalor.tweed5.fabric.helper.api.FabricConfigContainerHelper; import de.siphalor.tweed5.fabric.helper.api.FabricConfigContainerHelper;
import de.siphalor.tweed5.weaver.pojo.impl.weaving.TweedPojoWeaverBootstrapper; 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.api.ClientModInitializer;
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
import net.minecraft.client.KeyMapping; import net.minecraft.client.KeyMapping;
@@ -20,7 +20,7 @@ import net.minecraft.network.chat.Component;
import java.util.Arrays; import java.util.Arrays;
@CommonsLog @CustomLog
public class TweedCoatBridgeTestMod implements ClientModInitializer { public class TweedCoatBridgeTestMod implements ClientModInitializer {
public static final String MOD_ID = "tweed5_coat_bridge_testmod"; public static final String MOD_ID = "tweed5_coat_bridge_testmod";

View File

@@ -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.FabricConfigCommentLoader;
import de.siphalor.tweed5.fabric.helper.api.FabricConfigContainerHelper; import de.siphalor.tweed5.fabric.helper.api.FabricConfigContainerHelper;
import de.siphalor.tweed5.weaver.pojo.impl.weaving.TweedPojoWeaverBootstrapper; 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.api.ModInitializer;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
@CommonsLog @CustomLog
public class FabricHelperTestMod implements ModInitializer { public class FabricHelperTestMod implements ModInitializer {
public static final String MOD_ID = "tweed5_fabric_helper_testmod"; public static final String MOD_ID = "tweed5_fabric_helper_testmod";

View File

@@ -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