mirror of
https://github.com/Dreeam-qwq/Gale.git
synced 2025-12-22 08:19:31 +00:00
60 lines
2.8 KiB
Diff
60 lines
2.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martijn Muijsers <martijnmuijsers@live.nl>
|
|
Date: Mon, 30 Jan 2023 00:08:14 +0100
|
|
Subject: [PATCH] Run world upgrade tasks on base thread pool
|
|
|
|
License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
|
|
Gale - https://galemc.org
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/world/ThreadedWorldUpgrader.java b/src/main/java/io/papermc/paper/world/ThreadedWorldUpgrader.java
|
|
index 95cac7edae8ac64811fc6a2f6b97dd4a0fceb0b0..a376259202b4a16c67db4d3ef071e0b395aca524 100644
|
|
--- a/src/main/java/io/papermc/paper/world/ThreadedWorldUpgrader.java
|
|
+++ b/src/main/java/io/papermc/paper/world/ThreadedWorldUpgrader.java
|
|
@@ -7,25 +7,21 @@ import net.minecraft.nbt.CompoundTag;
|
|
import net.minecraft.resources.ResourceKey;
|
|
import net.minecraft.util.worldupdate.WorldUpgrader;
|
|
import net.minecraft.world.level.ChunkPos;
|
|
-import net.minecraft.world.level.Level;
|
|
import net.minecraft.world.level.chunk.ChunkGenerator;
|
|
import net.minecraft.world.level.chunk.storage.ChunkStorage;
|
|
import net.minecraft.world.level.chunk.storage.RegionFileStorage;
|
|
-import net.minecraft.world.level.dimension.DimensionType;
|
|
import net.minecraft.world.level.dimension.LevelStem;
|
|
-import net.minecraft.world.level.levelgen.WorldGenSettings;
|
|
import net.minecraft.world.level.storage.DimensionDataStorage;
|
|
import net.minecraft.world.level.storage.LevelStorageSource;
|
|
import org.apache.logging.log4j.LogManager;
|
|
import org.apache.logging.log4j.Logger;
|
|
+import org.galemc.gale.executor.queue.BaseTaskQueues;
|
|
+
|
|
import java.io.File;
|
|
import java.io.IOException;
|
|
import java.text.DecimalFormat;
|
|
import java.util.Optional;
|
|
import java.util.concurrent.ExecutorService;
|
|
-import java.util.concurrent.Executors;
|
|
-import java.util.concurrent.ThreadFactory;
|
|
-import java.util.concurrent.atomic.AtomicInteger;
|
|
import java.util.concurrent.atomic.AtomicLong;
|
|
import java.util.function.Supplier;
|
|
|
|
@@ -46,6 +42,10 @@ public class ThreadedWorldUpgrader {
|
|
this.dimensionType = dimensionType;
|
|
this.worldName = worldName;
|
|
this.worldDir = worldDir;
|
|
+ // Gale start - base thread pool - remove world upgrade executors
|
|
+ this.threadPool = BaseTaskQueues.scheduledAsync.yieldingExecutor;
|
|
+ /*
|
|
+ // Gale end - base thread pool - remove world upgrade executors
|
|
this.threadPool = Executors.newFixedThreadPool(Math.max(1, threads), new ThreadFactory() {
|
|
private final AtomicInteger threadCounter = new AtomicInteger();
|
|
|
|
@@ -61,6 +61,7 @@ public class ThreadedWorldUpgrader {
|
|
return ret;
|
|
}
|
|
});
|
|
+ */ // Gale - base thread pool - remove world upgrade executors
|
|
this.dataFixer = dataFixer;
|
|
this.generatorKey = generatorKey;
|
|
this.removeCaches = removeCaches;
|