54 lines
2.9 KiB
Diff
54 lines
2.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
|
|
Date: Thu, 1 Jul 2021 12:26:15 +0000
|
|
Subject: [PATCH] Completely remove bootstrapExecutor
|
|
|
|
Original code by PatinaMC, licensed under GNU General Public License v3.0
|
|
You can find the original code on https://github.com/PatinaMC/Patina
|
|
|
|
diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
|
|
index fa14cedb8437b1e1713b0023253845a4bc2b11fc..bc6600fe322ef9733233c0273e318f2c16f6d359 100644
|
|
--- a/src/main/java/net/minecraft/Util.java
|
|
+++ b/src/main/java/net/minecraft/Util.java
|
|
@@ -67,7 +67,7 @@ public class Util {
|
|
private static final int DEFAULT_MAX_THREADS = 255;
|
|
private static final String MAX_THREADS_SYSTEM_PROPERTY = "max.bg.threads";
|
|
private static final AtomicInteger WORKER_COUNT = new AtomicInteger(1);
|
|
- private static final ExecutorService BOOTSTRAP_EXECUTOR = makeExecutor("Bootstrap", -2); // Paper - add -2 priority
|
|
+ //private static final ExecutorService BOOTSTRAP_EXECUTOR = makeExecutor("Bootstrap", -2); // Paper - add -2 priority // Patina
|
|
private static final ExecutorService BACKGROUND_EXECUTOR = makeExecutor("Main", -1); // Paper - add -1 priority
|
|
// Paper start - don't submit BLOCKING PROFILE LOOKUPS to the world gen thread
|
|
public static final ExecutorService PROFILE_EXECUTOR = Executors.newFixedThreadPool(2, new java.util.concurrent.ThreadFactory() {
|
|
@@ -190,7 +190,7 @@ public class Util {
|
|
}
|
|
|
|
public static ExecutorService bootstrapExecutor() {
|
|
- return BOOTSTRAP_EXECUTOR;
|
|
+ return BACKGROUND_EXECUTOR; // Patina
|
|
}
|
|
|
|
public static ExecutorService backgroundExecutor() {
|
|
diff --git a/src/main/java/net/minecraft/util/datafix/DataFixers.java b/src/main/java/net/minecraft/util/datafix/DataFixers.java
|
|
index e4090fa0f01078277d70b1a88e870a56f6b1cb0f..0c5abb040d156c8a855c3c40718411f2c7e8e43d 100644
|
|
--- a/src/main/java/net/minecraft/util/datafix/DataFixers.java
|
|
+++ b/src/main/java/net/minecraft/util/datafix/DataFixers.java
|
|
@@ -78,15 +78,15 @@ public class DataFixers {
|
|
|
|
private static final BiFunction<Integer, Schema, Schema> SAME = Schema::new;
|
|
private static final BiFunction<Integer, Schema, Schema> SAME_NAMESPACED = NamespacedSchema::new;
|
|
- private static final DataFixer DATA_FIXER = DataFixers.createFixerUpper();
|
|
+ private static final DataFixer DATA_FIXER; // Patina
|
|
|
|
public DataFixers() {}
|
|
|
|
- private static DataFixer createFixerUpper() {
|
|
+ static { // Patina
|
|
DataFixerBuilder datafixerbuilder = new DataFixerBuilder(SharedConstants.getCurrentVersion().getWorldVersion());
|
|
|
|
DataFixers.addFixers(datafixerbuilder);
|
|
- return datafixerbuilder.build(Util.bootstrapExecutor());
|
|
+ DATA_FIXER = datafixerbuilder.build(Util.backgroundExecutor()); // Patina
|
|
}
|
|
|
|
public static DataFixer getDataFixer() {
|