From c5e73c7b4e1a7f5fc37b93c0d1752b079c68680f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Tue, 7 Jul 2020 11:05:58 +0800 Subject: [PATCH] Updated Upstream (Tuinity) Upstream has released updates that appears to apply and compile correctly Tuinity Changes: 18fdc0c Updated Upstream (Paper) 9a6fb96 Change paper target branch to ver/1.15.2 067a82a Updated Upstream (Paper) db8a861 Updated Upstream (Paper) --- Tuinity | 2 +- ...0011-Remove-vanilla-profiler-callers.patch | 106 +++++------------- ...9-Remove-Streams-using-IntelliJ-IDEA.patch | 8 +- 3 files changed, 31 insertions(+), 85 deletions(-) diff --git a/Tuinity b/Tuinity index db8a8617c..18fdc0c58 160000 --- a/Tuinity +++ b/Tuinity @@ -1 +1 @@ -Subproject commit db8a8617cd22377fe719dbb534c548e362b0aa00 +Subproject commit 18fdc0c583ef508d200e22f076ca667c191dc597 diff --git a/patches/server/0011-Remove-vanilla-profiler-callers.patch b/patches/server/0011-Remove-vanilla-profiler-callers.patch index ba6096233..144c7d488 100644 --- a/patches/server/0011-Remove-vanilla-profiler-callers.patch +++ b/patches/server/0011-Remove-vanilla-profiler-callers.patch @@ -36,15 +36,12 @@ index a08bfb4b3b02e998d3a6f519107e522fc58496eb..bed9730542ae7c5bb010b31d587c3cc6 // finished ticking, actual cleanup time diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index e8bf60507bacad9b333d4f074fbb62decf974c45..73545d70c2b576c22e8e6f67553d7ad07cdebdc2 100644 +index e8bf60507bacad9b333d4f074fbb62decf974c45..8895d1e7d360864fd4c7758ae24fb5ee2ab8db20 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java -@@ -636,9 +636,9 @@ public class ChunkProviderServer extends IChunkProvider { - return ifLoaded; - } +@@ -638,7 +638,7 @@ public class ChunkProviderServer extends IChunkProvider { // Paper end -- GameProfilerFiller gameprofilerfiller = this.world.getMethodProfiler(); -+ //GameProfilerFiller gameprofilerfiller = this.world.getMethodProfiler(); // Akarin - remove caller + GameProfilerFiller gameprofilerfiller = this.world.getMethodProfiler(); - gameprofilerfiller.c("getChunk"); + //gameprofilerfiller.c("getChunk"); // Akarin - remove caller @@ -60,12 +57,9 @@ index e8bf60507bacad9b333d4f074fbb62decf974c45..73545d70c2b576c22e8e6f67553d7ad0 CompletableFuture> completablefuture = this.getChunkFutureMainThread(i, j, chunkstatus, flag, true); // Paper if (!completablefuture.isDone()) { // Paper -@@ -728,13 +728,13 @@ public class ChunkProviderServer extends IChunkProvider { - this.chunkMapDistance.addTicketAtLevel(TicketType.REQUIRED_LOAD, chunkcoordintpair, l, identifier); // Tuinity - prevent plugin unloads from removing our ticket - if (isUrgent) this.chunkMapDistance.markUrgent(chunkcoordintpair); // Paper +@@ -730,11 +730,11 @@ public class ChunkProviderServer extends IChunkProvider { if (this.a(playerchunk, l)) { -- GameProfilerFiller gameprofilerfiller = this.world.getMethodProfiler(); -+ //GameProfilerFiller gameprofilerfiller = this.world.getMethodProfiler(); // Akarin - remove caller + GameProfilerFiller gameprofilerfiller = this.world.getMethodProfiler(); - gameprofilerfiller.enter("chunkLoad"); + //gameprofilerfiller.enter("chunkLoad"); // Akarin - remove caller @@ -227,15 +221,11 @@ index 2d512aa4f9ab74dfadff748ba6dd72631eda9fe5..98c8f90a00d27cdb24e2fd972c3e75e4 return b0; diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java -index ee42e1dfa493c3d7f5af8cc7b8e17e80fcb32b71..ccc9440947fd9e0d01daa92cf03f24c2ed865005 100644 +index ee42e1dfa493c3d7f5af8cc7b8e17e80fcb32b71..f7492750726351f2f2e313f1f3bcce9e3bd4e121 100644 --- a/src/main/java/net/minecraft/server/CustomFunctionData.java +++ b/src/main/java/net/minecraft/server/CustomFunctionData.java -@@ -58,10 +58,10 @@ public class CustomFunctionData implements IResourcePackListener { - } - - public void tick() { -- GameProfiler gameprofiler = this.server.getMethodProfiler(); -+ //GameProfiler gameprofiler = this.server.getMethodProfiler(); // Akarin - remove caller +@@ -61,7 +61,7 @@ public class CustomFunctionData implements IResourcePackListener { + GameProfiler gameprofiler = this.server.getMethodProfiler(); MinecraftKey minecraftkey = CustomFunctionData.d; - gameprofiler.a(minecraftkey::toString); @@ -253,8 +243,7 @@ index ee42e1dfa493c3d7f5af8cc7b8e17e80fcb32b71..ccc9440947fd9e0d01daa92cf03f24c2 this.m = false; Collection collection = this.h().b(CustomFunctionData.e).a(); -- gameprofiler = this.server.getMethodProfiler(); -+ //gameprofiler = this.server.getMethodProfiler(); // Akarin - remove caller + gameprofiler = this.server.getMethodProfiler(); minecraftkey = CustomFunctionData.e; - gameprofiler.a(minecraftkey::toString); + //gameprofiler.a(minecraftkey::toString); // Akarin - remove caller @@ -662,7 +651,7 @@ index 2552f860ff7a25f74e9a0600e58cefe064fac484..00b70d7447e0db11c09f3b751e089ea0 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 2cb12e02e836f34ed80e93d4426bd994146e26c8..06e1f6a0d7ee6b4119a4801ae298baaee1d2da3b 100644 +index 2cb12e02e836f34ed80e93d4426bd994146e26c8..5b8092be7540362bc8c893f314ea230d333e46e7 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -965,15 +965,15 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 0; // Paper - TileEntityHopper.skipHopperEvents = worldserver.paperConfig.disableHopperMoveEvents || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper - if (true || worldserver.worldProvider.getDimensionManager() == DimensionManager.OVERWORLD || this.getAllowNether()) { // CraftBukkit -- this.methodProfiler.a(() -> { -+ java.util.function.Supplier pleaseRemoveMe = (() -> { // Akarin - remove caller - return worldserver.getWorldData().getName() + " " + IRegistry.DIMENSION_TYPE.getKey(worldserver.worldProvider.getDimensionManager()); +@@ -1376,13 +1376,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant getExecutingGoals() {return c();} // Paper - OBFHELPER diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 34ec3b9d702fd865cf733c5608f11c927b3d6c68..4affa47c290d68d755759d2b96b46eb716515169 100644 +index 34ec3b9d702fd865cf733c5608f11c927b3d6c68..0b2209551ff369e8e189e0b017b4ac55091e87d8 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java -@@ -891,20 +891,20 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { - private static final double UNLOAD_QUEUE_RESIZE_FACTOR = 0.90; // Spigot // Paper - unload more - - protected void unloadChunks(BooleanSupplier booleansupplier) { -- GameProfilerFiller gameprofilerfiller = this.world.getMethodProfiler(); -+ //GameProfilerFiller gameprofilerfiller = this.world.getMethodProfiler(); // Akarin - remove caller +@@ -894,17 +894,17 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { + GameProfilerFiller gameprofilerfiller = this.world.getMethodProfiler(); try (Timing ignored = this.world.timings.poiUnload.startTiming()) { // Paper - gameprofilerfiller.enter("poi"); @@ -989,7 +968,7 @@ index 3f1aa5ced697490b5481ba992cf5af5dc98b8166..af705e6c650b529c18bdd8f0c063a71c this.h.clear(); this.g.clear(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 655e0b5e52e22a1ac1ff3718ad5ab3ab61ef7e41..665e7352d7b1f495f0d7cc4b3892382238b78ad7 100644 +index 655e0b5e52e22a1ac1ff3718ad5ab3ab61ef7e41..ec57cd1811bad25dec43515509d6a97f286d55b3 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -411,9 +411,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -1004,27 +983,15 @@ index 655e0b5e52e22a1ac1ff3718ad5ab3ab61ef7e41..665e7352d7b1f495f0d7cc4b38923822 } /* -@@ -781,9 +781,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable { - } - +@@ -783,7 +783,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { public void tickBlockEntities() { -- GameProfilerFiller gameprofilerfiller = this.getMethodProfiler(); -+ //GameProfilerFiller gameprofilerfiller = this.getMethodProfiler(); // Akarin - remove caller + GameProfilerFiller gameprofilerfiller = this.getMethodProfiler(); - gameprofilerfiller.enter("blockEntities"); + //gameprofilerfiller.enter("blockEntities"); // Akarin - remove caller timings.tileEntityTick.startTiming(); // Spigot if (!this.tileEntityListUnload.isEmpty()) { // Paper start - Use alternate implementation with faster contains -@@ -816,7 +816,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { - - if (this.chunkProvider.a(blockposition) && this.getWorldBorder().a(blockposition)) { - try { -- gameprofilerfiller.a(() -> { -+ /*gameprofilerfiller.a*/java.util.function.Supplier pleaseRemoveMe = (() -> { // Akarin - remove caller - return String.valueOf(TileEntityTypes.a(tileentity.getTileType())); - }); - tileentity.tickTimer.startTiming(); // Spigot @@ -826,7 +826,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { tileentity.v(); } @@ -1089,15 +1056,11 @@ index 655e0b5e52e22a1ac1ff3718ad5ab3ab61ef7e41..665e7352d7b1f495f0d7cc4b38923822 int j = MathHelper.f((axisalignedbb.maxX + 2.0D) / 16.0D); int k = MathHelper.floor((axisalignedbb.minZ - 2.0D) / 16.0D); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 24cd10c960a5460aef769d2937d02e7921dec9ce..1a6fa98a79910c74f121ca844424b3df0ab2e20a 100644 +index 24cd10c960a5460aef769d2937d02e7921dec9ce..9b4c77eff1e0a98c709591f45a24fc02837cf9bd 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -727,12 +727,12 @@ public class WorldServer extends World { - } - - public void doTick(BooleanSupplier booleansupplier) { -- GameProfilerFiller gameprofilerfiller = this.getMethodProfiler(); -+ //GameProfilerFiller gameprofilerfiller = this.getMethodProfiler(); // Akarin - remove caller +@@ -730,9 +730,9 @@ public class WorldServer extends World { + GameProfilerFiller gameprofilerfiller = this.getMethodProfiler(); this.ticking = true; - gameprofilerfiller.enter("world border"); @@ -1221,12 +1184,9 @@ index 24cd10c960a5460aef769d2937d02e7921dec9ce..1a6fa98a79910c74f121ca844424b3df } private void wakeupPlayers() { -@@ -1026,9 +1026,9 @@ public class WorldServer extends World { - boolean flag = this.isRaining(); - int j = chunkcoordintpair.d(); +@@ -1028,7 +1028,7 @@ public class WorldServer extends World { int k = chunkcoordintpair.e(); -- GameProfilerFiller gameprofilerfiller = this.getMethodProfiler(); -+ //GameProfilerFiller gameprofilerfiller = this.getMethodProfiler(); // Akarin - remove caller + GameProfilerFiller gameprofilerfiller = this.getMethodProfiler(); - gameprofilerfiller.enter("thunder"); + //gameprofilerfiller.enter("thunder"); // Akarin - remove caller @@ -1263,15 +1223,8 @@ index 24cd10c960a5460aef769d2937d02e7921dec9ce..1a6fa98a79910c74f121ca844424b3df timings.chunkTicksBlocks.stopTiming(); // Paper getChunkProvider().getLightEngine().queueUpdate(); // Paper // Paper end -@@ -1255,15 +1255,15 @@ public class WorldServer extends World { - entity.lastPitch = entity.pitch; - if (entity.inChunk) { - ++entity.ticksLived; -- GameProfilerFiller gameprofilerfiller = this.getMethodProfiler(); -+ //GameProfilerFiller gameprofilerfiller = this.getMethodProfiler(); // Akarin - remove caller - -- gameprofilerfiller.a(() -> { -+ /*gameprofilerfiller.a*/java.util.function.Supplier pleaseRemoveMe = (() -> { // Akarin - remove caller +@@ -1260,10 +1260,10 @@ public class WorldServer extends World { + gameprofilerfiller.a(() -> { return IRegistry.ENTITY_TYPE.getKey(entity.getEntityType()).toString(); }); - gameprofilerfiller.c("tickNonPassenger"); @@ -1283,15 +1236,8 @@ index 24cd10c960a5460aef769d2937d02e7921dec9ce..1a6fa98a79910c74f121ca844424b3df } this.chunkCheck(entity); -@@ -1296,14 +1296,14 @@ public class WorldServer extends World { - entity1.lastPitch = entity1.pitch; - if (entity1.inChunk) { - ++entity1.ticksLived; -- GameProfilerFiller gameprofilerfiller = this.getMethodProfiler(); -+ //GameProfilerFiller gameprofilerfiller = this.getMethodProfiler(); // Akarin - remove caller - -- gameprofilerfiller.a(() -> { -+ /*gameprofilerfiller.a*/java.util.function.Supplier pleaseRemoveMe = (() -> { // Akarin - remove caller +@@ -1301,9 +1301,9 @@ public class WorldServer extends World { + gameprofilerfiller.a(() -> { return IRegistry.ENTITY_TYPE.getKey(entity1.getEntityType()).toString(); }); - gameprofilerfiller.c("tickPassenger"); diff --git a/patches/server/0019-Remove-Streams-using-IntelliJ-IDEA.patch b/patches/server/0019-Remove-Streams-using-IntelliJ-IDEA.patch index f6e3c23ef..834976013 100644 --- a/patches/server/0019-Remove-Streams-using-IntelliJ-IDEA.patch +++ b/patches/server/0019-Remove-Streams-using-IntelliJ-IDEA.patch @@ -1491,7 +1491,7 @@ index 973bdd25ca45ee6a11803e3abb8c0ff22d658554..b20a4a0edb5f5958361cc4c12bee0584 private MCUtil() {} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 06e1f6a0d7ee6b4119a4801ae298baaee1d2da3b..7831f1d87df7cc19e1cc428a894dbee43c0e3208 100644 +index 5b8092be7540362bc8c893f314ea230d333e46e7..eb47c17a50841d07eadb41eeb21b6bc23f143d18 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -473,7 +473,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant> { @@ -1665,7 +1665,7 @@ index 44d6f2debc767cb0576b17ed3e0711baa4361001..e7bfefafb70df7cca594db433a83e73e // Paper end this.oldTicketLevel = this.ticketLevel; diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 4affa47c290d68d755759d2b96b46eb716515169..89e510c3fa06d33bfae457988d4f4f9b4b9a6c9e 100644 +index 0b2209551ff369e8e189e0b017b4ac55091e87d8..3140ac452e7acda8a21fee9d000e43cbd19dd4a7 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -474,53 +474,53 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -2352,7 +2352,7 @@ index 2f1be1995d1a188da5be792abd7ac6f126332f49..bae3f216d056cb64fde49e4ca592631e private boolean shouldUseVanillaMap() { return mapView.getRenderers().size() == 1 && mapView.getRenderers().get(0).getClass() == org.bukkit.craftbukkit.map.CraftMapRenderer.class; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 1a6fa98a79910c74f121ca844424b3df0ab2e20a..cbfe1550c701c457628470cb9d46864763ccb5e9 100644 +index 9b4c77eff1e0a98c709591f45a24fc02837cf9bd..096590141fe3f162c9d5fe53b71ec53abff1d4e6 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -22,15 +22,7 @@ import java.io.BufferedWriter;