aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/1003-Remove-streams-from-hot-code.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/1003-Remove-streams-from-hot-code.patch')
-rw-r--r--patches/server/1003-Remove-streams-from-hot-code.patch129
1 files changed, 50 insertions, 79 deletions
diff --git a/patches/server/1003-Remove-streams-from-hot-code.patch b/patches/server/1003-Remove-streams-from-hot-code.patch
index 75a38173c7..8e8133d2b2 100644
--- a/patches/server/1003-Remove-streams-from-hot-code.patch
+++ b/patches/server/1003-Remove-streams-from-hot-code.patch
@@ -7,10 +7,10 @@ Co-authored-by: Bjarne Koll <[email protected]>
Co-authored-by: Spottedleaf <[email protected]>
diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java b/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java
-index 4b31a91a8d8a3b231e323692d0a0f7ae04dc7e89..79e7a7adf9f9d8b9fee7ae3bb3bebab86fa7fd72 100644
+index 5ca112631cce775c609950d3540059f54033fd3e..5e13c5d7534397b902889b8dde9037da114b1039 100644
--- a/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java
+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java
-@@ -52,7 +52,7 @@ public class GateBehavior<E extends LivingEntity> implements BehaviorControl<E>
+@@ -57,7 +57,7 @@ public class GateBehavior<E extends LivingEntity> implements BehaviorControl<E>
if (this.hasRequiredMemories(entity)) {
this.status = Behavior.Status.RUNNING;
this.orderPolicy.apply(this.behaviors);
@@ -19,15 +19,11 @@ index 4b31a91a8d8a3b231e323692d0a0f7ae04dc7e89..79e7a7adf9f9d8b9fee7ae3bb3bebab8
return true;
} else {
return false;
-@@ -61,11 +61,13 @@ public class GateBehavior<E extends LivingEntity> implements BehaviorControl<E>
+@@ -66,7 +66,13 @@ public class GateBehavior<E extends LivingEntity> implements BehaviorControl<E>
@Override
public final void tickOrStop(ServerLevel world, E entity, long time) {
-- this.behaviors.stream().filter((task) -> {
-- return task.getStatus() == Behavior.Status.RUNNING;
-- }).forEach((task) -> {
-- task.tickOrStop(world, entity, time);
-- });
+- this.behaviors.stream().filter(task -> task.getStatus() == Behavior.Status.RUNNING).forEach(task -> task.tickOrStop(world, entity, time));
+ // Paper start - Perf: Remove streams from hot code
+ for (final BehaviorControl<? super E> task : this.behaviors) {
+ if (task.getStatus() == Behavior.Status.RUNNING) {
@@ -35,18 +31,14 @@ index 4b31a91a8d8a3b231e323692d0a0f7ae04dc7e89..79e7a7adf9f9d8b9fee7ae3bb3bebab8
+ }
+ }
+ // Paper end - Perf: Remove streams from hot code
- if (this.behaviors.stream().noneMatch((task) -> {
- return task.getStatus() == Behavior.Status.RUNNING;
- })) {
-@@ -77,12 +79,16 @@ public class GateBehavior<E extends LivingEntity> implements BehaviorControl<E>
+ if (this.behaviors.stream().noneMatch(task -> task.getStatus() == Behavior.Status.RUNNING)) {
+ this.doStop(world, entity, time);
+ }
+@@ -75,8 +81,16 @@ public class GateBehavior<E extends LivingEntity> implements BehaviorControl<E>
@Override
public final void doStop(ServerLevel world, E entity, long time) {
this.status = Behavior.Status.STOPPED;
-- this.behaviors.stream().filter((task) -> {
-- return task.getStatus() == Behavior.Status.RUNNING;
-- }).forEach((task) -> {
-- task.doStop(world, entity, time);
-- });
+- this.behaviors.stream().filter(task -> task.getStatus() == Behavior.Status.RUNNING).forEach(task -> task.doStop(world, entity, time));
- this.exitErasedMemories.forEach(entity.getBrain()::eraseMemory);
+ // Paper start - Perf: Remove streams from hot code
+ for (final BehaviorControl<? super E> task : this.behaviors) {
@@ -61,18 +53,14 @@ index 4b31a91a8d8a3b231e323692d0a0f7ae04dc7e89..79e7a7adf9f9d8b9fee7ae3bb3bebab8
}
@Override
-@@ -116,26 +122,30 @@ public class GateBehavior<E extends LivingEntity> implements BehaviorControl<E>
+@@ -111,18 +125,30 @@ public class GateBehavior<E extends LivingEntity> implements BehaviorControl<E>
public static enum RunningPolicy {
RUN_ONE {
+ // Paper start - Perf: Remove streams from hot code
@Override
- public <E extends LivingEntity> void apply(Stream<BehaviorControl<? super E>> tasks, ServerLevel world, E entity, long time) {
-- tasks.filter((task) -> {
-- return task.getStatus() == Behavior.Status.STOPPED;
-- }).filter((task) -> {
-- return task.tryStart(world, entity, time);
-- }).findFirst();
+- tasks.filter(task -> task.getStatus() == Behavior.Status.STOPPED).filter(task -> task.tryStart(world, entity, time)).findFirst();
+ public <E extends LivingEntity> void apply(ShufflingList<BehaviorControl<? super E>> tasks, ServerLevel world, E entity, long time) {
+ for (final BehaviorControl<? super E> task : tasks) {
+ if (task.getStatus() == Behavior.Status.STOPPED && task.tryStart(world, entity, time)) {
@@ -86,11 +74,7 @@ index 4b31a91a8d8a3b231e323692d0a0f7ae04dc7e89..79e7a7adf9f9d8b9fee7ae3bb3bebab8
+ // Paper start - Perf: Remove streams from hot code
@Override
- public <E extends LivingEntity> void apply(Stream<BehaviorControl<? super E>> tasks, ServerLevel world, E entity, long time) {
-- tasks.filter((task) -> {
-- return task.getStatus() == Behavior.Status.STOPPED;
-- }).forEach((task) -> {
-- task.tryStart(world, entity, time);
-- });
+- tasks.filter(task -> task.getStatus() == Behavior.Status.STOPPED).forEach(task -> task.tryStart(world, entity, time));
+ public <E extends LivingEntity> void apply(ShufflingList<BehaviorControl<? super E>> tasks, ServerLevel world, E entity, long time) {
+ for (final BehaviorControl<? super E> task : tasks) {
+ if (task.getStatus() == Behavior.Status.STOPPED) {
@@ -106,11 +90,11 @@ index 4b31a91a8d8a3b231e323692d0a0f7ae04dc7e89..79e7a7adf9f9d8b9fee7ae3bb3bebab8
}
}
diff --git a/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java b/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java
-index f1e717dc8320a00c0cc0ff53d97b74e7c1e109fe..2240fc6d5ba9530fcd62d6b560c17a275d4f164a 100644
+index aa32804bc9affe9a615d3ffaa513f6f09aab3f32..c7f012674361a323c1efeca4660cd3f46d308ee1 100644
--- a/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java
+++ b/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java
-@@ -61,8 +61,22 @@ public class GossipContainer {
- });
+@@ -59,8 +59,22 @@ public class GossipContainer {
+ return this.gossips.entrySet().stream().flatMap(entry -> entry.getValue().unpack(entry.getKey()));
}
+ // Paper start - Perf: Remove streams from hot code
@@ -133,24 +117,25 @@ index f1e717dc8320a00c0cc0ff53d97b74e7c1e109fe..2240fc6d5ba9530fcd62d6b560c17a27
if (list.isEmpty()) {
return Collections.emptyList();
} else {
-@@ -156,7 +170,7 @@ public class GossipContainer {
- }
+@@ -145,7 +159,7 @@ public class GossipContainer {
public <T> T store(DynamicOps<T> ops) {
-- return GossipContainer.GossipEntry.LIST_CODEC.encodeStart(ops, this.unpack().toList()).resultOrPartial((error) -> {
-+ return GossipContainer.GossipEntry.LIST_CODEC.encodeStart(ops, this.decompress()).resultOrPartial((error) -> { // Paper - Perf: Remove streams from hot code
- LOGGER.warn("Failed to serialize gossips: {}", (Object)error);
- }).orElseGet(ops::emptyList);
+ return GossipContainer.GossipEntry.LIST_CODEC
+- .encodeStart(ops, this.unpack().toList())
++ .encodeStart(ops, this.decompress()) // Paper - Perf: Remove streams from hot code
+ .resultOrPartial(error -> LOGGER.warn("Failed to serialize gossips: {}", error))
+ .orElseGet(ops::emptyList);
}
-@@ -184,11 +198,23 @@ public class GossipContainer {
+@@ -172,12 +186,23 @@ public class GossipContainer {
final Object2IntMap<GossipType> entries = new Object2IntOpenHashMap<>();
public int weightedValue(Predicate<GossipType> gossipTypeFilter) {
-- return this.entries.object2IntEntrySet().stream().filter((entry) -> {
-- return gossipTypeFilter.test(entry.getKey());
-- }).mapToInt((entry) -> {
-- return entry.getIntValue() * (entry.getKey()).weight;
-- }).sum();
+- return this.entries
+- .object2IntEntrySet()
+- .stream()
+- .filter(entry -> gossipTypeFilter.test(entry.getKey()))
+- .mapToInt(entry -> entry.getIntValue() * entry.getKey().weight)
+- .sum();
+ // Paper start - Perf: Remove streams from hot code
+ int weight = 0;
+ for (Object2IntMap.Entry<GossipType> entry : entries.object2IntEntrySet()) {
@@ -172,22 +157,21 @@ index f1e717dc8320a00c0cc0ff53d97b74e7c1e109fe..2240fc6d5ba9530fcd62d6b560c17a27
public Stream<GossipContainer.GossipEntry> unpack(UUID target) {
diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java
-index a41c3365db8e9999b686f5bf4bd888458cee43a5..18e2fd705fe0db7cb9e3afe1ce7c8dcfaf93b1a5 100644
+index 28fd073ddad358e087e8c78985a97cad21be81b7..a5bd308d1b3ea5db185c06a287167d1d8894a987 100644
--- a/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java
+++ b/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java
-@@ -25,14 +25,18 @@ public class NearestItemSensor extends Sensor<Mob> {
+@@ -24,13 +24,17 @@ public class NearestItemSensor extends Sensor<Mob> {
+ @Override
protected void doTick(ServerLevel world, Mob entity) {
Brain<?> brain = entity.getBrain();
- List<ItemEntity> list = world.getEntitiesOfClass(ItemEntity.class, entity.getBoundingBox().inflate(32.0D, 16.0D, 32.0D), (itemEntity) -> {
-- return true;
-+ return itemEntity.closerThan(entity, MAX_DISTANCE_TO_WANTED_ITEM) && entity.wantsToPickUp(itemEntity.getItem()); // Paper - Perf: Move predicate into getEntities
- });
+- List<ItemEntity> list = world.getEntitiesOfClass(ItemEntity.class, entity.getBoundingBox().inflate(32.0, 16.0, 32.0), itemEntity -> true);
++ List<ItemEntity> list = world.getEntitiesOfClass(ItemEntity.class, entity.getBoundingBox().inflate(32.0, 16.0, 32.0), itemEntity -> itemEntity.closerThan(entity, MAX_DISTANCE_TO_WANTED_ITEM) && entity.wantsToPickUp(itemEntity.getItem())); // Paper - Perf: Move predicate into getEntities
list.sort(Comparator.comparingDouble(entity::distanceToSqr));
-- Optional<ItemEntity> optional = list.stream().filter((itemEntity) -> {
-- return entity.wantsToPickUp(itemEntity.getItem());
-- }).filter((itemEntity) -> {
-- return itemEntity.closerThan(entity, 32.0D);
-- }).filter(entity::hasLineOfSight).findFirst();
+- Optional<ItemEntity> optional = list.stream()
+- .filter(itemEntity -> entity.wantsToPickUp(itemEntity.getItem()))
+- .filter(itemEntity -> itemEntity.closerThan(entity, 32.0))
+- .filter(entity::hasLineOfSight)
+- .findFirst();
- brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM, optional);
+ // Paper start - Perf: remove streams from hot code
+ ItemEntity nearest = null;
@@ -202,42 +186,29 @@ index a41c3365db8e9999b686f5bf4bd888458cee43a5..18e2fd705fe0db7cb9e3afe1ce7c8dcf
}
}
diff --git a/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java b/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java
-index bb8d8edb47621665872a5e8fc01512ba40c1b913..dcb62d768d234f60af77ffb589ac2011afcfae4b 100644
+index 14d3f57fa796776e372cfe722471cdf8d4166b44..7cd8e444cd33a0995eda56e3be931780c3f501d9 100644
--- a/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java
+++ b/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java
-@@ -36,9 +36,10 @@ public class Beardifier implements DensityFunctions.BeardifierOrMarker {
+@@ -35,9 +35,10 @@ public class Beardifier implements DensityFunctions.BeardifierOrMarker {
int j = pos.getMinBlockZ();
ObjectList<Beardifier.Rigid> objectList = new ObjectArrayList<>(10);
ObjectList<JigsawJunction> objectList2 = new ObjectArrayList<>(32);
-- world.startsForStructure(pos, (structure) -> {
+- world.startsForStructure(pos, structure -> structure.terrainAdaptation() != TerrainAdjustment.NONE)
+- .forEach(
+- start -> {
+ // Paper start - Perf: Remove streams from hot code
+ for (net.minecraft.world.level.levelgen.structure.StructureStart start : world.startsForStructure(pos, (structure) -> {
- return structure.terrainAdaptation() != TerrainAdjustment.NONE;
-- }).forEach((start) -> {
++ return structure.terrainAdaptation() != TerrainAdjustment.NONE;
+ })) { // Paper end - Perf: Remove streams from hot code
- TerrainAdjustment terrainAdjustment = start.getStructure().terrainAdaptation();
+ TerrainAdjustment terrainAdjustment = start.getStructure().terrainAdaptation();
- for(StructurePiece structurePiece : start.getPieces()) {
-@@ -51,9 +52,11 @@ public class Beardifier implements DensityFunctions.BeardifierOrMarker {
- }
-
- for(JigsawJunction jigsawJunction : poolElementStructurePiece.getJunctions()) {
-- int i = jigsawJunction.getSourceX();
-- int j = jigsawJunction.getSourceZ();
-- if (i > i - 12 && j > j - 12 && i < i + 15 + 12 && j < j + 15 + 12) {
-+ // Paper start - decompile fix
-+ int i2 = jigsawJunction.getSourceX();
-+ int j2 = jigsawJunction.getSourceZ();
-+ if (i2 > i - 12 && j2 > j - 12 && i2 < i + 15 + 12 && j2 < j + 15 + 12) {
-+ // Paper end - decompile fix
- objectList2.add(jigsawJunction);
+ for (StructurePiece structurePiece : start.getPieces()) {
+@@ -65,8 +66,7 @@ public class Beardifier implements DensityFunctions.BeardifierOrMarker {
}
}
-@@ -63,7 +66,7 @@ public class Beardifier implements DensityFunctions.BeardifierOrMarker {
- }
- }
-
-- });
+ }
+- }
+- );
+ } // Paper - Perf: Remove streams from hot code
return new Beardifier(objectList.iterator(), objectList2.iterator());
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 16:08:56 +0000