diff --git a/src/main/java/io/gitlab/jfronny/respackopts/Respackopts.java b/src/main/java/io/gitlab/jfronny/respackopts/Respackopts.java index 04667f8..87a37b1 100644 --- a/src/main/java/io/gitlab/jfronny/respackopts/Respackopts.java +++ b/src/main/java/io/gitlab/jfronny/respackopts/Respackopts.java @@ -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(); diff --git a/src/main/java/io/gitlab/jfronny/respackopts/filters/DebugEvents.java b/src/main/java/io/gitlab/jfronny/respackopts/filters/IOLogEvents.java similarity index 72% rename from src/main/java/io/gitlab/jfronny/respackopts/filters/DebugEvents.java rename to src/main/java/io/gitlab/jfronny/respackopts/filters/IOLogEvents.java index 3148d70..2212878 100644 --- a/src/main/java/io/gitlab/jfronny/respackopts/filters/DebugEvents.java +++ b/src/main/java/io/gitlab/jfronny/respackopts/filters/IOLogEvents.java @@ -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 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 open(ResourceType type, Identifier id, InputSupplier 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 openRoot(String[] fileName, InputSupplier 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 parseMetadata(ResourceMetadataReader reader, Supplier 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(); } }