Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Fully remove callers of vanilla profiler

Browse Source
This commit is contained in:
Sotr
2020-04-15 23:18:38 +07:00
parent 08d2f7a357
commit 9a3a5c67f3
12 changed files with 734 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

847
patches/server/0011-Remove-vanilla-profiler-callers.patch
View File

File diff suppressed because it is too large Load Diff

14
patches/server/0012-Asynchronous-pathfinding.patch
View File

@@ -1,4 +1,4 @@
From 47d6741745087c605a3a8f9f36475e6912ef3269 Mon Sep 17 00:00:00 2001
From 30738f8b0d7113418335b1e1cf760993ac495af1 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?=
<tsao-chi@the-lingo.org>
Date: Sun, 5 Apr 2020 13:01:13 +0800
@@ -6,17 +6,17 @@ Subject: [PATCH] Asynchronous pathfinding
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index e9f00a1e13..72fa93d75f 100644
index bb20398abc..cd8b462866 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -686,7 +686,7 @@ public abstract class EntityInsentient extends EntityLiving {
this.goalSelector.doTick();
//this.world.getMethodProfiler().exit(); // Akarin - remove caller
//this.world.getMethodProfiler().enter("navigation"); // Akarin - remove caller
// this.world.getMethodProfiler().exit(); // Akarin - remove caller
// this.world.getMethodProfiler().enter("navigation"); // Akarin - remove caller
- this.navigation.c();
+ this.navigation.tickAsync(); // Akarin - Async pathfinder
//this.world.getMethodProfiler().exit(); // Akarin - remove caller
//this.world.getMethodProfiler().enter("mob tick"); // Akarin - remove caller
// this.world.getMethodProfiler().exit(); // Akarin - remove caller
// this.world.getMethodProfiler().enter("mob tick"); // Akarin - remove caller
this.mobTick();
diff --git a/src/main/java/net/minecraft/server/Navigation.java b/src/main/java/net/minecraft/server/Navigation.java
index abf450917e..4f7f40d5e7 100644
@@ -32,7 +32,7 @@ index abf450917e..4f7f40d5e7 100644
if (pathtype == PathType.WATER) {
return false;
diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
index b763d7f37e..7f061ec1d8 100644
index cd8a631d7d..c134a96080 100644
--- a/src/main/java/net/minecraft/server/NavigationAbstract.java
+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
@@ -29,6 +29,15 @@ public abstract class NavigationAbstract {

4
patches/server/0013-Optimizations-for-network.patch
View File

@@ -1,4 +1,4 @@
From 2abe117f02389d2add1b31e7112924b4c636e36a Mon Sep 17 00:00:00 2001
From df50e4a222bdb9e05540ded0cd4b234bfb928346 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?=
<tsao-chi@the-lingo.org>
Date: Sun, 5 Apr 2020 14:59:10 +0800
@@ -361,7 +361,7 @@ index 50d5fb62ef..4da7a2c1a4 100644
+ // Akarin end
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index e1225d5017..3d03976203 100644
index 6dfbbc67dd..b23612817b 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -284,9 +284,9 @@ public class PlayerConnection implements PacketListenerPlayIn {

4
patches/server/0014-Swaps-the-predicate-order-of-collision.patch
View File

@@ -1,4 +1,4 @@
From 1177c075f73dc22b1cf6e469943399ca82ed2043 Mon Sep 17 00:00:00 2001
From e56809d3744900d2ce7713bd85fa27c579012fe2 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?=
<tsao-chi@the-lingo.org>
Date: Fri, 10 Apr 2020 15:47:15 +0800
@@ -6,7 +6,7 @@ Subject: [PATCH] Swaps the predicate order of collision
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 34aac60312..3de2d40a4d 100644
index b290f64fa1..fb21da032a 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1403,8 +1403,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

2
patches/server/0015-Tuinity-Use-ArrayDeque-for-pendingChunkUpdates-in-Ch.patch
View File

@@ -1,4 +1,4 @@
From f1f04b873cb66c439078daafc39633701e6b5da2 Mon Sep 17 00:00:00 2001
From 288f2d57f03c7df5db25dfb5d8bcc2854fe4ccec Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 02:39:12 +0700
Subject: [PATCH] Tuinity Use ArrayDeque for pendingChunkUpdates in

2
patches/server/0016-Tuinity-Optimise-ArraySetSorted-removeIf.patch
View File

@@ -1,4 +1,4 @@
From b57ae569df4d5aa81dd8ff0ed82c99b213782d76 Mon Sep 17 00:00:00 2001
From d97f27a2084582eab975e002242f7bceb095ba4c Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 02:44:07 +0700
Subject: [PATCH] Tuinity Optimise ArraySetSorted#removeIf

4
patches/server/0017-Don-t-run-entity-collision-code-if-not-needed.patch
View File

@@ -1,4 +1,4 @@
From 98d9d6f8c907c2dfbbc41f46431e7a7f641c95cf Mon Sep 17 00:00:00 2001
From 8d0da081e7bad951b56e04ddfced912e249fa013 Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 02:49:56 +0700
Subject: [PATCH] Don't run entity collision code if not needed
@@ -9,7 +9,7 @@ the max collisions per entity is less than or equal to 0
This commit was basically referenced on Tuinity#7131da4.
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index e93b7b2809..3beeb05b14 100644
index 2848268979..c1c7e7dca3 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2663,10 +2663,16 @@ public abstract class EntityLiving extends Entity {

2
patches/server/0018-Optimize-door-interact-with-pathfinding.patch
View File

@@ -1,4 +1,4 @@
From 3d244bbf77d894086740106726c99f3e7e0dcdf1 Mon Sep 17 00:00:00 2001
From c959fdcaf470d05e81517b7260c02659c3e4073b Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 03:51:50 +0700
Subject: [PATCH] Optimize door interact with pathfinding

4
patches/server/0019-Remove-stream-for-ender-teleport.patch
View File

@@ -1,11 +1,11 @@
From 29faf80a84d84dc29d1634b65ac30aa7cf5b254c Mon Sep 17 00:00:00 2001
From 682855a87bed94aed02a2e045060798cec7d2dfe Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 04:16:44 +0700
Subject: [PATCH] Remove stream for ender teleport
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 3de2d40a4d..c31bed6ac2 100644
index fb21da032a..6b43c41a85 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2842,7 +2842,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

2
patches/server/0020-Cache-Hashcode-for-BlockPosition.patch
View File

@@ -1,4 +1,4 @@
From a11885fc836b82d7814b94906226ad667a277af9 Mon Sep 17 00:00:00 2001
From 754e622d4aebdb21a62c61f83f7d0bfa9c2453f3 Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 04:28:25 +0700
Subject: [PATCH] Cache hashcode for BlockPosition

2
patches/server/0021-Remove-stream-and-simplify-operation-in-pathfinder.patch
View File

@@ -1,4 +1,4 @@
From 7b73ac0a5b62071f1a2a074ead1000b7ec2c1188 Mon Sep 17 00:00:00 2001
From 3298bf1cfdfd166ea4e3e0672aec5c0abf400ca2 Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 17:49:07 +0700
Subject: [PATCH] Remove stream and simplify operation in pathfinder

4
patches/server/0022-Remove-a-few-more-streams.patch
View File

@@ -1,4 +1,4 @@
From 1433da3521eaebe0be0549b9d2552841686c113d Mon Sep 17 00:00:00 2001
From 6c78e211340d417d966f0ac836db8fac179b93f4 Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 22:45:48 +0700
Subject: [PATCH] Remove a few more streams
@@ -76,7 +76,7 @@ index 9c31edade2..eb3f45d8b7 100644
}
// Paper end
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 9d94aa135e..5fda06edbd 100644
index a7a07ffc43..c9f0f7787f 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -548,11 +548,20 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation