Reimplement entity & BE mask

Now with more aggressive block entity finding!

Author: Ampflower

src/main/java/net/modfest/fireblanket/FireblanketMixin.java

@@ -65,10 +65,6 @@ public String getRefMapperConfig() {
 
 	@Override
 	public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
-		if (mixinClassName.contains("be_masking") || mixinClassName.contains("entity_masking")) {
-			return DO_MASKING;
-		}
-
 		if (mixinClassName.contains("region_chunk_cache")) {
 			return false;
 //			return FireblanketConfig.get(ConfigSpecs.FORCED_LOAD_RADIUS) > 0;

src/main/java/net/modfest/fireblanket/client/render/BlockEntityMaskRenderer.java

@@ -0,0 +1,134 @@
+package net.modfest.fireblanket.client.render;
+
+import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
+import it.unimi.dsi.fastutil.objects.Object2ObjectMaps;
+import net.minecraft.SharedConstants;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.client.renderer.culling.Frustum;
+import net.minecraft.client.renderer.debug.DebugRenderer;
+import net.minecraft.core.BlockPos;
+import net.minecraft.gizmos.GizmoProperties;
+import net.minecraft.gizmos.GizmoStyle;
+import net.minecraft.gizmos.Gizmos;
+import net.minecraft.util.ARGB;
+import net.minecraft.util.debug.DebugValueAccess;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.chunk.LevelChunk;
+import net.minecraft.world.phys.AABB;
+import net.modfest.fireblanket.FireblanketMixin;
+import net.modfest.fireblanket.client.ClientState;
+import net.modfest.fireblanket.mixin.client.accessor.AccessorClientChunkCache;
+import org.jspecify.annotations.Nullable;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReferenceArray;
+
+/**
+ * @author Ampflower
+ **/
+public final class BlockEntityMaskRenderer implements DebugRenderer.SimpleDebugRenderer {
+
+	private static final boolean alwaysVisible = FireblanketMixin.DO_MASKING | SharedConstants.DEBUG_ENABLED;
+
+	private final Minecraft minecraft;
+
+	public BlockEntityMaskRenderer(final Minecraft minecraft) {
+		this.minecraft = minecraft;
+	}
+
+	@Override
+	public void emitGizmos(
+		final double camX,
+		final double camY,
+		final double camZ,
+		final DebugValueAccess debugValues,
+		final Frustum frustum,
+		final float partialTicks
+	) {
+		if (ClientState.MASKED_BERS.isEmpty()) {
+			return;
+		}
+
+		final ClientLevel level = this.minecraft.level;
+
+		if (level == null) {
+			return;
+		}
+
+		final var clientChunkCache = (AccessorClientChunkCache) level.getChunkSource();
+
+		if (clientChunkCache == null) {
+			return;
+		}
+
+		final var storage = (AccessorClientChunkCache.Storage) (Object) (clientChunkCache).getStorage();
+
+		if (storage == null) {
+			return;
+		}
+
+		final AtomicReferenceArray<@Nullable LevelChunk> chunks = storage.getChunks();
+
+		if (chunks == null) {
+			return;
+		}
+
+		for (int i = 0; i < chunks.length(); i++) {
+			final LevelChunk chunk = chunks.get(i);
+
+			if (chunk == null || chunk.isEmpty()) {
+				continue;
+			}
+
+			final AABB chunkBounds;
+			{
+				final ChunkPos pos = chunk.getPos();
+				final BlockPos a = pos.getBlockAt(0, chunk.getMinY(), 0);
+				final BlockPos b = pos.getBlockAt(15, chunk.getMaxY(), 15);
+				chunkBounds = AABB.encapsulatingFullBlocks(a, b);
+			}
+
+			if (!frustum.isVisible(chunkBounds)) {
+				continue;
+			}
+
+			if (chunk.getBlockEntities() instanceof Object2ObjectMap<BlockPos, BlockEntity> map) {
+				iterate(Object2ObjectMaps.fastIterator(map), frustum);
+			} else {
+				iterate(chunk.getBlockEntities().entrySet().iterator(), frustum);
+			}
+		}
+	}
+
+	private static void iterate(
+		final Iterator<? extends Map.Entry<BlockPos, BlockEntity>> itr,
+		final Frustum frustum
+	) {
+		while (itr.hasNext()) {
+			final var entry = itr.next();
+			final BlockPos pos = entry.getKey();
+			final BlockEntity entity = entry.getValue();
+			final AABB box = new AABB(pos);
+
+			if (!frustum.isVisible(box)) {
+				continue;
+			}
+
+			if (!ClientState.MASKED_BERS.contains(entity.getType())) {
+				continue;
+			}
+
+			final GizmoProperties gizmo = Gizmos.cuboid(
+				box,
+				GizmoStyle.stroke(ARGB.color(192, 200, 220, 40))
+			);
+
+			if (alwaysVisible) {
+				gizmo.setAlwaysOnTop();
+			}
+		}
+	}
+}

src/main/java/net/modfest/fireblanket/client/render/EntityMaskRenderer.java

@@ -0,0 +1,79 @@
+package net.modfest.fireblanket.client.render;
+
+import net.minecraft.SharedConstants;
+import net.minecraft.client.CameraType;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.client.renderer.culling.Frustum;
+import net.minecraft.client.renderer.debug.DebugRenderer;
+import net.minecraft.gizmos.GizmoProperties;
+import net.minecraft.gizmos.GizmoStyle;
+import net.minecraft.gizmos.Gizmos;
+import net.minecraft.util.ARGB;
+import net.minecraft.util.debug.DebugValueAccess;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.phys.Vec3;
+import net.modfest.fireblanket.FireblanketMixin;
+import net.modfest.fireblanket.client.ClientState;
+
+/**
+ * @author Ampflower
+ **/
+public final class EntityMaskRenderer implements DebugRenderer.SimpleDebugRenderer {
+
+	private static final boolean alwaysVisible = FireblanketMixin.DO_MASKING | SharedConstants.DEBUG_ENABLED;
+
+	private final Minecraft minecraft;
+
+	public EntityMaskRenderer(final Minecraft minecraft) {
+		this.minecraft = minecraft;
+	}
+
+	@Override
+	public void emitGizmos(
+		final double camX,
+		final double camY,
+		final double camZ,
+		final DebugValueAccess debugValues,
+		final Frustum frustum,
+		final float partialTicks
+	) {
+		if (ClientState.MASKED_ENTITIES.isEmpty()) {
+			return;
+		}
+
+		final ClientLevel level = this.minecraft.level;
+
+		if (level == null) {
+			return;
+		}
+
+		for (final Entity entity : level.entitiesForRendering()) {
+			if (entity == this.minecraft.getCameraEntity() && this.minecraft.options.getCameraType() == CameraType.FIRST_PERSON) {
+				continue;
+			}
+
+			if ((!alwaysVisible && entity.isInvisible()) || !frustum.isVisible(entity.getBoundingBox())) {
+				continue;
+			}
+
+			if (!ClientState.MASKED_ENTITIES.contains(entity.getType())) {
+				continue;
+			}
+
+			final float entityPartialTicks = this.minecraft.getDeltaTracker()
+				.getGameTimeDeltaPartialTick(!level.tickRateManager().isEntityFrozen(entity));
+
+			final Vec3 delta = entity.getPosition(entityPartialTicks).subtract(entity.position());
+
+			final GizmoProperties gizmo = Gizmos.cuboid(
+				entity.getBoundingBox().move(delta),
+				GizmoStyle.stroke(ARGB.color(192, 200, 220, 40))
+			);
+
+			if (alwaysVisible) {
+				gizmo.setAlwaysOnTop();
+			}
+		}
+	}
+}

src/main/java/net/modfest/fireblanket/mixin/client/accessor/AccessorClientChunkCache.java

@@ -0,0 +1,24 @@
+package net.modfest.fireblanket.mixin.client.accessor;
+
+import net.minecraft.client.multiplayer.ClientChunkCache;
+import net.minecraft.world.level.chunk.LevelChunk;
+import org.jspecify.annotations.Nullable;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.concurrent.atomic.AtomicReferenceArray;
+
+/**
+ * @author Ampflower
+ **/
+@Mixin(ClientChunkCache.class)
+public interface AccessorClientChunkCache {
+	@Accessor
+	ClientChunkCache.Storage getStorage();
+
+	@Mixin(ClientChunkCache.Storage.class)
+	interface Storage {
+		@Accessor
+		AtomicReferenceArray<@Nullable LevelChunk> getChunks();
+	}
+}

src/main/java/net/modfest/fireblanket/mixin/client/be_masking/MixinBlockEntityRenderDispatcher.java

@@ -5,8 +5,11 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.debug.DebugRenderer;
+import net.modfest.fireblanket.FireblanketMixin;
 import net.modfest.fireblanket.client.FireblanketDebug;
+import net.modfest.fireblanket.client.render.BlockEntityMaskRenderer;
 import net.modfest.fireblanket.client.render.BlockTimingRenderer;
+import net.modfest.fireblanket.client.render.EntityMaskRenderer;
 import net.modfest.fireblanket.client.render.EntityTimingRenderer;
 import net.modfest.fireblanket.client.render.RenderRegionRenderer;
 import org.spongepowered.asm.mixin.Final;
@@ -42,5 +45,10 @@ private void injectFireblanketDebuggers(final CallbackInfo ci, final @Local Mine
 		if (minecraft.debugEntries.isCurrentlyEnabled(FireblanketDebug.BLOCK_TICK_TIMES)) {
 			this.renderers.add(new BlockTimingRenderer(minecraft));
 		}
+
+		if (FireblanketMixin.DO_MASKING) {
+			this.renderers.add(new EntityMaskRenderer(minecraft));
+			this.renderers.add(new BlockEntityMaskRenderer(minecraft));
+		}
 	}
 }