mirror of
https://github.com/Samsuik/Sakura.git
synced 2025-12-20 15:29:33 +00:00
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@a80d31b Log command execution exceptions if debug=true (#10130) PaperMC/Paper@ec19620 Use a ConcurrentHashMap for enum mappings for BlockData (#10161) PaperMC/Paper@f28caff Limit ResourceLocation length to nbt string tag length PaperMC/Paper@a0ffb57 [ci skip] Small cleanup to mc utils patch PaperMC/Paper@8c8862f Also check for the actual character length in ResourceLocation validation PaperMC/Paper@e84621a [ci skip] Add more patch identifying comments PaperMC/Paper@c0e4697 [ci skip] Add more patch identifying comments PaperMC/Paper@17275ff [ci skip] add more comments & move 1 hunk to correct patch PaperMC/Paper@78fcb8e [ci skip] Update contributing guidelines to include identifying commit titles in comments (#10162) PaperMC/Paper@8657cd9 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10164) PaperMC/Paper@c151c95 Fixup AsyncPreLoginEvent patches PaperMC/Paper@93a848c Readd missed line PaperMC/Paper@f9fdedf [ci skip] Add more patch identifying comments, merge related patches PaperMC/Paper@0ef5984 [ci skip] Add more patch identifying comments, merge related patches PaperMC/Paper@848a396 Add mob goal generator (#9980) PaperMC/Paper@ebf97bd [ci skip] Add more patch identifying comments PaperMC/Paper@94807a1 [ci skip] Minor cleanup and patch merges PaperMC/Paper@5e73c55 [ci skip] Add more identifying patch comments PaperMC/Paper@3e20d3a [ci skip] Add more identifying patch comments PaperMC/Paper@f61ebdc Fix issue with kick event causes being passed improperly PaperMC/Paper@106c67a [ci skip] Add more identifying patch comments PaperMC/Paper@cc693ce [ci skip] Add more identifying patch comments, merge related patches PaperMC/Paper@eeb6afc [ci skip] Add more identifying patch comments, merge related patches PaperMC/Paper@1c956ab [ci skip] Add more identifying patch comments, merge related patches PaperMC/Paper@42e88a8 [ci skip] Add more identifying patch comments PaperMC/Paper@8e41ef4 Add visual blockdata api for primed tnt (#10146) PaperMC/Paper@68c3297 [ci skip] Add more identifying patch comments PaperMC/Paper@4a98986 Add back Reduce allocation of Vec3D by entity tracker patch (#10179) PaperMC/Paper@b48d737 Async world data IO saving (#10171) PaperMC/Paper@8d94596 [ci skip] Add more identifying patch comments PaperMC/Paper@f7dd304 [ci skip] Add more identifying patch comments PaperMC/Paper@98e6d20 [ci skip] Add more identifying patch comments PaperMC/Paper@e9e0bc1 [ci skip] Add more identifying patch comments PaperMC/Paper@d9df6bc [ci skip] Add more patch identifying comments, cleanup PaperMC/Paper@27cabc1 [ci skip] Add more patch identifying comments PaperMC/Paper@684319f [ci skip] Add more patch identifying comments PaperMC/Paper@9eb0b38 [ci skip] Add more patch identifying comments PaperMC/Paper@25013d9 [ci skip] Move some disruptive patches back PaperMC/Paper@484d6bf [ci skip] Move some disruptive patches back PaperMC/Paper@52619e7 [ci skip] Add more patch identifying comments PaperMC/Paper@e660379 [ci skip] Move some disruptive patches back PaperMC/Paper@c57d1aa Move diffs around to compile without later ones applied PaperMC/Paper@581b101 Add world to Entity AddTo/RemoveFrom Events (#10183) PaperMC/Paper@24dc2bf Add BlockStateMeta#clearBlockState (#10160) PaperMC/Paper@76da4bc Expose LootTable of DecoratedPot (#10023) PaperMC/Paper@11645e3 [ci skip] (Mostly) finish adding identifying patch comments PaperMC/Paper@51bef80 [ci skip] Remove removed patches PaperMC/Paper@ad2cf68 [ci skip] Move chunk system patch back a bit PaperMC/Paper@d405ff1 [ci skip] Fixup last commit PaperMC/Paper@a4a08b7 [ci skip] Move chunk system patch a bit back PaperMC/Paper@b700460 Convert average tick value in the GUI to the correct granularity PaperMC/Paper@1831240 [ci skip] Move chunk system patch back PaperMC/Paper@b03f255 Finish moving patches back and improving compilable state PaperMC/Paper@bd2fd61 [ci skip] Fixup a few bad comments PaperMC/Paper@fe53b0e Updated Upstream (Bukkit/CraftBukkit/Spigot) PaperMC/Paper@1ed50da Fix javadoc errors, remove unused classes PaperMC/Paper@7f7d05a [ci skip] Remove IRC link from the README (#10194) PaperMC/Paper@ed130f1 [ci skip] clarify javadocs for Block#getDrops (#10153) PaperMC/Paper@4643b0d Shulker duplicate event (#10135) PaperMC/Paper@b333831 Make spawn egg colours visible (#10158) PaperMC/Paper@0cc3a7e Disable memory reserve allocating (#10180) PaperMC/Paper@3841722 Properly check if a loot table exists (#10190) PaperMC/Paper@b3c8108 [ci skip] Fix incorrect documentation for BlockDropItemEvent (#10175) PaperMC/Paper@294347b [ci skip] Cleanup events (#10202) PaperMC/Paper@87ce7c7 Small refactor of Paper plugin context preparation PaperMC/Paper@7f856a1 Fix sleeping pos desync PaperMC/Paper@8bc5be8 Add missing catch PaperMC/Paper@c5d168c More provider source fixup PaperMC/Paper@9e171ef Improve tag parser handling, move hunks out of chunk system patch PaperMC/Paper@934cd77 Lifecycle Event System (#9629) PaperMC/Paper@534659e Fix NotNull locales (#10216) PaperMC/Paper@9c04729 Add Arrow/Stinger Removal Time API (#10193) PaperMC/Paper@69b52b4 Check for server JARs in plugin directory (#10228) PaperMC/Paper@cbe62d9 Add Conduit API (#10195) PaperMC/Paper@97c0120 Fix fox drops on death (#8862) PaperMC/Paper@581fb30 itemstack expose tooltip lines (#10185) PaperMC/Paper@99bae59 Propagate failed to bind to port error (#10235) PaperMC/Paper@bf6e803 Fix WaterBottleSplashEvent not forwarding hit result (#10203) PaperMC/Paper@2fa2d32 Fix possible StackOverflowError for some dispenser iteractions (#8524) PaperMC/Paper@e6a5215 Properly track the changed item from dispense events (#8658) PaperMC/Paper@4b58a85 Fire BlockPreDispenseEvent for droppers (#10226) PaperMC/Paper@cde5587 Add getChunkSnapshot includeLightData parameter (#10234) PaperMC/Paper@31699ae Updated Upstream (Bukkit/CraftBukkit) (#10242) PaperMC/Paper@37df121 Fix BlockState being set to null for damage events (#10252) PaperMC/Paper@7f85940 Updated Upstream (Bukkit) (#10255) PaperMC/Paper@7ccefdc Fire entity knockback event for ownerless tnt (#7171) PaperMC/Paper@a07d526 [ci skip] Fix JavaDoc mistake in BlockPistonRetractEvent (#10250) PaperMC/Paper@9a66f2b [ci skip] Fix javadoc mistake in PluginMeta (#10258) PaperMC/Paper@1964b22 Scoreboard objective number format api (#10036) PaperMC/Paper@d95341e FluidState API (#9951) PaperMC/Paper@351923d Run round-trip adventure codec tests with JSON, NBT, and Java ops. Use JavaOps for conversions. (#10031) PaperMC/Paper@4939f87 Add more ResourceLocation checks, some cleanup
170 lines
5.5 KiB
Diff
170 lines
5.5 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..0f7da96d434cd699470e050898712898b54fa356
|
|
--- /dev/null
|
|
+++ b/src/main/java/me/samsuik/sakura/local/storage/LocalValueStorage.java
|
|
@@ -0,0 +1,37 @@
|
|
+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 def) {
|
|
+ T val = (T) this.map.get(key);
|
|
+ if (!def || val != null)
|
|
+ return val;
|
|
+ // update value
|
|
+ this.set(key, val = key.defaultSupplier().get());
|
|
+ return val;
|
|
+ }
|
|
+
|
|
+ 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 c5fe36050eeaff80cfb989fe2f38370215af6fe5..c91d6af3cc13a1b290e2b362a3017f6536046831 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.
|