mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2026-01-04 15:41:40 +00:00
387597f347
Upstream has released updates that appear to apply and compile correctly Leaves Changes: LeavesMC/Leaves@88819fe8 Add mc-old hopper suck-in behavior (#395) LeavesMC/Leaves@7394e8dd Fix papermc repo LeavesMC/Leaves@85c7bf11 Remove cache-world-generator-sea-level (#392) LeavesMC/Leaves@00798036 init 1.21.4, and boom! LeavesMC/Leaves@91fc24da build change, but weight not work LeavesMC/Leaves@4ccdf459 just work LeavesMC/Leaves@05ee2e36 Build changes, and delete timings LeavesMC/Leaves@fcc859dc Fix API patches (#406) LeavesMC/Leaves@6a1259df 0006/0129 LeavesMC/Leaves@3e3b05df 0009/0129 LeavesMC/Leaves@c3255c4f 0011/0129 LeavesMC/Leaves@6284c7b6 0018/0129 LeavesMC/Leaves@7abdc88c 0030/0129 LeavesMC/Leaves@4d119ff9 0035/0129 LeavesMC/Leaves@60baed99 0043/0129 LeavesMC/Leaves@dc319d5b 0048/0129 LeavesMC/Leaves@73a505d5 0049/0129 LeavesMC/Leaves@016b29dd 0057/0129 LeavesMC/Leaves@c9cf5af8 0065/0129 LeavesMC/Leaves@330b79ff 0086/0129 (#408) LeavesMC/Leaves@06c1d946 0087/0129 LeavesMC/Leaves@bf4bc284 0091/0129 LeavesMC/Leaves@102a3b70 0097/0129 LeavesMC/Leaves@53b43fed 0101/0129 LeavesMC/Leaves@892f3925 102/129 LeavesMC/Leaves@08c3043a 0107/0129 LeavesMC/Leaves@48764d8e 0112/0129 LeavesMC/Leaves@8380feff 0118/0129 LeavesMC/Leaves@e51603db 0129/0129, 100% patched LeavesMC/Leaves@ef851152 fix some LeavesMC/Leaves@9b7c6e88 server work LeavesMC/Leaves@272b7dcb Protocol... (#409) LeavesMC/Leaves@7be1bc97 Make jade better LeavesMC/Leaves@5350f6ea Make action work LeavesMC/Leaves@f07c26c8 fix action jar
66 lines
3.7 KiB
Diff
66 lines
3.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
|
|
Date: Tue, 26 Nov 2024 17:15:38 -0500
|
|
Subject: [PATCH] Cache part of canHoldFluid result
|
|
|
|
Cache the result of part of canHoldFluid logic, since there are many state#is in canAnyHoldFluid method,
|
|
it uses map contains to do iteration to check whether a block has a specific block tag key,
|
|
which the contains iteration call is very expensive if called everytime
|
|
|
|
In the test, it can improve ~30% performance in ~1577000 times of canHoldAnyFluid calls (~159ms -> ~111ms)
|
|
|
|
diff --git a/net/minecraft/world/level/block/state/BlockBehaviour.java b/net/minecraft/world/level/block/state/BlockBehaviour.java
|
|
index 7f46f33fa565fa1a3aedce5524f19be8ba420352..d35211b0cae66b1a40e89539507e55973313f46f 100644
|
|
--- a/net/minecraft/world/level/block/state/BlockBehaviour.java
|
|
+++ b/net/minecraft/world/level/block/state/BlockBehaviour.java
|
|
@@ -454,6 +454,8 @@ public abstract class BlockBehaviour implements FeatureElement {
|
|
private VoxelShape[] occlusionShapesByFace;
|
|
private boolean propagatesSkylightDown;
|
|
private int lightBlock;
|
|
+ private boolean canHoldAnyFluidInternal; // Leaf - Cache part of canHoldFluid result
|
|
+ private boolean canHoldAnyFluidInternalInit; // Leaf - Cache part of canHoldFluid result
|
|
|
|
// Paper start - rewrite chunk system
|
|
private boolean isConditionallyFullOpaque;
|
|
@@ -603,6 +605,8 @@ public abstract class BlockBehaviour implements FeatureElement {
|
|
|
|
this.propagatesSkylightDown = this.owner.propagatesSkylightDown(this.asState());
|
|
this.lightBlock = this.owner.getLightBlock(this.asState());
|
|
+ this.canHoldAnyFluidInternal = false; // Leaf - Cache part of canHoldFluid result
|
|
+ this.canHoldAnyFluidInternalInit = false; // Leaf - Cache part of canHoldFluid result
|
|
// Paper start - rewrite chunk system
|
|
this.isConditionallyFullOpaque = this.canOcclude & this.useShapeForLightOcclusion;
|
|
// Paper end - rewrite chunk system
|
|
@@ -654,6 +658,18 @@ public abstract class BlockBehaviour implements FeatureElement {
|
|
return block != Blocks.COBWEB && block != Blocks.BAMBOO_SAPLING && this.isSolid();
|
|
}
|
|
|
|
+ // Leaf start - Cache part of canHoldFluid result
|
|
+ public boolean canHoldAnyFluidInternal() {
|
|
+ // Lazy load cache
|
|
+ if (!canHoldAnyFluidInternalInit) {
|
|
+ canHoldAnyFluidInternal = net.minecraft.world.level.material.FlowingFluid.canHoldAnyFluid(this.asState());
|
|
+ canHoldAnyFluidInternalInit = true;
|
|
+ }
|
|
+
|
|
+ return canHoldAnyFluidInternal;
|
|
+ }
|
|
+ // Leaf end - Cache part of canHoldFluid result
|
|
+
|
|
@Deprecated
|
|
public boolean isSolid() {
|
|
return this.legacySolid;
|
|
diff --git a/net/minecraft/world/level/material/FlowingFluid.java b/net/minecraft/world/level/material/FlowingFluid.java
|
|
index 738defb8cbd9c63dc85c479911ebe2f795d0a815..4c2c2efd5380ff1fa5ad7553b51babae20f516ae 100644
|
|
--- a/net/minecraft/world/level/material/FlowingFluid.java
|
|
+++ b/net/minecraft/world/level/material/FlowingFluid.java
|
|
@@ -466,7 +466,7 @@ public abstract class FlowingFluid extends Fluid {
|
|
}
|
|
|
|
private static boolean canHoldFluid(BlockGetter level, BlockPos pos, BlockState state, Fluid fluid) {
|
|
- return canHoldAnyFluid(state) && canHoldSpecificFluid(level, pos, state, fluid);
|
|
+ return /*canHoldAnyFluid(state)*/ state.canHoldAnyFluidInternal() && canHoldSpecificFluid(level, pos, state, fluid); // Leaf - Cache part of canHoldFluid result
|
|
}
|
|
|
|
private static boolean canHoldSpecificFluid(BlockGetter level, BlockPos pos, BlockState state, Fluid fluid) {
|