diff --git a/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java b/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java index 2f55e3c5b..f8eeb62c6 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java @@ -24,7 +24,7 @@ import com.seibel.distanthorizons.coreapi.ModInfo; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.MinecraftServer; import net.minecraft.server.dedicated.DedicatedServer; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import java.lang.invoke.MethodHandles; import java.util.function.Consumer; @@ -36,7 +36,7 @@ import java.util.function.Supplier; */ public abstract class AbstractModInitializer { - protected static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName()); + protected static final DhLogger LOGGER = new DhLoggerBuilder().build(); private CommandInitializer commandInitializer; @@ -172,6 +172,7 @@ public abstract class AbstractModInitializer { ConfigHandler.tryRunFirstTimeSetup(); Config.completeDelayedSetup(); + DhLogger.runDelayedConfigSetup(); } private void checkForUpdates() diff --git a/common/src/main/java/com/seibel/distanthorizons/common/AbstractPluginPacketSender.java b/common/src/main/java/com/seibel/distanthorizons/common/AbstractPluginPacketSender.java index cb6550394..f16f3addb 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/AbstractPluginPacketSender.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/AbstractPluginPacketSender.java @@ -1,8 +1,8 @@ package com.seibel.distanthorizons.common; import com.seibel.distanthorizons.core.config.Config; -import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; -import com.seibel.distanthorizons.core.logging.ConfigBasedLogger; +import com.seibel.distanthorizons.core.logging.DhLogger; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.network.event.internal.IncompatibleMessageInternalEvent; import com.seibel.distanthorizons.core.network.event.internal.ProtocolErrorInternalEvent; import com.seibel.distanthorizons.core.network.messages.MessageRegistry; @@ -15,15 +15,15 @@ import io.netty.buffer.ByteBufUtil; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; -import org.apache.logging.log4j.LogManager; import java.io.IOException; import java.util.Objects; public abstract class AbstractPluginPacketSender implements IPluginPacketSender { - private static final ConfigBasedLogger LOGGER = new ConfigBasedLogger(LogManager.getLogger(), - () -> Config.Common.Logging.logNetworkEvent.get()); + private static final DhLogger LOGGER = new DhLoggerBuilder() + .fileLevelConfig(Config.Common.Logging.logNetworkEventToFile) + .build(); #if MC_VER >= MC_1_21_1 public static final ResourceLocation WRAPPER_PACKET_RESOURCE = ResourceLocation.fromNamespaceAndPath(ModInfo.RESOURCE_NAMESPACE, ModInfo.WRAPPER_PACKET_PATH); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/AbstractDhTintGetter.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/AbstractDhTintGetter.java index d09713bf1..a088fd5b4 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/AbstractDhTintGetter.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/AbstractDhTintGetter.java @@ -19,7 +19,7 @@ import net.minecraft.world.level.biome.Biome; import java.io.IOException; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; #if MC_VER >= MC_1_18_2 import net.minecraft.core.Holder; @@ -28,7 +28,7 @@ import net.minecraft.core.Holder; public abstract class AbstractDhTintGetter implements BlockAndTintGetter { - private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); protected final BiomeWrapper biomeWrapper; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java index 7133694a8..729f60578 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java @@ -26,10 +26,11 @@ import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; import net.minecraft.world.level.Level; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper; @@ -57,7 +58,7 @@ import net.minecraft.world.level.biome.Biomes; public class BiomeWrapper implements IBiomeWrapper { // must be defined before AIR, otherwise a null pointer will be thrown - private static final Logger LOGGER = LogManager.getLogger(); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); #if MC_VER < MC_1_18_2 diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java index 24eed92a6..216f7452e 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java @@ -35,7 +35,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockState; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import java.awt.*; import java.io.IOException; @@ -72,7 +72,7 @@ public class BlockStateWrapper implements IBlockStateWrapper // must be defined before AIR, otherwise a null pointer will be thrown - private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); public static final ConcurrentHashMap WRAPPER_BY_BLOCK_STATE = new ConcurrentHashMap<>(); public static final ConcurrentHashMap WRAPPER_BY_RESOURCE_LOCATION = new ConcurrentHashMap<>(); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/ClientBlockStateColorCache.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/ClientBlockStateColorCache.java index 0a6ccf2db..7978e6c17 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/ClientBlockStateColorCache.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/ClientBlockStateColorCache.java @@ -40,7 +40,7 @@ import net.minecraft.util.RandomSource; import java.util.Random; #endif import net.minecraft.world.level.block.state.BlockState; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; @@ -62,7 +62,7 @@ import net.minecraft.client.renderer.block.model.BlockModelPart; */ public class ClientBlockStateColorCache { - private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); // TODO it isn't that we need the level, but that we need the adjacent data // maybe we can pass in the full data source? diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java index 1a210d227..e04273faf 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java @@ -38,7 +38,7 @@ import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraft.world.level.chunk.ProtoChunk; import net.minecraft.world.level.levelgen.Heightmap; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import java.util.*; @@ -75,7 +75,7 @@ import net.minecraft.world.level.chunk.status.ChunkStatus; public class ChunkWrapper implements IChunkWrapper { - private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); /** can be used for interactions with the underlying chunk where creating new BlockPos objects could cause issues for the garbage collector. */ private static final ThreadLocal MUTABLE_BLOCK_POS_REF = ThreadLocal.withInitial(() -> new BlockPos.MutableBlockPos()); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java index 3bce82102..7e17bd0d7 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java @@ -22,7 +22,7 @@ import com.seibel.distanthorizons.core.config.types.enums.EConfigCommentTextPosi import com.seibel.distanthorizons.core.config.types.enums.EConfigValidity; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.jar.updater.SelfUpdater; -import com.seibel.distanthorizons.core.logging.SpamReducedLogger; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.util.AnnotationUtil; import com.seibel.distanthorizons.core.wrapperInterfaces.config.IConfigGui; import com.seibel.distanthorizons.core.wrapperInterfaces.config.ILangWrapper; @@ -38,8 +38,7 @@ import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -73,8 +72,10 @@ import static com.seibel.distanthorizons.common.wrappers.gui.GuiHelper.Translata @SuppressWarnings("unchecked") public class ClassicConfigGUI { - private static final Logger LOGGER = LogManager.getLogger(); - public static final SpamReducedLogger SPAM_LOGGER = new SpamReducedLogger(4); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); + public static final DhLogger RATE_LIMITED_LOGGER = new DhLoggerBuilder() + .maxCountPerSecond(1) + .build(); public static final ConfigCoreInterface CONFIG_CORE_INTERFACE = new ConfigCoreInterface(); @@ -1002,7 +1003,7 @@ public class ClassicConfigGUI catch (Exception e) { // should prevent crashing the game if there's an issue - SPAM_LOGGER.error("Unexpected gui rendering issue: ["+e.getMessage()+"]", e); + RATE_LIMITED_LOGGER.error("Unexpected gui rendering issue: ["+e.getMessage()+"]", e); } } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GetConfigScreen.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GetConfigScreen.java index 8c7853ce7..39fc001f8 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GetConfigScreen.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GetConfigScreen.java @@ -5,11 +5,11 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.coreapi.ModInfo; import com.seibel.distanthorizons.core.config.gui.JavaScreenHandlerScreen; import net.minecraft.client.gui.screens.Screen; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; public class GetConfigScreen { - protected static final Logger LOGGER = DhLoggerBuilder.getLogger(); + protected static final DhLogger LOGGER = new DhLoggerBuilder().build(); public static EType useScreen = EType.Classic; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java index 9d6bc5b51..448285ed4 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java @@ -14,7 +14,7 @@ import net.minecraft.client.gui.components.ContainerObjectSelectionList; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; #if MC_VER >= MC_1_17_1 import net.minecraft.client.gui.narration.NarratableEntry; @@ -41,7 +41,7 @@ import java.util.*; // TODO: Make this public class ChangelogScreen extends DhScreen { - private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); private Screen parent; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java index dc71c820b..533559613 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java @@ -16,7 +16,7 @@ import com.mojang.blaze3d.vertex.PoseStack; #endif import net.minecraft.client.gui.screens.Screen; import net.minecraft.resources.ResourceLocation; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import static com.seibel.distanthorizons.common.wrappers.gui.GuiHelper.*; @@ -31,7 +31,7 @@ import java.util.*; // and also maybe add this suggestion https://discord.com/channels/881614130614767666/1035863487110467625/1035949054485594192 public class UpdateModScreen extends DhScreen { - private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); private Screen parent; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java index a4578357a..4dc914ab6 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java @@ -57,7 +57,7 @@ import net.minecraft.network.chat.TextComponent; import net.minecraft.server.level.ServerLevel; import net.minecraft.util.profiling.ProfilerFiller; import net.minecraft.world.level.ChunkPos; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import org.jetbrains.annotations.Nullable; #if MC_VER < MC_1_21_3 @@ -72,7 +72,7 @@ import net.minecraft.util.profiling.Profiler; */ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecraftSharedWrapper { - private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName()); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); private static final Minecraft MINECRAFT = Minecraft.getInstance(); public static final MinecraftClientWrapper INSTANCE = new MinecraftClientWrapper(); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftGLWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftGLWrapper.java index e044ad564..3b7455a45 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftGLWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftGLWrapper.java @@ -28,7 +28,7 @@ import com.mojang.blaze3d.opengl.GlStateManager; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import org.lwjgl.opengl.GL32; @@ -54,7 +54,7 @@ public class MinecraftGLWrapper implements IMinecraftGLWrapper { public static final MinecraftGLWrapper INSTANCE = new MinecraftGLWrapper(); - private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java index 16a40130c..a759d61eb 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java @@ -68,7 +68,7 @@ import org.lwjgl.opengl.GL15; import net.minecraft.world.level.material.FogType; #endif import net.minecraft.world.phys.Vec3; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import org.joml.Vector4f; #if MC_VER >= MC_1_21_5 @@ -84,7 +84,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper { public static final MinecraftRenderWrapper INSTANCE = new MinecraftRenderWrapper(); - private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName()); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); private static final Minecraft MC = Minecraft.getInstance(); private static final IOptifineAccessor OPTIFINE_ACCESSOR = ModAccessorInjector.INSTANCE.get(IOptifineAccessor.class); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java index c3cf971a6..838494d4c 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java @@ -24,7 +24,7 @@ import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.misc.ILightMapWrapper; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import org.lwjgl.opengl.GL32; import java.nio.ByteBuffer; @@ -32,7 +32,7 @@ import java.nio.ByteBuffer; public class LightMapWrapper implements ILightMapWrapper { private static final IMinecraftGLWrapper GLMC = SingletonInjector.INSTANCE.get(IMinecraftGLWrapper.class); - private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); private int textureId = 0; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java index 828442aa0..4b0e7f85b 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java @@ -26,7 +26,7 @@ import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraft.world.level.chunk.ChunkSource; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -54,7 +54,7 @@ import com.seibel.distanthorizons.core.util.ColorUtil; public class ClientLevelWrapper implements IClientLevelWrapper { - private static final Logger LOGGER = DhLoggerBuilder.getLogger(ClientLevelWrapper.class.getSimpleName()); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); /** * weak references are to prevent rare issues * where, upon world closure, some levels aren't shutdown/removed properly diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java index 5e4317574..3576ffbd5 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java @@ -57,11 +57,11 @@ import net.minecraft.world.level.chunk.status.ChunkStatus; import java.nio.file.Path; #endif -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; public class ServerLevelWrapper implements IServerLevelWrapper { - private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); /** * weak references are to prevent rare issues * where, upon world closure, some levels aren't shutdown/removed properly diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java index ac6351a15..91e84e8fd 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java @@ -29,8 +29,8 @@ import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.generation.DhLightingEngine; import com.seibel.distanthorizons.core.level.IDhServerLevel; import com.seibel.distanthorizons.core.config.Config; -import com.seibel.distanthorizons.core.logging.ConfigBasedLogger; -import com.seibel.distanthorizons.core.logging.ConfigBasedSpamLogger; +import com.seibel.distanthorizons.core.logging.DhLogger; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.pos.DhChunkPos; import com.seibel.distanthorizons.core.util.objects.EventTimer; import com.seibel.distanthorizons.core.util.LodUtil; @@ -71,13 +71,11 @@ import net.minecraft.world.level.levelgen.FlatLevelSource; import net.minecraft.world.level.levelgen.Heightmap; import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator; import net.minecraft.nbt.CompoundTag; -import org.apache.logging.log4j.LogManager; #if MC_VER <= MC_1_17_1 #elif MC_VER <= MC_1_19_2 import net.minecraft.core.Registry; #else -import net.minecraft.core.registries.Registries; #endif #if MC_VER <= MC_1_20_4 @@ -101,15 +99,19 @@ Lod Generation: 0.269023348s */ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnvironmentWrapper { - public static final ConfigBasedSpamLogger PREF_LOGGER = - new ConfigBasedSpamLogger(LogManager.getLogger("LodWorldGen"), - () -> Config.Common.Logging.logWorldGenPerformance.get(), 1); - public static final ConfigBasedLogger EVENT_LOGGER = - new ConfigBasedLogger(LogManager.getLogger("LodWorldGen"), - () -> Config.Common.Logging.logWorldGenEvent.get()); - public static final ConfigBasedLogger LOAD_LOGGER = - new ConfigBasedLogger(LogManager.getLogger("LodWorldGen"), - () -> Config.Common.Logging.logWorldGenLoadEvent.get()); + public static final DhLogger PREF_LOGGER = new DhLoggerBuilder() + .name("LOD World Gen") + .fileLevelConfig(Config.Common.Logging.logWorldGenPerformanceToFile) + .maxCountPerSecond(1) + .build(); + public static final DhLogger EVENT_LOGGER = new DhLoggerBuilder() + .name("LOD World Gen") + .fileLevelConfig(Config.Common.Logging.logWorldGenEventToFile) + .build(); + public static final DhLogger CHUNK_LOAD_LOGGER = new DhLoggerBuilder() + .name("LOD World Gen") + .fileLevelConfig(Config.Common.Logging.logWorldGenChunkLoadEventToFile) + .build(); #if MC_VER < MC_1_21_5 private static final TicketType DH_SERVER_GEN_TICKET = TicketType.create("dh_server_gen_ticket", Comparator.comparingLong(ChunkPos::toLong)); @@ -311,7 +313,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv try { event.future.get(); // Should throw exception - LodUtil.assertNotReach(); + LodUtil.assertNotReach("Exceptionally completed world gen Future should have thrown an exception."); } catch (Exception e) { @@ -523,10 +525,10 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv genEvent.timer.complete(); genEvent.refreshTimeout(); - if (PREF_LOGGER.canMaybeLog()) + if (PREF_LOGGER.canLog()) { genEvent.threadedParam.perf.recordEvent(genEvent.timer); - PREF_LOGGER.debugInc(genEvent.timer.toString()); + PREF_LOGGER.debug(genEvent.timer.toString()); } } catch (Exception e) @@ -675,7 +677,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv actualThrowable = completionException.getCause(); } - LOAD_LOGGER.warn("DistantHorizons: Couldn't load or make chunk ["+chunkPos+"], error: ["+actualThrowable.getMessage()+"].", actualThrowable); + CHUNK_LOAD_LOGGER.warn("DistantHorizons: Couldn't load or make chunk ["+chunkPos+"], error: ["+actualThrowable.getMessage()+"].", actualThrowable); return null; }); } @@ -683,7 +685,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv } catch (Exception e) { - LOAD_LOGGER.warn("DistantHorizons: Couldn't load or make chunk [" + chunkPos + "]. Error: [" + e.getMessage() + "].", e); + CHUNK_LOAD_LOGGER.warn("DistantHorizons: Couldn't load or make chunk [" + chunkPos + "]. Error: [" + e.getMessage() + "].", e); return CompletableFuture.completedFuture(null); } } @@ -699,7 +701,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv { try { - LOAD_LOGGER.debug("DistantHorizons: Loading chunk [" + chunkPos + "] from disk."); + CHUNK_LOAD_LOGGER.debug("DistantHorizons: Loading chunk [" + chunkPos + "] from disk."); @Nullable ChunkAccess chunk = ChunkFileReader.read(level, chunkPos, chunkData); @@ -721,7 +723,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv } catch (Exception e) { - LOAD_LOGGER.error( + CHUNK_LOAD_LOGGER.error( "DistantHorizons: couldn't load or make chunk at [" + chunkPos + "]." + "Please try optimizing your world to fix this issue. \n" + "World optimization can be done from the singleplayer world selection screen.\n" + @@ -783,7 +785,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv if (throwable != null) { - LOAD_LOGGER.warn("DistantHorizons: Couldn't load chunk [" + chunkPos + "] from server, error: [" + actualThrowable.getMessage() + "].", actualThrowable); + CHUNK_LOAD_LOGGER.warn("DistantHorizons: Couldn't load chunk [" + chunkPos + "] from server, error: [" + actualThrowable.getMessage() + "].", actualThrowable); } if (chunk != null) @@ -838,10 +840,10 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv genEvent.timer.complete(); genEvent.refreshTimeout(); - if (PREF_LOGGER.canMaybeLog()) + if (PREF_LOGGER.canLog()) { genEvent.threadedParam.perf.recordEvent(genEvent.timer); - PREF_LOGGER.debugInc(genEvent.timer.toString()); + PREF_LOGGER.debug(genEvent.timer.toString()); } }); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GenerationEvent.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GenerationEvent.java index 5105e15bc..a49feb3d0 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GenerationEvent.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GenerationEvent.java @@ -32,11 +32,11 @@ import com.seibel.distanthorizons.core.util.objects.EventTimer; import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil; import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; public final class GenerationEvent { - private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName()); + private static final DhLogger LOGGER = new DhLoggerBuilder().build();; private static int generationFutureDebugIDs = 0; public final int id; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkFileReader.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkFileReader.java index d17e58ead..b9aa41169 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkFileReader.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkFileReader.java @@ -24,7 +24,7 @@ import com.mojang.serialization.Dynamic; import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper; import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment; -import com.seibel.distanthorizons.core.logging.ConfigBasedLogger; +import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.util.LodUtil; import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.ChunkLightStorage; @@ -93,6 +93,8 @@ public class ChunkFileReader { private static final AtomicBoolean ZERO_CHUNK_POS_ERROR_LOGGED_REF = new AtomicBoolean(false); + private static final DhLogger LOGGER = BatchGenerationEnvironment.CHUNK_LOAD_LOGGER; + #if MC_VER >= MC_1_21_9 // BLOCK_STATE_CODEC can no longer be statically created since @@ -108,7 +110,6 @@ public class ChunkFileReader private static final String FLUID_TICKS_TAG_18 = "fluid_ticks"; private static final String BLOCK_TICKS_TAG_PRE18 = "TileTicks"; private static final String FLUID_TICKS_TAG_PRE18 = "LiquidTicks"; - private static final ConfigBasedLogger LOGGER = BatchGenerationEnvironment.LOAD_LOGGER; private static boolean lightingSectionErrorLogged = false; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DhLitWorldGenRegion.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DhLitWorldGenRegion.java index 475e97889..10a05fad5 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DhLitWorldGenRegion.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DhLitWorldGenRegion.java @@ -28,7 +28,7 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.util.LodUtil; import net.minecraft.world.level.block.EntityBlock; import net.minecraft.world.level.block.SpawnerBlock; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -78,7 +78,7 @@ import net.minecraft.world.ticks.LevelTickAccess; public class DhLitWorldGenRegion extends WorldGenRegion { - private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName()); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); private static ChunkStatus debugTriggeredForStatus = null; @@ -392,10 +392,11 @@ public class DhLitWorldGenRegion extends WorldGenRegion } } - if (chunkStatus != ChunkStatus.EMPTY && chunkStatus != debugTriggeredForStatus) + if (chunkStatus != ChunkStatus.EMPTY + && chunkStatus != debugTriggeredForStatus) { - LOGGER.info("WorldGen requiring " + chunkStatus - + " outside expected range detected. Force passing EMPTY chunk and seeing if it works."); + LOGGER.info("WorldGen requiring [" + chunkStatus + "]" + + " is outside the expected range. Returning EMPTY chunk."); debugTriggeredForStatus = chunkStatus; } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/RegionFileStorageExternalCache.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/RegionFileStorageExternalCache.java index ceebd143c..3b8fb6980 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/RegionFileStorageExternalCache.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/RegionFileStorageExternalCache.java @@ -7,7 +7,7 @@ import net.minecraft.nbt.NbtIo; import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.chunk.storage.RegionFile; import net.minecraft.world.level.chunk.storage.RegionFileStorage; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import org.jetbrains.annotations.Nullable; import java.io.DataInputStream; @@ -29,7 +29,7 @@ import net.minecraft.world.level.chunk.storage.RegionStorageInfo; */ public class RegionFileStorageExternalCache implements AutoCloseable { - private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); /** Can be null due to the C2ME mod */ @Nullable @@ -139,7 +139,7 @@ public class RegionFileStorageExternalCache implements AutoCloseable if (retryCount >= maxRetryCount) { - BatchGenerationEnvironment.LOAD_LOGGER.warn("Concurrency issue detected when getting region file for chunk at [" + pos + "]."); + BatchGenerationEnvironment.CHUNK_LOAD_LOGGER.warn("Concurrency issue detected when getting region file for chunk at [" + pos + "]."); } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java index 6830462e0..ffe8fe346 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java @@ -29,7 +29,7 @@ import com.seibel.distanthorizons.core.util.gridList.ArrayGridList; import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraft.world.level.chunk.ProtoChunk; import net.minecraft.world.level.levelgen.Heightmap; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; #if MC_VER <= MC_1_20_4 import net.minecraft.world.level.chunk.ChunkStatus; @@ -42,7 +42,7 @@ import java.util.ConcurrentModificationException; public final class StepFeatures extends AbstractWorldGenStep { - private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); public static final ChunkStatus STATUS = ChunkStatus.FEATURES; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java index c424b7d06..ce5ff81f4 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java @@ -35,7 +35,7 @@ import net.minecraft.server.level.WorldGenRegion; import net.minecraft.world.level.Level; import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraft.world.level.chunk.ProtoChunk; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; #if MC_VER <= MC_1_20_4 import net.minecraft.world.level.chunk.ChunkStatus; @@ -46,7 +46,7 @@ import net.minecraft.world.level.chunk.status.ChunkStatus; public final class StepStructureStart extends AbstractWorldGenStep { - private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); private static final ChunkStatus STATUS = ChunkStatus.STRUCTURE_STARTS; private static final ReentrantLock STRUCTURE_PLACEMENT_LOCK = new ReentrantLock(); diff --git a/coreSubProjects b/coreSubProjects index 75c2758fd..0902d3f0f 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 75c2758fd534006a37d24a097de6c628c78bd1b8 +Subproject commit 0902d3f0f5ec44ff128d919576397159fa238589 diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java index 6d21d80c1..30cc79c5e 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java @@ -68,7 +68,7 @@ import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.world.InteractionResult; import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraft.world.phys.HitResult; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import org.lwjgl.glfw.GLFW; /** @@ -85,7 +85,7 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy private final ClientApi clientApi = ClientApi.INSTANCE; private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class); private static final AbstractPluginPacketSender PACKET_SENDER = (AbstractPluginPacketSender) SingletonInjector.INSTANCE.get(IPluginPacketSender.class); - private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); // TODO we shouldn't be filtering keys on the Forge/Fabric side, only in ClientApi private static final int[] KEY_TO_CHECK_FOR = { GLFW.GLFW_KEY_F6, GLFW.GLFW_KEY_F8, GLFW.GLFW_KEY_P}; diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java index b5290ebdd..a23e7b7dc 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java @@ -38,7 +38,7 @@ import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; import net.minecraft.commands.CommandSourceStack; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import org.lwjgl.util.tinyfd.TinyFileDialogs; #if MC_VER >= MC_1_19_2 @@ -64,7 +64,7 @@ public class FabricMain extends AbstractModInitializer implements ClientModIniti private static final ResourceLocation INITIAL_PHASE = new ResourceLocation(ModInfo.RESOURCE_NAMESPACE, ModInfo.DEDICATED_SERVER_INITIAL_PATH); #endif - private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java index 279d182f0..fd00d4571 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java @@ -30,7 +30,7 @@ import net.minecraft.client.gui.screens.TitleScreen; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; #if MC_VER >= MC_1_20_6 import com.seibel.distanthorizons.common.CommonPacketPayload; @@ -52,7 +52,7 @@ public class FabricServerProxy implements AbstractModInitializer.IEventProxy private static final ServerApi SERVER_API = ServerApi.INSTANCE; @SuppressWarnings("unused") private static final AbstractPluginPacketSender PACKET_SENDER = (AbstractPluginPacketSender) SingletonInjector.INSTANCE.get(IPluginPacketSender.class); - private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); private final boolean isDedicatedServer; diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java index 740d52018..7aa8cf585 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java @@ -77,7 +77,7 @@ import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; @@ -88,7 +88,7 @@ public class MixinLevelRenderer private ClientLevel level; @Unique - private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); #if MC_VER < MC_1_17_1 diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java index a6fc3334b..e52968461 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java @@ -16,7 +16,7 @@ import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.TitleScreen; import net.minecraft.client.multiplayer.ClientLevel; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; @@ -34,7 +34,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public abstract class MixinMinecraft { @Unique - private static final Logger LOGGER = DhLoggerBuilder.getLogger(MixinMinecraft.class.getSimpleName()); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); @Shadow diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestChunkInputReplacerEvent.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestChunkInputReplacerEvent.java index 48f3be15b..02a268d7d 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestChunkInputReplacerEvent.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestChunkInputReplacerEvent.java @@ -5,13 +5,13 @@ import com.seibel.distanthorizons.api.interfaces.block.IDhApiBlockStateWrapper; import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiChunkProcessingEvent; import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiEventParam; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import java.io.IOException; public class TestChunkInputReplacerEvent extends DhApiChunkProcessingEvent { - private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); private static final String REPLACEMENT_BLOCK_STATE_NAMESPACE = "minecraft:stone"; diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestGenericWorldGenerator.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestGenericWorldGenerator.java index 1a4425a71..e38eb690a 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestGenericWorldGenerator.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestGenericWorldGenerator.java @@ -13,7 +13,7 @@ import com.seibel.distanthorizons.api.objects.data.IDhApiFullDataSource; import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import net.minecraft.server.level.ServerLevel; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import java.io.IOException; import java.util.ArrayList; @@ -23,7 +23,7 @@ import java.util.function.Consumer; public class TestGenericWorldGenerator implements IDhApiWorldGenerator { - private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); private final IDhApiLevelWrapper levelWrapper; diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestWorldGenBindingEvent.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestWorldGenBindingEvent.java index 50ccd0524..8ae24ce55 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestWorldGenBindingEvent.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestWorldGenBindingEvent.java @@ -6,12 +6,12 @@ import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiLevelLo import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiEventParam; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import net.minecraft.server.level.ServerLevel; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; // TODO add to API example once Builderb0y has given the all-clear public class TestWorldGenBindingEvent extends DhApiLevelLoadEvent { - private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); @Override public void onLevelLoad(DhApiEventParam event) diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java index 8e9629edb..f96b416fe 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java @@ -55,7 +55,7 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraftforge.common.MinecraftForge; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import org.jetbrains.annotations.NotNull; import org.lwjgl.glfw.GLFW; @@ -81,7 +81,7 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy { private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class); private static final ForgePluginPacketSender PACKET_SENDER = (ForgePluginPacketSender) SingletonInjector.INSTANCE.get(IPluginPacketSender.class); - private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); #if MC_VER < MC_1_19_2 diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeServerProxy.java b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeServerProxy.java index 286820f84..498c8a441 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeServerProxy.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeServerProxy.java @@ -47,7 +47,7 @@ import net.minecraftforge.event.server.ServerStoppingEvent; #endif -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import java.util.function.Supplier; diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java index d79fa5aac..b2353cc84 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java @@ -12,7 +12,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.TitleScreen; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; @@ -29,7 +29,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public class MixinMinecraft { @Unique - private static final Logger LOGGER = DhLoggerBuilder.getLogger(MixinMinecraft.class.getSimpleName()); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java index c8b9377ba..690f0aec4 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java @@ -42,7 +42,7 @@ import net.neoforged.neoforge.event.level.LevelEvent; import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; import net.minecraft.world.level.chunk.ChunkAccess; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import org.lwjgl.glfw.GLFW; import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper; @@ -64,7 +64,7 @@ import java.util.concurrent.AbstractExecutorService; public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy { private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class); - private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeServerProxy.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeServerProxy.java index 9bd630767..351b5b081 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeServerProxy.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeServerProxy.java @@ -24,7 +24,7 @@ import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.neoforge.event.server.ServerAboutToStartEvent; import net.neoforged.neoforge.event.server.ServerStoppingEvent; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import java.util.function.Supplier; @@ -40,7 +40,7 @@ public class NeoforgeServerProxy implements AbstractModInitializer.IEventProxy private static LevelAccessor GetEventLevel(LevelEvent e) { return e.getLevel(); } private final ServerApi serverApi = ServerApi.INSTANCE; - private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); private final boolean isDedicated; public static Supplier isGenerationThreadChecker = null; diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinLevelRenderer.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinLevelRenderer.java index b39c5a277..73bf77029 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinLevelRenderer.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinLevelRenderer.java @@ -48,7 +48,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.neoforge.NeoforgeClientProxy; import com.seibel.distanthorizons.common.wrappers.McObjectConverter; @@ -76,7 +76,7 @@ public class MixinLevelRenderer private ClientLevel level; @Unique - private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinMinecraft.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinMinecraft.java index 3c4487039..fcbb2cb27 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinMinecraft.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinMinecraft.java @@ -12,7 +12,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants; import com.seibel.distanthorizons.coreapi.ModInfo; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.TitleScreen; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; @@ -29,7 +29,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public class MixinMinecraft { @Unique - private static final Logger LOGGER = DhLoggerBuilder.getLogger(MixinMinecraft.class.getSimpleName()); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); /** * Can be enabled for testing the auto updater UI.
diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/NeoforgeMinecraftRenderWrapper.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/NeoforgeMinecraftRenderWrapper.java index ffe3d2235..f540abd6c 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/NeoforgeMinecraftRenderWrapper.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/NeoforgeMinecraftRenderWrapper.java @@ -3,7 +3,7 @@ package com.seibel.distanthorizons.neoforge.wrappers; import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import net.minecraft.client.Minecraft; -import org.apache.logging.log4j.Logger; +import com.seibel.distanthorizons.core.logging.DhLogger; #if MC_VER < MC_1_21_9 #else @@ -18,7 +18,7 @@ public class NeoforgeMinecraftRenderWrapper extends MinecraftRenderWrapper { public static final NeoforgeMinecraftRenderWrapper INSTANCE = new NeoforgeMinecraftRenderWrapper(); - private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName()); + private static final DhLogger LOGGER = new DhLoggerBuilder().build(); private static final Minecraft MC = Minecraft.getInstance();