mirror of
https://github.com/Samsuik/Sakura.git
synced 2025-12-20 23:39:32 +00:00
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@9e51f94 Fix ping event always receiving protocol version 0 (#10671) PaperMC/Paper@89ad61f Fix hopper pull event being skipped after the first call (#10667) PaperMC/Paper@eee55d0 Correctly compare holders in BeaconMenu (#10673) PaperMC/Paper@5729b29 Update Adventure to 4.17.0 Release PaperMC/Paper@ab2a85a [ci skip] Clarify var entry in contributing file PaperMC/Paper@f2512b1 Print data component type on encoding error PaperMC/Paper@1b67e02 Fix entity tracker desync when new players are added to the tracker PaperMC/Paper@cc29d2b Invalidate PathTypeCache when pathfinding updates are disabled PaperMC/Paper@b56e92f Fix chunk data version check not running in chunk system PaperMC/Paper@2df1dac Fix DataConverter ConverterParticleToNBT.parseProperties PaperMC/Paper@8748ae1 Use MCDataConverter instead of raw convert call for cmd converter PaperMC/Paper@7f1a154 Add validation to player profile and properties (#10680) PaperMC/Paper@4fd58a1 Add conversion for summon command PaperMC/Paper@39532a1 Fix stacks losing empty attr modifiers PaperMC/Paper@cdb6ba8 Fix keepalive time interval (#10690) PaperMC/Paper@a61d58d adjust ItemMeta to distinguish null and empty modifiers PaperMC/Paper@6c02dbc handle recent ItemMeta changes in serialization logic PaperMC/Paper@447f9a1 [ci skip] Fix paperclip PR label PaperMC/Paper@b98d20a Brigadier Command Support (#8235) PaperMC/Paper@ac554ad Updated Upstream (Bukkit/CraftBukkit) (#10691) PaperMC/Paper@711f82e Fix signed book page serialization (#10696) PaperMC/Paper@7e48f66 Properly pass requirement on namespaced redirects (#10701) PaperMC/Paper@f041f48 Prevent infinite recursion on cyclic brig redirect (#10705) PaperMC/Paper@11c3963 Improve Recipe validation (#10707) PaperMC/Paper@0688f21 Better way to keep paper datapack enabled PaperMC/Paper@218d33c fix creating complex recipes that have air results PaperMC/Paper@fa8a407 Remove Adventure snapshot repo from dev bundle (#10716) PaperMC/Paper@bebcc9c Make exception during command conversion non-fatal PaperMC/Paper@2faa3b2 Correctly copy alias requirements in command upgrader PaperMC/Paper@3fc9358 Show stacktrace when modifyItemStack fails PaperMC/Paper@f175193 Expose server build information (#10729) PaperMC/Paper@d8d59e0 Fix NPE sending resource pack without prompt PaperMC/Paper@5a9afbe Fixes issues in the suppress dismount cancellation patch (#10735) PaperMC/Paper@0ad09de Make PaperSimplePluginClassLoader show class which is not found PaperMC/Paper@b3b3406 fix CompassMeta not being correct (#10737) PaperMC/Paper@591521e Check for more correct profile validation (#10730) PaperMC/Paper@7d2e5c3 Add an 'empty' RecipeChoice for certain ingredient slots (#10710) PaperMC/Paper@9bf4855 Add a better warning message than "Server performance will be affected" for CommandRegisteredEvent use (#10754) PaperMC/Paper@66cb880 Remove ThreadedWorldUpgrader patch PaperMC/Paper@980cff9 Fix compile PaperMC/Paper@d3ffa62 fix default item attributes PaperMC/Paper@b149584 Always show command exception stack traces in logs (#10766) PaperMC/Paper@a9201d4 [ci skip] Move logic in our patches to ItemType/BlockType (#10772) PaperMC/Paper@3de408e Fix equipment slot and group API (#10767) PaperMC/Paper@d408381 Print CommandRegisteredEvent deprecation warnings again (#10756) PaperMC/Paper@6de7a1f Improve default item attributes API (#10765) PaperMC/Paper@2a90732 Remove incorrect logic for Fireball#setVelocity (#10764) PaperMC/Paper@5e7b65a Allow using PluginLoader classpath API from Bukkit plugins (#10758) PaperMC/Paper@3004717 Do not re-wrap vanilla goals (#10751) PaperMC/Paper@377733d Use getter/setter on Mob for equipment drop chances (#10780) PaperMC/Paper@dff591d Allow to define new map cursor types (#10782) PaperMC/Paper@4fd3ac0 [ci skip] Update Player#getListeningPluginChannels Jdoc (#10778) PaperMC/Paper@535dca5 Fix a few issues with ItemMeta (#10740) PaperMC/Paper@26e90b9 Fix CraftMetaBlockState for data components (#10731) PaperMC/Paper@f0bd0cc Expose anvil cost in the API (#10682) PaperMC/Paper@41bee55 Fix NPE for color-related metas PaperMC/Paper@4e10fad reset meta block state on BlockStateMeta#setBlockState PaperMC/Paper@a7ae966 readd itemstack data sanitization (#10454) PaperMC/Paper@ca50b87 Clear firework item properly (#10793) PaperMC/Paper@9774a52 fix and cleanup loot table patches (#10100) PaperMC/Paper@ac4ee06 Fix integer overflow for lag compensating eating check (#10797) PaperMC/Paper@6649a17 Fix BlockStateMeta equals (#10795) PaperMC/Paper@1b8cdc6 Extend Player Interact cancellation to cover Jigsaw blocks (#10719) PaperMC/Paper@841ab41 Fix more item desync when an event is cancelled (#10654) PaperMC/Paper@b0e3ca4 Prevent NPE if hooked entity was cleared (#10712) PaperMC/Paper@347bbe3 Fix Cancelling BlockPlaceEvent calling onRemove (#10773) PaperMC/Paper@23fe116 Fix missing debug trace PaperMC/Paper@b0c9b9c Only remove worldgen block entity on changed block (#10794) PaperMC/Paper@9c917fe [ci skip] Clean up paperclip build-pr workflow (#10802) PaperMC/Paper@9d6f2cc [ci skip] Rebuild patches (#10803)
277 lines
11 KiB
Diff
277 lines
11 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:24:24 +0000
|
|
Subject: [PATCH] Local Config and Value Storage API
|
|
|
|
|
|
diff --git a/src/main/java/me/samsuik/sakura/local/config/LocalConfigManager.java b/src/main/java/me/samsuik/sakura/local/config/LocalConfigManager.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..a3a09b8d58589883c7c465597bc64502bbfa0d88
|
|
--- /dev/null
|
|
+++ b/src/main/java/me/samsuik/sakura/local/config/LocalConfigManager.java
|
|
@@ -0,0 +1,143 @@
|
|
+package me.samsuik.sakura.local.config;
|
|
+
|
|
+import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
|
|
+import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
|
|
+import it.unimi.dsi.fastutil.longs.Long2ObjectRBTreeMap;
|
|
+import it.unimi.dsi.fastutil.longs.Long2ObjectSortedMap;
|
|
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
|
|
+import me.samsuik.sakura.local.LocalRegion;
|
|
+import me.samsuik.sakura.local.storage.LocalStorageHandler;
|
|
+import me.samsuik.sakura.local.storage.LocalValueStorage;
|
|
+import me.samsuik.sakura.utils.objects.Expiry;
|
|
+import net.minecraft.core.BlockPos;
|
|
+import net.minecraft.server.MinecraftServer;
|
|
+import net.minecraft.world.level.ChunkPos;
|
|
+import net.minecraft.world.level.Level;
|
|
+import org.bukkit.Location;
|
|
+
|
|
+import java.util.ArrayList;
|
|
+import java.util.List;
|
|
+import java.util.Map;
|
|
+
|
|
+public final class LocalConfigManager implements LocalStorageHandler {
|
|
+
|
|
+ private final Map<LocalRegion, LocalValueStorage> storageMap = new Object2ObjectOpenHashMap<>();
|
|
+ // tree is a tree. it may not be correct but it works.
|
|
+ private final Long2ObjectRBTreeMap<LocalRegion> regionTree = new Long2ObjectRBTreeMap<>();
|
|
+ private final Long2ObjectMap<LocalValueConfig> configMap = new Long2ObjectOpenHashMap<>();
|
|
+ private final Level level;
|
|
+
|
|
+ public LocalConfigManager(Level level) {
|
|
+ this.level = level;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public LocalRegion locate(Location location, int searchDistance) {
|
|
+ return this.locate(location.getBlockX(), location.getBlockZ(), searchDistance);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public synchronized LocalRegion locate(int x, int z, int searchDistance) {
|
|
+ long search = (long) searchDistance << 32;
|
|
+ long coordinate = ChunkPos.asLong(x, z);
|
|
+
|
|
+ // all regions below the coordinate (they're stored with the minX, minZ)
|
|
+ Long2ObjectSortedMap<LocalRegion> head = this.regionTree.headMap(coordinate);
|
|
+
|
|
+ if (head.isEmpty()) return null;
|
|
+
|
|
+ for (Long2ObjectMap.Entry<LocalRegion> entry : head.long2ObjectEntrySet()) {
|
|
+ // this has no respect for the x coordinate, but it works
|
|
+ if (coordinate - entry.getLongKey() > search) {
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ // check if the region we found contains the position
|
|
+ if (entry.getValue().contains(x, z)) {
|
|
+ return entry.getValue();
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return null;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public synchronized LocalValueStorage get(LocalRegion region) {
|
|
+ return this.storageMap.get(region);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public synchronized boolean has(LocalRegion region) {
|
|
+ return this.storageMap.containsKey(region);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public synchronized void put(LocalRegion region, LocalValueStorage storage) {
|
|
+ assert region != null : "region cannot be null";
|
|
+ assert storage != null : "storage cannot be null";
|
|
+
|
|
+ long base = ChunkPos.asLong(region.minX(), region.minZ());
|
|
+ this.ensureNotOverlapping(region);
|
|
+
|
|
+ this.storageMap.put(region, storage);
|
|
+ this.regionTree.put(base, region);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public synchronized void remove(LocalRegion region) {
|
|
+ assert region != null : "region cannot be null";
|
|
+
|
|
+ long base = ChunkPos.asLong(region.minX(), region.minZ());
|
|
+
|
|
+ this.storageMap.remove(region);
|
|
+ this.regionTree.remove(base);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public synchronized List<LocalRegion> regions() {
|
|
+ return new ArrayList<>(this.storageMap.keySet());
|
|
+ }
|
|
+
|
|
+ public synchronized LocalValueConfig config(BlockPos position) {
|
|
+ long chunkKey = ChunkPos.asLong(position.getX() >> 4, position.getZ() >> 4);
|
|
+
|
|
+ LocalValueConfig local = this.configMap.computeIfAbsent(chunkKey, (key) -> {
|
|
+ LocalValueConfig config = new LocalValueConfig(new Expiry(MinecraftServer.currentTickLong, 600));
|
|
+
|
|
+ // defaults from sakura config
|
|
+ config.init(level);
|
|
+
|
|
+ // search the entire map if we have to for a region
|
|
+ LocalRegion region = this.locate(position.getX(), position.getZ(), Integer.MAX_VALUE);
|
|
+
|
|
+ if (region != null) {
|
|
+ // load local values
|
|
+ config.load(this.storageMap.get(region));
|
|
+ }
|
|
+
|
|
+ return config;
|
|
+ });
|
|
+
|
|
+ local.expiry().refresh(MinecraftServer.currentTickLong);
|
|
+ return local;
|
|
+ }
|
|
+
|
|
+ public synchronized void expire(long tick) {
|
|
+ if (tick % 200 != 0) return;
|
|
+
|
|
+ // remove expired
|
|
+ this.configMap.values().removeIf(obj -> obj.expiry().isExpired(tick));
|
|
+ }
|
|
+
|
|
+ private void ensureNotOverlapping(LocalRegion region) {
|
|
+ long top = ChunkPos.asLong(region.maxX(), region.maxZ());
|
|
+ Long2ObjectSortedMap<LocalRegion> head = this.regionTree.headMap(top);
|
|
+
|
|
+ for (LocalRegion present : head.values()) {
|
|
+ if (present != region && present.intersects(region)) {
|
|
+ throw new UnsupportedOperationException("overlapping regions");
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+}
|
|
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..dd61d4e8811ffb1e8a842df1db6ac6ce5a8258c6
|
|
--- /dev/null
|
|
+++ b/src/main/java/me/samsuik/sakura/local/config/LocalValueConfig.java
|
|
@@ -0,0 +1,68 @@
|
|
+package me.samsuik.sakura.local.config;
|
|
+
|
|
+import io.papermc.paper.configuration.WorldConfiguration.Misc.RedstoneImplementation;
|
|
+import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;
|
|
+import me.samsuik.sakura.explosion.durable.DurableMaterial;
|
|
+import me.samsuik.sakura.local.LocalValueKey;
|
|
+import me.samsuik.sakura.local.storage.LocalValueStorage;
|
|
+import me.samsuik.sakura.physics.PhysicsVersion;
|
|
+import me.samsuik.sakura.utils.objects.Expiry;
|
|
+import net.minecraft.world.level.Level;
|
|
+import net.minecraft.world.level.block.Block;
|
|
+import org.bukkit.craftbukkit.util.CraftMagicNumbers;
|
|
+
|
|
+import java.util.Map;
|
|
+
|
|
+public final class LocalValueConfig {
|
|
+
|
|
+ private final Expiry expiry;
|
|
+ public Map<Block, DurableMaterial> durableMaterials;
|
|
+ public PhysicsVersion physicsVersion;
|
|
+ public RedstoneImplementation redstoneImplementation;
|
|
+ public boolean consistentRadius;
|
|
+
|
|
+ LocalValueConfig(Expiry expiry) {
|
|
+ this.expiry = expiry;
|
|
+ }
|
|
+
|
|
+ void init(Level level) {
|
|
+ // default materials
|
|
+ this.durableMaterials = new Reference2ObjectOpenHashMap<>(level.sakuraConfig().cannons.explosion.durableMaterials);
|
|
+
|
|
+ // physics version
|
|
+ this.physicsVersion = level.sakuraConfig().cannons.mechanics.physicsVersion;
|
|
+
|
|
+ // redstone implementation
|
|
+ this.redstoneImplementation = level.paperConfig().misc.redstoneImplementation;
|
|
+
|
|
+ // consistent explosion radius
|
|
+ this.consistentRadius = level.sakuraConfig().cannons.explosion.consistentRadius;
|
|
+ }
|
|
+
|
|
+ void load(LocalValueStorage storage) {
|
|
+ // local materials
|
|
+ storage.value(LocalValueKey.DURABLE_MATERIALS, true).forEach(((material, entry) -> {
|
|
+ this.durableMaterials.put(CraftMagicNumbers.getBlock(material), new DurableMaterial(entry.getKey(), entry.getValue()));
|
|
+ }));
|
|
+
|
|
+ // physics version
|
|
+ if (storage.exists(LocalValueKey.PHYSICS_VERSION)) {
|
|
+ this.physicsVersion = storage.value(LocalValueKey.PHYSICS_VERSION);
|
|
+ }
|
|
+
|
|
+ // redstone implementation
|
|
+ if (storage.exists(LocalValueKey.REDSTONE_IMPLEMENTATION)) {
|
|
+ this.redstoneImplementation = RedstoneImplementation.values()[storage.value(LocalValueKey.REDSTONE_IMPLEMENTATION).ordinal()];
|
|
+ }
|
|
+
|
|
+ // consistent explosion radius
|
|
+ if (storage.exists(LocalValueKey.CONSISTENT_EXPLOSION_RADIUS)) {
|
|
+ this.consistentRadius = storage.value(LocalValueKey.CONSISTENT_EXPLOSION_RADIUS);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ Expiry expiry() {
|
|
+ return expiry;
|
|
+ }
|
|
+
|
|
+}
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
index 48648f73925c79282df19158ef52678d10608f44..9677324fc698789e9cd880705985d6112c6bd9bb 100644
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
@@ -1798,6 +1798,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
|
this.profiler.pop();
|
|
this.profiler.pop();
|
|
worldserver.explosionDensityCache.clear(); // Paper - Optimize explosions
|
|
+ worldserver.localConfig().expire(currentTickLong); // Sakura - add local config
|
|
}
|
|
this.isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
|
|
index f2cd3046fdd280b03586e645216ccef15fc4b116..1059530bb6f817352c8304f6a1544aeb5ac14b30 100644
|
|
--- a/src/main/java/net/minecraft/world/level/Level.java
|
|
+++ b/src/main/java/net/minecraft/world/level/Level.java
|
|
@@ -175,6 +175,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
|
|
return this.sakuraConfig;
|
|
}
|
|
// Sakura end - sakura configuration files
|
|
+ // Sakura start - add local config
|
|
+ private final me.samsuik.sakura.local.config.LocalConfigManager localConfig = new me.samsuik.sakura.local.config.LocalConfigManager(this);
|
|
+ public final me.samsuik.sakura.local.config.LocalConfigManager localConfig() {
|
|
+ return this.localConfig;
|
|
+ }
|
|
+ // Sakura end - add local config
|
|
|
|
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 f2b20ed5063a293f0b464548f590d652170cd1d8..91ad056cd98d799caf811defde57dbdcecc07700 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
@@ -252,6 +252,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
|
}
|
|
// Paper end
|
|
|
|
+ // Sakura start - add local config
|
|
+ @Override
|
|
+ public final me.samsuik.sakura.local.storage.LocalStorageHandler getStorageHandler() {
|
|
+ return this.getHandle().localConfig();
|
|
+ }
|
|
+ // Sakura end - add local config
|
|
+
|
|
private static final Random rand = new Random();
|
|
|
|
public CraftWorld(ServerLevel world, ChunkGenerator gen, BiomeProvider biomeProvider, Environment env) {
|