diff --git a/commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java b/commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java index c3344803a..ca5806b49 100644 --- a/commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java +++ b/commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java @@ -59,9 +59,9 @@ import java.util.concurrent.TimeUnit; */ public class ClientApi { - public static final Logger LOGGER = LogManager.getLogger(ClientApi.class.getSimpleName()); - public static boolean prefLoggerEnabled = false; + private static final Logger LOGGER = LogManager.getLogger(ClientApi.class.getSimpleName()); public static final boolean ENABLE_EVENT_LOGGING = true; + public static boolean prefLoggerEnabled = false; public static final ClientApi INSTANCE = new ClientApi(); public static RenderSystemTest testRenderer = new RenderSystemTest(); diff --git a/commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ServerApi.java b/commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ServerApi.java index 860e69509..77880461c 100644 --- a/commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ServerApi.java +++ b/commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ServerApi.java @@ -50,10 +50,13 @@ public class ServerApi { public static final boolean ENABLE_STACK_DUMP_LOGGING = false; public static final ServerApi INSTANCE = new ServerApi(); - public static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName()); - private static final IVersionConstants VERSION_CONSTANTS = SingletonInjector.INSTANCE.get(IVersionConstants.class); public static final boolean ENABLE_EVENT_LOGGING = true; - + + private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName()); + private static final IVersionConstants VERSION_CONSTANTS = SingletonInjector.INSTANCE.get(IVersionConstants.class); + + + private ServerApi() { } diff --git a/core/src/main/java/com/seibel/lod/core/a7/save/io/MetaFile.java b/core/src/main/java/com/seibel/lod/core/a7/save/io/MetaFile.java index d175bb2bb..f94a96af3 100644 --- a/core/src/main/java/com/seibel/lod/core/a7/save/io/MetaFile.java +++ b/core/src/main/java/com/seibel/lod/core/a7/save/io/MetaFile.java @@ -19,8 +19,9 @@ import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.util.LodUtil; import org.apache.logging.log4j.Logger; -public class MetaFile { - public static final Logger LOGGER = DhLoggerBuilder.getLogger(); +public class MetaFile +{ + private static final Logger LOGGER = DhLoggerBuilder.getLogger(); //Metadata format: // // 4 bytes: magic bytes: "DHv0" (in ascii: 0x44 48 76 30) (this also signal the metadata format) diff --git a/core/src/main/java/com/seibel/lod/core/a7/save/io/file/DataMetaFile.java b/core/src/main/java/com/seibel/lod/core/a7/save/io/file/DataMetaFile.java index e1ebb1451..fd5c3c3cf 100644 --- a/core/src/main/java/com/seibel/lod/core/a7/save/io/file/DataMetaFile.java +++ b/core/src/main/java/com/seibel/lod/core/a7/save/io/file/DataMetaFile.java @@ -27,9 +27,14 @@ import com.seibel.lod.core.a7.pos.DhLodPos; import com.seibel.lod.core.a7.save.io.MetaFile; import com.seibel.lod.core.a7.level.ILevel; import com.seibel.lod.core.a7.pos.DhSectionPos; +import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.util.LodUtil; +import org.apache.logging.log4j.Logger; -public class DataMetaFile extends MetaFile { +public class DataMetaFile extends MetaFile +{ + private static final Logger LOGGER = DhLoggerBuilder.getLogger(DataMetaFile.class.getSimpleName()); + private final ILevel level; public DataSourceLoader loader; public Class dataType; diff --git a/core/src/main/java/com/seibel/lod/core/a7/save/io/render/RenderMetaFile.java b/core/src/main/java/com/seibel/lod/core/a7/save/io/render/RenderMetaFile.java index a747872f2..dfc183eca 100644 --- a/core/src/main/java/com/seibel/lod/core/a7/save/io/render/RenderMetaFile.java +++ b/core/src/main/java/com/seibel/lod/core/a7/save/io/render/RenderMetaFile.java @@ -9,7 +9,9 @@ import com.seibel.lod.core.a7.level.IClientLevel; import com.seibel.lod.core.a7.pos.DhLodPos; import com.seibel.lod.core.a7.save.io.MetaFile; import com.seibel.lod.core.a7.pos.DhSectionPos; +import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.util.LodUtil; +import org.apache.logging.log4j.Logger; import java.io.File; import java.io.FileInputStream; @@ -18,7 +20,10 @@ import java.lang.ref.SoftReference; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; -public class RenderMetaFile extends MetaFile { +public class RenderMetaFile extends MetaFile +{ + private static final Logger LOGGER = DhLoggerBuilder.getLogger(RenderMetaFile.class.getSimpleName()); + private final IClientLevel level; public RenderSourceLoader loader; public Class dataType; diff --git a/core/src/main/java/com/seibel/lod/core/config/file/ConfigFileHandling.java b/core/src/main/java/com/seibel/lod/core/config/file/ConfigFileHandling.java index a1a1be0d3..eab812880 100644 --- a/core/src/main/java/com/seibel/lod/core/config/file/ConfigFileHandling.java +++ b/core/src/main/java/com/seibel/lod/core/config/file/ConfigFileHandling.java @@ -26,7 +26,7 @@ import java.nio.file.Path; */ public class ConfigFileHandling { - public static final Logger LOGGER = LogManager.getLogger(ConfigBase.class.getSimpleName()); + private static final Logger LOGGER = LogManager.getLogger(ConfigBase.class.getSimpleName()); public static final Path ConfigPath = SingletonInjector.INSTANCE.get(IMinecraftSharedWrapper.class) .getInstallationDirectory().toPath().resolve("config").resolve(ModInfo.NAME+".toml"); diff --git a/core/src/main/java/com/seibel/lod/core/handlers/dependencyInjection/DhApiEventInjector.java b/core/src/main/java/com/seibel/lod/core/handlers/dependencyInjection/DhApiEventInjector.java index d96d70b20..73a92ac95 100644 --- a/core/src/main/java/com/seibel/lod/core/handlers/dependencyInjection/DhApiEventInjector.java +++ b/core/src/main/java/com/seibel/lod/core/handlers/dependencyInjection/DhApiEventInjector.java @@ -38,8 +38,10 @@ import java.util.ArrayList; */ public class DhApiEventInjector extends DependencyInjector // Note to self: Don't try adding a generic type to IDhApiEvent, the consturctor won't accept it { + private static final Logger LOGGER = LogManager.getLogger(DhApiEventInjector.class.getSimpleName()); + public static final DhApiEventInjector INSTANCE = new DhApiEventInjector(); - public static final Logger LOGGER = LogManager.getLogger(DhApiEventInjector.class.getSimpleName()); + public DhApiEventInjector() diff --git a/core/src/main/java/com/seibel/lod/core/logging/SpamReducedLogger.java b/core/src/main/java/com/seibel/lod/core/logging/SpamReducedLogger.java index 021e6c703..ccf9e49da 100644 --- a/core/src/main/java/com/seibel/lod/core/logging/SpamReducedLogger.java +++ b/core/src/main/java/com/seibel/lod/core/logging/SpamReducedLogger.java @@ -32,7 +32,7 @@ import org.apache.logging.log4j.Logger; public class SpamReducedLogger { - public static final Logger LOGGER = LogManager.getLogger(MethodHandles.lookup().lookupClass().getSimpleName()); + private static final Logger LOGGER = LogManager.getLogger(MethodHandles.lookup().lookupClass().getSimpleName()); public static final List> loggers = Collections.synchronizedList(new LinkedList>());