mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 23:38:25 +01:00
Don't print full packages in new chunk system classes
Closes #8391, #8412
This commit is contained in:
Nassim Jahnke
parent
99a00c8e1c
commit
bcbb7dae76
2 changed files with 25 additions and 15 deletions
|
|
@ -2156,6 +2156,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||
+ return (this.backingSet & (1L << element.ordinal())) != 0;
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/com/mojang/logging/LogUtils.java b/src/main/java/com/mojang/logging/LogUtils.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/com/mojang/logging/LogUtils.java
|
||||
+++ b/src/main/java/com/mojang/logging/LogUtils.java
|
||||
@@ -0,0 +0,0 @@ public class LogUtils {
|
||||
public static Logger getLogger() {
|
||||
return LoggerFactory.getLogger(STACK_WALKER.getCallerClass());
|
||||
}
|
||||
+ // Paper start
|
||||
+ public static Logger getClassLogger() {
|
||||
+ return LoggerFactory.getLogger(STACK_WALKER.getCallerClass().getSimpleName());
|
||||
+ }
|
||||
+ // Paper end
|
||||
}
|
||||
diff --git a/src/main/java/io/papermc/paper/chunk/SingleThreadChunkRegionManager.java b/src/main/java/io/papermc/paper/chunk/SingleThreadChunkRegionManager.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
|
||||
|
|
|
|||
|
|
@ -2480,7 +2480,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||
+
|
||||
+public final class EntityLookup implements LevelEntityGetter<Entity> {
|
||||
+
|
||||
+ private static final Logger LOGGER = LogUtils.getLogger();
|
||||
+ private static final Logger LOGGER = LogUtils.getClassLogger();
|
||||
+
|
||||
+ protected static final int REGION_SHIFT = 5;
|
||||
+ protected static final int REGION_MASK = (1 << REGION_SHIFT) - 1;
|
||||
|
|
@ -3330,7 +3330,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||
+ */
|
||||
+public final class RegionFileIOThread extends PrioritisedQueueExecutorThread {
|
||||
+
|
||||
+ private static final Logger LOGGER = LogUtils.getLogger();
|
||||
+ private static final Logger LOGGER = LogUtils.getClassLogger();
|
||||
+
|
||||
+ /**
|
||||
+ * The kinds of region files controlled by the region file thread. Add more when needed, and ensure
|
||||
|
|
@ -4307,7 +4307,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||
+
|
||||
+ static final class InProgressRead {
|
||||
+
|
||||
+ private static final Logger LOGGER = LogUtils.getLogger();
|
||||
+ private static final Logger LOGGER = LogUtils.getClassLogger();
|
||||
+
|
||||
+ CompoundTag value;
|
||||
+ Throwable throwable;
|
||||
|
|
@ -4449,7 +4449,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||
+
|
||||
+ protected static final CompoundTag NOTHING_TO_WRITE = new CompoundTag();
|
||||
+
|
||||
+ private static final Logger LOGGER = LogUtils.getLogger();
|
||||
+ private static final Logger LOGGER = LogUtils.getClassLogger();
|
||||
+
|
||||
+ RegionFileIOThread.InProgressRead inProgressRead;
|
||||
+ volatile CompoundTag inProgressWrite = NOTHING_TO_WRITE; // only needs to be acquire/release
|
||||
|
|
@ -4928,7 +4928,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||
+
|
||||
+public final class PoiChunk {
|
||||
+
|
||||
+ private static final Logger LOGGER = LogUtils.getLogger();
|
||||
+ private static final Logger LOGGER = LogUtils.getClassLogger();
|
||||
+
|
||||
+ public final ServerLevel world;
|
||||
+ public final int chunkX;
|
||||
|
|
@ -5129,7 +5129,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||
+
|
||||
+import ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor;
|
||||
+import ca.spottedleaf.concurrentutil.util.ConcurrentUtil;
|
||||
+import com.mojang.logging.LogUtils;
|
||||
+import net.minecraft.server.level.ChunkMap;
|
||||
+import net.minecraft.server.level.ServerLevel;
|
||||
+import net.minecraft.world.level.chunk.ChunkAccess;
|
||||
|
|
@ -5137,13 +5136,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||
+import net.minecraft.world.level.chunk.ImposterProtoChunk;
|
||||
+import net.minecraft.world.level.chunk.LevelChunk;
|
||||
+import net.minecraft.world.level.chunk.ProtoChunk;
|
||||
+import org.slf4j.Logger;
|
||||
+import java.lang.invoke.VarHandle;
|
||||
+
|
||||
+public final class ChunkFullTask extends ChunkProgressionTask implements Runnable {
|
||||
+
|
||||
+ private static final Logger LOGGER = LogUtils.getLogger();
|
||||
+
|
||||
+ protected final NewChunkHolder chunkHolder;
|
||||
+ protected final ChunkAccess fromChunk;
|
||||
+ protected final PrioritisedExecutor.PrioritisedTask convertToFullTask;
|
||||
|
|
@ -5313,7 +5309,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||
+
|
||||
+public final class ChunkHolderManager {
|
||||
+
|
||||
+ private static final Logger LOGGER = LogUtils.getLogger();
|
||||
+ private static final Logger LOGGER = LogUtils.getClassLogger();
|
||||
+
|
||||
+ public static final int FULL_LOADED_TICKET_LEVEL = 33;
|
||||
+ public static final int BLOCK_TICKING_TICKET_LEVEL = 32;
|
||||
|
|
@ -6670,7 +6666,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||
+
|
||||
+public final class ChunkLoadTask extends ChunkProgressionTask {
|
||||
+
|
||||
+ private static final Logger LOGGER = LogUtils.getLogger();
|
||||
+ private static final Logger LOGGER = LogUtils.getClassLogger();
|
||||
+
|
||||
+ private final NewChunkHolder chunkHolder;
|
||||
+ private final ChunkDataLoadTask loadTask;
|
||||
|
|
@ -7296,7 +7292,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||
+
|
||||
+public final class ChunkTaskScheduler {
|
||||
+
|
||||
+ private static final Logger LOGGER = LogUtils.getLogger();
|
||||
+ private static final Logger LOGGER = LogUtils.getClassLogger();
|
||||
+
|
||||
+ static int newChunkSystemIOThreads;
|
||||
+ static int newChunkSystemWorkerThreads;
|
||||
|
|
@ -8062,7 +8058,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||
+
|
||||
+public final class ChunkUpgradeGenericStatusTask extends ChunkProgressionTask implements Runnable {
|
||||
+
|
||||
+ private static final Logger LOGGER = LogUtils.getLogger();
|
||||
+ private static final Logger LOGGER = LogUtils.getClassLogger();
|
||||
+
|
||||
+ protected final ChunkAccess fromChunk;
|
||||
+ protected final ChunkStatus fromStatus;
|
||||
|
|
@ -8276,7 +8272,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||
+
|
||||
+public abstract class GenericDataLoadTask<OnMain,FinalCompletion> {
|
||||
+
|
||||
+ private static final Logger LOGGER = LogUtils.getLogger();
|
||||
+ private static final Logger LOGGER = LogUtils.getClassLogger();
|
||||
+
|
||||
+ protected static final CompoundTag CANCELLED_DATA = new CompoundTag();
|
||||
+
|
||||
|
|
@ -9055,7 +9051,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||
+
|
||||
+public final class NewChunkHolder {
|
||||
+
|
||||
+ private static final Logger LOGGER = LogUtils.getLogger();
|
||||
+ private static final Logger LOGGER = LogUtils.getClassLogger();
|
||||
+
|
||||
+ public static final Thread.UncaughtExceptionHandler CHUNKSYSTEM_UNCAUGHT_EXCEPTION_HANDLER = new Thread.UncaughtExceptionHandler() {
|
||||
+ @Override
|
||||
|
|
|
|||
Loading…
Reference in a new issue