From c6acb196f80dcc051de04e9e83be964b50bcee2a Mon Sep 17 00:00:00 2001 From: OrderedSet Date: Sat, 14 Nov 2026 21:07:11 -0800 Subject: [PATCH] Initial fixes for PR comments --- .../java/codechicken/nei/ClientHandler.java | 1 + .../java/codechicken/nei/NEIClientConfig.java | 6 +- .../codechicken/nei/WorldOverlayRenderer.java | 60 ++-------- .../nei/moboverlay/MobOverlayDisplayList.java | 2 +- .../nei/moboverlay/MobOverlayScan.java | 107 ++++++++++++++---- .../nei/moboverlay/MobOverlayStyle.java | 23 +--- src/main/resources/assets/nei/lang/en_US.lang | 1 - .../assets/nei/textures/overlay/gtnh_logo.png | Bin 6306 -> 0 bytes .../nei/textures/overlay/gtnh_logo.png.mcmeta | 6 - 9 files changed, 97 insertions(+), 109 deletions(-) delete mode 100644 src/main/resources/assets/nei/textures/overlay/gtnh_logo.png delete mode 100644 src/main/resources/assets/nei/textures/overlay/gtnh_logo.png.mcmeta diff --git a/src/main/java/codechicken/nei/ClientHandler.java b/src/main/java/codechicken/nei/ClientHandler.java index f78cc1fa..88fffb64 100644 --- a/src/main/java/codechicken/nei/ClientHandler.java +++ b/src/main/java/codechicken/nei/ClientHandler.java @@ -444,6 +444,7 @@ public class ClientHandler { if (event.world == mc.theWorld) { NEIClientConfig.unloadWorld(); ItemMobSpawner.clearEntityReferences(); + WorldOverlayRenderer.onWorldUnload(); } } diff --git a/src/main/java/codechicken/nei/NEIClientConfig.java b/src/main/java/codechicken/nei/NEIClientConfig.java index c71cd063..f630285e 100644 --- a/src/main/java/codechicken/nei/NEIClientConfig.java +++ b/src/main/java/codechicken/nei/NEIClientConfig.java @@ -17,7 +17,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; import net.minecraft.world.storage.SaveFormatComparator; import net.minecraftforge.common.MinecraftForge; @@ -462,8 +461,9 @@ public class NEIClientConfig { @Override public String getButtonText() { - final MobOverlayStyle style = MobOverlayStyle.parseStyle(getTag().getValue()); - return StatCollector.translateToLocal(style.getLangKey()); + return translateN( + "world.overlays.mobOverlayStyle." + + MobOverlayStyle.parseStyle(getTag().getValue()).formatName()); } }); diff --git a/src/main/java/codechicken/nei/WorldOverlayRenderer.java b/src/main/java/codechicken/nei/WorldOverlayRenderer.java index 2f0c7ba4..8b766534 100644 --- a/src/main/java/codechicken/nei/WorldOverlayRenderer.java +++ b/src/main/java/codechicken/nei/WorldOverlayRenderer.java @@ -4,20 +4,12 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.concurrent.Callable; -import net.minecraft.block.Block; -import net.minecraft.block.BlockSnow; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; import net.minecraft.entity.Entity; -import net.minecraft.entity.EnumCreatureType; -import net.minecraft.entity.passive.EntityPig; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatComponentText; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.EnumSkyBlock; -import net.minecraft.world.SpawnerAnimals; import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; import org.lwjgl.opengl.GL11; @@ -44,6 +36,11 @@ public class WorldOverlayRenderer implements IKeyStateTracker { chunkOverlay = 0; } + public static void onWorldUnload() { + MOB_OVERLAY_SCAN.clear(); + MOB_OVERLAY_LIST.delete(); + } + @Override public void tickKeyStates() { if (Minecraft.getMinecraft().currentScreen != null) return; @@ -86,15 +83,6 @@ public class WorldOverlayRenderer implements IKeyStateTracker { GL11.glPopAttrib(); } - private static double getOverlayYOffset(World world, int x, int y, int z) { - Block block = world.getBlock(x, y, z); - if (block instanceof BlockSnow) { - int meta = world.getBlockMetadata(x, y, z) & 7; - return (1 + meta) / 8.0 + 0.02; - } - return 0.02; - } - /** * The model view matrix is relative to ({@code intOffsetX}, {@code intOffsetY}, {@code intOffsetZ}), the camera * position cast to {@code int}. @@ -114,7 +102,7 @@ public class WorldOverlayRenderer implements IKeyStateTracker { .parseStyle(NEIClientConfig.getSetting("world.overlays.mobOverlayStyle").getValue()); final long worldTicks = entity.worldObj.getTotalWorldTime(); if (MOB_OVERLAY_LIST.isCompileDue(MOB_OVERLAY_SCAN.getModesVersion(), style, worldTicks)) { - compileMobOverlayList(entity.worldObj, style, worldTicks); + compileMobOverlayList(style, worldTicks); } beginMobOverlayDraw(style); @@ -125,7 +113,7 @@ public class WorldOverlayRenderer implements IKeyStateTracker { /** * Add a marked face to {@link #MOB_OVERLAY_LIST} for each block of {@link #MOB_OVERLAY_SCAN} where mobs can spawn. */ - private static void compileMobOverlayList(World world, MobOverlayStyle style, long worldTicks) { + private static void compileMobOverlayList(MobOverlayStyle style, long worldTicks) { MOB_OVERLAY_LIST.beginCompile(MOB_OVERLAY_SCAN, style, worldTicks); final float alpha = style.computeAlpha(); final Tessellator tess = Tessellator.instance; @@ -136,12 +124,7 @@ public class WorldOverlayRenderer implements IKeyStateTracker { for (int k = 0; k < MOB_OVERLAY_SCAN.getHeight(); k++) { if (MOB_OVERLAY_SCAN.readSpawnMode(i, k, j) == 0) continue; - final double yOffset = getOverlayYOffset( - world, - MOB_OVERLAY_SCAN.getMinX() + i, - MOB_OVERLAY_SCAN.getMinY() + k, - MOB_OVERLAY_SCAN.getMinZ() + j); - MARKED_FACE.moveTo(i, k + yOffset, j); + MARKED_FACE.moveTo(i, k + MOB_OVERLAY_SCAN.readOverlayYOffset(i, k, j), j); loadNeighbourModes(i, k, j); MARKED_FACE.applyColor(style.colouring, alpha); style.addVertices(MARKED_FACE); @@ -191,33 +174,6 @@ public class WorldOverlayRenderer implements IKeyStateTracker { GL11.glDisable(GL11.GL_BLEND); } - private static final Entity dummyEntity = new EntityPig(null); - private static final AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox(0, 0, 0, 0, 0, 0); - - public static byte getSpawnMode(Chunk chunk, int x, int y, int z) { - if (y >= chunk.worldObj.getHeight()) { - return 0; - } - - if (chunk.getSavedLightValue(EnumSkyBlock.Block, x & 15, y, z & 15) >= 8 - || !SpawnerAnimals.canCreatureTypeSpawnAtLocation(EnumCreatureType.monster, chunk.worldObj, x, y, z)) { - return 0; - } - - aabb.minX = x + 0.2; - aabb.maxX = x + 0.8; - aabb.minY = y + 0.01; - aabb.maxY = y + 1.8; - aabb.minZ = z + 0.2; - aabb.maxZ = z + 0.8; - if (!chunk.worldObj.getCollidingBoundingBoxes(dummyEntity, aabb).isEmpty() - || chunk.worldObj.isAnyLiquid(aabb)) { - return 0; - } - - return (byte) (chunk.getSavedLightValue(EnumSkyBlock.Sky, x & 15, y, z & 15) >= 8 ? 1 : 2); - } - private static void renderChunkBounds(Entity entity, int intOffsetX, int intOffsetY, int intOffsetZ) { if (chunkOverlay == 0) return; diff --git a/src/main/java/codechicken/nei/moboverlay/MobOverlayDisplayList.java b/src/main/java/codechicken/nei/moboverlay/MobOverlayDisplayList.java index 80cb24c8..3265d3cb 100644 --- a/src/main/java/codechicken/nei/moboverlay/MobOverlayDisplayList.java +++ b/src/main/java/codechicken/nei/moboverlay/MobOverlayDisplayList.java @@ -17,7 +17,7 @@ public final class MobOverlayDisplayList { /** * Compiles after a {@link MobOverlayScan#getModesVersion} change are debounced to one per {@code MIN_COMPILE_TICKS} - * ticks, because the version changes several times per second while the player moves fast, and a compile takes a + * ticks, because the version changes several times per second while the player moves fast, and a compile runs for a * millisecond or more. */ public boolean isCompileDue(int currentModesVersion, MobOverlayStyle currentStyle, long worldTicks) { diff --git a/src/main/java/codechicken/nei/moboverlay/MobOverlayScan.java b/src/main/java/codechicken/nei/moboverlay/MobOverlayScan.java index 40d9ff04..f3d36545 100644 --- a/src/main/java/codechicken/nei/moboverlay/MobOverlayScan.java +++ b/src/main/java/codechicken/nei/moboverlay/MobOverlayScan.java @@ -1,23 +1,27 @@ package codechicken.nei.moboverlay; +import net.minecraft.block.Block; +import net.minecraft.block.BlockSnow; import net.minecraft.entity.Entity; import net.minecraft.entity.EnumCreatureType; +import net.minecraft.entity.passive.EntityPig; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.IWorldAccess; +import net.minecraft.world.SpawnerAnimals; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.Chunk; import codechicken.lib.math.MathHelper; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.WorldOverlayRenderer; /** - * Spawn modes in a box around the player, from {@link WorldOverlayRenderer#getSpawnMode}: 0 for no spawns, 1 for night - * only and 2 for any time. The box moves with the player once the player is a few blocks from the box's centre, and - * {@link #update} scans only the blocks that enter the box. {@link #update} rescans the column of a block or light - * change on the next tick. On each tick, {@link #update} also rescans a slice of the columns, for changes with no block - * update, such as a boat that moves into the box. + * Spawn modes and snow layers in a box around the player. The spawn modes are from {@link Column#getSpawnMode}: 0 for + * no spawns, 1 for night only and 2 for any time. The box moves with the player once the player is a few blocks from + * the box's centre, and {@link #update} scans only the blocks that enter the box. {@link #update} rescans the column of + * a block or light change on the next tick. On each tick, {@link #update} also rescans a slice of the columns, for + * changes with no block update, such as a boat that moves into the box. */ public final class MobOverlayScan { @@ -31,6 +35,8 @@ public final class MobOverlayScan { private static final int RECENTRE_DISTANCE = 4; private static final int VERTICAL_RECENTRE_DISTANCE = 2; private static final int RESCAN_TICKS = 40; + private static final int SPAWN_MODE_MASK = 3; + private static final int SNOW_LAYERS_SHIFT = 2; private final IWorldAccess changeListener = new ChangeListener(); private final Column column = new Column(); @@ -38,7 +44,8 @@ public final class MobOverlayScan { private int verticalRadius; private int span; private int height; - // a ring buffer over the box, indexed by `findCell()` + // a ring buffer over the box, indexed by `findCell()`. A cell has the spawn mode in the bits of `SPAWN_MODE_MASK`, + // and the block's snow layers shifted left by `SNOW_LAYERS_SHIFT` private byte[] modes = new byte[0]; // indexed by `findColumn(x, z)` private boolean[] dirty = new boolean[0]; @@ -55,6 +62,8 @@ public final class MobOverlayScan { private World scannedWorld; public void clear() { + if (scannedWorld == null && span == 0) return; + if (scannedWorld != null) scannedWorld.removeWorldAccess(changeListener); radius = 0; verticalRadius = 0; @@ -64,6 +73,8 @@ public final class MobOverlayScan { dirty = new boolean[0]; hasModes = false; scannedWorld = null; + // `Chunk.worldObj` references the world + column.chunk = null; } /** @@ -101,7 +112,7 @@ public final class MobOverlayScan { if (isChanged) modesVersion++; } - /** The version changes when a spawn mode changes or the box moves. */ + /** The version changes when a spawn mode or a snow layer changes, or the box moves. */ public int getModesVersion() { return modesVersion; } @@ -128,7 +139,18 @@ public final class MobOverlayScan { /** {@code i} and {@code j} are from 0 to {@link #getSpan}, and {@code k} is from 0 to {@link #getHeight}. */ public byte readSpawnMode(int i, int k, int j) { - return modes[findCell(minX + i, minY + k, minZ + j)]; + return (byte) (modes[findCell(minX + i, minY + k, minZ + j)] & SPAWN_MODE_MASK); + } + + /** + * Height of the overlay above the bottom of the block, so that a snow layer does not cover the overlay. The indices + * are those of {@link #readSpawnMode}. + */ + public double readOverlayYOffset(int i, int k, int j) { + final int SNOW_LAYERS_PER_BLOCK = 8; + final double OVERLAY_GAP = 0.02; + final int snowLayers = modes[findCell(minX + i, minY + k, minZ + j)] >> SNOW_LAYERS_SHIFT; + return (double) snowLayers / SNOW_LAYERS_PER_BLOCK + OVERLAY_GAP; } private void resize(int newRadius, int newVerticalRadius) { @@ -139,10 +161,10 @@ public final class MobOverlayScan { modes = new byte[span * span * height]; dirty = new boolean[span * span]; hasModes = false; + nextRescanColumn = 0; } private void scanFullBox(int centreX, int centreY, int centreZ) { - final long startNanos = System.nanoTime(); minX = centreX - radius; minY = centreY - verticalRadius; minZ = centreZ - radius; @@ -154,12 +176,6 @@ public final class MobOverlayScan { hasModes = true; modesVersion++; scannedTick = scannedWorld.getTotalWorldTime(); - NEIClientConfig.logger.info( - "moboverlay.scan.full radius={} verticalRadius={} columns={} micros={}", - radius, - verticalRadius, - span * span, - (System.nanoTime() - startNanos) / 1000); } private void watchWorld(World world) { @@ -230,11 +246,11 @@ public final class MobOverlayScan { final int z = minZ + nextRescanColumn % span; isChanged |= scanColumn(x, z); } - if (nextRescanColumn == columnCount) nextRescanColumn = 0; + if (nextRescanColumn >= columnCount) nextRescanColumn = 0; return isChanged; } - /** @return whether a spawn mode changed */ + /** @return whether a spawn mode or a snow layer changed */ private boolean scanColumn(int x, int z) { column.moveTo(x, z); dirty[findColumn(x, z)] = false; @@ -255,6 +271,8 @@ public final class MobOverlayScan { */ private final class Column { + private final Entity dummyEntity = new EntityPig(null); + private final AxisAlignedBB spawnBox = AxisAlignedBB.getBoundingBox(0, 0, 0, 0, 0, 0); private int x; private int z; private Chunk chunk; @@ -268,21 +286,60 @@ public final class MobOverlayScan { canBiomeSpawn = !biome.getSpawnableList(EnumCreatureType.monster).isEmpty() && biome.getSpawningChance() > 0; chunk = scannedWorld.getChunkFromBlockCoords(x, z); - topY = Math.min(scannedWorld.getHeight() - 1, scannedWorld.getHeightValue(x, z)); + // on the client, `Chunk.generateHeightMap()` never tests the top layer of the highest non-empty section. + // `getHeightValue()` can then be below a block on that layer, so test that layer here + final int topLayerY = chunk.getTopFilledSegment() + 15; + final boolean isTopLayerFilled = !chunk.isEmpty() && chunk.func_150808_b(x & 15, topLayerY, z & 15) != 0; + final int heightValue = isTopLayerFilled ? topLayerY + 1 : scannedWorld.getHeightValue(x, z); + topY = Math.min(scannedWorld.getHeight() - 1, heightValue); } - /** @return whether a spawn mode changed */ + /** @return whether a spawn mode or a snow layer changed */ private boolean scan(int fromY, int toY) { boolean isChanged = false; for (int y = fromY; y < toY; y++) { - final byte spawnMode = canBiomeSpawn && y <= topY ? WorldOverlayRenderer.getSpawnMode(chunk, x, y, z) - : 0; + final int spawnMode = canBiomeSpawn && y <= topY ? getSpawnMode(y) : 0; + final byte cellValue = (byte) (spawnMode == 0 ? 0 + : spawnMode | (readSnowLayers(y) << SNOW_LAYERS_SHIFT)); final int cell = findCell(x, y, z); - isChanged |= modes[cell] != spawnMode; - modes[cell] = spawnMode; + isChanged |= modes[cell] != cellValue; + modes[cell] = cellValue; } return isChanged; } + + /** The spawn mode of the block at height {@code y} in this column. */ + private byte getSpawnMode(int y) { + if (y >= chunk.worldObj.getHeight()) { + return 0; + } + + if (chunk.getSavedLightValue(EnumSkyBlock.Block, x & 15, y, z & 15) >= 8 || !SpawnerAnimals + .canCreatureTypeSpawnAtLocation(EnumCreatureType.monster, chunk.worldObj, x, y, z)) { + return 0; + } + + spawnBox.minX = x + 0.2; + spawnBox.maxX = x + 0.8; + spawnBox.minY = y + 0.01; + spawnBox.maxY = y + 1.8; + spawnBox.minZ = z + 0.2; + spawnBox.maxZ = z + 0.8; + if (!chunk.worldObj.getCollidingBoundingBoxes(dummyEntity, spawnBox).isEmpty() + || chunk.worldObj.isAnyLiquid(spawnBox)) { + return 0; + } + + return (byte) (chunk.getSavedLightValue(EnumSkyBlock.Sky, x & 15, y, z & 15) >= 8 ? 1 : 2); + } + + private int readSnowLayers(int y) { + final Block block = chunk.getBlock(x & 15, y, z & 15); + if (!(block instanceof BlockSnow)) return 0; + + // snow metadata 0 is one layer + return (chunk.getBlockMetadata(x & 15, y, z & 15) & 7) + 1; + } } /** Marks the columns of the block and light changes in {@link #scannedWorld}. */ diff --git a/src/main/java/codechicken/nei/moboverlay/MobOverlayStyle.java b/src/main/java/codechicken/nei/moboverlay/MobOverlayStyle.java index 73636004..10117175 100644 --- a/src/main/java/codechicken/nei/moboverlay/MobOverlayStyle.java +++ b/src/main/java/codechicken/nei/moboverlay/MobOverlayStyle.java @@ -62,15 +62,6 @@ public enum MobOverlayStyle { } }, - /** The GTNH logo without the globe. */ - GTNH_LOGO("gtnh_logo", Colouring.OVERLAY) { - - @Override - public void addVertices(MobOverlayFace face) { - face.addTexturedFace(); - } - }, - /** The pufferfish sticker. */ PUFFERFISH("pufferfish", Colouring.STICKER) { @@ -124,22 +115,12 @@ public enum MobOverlayStyle { return name().toLowerCase(Locale.ROOT); } - public String getLangKey() { - return switch (this) { - case X -> "nei.options.world.overlays.mobOverlayStyle.x"; - case CONNECTED -> "nei.options.world.overlays.mobOverlayStyle.connected"; - case SQUARE -> "nei.options.world.overlays.mobOverlayStyle.square"; - case GTNH_LOGO -> "nei.options.world.overlays.mobOverlayStyle.gtnh_logo"; - case PUFFERFISH -> "nei.options.world.overlays.mobOverlayStyle.pufferfish"; - }; - } - public float computeAlpha() { return switch (this) { case CONNECTED -> TINT_ALPHA; case SQUARE -> MARK_ALPHA; - // the alpha is in the PNGs - case X, GTNH_LOGO, PUFFERFISH -> 1.0F; + // opaque lines for X, and the alpha of the PNG for PUFFERFISH + case X, PUFFERFISH -> 1.0F; }; } diff --git a/src/main/resources/assets/nei/lang/en_US.lang b/src/main/resources/assets/nei/lang/en_US.lang index 890f9bb9..8b1528b3 100644 --- a/src/main/resources/assets/nei/lang/en_US.lang +++ b/src/main/resources/assets/nei/lang/en_US.lang @@ -570,7 +570,6 @@ nei.options.world.overlays.mobOverlayStyle=Mob Spawn Overlay Style nei.options.world.overlays.mobOverlayStyle.x=X nei.options.world.overlays.mobOverlayStyle.connected=Connected nei.options.world.overlays.mobOverlayStyle.square=Square -nei.options.world.overlays.mobOverlayStyle.gtnh_logo=GTNH Logo nei.options.world.overlays.mobOverlayStyle.pufferfish=Pufferfish nei.options.world.overlays.mobOverlayRadius=Mob Spawn Overlay Horizontal Radius nei.options.world.overlays.mobOverlayRadius.tip=Horizontal block radius scanned around you. Range 8-64 blocks diff --git a/src/main/resources/assets/nei/textures/overlay/gtnh_logo.png b/src/main/resources/assets/nei/textures/overlay/gtnh_logo.png deleted file mode 100644 index 2492fdf9e9a9e90c4d440ae78358376e820fba65..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6306 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