Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-18 21:41:45 +01:00
Code Issues Projects Releases Wiki Activity

net.minecraft

Browse Source
This commit is contained in:
Noah van der Aa 2024-12-14 19:06:52 +01:00
parent 2a274e38c6
commit b602dc968e
No known key found for this signature in database
GPG Key ID: 547D90BC6FF753CF
4 changed files with 46 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
paper-server/patches/unapplied/net/minecraft/ChatFormatting.java.patch → paper-server/patches/sources/net/minecraft/ChatFormatting.java.patch
View File

@ -1,11 +1,12 @@
--- a/net/minecraft/ChatFormatting.java
+++ b/net/minecraft/ChatFormatting.java
@@ -112,6 +112,18 @@
return name == null ? null : FORMATTING_BY_NAME.get(cleanName(name));
@@ -112,6 +_,19 @@
return friendlyName == null ? null : FORMATTING_BY_NAME.get(cleanName(friendlyName));
}
+ // Paper start - add method to get by hex value
+ @Nullable public static ChatFormatting getByHexValue(int i) {
+ @Nullable
+ public static ChatFormatting getByHexValue(int i) {
+ for (ChatFormatting value : values()) {
+ if (value.getColor() != null && value.getColor() == i) {
+ return value;
@ -17,5 +18,5 @@
+ // Paper end - add method to get by hex value
+
@Nullable
public static ChatFormatting getById(int colorIndex) {
if (colorIndex < 0) {
public static ChatFormatting getById(int index) {
if (index < 0) {

16
paper-server/patches/unapplied/net/minecraft/CrashReport.java.patch → paper-server/patches/sources/net/minecraft/CrashReport.java.patch
View File

@ -1,22 +1,22 @@
--- a/net/minecraft/CrashReport.java
+++ b/net/minecraft/CrashReport.java
@@ -34,8 +34,10 @@
@@ -32,8 +_,10 @@
private final SystemReport systemReport = new SystemReport();
public CrashReport(String message, Throwable cause) {
+ io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(cause); // Paper
this.title = message;
this.exception = cause;
public CrashReport(String title, Throwable exception) {
+ io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(exception); // Paper
this.title = title;
this.exception = exception;
+ this.systemReport.setDetail("CraftBukkit Information", new org.bukkit.craftbukkit.CraftCrashReport()); // CraftBukkit
}
public String getTitle() {
@@ -251,7 +253,7 @@
@@ -218,7 +_,7 @@
}
public static void preload() {
- MemoryReserve.allocate();
+ // MemoryReserve.allocate(); // Paper - Disable memory reserve allocating
(new CrashReport("Don't panic!", new Throwable())).getFriendlyReport(ReportType.CRASH);
+ //MemoryReserve.allocate(); // Paper - Disable memory reserve allocating
new CrashReport("Don't panic!", new Throwable()).getFriendlyReport(ReportType.CRASH);
}
}

6
paper-server/patches/unapplied/net/minecraft/CrashReportCategory.java.patch → paper-server/patches/sources/net/minecraft/CrashReportCategory.java.patch
View File

@ -1,9 +1,9 @@
--- a/net/minecraft/CrashReportCategory.java
+++ b/net/minecraft/CrashReportCategory.java
@@ -110,6 +110,7 @@
@@ -138,6 +_,7 @@
} else {
this.stackTrace = new StackTraceElement[stackTraceElements.length - 3 - ignoredCallCount];
System.arraycopy(stackTraceElements, 3 + ignoredCallCount, this.stackTrace, 0, this.stackTrace.length);
this.stackTrace = new StackTraceElement[stackTrace.length - 3 - size];
System.arraycopy(stackTrace, 3 + size, this.stackTrace, 0, this.stackTrace.length);
+ this.stackTrace = io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateStacktrace(this.stackTrace); // Paper
return this.stackTrace.length;
}

70
paper-server/patches/unapplied/net/minecraft/Util.java.patch → paper-server/patches/sources/net/minecraft/Util.java.patch
View File

@ -1,6 +1,6 @@
--- a/net/minecraft/Util.java
+++ b/net/minecraft/Util.java
@@ -92,9 +92,26 @@
@@ -92,9 +_,26 @@
private static final int DEFAULT_MAX_THREADS = 255;
private static final int DEFAULT_SAFE_FILE_OPERATION_RETRIES = 10;
private static final String MAX_THREADS_SYSTEM_PROPERTY = "max.bg.threads";
@ -28,7 +28,7 @@
private static final DateTimeFormatter FILENAME_DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd_HH.mm.ss", Locale.ROOT);
public static final int LINEAR_LOOKUP_THRESHOLD = 8;
private static final Set<String> ALLOWED_UNTRUSTED_LINK_PROTOCOLS = Set.of("http", "https");
@@ -136,7 +153,7 @@
@@ -135,7 +_,7 @@
}
public static long getNanos() {
@ -37,36 +37,37 @@
}
public static long getEpochMillis() {
@@ -147,15 +164,16 @@
@@ -146,15 +_,17 @@
return FILENAME_DATE_TIME_FORMATTER.format(ZonedDateTime.now());
}
- private static TracingExecutor makeExecutor(String name) {
+ private static TracingExecutor makeExecutor(String name, final int priorityModifier) { // Paper - Perf: add priority
int i = maxAllowedExecutorThreads();
- ExecutorService executorService;
- ExecutorService directExecutorService;
+ // Paper start - Perf: use simpler thread pool that allows 1 thread and reduce worldgen thread worker count for low core count CPUs
+ final ExecutorService executorService;
+ final ExecutorService directExecutorService;
if (i <= 0) {
executorService = MoreExecutors.newDirectExecutorService();
directExecutorService = MoreExecutors.newDirectExecutorService();
} else {
- AtomicInteger atomicInteger = new AtomicInteger(1);
- executorService = new ForkJoinPool(i, pool -> {
- final String string2 = "Worker-" + name + "-" + atomicInteger.getAndIncrement();
+ executorService = Executors.newFixedThreadPool(i, target -> new io.papermc.paper.util.ServerWorkerThread(target, name, priorityModifier));
AtomicInteger atomicInteger = new AtomicInteger(1);
- directExecutorService = new ForkJoinPool(i, forkJoinPool -> {
- final String string = "Worker-" + name + "-" + atomicInteger.getAndIncrement();
+ directExecutorService = Executors.newFixedThreadPool(i, target -> new io.papermc.paper.util.ServerWorkerThread(target, name, priorityModifier));
+ }
+ /* final String string2 = "Worker-" + name + "-" + atomicInteger.getAndIncrement();
ForkJoinWorkerThread forkJoinWorkerThread = new ForkJoinWorkerThread(pool) {
+ /* final String string = "Worker-" + name + "-" + atomicInteger.getAndIncrement();
ForkJoinWorkerThread forkJoinWorkerThread = new ForkJoinWorkerThread(forkJoinPool) {
@Override
protected void onStart() {
@@ -177,13 +195,26 @@
forkJoinWorkerThread.setName(string2);
@@ -176,13 +_,27 @@
forkJoinWorkerThread.setName(string);
return forkJoinWorkerThread;
}, Util::onThreadException, true);
- }
+ }*/
+ // Paper end
return new TracingExecutor(executorService);
return new TracingExecutor(directExecutorService);
}
public static int maxAllowedExecutorThreads() {
@ -88,15 +89,10 @@
}
private static int getMaxThreads() {
@@ -229,10 +260,25 @@
TracyClient.setThreadName(string2, namePrefix.hashCode());
thread.setName(string2);
thread.setDaemon(daemon);
+ thread.setUncaughtExceptionHandler(Util::onThreadException);
+ return thread;
+ }));
+ }
+
@@ -233,6 +_,21 @@
}));
}
+ // Paper start - Separate dimension data IO pool
+ private static TracingExecutor makeExtraIoExecutor(String namePrefix) {
+ AtomicInteger atomicInteger = new AtomicInteger(1);
@ -106,24 +102,16 @@
+ TracyClient.setThreadName(string2, namePrefix.hashCode());
+ thread.setName(string2);
+ thread.setDaemon(false);
thread.setUncaughtExceptionHandler(Util::onThreadException);
return thread;
}));
}
+ thread.setUncaughtExceptionHandler(Util::onThreadException);
+ return thread;
+ }));
+ }
+ // Paper end - Separate dimension data IO pool
public static void throwAsRuntime(Throwable t) {
throw t instanceof RuntimeException ? (RuntimeException)t : new RuntimeException(t);
@@ -537,7 +583,7 @@
public static <K extends Enum<K>, V> EnumMap<K, V> makeEnumMap(Class<K> enumClass, Function<K, V> mapper) {
EnumMap<K, V> enumMap = new EnumMap<>(enumClass);
- for (K enum_ : (Enum[])enumClass.getEnumConstants()) {
+ for (K enum_ : enumClass.getEnumConstants()) { // Paper - decompile error
enumMap.put(enum_, mapper.apply(enum_));
}
@@ -1057,16 +1103,7 @@
+
public static void throwAsRuntime(Throwable throwable) {
throw throwable instanceof RuntimeException ? (RuntimeException)throwable : new RuntimeException(throwable);
}
@@ -1075,16 +_,7 @@
}
public void openUri(URI uri) {