From d04718c5c672394f96e41a46e94c9ab74d4b3905 Mon Sep 17 00:00:00 2001 From: OrderedSet Date: Sat, 7 Nov 2026 22:59:28 -0800 Subject: [PATCH] Add light level overlay variants, set default to connected --- .../codechicken/nei/MobSpawnMarkedFace.java | 101 ++++++++++ .../codechicken/nei/MobSpawnOverlayStyle.java | 156 +++++++++++++++ .../java/codechicken/nei/MobSpawnScan.java | 181 ++++++++++++++++++ .../java/codechicken/nei/NEIClientConfig.java | 32 ++++ .../codechicken/nei/WorldOverlayRenderer.java | 179 ++++++++--------- src/main/resources/assets/nei/lang/en_US.lang | 8 + .../assets/nei/textures/overlay/gtnh_logo.png | Bin 0 -> 7779 bytes .../nei/textures/overlay/gtnh_logo.png.mcmeta | 6 + .../nei/textures/overlay/pufferfish.png | Bin 0 -> 18566 bytes .../textures/overlay/pufferfish.png.mcmeta | 6 + 10 files changed, 567 insertions(+), 102 deletions(-) create mode 100644 src/main/java/codechicken/nei/MobSpawnMarkedFace.java create mode 100644 src/main/java/codechicken/nei/MobSpawnOverlayStyle.java create mode 100644 src/main/java/codechicken/nei/MobSpawnScan.java create mode 100644 src/main/resources/assets/nei/textures/overlay/gtnh_logo.png create mode 100644 src/main/resources/assets/nei/textures/overlay/gtnh_logo.png.mcmeta create mode 100644 src/main/resources/assets/nei/textures/overlay/pufferfish.png create mode 100644 src/main/resources/assets/nei/textures/overlay/pufferfish.png.mcmeta diff --git a/src/main/java/codechicken/nei/MobSpawnMarkedFace.java b/src/main/java/codechicken/nei/MobSpawnMarkedFace.java new file mode 100644 index 00000000..13259184 --- /dev/null +++ b/src/main/java/codechicken/nei/MobSpawnMarkedFace.java @@ -0,0 +1,101 @@ +package codechicken.nei; + +import net.minecraft.client.renderer.Tessellator; + +/** + * The top face of one block where mobs can spawn, in the coordinates of the overlay draw, with the spawn modes of the 8 + * blocks around the block at the same height. One instance is moved from block to block, so the draw allocates nothing. + * An offset of -1 is west or north, and 1 is east or south. + */ +public final class MobSpawnMarkedFace { + + /** The spawn mode of a neighbour outside {@link MobSpawnScan}. */ + public static final byte OUTSIDE_SCAN = -2; + + private static final int NEIGHBOURHOOD_SIZE = 3; + + private final byte[] neighbourModes = new byte[NEIGHBOURHOOD_SIZE * NEIGHBOURHOOD_SIZE]; + private double x; + private double y; + private double z; + + /** Move to the block whose north-west top corner is at {@code (x, y, z)}. */ + public void moveTo(double x, double y, double z) { + this.x = x; + this.y = y; + this.z = z; + } + + /** The mode at offset {@code (0, 0)} is the spawn mode of this face. */ + public void setNeighbourMode(int offsetX, int offsetZ, byte spawnMode) { + neighbourModes[indexNeighbour(offsetX, offsetZ)] = spawnMode; + } + + /** Set the colour of the next vertices, for the spawn mode of this face. */ + public void applyColor(MobSpawnOverlayStyle.Colouring colouring, float alpha) { + final boolean isNightOnly = neighbourModes[indexNeighbour(0, 0)] == MobSpawnScan.NIGHT_ONLY; + final int rgb = switch (colouring) { + case OVERLAY -> isNightOnly ? 0xFFFF00 : 0xFF0000; + case STICKER -> isNightOnly ? 0xFFFFFF : 0xFF7373; + }; + Tessellator.instance.setColorRGBA_I(rgb, Math.round(alpha * 255)); + } + + /** + * Whether the neighbour has the spawn mode of this face. A neighbour outside {@link MobSpawnScan} counts as joined: + * the edge of the scan is no edge between spawn modes. + */ + public boolean isJoined(int offsetX, int offsetZ) { + final byte neighbourMode = neighbourModes[indexNeighbour(offsetX, offsetZ)]; + return neighbourMode == neighbourModes[indexNeighbour(0, 0)] || neighbourMode == OUTSIDE_SCAN; + } + + public void addFullFace() { + addVertex(0, 0); + addVertex(0, 1); + addVertex(1, 1); + addVertex(1, 0); + } + + /** + * Add a quad on one cell of a 3 x 3 grid over the face. The cells along the edges are {@code width} wide, and the + * cell at offset {@code (0, 0)} fills the rest. + */ + public void addCell(int offsetX, int offsetZ, double width) { + final double west = computeCellStart(offsetX, width); + final double east = 1 - computeCellStart(-offsetX, width); + final double north = computeCellStart(offsetZ, width); + final double south = 1 - computeCellStart(-offsetZ, width); + addVertex(west, north); + addVertex(west, south); + addVertex(east, south); + addVertex(east, north); + } + + /** Add the face as one quad with the whole texture, upright to a player facing south (+z). */ + public void addTexturedFace() { + addTexturedVertex(0, 0); + addTexturedVertex(0, 1); + addTexturedVertex(1, 1); + addTexturedVertex(1, 0); + } + + /** @param offsetX from 0 at the west edge to 1 at the east edge */ + public void addVertex(double offsetX, double offsetZ) { + Tessellator.instance.addVertex(x + offsetX, y, z + offsetZ); + } + + private void addTexturedVertex(double offsetX, double offsetZ) { + Tessellator.instance.setTextureUV(1 - offsetX, 1 - offsetZ); + addVertex(offsetX, offsetZ); + } + + private static int indexNeighbour(int offsetX, int offsetZ) { + return (offsetX + 1) * NEIGHBOURHOOD_SIZE + offsetZ + 1; + } + + private static double computeCellStart(int offset, double width) { + if (offset < 0) return 0; + return offset == 0 ? width : 1 - width; + } +} diff --git a/src/main/java/codechicken/nei/MobSpawnOverlayStyle.java b/src/main/java/codechicken/nei/MobSpawnOverlayStyle.java new file mode 100644 index 00000000..1b031c30 --- /dev/null +++ b/src/main/java/codechicken/nei/MobSpawnOverlayStyle.java @@ -0,0 +1,156 @@ +package codechicken.nei; + +import java.util.Locale; + +import javax.annotation.Nullable; + +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + +/** + * The shape drawn on the top face of each block where mobs can spawn, by the mob spawn overlay. The setting + * {@code world.overlays.mobSpawnStyle} has the lower-case name of the style. + */ +public enum MobSpawnOverlayStyle { + + /** A cross from corner to corner. */ + X(GL11.GL_LINES) { + + @Override + public void addVertices(MobSpawnMarkedFace face) { + face.addVertex(0, 0); + face.addVertex(1, 1); + face.addVertex(1, 0); + face.addVertex(0, 1); + } + }, + + /** + * A translucent tint over the face, and a stronger band inside each edge to a block of another spawn mode. The band + * follows the outline of each region of one spawn mode, like the border of a connected texture. + */ + CONNECTED(GL11.GL_QUADS) { + + @Override + public void addVertices(MobSpawnMarkedFace face) { + final double BAND_WIDTH = 1.0 / 16; + face.addFullFace(); + face.applyColor(Colouring.OVERLAY, MARK_ALPHA); + for (int offsetX = -1; offsetX <= 1; offsetX++) { + for (int offsetZ = -1; offsetZ <= 1; offsetZ++) { + // a corner cell of the band is drawn when either side of the corner has a band, and on the inside + // corner of an L-shaped region + final boolean isBand = !(face.isJoined(offsetX, offsetZ) && face.isJoined(offsetX, 0) + && face.isJoined(0, offsetZ)); + if (isBand) face.addCell(offsetX, offsetZ, BAND_WIDTH); + } + } + } + }, + + /** A small translucent square in the middle of the face, with no tint. */ + SQUARE(GL11.GL_QUADS) { + + @Override + public void addVertices(MobSpawnMarkedFace face) { + final double CENTRE = 0.5; + final double HALF_SIDE = 7.0 / 64; + face.addVertex(CENTRE - HALF_SIDE, CENTRE - HALF_SIDE); + face.addVertex(CENTRE - HALF_SIDE, CENTRE + HALF_SIDE); + face.addVertex(CENTRE + HALF_SIDE, CENTRE + HALF_SIDE); + face.addVertex(CENTRE + HALF_SIDE, CENTRE - HALF_SIDE); + } + }, + + /** The gear and the letters of the GTNH logo, as a mask in the overlay colour. */ + GTNH_LOGO("gtnh_logo", Colouring.OVERLAY) { + + @Override + public void addVertices(MobSpawnMarkedFace face) { + face.addTexturedFace(); + } + }, + + /** A sticker of a yellow pufferfish, in the sticker's colours. */ + PUFFERFISH("pufferfish", Colouring.STICKER) { + + @Override + public void addVertices(MobSpawnMarkedFace face) { + face.addTexturedFace(); + } + }; + + public static final MobSpawnOverlayStyle DEFAULT = CONNECTED; + + private static final float TINT_ALPHA = 0.15F; + // the band of `CONNECTED` and the mark of `SQUARE` cover a small part of the face. At `TINT_ALPHA`, the band and + // the mark are too faint to see + private static final float MARK_ALPHA = 0.45F; + + /** The draw mode for {@code Tessellator.startDrawing}. */ + public final int glMode; + @Nullable + public final ResourceLocation texture; + public final Colouring colouring; + + MobSpawnOverlayStyle(int glMode) { + this.glMode = glMode; + this.texture = null; + this.colouring = Colouring.OVERLAY; + } + + /** A style of one textured quad over the face, from {@code textures/overlay/.png} of NEI. */ + MobSpawnOverlayStyle(String textureName, Colouring colouring) { + this.glMode = GL11.GL_QUADS; + this.texture = new ResourceLocation("nei", "textures/overlay/" + textureName + ".png"); + this.colouring = colouring; + } + + /** @return the style named {@code rawStyle} in any case, or {@link #DEFAULT} for an unknown name */ + public static MobSpawnOverlayStyle parseStyle(String rawStyle) { + for (MobSpawnOverlayStyle candidate : values()) { + if (candidate.formatName().equalsIgnoreCase(rawStyle)) return candidate; + } + return DEFAULT; + } + + public String formatName() { + return name().toLowerCase(Locale.ROOT); + } + + public String getLangKey() { + return switch (this) { + case X -> "nei.options.world.overlays.mobSpawnStyle.x"; + case CONNECTED -> "nei.options.world.overlays.mobSpawnStyle.connected"; + case SQUARE -> "nei.options.world.overlays.mobSpawnStyle.square"; + case GTNH_LOGO -> "nei.options.world.overlays.mobSpawnStyle.gtnh_logo"; + case PUFFERFISH -> "nei.options.world.overlays.mobSpawnStyle.pufferfish"; + }; + } + + public boolean isFilled() { + return glMode == GL11.GL_QUADS; + } + + public float computeAlpha() { + return switch (this) { + case CONNECTED -> TINT_ALPHA; + case SQUARE -> MARK_ALPHA; + // the lines of `X` are opaque. The textures have the opacity + case X, GTNH_LOGO, PUFFERFISH -> 1.0F; + }; + } + + public abstract void addVertices(MobSpawnMarkedFace face); + + /** The colours of a style. */ + public enum Colouring { + /** + * Yellow where mobs spawn only at night, red where mobs spawn at any time, through the alpha of any texture. + */ + OVERLAY, + /** The colours of the texture, tinted red where mobs spawn at any time. */ + STICKER + } +} diff --git a/src/main/java/codechicken/nei/MobSpawnScan.java b/src/main/java/codechicken/nei/MobSpawnScan.java new file mode 100644 index 00000000..5bf5f2d2 --- /dev/null +++ b/src/main/java/codechicken/nei/MobSpawnScan.java @@ -0,0 +1,181 @@ +package codechicken.nei; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EnumCreatureType; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.chunk.Chunk; + +import codechicken.lib.math.MathHelper; + +/** + * The spawn modes of the blocks around the render view entity, in a square that reaches the radius of {@link #update} + * on each side of the entity, and {@link #VERTICAL_RADIUS} blocks above and below. Once per tick, {@link #update} + * rescans {@code 1 / REFRESH_TICKS} of the columns into a second buffer, and after a full pass the second buffer + * becomes the drawn buffer. A block's mode is 0 where mobs can't spawn, {@link #NIGHT_ONLY} where mobs spawn only at + * night and 2 where mobs spawn at any time. + */ +public final class MobSpawnScan { + + public static final byte NIGHT_ONLY = 1; + public static final int MIN_RADIUS = 8; + public static final int MAX_RADIUS = 64; + public static final int DEFAULT_RADIUS = 32; + public static final int VERTICAL_RADIUS = 16; + public static final int HEIGHT = 2 * VERTICAL_RADIUS + 1; + private static final int REFRESH_TICKS = 10; + + private int radius; + private int span; + // the drawn buffer: `modes[column * HEIGHT + k]`, valid for `k < columnEnds[column]` + private byte[] modes = new byte[0]; + private int[] columnEnds = new int[0]; + private int minX; + private int minY; + private int minZ; + // the buffer of the pass in progress + private byte[] nextModes = new byte[0]; + private int[] nextColumnEnds = new int[0]; + private int nextMinX; + private int nextMinY; + private int nextMinZ; + private int nextColumn; + private boolean hasModes; + private long scannedTick; + // the world of the drawn modes + private World scannedWorld; + + /** Drop the scanned modes and free the buffers, so that the next call of {@link #update} is a full scan. */ + public void clear() { + radius = 0; + span = 0; + modes = new byte[0]; + columnEnds = new int[0]; + nextModes = new byte[0]; + nextColumnEnds = new int[0]; + hasModes = false; + scannedWorld = null; + } + + /** + * Scan the next slice of columns once per tick. On the first call after {@link #clear}, a change of + * {@code newRadius} or a change of world, scan every column at once and log the time of the scan. {@code newRadius} + * is clamped to {@link #MIN_RADIUS} and {@link #MAX_RADIUS}. + */ + public void update(Entity entity, int newRadius) { + final World world = entity.worldObj; + final int clampedRadius = Math.max(MIN_RADIUS, Math.min(MAX_RADIUS, newRadius)); + if (radius != clampedRadius) resize(clampedRadius); + if (!(hasModes && world == scannedWorld)) { + scanFullPass(entity); + return; + } + + final long worldTicks = world.getTotalWorldTime(); + if (worldTicks == scannedTick) return; + + scannedTick = worldTicks; + final int columnCount = span * span; + final int sliceEnd = Math.min(columnCount, nextColumn + (columnCount + REFRESH_TICKS - 1) / REFRESH_TICKS); + for (; nextColumn < sliceEnd; nextColumn++) { + scanColumn(world, nextColumn); + } + if (nextColumn == columnCount) { + swapBuffers(); + startPass(entity); + } + } + + public int getSpan() { + return span; + } + + public int getMinX() { + return minX; + } + + public int getMinY() { + return minY; + } + + public int getMinZ() { + return minZ; + } + + public int getColumnEnd(int column) { + return columnEnds[column]; + } + + /** @return the spawn mode of the block at height index {@code k} of {@code column}, 0 above the column's end */ + public byte readSpawnMode(int column, int k) { + return k < columnEnds[column] ? modes[column * HEIGHT + k] : 0; + } + + private void resize(int newRadius) { + radius = newRadius; + span = 2 * newRadius + 1; + modes = new byte[span * span * HEIGHT]; + columnEnds = new int[span * span]; + nextModes = new byte[span * span * HEIGHT]; + nextColumnEnds = new int[span * span]; + hasModes = false; + } + + private void scanFullPass(Entity entity) { + final long startNanos = System.nanoTime(); + startPass(entity); + for (; nextColumn < span * span; nextColumn++) { + scanColumn(entity.worldObj, nextColumn); + } + swapBuffers(); + hasModes = true; + scannedWorld = entity.worldObj; + scannedTick = entity.worldObj.getTotalWorldTime(); + NEIClientConfig.logger.info( + "moboverlay.scan.full radius={} columns={} micros={}", + radius, + span * span, + (System.nanoTime() - startNanos) / 1000); + startPass(entity); + } + + private void startPass(Entity entity) { + final int centreY = (int) MathHelper + .clip(entity.posY, VERTICAL_RADIUS, entity.worldObj.getHeight() - VERTICAL_RADIUS); + nextMinX = (int) entity.posX - radius; + nextMinY = centreY - VERTICAL_RADIUS; + nextMinZ = (int) entity.posZ - radius; + nextColumn = 0; + } + + private void scanColumn(World world, int column) { + final int x = nextMinX + column / span; + final int z = nextMinZ + column % span; + final BiomeGenBase biome = world.getBiomeGenForCoords(x, z); + if (biome.getSpawnableList(EnumCreatureType.monster).isEmpty() || biome.getSpawningChance() <= 0) { + nextColumnEnds[column] = 0; + return; + } + + final Chunk chunk = world.getChunkFromBlockCoords(x, z); + final int topY = Math.min(world.getHeight() - 1, world.getHeightValue(x, z)); + int end = 0; + while (end < HEIGHT && nextMinY + end <= topY) { + nextModes[column * HEIGHT + end] = WorldOverlayRenderer.getSpawnMode(chunk, x, nextMinY + end, z); + end++; + } + nextColumnEnds[column] = end; + } + + private void swapBuffers() { + final byte[] scannedModes = nextModes; + nextModes = modes; + modes = scannedModes; + final int[] scannedEnds = nextColumnEnds; + nextColumnEnds = columnEnds; + columnEnds = scannedEnds; + minX = nextMinX; + minY = nextMinY; + minZ = nextMinZ; + } +} diff --git a/src/main/java/codechicken/nei/NEIClientConfig.java b/src/main/java/codechicken/nei/NEIClientConfig.java index 1a532500..262c8993 100644 --- a/src/main/java/codechicken/nei/NEIClientConfig.java +++ b/src/main/java/codechicken/nei/NEIClientConfig.java @@ -17,6 +17,7 @@ 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; @@ -442,6 +443,37 @@ public class NEIClientConfig { tag.getTag("world.overlays.lock").getBooleanValue(true); API.addOption(new OptionToggleButton("world.overlays.lock", true)); + tag.getTag("world.overlays.mobSpawnStyle").setComment( + "Mark on each block of the mob spawn overlay: x, connected, square, gtnh_logo or pufferfish") + .getValue(MobSpawnOverlayStyle.DEFAULT.formatName()); + API.addOption(new OptionCycled("world.overlays.mobSpawnStyle", MobSpawnOverlayStyle.values().length, true) { + + @Override + public int value() { + return MobSpawnOverlayStyle.parseStyle(getTag().getValue()).ordinal(); + } + + @Override + public void setValue(int value) { + getTag().setValue(MobSpawnOverlayStyle.values()[value].formatName()); + } + + @Override + public String getButtonText() { + final MobSpawnOverlayStyle style = MobSpawnOverlayStyle.parseStyle(getTag().getValue()); + return StatCollector.translateToLocal(style.getLangKey()); + } + }); + + tag.getTag("world.overlays.mobSpawnRadius") + .setComment("Blocks scanned on each side of the player by the mob spawn overlay") + .getIntValue(MobSpawnScan.DEFAULT_RADIUS); + API.addOption( + new OptionIntegerField( + "world.overlays.mobSpawnRadius", + MobSpawnScan.MIN_RADIUS, + MobSpawnScan.MAX_RADIUS)); + tag.getTag("inventory.itempanelScale").getIntValue(100); ItemsPanelGrid.updateScale(); API.addOption(new OptionIntegerField("inventory.itempanelScale", 1, 1000) { diff --git a/src/main/java/codechicken/nei/WorldOverlayRenderer.java b/src/main/java/codechicken/nei/WorldOverlayRenderer.java index 56a3af37..cfa0556c 100644 --- a/src/main/java/codechicken/nei/WorldOverlayRenderer.java +++ b/src/main/java/codechicken/nei/WorldOverlayRenderer.java @@ -13,17 +13,16 @@ 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.biome.BiomeGenBase; import net.minecraft.world.chunk.Chunk; import org.lwjgl.opengl.GL11; import com.cardinalstar.cubicchunks.world.api.IMinMaxHeight; -import codechicken.lib.math.MathHelper; import codechicken.nei.KeyManager.IKeyStateTracker; import cpw.mods.fml.relauncher.ReflectionHelper; @@ -32,8 +31,8 @@ public class WorldOverlayRenderer implements IKeyStateTracker { public static int chunkOverlay = 0; public static int mobOverlay = 0; - private static byte[] mobSpawnCache; - private static long mobOverlayUpdateTime; + private static final MobSpawnScan mobSpawnScan = new MobSpawnScan(); + private static final MobSpawnMarkedFace markedFace = new MobSpawnMarkedFace(); public static void reset() { mobOverlay = 0; @@ -82,51 +81,6 @@ public class WorldOverlayRenderer implements IKeyStateTracker { GL11.glPopAttrib(); } - private static void buildMobSpawnOverlay(Entity entity) { - if (mobSpawnCache == null) { - mobSpawnCache = new byte[33 * 33 * 33]; // 35kB - } - - World world = entity.worldObj; - int worldHeight = world.getHeight(); - - int x1 = (int) entity.posX; - int z1 = (int) entity.posZ; - int y1 = (int) MathHelper.clip(entity.posY, 16, worldHeight - 16); - - for (int i = 0; i <= 32; i++) { - int x = x1 - 16 + i; - for (int j = 0; j <= 32; j++) { - int z = z1 - 16 + j; - int bufIndex = (i * 33 + j) * 33; - - Chunk chunk = world.getChunkFromBlockCoords(x, z); - BiomeGenBase biome = world.getBiomeGenForCoords(x, z); - if (biome.getSpawnableList(EnumCreatureType.monster).isEmpty() || biome.getSpawningChance() <= 0) { - mobSpawnCache[bufIndex] = -1; - continue; - } - - int maxHeight = chunk.worldObj.getHeightValue(x, z); - - for (int k = 0; k <= 32; k++) { - int y = y1 - 16 + k; - - if (y >= worldHeight) { - mobSpawnCache[bufIndex + k] = -1; - continue; - } - - if (y > maxHeight) { - mobSpawnCache[bufIndex + k] = -1; - break; - } - mobSpawnCache[bufIndex + k] = getSpawnMode(chunk, x, y, z); - } - } - } - } - private static double getOverlayYOffset(World world, int x, int y, int z) { Block block = world.getBlock(x, y, z); if (block instanceof BlockSnow) { @@ -138,70 +92,91 @@ public class WorldOverlayRenderer implements IKeyStateTracker { private static void renderMobSpawnOverlay(Entity entity, int intOffsetX, int intOffsetY, int intOffsetZ) { if (mobOverlay == 0) { - if (mobSpawnCache != null) { - mobSpawnCache = null; - } + mobSpawnScan.clear(); return; } - long worldTime = entity.worldObj.getTotalWorldTime(); - if (mobSpawnCache == null || mobOverlayUpdateTime != worldTime) { - mobOverlayUpdateTime = worldTime; - buildMobSpawnOverlay(entity); - } - - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glLineWidth(1.5F); - - int curSpawnMode = 2; - - World world = entity.worldObj; - int x1 = (int) entity.posX - intOffsetX; - int z1 = (int) entity.posZ - intOffsetZ; - int y1 = (int) MathHelper.clip(entity.posY, 16, world.getHeight() - 16) - intOffsetY; - + mobSpawnScan.update(entity, NEIClientConfig.getIntSetting("world.overlays.mobSpawnRadius")); + final MobSpawnOverlayStyle style = MobSpawnOverlayStyle + .parseStyle(NEIClientConfig.getSetting("world.overlays.mobSpawnStyle").getValue()); + beginMobSpawnDraw(style); + final float alpha = style.computeAlpha(); + final World world = entity.worldObj; final Tessellator tess = Tessellator.instance; - tess.startDrawing(GL11.GL_LINES); - tess.setColorOpaque(255, 0, 0); + tess.startDrawing(style.glMode); - for (int i = 0; i <= 32; i++) { - int x = x1 - 16 + i; - for (int j = 0; j <= 32; j++) { - int z = z1 - 16 + j; - int cacheIndex = (i * 33 + j) * 33; + final int span = mobSpawnScan.getSpan(); + for (int i = 0; i < span; i++) { + for (int j = 0; j < span; j++) { + final int column = i * span + j; - for (int k = 0; k <= 32; k++) { - int y = y1 - 16 + k; - int spawnMode = mobSpawnCache[cacheIndex + k]; - if (spawnMode == 0) { - continue; - } else if (spawnMode == -1) { - break; - } + for (int k = 0; k < mobSpawnScan.getColumnEnd(column); k++) { + if (mobSpawnScan.readSpawnMode(column, k) == 0) continue; - if (spawnMode != curSpawnMode) { - if (spawnMode == 1) { - tess.setColorOpaque(255, 255, 0); - } else { - tess.setColorOpaque(255, 0, 0); - } - curSpawnMode = spawnMode; - } - - double yOff = getOverlayYOffset(world, x + intOffsetX, y + intOffsetY, z + intOffsetZ); - - tess.addVertex(x, y + yOff, z); - tess.addVertex(x + 1, y + yOff, z + 1); - tess.addVertex(x + 1, y + yOff, z); - tess.addVertex(x, y + yOff, z + 1); + final int x = mobSpawnScan.getMinX() + i; + final int y = mobSpawnScan.getMinY() + k; + final int z = mobSpawnScan.getMinZ() + j; + final double yOffset = getOverlayYOffset(world, x, y, z); + markedFace.moveTo(x - intOffsetX, y - intOffsetY + yOffset, z - intOffsetZ); + loadNeighbourModes(column, k); + markedFace.applyColor(style.colouring, alpha); + style.addVertices(markedFace); } } } tess.draw(); + endMobSpawnDraw(style); + } + + /** + * Set the GL state for the draw of {@code style}. For a style with a texture, the texture is bound, and stays bound + * after {@link #endMobSpawnDraw}. {@link #endMobSpawnDraw} resets each other setting. + */ + private static void beginMobSpawnDraw(MobSpawnOverlayStyle style) { + final ResourceLocation texture = style.texture; + if (texture == null) { + GL11.glDisable(GL11.GL_TEXTURE_2D); + } else { + GL11.glEnable(GL11.GL_TEXTURE_2D); + Minecraft.getMinecraft().getTextureManager().bindTexture(texture); + } + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glLineWidth(1.5F); + if (style.isFilled()) { + // a translucent quad that writes depth hides the overlay quads behind the quad + GL11.glDepthMask(false); + GL11.glDisable(GL11.GL_CULL_FACE); + // `EntityRenderer` leaves the alpha test on at GL_GREATER 0.1. The test discards a tint of opacity 0.1 or + // less + GL11.glDisable(GL11.GL_ALPHA_TEST); + } + } + + private static void loadNeighbourModes(int column, int k) { + final int span = mobSpawnScan.getSpan(); + final int i = column / span; + final int j = column % span; + for (int offsetX = -1; offsetX <= 1; offsetX++) { + for (int offsetZ = -1; offsetZ <= 1; offsetZ++) { + final int neighbourI = i + offsetX; + final int neighbourJ = j + offsetZ; + final boolean isInScan = neighbourI >= 0 && neighbourI < span && neighbourJ >= 0 && neighbourJ < span; + final byte spawnMode = isInScan ? mobSpawnScan.readSpawnMode(neighbourI * span + neighbourJ, k) + : MobSpawnMarkedFace.OUTSIDE_SCAN; + markedFace.setNeighbourMode(offsetX, offsetZ, spawnMode); + } + } + } + + private static void endMobSpawnDraw(MobSpawnOverlayStyle style) { + if (style.isFilled()) { + GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glDepthMask(true); + } GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glDisable(GL11.GL_BLEND); @@ -210,7 +185,7 @@ public class WorldOverlayRenderer implements IKeyStateTracker { private static final Entity dummyEntity = new EntityPig(null); private static final AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox(0, 0, 0, 0, 0, 0); - private static byte getSpawnMode(Chunk chunk, int x, int y, int z) { + static byte getSpawnMode(Chunk chunk, int x, int y, int z) { if (y >= chunk.worldObj.getHeight()) { return 0; } diff --git a/src/main/resources/assets/nei/lang/en_US.lang b/src/main/resources/assets/nei/lang/en_US.lang index 2b7ce60f..20d2eccf 100644 --- a/src/main/resources/assets/nei/lang/en_US.lang +++ b/src/main/resources/assets/nei/lang/en_US.lang @@ -566,6 +566,14 @@ nei.options.world.overlays=Overlays Settings nei.options.world.overlays.lock=Lock overlays between dimensions nei.options.world.overlays.lock.true=Enabled nei.options.world.overlays.lock.false=Disabled +nei.options.world.overlays.mobSpawnStyle=Mob Spawn Overlay Style +nei.options.world.overlays.mobSpawnStyle.x=X +nei.options.world.overlays.mobSpawnStyle.connected=Connected +nei.options.world.overlays.mobSpawnStyle.square=Square +nei.options.world.overlays.mobSpawnStyle.gtnh_logo=GTNH Logo +nei.options.world.overlays.mobSpawnStyle.pufferfish=Pufferfish +nei.options.world.overlays.mobSpawnRadius=Mob Spawn Overlay Radius +nei.options.world.overlays.mobSpawnRadius.tip=Block radius scanned around you. Range 8-64 blocks nei.options.tools=Tools nei.options.tools.export_configs=Default Config Files diff --git a/src/main/resources/assets/nei/textures/overlay/gtnh_logo.png b/src/main/resources/assets/nei/textures/overlay/gtnh_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..afd428e6c7e37ee6e4d7aa0c73931ceb6521b203 GIT binary patch literal 7779 zcmeI1=T{SL)b1yN&{tpJ3bAurV3fcaS%8fIU63?|w{CK5r`2;|REaC%b}_ z&b!J3-z3u^#24|EfZ!7)e!!jk8`#C9)ecBE6lBFHGrRx)oBnS@;NIhi(aFuuX@1>v zBQ=g=^cS})NDvB7$Z!8PDe3#&XDIC*;UgFSDE1vQtLAY!?wyUg-bdOGI@WRXG@_dx zOO_@13*GRz2%!|>;92bkDtYb(hxNhSOXf0xk3_cn{U`|oY{^Gu7qDHzYEkU!J%+LT z#*woYaDL2Ta&`>c3;L0QZ&4Thxc%5GSYLqm{=2eL^-aA@ZyM3;w7GSGW$BiSY6a{n z55<4)1;gGQO{s;gs3n{Fl#~|ChEg4pH~&c zS$R~4Oz-^dn8bTC@>Ef5%=HRT9Z<(fx#%b3Cr9{ol#RJXf4>#1baewk8zAaf!Zk#L zDXiHZe%B7vLs?$dz0WL9XoU+Mn3#GvK7STya}!#1@%!Dy@vpO@a)@9&DKxHq^vu~S zMjETW;9kbO{6^aIs{LceDtd65rl}pkAVu#Ya+NK^MT$;Q7b`Yo*MV8~Kq51X7$duc z175T~zOqjFEM^aVKcZEuQq_lG41;qQD)X}vMJ`s-80rY5Jf~#nw5Ik|OUlXb-2|Oa zvGM2&er$d)Qf}FU!0~Mq7n5cBex!$sraTbG#jc@83r07^fWntKJV&(mzIb{fk#SLA zR$_{QdPpHx7%1iIgT14WS)U1Wfrz=QLj`w@^PC}3WgUGFE||;zdJlmaOm~gq)|^;H zAXJgDRNXnIS$pE8E^JXotLJr@qhmOFheQ89Q!xr>ek#ZVRsxA+nH*obm6w&zTGE1~ z%V-^iBU=VBU$e#6wcwKqvkF6XwRp>LxeAUHE#!BPt^8%8bU#FrEigLDCx{5gz_Vp& zJtZ2zL|L4Rt>is)I1v$~$I z7<}}Kj)VyMMdt}e?p@2(pTf=U*iDBFGj;Gg^d!-t@ZZ}xY4x$9ovGpSt2>uUF6k#J zybjP6ZOd&U=v=Xw`c{QAr3qC4Y-U&A7R8!NI1_swGd;~fYo(KH%9$&HI#8Gx$r%l8 z%++1~1!`bCfaWnaaEF=fIb0dNGCFrq@uCRBfk!~aFp&Rs*$=AP9Zlrx{Ih!&k)~Ok zIP+a&{^sm)Cvy#cv9V{0xiD^qgDOn6X%MMnIsl4F_+!n2`!#<@oOwlFKgYpDmL+2T zWv1J3@j!{Xo&s1vJPl{7Z<8LuK5I1VC@sxEzD6~=M?v+`nEa$(;hpIkgu?f}8m$KR z!mu=+lI<afHLcU+4Cy&;<#N7(6}t1||Lox`kK}@8 zEM6O^>;W-g>V@!Sq+Q{3q5I|j8%t`jNWI;QhWp^lS*u$Je#K+dgSHk60Xf)hV3#vP zS?I3vPw%RvK0%#Fe--W=cA&r9&_9-KEk!Hk)-cz^0#f68j@BBSUaQe+> z0^!F*NN+OQrD;DB<4_mPShc~1fx-{VA=B}>XuRljUFoP90?}W(>9-$w3^)QG-g&E<9G4(?EM)Wc=yAo84M>y-iF4X<}u!bXo`_w_1c++as#VI{Dmmwqyj9=Zm-upE4=qkN(nW>y|7ElKfb^SxIwII_Tr zr$oO?K^%%L@Rp@=I%sNXb^OPQd5?kpd(;xRiRZyww#07ALid=YoX5FG*~n52q6d(i ziyAnCD}(W_T%!$)=VX_Idp@82|HJOod`Eo(jr9m&8FZd(184l$>TIJM?_`(iV*ic!AZ-^06m z6J8c$TWXdy`DTXN%a|DkC+#M^JZ@LW15`L2!A(x@F{FZPibs)g&)|MWsdJ$gYMpj< zl`4GC_ax~v5|uaQDL`VBu8pzp^txJi6I6~G(G)d~`+G8_8Z~l*^Zdzh3A86SHc)!G zHE!U#%pnMxxaJTd4@~j!Yf7GkaSj{XxJ%dfu`h5vKmsSQ#TvzJ#x@w`38q=EBYkv{ zW99CK1EK`aivsedN!Z@)tpd_gy~>J@r3Q8~E1G zT&HiPahSw>1Sbb>!dsTrNm{eC&a74+{i~2Zonp3KVOf#ERQG{wM{E(Vmu%i`qt>?O zl-^}|SVnG@6U#amD={{m_aVQS>q%C@;ullvNLuJwshewo@bSRrEHjFuBl%j32ub!S zSMgNk^i&lW^QciLVu;;e>;o$4(NlZS_R7R>>)*-&`YwMhsU}ZcL7g%oJC*@~NEpw! zJGVEAUEgUOv8(cGt(F^p@S{_#Uq-lBp3K<5ml1G`fYfH^4~}L^>wL%CK2ij%mt>9Q zsK8p+Jje|t4)aH*wYpRQ^aIkZZO$1cbE;^c@T=Y0fmdH;iRtei?#RwYqGi%9m!~Z@ z8e3jWmz8tjW$xmCs{KHx;QN%tBzoJ5uoX@L+=TjlBpnI*4yV7=qs|^@5C7}H)a&1k zw`}Y3hUNFT?C42dnkcsnWXJ(3?4HUi|Dlr01)M_!h9S+$^-JS39_*p?6wjx-d-tB| zH=%lotg-pH7mu9u{*dU_rK!`Kk*^F~U~H3}WPQk^wk;<@LTT)#p-IpAexq)6!l3<~ zY*SBKzDKxKdAXoGkhZ+fLsUkaoslVab2>8~llf-5=oN(g;_#xIte-$P8&%Nd((pCN z9zO1JbIR|>06HcaxR{<7qCjR${r>~sMKyrf_cz8N6JR;9orcsc^e~oldcu# z;RB<^V#_{;#2Y-&+^@5m{&wedML!@>;Iq~J@~UMw`do>8TBtEk7^6^Eo)!%JYqNg& zao?;e(ODu5pXz8J4NLs+ad5N!q29XNbjz0?t3J6Q%7o`!O|gcOh5SGR3&8kcTY$&d zI=rM*!#8!$7~>J|x2}2CPi}bJ|7$~|V3|#tX>3S>-Zw zRAjts2Lzyc zpWq~2f;(@~z%|G=TG+eoM4wSTo!l!ZdQX^y%860b%ytagv)#~pjjh2S*;WhSRu~P0 z)Ifo)4H@1I`vtQvMH4!vN@AzXcA2U$ZD(^953y?cbjPx!%`$bH?ITK_RllK5amCd< z+~6@xOW3!j@QYpV6z1>LT8UYc_TJ>i%Jk%q-;p64U!F$}G-5YM_J*#kn!1e4%N8&8 zP+~;gy+D!0L%FmfR;xqh70w{~g_1fp5|kV40yc!b;`klGxlA4BBV%>I4R_WM0g)~uJU?g9r| zuRSt}{&xaKEk6jpoZ)alEmJV(t2Fa86&$?Y^{R2s@W2<0m~-rn!!P5cw^dfDbBp<| ze;efxDveZIBG^xSBczJ&m_AV2ei1q$_T~)yXT-wO(vK!r@S<@vhs0R*DM zH~7077vSSweY%FSgr%v*99P~SYcm;3^&aupV!#s!svW{}BxTFar!ZX#FfWRF?(8uC zV{1(t_5ppZ#iq&a zl-$JC3L~^4p^6K@coP~jJTdgO(unaY`H*n8SS4>)>qcJSvB{0bzD8Oc}PX6qecaQO4eAJ+7PNkR|-@NV}kTpajLmV_|rU2xDcQB{r zf}3?pa*Lz1!{r>h+svRbHuYcwj|oB#XZl#!%wP4gzTo5}aCt)@Une+xG;ZmSnI?0(KgM$L+e7??f(Xv6O>LPZBvz z0%kcEWI)4ILLr$D@S}qPYm38rf8~w!>i;|6n3-r<fe3 zVQN%Nvp((LM$85{loGzv%JGdW9@|?LU^5hB3|mhFbeqCG8*s;L{}P|w{oiWNvD9-O z_?R}v$;8ztjxUT(Cu=ZoiiXsLr#y#cF zv0FD?vX}~T0}bzbFHFa%(N5V)zZgo+MU18GGc^2dDRgHn>-*%D?B%-B$ToJlS-si! zXgUjC`W7g%|L2hBfKYI;d*cXQ42ydHTu|Lg|D~0N7U9k- zBi5C?DVpwqLoZh*Y6%r-v{qx=Z7nSBN7fAe1 zciaTcS}5Pe3WDb9|2)959SK%4tk!h^zM58<1n*%S*@-+Z=ev zj-rUhEo~i#jC7VoX%N!PALsX~I8*NZgO!2?23vNF`KwH zU_jBDebTAo#N3t~!|MlQ@qMVf*DUizE%^-rs!gw;JBZIJ;EVTTO8nZt6AN+iYrUqL zl0#M~Jj#wqkJ9*+$r<~3T@Cj9`a?QOXpjOiB&V3CE!0OFc9Pcbzc5FUcZwP2UJ)F| zhuP^oAsSmOXJLw5^)JB4|EM3LRg$EnGPCjNNI^SxOBcSZyGQ#?)j&K1XtvWV4uxrcOc#&yZ;&Vae*eHbdOPa}E)`2$it*gLwvE;qz>aV27rGN`&T`e&|5y&u32F)% zNE|qbIFPq+I@$7U7K{Dh&O-{CrL14NQfM}9c7N%Yb=j=<4no zAff}dshRiXJFZTV?mHfzhX!4EJur0crop$zfCvh9aZ0>zbK8VJP4gpZ8}W2${W8BN z=<+|lnf_Y?BSW@|Q`8TxPly^4{oxb}c~!q9&fz^}v}uf)#KYLt&n~C-JUI4a?6y~W z`Ao4%QGIoA+$-W-w-sCRL>fI8`JL(CqgIwPI$qT09v)%P&(7jyPso>%JU7r?VFI8Y@->8kRL zBtA~sYshr|^?hBHR>#bxgMEA^f5C@-Cjd9iFs=LRUg#+0c!!bU$djJo-Oc#8J!u literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/nei/textures/overlay/gtnh_logo.png.mcmeta b/src/main/resources/assets/nei/textures/overlay/gtnh_logo.png.mcmeta new file mode 100644 index 00000000..70fbb13c --- /dev/null +++ b/src/main/resources/assets/nei/textures/overlay/gtnh_logo.png.mcmeta @@ -0,0 +1,6 @@ +{ + "texture": { + "blur": true, + "clamp": true + } +} diff --git a/src/main/resources/assets/nei/textures/overlay/pufferfish.png b/src/main/resources/assets/nei/textures/overlay/pufferfish.png new file mode 100644 index 0000000000000000000000000000000000000000..451e4bb20e02ac6e904f8846d2be7abaf53b9098 GIT binary patch literal 18566 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 bzkYYLncwW*8M(mog%~_t{an^LB{Ts57NJmB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/nei/textures/overlay/pufferfish.png.mcmeta b/src/main/resources/assets/nei/textures/overlay/pufferfish.png.mcmeta new file mode 100644 index 00000000..96fb0a20 --- /dev/null +++ b/src/main/resources/assets/nei/textures/overlay/pufferfish.png.mcmeta @@ -0,0 +1,6 @@ +{ + "texture": { + "blur": false, + "clamp": true + } +}