diff options
| -rw-r--r-- | patches/server/0991-Chunk-System-Starlight-from-Moonrise.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/server/0991-Chunk-System-Starlight-from-Moonrise.patch b/patches/server/0991-Chunk-System-Starlight-from-Moonrise.patch index 1d15ab1035..74b2b07dcd 100644 --- a/patches/server/0991-Chunk-System-Starlight-from-Moonrise.patch +++ b/patches/server/0991-Chunk-System-Starlight-from-Moonrise.patch @@ -8636,7 +8636,7 @@ index 0000000000000000000000000000000000000000..bc07e710a5854fd526e3bb56d1565602 \ No newline at end of file diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java new file mode 100644 -index 0000000000000000000000000000000000000000..a7e7569b9d4160e7d92422ca5c1cce7f46b78f2e +index 0000000000000000000000000000000000000000..5576924839c9c5a42a8c430c30cb5a6275ae6f23 --- /dev/null +++ b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java @@ -0,0 +1,1430 @@ @@ -8661,6 +8661,7 @@ index 0000000000000000000000000000000000000000..a7e7569b9d4160e7d92422ca5c1cce7f +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; @@ -8681,7 +8682,6 @@ index 0000000000000000000000000000000000000000..a7e7569b9d4160e7d92422ca5c1cce7f +import net.minecraft.util.Unit; +import net.minecraft.world.level.ChunkPos; +import org.slf4j.Logger; -+import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.text.DecimalFormat; +import java.util.ArrayDeque; @@ -8699,7 +8699,7 @@ index 0000000000000000000000000000000000000000..a7e7569b9d4160e7d92422ca5c1cce7f + +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; @@ -10072,7 +10072,7 @@ index 0000000000000000000000000000000000000000..a7e7569b9d4160e7d92422ca5c1cce7f +} diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkTaskScheduler.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkTaskScheduler.java new file mode 100644 -index 0000000000000000000000000000000000000000..f52e104b3e07825caf0d6d1bda2e45c8437d6e20 +index 0000000000000000000000000000000000000000..bfb53d1f2f96539fbe62946252faa506188560a1 --- /dev/null +++ b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkTaskScheduler.java @@ -0,0 +1,923 @@ @@ -10098,6 +10098,7 @@ index 0000000000000000000000000000000000000000..f52e104b3e07825caf0d6d1bda2e45c8 +import ca.spottedleaf.moonrise.patches.chunk_system.server.ChunkSystemMinecraftServer; +import ca.spottedleaf.moonrise.patches.chunk_system.status.ChunkSystemChunkStep; +import ca.spottedleaf.moonrise.patches.chunk_system.util.ParallelSearchRadiusIteration; ++import com.mojang.logging.LogUtils; +import net.minecraft.CrashReport; +import net.minecraft.CrashReportCategory; +import net.minecraft.ReportedException; @@ -10115,7 +10116,6 @@ index 0000000000000000000000000000000000000000..f52e104b3e07825caf0d6d1bda2e45c8 +import net.minecraft.world.level.chunk.status.ChunkStatus; +import net.minecraft.world.level.chunk.status.ChunkStep; +import org.slf4j.Logger; -+import org.slf4j.LoggerFactory; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Arrays; @@ -10128,7 +10128,7 @@ index 0000000000000000000000000000000000000000..f52e104b3e07825caf0d6d1bda2e45c8 + +public final class ChunkTaskScheduler { + -+ private static final Logger LOGGER = LoggerFactory.getLogger(ChunkTaskScheduler.class); ++ private static final Logger LOGGER = LogUtils.getClassLogger(); + + static int newChunkSystemIOThreads; + static int newChunkSystemGenParallelism; |