JfMods/Respackopts
JfMods
/
Respackopts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: use different log category for IO logs
ci/woodpecker/push/docs Pipeline was successful Details
ci/woodpecker/push/jfmod Pipeline was successful Details

This commit is contained in:
Johannes Frohnmeyer 2024-05-04 20:23:53 +02:00
parent 57e2fb4b7a
commit 0dc1187d3a
Signed by: Johannes
GPG Key ID: E76429612C2929F4
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/io/gitlab/jfronny/respackopts/Respackopts.java
View File

@ -36,7 +36,7 @@ public class Respackopts implements ModInitializer, SaveHook {
if (RespackoptsConfig.debugLogs) ValidationLayer.Pre.INSTANCE.register();
DirFilterEvents.INSTANCE.register();
FileFilterEvents.INSTANCE.register();
if (RespackoptsConfig.ioLogs) DebugEvents.INSTANCE.register();
if (RespackoptsConfig.ioLogs) IOLogEvents.INSTANCE.register();
if (RespackoptsConfig.debugLogs) ValidationLayer.Post.INSTANCE.register();
ServerInstanceHolder.init();

16
src/main/java/io/gitlab/jfronny/respackopts/filters/DebugEvents.java → src/main/java/io/gitlab/jfronny/respackopts/filters/IOLogEvents.java
View File

@ -1,7 +1,7 @@
package io.gitlab.jfronny.respackopts.filters;
import io.gitlab.jfronny.commons.logger.SystemLoggerPlus;
import io.gitlab.jfronny.libjf.data.manipulation.api.UserResourceEvents;
import io.gitlab.jfronny.respackopts.Respackopts;
import net.minecraft.resource.*;
import net.minecraft.resource.metadata.ResourceMetadataReader;
import net.minecraft.util.Identifier;
@ -11,8 +11,10 @@ import java.util.HashSet;
import java.util.Set;
import java.util.function.Supplier;
public enum DebugEvents implements UserResourceEvents.FindResource, UserResourceEvents.ParseMetadata, UserResourceEvents.Open, UserResourceEvents.OpenRoot {
public enum IOLogEvents implements UserResourceEvents.FindResource, UserResourceEvents.ParseMetadata, UserResourceEvents.Open, UserResourceEvents.OpenRoot {
INSTANCE;
private static final SystemLoggerPlus LOG = SystemLoggerPlus.forName("respackopts/io");
public void register() {
UserResourceEvents.FIND_RESOURCE.register(this);
@ -23,11 +25,11 @@ public enum DebugEvents implements UserResourceEvents.FindResource, UserResource
@Override
public ResourcePack.ResultConsumer findResources(ResourceType type, String namespace, String prefix, ResourcePack.ResultConsumer previous, ResourcePack pack) {
Respackopts.LOGGER.info("FIND_RESOURCE " + type + " in " + namespace + " " + prefix + " of " + pack.getId());
LOG.info("FIND_RESOURCE " + type + " in " + namespace + " " + prefix + " of " + pack.getId());
Set<Identifier> results = new HashSet<>();
return (identifier, inputStreamInputSupplier) -> {
if (!results.add(identifier)) {
Respackopts.LOGGER.warn("Duplicate identifier returned by findResources: " + identifier);
LOG.warn("Duplicate identifier returned by findResources: " + identifier);
}
previous.accept(identifier, inputStreamInputSupplier);
};
@ -35,19 +37,19 @@ public enum DebugEvents implements UserResourceEvents.FindResource, UserResource
@Override
public InputSupplier<InputStream> open(ResourceType type, Identifier id, InputSupplier<InputStream> previous, ResourcePack pack) {
Respackopts.LOGGER.info("OPEN " + type + " at " + id + " of " + pack.getId());
LOG.info("OPEN " + type + " at " + id + " of " + pack.getId());
return previous;
}
@Override
public InputSupplier<InputStream> openRoot(String[] fileName, InputSupplier<InputStream> previous, ResourcePack pack) {
Respackopts.LOGGER.info("OPEN_ROOT " + String.join("/", fileName) + " of " + pack.getId());
LOG.info("OPEN_ROOT " + String.join("/", fileName) + " of " + pack.getId());
return previous;
}
@Override
public <T> T parseMetadata(ResourceMetadataReader<T> reader, Supplier<T> previous, ResourcePack pack) {
Respackopts.LOGGER.info("PARSE_METADATA " + reader.getKey() + " of " + pack.getId());
LOG.info("PARSE_METADATA " + reader.getKey() + " of " + pack.getId());
return previous.get();
}
}