101 lines
3.9 KiB
Diff
101 lines
3.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Simon Gardling <titaniumtown@gmail.com>
|
|
Date: Thu, 8 Jul 2021 17:03:31 -0400
|
|
Subject: [PATCH] Use MCUtil.asyncExecutor for MAIN_WORKER_EXECUTOR in
|
|
SystemUtils
|
|
|
|
Original code by Titaniumtown, licensed under GNU General Public License v3.0
|
|
You can find the original code on https://gitlab.com/Titaniumtown/JettPack
|
|
|
|
diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
|
|
index bc6600fe322ef9733233c0273e318f2c16f6d359..73693a3a7faaa2be24c367e351f75aeb0d0f2208 100644
|
|
--- a/src/main/java/net/minecraft/Util.java
|
|
+++ b/src/main/java/net/minecraft/Util.java
|
|
@@ -61,6 +61,10 @@ import net.minecraft.util.datafix.DataFixers;
|
|
import net.minecraft.world.level.block.state.properties.Property;
|
|
import org.apache.commons.io.IOUtils;
|
|
import org.slf4j.Logger;
|
|
+import java.util.concurrent.AbstractExecutorService;
|
|
+import wtf.etil.mirai.server.util.ServerWorkerWrapper;
|
|
+import net.minecraft.server.MCUtil;
|
|
+import java.util.Collections;
|
|
|
|
public class Util {
|
|
static final Logger LOGGER = LogUtils.getLogger();
|
|
@@ -148,7 +152,43 @@ public class Util {
|
|
if (i <= 0) {
|
|
executorService = MoreExecutors.newDirectExecutorService();
|
|
} else {
|
|
- executorService = new java.util.concurrent.ThreadPoolExecutor(i, i,0L, TimeUnit.MILLISECONDS, new java.util.concurrent.LinkedBlockingQueue<Runnable>(), target -> new net.minecraft.server.ServerWorkerThread(target, s, priorityModifier));
|
|
+ executorService = Integer.getInteger("Paper.WorkerThreadCount", i) <= 0 ? MoreExecutors.newDirectExecutorService() : new AbstractExecutorService(){
|
|
+ private volatile boolean shutdown = false;
|
|
+
|
|
+ @Override
|
|
+ public final List<Runnable> shutdownNow() {
|
|
+ this.shutdown = true;
|
|
+ return Collections.emptyList();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public final void shutdown() {
|
|
+ this.shutdown = true;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public final boolean isShutdown() {
|
|
+ return this.shutdown;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public final boolean isTerminated() {
|
|
+ return this.shutdown;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public final boolean awaitTermination(long l2, TimeUnit timeUnit) throws InterruptedException {
|
|
+ if (!this.shutdown) {
|
|
+ throw new UnsupportedOperationException();
|
|
+ }
|
|
+ return true;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public final void execute(Runnable runnable) {
|
|
+ MCUtil.asyncExecutor.execute(new ServerWorkerWrapper(runnable));
|
|
+ }
|
|
+ };
|
|
}
|
|
/*
|
|
@Override
|
|
diff --git a/src/main/java/wtf/etil/mirai/server/util/ServerWorkerWrapper.java b/src/main/java/wtf/etil/mirai/server/util/ServerWorkerWrapper.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..4633764f3d806c7e29cbda6e85db5a3432ad0c29
|
|
--- /dev/null
|
|
+++ b/src/main/java/wtf/etil/mirai/server/util/ServerWorkerWrapper.java
|
|
@@ -0,0 +1,24 @@
|
|
+package wtf.etil.mirai.server.util;
|
|
+
|
|
+import com.google.common.base.Preconditions;
|
|
+import net.minecraft.Util;
|
|
+
|
|
+public final class ServerWorkerWrapper implements Runnable {
|
|
+ private final Runnable internalRunnable;
|
|
+
|
|
+ public ServerWorkerWrapper(Runnable runnable) {
|
|
+ this.internalRunnable = Preconditions.checkNotNull(runnable, "internalRunnable");
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public final void run() {
|
|
+ try {
|
|
+ this.internalRunnable.run();
|
|
+ return;
|
|
+ }
|
|
+ catch (Throwable throwable) {
|
|
+ Util.onThreadException(Thread.currentThread(), throwable);
|
|
+ return;
|
|
+ }
|
|
+ }
|
|
+}
|
|
\ No newline at end of file
|