diff --git a/patches/api/0005-isPushedByFluid-API.patch b/patches/api/0005-isPushedByFluid-API.patch index 3414277..3e18824 100644 --- a/patches/api/0005-isPushedByFluid-API.patch +++ b/patches/api/0005-isPushedByFluid-API.patch @@ -5,28 +5,27 @@ Subject: [PATCH] isPushedByFluid API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 1d0fd7ff8449f815a7d980af0b378181ea8bf8d8..27b7b6c676b514968efefe254dc4afde122438ad 100644 +index 1d0fd7ff8449f815a7d980af0b378181ea8bf8d8..e0ef6e5a4664b69a5797afeafac2c6436137cab3 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -111,6 +111,23 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -111,6 +111,22 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ public boolean isInWater(); + // Sakura start -+ + /** -+ * Gets if the entity will be pushed by fluid ++ * Gets if the entity will be pushed by fluid. + * -+ * @return ahem ++ * @return if this entity can be pushed by fluid. + */ + boolean isPushedByFluid(); + + /** -+ * Sets if the entity will be pushed by fluid ++ * Sets if the entity will be pushed by fluid. + * -+ * @param push pushed by fluid ++ * @param state whether entity should be pushed by fluid + */ -+ void setPushedByFluid(boolean push); ++ void setPushedByFluid(boolean state); + // Sakura end + /** diff --git a/patches/api/0008-Add-physics-version-API.patch b/patches/api/0008-Add-physics-version-API.patch index 7b1223d..06fb044 100644 --- a/patches/api/0008-Add-physics-version-API.patch +++ b/patches/api/0008-Add-physics-version-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add physics version API diff --git a/src/main/java/me/samsuik/sakura/local/LocalValueKey.java b/src/main/java/me/samsuik/sakura/local/LocalValueKey.java -index ee3057c7969956b9c552ac5ceb2f5e38a30e9cdf..f16ea4550f3fb32bcc39d0fe735849264ce02658 100644 +index ee3057c7969956b9c552ac5ceb2f5e38a30e9cdf..58f220a3f48a8cc1a25249d4a56cf356dc2c9c99 100644 --- a/src/main/java/me/samsuik/sakura/local/LocalValueKey.java +++ b/src/main/java/me/samsuik/sakura/local/LocalValueKey.java @@ -1,5 +1,6 @@ @@ -20,7 +20,7 @@ index ee3057c7969956b9c552ac5ceb2f5e38a30e9cdf..f16ea4550f3fb32bcc39d0fe73584926 // ... + public static final LocalValueKey PHYSICS_VERSION = new LocalValueKey<>( -+ new NamespacedKey("sakura", "physics-version"), () -> PhysicsVersion.LATEST ++ new NamespacedKey("sakura", "physics-version"), () -> PhysicsVersion.LATEST + ); @Override diff --git a/patches/api/0009-Add-durable-material-API.patch b/patches/api/0009-Add-durable-material-API.patch index 0420de4..601221e 100644 --- a/patches/api/0009-Add-durable-material-API.patch +++ b/patches/api/0009-Add-durable-material-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add durable material API diff --git a/src/main/java/me/samsuik/sakura/local/LocalValueKey.java b/src/main/java/me/samsuik/sakura/local/LocalValueKey.java -index f16ea4550f3fb32bcc39d0fe735849264ce02658..3beb5830d623e72a3f4dec63aedc8b69a6396bf0 100644 +index 58f220a3f48a8cc1a25249d4a56cf356dc2c9c99..4735e5d8dcea4835061b5cada9d601794efdf390 100644 --- a/src/main/java/me/samsuik/sakura/local/LocalValueKey.java +++ b/src/main/java/me/samsuik/sakura/local/LocalValueKey.java @@ -1,8 +1,11 @@ @@ -21,7 +21,7 @@ index f16ea4550f3fb32bcc39d0fe735849264ce02658..3beb5830d623e72a3f4dec63aedc8b69 import java.util.function.Supplier; @@ -13,6 +16,10 @@ public record LocalValueKey(NamespacedKey key, Supplier defaultSupplier) { - new NamespacedKey("sakura", "physics-version"), () -> PhysicsVersion.LATEST + new NamespacedKey("sakura", "physics-version"), () -> PhysicsVersion.LATEST ); + public static final LocalValueKey>> DURABLE_MATERIALS = new LocalValueKey<>(