mirror of
https://github.com/Samsuik/Sakura.git
synced 2025-12-23 16:59:16 +00:00
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@20ec622 use correct types for preloading CraftRegistry PaperMC/Paper@627cc64 Adjust HAProxy's existance to log for console masters (#11433) PaperMC/Paper@01c4820 Call EntityDropItemEvent when a container item drops its contents (#11441) PaperMC/Paper@9c76642 Deprecate for removal Block#isValidTool (#11439) PaperMC/Paper@dd6d184 Remove redundant fillUsableCommands call (#11425) PaperMC/Paper@f33611c fix ItemStack#removeEnchantments creating non-stackable items (#11442) PaperMC/Paper@8f56db8 Add enchantWithLevels with tag specification (#11438) PaperMC/Paper@b7ab22d Fix console completions on invalid commands (#7603) PaperMC/Paper@41bc31b Update paperweight to 1.7.3 (#11445) PaperMC/Paper@e17eb6b Improve entity effect API (#11444) PaperMC/Paper@7b03141 Add startingBrewTime (#11406) PaperMC/Paper@355b1cb Add API for explosions to damage the explosion cause (#11180) PaperMC/Paper@6d7a438 Call bucket events for cauldrons (#7486) PaperMC/Paper@f9c7f2a Begin switching to JSpecify annotations (#11448) PaperMC/Paper@e3c8a8e Add PlayerInsertLecternBookEvent [1.20 port] (#7305) PaperMC/Paper@b410fe8 Configurable per-world void damage offset/damage(#11436) PaperMC/Paper@ea00be3 Do not NPE on uuid resolution in player profile (#11449) PaperMC/Paper@ba3c29b Finish converting all events to jspecify annotations PaperMC/Paper@e7e1ab5 Finish converting most of the undeprecated api to jspecify PaperMC/Paper@69ffbec Fix hex color check PaperMC/Paper@709f0f2 Use components properly in ProfileWhitelistVerifyEvent (#11456) PaperMC/Paper@fb76840 [ci skip] Add section on nullability annotations (#11461)
172 lines
5.7 KiB
Diff
172 lines
5.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Samsuik <40902469+Samsuik@users.noreply.github.com>
|
|
Date: Tue, 21 Nov 2023 23:22:35 +0000
|
|
Subject: [PATCH] Local Value Storage API
|
|
|
|
|
|
diff --git a/src/main/java/me/samsuik/sakura/local/LocalRegion.java b/src/main/java/me/samsuik/sakura/local/LocalRegion.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..34a0755da6c471a51fb18a5e139af42df1362a93
|
|
--- /dev/null
|
|
+++ b/src/main/java/me/samsuik/sakura/local/LocalRegion.java
|
|
@@ -0,0 +1,36 @@
|
|
+package me.samsuik.sakura.local;
|
|
+
|
|
+import org.bukkit.Location;
|
|
+
|
|
+public record LocalRegion(int minX, int minZ, int maxX, int maxZ) {
|
|
+
|
|
+ public static LocalRegion of(Location min, Location max) {
|
|
+ return of(min.getBlockX(), min.getBlockZ(), max.getBlockX(), max.getBlockZ());
|
|
+ }
|
|
+
|
|
+ public static LocalRegion of(int minX, int minZ, int maxX, int maxZ) {
|
|
+ return new LocalRegion(
|
|
+ Math.min(minX, maxX), Math.min(minZ, maxZ),
|
|
+ Math.max(minX, maxX), Math.max(minZ, maxZ)
|
|
+ );
|
|
+ }
|
|
+
|
|
+ public static LocalRegion at(int x, int z, int radius) {
|
|
+ return new LocalRegion(x-radius, z-radius, x+radius, z+radius);
|
|
+ }
|
|
+
|
|
+ public boolean intersects(LocalRegion region) {
|
|
+ return (minX < region.minX() && maxX > region.minX() || maxX > region.maxX() && minX < region.maxX())
|
|
+ && (minZ < region.minZ() && maxZ > region.minZ() || maxZ > region.maxZ() && minZ < region.maxZ());
|
|
+ }
|
|
+
|
|
+ public boolean contains(LocalRegion region) {
|
|
+ return minX < region.minX() && maxX > region.maxX()
|
|
+ && maxZ < region.minZ() && maxZ > region.maxZ();
|
|
+ }
|
|
+
|
|
+ public boolean contains(int x, int z) {
|
|
+ return minX <= x && maxX >= x && minZ <= z && maxZ >= z;
|
|
+ }
|
|
+
|
|
+}
|
|
diff --git a/src/main/java/me/samsuik/sakura/local/LocalValueKey.java b/src/main/java/me/samsuik/sakura/local/LocalValueKey.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..ee3057c7969956b9c552ac5ceb2f5e38a30e9cdf
|
|
--- /dev/null
|
|
+++ b/src/main/java/me/samsuik/sakura/local/LocalValueKey.java
|
|
@@ -0,0 +1,27 @@
|
|
+package me.samsuik.sakura.local;
|
|
+
|
|
+import org.bukkit.NamespacedKey;
|
|
+
|
|
+import java.util.Objects;
|
|
+import java.util.function.Supplier;
|
|
+
|
|
+public record LocalValueKey<T>(NamespacedKey key, Supplier<T> defaultSupplier) {
|
|
+
|
|
+ // ...
|
|
+
|
|
+ @Override
|
|
+ public boolean equals(Object o) {
|
|
+ if (this == o) return true;
|
|
+ if (o == null || getClass() != o.getClass()) return false;
|
|
+
|
|
+ LocalValueKey<?> that = (LocalValueKey<?>) o;
|
|
+
|
|
+ return Objects.equals(key, that.key);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public int hashCode() {
|
|
+ return key != null ? key.hashCode() : 0;
|
|
+ }
|
|
+
|
|
+}
|
|
diff --git a/src/main/java/me/samsuik/sakura/local/storage/LocalStorageHandler.java b/src/main/java/me/samsuik/sakura/local/storage/LocalStorageHandler.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..5c971fb4266f46de258767fccaf7fe55be467886
|
|
--- /dev/null
|
|
+++ b/src/main/java/me/samsuik/sakura/local/storage/LocalStorageHandler.java
|
|
@@ -0,0 +1,24 @@
|
|
+package me.samsuik.sakura.local.storage;
|
|
+
|
|
+import me.samsuik.sakura.local.LocalRegion;
|
|
+import org.bukkit.Location;
|
|
+
|
|
+import java.util.List;
|
|
+
|
|
+public interface LocalStorageHandler {
|
|
+
|
|
+ LocalRegion locate(Location location, int searchDistance);
|
|
+
|
|
+ LocalRegion locate(int x, int z, int searchDistance);
|
|
+
|
|
+ LocalValueStorage get(LocalRegion region);
|
|
+
|
|
+ boolean has(LocalRegion region);
|
|
+
|
|
+ void put(LocalRegion region, LocalValueStorage storage);
|
|
+
|
|
+ void remove(LocalRegion region);
|
|
+
|
|
+ List<LocalRegion> regions();
|
|
+
|
|
+}
|
|
diff --git a/src/main/java/me/samsuik/sakura/local/storage/LocalValueStorage.java b/src/main/java/me/samsuik/sakura/local/storage/LocalValueStorage.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..de18836d1a2a6038a661cdc60161d3bacdcb8bfe
|
|
--- /dev/null
|
|
+++ b/src/main/java/me/samsuik/sakura/local/storage/LocalValueStorage.java
|
|
@@ -0,0 +1,39 @@
|
|
+package me.samsuik.sakura.local.storage;
|
|
+
|
|
+import me.samsuik.sakura.local.LocalValueKey;
|
|
+
|
|
+import java.util.HashMap;
|
|
+import java.util.Map;
|
|
+
|
|
+public final class LocalValueStorage {
|
|
+ private final Map<LocalValueKey<?>, Object> map = new HashMap<>();
|
|
+
|
|
+ public boolean exists(LocalValueKey<?> key) {
|
|
+ return this.map.containsKey(key);
|
|
+ }
|
|
+
|
|
+ public <T> T value(LocalValueKey<T> key) {
|
|
+ return (T) this.map.get(key);
|
|
+ }
|
|
+
|
|
+ public <T> T value(LocalValueKey<T> key, boolean returnDefault) {
|
|
+ T val = (T) this.map.get(key);
|
|
+ if (!returnDefault || val != null)
|
|
+ return val;
|
|
+ // update value
|
|
+ this.set(key, val = key.defaultSupplier().get());
|
|
+ return val;
|
|
+ }
|
|
+
|
|
+ public <T> T getOrDefault(LocalValueKey<T> key, T def) {
|
|
+ return (T) this.map.getOrDefault(key, def);
|
|
+ }
|
|
+
|
|
+ public <T> void set(LocalValueKey<T> key, T insert) {
|
|
+ this.map.put(key, insert);
|
|
+ }
|
|
+
|
|
+ public void remove(LocalValueKey<?> key) {
|
|
+ this.map.remove(key);
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
|
index ef32a937e6faf1e8a5d6b1207986715bae5a246c..9ef129370e7773e256fe4d2d3bfe93abc625b26a 100644
|
|
--- a/src/main/java/org/bukkit/World.java
|
|
+++ b/src/main/java/org/bukkit/World.java
|
|
@@ -205,6 +205,10 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
|
|
return new Location(this, x, y, z);
|
|
}
|
|
// Paper end
|
|
+ // Sakura start
|
|
+ @NotNull
|
|
+ me.samsuik.sakura.local.storage.LocalStorageHandler getStorageHandler();
|
|
+ // Sakura end
|
|
|
|
/**
|
|
* Gets the highest non-empty (impassable) block at the given coordinates.
|