From 59c3043a35eec2398c0cf069c270958a2850de79 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Wed, 17 Jul 2024 08:03:42 -0700 Subject: [PATCH] Move ChunkSystem hook class to common util package This class is supposed to be interfaced by a lot of other patches, so it makes sense to move it here. --- .../ca/spottedleaf/moonrise/common/misc/NearbyPlayers.java | 2 +- .../{patches/chunk_system => common/util}/ChunkSystem.java | 7 +++---- .../moonrise/mixin/chunk_system/ChunkMapMixin.java | 2 +- .../patches/chunk_system/level/entity/EntityLookup.java | 6 ++++++ .../level/entity/client/ClientEntityLookup.java | 5 +++++ .../chunk_system/level/entity/dfl/DefaultEntityLookup.java | 5 +++++ .../level/entity/server/ServerEntityLookup.java | 6 ++++++ .../chunk_system/scheduling/ChunkHolderManager.java | 2 +- .../patches/chunk_system/scheduling/NewChunkHolder.java | 3 +-- 9 files changed, 29 insertions(+), 9 deletions(-) rename src/main/java/ca/spottedleaf/moonrise/{patches/chunk_system => common/util}/ChunkSystem.java (97%) diff --git a/src/main/java/ca/spottedleaf/moonrise/common/misc/NearbyPlayers.java b/src/main/java/ca/spottedleaf/moonrise/common/misc/NearbyPlayers.java index 3d5be35..ab093b0 100644 --- a/src/main/java/ca/spottedleaf/moonrise/common/misc/NearbyPlayers.java +++ b/src/main/java/ca/spottedleaf/moonrise/common/misc/NearbyPlayers.java @@ -3,7 +3,7 @@ import ca.spottedleaf.moonrise.common.list.ReferenceList; import ca.spottedleaf.moonrise.common.util.CoordinateUtils; import ca.spottedleaf.moonrise.common.util.MoonriseConstants; -import ca.spottedleaf.moonrise.patches.chunk_system.ChunkSystem; +import ca.spottedleaf.moonrise.common.util.ChunkSystem; import ca.spottedleaf.moonrise.patches.chunk_tick_iteration.ChunkTickConstants; import it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap; import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap; diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/ChunkSystem.java b/src/main/java/ca/spottedleaf/moonrise/common/util/ChunkSystem.java similarity index 97% rename from src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/ChunkSystem.java rename to src/main/java/ca/spottedleaf/moonrise/common/util/ChunkSystem.java index 1ef7e0c..79ea42f 100644 --- a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/ChunkSystem.java +++ b/src/main/java/ca/spottedleaf/moonrise/common/util/ChunkSystem.java @@ -1,4 +1,4 @@ -package ca.spottedleaf.moonrise.patches.chunk_system; +package ca.spottedleaf.moonrise.common.util; import ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor; import ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel; @@ -36,7 +36,6 @@ public static void scheduleChunkLoad(final ServerLevel level, final int chunkX, ((ChunkSystemServerLevel)level).moonrise$getChunkTaskScheduler().scheduleChunkLoad(chunkX, chunkZ, gen, toStatus, addTicket, priority, onComplete); } - // Paper - rewrite chunk system public static void scheduleChunkLoad(final ServerLevel level, final int chunkX, final int chunkZ, final ChunkStatus toStatus, final boolean addTicket, final PrioritisedExecutor.Priority priority, final Consumer onComplete) { ((ChunkSystemServerLevel)level).moonrise$getChunkTaskScheduler().scheduleChunkLoad(chunkX, chunkZ, toStatus, addTicket, priority, onComplete); @@ -68,8 +67,8 @@ public static boolean hasAnyChunkHolders(final ServerLevel level) { return getUpdatingChunkHolderCount(level) != 0; } - public static void onEntityPreAdd(final ServerLevel level, final Entity entity) { - + public static boolean screenEntity(final ServerLevel level, final Entity entity) { + return true; } public static void onChunkHolderCreate(final ServerLevel level, final ChunkHolder holder) { diff --git a/src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/ChunkMapMixin.java b/src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/ChunkMapMixin.java index 0e9a89b..7fc88c0 100644 --- a/src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/ChunkMapMixin.java +++ b/src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/ChunkMapMixin.java @@ -1,7 +1,7 @@ package ca.spottedleaf.moonrise.mixin.chunk_system; import ca.spottedleaf.moonrise.common.util.MoonriseConstants; -import ca.spottedleaf.moonrise.patches.chunk_system.ChunkSystem; +import ca.spottedleaf.moonrise.common.util.ChunkSystem; import ca.spottedleaf.moonrise.patches.chunk_system.io.RegionFileIOThread; import ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel; import ca.spottedleaf.moonrise.patches.chunk_system.level.chunk.ChunkSystemChunkHolder; diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/EntityLookup.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/EntityLookup.java index a346435..efc0c1a 100644 --- a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/EntityLookup.java +++ b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/EntityLookup.java @@ -91,6 +91,8 @@ protected abstract void entitySectionChangeCallback( protected abstract void entityEndTicking(final Entity entity); + protected abstract boolean screenEntity(final Entity entity); + private static Entity maskNonAccessible(final Entity entity) { if (entity == null) { return null; @@ -412,6 +414,10 @@ protected boolean addEntity(final Entity entity, final boolean fromDisk) { return false; } + if (!this.screenEntity(entity)) { + return false; + } + Entity currentlyMapped = this.entityById.putIfAbsent((long)entity.getId(), entity); if (currentlyMapped != null) { LOGGER.warn("Entity id already exists: " + entity.getId() + ", mapped to " + currentlyMapped + ", can't add " + entity); diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/client/ClientEntityLookup.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/client/ClientEntityLookup.java index 77e8141..edcde00 100644 --- a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/client/ClientEntityLookup.java +++ b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/client/ClientEntityLookup.java @@ -96,6 +96,11 @@ protected void entityEndTicking(final Entity entity) { } + @Override + protected boolean screenEntity(final Entity entity) { + return true; + } + public void markTicking(final long pos) { if (this.tickingChunks.add(pos)) { final int chunkX = CoordinateUtils.getChunkX(pos); diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/dfl/DefaultEntityLookup.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/dfl/DefaultEntityLookup.java index 4747499..465469e 100644 --- a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/dfl/DefaultEntityLookup.java +++ b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/dfl/DefaultEntityLookup.java @@ -83,6 +83,11 @@ protected void entityEndTicking(final Entity entity) { } + @Override + protected boolean screenEntity(final Entity entity) { + return true; + } + protected static final class DefaultLevelCallback implements LevelCallback { @Override diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/server/ServerEntityLookup.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/server/ServerEntityLookup.java index 0053ecb..dacf2b2 100644 --- a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/server/ServerEntityLookup.java +++ b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/server/ServerEntityLookup.java @@ -2,6 +2,7 @@ import ca.spottedleaf.moonrise.common.list.ReferenceList; import ca.spottedleaf.moonrise.common.util.TickThread; +import ca.spottedleaf.moonrise.common.util.ChunkSystem; import ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel; import ca.spottedleaf.moonrise.patches.chunk_system.level.entity.ChunkEntitySlices; import ca.spottedleaf.moonrise.patches.chunk_system.level.entity.EntityLookup; @@ -104,4 +105,9 @@ protected void entityStartTicking(final Entity entity) { protected void entityEndTicking(final Entity entity) { } + + @Override + protected boolean screenEntity(final Entity entity) { + return ChunkSystem.screenEntity(this.serverWorld, entity); + } } diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java index c269a1d..7627593 100644 --- a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java +++ b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java @@ -7,7 +7,7 @@ import ca.spottedleaf.moonrise.common.util.MoonriseCommon; import ca.spottedleaf.moonrise.common.util.TickThread; import ca.spottedleaf.moonrise.common.util.WorldUtil; -import ca.spottedleaf.moonrise.patches.chunk_system.ChunkSystem; +import ca.spottedleaf.moonrise.common.util.ChunkSystem; import ca.spottedleaf.moonrise.patches.chunk_system.io.RegionFileIOThread; import ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel; import ca.spottedleaf.moonrise.patches.chunk_system.level.entity.ChunkEntitySlices; diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/NewChunkHolder.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/NewChunkHolder.java index 5edb295..ed0edee 100644 --- a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/NewChunkHolder.java +++ b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/NewChunkHolder.java @@ -9,7 +9,7 @@ import ca.spottedleaf.moonrise.common.util.CoordinateUtils; import ca.spottedleaf.moonrise.common.util.TickThread; import ca.spottedleaf.moonrise.common.util.WorldUtil; -import ca.spottedleaf.moonrise.patches.chunk_system.ChunkSystem; +import ca.spottedleaf.moonrise.common.util.ChunkSystem; import ca.spottedleaf.moonrise.patches.chunk_system.ChunkSystemFeatures; import ca.spottedleaf.moonrise.patches.chunk_system.async_save.AsyncChunkSaveData; import ca.spottedleaf.moonrise.patches.chunk_system.io.RegionFileIOThread; @@ -43,7 +43,6 @@ import net.minecraft.world.level.chunk.LevelChunk; import net.minecraft.world.level.chunk.status.ChunkStatus; import net.minecraft.world.level.chunk.storage.ChunkSerializer; -import net.minecraft.world.level.chunk.storage.EntityStorage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.lang.invoke.VarHandle;