From a403e97804c7ea74684d97a98f116f3067bf0134 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Mon, 18 Nov 2024 13:06:15 +0100 Subject: [PATCH] Make logs less annoying --- patches/server/MC-Utils.patch | 4 ++-- patches/server/Moonrise-optimisation-patches.patch | 8 ++++---- patches/server/Rewrite-dataconverter-system.patch | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/patches/server/MC-Utils.patch b/patches/server/MC-Utils.patch index 282629407..868047c55 100644 --- a/patches/server/MC-Utils.patch +++ b/patches/server/MC-Utils.patch @@ -3923,15 +3923,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + +import ca.spottedleaf.concurrentutil.executor.thread.PrioritisedThreadPool; +import ca.spottedleaf.moonrise.common.PlatformHooks; ++import com.mojang.logging.LogUtils; +import org.slf4j.Logger; -+import org.slf4j.LoggerFactory; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Consumer; + +public final class MoonriseCommon { + -+ private static final Logger LOGGER = LoggerFactory.getLogger(MoonriseCommon.class); ++ private static final Logger LOGGER = LogUtils.getClassLogger(); + + public static final PrioritisedThreadPool WORKER_POOL = new PrioritisedThreadPool( + new Consumer<>() { diff --git a/patches/server/Moonrise-optimisation-patches.patch b/patches/server/Moonrise-optimisation-patches.patch index 05f851b4a..04b0fa89c 100644 --- a/patches/server/Moonrise-optimisation-patches.patch +++ b/patches/server/Moonrise-optimisation-patches.patch @@ -6811,6 +6811,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +import ca.spottedleaf.moonrise.patches.chunk_system.util.ChunkSystemSortedArraySet; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; ++import com.mojang.logging.LogUtils; +import it.unimi.dsi.fastutil.longs.Long2ByteLinkedOpenHashMap; +import it.unimi.dsi.fastutil.longs.Long2ByteMap; +import it.unimi.dsi.fastutil.longs.Long2IntMap; @@ -6832,7 +6833,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +import net.minecraft.world.level.ChunkPos; +import net.minecraft.world.level.chunk.LevelChunk; +import org.slf4j.Logger; -+import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.text.DecimalFormat; +import java.util.ArrayDeque; @@ -6850,7 +6850,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + +public final class ChunkHolderManager { + -+ private static final Logger LOGGER = LoggerFactory.getLogger(ChunkHolderManager.class); ++ private static final Logger LOGGER = LogUtils.getClassLogger(); + + public static final int FULL_LOADED_TICKET_LEVEL = ChunkLevel.FULL_CHUNK_LEVEL; + public static final int BLOCK_TICKING_TICKET_LEVEL = ChunkLevel.BLOCK_TICKING_LEVEL; @@ -8277,6 +8277,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +import ca.spottedleaf.moonrise.patches.chunk_system.util.ParallelSearchRadiusIteration; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; ++import com.mojang.logging.LogUtils; +import net.minecraft.CrashReport; +import net.minecraft.CrashReportCategory; +import net.minecraft.ReportedException; @@ -8299,7 +8300,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +import net.minecraft.world.level.chunk.status.ChunkStep; +import net.minecraft.world.phys.Vec3; +import org.slf4j.Logger; -+import org.slf4j.LoggerFactory; +import java.io.File; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; @@ -8315,7 +8315,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + +public final class ChunkTaskScheduler { + -+ private static final Logger LOGGER = LoggerFactory.getLogger(ChunkTaskScheduler.class); ++ private static final Logger LOGGER = LogUtils.getClassLogger(); + + public static void init(final boolean useParallelGen) { + for (final PrioritisedThreadPool.ExecutorGroup.ThreadPoolExecutor executor : MoonriseCommon.RADIUS_AWARE_GROUP.getAllExecutors()) { diff --git a/patches/server/Rewrite-dataconverter-system.patch b/patches/server/Rewrite-dataconverter-system.patch index 21d981945..7611f1bcf 100644 --- a/patches/server/Rewrite-dataconverter-system.patch +++ b/patches/server/Rewrite-dataconverter-system.patch @@ -9352,7 +9352,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + +public final class MCTypeRegistry { + -+ private static final Logger LOGGER = LogUtils.getLogger(); ++ private static final Logger LOGGER = LogUtils.getClassLogger(); + + public static final MCDataType LEVEL = new MCDataType("Level"); + public static final MCDataType PLAYER = new MCDataType("Player");