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(NamespacedKey key, Supplier 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 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, Object> map = new HashMap<>(); + + public boolean exists(LocalValueKey key) { + return this.map.containsKey(key); + } + + public T value(LocalValueKey key) { + return (T) this.map.get(key); + } + + public T value(LocalValueKey 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 getOrDefault(LocalValueKey key, T def) { + return (T) this.map.getOrDefault(key, def); + } + + public void set(LocalValueKey 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 e6f66d70d024cf4f0536a5bf8e51bf7b306335df..d554b1f54e706500153718527a6b60c7743901ea 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -157,6 +157,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.