Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2024-11-29 22:23:50 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream and Sidestream(s) (Tuinity/Purpur)

Browse Source 
Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Tuinity Changes:
5994cb0 Updated Upstream (Paper)
7dfe18c Merge https://github.com/Spottedleaf/Tuinity into ver/1.16.3
ef4e59a Optimise tab complete

Purpur Changes:
8726ad9 Updated Upstream (Paper)
This commit is contained in:
Ivan Pekov 2020-09-13 09:07:20 +03:00
parent 21db600711
commit f1d3c9d7a2
8 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PATCHES.md
View File

@ -77,6 +77,7 @@ # Patches
| api | Modify POM | tr7zw | | | api | Modify POM | tr7zw | |
| server | Modify POM | tr7zw | | | server | Modify POM | tr7zw | |
| server | Modify default configs | tr7zw | | | server | Modify default configs | tr7zw | |
| server | Nuke Bootstrap thread pool | foss-mc | Ivan Pekov |
| server | Nuke streams off BlockPosition | Ivan Pekov | | | server | Nuke streams off BlockPosition | Ivan Pekov | |
| server | Nuke streams off SectionPosition | Ivan Pekov | | | server | Nuke streams off SectionPosition | Ivan Pekov | |
| server | Optimize BehaviorController | MrIvanPlays | | | server | Optimize BehaviorController | MrIvanPlays | |
@ -105,7 +106,6 @@ # Patches
| server | Respect PlayerKickEvent leaveMessage | Ivan Pekov | | | server | Respect PlayerKickEvent leaveMessage | Ivan Pekov | |
| server | Respect permissions when constructing InventoryEnderChest | Ivan Pekov | | | server | Respect permissions when constructing InventoryEnderChest | Ivan Pekov | |
| server | Send more packets immediately | MrIvanPlays | | | server | Send more packets immediately | MrIvanPlays | |
| server | Shutdown Bootstrap thread pool | foss-mc | |
| server | Skip events if there's no listeners | William Blake Galbreath | | | server | Skip events if there's no listeners | William Blake Galbreath | |
| server | Snowman drop and put back pumpkin | William Blake Galbreath | | | server | Snowman drop and put back pumpkin | William Blake Galbreath | |
| server | Squid EAR immunity | William Blake Galbreath | | | server | Squid EAR immunity | William Blake Galbreath | |

2
Purpur

@ -1 +1 @@
Subproject commit fc3376c26dcc05cacf6aa6897b43f843f7c1c5ca Subproject commit 8726ad9583aebc325bc5671e4b19db4ab5cefe67

2
Tuinity

@ -1 +1 @@
Subproject commit 1c058587d99bc220c98b50ad03ae0f1751debf19 Subproject commit 5994cb01c1c6b133fe73b6bd55b2702181c6d046

