From 6e0143f686eee7c2b86f47b1b7dfe545eb68c622 Mon Sep 17 00:00:00 2001 From: Samsuik Date: Thu, 5 Dec 2024 22:23:07 +0000 Subject: [PATCH] Add lava flow speed api --- .../api/0014-Add-lava-flow-speed-api.patch | 21 ++++++++++++++++++ ...4-Local-Config-and-Value-Storage-API.patch | 10 ++++++--- .../server/0082-Add-lava-flow-speed-api.patch | 22 +++++++++++++++++++ 3 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 patches/api/0014-Add-lava-flow-speed-api.patch create mode 100644 patches/server/0082-Add-lava-flow-speed-api.patch diff --git a/patches/api/0014-Add-lava-flow-speed-api.patch b/patches/api/0014-Add-lava-flow-speed-api.patch new file mode 100644 index 0000000..5dd2239 --- /dev/null +++ b/patches/api/0014-Add-lava-flow-speed-api.patch @@ -0,0 +1,21 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Samsuik +Date: Thu, 5 Dec 2024 22:27:38 +0000 +Subject: [PATCH] Add lava flow speed api + + +diff --git a/src/main/java/me/samsuik/sakura/local/LocalValueKey.java b/src/main/java/me/samsuik/sakura/local/LocalValueKey.java +index 780a02fb451d5b4b98f6895b488b90c75a6507a8..ed5ff8c6262e2c9ab01417859061cba2897b2422 100644 +--- a/src/main/java/me/samsuik/sakura/local/LocalValueKey.java ++++ b/src/main/java/me/samsuik/sakura/local/LocalValueKey.java +@@ -33,6 +33,10 @@ public record LocalValueKey(NamespacedKey key, Supplier defaultSupplier) { + new NamespacedKey("sakura", "redstone-cache"), () -> false + ); + ++ public static final LocalValueKey LAVA_FLOW_SPEED = new LocalValueKey<>( ++ new NamespacedKey("sakura", "lava-flow-speed"), () -> -1 ++ ); ++ + @Override + public boolean equals(Object o) { + if (this == o) return true; diff --git a/patches/server/0004-Local-Config-and-Value-Storage-API.patch b/patches/server/0004-Local-Config-and-Value-Storage-API.patch index bc8237d..10dacb7 100644 --- a/patches/server/0004-Local-Config-and-Value-Storage-API.patch +++ b/patches/server/0004-Local-Config-and-Value-Storage-API.patch @@ -153,10 +153,10 @@ index 0000000000000000000000000000000000000000..58e2bada4d9120a4802def5caece906f +} diff --git a/src/main/java/me/samsuik/sakura/local/config/LocalValueConfig.java b/src/main/java/me/samsuik/sakura/local/config/LocalValueConfig.java new file mode 100644 -index 0000000000000000000000000000000000000000..5b3e2cca7ee16bc6ecfa0f29438fa6588fa39a99 +index 0000000000000000000000000000000000000000..86a5964e7dea512da0a54ae675394bded91c5e0e --- /dev/null +++ b/src/main/java/me/samsuik/sakura/local/config/LocalValueConfig.java -@@ -0,0 +1,69 @@ +@@ -0,0 +1,73 @@ +package me.samsuik.sakura.local.config; + +import io.papermc.paper.configuration.WorldConfiguration.Misc.RedstoneImplementation; @@ -179,6 +179,7 @@ index 0000000000000000000000000000000000000000..5b3e2cca7ee16bc6ecfa0f29438fa658 + public RedstoneImplementation redstoneImplementation; + public boolean consistentRadius; + public boolean redstoneCache; ++ public int lavaFlowSpeed = -1; + + LocalValueConfig(Expiry expiry) { + this.expiry = expiry; @@ -220,6 +221,9 @@ index 0000000000000000000000000000000000000000..5b3e2cca7ee16bc6ecfa0f29438fa658 + + // redstone cache + this.redstoneCache = storage.getOrDefault(LocalValueKey.REDSTONE_CACHE, this.redstoneCache); ++ ++ // lava flow speed ++ this.lavaFlowSpeed = storage.getOrDefault(LocalValueKey.LAVA_FLOW_SPEED, this.lavaFlowSpeed); + } + + Expiry expiry() { @@ -256,7 +260,7 @@ index 48c2d026fd678f7990738a0037780a535f1ac19b..613c402744314644f86b401fa84dbd20 public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray public final co.aikar.timings.WorldTimingsHandler timings; // Paper diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 33e4818ba5a90d78d69baad9f6b1be1b1382e9f3..d14c942a4505222c13bf0e7bc15ac4904f3ebbd1 100644 +index e76186d580a2d7f1a83af4600b0bdd435b67eba3..d2f103e349e562ff0ffc5c1b72d287335b858cbb 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -291,6 +291,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0082-Add-lava-flow-speed-api.patch b/patches/server/0082-Add-lava-flow-speed-api.patch new file mode 100644 index 0000000..e13b00a --- /dev/null +++ b/patches/server/0082-Add-lava-flow-speed-api.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Samsuik +Date: Thu, 5 Dec 2024 22:21:39 +0000 +Subject: [PATCH] Add lava flow speed api + + +diff --git a/src/main/java/net/minecraft/world/level/material/LavaFluid.java b/src/main/java/net/minecraft/world/level/material/LavaFluid.java +index 28a968e7738b37a4280d5019b5334e5e0303c5ae..68e31a1f8d95b00f284a0b03a095d0ad9b92ebef 100644 +--- a/src/main/java/net/minecraft/world/level/material/LavaFluid.java ++++ b/src/main/java/net/minecraft/world/level/material/LavaFluid.java +@@ -188,7 +188,10 @@ public abstract class LavaFluid extends FlowingFluid { + + @Override + public int getSpreadDelay(Level world, BlockPos pos, FluidState oldState, FluidState newState) { +- int i = this.getTickDelay(world); ++ // Sakura start - lava flow speed api ++ final int flowSpeed = world.localConfig().config(pos).lavaFlowSpeed; ++ int i = flowSpeed >= 0 ? flowSpeed : this.getTickDelay(world); ++ // Sakura end - lava flow speed api + + if (!oldState.isEmpty() && !newState.isEmpty() && !(Boolean) oldState.getValue(LavaFluid.FALLING) && !(Boolean) newState.getValue(LavaFluid.FALLING) && newState.getHeight(world, pos) > oldState.getHeight(world, pos) && world.getRandom().nextInt(4) != 0) { + i *= 4;