6
patches/server/0002-Modify-POM.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Modify POM
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index f009b05e4c2ab0f093150a9eecff5629db35b517..eb20fadc4c53d7f8e34f4f8e8caa58f943eaf4e8 100644 index 5e25ae55e44e31d232b088b7c3c39df69b0cc875..7e1c319897728af0943a5ce71f7220d97f0a7153 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
@ -53,7 +53,7 @@ index f009b05e4c2ab0f093150a9eecff5629db35b517..eb20fadc4c53d7f8e34f4f8e8caa58f9
<version>${project.version}</version> <version>${project.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
@@ -153,6 +162,15 @@ @@ -154,6 +163,15 @@
<id>spigotmc-public</id> <id>spigotmc-public</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url> <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository> </repository>
@ -69,7 +69,7 @@ index f009b05e4c2ab0f093150a9eecff5629db35b517..eb20fadc4c53d7f8e34f4f8e8caa58f9
</repositories> </repositories>
<pluginRepositories> <pluginRepositories>
@@ -164,15 +182,15 @@ @@ -165,15 +183,15 @@
<!-- This builds a completely 'ready to start' jar with all dependencies inside --> <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
<build> <build>

4
patches/server/0006-Add-config-Yatopia-command-and-basic-settings.patch
View File

@ -17,10 +17,10 @@ index b67f05f290db653cf75a89e85bd3decb5044a1e0..11758b6b158d971b9beb1b609d7513da
new TimingsExport(listeners, parent, history).start(); new TimingsExport(listeners, parent, history).start();
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 943273206e6123fdd101aafb6505a7c5bfe8d980..21058e0f08bd689901bcf51eef7198de791642f1 100644 index 050e0d7ec29755590dde2f35090b96f6f2457952..dde91498e773cc6744612f780ce82bd35ad79637 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java --- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -181,6 +181,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -177,6 +177,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
// Paper end // Paper end
com.tuinity.tuinity.config.TuinityConfig.init((java.io.File) options.valueOf("tuinity-settings")); // Tuinity - Server Config com.tuinity.tuinity.config.TuinityConfig.init((java.io.File) options.valueOf("tuinity-settings")); // Tuinity - Server Config

4
patches/server/0009-Add-NBT-API-as-a-first-class-lib.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add NBT API as a first-class lib
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index eb20fadc4c53d7f8e34f4f8e8caa58f943eaf4e8..d8e7edc27dc1107272a87e7f9396f50136b662a8 100644 index 7e1c319897728af0943a5ce71f7220d97f0a7153..4e9dfd79751fbf5c926c9683a2c8bb2800c60f0c 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -320,6 +320,10 @@ @@ -321,6 +321,10 @@
<pattern>net.minecraft.server</pattern> <pattern>net.minecraft.server</pattern>
<shadedPattern>net.minecraft.server.v${minecraft_version}</shadedPattern> <shadedPattern>net.minecraft.server.v${minecraft_version}</shadedPattern>
</relocation> </relocation>

4
patches/server/0023-Redirect-Configs.patch
View File

@ -73,10 +73,10 @@ index bbf09800b7b72bdfb75c91e4c6c77fe00e3ad436..1d98bfdee95fb1052fcd9f141a2ab82b
for (final Method method : clazz.getDeclaredMethods()) { for (final Method method : clazz.getDeclaredMethods()) {
if (method.getReturnType() != void.class || method.getParameterCount() != 0 || if (method.getReturnType() != void.class || method.getParameterCount() != 0 ||
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 21058e0f08bd689901bcf51eef7198de791642f1..f5a417bc349ee691a8d4b21eb39e6a6225ed96d9 100644 index dde91498e773cc6744612f780ce82bd35ad79637..70d22f03162df1855fa8632127ef1a3e6703c4be 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java --- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -189,6 +189,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -185,6 +185,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
return false; return false;
} }
net.yatopia.server.YatopiaConfig.registerCommands(); net.yatopia.server.YatopiaConfig.registerCommands();

29
patches/server/0049-Shutdown-Bootstrap-thread-pool.patch → patches/server/0049-Nuke-Bootstrap-thread-pool.patch
View File

@ -1,14 +1,15 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: foss-mc <69294560+foss-mc@users.noreply.github.com> From: foss-mc <69294560+foss-mc@users.noreply.github.com>
Date: Sat, 12 Sep 2020 11:12:23 +0800 Date: Sat, 12 Sep 2020 11:12:23 +0800
Subject: [PATCH] Shutdown Bootstrap thread pool Subject: [PATCH] Nuke Bootstrap thread pool
Co-authored-by: Ivan Pekov <ivan@mrivanplays.com>
diff --git a/src/main/java/net/minecraft/server/DataConverterRegistry.java b/src/main/java/net/minecraft/server/DataConverterRegistry.java diff --git a/src/main/java/net/minecraft/server/DataConverterRegistry.java b/src/main/java/net/minecraft/server/DataConverterRegistry.java
index 48e31e9142ffeb2725af6b1f483de67410e25694..b149e32aac86ce2f7521958fa7394e4f5b852174 100644 index 48e31e9142ffeb2725af6b1f483de67410e25694..1b5b06cad7771a7d351aca0a009d902f23f07d9d 100644
--- a/src/main/java/net/minecraft/server/DataConverterRegistry.java --- a/src/main/java/net/minecraft/server/DataConverterRegistry.java
+++ b/src/main/java/net/minecraft/server/DataConverterRegistry.java +++ b/src/main/java/net/minecraft/server/DataConverterRegistry.java
@@ -15,14 +15,16 @@ public class DataConverterRegistry { @@ -15,14 +15,15 @@ public class DataConverterRegistry {
private static final BiFunction<Integer, Schema, Schema> a = Schema::new; private static final BiFunction<Integer, Schema, Schema> a = Schema::new;
private static final BiFunction<Integer, Schema, Schema> b = DataConverterSchemaNamed::new; private static final BiFunction<Integer, Schema, Schema> b = DataConverterSchemaNamed::new;
@ -22,32 +23,36 @@ index 48e31e9142ffeb2725af6b1f483de67410e25694..b149e32aac86ce2f7521958fa7394e4f
a(datafixerbuilder); a(datafixerbuilder);
- return datafixerbuilder.build(SystemUtils.e()); - return datafixerbuilder.build(SystemUtils.e());
+ c = datafixerbuilder.build(SystemUtils.d); + c = datafixerbuilder.build(SystemUtils.getMainExecutor());
+ SystemUtils.d.shutdown();
} }
+ // Yatopia end + // Yatopia end
public static DataFixer getDataFixer() { return a(); } // Paper - OBFHELPER public static DataFixer getDataFixer() { return a(); } // Paper - OBFHELPER
public static DataFixer a() { public static DataFixer a() {
diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java
index 20f1c25db110c17eff6630c9db2e109e58159a22..51cbe01e171f8019a8b57c91c55980280d6857db 100644 index 869dcf1545601358a273a5cfb47afa88fa13a11c..cbb5bcbeaac5487c99b6f2171a5ba28ea7fe171a 100644
--- a/src/main/java/net/minecraft/server/SystemUtils.java --- a/src/main/java/net/minecraft/server/SystemUtils.java
+++ b/src/main/java/net/minecraft/server/SystemUtils.java +++ b/src/main/java/net/minecraft/server/SystemUtils.java
@@ -48,7 +48,7 @@ import org.apache.logging.log4j.Logger; @@ -48,7 +48,7 @@ import org.apache.logging.log4j.Logger;
public class SystemUtils { public class SystemUtils {
private static final AtomicInteger c = new AtomicInteger(1); private static final AtomicInteger c = new AtomicInteger(1);
- private static final ExecutorService d = a("Bootstrap"); - private static final ExecutorService d = a("Bootstrap", -2); // Paper - add -2 priority
+ public static final ExecutorService d = a("Bootstrap"); // Yatopia - private -> public + //private static final ExecutorService d = a("Bootstrap", -2); // Paper - add -2 priority // Yatopia - nuke this shit
private static final ExecutorService e = a("Main"); private static final ExecutorService e = a("Main", -1); // Paper - add -1 priority
private static final ExecutorService f = n(); private static final ExecutorService f = n();
public static LongSupplier a = System::nanoTime; public static LongSupplier a = System::nanoTime;
@@ -111,7 +111,7 @@ public class SystemUtils { @@ -111,10 +111,13 @@ public class SystemUtils {
return (ExecutorService) object; return (ExecutorService) object;
} }
- public static Executor e() { + /* // Yatopia start - ditch this
+ public static Executor e_unused() { // Yatopia - unused public static Executor e() {
return SystemUtils.d; return SystemUtils.d;
} }
+ */ // Yatopia end
+ public static Executor getMainExecutor() { return f(); } // Yatopia - OBFHELPER
public static Executor f() {
return SystemUtils.e;
}