feat(hand): add cancellable RenderHandEvent for canRender (#1806 )

Improve perf of EmissiveTextureAutoloader.resourceExists (#1805 )
More class loading order fun with java 8... (#1804 )
2026-11-15 09:44:52 +00:00 · 2026-06-01 20:38:27 +00:00 · 2026-06-01 13:34:23 -07:00 · 2026-05-31 20:56:00 -07:00 · 2026-05-31 15:28:27 -07:00 · 2026-05-31 15:12:45 -07:00
185 changed files with 6440 additions and 3600 deletions
@@ -1,302 +0,0 @@
-# CTM Guide<img src="img/logo-readme.png" align="right">
-###### by Vortex [@vortex_so in discord, any suggestions are accepted]<br>
-
-This file describes how to use CTM, structure of `.properties` file and some useful (or not) techniques
-
-### Note:
- All textures for CTM textures are in `[modname]/mcpatcher/ctm` folder<br>
-the overrides apply globally so it doesn't matter in which directory you put them<br>
-
- in the `ctm` folder you must have a folder with your block name (or any name actually)<br>
-in that folder you will have all texture files (animations allowed via mcmeta file for every texture) and `.properties` file<br>
-multiple `.properties` files are allowed for a single folder and set of textures for more complex behaviour (see examples)
-
-## Quick Links
- **[Method](#method)**
- **[MatchBlocks](#matchblocks)**
- **[MatchTiles](#matchtiles)**
- **[Tiles](#tiles)**
- **[Connect](#connect)**
- **[Faces](#faces)**
- **[Biomes](#biomes)**
- **[Heights](#heights)**
- **[RenderPass](#renderpass)**
- **[InnerSeams](#innerseams)**
- **[Weights](#weights)**<br>
- **[Examples](#examples)**
-
-## Structure of `.properties` files
-
---
-
-## `matchBlocks`
-Override for a specific block, you can get the value from the tooltip if you have this feature enabled.<br>
-Can accept several values which allows to apply one CTM for different blocks.<br>
-if no value for this property was provided, Angelica will fallback to name of the `.property` file
-
-examples:<br>
-`matchBlocks=gregtech:gt.blockcasings4`<br>
-`matchBlocks=minecraft:glass minecraft:glass_pane`
-
---
-
-## `matchTiles`
-Override for a specific texture, main difference from matchBlocks is that this will only match a certain texture, not the block itself<br>
-
-example:<br>
-`matchTiles:minecraft:blocks/stone`
-
---
-
-## `tiles`
-The list of texture names for CTM. Supports ranges and explicit names.<br>
-You probably would want to use texture names like `0.png`, `1.png` as it is easier, however this allows for any names
-
-examples:<br>
-`tiles=0-46` - classic for full CTM, expects files from `0.png` to `46.png`<br>
-`tiles=0-3,5, 8` - expects files `0.png`, `1.png`, `2.png`, `3.png`, `5.png`, `8.png`<br>
-`tiles=sometext,somemoretext` - expects files `sometext.png`, `somemoretext.png`
-
---
-
-## `connect`
-Sets how the blocks are connected, can accept values: `block`, `tile`, `material`<br>
-`block` connects based on block (who would guess)<br>
-`tile` connects based on texture<br>
-`material` connects based on material (didn't really understand this part, ig it is for stone, iron, wood etc)<br>
-Fallbacks to `block` if no value for `matchTiles` is set, otherwise fallbacks to `tile`<br>
-Most of the time you don't need to set this value because of that fallback rule
-
-example:<br>
-`connect=block`
-
---
-
-## `faces`
-Limit to specific faces of a block, can accept several values<br>
-Fallbacks to `all` if value not present in the `.properties` file
-
-examples:<br>
-`faces=top`<br>
-`faces=all`<br>
-`faces=bottom`<br>
-`faces=sides`<br>
-`faces=north south east west`<br>
-`faces=top bottom sides`
-
---
-
-## `biomes`
-Limit to specific biomes, can accept several values<br>
-Fallbacks to all if value not present in the `.properties` file
-
-examples:<br>
-`biomes=plains`<br>
-`biomes=desert forest`<br>
-`biomes=taiga jungle savanna`
-
---
-
-## `heights`
-Limit to certain Y levels, can only accept several values<br>
-can be set through either `minHeight` and `maxHeight` or `heights`
-
-examples:<br>
-`heights=0-64`<br>
-`heights=64-255`<br>
-example of maxHeight and minHeight:<br>
-`minHeight=64`<br>
-`maxHeight=128`
-
---
-
-## `renderPass`
-Controls which rendering layer a CTM rule is applied in<br>
-In most cases you only need it to avoid rendering issues with transparency
-
-`renderPass=solid` used for fully opaque blocks<br>
-`renderPass=cutout` used for fences, glass CTM, textured blocks with hard transparency<br>
-`renderPass=translucent` used for transparent blocks like glass or water<br>
-`renderPass=cutout_mipped` no idea for what<br>
-`renderPass=overlay` used for blocks with an overlay, for example GT hatches or damaged anvils<br>
-`renderPass=backface` used for blocks with a backface, however it is very rare to use this one
-
---
-
-## `innerSeams`
-Adds internal seams, fallback to `innerSeams=false` if not set<br>
-
-example:<br>
-`innerSeams=true`
-
---
-
-## `weights`
-Priority, used for `Random` type to determine which textures have certain chances to be used for render<br>
-accepts several values, assigns values correspondingly to `tiles` list values
-
-examples:<br>
-`weight=10`<br>
-`weights=1 3 3 2 1`
-
---
-
-# `Method`
-
-Selects CTM mode:
- [LINK](#full-ctm-ctm) `ctm` / `glass` / `default`
- [LINK](#compact-ctm) `compact` / `ctm_compact`
- [LINK](#horizontal)`horizontal` / `bookshelf`
- [LINK](#vertical)`vertical`
- [LINK](#horizontalvertical-hv)`horizontal+vertical` / `h+v`
- [LINK](#verticalhorizontal-vh)`vertical+horizontal` / `v+h`
- [LINK](#top)`top` / `sandstone`
- [LINK](#repeat)`repeat` / `pattern`
- [LINK](#random)`random`
- [LINK](#fixed)`fixed` / `static`
-
-example:<br>
-`method=ctm`
-
-### Full CTM (ctm)
-
-Requires exactly 47 tiles, the most versatile but the most size-heavy method
-
-Here's a visual explanation of how the textures should be numbered:
-
-<img src="img/CTM/CTM-pattern.png" width="624" style="image-rendering: pixelated;">
-
---
-
-### Compact CTM
-
-Requires exactly 5 tiles.
-
-<img src="img/CTM/CCTM-pattern.png" width="284" style="image-rendering: pixelated;">
-
-Splits face into 4 quadrants and builds final texture per quadrant.
-
-Here's a visual explanation of how it works on an example of 3x3 blocks pattern with a cutout:
-
-<img src="img/CTM/CCTM-principle.png" width="400" style="image-rendering: pixelated;">
-
-as you can see, compact CTM has a single limitation:<br>
-the size of any part of texture, such as an edge or a corner, can't be larger than `8x8` pixel<br>
-this is the main case where only full CTM can be used.
-
---
-
-### Horizontal
-
-Requires exactly 4 tiles. connects only horizontally, used for bookshelves for example
-
-<img src="img/CTM/HCTM-pattern.png" width="284" style="image-rendering: pixelated;">
-
-
---
-
-### Vertical
-
-Requires exactly 4 tiles.
-
-<img src="img/CTM/VCTM-pattern.png" height="284" style="image-rendering: pixelated;">
-
---
-
-### Horizontal+Vertical (h+v)
-
-Requires exactly 7 tiles.
-
-Two-stage: horizontal first, then vertical if none horizontal variations are found.
-
-<img src="img/CTM/HVCTM-pattern.png" height="284" style="image-rendering: pixelated;">
-
---
-
-### Vertical+Horizontal (v+h)
-
-Requires exactly 7 tiles.
-
-Two-stage: vertical first, then horizontal if none vertical variations are found.
-
-<img src="img/CTM/VHCTM-pattern.png" height="284" style="image-rendering: pixelated;">
-
---
-
-### Top
-
-Requires exactly 1 tile.
-
-Applies tile on side faces when block above matches, for example used for smooth sandstone
-
---
-
-### Repeat
-
-Requires width * height tiles.
-
-Properties:
- `width` - defines the number of tiles in width
- `height` - defines the number of tiles in height
- `symmetry` - defines the symmetry of the pattern, can be either `none` or `opposite`
-
-Just uses N*M grid, for example<br>
-`0 1 2 3 4`<br>
-`5 6 7 8 9`
-
---
-
-### Random
-
-Any number of tiles.
-
-Properties:
- `weights` - described [here](#weights)
- `symmetry` - accepts `all`, `opposite`, `none`, groups opposite faces together, otherwise keeps them independent
- `linked` - makes the textures consistent between render states, not needed much
-
---
-
-### Fixed
-
-Requires exactly 1 tile. Always uses the same tile.<br>
-useful only if combined with height or other properties (see examples)
-
---
-
-# Examples
-
-## Glass via full CTM
-```properties
-matchBlocks=minecraft:glass minecraft:glass_pane
-metadata=0
-method=ctm
-faces=all
-tiles=0-46
-connect=block
-```
-
-## Multiple properties files usage
-### Use multiple .properties files with different heights for more detailed worldgen
-this one will use one texture for lower part of the world and another for the rest of the world
-```properties
-matchBlocks=minecraft:dirt
-metadata=0
-method=fixed
-faces=all
-tiles=0
-connect=block
-maxHeight=40
-```
-
-```properties
-matchBlocks=minecraft:dirt
-metadata=0
-method=fixed
-faces=all
-tiles=0
-connect=block
-minHeight=41
-```
-
---
@@ -50,6 +50,7 @@ Targets GL 3.3+ core profile
 * CodeChicken[Core](https://github.com/GTNewHorizons/CodeChickenCore/releases)/[Lib](https://github.com/GTNewHorizons/CodeChickenLib/releases) <1.2.0 - Threading issues, use 1.3.0+
 * Neodymium - Untested, but unlikely to be compatible. (Chunk Meshing is definitely incompatible, other features might work depending on config)
 * SmoothFont - Equivalent functionality added
+* ClientFixer - Use a resource pack like [GTNH-FTI-Standard-Font](https://github.com/Eldrinn-Elantey/GTNH-FTI-Standard-Font)

 # Credits
 * ShadersMod
@@ -1,9 +1,14 @@
+import xyz.wagyourtail.jvmdg.gradle.flags.DowngradeFlags
+import xyz.wagyourtail.jvmdg.gradle.task.DowngradeJar
 import xyz.wagyourtail.jvmdg.gradle.task.files.DowngradeFiles

 plugins {
    id("com.gtnewhorizons.gtnhconvention")
 }

+tasks.withType<DowngradeJar>().configureEach { logLevel.set("FATAL") }
+tasks.withType<DowngradeFiles>().configureEach { logLevel.set("FATAL") }
+
 minecraft {
    extraRunJvmArguments.add("-Dangelica.enableTestBlocks=true")
    extraRunJvmArguments.add("-Dangelica.dumpClass=true")
@@ -68,7 +68,7 @@ configurations.all {
 dependencies {
    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.7.14:dev")

-    compileOnly("com.gtnewhorizons.retrofuturabootstrap:RetroFuturaBootstrap:1.0.7") { transitive = false }
+    compileOnly("com.gtnewhorizons.retrofuturabootstrap:RetroFuturaBootstrap:1.1.0") { transitive = false }
 //    runtimeOnlyNonPublishable("com.github.GTNewHorizons:lwjgl3ify:3.0.99")

    compileOnly("org.projectlombok:lombok:1.18.42") { transitive = false }
@@ -76,7 +76,7 @@ dependencies {

    // Iris Shaders
    compileOnly('org.jetbrains:annotations:26.0.2')
-    api("com.github.GTNewHorizons:GTNHLib:0.9.36:dev")
+    api("com.github.GTNewHorizons:GTNHLib:0.11.4:dev")

    shadowImplementation(project(":glsm")) { transitive = false }
    shadowImplementation(project(":lwjgl3-backend")) { transitive = false }
@@ -97,6 +97,24 @@ dependencies {
    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.35-GTNH:dev')
    devOnlyNonPublishable('com.github.GTNewHorizons:CodeChickenCore:1.4.7:dev')

+    // Display List Testing
+    /*
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-749-GTNH:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:ae2stuff:0.10.14-GTNH:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:BuildCraft:7.1.54:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:IguanaTweaksTConstruct:2.7.0:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:OpenBlocks:1.12.4-GTNH:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:OpenComputers:1.12.12-GTNH:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:TinkersConstruct:1.14.12-GTNH:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:ServerUtilities:2.2.13:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:ironchest:6.1.6:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:waila:1.9.7:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:Botania:1.13.15-GTNH:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:Mobs-Info:0.5.10-GTNH:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:Draconic-Evolution:1.5.18-GTNH:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:HoloInventory:2.5.8-GTNH:dev")
+     */
+
    //devOnlyNonPublishable('com.github.GTNewHorizons:worldedit-gtnh:v0.0.9')

    // Notfine Deps
@@ -129,6 +147,8 @@ dependencies {
    compileOnly(rfg.deobf("curse.maven:et-futurum-requiem-441392:5873837"))
    compileOnly(rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612"))

+    devOnlyNonPublishable("com.github.GTNewHorizons:CosmeticArmorReworked:1.0.3-GTNH:dev")
+
    // For testing alternative splash screens — https://github.com/MalTeeez/ModernSplash/releases
    // devOnlyNonPublishable("com.github.MalTeeez:modernsplash:1.7.10-1.2.4:dev")

@@ -66,6 +66,7 @@ repositories {
        content { includeGroup("xyz.wagyourtail.jvmdowngrader") }
    }
    mavenCentral()
+    mavenLocal()
 }

 dependencies {
@@ -123,6 +124,7 @@ tasks.withType<DowngradeFiles>().configureEach {
    downgradeTo.set(JavaVersion.VERSION_1_8)
    multiReleaseOriginal.set(false)
    multiReleaseVersions.set(emptySet())
+    logLevel.set("FATAL")
 }

 val downgradeDepsForTest by tasks.registering(DowngradeFiles::class) {
@@ -138,6 +140,7 @@ val downgradeMainClasses by tasks.registering(DowngradeFiles::class) {
 val downgradeTestClasses by tasks.registering(DowngradeFiles::class) {
    inputCollection = sourceSets["test"].output.classesDirs
    classpath = sourceSets["test"].compileClasspath
+    sourceSets["test"].output.classesDirs.files.forEach { outputs.dir(temporaryDir.resolve(it.name)) }
    dependsOn(tasks.named("testClasses"))
 }

@@ -173,6 +176,19 @@ tasks.test {
    jvmArgs("-Djava.library.path=${extractNatives.get().property("destinationFolder").let { (it as DirectoryProperty).asFile.get().path }}")
 }

+val verifyTestsRan by tasks.registering {
+    val resultsDir = layout.buildDirectory.dir("test-results/test")
+    dependsOn(tasks.test)
+    doLast {
+        val dir = resultsDir.get().asFile
+        val xmls = dir.listFiles { f -> f.name.startsWith("TEST-") && f.name.endsWith(".xml") } ?: emptyArray()
+        check(xmls.isNotEmpty()) {
+            ":glsm:test produced no TEST-*.xml in $dir - test task likely went NO-SOURCE"
+        }
+    }
+}
+tasks.check { dependsOn(verifyTestsRan) }
+
 publishing {
    publications {
        create<MavenPublication>("mavenJava") {
@@ -4,7 +4,7 @@ celeritasVersion = 2.5.3-GTNH
 lombokVersion = 1.18.42
 log4jVersion = 2.0-beta9
 guavaVersion = 18.0
-gtnhlibVersion = 0.9.36
+gtnhlibVersion = 0.10.0
 glslTransformLibVersion = 0.2.0-26.g5ee7d96-GTNH
 antlr4RuntimeVersion = 4.13.2
 jcppVersion = 1.4.14
@@ -1,67 +0,0 @@
-package com.gtnewhorizons.angelica.glsm;
-
-import com.gtnewhorizons.angelica.glsm.recording.AccumulatedDraw;
-import com.gtnewhorizons.angelica.glsm.recording.CommandBuffer;
-import com.gtnewhorizons.angelica.glsm.recording.CommandBufferProcessor;
-
-import java.util.List;
-
-/**
- * Builds final command buffers from raw command buffers and compiled VBO data.
- * Bridges the gap between VBO compilation (glsm types) and buffer processing (recording types).
- */
-public final class CommandBufferBuilder {
-
-    private CommandBufferBuilder() {}
-
-    /**
-     * Build commands with transform collapsing optimization.
-     * Accumulates MODELVIEW transforms and emits MultMatrix at barriers (draws, CallList).
-     * Uses mergedRanges where consecutive same-transform draws are combined.
-     */
-    public static void buildFromRawBuffer(
-            CommandBuffer rawBuffer,
-            List<AccumulatedDraw> accumulatedDraws,
-            CommandBuffer finalBuffer) {
-
-        rawBuffer.resetRead();
-        int cmdIndex = 0;
-        int rangeIndex = 0;
-
-        AccumulatedDraw draw;
-        while (rawBuffer.hasRemaining()) {
-            // Read and process the command
-            CommandBufferProcessor.copyCommand(rawBuffer, finalBuffer);
-
-            // Emit draw ranges at this command position
-            while (rangeIndex < accumulatedDraws.size() && (draw = accumulatedDraws.get(rangeIndex)).commandIndex == cmdIndex) {
-                emitDrawRangeToBuffer(draw, finalBuffer, rangeIndex);
-                rangeIndex++;
-            }
-
-            cmdIndex++;
-        }
-
-        while (rangeIndex < accumulatedDraws.size()) {
-            emitDrawRangeToBuffer(accumulatedDraws.get(rangeIndex), finalBuffer, rangeIndex);
-            rangeIndex++;
-        }
-    }
-
-    /**
-     * Emit a draw range to the output buffer, with transform if needed.
-     */
-    private static void emitDrawRangeToBuffer(
-            AccumulatedDraw draw,
-            CommandBuffer out,
-            int vboIdx) {
-
-        if (draw.restoreData != null) {
-            out.writeDrawRangeRestore(vboIdx, draw.restoreData);
-            return;
-        }
-
-        // Write the draw range command
-        out.writeDrawRange(vboIdx);
-    }
-}
@@ -9,13 +9,11 @@ import com.gtnewhorizons.angelica.glsm.states.MaterialState;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;

 import static com.gtnewhorizons.angelica.glsm.backend.BackendManager.RENDER_BACKEND;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.joml.Matrix3f;
 import org.joml.Matrix4f;
+import org.joml.Vector3f;
 import org.lwjgl.BufferUtils;
 import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL20;

 import java.nio.FloatBuffer;

@@ -115,6 +113,7 @@ public class CompatUniformManager {
    private static final FloatBuffer clipPlaneBuf = BufferUtils.createFloatBuffer(32); // 8 planes * vec4
    private static final Matrix3f normalMatrix = new Matrix3f();
    private static final Matrix4f scratchMatrix = new Matrix4f();
+    private static final Vector3f scratchCol = new Vector3f();

    private static final float LIGHTMAP_SCALE = 1.0f / 256.0f;
    private static final FloatBuffer lightmapMatrixBuf;
@@ -135,6 +134,16 @@ public class CompatUniformManager {

    private CompatUniformManager() {}

+    /**
+     * Normalize each column of a 3x3 matrix in place. Used to strip the residual 1/scale that
+     * inverse-transpose introduces.
+     */
+    private static void normalizeColumnsInPlace(Matrix3f m) {
+        m.setColumn(0, m.getColumn(0, scratchCol).normalize());
+        m.setColumn(1, m.getColumn(1, scratchCol).normalize());
+        m.setColumn(2, m.getColumn(2, scratchCol).normalize());
+    }
+
    public static void onLinkProgram(int program) {
        int[] locs = new int[LOC_COUNT];
        boolean hasAny = false;
@@ -225,13 +234,17 @@ public class CompatUniformManager {
            // Normal Matrix (inverse-transpose of upper-left 3x3 of ModelView)
            if (locs[LOC_NORMAL] != -1 || locs[LOC_IRIS_NORMAL] != -1) {
                mv.normal(normalMatrix);
-                normalMatrix.get(mat3Buf);
                if (locs[LOC_NORMAL] != -1) {
+                    normalMatrix.get(mat3Buf);
                    RENDER_BACKEND.uniformMatrix3(locs[LOC_NORMAL], false, mat3Buf);
                }
+                // Column-normalized to unit magnitude
                if (locs[LOC_IRIS_NORMAL] != -1) {
+                    normalizeColumnsInPlace(normalMatrix);
+                    normalMatrix.get(mat3Buf);
                    RENDER_BACKEND.uniformMatrix3(locs[LOC_IRIS_NORMAL], false, mat3Buf);
                }
+
            }
        }

@@ -142,7 +142,7 @@ public class FeedbackManager {
        final int byteCount = count * stride;
        ensureReadbackCapacity(byteCount);
        readbackBuf.clear().limit(byteCount);
-        RENDER_BACKEND.getBufferSubData(GL15.GL_ARRAY_BUFFER, (long) first * stride + posOffset, readbackBuf);
+        readPositionBuffer((long) first * stride + posOffset, readbackBuf);

        emitAllPrimitives(mode, count, i -> i, stride);
    }
@@ -170,7 +170,7 @@ public class FeedbackManager {
        final int byteCount = vertexCount * stride;
        ensureReadbackCapacity(byteCount);
        readbackBuf.clear().limit(byteCount);
-        RENDER_BACKEND.getBufferSubData(GL15.GL_ARRAY_BUFFER, (long) minIdx * stride + posOffset, readbackBuf);
+        readPositionBuffer((long) minIdx * stride + posOffset, readbackBuf);

        final int base = minIdx;
        emitAllPrimitives(mode, indexCount, i -> ImmediateModeRecorder.readIndex(indexBuf, type, 0, i) - base, stride);
@@ -251,7 +251,23 @@ public class FeedbackManager {
        final int byteCount = vertexCount * stride;
        ensureReadbackCapacity(byteCount);
        readbackBuf.clear().limit(byteCount);
-        RENDER_BACKEND.getBufferSubData(GL15.GL_ARRAY_BUFFER, (long) minIdx * stride + posOffset, readbackBuf);
+        readPositionBuffer((long) minIdx * stride + posOffset, readbackBuf);
+    }
+
+    private static void readPositionBuffer(long offset, ByteBuffer destination) {
+        final int positionVbo = VertexAttribState.get(0).vboId;
+        final int previousVbo = GLStateManager.getBoundVBO();
+
+        if (positionVbo != 0 && positionVbo != previousVbo) {
+            GLStateManager.glBindBuffer(GL15.GL_ARRAY_BUFFER, positionVbo);
+        }
+        try {
+            RENDER_BACKEND.getBufferSubData(GL15.GL_ARRAY_BUFFER, offset, destination);
+        } finally {
+            if (positionVbo != 0 && positionVbo != previousVbo) {
+                GLStateManager.glBindBuffer(GL15.GL_ARRAY_BUFFER, previousVbo);
+            }
+        }
    }

    private static void emitVertex(int vertexIndex, int stride) {
@@ -148,22 +148,54 @@ public class GLStateManager {
    public static int projGeneration;  // projection matrix changes
    public static int texMatrixGeneration; // texture matrix changes
    public static int lightingGeneration;
-    public static int fragmentGeneration; // fog + alpha ref
+    public static int fragmentGeneration; // fog + alpha ref + overlay color
    public static int colorGeneration;    // current vertex color
    public static int clipPlaneGeneration; // clip plane equation changes

+    @Getter private static float overlayR = 0.0f;
+    @Getter private static float overlayG = 0.0f;
+    @Getter private static float overlayB = 0.0f;
+    @Getter private static float overlayA = 0.0f;
+
+    public static void setOverlayColor(float r, float g, float b, float a) {
+        if (r == overlayR && g == overlayG && b == overlayB && a == overlayA) return;
+        overlayR = r; overlayG = g; overlayB = b; overlayA = a;
+        fragmentGeneration++;
+    }
+
+    @Getter private static float shaderColorR = 1.0f;
+    @Getter private static float shaderColorG = 1.0f;
+    @Getter private static float shaderColorB = 1.0f;
+    @Getter private static float shaderColorA = 1.0f;
+
+    public static void setShaderColor(float r, float g, float b, float a) {
+        if (r == shaderColorR && g == shaderColorG && b == shaderColorB && a == shaderColorA) return;
+        shaderColorR = r; shaderColorG = g; shaderColorB = b; shaderColorA = a;
+        if (GLSMHooks.SHADER_COLOR_CHANGE.hasListeners()) {
+            GLSMHooks.shaderColorChangeEvent.red = r;
+            GLSMHooks.shaderColorChangeEvent.green = g;
+            GLSMHooks.shaderColorChangeEvent.blue = b;
+            GLSMHooks.shaderColorChangeEvent.alpha = a;
+            GLSMHooks.SHADER_COLOR_CHANGE.post(GLSMHooks.shaderColorChangeEvent);
+        }
+    }
+
    // Deferred vertex attribute upload flags — set when state changes, flushed before draw
-    private static boolean dirtyColorAttrib;
+    private static boolean dirtyColorAttrib = true;
    private static boolean dirtyNormalAttrib;
    private static boolean dirtyTexCoordAttrib;
-    private static boolean dirtyLightmapAttrib;
+    private static boolean dirtyLightmapAttrib = true;

    /** Flush deferred vertex attribute uploads. Called before draw to ensure default attrib values are current. */
    public static void flushDeferredVertexAttribs() {
-        RENDER_BACKEND.vertexAttrib4f(Usage.COLOR.getAttributeLocation(), color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha());
-        dirtyColorAttrib = false;
-        RENDER_BACKEND.vertexAttrib4f(Usage.SECONDARY_UV.getAttributeLocation(), GLSMConfig.lastBrightnessX, GLSMConfig.lastBrightnessY, 0.0f, 1.0f);
-        dirtyLightmapAttrib = false;
+        if (dirtyColorAttrib) {
+            RENDER_BACKEND.vertexAttrib4f(Usage.COLOR.getAttributeLocation(), color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha());
+            dirtyColorAttrib = false;
+        }
+        if (dirtyLightmapAttrib) {
+            RENDER_BACKEND.vertexAttrib4f(Usage.SECONDARY_UV.getAttributeLocation(), GLSMConfig.lastBrightnessX, GLSMConfig.lastBrightnessY, 0.0f, 1.0f);
+            dirtyLightmapAttrib = false;
+        }
        if (dirtyNormalAttrib) {
            final var n = ShaderManager.getCurrentNormal();
            RENDER_BACKEND.vertexAttrib3f(Usage.NORMAL.getAttributeLocation(), n.x, n.y, n.z);
@@ -188,6 +220,8 @@ public class GLStateManager {

    @Getter private static Vendor VENDOR;

+    @Getter private static boolean windows;
+
    // This setting varies depending on driver, so it gets queried at runtime
    public static int DEFAULT_DRAW_BUFFER = 0x0405; // GL_BACK

@@ -518,6 +552,12 @@ public class GLStateManager {
            // After Display.create(), viewport is (0, 0, width, height)
            viewportState.setViewPort(0, 0, displayWidth, displayHeight);
        }
+
+        final String glVendor = RENDER_BACKEND.getString(GL11.GL_VENDOR);
+        VENDOR = Vendor.getVendor(glVendor.toLowerCase());
+
+        final String os = System.getProperty("os.name").toLowerCase();
+        windows = os.contains("win");
    }

    static void init(Runnable initCallback) {
@@ -525,9 +565,6 @@ public class GLStateManager {

        DEFAULT_DRAW_BUFFER = RENDER_BACKEND.getInteger(GL11.GL_DRAW_BUFFER);

-        final String glVendor = RENDER_BACKEND.getString(GL11.GL_VENDOR);
-        VENDOR = Vendor.getVendor(glVendor.toLowerCase());
-
        // The initial mask value should be defined as all 1's. However, some drivers have it set to 0's.
        // To ensure consistency & correctness across all drivers, we're setting them to 0xFF.
        RENDER_BACKEND.stencilFunc(stencilState.getFuncFront(), stencilState.getRefFront(), 0xFF);
@@ -621,16 +658,6 @@ public class GLStateManager {
        return BYPASS_CACHE || !isCachingEnabled();
    }

-    /**
-     * Returns true if we should use DSA for texture operations. DSA relies on cached texture bindings, which aren't tracked when caching is disabled. Also,
-     * proxy textures are special query textures that shouldn't use DSA.
-     */
-    private static boolean shouldUseDSA(int target) {
-        if (!isCachingEnabled()) return false;
-        // Proxy textures are for capability queries, not real textures
-        return target != GL11.GL_PROXY_TEXTURE_1D && target != GL11.GL_PROXY_TEXTURE_2D && target != GL12.GL_PROXY_TEXTURE_3D;
-    }
-
    // LWJGL Overrides
    public static void glEnable(int cap) {
        final RecordMode mode = DisplayListManager.getRecordMode();
@@ -1828,13 +1855,7 @@ public class GLStateManager {
        }
        TextureInfoCache.INSTANCE.onTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
        suspendPixelUnpackBuffer();
-        if (shouldUseDSA(target)) {
-            // Use DSA to upload directly to the texture
-            RenderSystem.textureImage2D(getBoundTextureForServerState(), target, level, internalformat, width, height, border, format, type, pixels);
-        } else {
-            // Non-main thread or proxy texture - use direct GL call
-            RENDER_BACKEND.texImage2D(target, level, internalformat, width, height, border, format, type, pixels);
-        }
+        RENDER_BACKEND.texImage2D(target, level, internalformat, width, height, border, format, type, pixels);
        restorePixelUnpackBuffer();
    }

@@ -1879,11 +1900,7 @@ public class GLStateManager {
        }
        TextureInfoCache.INSTANCE.onTexImage2D(target, level, internalformat, width, height, border, format, type, pixels != null ? pixels.asIntBuffer() : null);
        suspendPixelUnpackBuffer();
-        if (shouldUseDSA(target)) {
-            RenderSystem.textureImage2D(getBoundTextureForServerState(), target, level, internalformat, width, height, border, format, type, pixels);
-        } else {
-            RENDER_BACKEND.texImage2D(target, level, internalformat, width, height, border, format, type, pixels);
-        }
+        RENDER_BACKEND.texImage2D(target, level, internalformat, width, height, border, format, type, pixels);
        restorePixelUnpackBuffer();
    }

@@ -1981,7 +1998,14 @@ public class GLStateManager {
        }
    }

-    /** Shrink texture to 1x1 to free GPU memory, unbind from all units, but keep the name valid. */
+    /**
+     * Defer deleting textures until it has been reclaimed.
+     * Why you might ask?  In compat profile if you bind a texture that doesn't exist, ie a deleted texture,
+     * mesa will silently create it for you, in core this is an error.  Why would you be binding a deleted texture?
+     * Damned if I know, but vanilla and mods do it... they create one, delete it, and then bind it....
+     *
+     * So... we shrink the texture to 1x1 to free GPU memory, unbind from all units, but keep the name valid.
+     * */
    private static void deferDeleteTexture(int id) {
        if (id == 0) return;

@@ -2006,7 +2030,9 @@ public class GLStateManager {
        }
        RENDER_BACKEND.bindTexture(GL11.GL_TEXTURE_2D, id);
        RENDER_BACKEND.texParameteri(GL11.GL_TEXTURE_2D, GL12.GL_TEXTURE_MAX_LEVEL, 0);
+        suspendPixelUnpackBuffer();
        RENDER_BACKEND.texImage2D(GL11.GL_TEXTURE_2D, 0, GL30.GL_R8, 1, 1, 0, GL11.GL_RED, GL11.GL_UNSIGNED_BYTE, (ByteBuffer) null);
+        restorePixelUnpackBuffer();

        // Restore previous binding on active unit
        RENDER_BACKEND.bindTexture(GL11.GL_TEXTURE_2D, savedBinding == id ? 0 : savedBinding);
@@ -2112,22 +2138,20 @@ public class GLStateManager {
    }

    public static void glEnd() {
-        if (DisplayListManager.isRecording()) {
-            final DirectTessellator result = ImmediateModeRecorder.end();
-            if (result != null) {
+        final DirectTessellator result = ImmediateModeRecorder.end();
+        if (result != null) {
+            if (DisplayListManager.isRecording()) {
                if (DisplayListManager.isCompileAndExecute() && initConfig != null && initConfig.getDirectDrawer() != null) {
-                    DisplayListManager.flushMatrix();
-                    final var recorder = DisplayListManager.pauseRecording();
+                    final CommandRecorder recorder = DisplayListManager.pauseRecording();
                    initConfig.getDirectDrawer().accept(result);
                    DisplayListManager.resumeRecording(recorder);
                }
                DisplayListManager.addImmediateModeDraw(result);
+                return;
+            }
+            if (initConfig != null && initConfig.getDirectDrawer() != null) {
+                initConfig.getDirectDrawer().accept(result);
            }
-            return;
-        }
-        final DirectTessellator result = ImmediateModeRecorder.end();
-        if (result != null && initConfig != null && initConfig.getDirectDrawer() != null) {
-            initConfig.getDirectDrawer().accept(result);
        }
    }

@@ -2242,7 +2266,6 @@ public class GLStateManager {
        if (recordMode != RecordMode.NONE) {
            // Core profile: a default VAO is generated at init and glBindVertexArray(0)
            // is redirected to it, so a VAO is always bound here — no fallback branches.
-            DisplayListManager.flushMatrix();
            final IndexedDrawCapture capture = IndexedDrawCapture.create(mode, indices_count, type, indices_buffer_offset, boundEBO);
            if (capture != null) {
                DisplayListManager.recordIndexedDrawCapture(capture);
@@ -3363,7 +3386,6 @@ public class GLStateManager {
        final RecordMode recordMode = DisplayListManager.getRecordMode();
        if (recordMode != RecordMode.NONE) {
            DisplayListManager.recordMatrixMode(mode);
-            DisplayListManager.resetRelativeTransform();  // Mode switch is a barrier - reset delta tracking
            if (recordMode == RecordMode.COMPILE) {
                return;
            }
@@ -3377,8 +3399,6 @@ public class GLStateManager {
            final Matrix4f matrix = new Matrix4f().set(m);
            m.rewind();
            DisplayListManager.recordLoadMatrix(matrix);
-            // Reset relative transform - subsequent transforms are relative to loaded matrix
-            DisplayListManager.resetRelativeTransform();
            if (mode == RecordMode.COMPILE) {
                return;
            }
@@ -3398,8 +3418,6 @@ public class GLStateManager {
            final Matrix4f floatMatrix = new Matrix4f();
            floatMatrix.set(conversionMatrix4d);
            DisplayListManager.recordLoadMatrix(floatMatrix);
-            // Reset relative transform - subsequent transforms are relative to loaded matrix
-            DisplayListManager.resetRelativeTransform();
            if (mode == RecordMode.COMPILE) {
                return;
            }
@@ -3439,8 +3457,6 @@ public class GLStateManager {
        final RecordMode mode = DisplayListManager.getRecordMode();
        if (mode != RecordMode.NONE) {
            DisplayListManager.recordLoadIdentity();
-            // Reset relative transform - accumulated transforms are discarded (overwritten by load)
-            DisplayListManager.resetRelativeTransform();
            if (mode == RecordMode.COMPILE) {
                return;
            }
@@ -3452,10 +3468,9 @@ public class GLStateManager {
    }

    public static void glTranslatef(float x, float y, float z) {
-        final RecordMode mode = DisplayListManager.getRecordMode();
-        if (mode != RecordMode.NONE) {
-            DisplayListManager.updateRelativeTransform(x, y, z, DisplayListManager.TransformOp.TRANSLATE, null);
-            if (mode == RecordMode.COMPILE) return;
+        if (DisplayListManager.isRecording()) {
+            DisplayListManager.applyMatrixTranslation(x, y, z);
+            return;
        }
        if (isCachingEnabled()) {
            getMatrixStack().translate(x, y, z);
@@ -3464,10 +3479,9 @@ public class GLStateManager {
    }

    public static void glTranslated(double x, double y, double z) {
-        final RecordMode mode = DisplayListManager.getRecordMode();
-        if (mode != RecordMode.NONE) {
-            DisplayListManager.updateRelativeTransform((float) x, (float) y, (float) z, DisplayListManager.TransformOp.TRANSLATE, null);
-            if (mode == RecordMode.COMPILE) return;
+        if (DisplayListManager.isRecording()) {
+            DisplayListManager.applyMatrixTranslation((float) x, (float) y, (float) z);
+            return;
        }
        if (isCachingEnabled()) {
            getMatrixStack().translate((float) x, (float) y, (float) z);
@@ -3476,10 +3490,9 @@ public class GLStateManager {
    }

    public static void glScalef(float x, float y, float z) {
-        final RecordMode mode = DisplayListManager.getRecordMode();
-        if (mode != RecordMode.NONE) {
-            DisplayListManager.updateRelativeTransform(x, y, z, DisplayListManager.TransformOp.SCALE, null);
-            if (mode == RecordMode.COMPILE) return;
+        if (DisplayListManager.isRecording()) {
+            DisplayListManager.applyMatrixScale(x, y, z);
+            return;
        }
        if (isCachingEnabled()) {
            getMatrixStack().scale(x, y, z);
@@ -3488,10 +3501,9 @@ public class GLStateManager {
    }

    public static void glScaled(double x, double y, double z) {
-        final RecordMode mode = DisplayListManager.getRecordMode();
-        if (mode != RecordMode.NONE) {
-            DisplayListManager.updateRelativeTransform((float) x, (float) y, (float) z, DisplayListManager.TransformOp.SCALE, null);
-            if (mode == RecordMode.COMPILE) return;
+        if (DisplayListManager.isRecording()) {
+            DisplayListManager.applyMatrixScale((float) x, (float) y, (float) z);
+            return;
        }
        if (isCachingEnabled()) {
            getMatrixStack().scale((float) x, (float) y, (float) z);
@@ -3505,10 +3517,9 @@ public class GLStateManager {
        multMatrix.set(floatBuffer);
        final int currentMode = matrixMode.getMode();

-        final RecordMode mode = DisplayListManager.getRecordMode();
-        if (mode != RecordMode.NONE) {
+        if (DisplayListManager.isRecording()) {
            DisplayListManager.updateRelativeTransform(multMatrix);
-            if (mode == RecordMode.COMPILE) return;
+            return;
        }
        if (isCachingEnabled()) {
            getMatrixStack().mul(multMatrix);
@@ -3516,6 +3527,13 @@ public class GLStateManager {
        }
    }

+    public static void applyMultMatrix(Matrix4f multMatrix) {
+        if (isCachingEnabled()) {
+            getMatrixStack().mul(multMatrix);
+            bumpMatrixGeneration();
+        }
+    }
+
    public static final Matrix4d conversionMatrix4d = new Matrix4d();
    public static final Matrix4f conversionMatrix4f = new Matrix4f();

@@ -3523,10 +3541,9 @@ public class GLStateManager {
        conversionMatrix4d.set(matrix);
        conversionMatrix4f.set(conversionMatrix4d);

-        final RecordMode mode = DisplayListManager.getRecordMode();
-        if (mode != RecordMode.NONE) {
+        if (DisplayListManager.isRecording()) {
            DisplayListManager.updateRelativeTransform(conversionMatrix4f);
-            if (mode == RecordMode.COMPILE) return;
+            return;
        }
        if (isCachingEnabled()) {
            getMatrixStack().mul(conversionMatrix4f);
@@ -3534,20 +3551,24 @@ public class GLStateManager {
        }
    }

-    private static final Vector3f rotation = new Vector3f();
-
    public static void glRotatef(float angle, float x, float y, float z) {
        final float lenSq = x * x + y * y + z * z;
        if (lenSq == 0.0f) return;
-        final RecordMode mode = DisplayListManager.getRecordMode();
-        if (mode != RecordMode.NONE) {
-            rotation.set(x, y, z).normalize();
-            DisplayListManager.updateRelativeTransform(angle, 0, 0, DisplayListManager.TransformOp.ROTATE, rotation);
-            if (mode == RecordMode.COMPILE) return;
+
+        // Fast way to normalize rotation
+        final float scalar = 1.0f / (float) Math.sqrt(lenSq);
+        x *= scalar;
+        y *= scalar;
+        z *= scalar;
+        // Convert deg to rad
+        angle = (float) Math.toRadians(angle);
+
+        if (DisplayListManager.isRecording()) {
+            DisplayListManager.applyMatrixRotation(angle, x, y, z);
+            return;
        }
        if (isCachingEnabled()) {
-            rotation.set(x, y, z).normalize();
-            getMatrixStack().rotate((float) Math.toRadians(angle), rotation);
+            getMatrixStack().rotate(angle, x, y, z);
            bumpMatrixGeneration();
        }
    }
@@ -3555,24 +3576,29 @@ public class GLStateManager {
    public static void glRotated(double angle, double x, double y, double z) {
        final double lenSq = x * x + y * y + z * z;
        if (lenSq == 0.0) return;
-        final RecordMode mode = DisplayListManager.getRecordMode();
-        if (mode != RecordMode.NONE) {
-            rotation.set((float) x, (float) y, (float) z).normalize();
-            DisplayListManager.updateRelativeTransform((float) angle, 0, 0, DisplayListManager.TransformOp.ROTATE, rotation);
-            if (mode == RecordMode.COMPILE) return;
+
+        // Fast way to normalize rotation
+        final double scalar = 1.0 / Math.sqrt(lenSq);
+        x *= scalar;
+        y *= scalar;
+        z *= scalar;
+        // Convert deg to rad
+        angle = Math.toRadians(angle);
+
+        if (DisplayListManager.isRecording()) {
+            DisplayListManager.applyMatrixRotation((float) angle, (float) x, (float) y, (float) z);
+            return;
        }
        if (isCachingEnabled()) {
-            rotation.set((float) x, (float) y, (float) z).normalize();
-            getMatrixStack().rotate((float) Math.toRadians(angle), rotation);
+            getMatrixStack().rotate((float) angle, (float) x, (float) y, (float) z);
            bumpMatrixGeneration();
        }
    }

    public static void glOrtho(double left, double right, double bottom, double top, double zNear, double zFar) {
-        final RecordMode mode = DisplayListManager.getRecordMode();
-        if (mode != RecordMode.NONE) {
+        if (DisplayListManager.isRecording()) {
            DisplayListManager.updateRelativeTransformOrtho(left, right, bottom, top, zNear, zFar);
-            if (mode == RecordMode.COMPILE) return;
+            return;
        }
        if (isCachingEnabled()) {
            getMatrixStack().ortho((float) left, (float) right, (float) bottom, (float) top, (float) zNear, (float) zFar);
@@ -3581,10 +3607,9 @@ public class GLStateManager {
    }

    public static void glFrustum(double left, double right, double bottom, double top, double zNear, double zFar) {
-        final RecordMode mode = DisplayListManager.getRecordMode();
-        if (mode != RecordMode.NONE) {
+        if (DisplayListManager.isRecording()) {
            DisplayListManager.updateRelativeTransformFrustum(left, right, bottom, top, zNear, zFar);
-            if (mode == RecordMode.COMPILE) return;
+            return;
        }
        if (isCachingEnabled()) {
            getMatrixStack().frustum((float) left, (float) right, (float) bottom, (float) top, (float) zNear, (float) zFar);
@@ -3879,7 +3904,12 @@ public class GLStateManager {
        return switch (pname) {
            case GL11.GL_TEXTURE_WIDTH -> info.getWidth();
            case GL11.GL_TEXTURE_HEIGHT -> info.getHeight();
-            case GL11.GL_TEXTURE_INTERNAL_FORMAT -> info.getInternalFormat();
+            case GL11.GL_TEXTURE_INTERNAL_FORMAT -> {
+                if (info.needsInternalFormatResolve() && isRecordingDisplayList()) {
+                    throw new IllegalStateException(String.format("glGetTexLevelParameteri(GL_TEXTURE_INTERNAL_FORMAT) needs to resolve a generic compressed format for texture %d during display list recording", getBoundTextureForServerState()));
+                }
+                yield info.getResolvedInternalFormat();
+            }
            default -> {
                if (isRecordingDisplayList()) {
                    throw new IllegalStateException(String.format(
@@ -4295,6 +4325,7 @@ public class GLStateManager {
            if (GLSMHooks.PROGRAM_CHANGE.hasListeners()) {
                GLSMHooks.programChangeEvent.previousProgram = prev;
                GLSMHooks.programChangeEvent.newProgram = 0;
+                GLSMHooks.programChangeEvent.postBind = false;
                GLSMHooks.PROGRAM_CHANGE.post(GLSMHooks.programChangeEvent);
            }
            ffp.activate();
@@ -4315,6 +4346,7 @@ public class GLStateManager {
            if (GLSMHooks.PROGRAM_CHANGE.hasListeners()) {
                GLSMHooks.programChangeEvent.previousProgram = prev;
                GLSMHooks.programChangeEvent.newProgram = program;
+                GLSMHooks.programChangeEvent.postBind = false;
                GLSMHooks.PROGRAM_CHANGE.post(GLSMHooks.programChangeEvent);
            }
            if (initConfig != null && initConfig.isLwjglDebug()) {
@@ -4323,6 +4355,12 @@ public class GLStateManager {
            }
            RENDER_BACKEND.useProgram(program);
            CompatUniformManager.onUseProgram(program);
+            if (GLSMHooks.PROGRAM_CHANGE.hasListeners()) {
+                GLSMHooks.programChangeEvent.previousProgram = prev;
+                GLSMHooks.programChangeEvent.newProgram = program;
+                GLSMHooks.programChangeEvent.postBind = true;
+                GLSMHooks.PROGRAM_CHANGE.post(GLSMHooks.programChangeEvent);
+            }
        }
    }

@@ -4398,6 +4436,7 @@ public class GLStateManager {
    }

    public static int glGetError() {
+        if (initConfig.noErrorChecks()) return 0;
        if (!RENDER_BACKEND.hasContext()) return 0;
        return RENDER_BACKEND.getError();
    }
@@ -4453,13 +4492,7 @@ public class GLStateManager {
            }
        }
        suspendPixelUnpackBuffer();
-        if (shouldUseDSA(target)) {
-            // Use DSA to upload directly to the texture - keeps GL binding state unchanged
-            RenderSystem.textureSubImage2D(getBoundTextureForServerState(), target, level, xoffset, yoffset, width, height, format, type, pixels);
-        } else {
-            // Non-main thread or proxy texture - use direct GL call
-            RENDER_BACKEND.texSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
-        }
+        RENDER_BACKEND.texSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
        restorePixelUnpackBuffer();
    }

@@ -4472,13 +4505,7 @@ public class GLStateManager {
            }
        }
        suspendPixelUnpackBuffer();
-        if (shouldUseDSA(target)) {
-            // Use DSA to upload directly to the texture
-            RenderSystem.textureSubImage2D(getBoundTextureForServerState(), target, level, xoffset, yoffset, width, height, format, type, pixels);
-        } else {
-            // Non-main thread or proxy texture - use direct GL call
-            RENDER_BACKEND.texSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
-        }
+        RENDER_BACKEND.texSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
        restorePixelUnpackBuffer();
    }

@@ -4982,25 +5009,25 @@ public class GLStateManager {
        RENDER_BACKEND.bindBuffer(target, buffer);
    }

-    private static void suspendPixelUnpackBuffer() {
+    static void suspendPixelUnpackBuffer() {
        if (boundPixelUnpackBuffer != 0) {
            RENDER_BACKEND.bindBuffer(GL21.GL_PIXEL_UNPACK_BUFFER, 0);
        }
    }

-    private static void restorePixelUnpackBuffer() {
+    static void restorePixelUnpackBuffer() {
        if (boundPixelUnpackBuffer != 0) {
            RENDER_BACKEND.bindBuffer(GL21.GL_PIXEL_UNPACK_BUFFER, boundPixelUnpackBuffer);
        }
    }

-    private static void suspendPixelPackBuffer() {
+    static void suspendPixelPackBuffer() {
        if (boundPixelPackBuffer != 0) {
            RENDER_BACKEND.bindBuffer(GL21.GL_PIXEL_PACK_BUFFER, 0);
        }
    }

-    private static void restorePixelPackBuffer() {
+    static void restorePixelPackBuffer() {
        if (boundPixelPackBuffer != 0) {
            RENDER_BACKEND.bindBuffer(GL21.GL_PIXEL_PACK_BUFFER, boundPixelPackBuffer);
        }
@@ -5164,8 +5191,12 @@ public class GLStateManager {
                return;
            }
            setLightmapTextureCoords(target, s, t);
+        } else {
+            final int unit = target - GL13.GL_TEXTURE0;
+            if (unit >= 2 && unit < 4) {
+                ShaderManager.setCurrentTexCoord(unit, s, t, 0.0f, 1.0f);
+            }
        }
-        // Units 2+ silently ignored — shader uses v_TexCoord0 for all non-lightmap units
    }

    public static void glMultiTexCoord2d(int target, double s, double t) {
@@ -5198,7 +5229,7 @@ public class GLStateManager {
    }

    public static boolean isFramebufferEnabled() {
-        return initConfig != null && initConfig.isFramebufferSupported() && initConfig.isFboEnabled();
+        return true;
    }

    private static final boolean FFP_WARN_ON_UNSUPPORTED = Boolean.parseBoolean(System.getProperty("angelica.ffp.warnOnUnsupported", "false"));
@@ -5933,4 +5964,14 @@ public class GLStateManager {
    public static void glGetTexImage(int target, int level, int format, int type, long pixels) {
        GL11.glGetTexImage(target, level, format, type, pixels);
    }
+
+    /**
+     * Draw modes that rely on the previous vertex data cannot be merged currently.
+     * It is possible to merge them using Index Buffers, but currently unimplemented.
+     */
+    public static boolean isContinuousDraw(int drawMode) {
+        return drawMode == GL11.GL_TRIANGLE_STRIP || drawMode == GL11.GL_TRIANGLE_FAN
+            || drawMode == GL11.GL_LINE_STRIP || drawMode == GL11.GL_LINE_LOOP
+            || drawMode == GL11.GL_QUAD_STRIP || drawMode == GL11.GL_POLYGON;
+    }
 }
@@ -1,22 +0,0 @@
-package com.gtnewhorizons.angelica.glsm;
-
-/**
- * Tessellator data needed by {@link com.gtnewhorizons.angelica.glsm.streaming.TessellatorStreamingDrawer}.
- */
-public interface ITessellatorData {
-
-    boolean isDrawing();
-    void setDrawing(boolean drawing);
-    int getVertexCount();
-    int[] getRawBuffer();
-    int getRawBufferIndex();
-    int getRawBufferSize();
-    void setRawBufferSize(int size);
-    void setRawBuffer(int[] buffer);
-    int getDrawMode();
-    boolean hasTexture();
-    boolean hasColor();
-    boolean hasNormals();
-    boolean hasBrightness();
-    void angelica$reset();
-}
@@ -7,7 +7,9 @@ import com.gtnewhorizons.angelica.glsm.dsa.DSACore;
 import com.gtnewhorizons.angelica.glsm.dsa.DSAEXT;
 import com.gtnewhorizons.angelica.glsm.dsa.DSAUnsupported;
 import com.gtnewhorizons.angelica.glsm.ffp.ShaderManager;
+import com.gtnewhorizons.angelica.glsm.hooks.GLSMInitConfig;
 import com.gtnewhorizons.angelica.glsm.texture.TextureInfoCache;
+import lombok.Getter;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Matrix4f;
 import org.joml.Vector3i;
@@ -47,6 +49,9 @@ public class RenderSystem {
    private static int maxSSBOBindings;
    private static int maxGlslVersion;
    private static boolean supportsGpuShader4;
+    @Getter private static int glMajor;
+    @Getter private static int glMinor;
+    @Getter private static boolean coreProfile;

    // Sampler object state tracking (null if unsupported)
    private static int[] samplers;
@@ -61,7 +66,13 @@ public class RenderSystem {
        if (rendererInitialized) return;
        rendererInitialized = true;
        try {
-            if (GLStateManager.capabilities.OpenGL45) {
+            if (GLStateManager.vendorIsIntel() && GLStateManager.isWindows()) {
+                dsaState = new DSAUnsupported();
+                GLStateManager.LOGGER.info("Detected Intel drivers on Windows, disabling DSA.");
+            } else if (!GLStateManager.getInitConfig().isDSAEnabled()) {
+                dsaState = new DSAUnsupported();
+                GLStateManager.LOGGER.info("enableDSA is set to false, disabling DSA.");
+            } else if (GLStateManager.capabilities.OpenGL45) {
                dsaState = (Runtime.version().feature() > 8 && GLStateManager.capabilities.GL_EXT_direct_state_access) ? new DSAEXT() : new DSACore();
                GLStateManager.LOGGER.info("OpenGL 4.5 detected, enabling DSA.");
            }
@@ -133,10 +144,17 @@ public class RenderSystem {
        if (GLStateManager.capabilities.OpenGL32) {
            final int profileMask = RENDER_BACKEND.getInteger(GL32.GL_CONTEXT_PROFILE_MASK);
            if ((profileMask & GL32.GL_CONTEXT_CORE_PROFILE_BIT) != 0) {
+                coreProfile = true;
                GLStateManager.LOGGER.info("GL 3.3 core profile detected, enabling FFP shader emulation.");
                ShaderManager.getInstance().enable();
            }
        }
+
+        final Matcher glVerMatcher = SEMVER_PATTERN.matcher(RENDER_BACKEND.getString(GL11.GL_VERSION));
+        if (glVerMatcher.matches()) {
+            glMajor = Integer.parseInt(glVerMatcher.group("major"));
+            glMinor = Integer.parseInt(glVerMatcher.group("minor"));
+        }
    }

    public static void generateMipmaps(int texture, int mipmapTarget) {
@@ -149,7 +167,9 @@ public class RenderSystem {

    public static void texImage2D(int texture, int target, int level, int internalformat, int width, int height, int border, int format, int type, @Nullable ByteBuffer pixels) {
        GLStateManager.glBindTexture(target, texture);
+        GLStateManager.suspendPixelUnpackBuffer();
        RENDER_BACKEND.texImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+        GLStateManager.restorePixelUnpackBuffer();
        if (target == GL11.GL_TEXTURE_2D && level == 0) {
            TextureInfoCache.INSTANCE.onTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
        }
@@ -218,29 +238,41 @@ public class RenderSystem {
    }

    public static void textureImage2D(int texture, int target, int level, int internalformat, int width, int height, int border, int format, int type, ByteBuffer pixels) {
+        GLStateManager.suspendPixelUnpackBuffer();
        dsaState.textureImage2D(texture, target, level, internalformat, width, height, border, format, type, pixels);
+        GLStateManager.restorePixelUnpackBuffer();
    }

    public static void textureImage2D(int texture, int target, int level, int internalformat, int width, int height, int border, int format, int type, IntBuffer pixels) {
+        GLStateManager.suspendPixelUnpackBuffer();
        dsaState.textureImage2D(texture, target, level, internalformat, width, height, border, format, type, pixels);
+        GLStateManager.restorePixelUnpackBuffer();
    }

    public static void textureSubImage2D(int texture, int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, ByteBuffer pixels) {
+        GLStateManager.suspendPixelUnpackBuffer();
        dsaState.textureSubImage2D(texture, target, level, xoffset, yoffset, width, height, format, type, pixels);
+        GLStateManager.restorePixelUnpackBuffer();
    }

    public static void textureSubImage2D(int texture, int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, IntBuffer pixels) {
+        GLStateManager.suspendPixelUnpackBuffer();
        dsaState.textureSubImage2D(texture, target, level, xoffset, yoffset, width, height, format, type, pixels);
+        GLStateManager.restorePixelUnpackBuffer();
    }

    public static void texImage1D(int texture, int target, int level, int internalformat, int width, int border, int format, int type, ByteBuffer pixels) {
        RENDER_BACKEND.bindTexture(target, texture);
+        GLStateManager.suspendPixelUnpackBuffer();
        RENDER_BACKEND.texImage1D(target, level, internalformat, width, border, format, type, pixels);
+        GLStateManager.restorePixelUnpackBuffer();
    }

    public static void texImage3D(int texture, int target, int level, int internalformat, int width, int height, int depth, int border, int format, int type, ByteBuffer pixels) {
        RENDER_BACKEND.bindTexture(target, texture);
+        GLStateManager.suspendPixelUnpackBuffer();
        RENDER_BACKEND.texImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+        GLStateManager.restorePixelUnpackBuffer();
    }

    public static String getProgramInfoLog(int program) {
@@ -264,7 +296,9 @@ public class RenderSystem {
    }

    public static void readPixels(int x, int y, int width, int height, int format, int type, FloatBuffer pixels) {
+        GLStateManager.suspendPixelPackBuffer();
        RENDER_BACKEND.readPixels(x, y, width, height, format, type, pixels);
+        GLStateManager.restorePixelPackBuffer();
    }

    public static void bufferData(int target, FloatBuffer data, int usage) {
@@ -1,132 +0,0 @@
-package com.gtnewhorizons.angelica.glsm;
-
-import com.gtnewhorizons.angelica.glsm.recording.commands.DisplayListCommand;
-import com.gtnewhorizons.angelica.glsm.recording.commands.MultMatrixCmd;
-import org.joml.Matrix4f;
-
-import java.util.ArrayDeque;
-import java.util.Deque;
-import java.util.List;
-
-/**
- * Helper class for tracking and collapsing matrix transforms during optimization.
- * Implements the transform accumulation and emission strategy:
- * <ul>
- *   <li>accumulated: total relative transform (what GL matrix should be)</li>
- *   <li>lastEmitted: what we've emitted (what GL matrix is)</li>
- *   <li>stack: saved accumulated values at Push points</li>
- * </ul>
- */
-class TransformOptimizer {
-    private final Matrix4f accumulated = new Matrix4f();  // Current accumulated transform
-    private final Matrix4f lastEmitted = new Matrix4f();  // Last emitted transform
-    private final Deque<Matrix4f> stack = new ArrayDeque<>();  // For Push/Pop
-    private final int listId;  // For logging
-    private boolean absoluteMatrixFlag = false;  // True after LoadMatrix, cleared by LoadIdentity emit
-
-    TransformOptimizer(int listId) {
-        this.listId = listId;
-        accumulated.identity();
-        lastEmitted.identity();
-    }
-
-    Matrix4f getAccumulated() {
-        return accumulated;
-    }
-
-    void loadIdentity() {
-        accumulated.identity();
-    }
-
-    void pushTransform() {
-        stack.push(new Matrix4f(accumulated));
-    }
-
-    void popTransform() {
-        if (!stack.isEmpty()) {
-            final Matrix4f popped = stack.pop();
-            accumulated.set(popped);
-            // After Pop, GL state is restored to the pushed value so lastEmitted should also reflect this
-            lastEmitted.set(accumulated);
-        } else {
-            GLStateManager.LOGGER.warn("[TransformOptimizer] list={} Pop with empty stack - resetting to identity", listId);
-            accumulated.identity();
-            lastEmitted.identity();
-        }
-    }
-
-    boolean isIdentity() {
-        return DisplayListManager.isIdentity(accumulated);
-    }
-
-    /**
-     * Check if there's a pending transform that hasn't been emitted yet.
-     */
-    boolean hasPendingTransform() {
-        return !accumulated.equals(lastEmitted);
-    }
-
-    /**
-     * Emit a MultMatrix command if accumulated differs from lastEmitted.
-     * Updates lastEmitted to match accumulated after emission.
-     */
-    void emitPendingTransform(List<DisplayListCommand> output) {
-        if (!accumulated.equals(lastEmitted)) {
-            emitTransformTo(output, accumulated);
-        }
-    }
-
-    /**
-     * Emit a MultMatrix command to make GL state match a target transform.
-     * Used when a draw expects a specific transform that may differ from accumulated.
-     * Updates lastEmitted to match target after emission.
-     *
-     * @param output The command list to emit to
-     * @param target The target transform to reach
-     */
-    void emitTransformTo(List<DisplayListCommand> output, Matrix4f target) {
-        if (target.equals(lastEmitted)) {
-            // Already at target - nothing to emit
-            return;
-        }
-
-        // Calculate delta: what we need to multiply to go from lastEmitted to target
-        // delta = inverse(lastEmitted) * target
-        // But for simplicity, if lastEmitted is identity, just emit target
-        if (DisplayListManager.isIdentity(lastEmitted)) {
-            // Simple case: just emit target
-            output.add(MultMatrixCmd.create(target));
-        } else {
-            // Need to emit delta: inv(lastEmitted) * target
-            final Matrix4f delta = new Matrix4f(lastEmitted).invert().mul(target);
-            output.add(MultMatrixCmd.create(delta));
-        }
-        lastEmitted.set(target);
-    }
-
-    /**
-     * Check if a draw's expected transform differs from what we've emitted.
-     */
-    boolean needsTransformForDraw(Matrix4f drawTransform) {
-        return !drawTransform.equals(lastEmitted);
-    }
-
-    /**
-     * Mark that the GL matrix is at an absolute value (after LoadMatrix).
-     * Subsequent LoadIdentity commands must be emitted to actually reset GL to identity.
-     */
-    void markAbsoluteMatrix() {
-        absoluteMatrixFlag = true;
-    }
-
-    /**
-     * Check if the GL matrix is at an absolute value and clear the flag.
-     * Used to determine if LoadIdentity needs to emit.
-     * @return true if LoadMatrix was called and not yet reset by LoadIdentity
-     */
-    boolean checkAndClearAbsoluteMatrix() {
-        boolean was = absoluteMatrixFlag;
-        absoluteMatrixFlag = false;
-        return was;
-    }
-}
@@ -12,7 +12,7 @@ import org.lwjgl.opengl.GL13;
 * Packed-long fragment shader permutation key for FFP emulation.
 *
 * Layout:
- *   long[0]: global bits (10) + unit 0 (47 bits at offset 10)
+ *   long[0]: global bits (11) + unit 0 (47 bits at offset 11)
 *   long[1..3]: unit 1..3 (47 bits each, low-aligned)
 * Only max(1, nrEnabledUnits) longs are significant.
 *
@@ -63,12 +63,13 @@ public final class FragmentKey {
    public static final int FOG_EXP    = 2;
    public static final int FOG_EXP2   = 3;

-    private static final int GLOBAL_BITS = 10;
+    private static final int GLOBAL_BITS = 11;
    private static final int BIT_FOG_MODE          = 0;  // 2 bits
    private static final int BIT_ALPHA_TEST        = 2;  // 1 bit
    private static final int BIT_ALPHA_FUNC        = 3;  // 3 bits
    private static final int BIT_SEPARATE_SPECULAR = 6;  // 1 bit
    private static final int BIT_NR_ENABLED_UNITS  = 7;  // 3 bits
+    private static final int BIT_OVERLAY_ENABLED   = 10; // 1 bit

    private static final int U_ENABLED         = 0;
    private static final int U_MODE            = 1;   // 3 bits
@@ -119,6 +120,11 @@ public final class FragmentKey {
            global |= ((long) (encodeAlphaFunc(GLStateManager.getAlphaState().getFunction()) & 0x7)) << BIT_ALPHA_FUNC;
        }

+        // Damage overlay
+        if (GLStateManager.getOverlayA() != 0.0f) {
+            global |= (1L << BIT_OVERLAY_ENABLED);
+        }
+
        // Separate specular
        if (GLStateManager.getLightingState().isEnabled()
            && GLStateManager.getLightModel().colorControl == GL12.GL_SEPARATE_SPECULAR_COLOR) {
@@ -227,6 +233,7 @@ public final class FragmentKey {
    public int alphaTestFunc()        { return (int) ((packed[0] >> BIT_ALPHA_FUNC) & 0x7); }
    public boolean separateSpecular() { return ((packed[0] >> BIT_SEPARATE_SPECULAR) & 1) != 0; }
    public int nrEnabledUnits()       { return (int) ((packed[0] >> BIT_NR_ENABLED_UNITS) & 0x7); }
+    public boolean overlayEnabled()   { return ((packed[0] >> BIT_OVERLAY_ENABLED) & 1) != 0; }

    private long unitBits(int i) {
        return (i == 0) ? (packed[0] >>> GLOBAL_BITS) : packed[i];
@@ -252,6 +259,28 @@ public final class FragmentKey {
        return false;
    }

+    /** Per-unit enable bits as a 4-bit mask (bit i = unit i enabled). */
+    public int enabledUnitMask() {
+        int mask = 0;
+        final int n = Math.min(nrEnabledUnits(), MAX_UNITS);
+        for (int i = 0; i < n; i++) {
+            if (unitEnabled(i)) mask |= (1 << i);
+        }
+        return mask;
+    }
+
+    /** Per-unit enable bits from a packed scratch as a 4-bit mask (bit i = unit i enabled). */
+    public static int unitMaskFromPacked(long[] packed, int len) {
+        int mask = 0;
+        if (len < 1) return 0;
+        if (((packed[0] >>> GLOBAL_BITS) & 1L) != 0) mask |= 1;
+        final int n = Math.min(len, MAX_UNITS);
+        for (int i = 1; i < n; i++) {
+            if ((packed[i] & 1L) != 0) mask |= (1 << i);
+        }
+        return mask;
+    }
+
    public boolean lightmapEnabled() {
        return nrEnabledUnits() > 1 && unitEnabled(1);
    }
@@ -338,10 +367,10 @@ public final class FragmentKey {
            default -> "?";
        };
        final StringBuilder sb = new StringBuilder();
-        sb.append(String.format("FFPFragmentKey[fog=%s alpha=%b(%s) specSep=%b units=%d",
+        sb.append(String.format("FFPFragmentKey[fog=%s alpha=%b(%s) specSep=%b overlay=%b units=%d",
            fogName, alphaTestEnabled(),
            alphaTestEnabled() ? String.format("0x%04X", decodeAlphaFunc(alphaTestFunc())) : "-",
-            separateSpecular(), nrEnabledUnits()));
+            separateSpecular(), overlayEnabled(), nrEnabledUnits()));
        for (int i = 0; i < nrEnabledUnits(); i++) {
            if (!unitEnabled(i)) {
                sb.append(String.format(" u%d=OFF", i));
@@ -37,11 +37,11 @@ public final class FragmentShaderGenerator {
        if (key.separateSpecular()) {
            sb.append("in vec3 v_SpecularColor;\n");
        }
-        if (key.textureEnabled()) {
-            sb.append("in vec4 v_TexCoord0;\n");
-        }
-        if (key.lightmapEnabled()) {
-            sb.append("in vec4 v_TexCoord1;\n");
+        // Per-unit texcoord inputs. Each enabled unit sources from its own varying
+        for (int i = 0; i < key.nrEnabledUnits(); i++) {
+            if (key.unitEnabled(i)) {
+                sb.append("in vec4 v_TexCoord").append(i).append(";\n");
+            }
        }
        if (key.fogMode() != FragmentKey.FOG_NONE) {
            sb.append("in float v_FogCoord;\n");
@@ -65,6 +65,9 @@ public final class FragmentShaderGenerator {
                sb.append("uniform vec4 u_TexEnvColor").append(i).append(";\n");
            }
        }
+        if (key.overlayEnabled()) {
+            sb.append("uniform vec4 u_OverlayColor;\n");
+        }
        if (key.fogMode() != FragmentKey.FOG_NONE) {
            sb.append("uniform vec4 u_FogParams;\n");
            sb.append("uniform vec4 u_FogColor;\n");
@@ -75,11 +78,7 @@ public final class FragmentShaderGenerator {
    private static void emitTextureSampling(StringBuilder sb, FragmentKey key) {
        for (int i = 0; i < key.nrEnabledUnits(); i++) {
            if (!key.unitEnabled(i)) continue;
-            // Unit 1 is the lightmap — uses v_TexCoord1.
-            // Units 2-3 intentionally share unit 0's texture coordinates since
-            // the vertex shader only provides 2 tex coord varyings (unit 0 and unit 1/lightmap).
-            final String texCoord = (i == 1) ? "v_TexCoord1.st" : "v_TexCoord0.st";
-            sb.append("  vec4 tex").append(i).append("Color = texture(u_Sampler").append(i).append(", ").append(texCoord).append(");\n");
+            sb.append("  vec4 tex").append(i).append("Color = texture(u_Sampler").append(i).append(", v_TexCoord").append(i).append(".st);\n");
        }
    }

@@ -87,14 +86,21 @@ public final class FragmentShaderGenerator {
        if (!key.textureEnabled()) {
            sb.append("  // No texture -- vertex color only\n");
            sb.append("  vec4 color = v_Color;\n");
+            emitOverlay(sb, key);
            return;
        }

-        // Process units in order; "previous" starts as vertex color
+        // Process units in order; "previous" starts as vertex color.
        boolean firstUnit = true;
+        boolean overlayInjected = false;
        for (int i = 0; i < key.nrEnabledUnits(); i++) {
            if (!key.unitEnabled(i)) continue;

+            if (!firstUnit && !overlayInjected) {
+                emitOverlay(sb, key);
+                overlayInjected = true;
+            }
+
            final String texVar = "tex" + i + "Color";
            final String envColorVar = "u_TexEnvColor" + i;
            final String prevVar = firstUnit ? "v_Color" : "color";
@@ -107,6 +113,16 @@ public final class FragmentShaderGenerator {
            }
            firstUnit = false;
        }
+
+        if (!overlayInjected) emitOverlay(sb, key);
+    }
+
+    /**
+     * Emit the modern-style damage overlay mix.
+     */
+    private static void emitOverlay(StringBuilder sb, FragmentKey key) {
+        if (!key.overlayEnabled()) return;
+        sb.append("  color.rgb = mix(color.rgb, u_OverlayColor.rgb, u_OverlayColor.a);\n");
    }

    private static void emitSimpleUnit(StringBuilder sb, FragmentKey key, int unit, String texVar, String envColorVar, String prevVar, String assign) {
@@ -22,12 +22,10 @@ public final class GeometryShaderGenerator {
        if (key.separateSpecular()) {
            sb.append("in vec3 v_SpecularColor_gs[];\n");
        }
-        if (key.textureEnabled() || key.hasVertexTexCoord() || key.texGenEnabled()) {
-            sb.append("in vec4 v_TexCoord0_gs[];\n");
-        }
-        if (key.lightmapEnabled()) {
-            sb.append("in vec4 v_TexCoord1_gs[];\n");
-        }
+        if (key.unitTexCoordEnabled(0) || key.texGenEnabled()) sb.append("in vec4 v_TexCoord0_gs[];\n");
+        if (key.lightmapEnabled())            sb.append("in vec4 v_TexCoord1_gs[];\n");
+        if (key.unitTexCoordEnabled(2))       sb.append("in vec4 v_TexCoord2_gs[];\n");
+        if (key.unitTexCoordEnabled(3))       sb.append("in vec4 v_TexCoord3_gs[];\n");
        if (key.fogEnabled()) {
            sb.append("in float v_FogCoord_gs[];\n");
        }
@@ -37,12 +35,10 @@ public final class GeometryShaderGenerator {
        if (key.separateSpecular()) {
            sb.append("out vec3 v_SpecularColor;\n");
        }
-        if (key.textureEnabled() || key.hasVertexTexCoord() || key.texGenEnabled()) {
-            sb.append("out vec4 v_TexCoord0;\n");
-        }
-        if (key.lightmapEnabled()) {
-            sb.append("out vec4 v_TexCoord1;\n");
-        }
+        if (key.unitTexCoordEnabled(0) || key.texGenEnabled()) sb.append("out vec4 v_TexCoord0;\n");
+        if (key.lightmapEnabled())            sb.append("out vec4 v_TexCoord1;\n");
+        if (key.unitTexCoordEnabled(2))       sb.append("out vec4 v_TexCoord2;\n");
+        if (key.unitTexCoordEnabled(3))       sb.append("out vec4 v_TexCoord3;\n");
        if (key.fogEnabled()) {
            sb.append("out float v_FogCoord;\n");
        }
@@ -82,12 +78,10 @@ public final class GeometryShaderGenerator {
        if (key.separateSpecular()) {
            sb.append("    v_SpecularColor = v_SpecularColor_gs").append(idx).append(";\n");
        }
-        if (key.textureEnabled() || key.hasVertexTexCoord() || key.texGenEnabled()) {
-            sb.append("    v_TexCoord0 = v_TexCoord0_gs").append(idx).append(";\n");
-        }
-        if (key.lightmapEnabled()) {
-            sb.append("    v_TexCoord1 = v_TexCoord1_gs").append(idx).append(";\n");
-        }
+        if (key.unitTexCoordEnabled(0) || key.texGenEnabled()) sb.append("    v_TexCoord0 = v_TexCoord0_gs").append(idx).append(";\n");
+        if (key.lightmapEnabled())            sb.append("    v_TexCoord1 = v_TexCoord1_gs").append(idx).append(";\n");
+        if (key.unitTexCoordEnabled(2))       sb.append("    v_TexCoord2 = v_TexCoord2_gs").append(idx).append(";\n");
+        if (key.unitTexCoordEnabled(3))       sb.append("    v_TexCoord3 = v_TexCoord3_gs").append(idx).append(";\n");
        if (key.fogEnabled()) {
            sb.append("    v_FogCoord = v_FogCoord_gs").append(idx).append(";\n");
        }
@@ -32,12 +32,12 @@ public class Program {
    public int locProjectionMatrix = -1;
    public int locMVPMatrix = -1;
    public int locNormalMatrix = -1;
-    public int locTextureMatrix0 = -1;
+    public final int[] locTextureMatrix = { -1, -1, -1, -1 };

    // Current state defaults
    public int locCurrentNormal = -1;
    public int locCurrentColor = -1;
-    public int locCurrentTexCoord = -1;
+    public final int[] locCurrentTexCoord = { -1, -1, -1, -1 };
    public int locCurrentLightmapCoord = -1;
    public int locLightmapTextureMatrix = -1;

@@ -92,6 +92,7 @@ public class Program {
    public final int[] locSampler = { -1, -1, -1, -1 };
    public int locAlphaRef = -1;
    public final int[] locTexEnvColor = { -1, -1, -1, -1 };
+    public int locOverlayColor = -1;
    public int locFogParams = -1;
    public int locFogColor = -1;

@@ -107,11 +108,13 @@ public class Program {
        locProjectionMatrix = loc("u_ProjectionMatrix");
        locMVPMatrix = loc("u_MVPMatrix");
        locNormalMatrix = loc("u_NormalMatrix");
-        locTextureMatrix0 = loc("u_TextureMatrix0");
+        for (int i = 0; i < 4; i++) {
+            locTextureMatrix[i] = loc("u_TextureMatrix" + i);
+            locCurrentTexCoord[i] = loc("u_CurrentTexCoord" + i);
+        }

        locCurrentNormal = loc("u_CurrentNormal");
        locCurrentColor = loc("u_CurrentColor");
-        locCurrentTexCoord = loc("u_CurrentTexCoord");
        locCurrentLightmapCoord = loc("u_CurrentLightmapCoord");
        locLightmapTextureMatrix = loc("u_LightmapTextureMatrix");

@@ -169,6 +172,7 @@ public class Program {
        for (int i = 0; i < 4; i++) {
            locTexEnvColor[i] = loc("u_TexEnvColor" + i);
        }
+        locOverlayColor = loc("u_OverlayColor");
        locFogParams = loc("u_FogParams");
        locFogColor = loc("u_FogColor");
    }
@@ -42,11 +42,19 @@ public class ShaderManager {
    private int currentFKLen = 0;

    @Getter private static final Vector3f currentNormal = new Vector3f(0.0f, 0.0f, 1.0f);
-    @Getter private static final Vector4f currentTexCoord = new Vector4f(0.0f, 0.0f, 0.0f, 1.0f);
+    private static final Vector4f[] currentTexCoords = {
+        new Vector4f(0.0f, 0.0f, 0.0f, 1.0f),
+        new Vector4f(0.0f, 0.0f, 0.0f, 1.0f),
+        new Vector4f(0.0f, 0.0f, 0.0f, 1.0f),
+        new Vector4f(0.0f, 0.0f, 0.0f, 1.0f),
+    };
    @Getter private static final Vec3fStack normalStack = new Vec3fStack(currentNormal);
-    @Getter private static final Vec4fStack texCoordStack = new Vec4fStack(currentTexCoord);
+    @Getter private static final Vec4fStack texCoordStack = new Vec4fStack(currentTexCoords[0]);
    @Getter private static int normalGeneration;
    @Getter private static int texCoordGeneration;
+
+    public static Vector4f getCurrentTexCoord() { return currentTexCoords[0]; }
+    public static Vector4f getCurrentTexCoord(int unit) { return currentTexCoords[unit]; }
    @Getter private boolean enabled = false;
    private int currentVertexFlags = VertexFlags.TEXTURE_BIT | VertexFlags.COLOR_BIT | VertexFlags.NORMAL_BIT;

@@ -108,8 +116,9 @@ public class ShaderManager {
            }
        }

-        final long vkPacked = VertexKey.packFromState(hasColor, hasNormal, hasTexCoord, hasLightmap);
        final int fkLen = FragmentKey.packFromState(currentFKScratch);
+        final int fragMask = FragmentKey.unitMaskFromPacked(currentFKScratch, fkLen);
+        final long vkPacked = VertexKey.packFromState(hasColor, hasNormal, hasTexCoord, hasLightmap, fragMask);

        if (vkPacked != currentVertexKeyPacked || !Arrays.equals(currentFKScratch, 0, fkLen, currentFKPacked, 0, currentFKLen)) {
            commitVariant(vkPacked, fkLen);
@@ -133,8 +142,9 @@ public class ShaderManager {
    }

    private void updateVariant(boolean hasColor, boolean hasNormal, boolean hasTexCoord, boolean hasLightmap) {
-        final long vkPacked = VertexKey.packFromState(hasColor, hasNormal, hasTexCoord, hasLightmap);
        final int fkLen = FragmentKey.packFromState(currentFKScratch);
+        final int fragMask = FragmentKey.unitMaskFromPacked(currentFKScratch, fkLen);
+        final long vkPacked = VertexKey.packFromState(hasColor, hasNormal, hasTexCoord, hasLightmap, fragMask);
        commitVariant(vkPacked, fkLen);
    }

@@ -158,7 +168,12 @@ public class ShaderManager {
    }

    public static void setCurrentTexCoord(float s, float t, float r, float q) {
-        currentTexCoord.set(s, t, r, q);
+        currentTexCoords[0].set(s, t, r, q);
+        texCoordGeneration++;
+    }
+
+    public static void setCurrentTexCoord(int unit, float s, float t, float r, float q) {
+        currentTexCoords[unit].set(s, t, r, q);
        texCoordGeneration++;
    }

@@ -7,6 +7,7 @@ import com.gtnewhorizons.angelica.glsm.states.LightState;
 import com.gtnewhorizons.angelica.glsm.states.MaterialState;
 import com.gtnewhorizons.angelica.glsm.states.TexGenState;
 import com.gtnewhorizons.angelica.glsm.hooks.GLSMConfig;
+import org.joml.Math;
 import org.joml.Matrix3f;
 import org.joml.Matrix4f;
 import org.joml.Vector4f;
@@ -42,8 +43,8 @@ public class Uniforms {
    private final org.joml.Vector3f tempVec3 = new org.joml.Vector3f();

    // Pre-computed constants for fog params (Mesa STATE_FOG_PARAMS_OPTIMIZED)
-    private static final double LN2 = Math.log(2.0);
-    private static final double SQRT_LN2 = Math.sqrt(LN2);
+    private static final double LN2 = java.lang.Math.log(2.0);
+    private static final double SQRT_LN2 = java.lang.Math.sqrt(LN2);

    // Dirty tracking: last-uploaded generation per category + program ID.
    // Program change forces full re-upload since uniform locations differ.
@@ -110,10 +111,10 @@ public class Uniforms {
            }
        }

-        if (!program.getVertexKey().hasVertexTexCoord() && program.getVertexKey().textureEnabled()) {
+        if (program.getVertexKey().anyUnitTexCoordEnabled()) {
            final int texGen = ShaderManager.getTexCoordGeneration();
            if (programChanged || texGen != lastTexCoordGen) {
-                uploadCurrentTexCoord(program);
+                uploadCurrentTexCoords(program);
                lastTexCoordGen = texGen;
            }
        }
@@ -197,16 +198,15 @@ public class Uniforms {
            RENDER_BACKEND.uniformMatrix4(program.locMVPMatrix, false, mat4Buf);
        }

-        // Texture matrices
+        // Texture matrices (per-unit).
        if (texMatChanged) {
-            // Texture matrix unit 0
-            if (program.locTextureMatrix0 != -1) {
-                final Matrix4f texMat = GLStateManager.getTextures().getTextureUnitMatrix(0);
-                texMat.get(mat4Buf);
-                RENDER_BACKEND.uniformMatrix4(program.locTextureMatrix0, false, mat4Buf);
+            for (int i = 0; i < 4; i++) {
+                if (program.locTextureMatrix[i] != -1) {
+                    final Matrix4f texMat = GLStateManager.getTextures().getTextureUnitMatrix(i);
+                    texMat.get(mat4Buf);
+                    RENDER_BACKEND.uniformMatrix4(program.locTextureMatrix[i], false, mat4Buf);
+                }
            }
-
-            // Texture matrix unit 1 (lightmap)
            if (program.locLightmapTextureMatrix != -1) {
                final Matrix4f lmTexMat = GLStateManager.getTextures().getTextureUnitMatrix(1);
                lmTexMat.get(mat4Buf);
@@ -315,18 +315,20 @@ public class Uniforms {
        // Upload the current color from GLSM
        final var color = GLStateManager.getColor();
        vec4Buf.clear();
-        vec4Buf.put(color.getRed());
-        vec4Buf.put(color.getGreen());
-        vec4Buf.put(color.getBlue());
-        vec4Buf.put(color.getAlpha());
+        vec4Buf.put(Math.clamp(0f, 1f, color.getRed()));
+        vec4Buf.put(Math.clamp(0f, 1f, color.getGreen()));
+        vec4Buf.put(Math.clamp(0f, 1f, color.getBlue()));
+        vec4Buf.put(Math.clamp(0f, 1f, color.getAlpha()));
        vec4Buf.flip();
        RENDER_BACKEND.uniform4(program.locCurrentColor, vec4Buf);
    }

-    private void uploadCurrentTexCoord(Program program) {
-        if (program.locCurrentTexCoord == -1) return;
-        final var tc = ShaderManager.getCurrentTexCoord();
-        uploadVec4(program.locCurrentTexCoord, tc);
+    private void uploadCurrentTexCoords(Program program) {
+        for (int i = 0; i < 4; i++) {
+            if (program.locCurrentTexCoord[i] != -1) {
+                uploadVec4(program.locCurrentTexCoord[i], ShaderManager.getCurrentTexCoord(i));
+            }
+        }
    }

    private void uploadCurrentLightmapCoord(Program program) {
@@ -420,6 +422,16 @@ public class Uniforms {
            }
        }

+        if (fk.overlayEnabled() && program.locOverlayColor != -1) {
+            vec4Buf.clear();
+            vec4Buf.put(GLStateManager.getOverlayR());
+            vec4Buf.put(GLStateManager.getOverlayG());
+            vec4Buf.put(GLStateManager.getOverlayB());
+            vec4Buf.put(GLStateManager.getOverlayA());
+            vec4Buf.flip();
+            RENDER_BACKEND.uniform4(program.locOverlayColor, vec4Buf);
+        }
+
        // Fog
        if (fk.fogMode() != FragmentKey.FOG_NONE) {
            uploadFog(program);
@@ -1,8 +1,10 @@
 package com.gtnewhorizons.angelica.glsm.ffp;

+import com.gtnewhorizon.gtnhlib.client.renderer.MatrixHelper;
 import com.gtnewhorizons.angelica.glsm.DisplayListManager;
 import com.gtnewhorizons.angelica.glsm.GLStateManager;
 import com.gtnewhorizons.angelica.glsm.states.TexGenState;
+import com.gtnewhorizons.angelica.glsm.states.TextureUnitArray;
 import org.joml.Matrix4f;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
@@ -10,9 +12,14 @@ import org.lwjgl.opengl.GL12;
 /**
 * Compact key capturing the vertex shader permutation axes for FFP emulation.
 * Packed into a single long for fast hash/compare.
+ *
+ * Per-unit fields are 4-bit base-indexed: bit (BASE + i) for unit i in [0..3].
+ * Unit 1 is the lightmap; texcoord enable for unit 1 also gates the lightmap-specific code paths.
 */
 public final class VertexKey {

+    public static final int MAX_UNITS = 4;
+
    private final long packed;

    private static final int BIT_LIGHTING            = 0;
@@ -23,26 +30,25 @@ public final class VertexKey {
    private static final int BIT_COLOR_MATERIAL      = 5;
    private static final int BIT_SEPARATE_SPECULAR   = 6;
    private static final int BIT_FOG                 = 7;
-    private static final int BIT_FOG_DIST_MODE       = 8;
+    private static final int BIT_FOG_DIST_MODE       = 8;  // 2 bits: 8-9
    private static final int BIT_NORMALIZE           = 10;
    private static final int BIT_RESCALE_NORMAL      = 11;
-    private static final int BIT_TEXTURE             = 12;
-    private static final int BIT_LIGHTMAP            = 13;
-    private static final int BIT_TEX_MATRIX          = 14;
-    private static final int BIT_HAS_VERTEX_COLOR    = 15;
-    private static final int BIT_HAS_VERTEX_NORMAL   = 16;
-    private static final int BIT_HAS_VERTEX_TEX      = 17;
-    private static final int BIT_HAS_VERTEX_LIGHTMAP = 18;
-    private static final int BIT_COLOR_MAT_MODE      = 19;
-    // bits 19-21: colorMaterialMode (3 bits)
-    // TexGen modes: 3 bits each (0=NONE, 1=OBJ_LINEAR, 2=EYE_LINEAR)
-    private static final int BIT_TEXGEN_S            = 22;
-    private static final int BIT_TEXGEN_T            = 25;
-    private static final int BIT_TEXGEN_R            = 28;
-    private static final int BIT_TEXGEN_Q            = 31;
-    // bits 31-33: texGenModeQ (3 bits)
-    private static final int BIT_CLIP_PLANES         = 34;
-    private static final int BIT_WIDE_LINE           = 35;
+    // Per-unit texcoord enable: bits 12-15 (unit 0..3). Unit 1 doubles as the lightmap flag.
+    private static final int BIT_UNIT_TEX_BASE       = 12;
+    private static final int BIT_HAS_VERTEX_COLOR    = 16;
+    private static final int BIT_HAS_VERTEX_NORMAL   = 17;
+    private static final int BIT_HAS_VERTEX_TEX      = 18;
+    private static final int BIT_HAS_VERTEX_LIGHTMAP = 19;
+    private static final int BIT_COLOR_MAT_MODE      = 20;  // 3 bits: 20-22
+    // TexGen modes (unit 0 only, for now): 3 bits each (0=NONE, 1=OBJ_LINEAR, 2=EYE_LINEAR).
+    private static final int BIT_TEXGEN_S            = 23;  // 3 bits: 23-25
+    private static final int BIT_TEXGEN_T            = 26;  // 3 bits: 26-28
+    private static final int BIT_TEXGEN_R            = 29;  // 3 bits: 29-31
+    private static final int BIT_TEXGEN_Q            = 32;  // 3 bits: 32-34
+    private static final int BIT_CLIP_PLANES         = 35;
+    private static final int BIT_WIDE_LINE           = 36;
+    // Per-unit texmat enable: bits 37-40 (unit 0..3). Unit 1 is the lightmap matrix.
+    private static final int BIT_UNIT_TEXMAT_BASE    = 37;

    public static final int TG_NONE                  = 0;
    public static final int TG_OBJ_LINEAR            = 1;
@@ -71,9 +77,10 @@ public final class VertexKey {
    public int fogDistanceMode()           { return (int)((packed >> BIT_FOG_DIST_MODE) & 0x3); }
    public boolean normalizeEnabled()      { return bit(BIT_NORMALIZE); }
    public boolean rescaleNormalsEnabled() { return bit(BIT_RESCALE_NORMAL); }
-    public boolean textureEnabled()        { return bit(BIT_TEXTURE); }
-    public boolean lightmapEnabled()       { return bit(BIT_LIGHTMAP); }
-    public boolean textureMatrixEnabled()  { return bit(BIT_TEX_MATRIX); }
+    public boolean unitTexCoordEnabled(int unit) { return bit(BIT_UNIT_TEX_BASE + unit); }
+    public boolean unitTexMatEnabled(int unit)   { return bit(BIT_UNIT_TEXMAT_BASE + unit); }
+    public boolean anyUnitTexCoordEnabled() { return ((packed >> BIT_UNIT_TEX_BASE) & 0xF) != 0; }
+    public boolean lightmapEnabled()       { return unitTexCoordEnabled(1); }
    public boolean hasVertexColor()        { return bit(BIT_HAS_VERTEX_COLOR); }
    public boolean hasVertexNormal()       { return bit(BIT_HAS_VERTEX_NORMAL); }
    public boolean hasVertexTexCoord()     { return bit(BIT_HAS_VERTEX_TEX); }
@@ -81,28 +88,18 @@ public final class VertexKey {
    /** Color material mode (CM_AMBIENT, CM_DIFFUSE, CM_SPECULAR, CM_EMISSION, CM_AMBIENT_AND_DIFFUSE). Only meaningful when colorMaterialEnabled(). */
    public int colorMaterialMode()        { return (int)((packed >> BIT_COLOR_MAT_MODE) & 0x7); }

-    /** TexGen mode for S coordinate (TG_NONE, TG_OBJ_LINEAR, TG_EYE_LINEAR). */
+    /** TexGen mode for S coordinate (TG_NONE, TG_OBJ_LINEAR, TG_EYE_LINEAR). Unit 0 only; see TODO in packFromState. */
    public int texGenModeS()              { return (int)((packed >> BIT_TEXGEN_S) & 0x7); }
-    /** TexGen mode for T coordinate. */
    public int texGenModeT()              { return (int)((packed >> BIT_TEXGEN_T) & 0x7); }
-    /** TexGen mode for R coordinate. */
    public int texGenModeR()              { return (int)((packed >> BIT_TEXGEN_R) & 0x7); }
-    /** TexGen mode for Q coordinate. */
    public int texGenModeQ()              { return (int)((packed >> BIT_TEXGEN_Q) & 0x7); }
-    /** Whether any texgen coordinate is enabled. */
    public boolean texGenEnabled()        { return texGenModeS() != TG_NONE || texGenModeT() != TG_NONE || texGenModeR() != TG_NONE || texGenModeQ() != TG_NONE; }
-    /** Whether any clip plane is enabled. */
    public boolean clipPlanesEnabled()    { return bit(BIT_CLIP_PLANES); }
-    /** Whether wide line GS emulation is active for this variant. */
    public boolean wideLineEmulation()   { return bit(BIT_WIDE_LINE); }

-    /** Whether vertex color replaces material ambient in this variant. */
    public boolean cmReplacesAmbient()    { final int m = colorMaterialMode(); return m == CM_AMBIENT || m == CM_AMBIENT_AND_DIFFUSE; }
-    /** Whether vertex color replaces material diffuse in this variant. */
    public boolean cmReplacesDiffuse()    { final int m = colorMaterialMode(); return m == CM_DIFFUSE || m == CM_AMBIENT_AND_DIFFUSE; }
-    /** Whether vertex color replaces material specular in this variant. */
    public boolean cmReplacesSpecular()   { return colorMaterialMode() == CM_SPECULAR; }
-    /** Whether vertex color replaces material emission in this variant. */
    public boolean cmReplacesEmission()   { return colorMaterialMode() == CM_EMISSION; }

    private boolean bit(int pos) { return ((packed >> pos) & 1) != 0; }
@@ -126,7 +123,7 @@ public final class VertexKey {
        };
    }

-    public static long packFromState(boolean hasColor, boolean hasNormal, boolean hasTexCoord, boolean hasLightmap) {
+    public static long packFromState(boolean hasColor, boolean hasNormal, boolean hasTexCoord, boolean hasLightmap, int fragUnitMask) {
        long bits = 0;

        final boolean lighting = GLStateManager.getLightingState().isEnabled();
@@ -171,23 +168,18 @@ public final class VertexKey {
            bits |= (1L << BIT_RESCALE_NORMAL);
        }

-        // Texture unit 0 (base texture)
-        if (GLStateManager.getTextures().getTextureUnitStates(0).isEnabled()) {
-            bits |= (1L << BIT_TEXTURE);
-        }
-        // Texture unit 1 (lightmap)
-        if (GLStateManager.getTextures().getTextureUnitStates(1).isEnabled()) {
-            bits |= (1L << BIT_LIGHTMAP);
+        final TextureUnitArray texUnit = GLStateManager.getTextures();
+        for (int i = 0; i < MAX_UNITS; i++) {
+            if ((fragUnitMask & (1 << i)) != 0) {
+                bits |= (1L << (BIT_UNIT_TEX_BASE + i));
+            }
+            if (!MatrixHelper.isIdentity(texUnit.getTextureUnitMatrix(i))) {
+                bits |= (1L << (BIT_UNIT_TEXMAT_BASE + i));
+            }
        }

-        // Check if texture matrix unit 0 is non-identity
-        final Matrix4f texMat = GLStateManager.getTextures().getTextureUnitMatrix(0);
-        if (!DisplayListManager.isIdentity(texMat)) {
-            bits |= (1L << BIT_TEX_MATRIX);
-        }
-
-        // TexGen (unit 0 only) — encode per-coordinate mode if enabled
-        final var texUnit = GLStateManager.getTextures();
+        // TexGen (unit 0 only) - per-coordinate mode if enabled.
+        // TODO: per-unit texgen for units 2/3. Deferred - no MC code path uses glTexGen on those.
        final TexGenState tg = texUnit.getTexGenState(0);
        boolean anyTexGen = false;
        if (texUnit.getTexGenSStates(0).isEnabled() && tg.getMode(GL11.GL_S) != 0) {
@@ -210,9 +202,9 @@ public final class VertexKey {
            bits |= ((long) m & 0x7) << BIT_TEXGEN_Q;
            if (m != TG_NONE) anyTexGen = true;
        }
-        // Force texture matrix on when texgen is active (end portal pattern always uses it)
+        // Force unit-0 texture matrix on when texgen is active (end portal pattern always uses it).
        if (anyTexGen) {
-            bits |= (1L << BIT_TEX_MATRIX);
+            bits |= (1L << BIT_UNIT_TEXMAT_BASE);
        }

        // Vertex format flags
@@ -221,12 +213,10 @@ public final class VertexKey {
        if (hasTexCoord) bits |= (1L << BIT_HAS_VERTEX_TEX);
        if (hasLightmap) bits |= (1L << BIT_HAS_VERTEX_LIGHTMAP);

-        // Clip planes
        if (GLStateManager.anyClipPlaneEnabled()) {
            bits |= (1L << BIT_CLIP_PLANES);
        }

-        // Wide line GS emulation
        if (GLStateManager.wideLineEmulationActive) {
            bits |= (1L << BIT_WIDE_LINE);
        }
@@ -234,8 +224,8 @@ public final class VertexKey {
        return bits;
    }

-    public static VertexKey fromState(boolean hasColor, boolean hasNormal, boolean hasTexCoord, boolean hasLightmap) {
-        return new VertexKey(packFromState(hasColor, hasNormal, hasTexCoord, hasLightmap));
+    public static VertexKey fromState(boolean hasColor, boolean hasNormal, boolean hasTexCoord, boolean hasLightmap, int fragUnitMask) {
+        return new VertexKey(packFromState(hasColor, hasNormal, hasTexCoord, hasLightmap, fragUnitMask));
    }

    static VertexKey fromPacked(long packed) {
@@ -256,9 +246,11 @@ public final class VertexKey {

    @Override
    public String toString() {
-        return String.format("FFPVertexKey[0x%09X: lit=%b l0=%b l1=%b cm=%b fog=%b tex=%b lm=%b col=%b nrm=%b vtex=%b vlm=%b tg=%d/%d/%d/%d clip=%b wline=%b]",
+        return String.format("FFPVertexKey[0x%011X: lit=%b l0=%b l1=%b cm=%b fog=%b tex=%d%d%d%d texmat=%d%d%d%d col=%b nrm=%b vtex=%b vlm=%b tg=%d/%d/%d/%d clip=%b wline=%b]",
            packed, lightingEnabled(), light0Enabled(), light1Enabled(),
-            colorMaterialEnabled(), fogEnabled(), textureEnabled(), lightmapEnabled(),
+            colorMaterialEnabled(), fogEnabled(),
+            unitTexCoordEnabled(0)?1:0, unitTexCoordEnabled(1)?1:0, unitTexCoordEnabled(2)?1:0, unitTexCoordEnabled(3)?1:0,
+            unitTexMatEnabled(0)?1:0, unitTexMatEnabled(1)?1:0, unitTexMatEnabled(2)?1:0, unitTexMatEnabled(3)?1:0,
            hasVertexColor(), hasVertexNormal(), hasVertexTexCoord(), hasVertexLightmap(),
            texGenModeS(), texGenModeT(), texGenModeR(), texGenModeQ(), clipPlanesEnabled(), wideLineEmulation());
    }
@@ -42,6 +42,8 @@ public final class VertexShaderGenerator {
            source = source.replace("v_SpecularColor", "v_SpecularColor_gs")
                           .replace("v_TexCoord0", "v_TexCoord0_gs")
                           .replace("v_TexCoord1", "v_TexCoord1_gs")
+                           .replace("v_TexCoord2", "v_TexCoord2_gs")
+                           .replace("v_TexCoord3", "v_TexCoord3_gs")
                           .replace("v_FogCoord", "v_FogCoord_gs")
                           .replace("v_Color", "v_Color_gs");
        }
@@ -76,11 +78,14 @@ public final class VertexShaderGenerator {
            sb.append("uniform mat3 u_NormalMatrix;\n");
        }

-        if (key.textureMatrixEnabled()) {
-            sb.append("uniform mat4 u_TextureMatrix0;\n");
+        for (int i = 0; i < VertexKey.MAX_UNITS; i++) {
+            if (i == 1) continue;
+            if (key.unitTexMatEnabled(i)) {
+                sb.append("uniform mat4 u_TextureMatrix").append(i).append(";\n");
+            }
        }

-        // TexGen plane uniforms
+        // TexGen plane uniforms (unit 0 only - TODO: per-unit)
        if (key.texGenModeS() == VertexKey.TG_OBJ_LINEAR) sb.append("uniform vec4 u_TexGenObjPlaneS;\n");
        if (key.texGenModeS() == VertexKey.TG_EYE_LINEAR) sb.append("uniform vec4 u_TexGenEyePlaneS;\n");
        if (key.texGenModeT() == VertexKey.TG_OBJ_LINEAR) sb.append("uniform vec4 u_TexGenObjPlaneT;\n");
@@ -98,9 +103,11 @@ public final class VertexShaderGenerator {
            sb.append("uniform vec4 u_CurrentColor;\n");
        }

-        if (!key.hasVertexTexCoord() && key.textureEnabled()) {
-            sb.append("uniform vec4 u_CurrentTexCoord;\n");
+        if (key.unitTexCoordEnabled(0) && !key.hasVertexTexCoord()) {
+            sb.append("uniform vec4 u_CurrentTexCoord0;\n");
        }
+        if (key.unitTexCoordEnabled(2)) sb.append("uniform vec4 u_CurrentTexCoord2;\n");
+        if (key.unitTexCoordEnabled(3)) sb.append("uniform vec4 u_CurrentTexCoord3;\n");

        if (key.lightmapEnabled() && !key.hasVertexLightmap()) {
            sb.append("uniform vec2 u_CurrentLightmapCoord;\n");
@@ -178,12 +185,15 @@ public final class VertexShaderGenerator {
        if (key.separateSpecular()) {
            sb.append("out vec3 v_SpecularColor;\n");
        }
-        if (key.textureEnabled() || key.hasVertexTexCoord() || key.texGenEnabled()) {
+        // Per-unit varying outputs. Each enabled texture unit (and texgen, which targets unit 0) gets its own v_TexCoord<i>.
+        if (key.unitTexCoordEnabled(0) || key.texGenEnabled()) {
            sb.append("out vec4 v_TexCoord0;\n");
        }
        if (key.lightmapEnabled()) {
            sb.append("out vec4 v_TexCoord1;\n");
        }
+        if (key.unitTexCoordEnabled(2)) sb.append("out vec4 v_TexCoord2;\n");
+        if (key.unitTexCoordEnabled(3)) sb.append("out vec4 v_TexCoord3;\n");
        if (key.fogEnabled()) {
            sb.append("out float v_FogCoord;\n");
        }
@@ -331,22 +341,18 @@ public final class VertexShaderGenerator {
    private static void emitTexCoordPassthrough(StringBuilder sb, VertexKey key) {
        if (key.texGenEnabled()) {
            emitTexGenCoordGeneration(sb, key);
-        } else if (key.textureEnabled() || key.hasVertexTexCoord()) {
-            sb.append("  // Texture coordinates\n");
-            if (key.hasVertexTexCoord()) {
-                if (key.textureMatrixEnabled()) {
-                    sb.append("  v_TexCoord0 = u_TextureMatrix0 * vec4(a_TexCoord0, 0.0, 1.0);\n");
-                } else {
-                    sb.append("  v_TexCoord0 = vec4(a_TexCoord0, 0.0, 1.0);\n");
-                }
+        } else if (key.unitTexCoordEnabled(0)) {
+            sb.append("  // Texture coordinates - unit 0\n");
+            final String src = key.hasVertexTexCoord()
+                ? "vec4(a_TexCoord0, 0.0, 1.0)"
+                : "u_CurrentTexCoord0";
+            if (key.unitTexMatEnabled(0)) {
+                sb.append("  v_TexCoord0 = u_TextureMatrix0 * ").append(src).append(";\n");
            } else {
-                if (key.textureMatrixEnabled()) {
-                    sb.append("  v_TexCoord0 = u_TextureMatrix0 * u_CurrentTexCoord;\n");
-                } else {
-                    sb.append("  v_TexCoord0 = u_CurrentTexCoord;\n");
-                }
+                sb.append("  v_TexCoord0 = ").append(src).append(";\n");
            }
        }
+
        if (key.lightmapEnabled()) {
            if (key.hasVertexLightmap()) {
                sb.append("  v_TexCoord1 = u_LightmapTextureMatrix * vec4(a_TexCoord1, 0.0, 1.0);\n");
@@ -354,6 +360,16 @@ public final class VertexShaderGenerator {
                sb.append("  v_TexCoord1 = u_LightmapTextureMatrix * vec4(u_CurrentLightmapCoord, 0.0, 1.0);\n");
            }
        }
+
+        for (int i = 2; i < VertexKey.MAX_UNITS; i++) {
+            if (!key.unitTexCoordEnabled(i)) continue;
+            final String src = "u_CurrentTexCoord" + i;
+            if (key.unitTexMatEnabled(i)) {
+                sb.append("  v_TexCoord").append(i).append(" = u_TextureMatrix").append(i).append(" * ").append(src).append(";\n");
+            } else {
+                sb.append("  v_TexCoord").append(i).append(" = ").append(src).append(";\n");
+            }
+        }
    }

    /**
@@ -18,6 +18,7 @@ public final class GLSMHooks {
    public static final EventBus<FogStateChangeEvent> FOG_STATE_CHANGE = EventBus.create(FogStateChangeEvent.class);
    public static final EventBus<LightmapCoordsEvent> LIGHTMAP_COORDS = EventBus.create(LightmapCoordsEvent.class);
    public static final EventBus<AlphaStateChangeEvent> ALPHA_STATE_CHANGE = EventBus.create(AlphaStateChangeEvent.class);
+    public static final EventBus<ShaderColorChangeEvent> SHADER_COLOR_CHANGE = EventBus.create(ShaderColorChangeEvent.class);

    // Reusable event instances
    public static final TextureBindEvent textureBindEvent = new TextureBindEvent();
@@ -28,6 +29,7 @@ public final class GLSMHooks {
    public static final FogStateChangeEvent fogStateChangeEvent = new FogStateChangeEvent();
    public static final LightmapCoordsEvent lightmapCoordsEvent = new LightmapCoordsEvent();
    public static final AlphaStateChangeEvent alphaStateChangeEvent = new AlphaStateChangeEvent();
+    public static final ShaderColorChangeEvent shaderColorChangeEvent = new ShaderColorChangeEvent();

    private GLSMHooks() {}
 }
@@ -8,24 +8,24 @@ import java.util.function.Consumer;
 public final class GLSMInitConfig {
    private final boolean lwjglDebug;
    private final StreamingUploader.UploadStrategy streamingUploadStrategy;
-    private final boolean framebufferSupported;
-    private final boolean fboEnabled;
    private final Consumer<DirectTessellator> directDrawer;
    private final Runnable streamingDrawerDestroy;
    private final int displayWidth;
    private final int displayHeight;
    private final Runnable postInitCallback;
+    private final boolean enableDSA;
+    private final boolean noErrorChecks;

    private GLSMInitConfig(Builder builder) {
        this.lwjglDebug = builder.lwjglDebug;
        this.streamingUploadStrategy = builder.streamingUploadStrategy;
-        this.framebufferSupported = builder.framebufferSupported;
-        this.fboEnabled = builder.fboEnabled;
+        this.noErrorChecks = builder.noErrorChecks;
        this.directDrawer = builder.directDrawer;
        this.streamingDrawerDestroy = builder.streamingDrawerDestroy;
        this.displayWidth = builder.displayWidth;
        this.displayHeight = builder.displayHeight;
        this.postInitCallback = builder.postInitCallback;
+        this.enableDSA = builder.enableDSA;
    }

    public static Builder builder() {
@@ -34,24 +34,24 @@ public final class GLSMInitConfig {

    public boolean isLwjglDebug() { return lwjglDebug; }
    public StreamingUploader.UploadStrategy getStreamingUploadStrategy() { return streamingUploadStrategy; }
-    public boolean isFramebufferSupported() { return framebufferSupported; }
-    public boolean isFboEnabled() { return fboEnabled; }
    public Consumer<DirectTessellator> getDirectDrawer() { return directDrawer; }
    public Runnable getStreamingDrawerDestroy() { return streamingDrawerDestroy; }
    public int getDisplayWidth() { return displayWidth; }
    public int getDisplayHeight() { return displayHeight; }
    public Runnable getPostInitCallback() { return postInitCallback; }
+    public boolean isDSAEnabled() { return enableDSA; }
+    public boolean noErrorChecks() { return noErrorChecks; }

    public static final class Builder {
        private boolean lwjglDebug = false;
        private StreamingUploader.UploadStrategy streamingUploadStrategy = StreamingUploader.UploadStrategy.BUFFER_DATA;
-        private boolean framebufferSupported = false;
-        private boolean fboEnabled = false;
        private Consumer<DirectTessellator> directDrawer = null;
        private Runnable streamingDrawerDestroy = null;
        private int displayWidth = 0;
        private int displayHeight = 0;
        private Runnable postInitCallback = null;
+        private boolean enableDSA = false;
+        private boolean noErrorChecks;

        private Builder() {}

@@ -65,13 +65,8 @@ public final class GLSMInitConfig {
            return this;
        }

-        public Builder framebufferSupported(boolean framebufferSupported) {
-            this.framebufferSupported = framebufferSupported;
-            return this;
-        }
-
-        public Builder fboEnabled(boolean fboEnabled) {
-            this.fboEnabled = fboEnabled;
+        public Builder noErrorChecks(boolean noErrorChecks) {
+            this.noErrorChecks = noErrorChecks;
            return this;
        }

@@ -96,6 +91,11 @@ public final class GLSMInitConfig {
            return this;
        }

+        public Builder enableDSA(boolean enableDSA) {
+            this.enableDSA = enableDSA;
+            return this;
+        }
+
        public GLSMInitConfig build() {
            return new GLSMInitConfig(this);
        }
@@ -5,4 +5,5 @@ import net.minecraftforge.eventbus.api.event.MutableEvent;
 public final class ProgramChangeEvent extends MutableEvent {
    public int previousProgram;
    public int newProgram;
+    public boolean postBind;
 }
@@ -0,0 +1,10 @@
+package com.gtnewhorizons.angelica.glsm.hooks.events;
+
+import net.minecraftforge.eventbus.api.event.MutableEvent;
+
+public final class ShaderColorChangeEvent extends MutableEvent {
+    public float red;
+    public float green;
+    public float blue;
+    public float alpha;
+}
@@ -16,17 +16,13 @@ public final class AccumulatedDraw {
    public final VertexFormat format;
    public final List<ByteBuffer> drawBuffers;
    public final int drawMode;
-    public final int commandIndex; // Position in command list for state tracking
-    public final int stateGeneration; // Position in command list for state tracking
    public RestoreData restoreData;

-    public AccumulatedDraw(DirectTessellator tessellator, int commandIndex, int stateGeneration, boolean copyLast) {
+    public AccumulatedDraw(DirectTessellator tessellator, boolean copyLast) {
        this.format = tessellator.getVertexFormat();
        this.drawMode = tessellator.drawMode;
        this.drawBuffers = new ArrayList<>();
        this.drawBuffers.add(tessellator.allocateBufferCopy());
-        this.commandIndex = commandIndex;
-        this.stateGeneration = stateGeneration;

        if (copyLast) {
            this.restoreData = new RestoreData(tessellator);
@@ -36,7 +32,6 @@ public final class AccumulatedDraw {

    public void mergeDraw(DirectTessellator tessellator, boolean copyLast) {
        this.drawBuffers.add(tessellator.allocateBufferCopy());
-
        if (copyLast) {
            this.restoreData = new RestoreData(tessellator);
        }
@@ -1,767 +0,0 @@
-package com.gtnewhorizons.angelica.glsm.recording;
-
-import com.gtnewhorizons.angelica.glsm.recording.commands.DisplayListCommand;
-import org.joml.Matrix4f;
-
-import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.*;
-
-public final class CommandBuffer {
-    private static final int DEFAULT_CAPACITY = 4096; // Guess at typical display list size
-
-    private ByteBuffer buffer;
-    private long basePointer;
-    private long writePointer;
-    private final List<Object> complexObjects = new ArrayList<>();
-
-    public CommandBuffer() {
-        this(DEFAULT_CAPACITY);
-    }
-
-    public CommandBuffer(int initialCapacity) {
-        this.buffer = memAlloc(initialCapacity);
-        this.basePointer = memAddress(buffer);
-        this.writePointer = basePointer;
-    }
-
-    // === Low-level write operations ===
-
-    private void writeInt(int value) {
-        memPutInt(writePointer, value);
-        writePointer += 4;
-    }
-
-    private void writeLong(long value) {
-        memPutLong(writePointer, value);
-        writePointer += 8;
-    }
-
-    private void writeFloat(float value) {
-        memPutFloat(writePointer, value);
-        writePointer += 4;
-    }
-
-    private void writeDouble(double value) {
-        memPutDouble(writePointer, value);
-        writePointer += 8;
-    }
-
-    private void ensureCapacity(int needed) {
-        final int size = size();
-        final int remaining = buffer.capacity() - size;
-        if (remaining < needed) {
-            final int newCapacity = Math.max(buffer.capacity() * 2, buffer.capacity() + needed);
-            buffer = memRealloc(buffer, newCapacity);
-            basePointer = memAddress(buffer);
-            writePointer = basePointer + size;
-        }
-    }
-
-    // === Single int commands ===
-
-    public void writeEnable(int cap) {
-        ensureCapacity(8);
-        writeInt(GLCommand.ENABLE);
-        writeInt(cap);
-    }
-
-    public void writeDisable(int cap) {
-        ensureCapacity(8);
-        writeInt(GLCommand.DISABLE);
-        writeInt(cap);
-    }
-
-    public void writeClear(int mask) {
-        ensureCapacity(8);
-        writeInt(GLCommand.CLEAR);
-        writeInt(mask);
-    }
-
-    public void writeClearStencil(int s) {
-        ensureCapacity(8);
-        writeInt(GLCommand.CLEAR_STENCIL);
-        writeInt(s);
-    }
-
-    public void writeCullFace(int mode) {
-        ensureCapacity(8);
-        writeInt(GLCommand.CULL_FACE);
-        writeInt(mode);
-    }
-
-    public void writeDepthFunc(int func) {
-        ensureCapacity(8);
-        writeInt(GLCommand.DEPTH_FUNC);
-        writeInt(func);
-    }
-
-    public void writeShadeModel(int mode) {
-        ensureCapacity(8);
-        writeInt(GLCommand.SHADE_MODEL);
-        writeInt(mode);
-    }
-
-    public void writeLogicOp(int opcode) {
-        ensureCapacity(8);
-        writeInt(GLCommand.LOGIC_OP);
-        writeInt(opcode);
-    }
-
-    public void writeMatrixMode(int mode) {
-        ensureCapacity(8);
-        writeInt(GLCommand.MATRIX_MODE);
-        writeInt(mode);
-    }
-
-    public void writeActiveTexture(int texture) {
-        ensureCapacity(8);
-        writeInt(GLCommand.ACTIVE_TEXTURE);
-        writeInt(texture);
-    }
-
-    public void writeUseProgram(int program) {
-        ensureCapacity(8);
-        writeInt(GLCommand.USE_PROGRAM);
-        writeInt(program);
-    }
-
-    public void writePushAttrib(int mask) {
-        ensureCapacity(8);
-        writeInt(GLCommand.PUSH_ATTRIB);
-        writeInt(mask);
-    }
-
-    public void writePopAttrib() {
-        ensureCapacity(8);
-        writeInt(GLCommand.POP_ATTRIB);
-        writeInt(0); // unused padding
-    }
-
-    public void writeLoadIdentity() {
-        ensureCapacity(4);
-        writeInt(GLCommand.LOAD_IDENTITY);
-    }
-
-    public void writePushMatrix() {
-        ensureCapacity(4);
-        writeInt(GLCommand.PUSH_MATRIX);
-    }
-
-    public void writePopMatrix() {
-        ensureCapacity(4);
-        writeInt(GLCommand.POP_MATRIX);
-    }
-
-    public void writeStencilMask(int mask) {
-        ensureCapacity(8);
-        writeInt(GLCommand.STENCIL_MASK);
-        writeInt(mask);
-    }
-
-    public void writeDepthMask(boolean flag) {
-        ensureCapacity(8);
-        writeInt(GLCommand.DEPTH_MASK);
-        writeInt(flag ? 1 : 0);
-    }
-
-    public void writeFrontFace(int mode) {
-        ensureCapacity(8);
-        writeInt(GLCommand.FRONT_FACE);
-        writeInt(mode);
-    }
-
-    // === Two int commands ===
-
-    public void writeBindTexture(int target, int texture) {
-        ensureCapacity(12);
-        writeInt(GLCommand.BIND_TEXTURE);
-        writeInt(target);
-        writeInt(texture);
-    }
-
-    public void writePolygonMode(int face, int mode) {
-        ensureCapacity(12);
-        writeInt(GLCommand.POLYGON_MODE);
-        writeInt(face);
-        writeInt(mode);
-    }
-
-    public void writeColorMaterial(int face, int mode) {
-        ensureCapacity(12);
-        writeInt(GLCommand.COLOR_MATERIAL);
-        writeInt(face);
-        writeInt(mode);
-    }
-
-    public void writeLineStipple(int factor, int pattern) {
-        ensureCapacity(12);
-        writeInt(GLCommand.LINE_STIPPLE);
-        writeInt(factor);
-        writeInt(pattern);
-    }
-
-    public void writeStencilMaskSeparate(int face, int mask) {
-        ensureCapacity(12);
-        writeInt(GLCommand.STENCIL_MASK_SEPARATE);
-        writeInt(face);
-        writeInt(mask);
-    }
-
-    public void writeFogi(int pname, int param) {
-        ensureCapacity(12);
-        writeInt(GLCommand.FOGI);
-        writeInt(pname);
-        writeInt(param);
-    }
-
-    public void writeHint(int target, int mode) {
-        ensureCapacity(12);
-        writeInt(GLCommand.HINT);
-        writeInt(target);
-        writeInt(mode);
-    }
-
-    // === Three int commands ===
-
-    public void writeStencilFunc(int func, int ref, int mask) {
-        ensureCapacity(16);
-        writeInt(GLCommand.STENCIL_FUNC);
-        writeInt(func);
-        writeInt(ref);
-        writeInt(mask);
-    }
-
-    public void writeStencilOp(int fail, int zfail, int zpass) {
-        ensureCapacity(16);
-        writeInt(GLCommand.STENCIL_OP);
-        writeInt(fail);
-        writeInt(zfail);
-        writeInt(zpass);
-    }
-
-    public void writeTexParameteri(int target, int pname, int param) {
-        ensureCapacity(16);
-        writeInt(GLCommand.TEX_PARAMETERI);
-        writeInt(target);
-        writeInt(pname);
-        writeInt(param);
-    }
-
-    // === Four int commands ===
-
-    public void writeViewport(int x, int y, int width, int height) {
-        ensureCapacity(20);
-        writeInt(GLCommand.VIEWPORT);
-        writeInt(x);
-        writeInt(y);
-        writeInt(width);
-        writeInt(height);
-    }
-
-    public void writeScissor(int x, int y, int width, int height) {
-        ensureCapacity(20);
-        writeInt(GLCommand.SCISSOR);
-        writeInt(x);
-        writeInt(y);
-        writeInt(width);
-        writeInt(height);
-    }
-
-    public void writeBlendFunc(int srcRgb, int dstRgb, int srcAlpha, int dstAlpha) {
-        ensureCapacity(20);
-        writeInt(GLCommand.BLEND_FUNC);
-        writeInt(srcRgb);
-        writeInt(dstRgb);
-        writeInt(srcAlpha);
-        writeInt(dstAlpha);
-    }
-
-    public void writeColorMask(boolean red, boolean green, boolean blue, boolean alpha) {
-        ensureCapacity(20);
-        writeInt(GLCommand.COLOR_MASK);
-        writeInt(red ? 1 : 0);
-        writeInt(green ? 1 : 0);
-        writeInt(blue ? 1 : 0);
-        writeInt(alpha ? 1 : 0);
-    }
-
-    public void writeStencilFuncSeparate(int face, int func, int ref, int mask) {
-        ensureCapacity(20);
-        writeInt(GLCommand.STENCIL_FUNC_SEPARATE);
-        writeInt(face);
-        writeInt(func);
-        writeInt(ref);
-        writeInt(mask);
-    }
-
-    public void writeStencilOpSeparate(int face, int sfail, int dpfail, int dppass) {
-        ensureCapacity(20);
-        writeInt(GLCommand.STENCIL_OP_SEPARATE);
-        writeInt(face);
-        writeInt(sfail);
-        writeInt(dpfail);
-        writeInt(dppass);
-    }
-
-    // === Float commands ===
-
-    public void writePointSize(float size) {
-        ensureCapacity(8);
-        writeInt(GLCommand.POINT_SIZE);
-        writeFloat(size);
-    }
-
-    public void writeLineWidth(float width) {
-        ensureCapacity(8);
-        writeInt(GLCommand.LINE_WIDTH);
-        writeFloat(width);
-    }
-
-    public void writePolygonOffset(float factor, float units) {
-        ensureCapacity(12);
-        writeInt(GLCommand.POLYGON_OFFSET);
-        writeFloat(factor);
-        writeFloat(units);
-    }
-
-    public void writeColor(float r, float g, float b, float a) {
-        ensureCapacity(20);
-        writeInt(GLCommand.COLOR);
-        writeFloat(r);
-        writeFloat(g);
-        writeFloat(b);
-        writeFloat(a);
-    }
-
-    public void writeClearColor(float r, float g, float b, float a) {
-        ensureCapacity(20);
-        writeInt(GLCommand.CLEAR_COLOR);
-        writeFloat(r);
-        writeFloat(g);
-        writeFloat(b);
-        writeFloat(a);
-    }
-
-    public void writeClearDepth(double depth) {
-        ensureCapacity(12);
-        writeInt(GLCommand.CLEAR_DEPTH);
-        writeDouble(depth);
-    }
-
-    public void writeBlendColor(float r, float g, float b, float a) {
-        ensureCapacity(20);
-        writeInt(GLCommand.BLEND_COLOR);
-        writeFloat(r);
-        writeFloat(g);
-        writeFloat(b);
-        writeFloat(a);
-    }
-
-    // === Mixed int+float commands ===
-
-    public void writeAlphaFunc(int func, float ref) {
-        ensureCapacity(12);
-        writeInt(GLCommand.ALPHA_FUNC);
-        writeInt(func);
-        writeFloat(ref);
-    }
-
-    public void writeFogf(int pname, float param) {
-        ensureCapacity(12);
-        writeInt(GLCommand.FOGF);
-        writeInt(pname);
-        writeFloat(param);
-    }
-
-    public void writeLightf(int light, int pname, float param) {
-        ensureCapacity(16);
-        writeInt(GLCommand.LIGHTF);
-        writeInt(light);
-        writeInt(pname);
-        writeFloat(param);
-    }
-
-    public void writeLightModelf(int pname, float param) {
-        ensureCapacity(12);
-        writeInt(GLCommand.LIGHT_MODELF);
-        writeInt(pname);
-        writeFloat(param);
-    }
-
-    public void writeLighti(int light, int pname, int param) {
-        ensureCapacity(16);
-        writeInt(GLCommand.LIGHTI);
-        writeInt(light);
-        writeInt(pname);
-        writeInt(param);
-    }
-
-    public void writeLightModeli(int pname, int param) {
-        ensureCapacity(12);
-        writeInt(GLCommand.LIGHT_MODELI);
-        writeInt(pname);
-        writeInt(param);
-    }
-
-    public void writeMaterialf(int face, int pname, float param) {
-        ensureCapacity(16);
-        writeInt(GLCommand.MATERIALF);
-        writeInt(face);
-        writeInt(pname);
-        writeFloat(param);
-    }
-
-    public void writeTexParameterf(int target, int pname, float param) {
-        ensureCapacity(16);
-        writeInt(GLCommand.TEX_PARAMETERF);
-        writeInt(target);
-        writeInt(pname);
-        writeFloat(param);
-    }
-
-    // === Double commands ===
-
-    public void writeTranslate(double x, double y, double z) {
-        ensureCapacity(28);
-        writeInt(GLCommand.TRANSLATE);
-        writeDouble(x);
-        writeDouble(y);
-        writeDouble(z);
-    }
-
-    public void writeRotate(double angle, double x, double y, double z) {
-        ensureCapacity(36);
-        writeInt(GLCommand.ROTATE);
-        writeDouble(angle);
-        writeDouble(x);
-        writeDouble(y);
-        writeDouble(z);
-    }
-
-    public void writeScale(double x, double y, double z) {
-        ensureCapacity(28);
-        writeInt(GLCommand.SCALE);
-        writeDouble(x);
-        writeDouble(y);
-        writeDouble(z);
-    }
-
-    public void writeOrtho(double left, double right, double bottom, double top, double zNear, double zFar) {
-        ensureCapacity(52);
-        writeInt(GLCommand.ORTHO);
-        writeDouble(left);
-        writeDouble(right);
-        writeDouble(bottom);
-        writeDouble(top);
-        writeDouble(zNear);
-        writeDouble(zFar);
-    }
-
-    public void writeFrustum(double left, double right, double bottom, double top, double zNear, double zFar) {
-        ensureCapacity(52);
-        writeInt(GLCommand.FRUSTUM);
-        writeDouble(left);
-        writeDouble(right);
-        writeDouble(bottom);
-        writeDouble(top);
-        writeDouble(zNear);
-        writeDouble(zFar);
-    }
-
-    // === Matrix commands ===
-
-    public void writeMultMatrix(Matrix4f matrix) {
-        ensureCapacity(68);
-        writeInt(GLCommand.MULT_MATRIX);
-        writeMatrix4f(matrix);
-    }
-
-    public void writeLoadMatrix(Matrix4f matrix) {
-        ensureCapacity(68);
-        writeInt(GLCommand.LOAD_MATRIX);
-        writeMatrix4f(matrix);
-    }
-
-    /**
-     * Write a Matrix4f to the buffer in column-major order (OpenGL convention).
-     * Uses accessor methods instead of getToAddress() to avoid JOML MemUtil issues.
-     */
-    private void writeMatrix4f(Matrix4f m) {
-        // Column 0
-        writeFloat(m.m00()); writeFloat(m.m01()); writeFloat(m.m02()); writeFloat(m.m03());
-        // Column 1
-        writeFloat(m.m10()); writeFloat(m.m11()); writeFloat(m.m12()); writeFloat(m.m13());
-        // Column 2
-        writeFloat(m.m20()); writeFloat(m.m21()); writeFloat(m.m22()); writeFloat(m.m23());
-        // Column 3
-        writeFloat(m.m30()); writeFloat(m.m31()); writeFloat(m.m32()); writeFloat(m.m33());
-    }
-
-    // === Buffer commands (inline 4 floats) ===
-
-    public void writeFog(int pname, FloatBuffer params) {
-        final int count = Math.min(params.remaining(), 4);
-        ensureCapacity(12 + count * 4);
-        writeInt(GLCommand.FOG);
-        writeInt(pname);
-        writeInt(count);
-        final int pos = params.position();
-        for (int i = 0; i < count; i++) {
-            writeFloat(params.get(pos + i));
-        }
-    }
-
-    public void writeLight(int light, int pname, FloatBuffer params) {
-        final int count = Math.min(params.remaining(), 4);
-        ensureCapacity(16 + count * 4);
-        writeInt(GLCommand.LIGHT);
-        writeInt(light);
-        writeInt(pname);
-        writeInt(count);
-        final int pos = params.position();
-        for (int i = 0; i < count; i++) {
-            writeFloat(params.get(pos + i));
-        }
-    }
-
-    public void writeLightModel(int pname, FloatBuffer params) {
-        final int count = Math.min(params.remaining(), 4);
-        ensureCapacity(12 + count * 4);
-        writeInt(GLCommand.LIGHT_MODEL);
-        writeInt(pname);
-        writeInt(count);
-        final int pos = params.position();
-        for (int i = 0; i < count; i++) {
-            writeFloat(params.get(pos + i));
-        }
-    }
-
-    public void writeMaterial(int face, int pname, FloatBuffer params) {
-        final int count = Math.min(params.remaining(), 4);
-        ensureCapacity(16 + count * 4);
-        writeInt(GLCommand.MATERIAL);
-        writeInt(face);
-        writeInt(pname);
-        writeInt(count);
-        final int pos = params.position();
-        for (int i = 0; i < count; i++) {
-            writeFloat(params.get(pos + i));
-        }
-    }
-
-    public void writeClipPlane(int plane, double a, double b, double c, double d) {
-        ensureCapacity(40);
-        writeInt(GLCommand.CLIP_PLANE);
-        writeInt(plane);
-        writeDouble(a);
-        writeDouble(b);
-        writeDouble(c);
-        writeDouble(d);
-    }
-
-    // === Draw commands ===
-
-    public void writeDrawRange(int vboIndex) {
-        ensureCapacity(8);
-        writeInt(GLCommand.DRAW_RANGE);
-        writeInt(vboIndex);
-    }
-
-    /**
-     * Write a DRAW_RANGE_RESTORE command that draws a VBO range and restores GL current state after.
-     * Used for immediate mode VBOs to restore GL_CURRENT_COLOR, GL_CURRENT_NORMAL, GL_CURRENT_TEXTURE_COORDS.
-     *
-     * @param vboIndex Index into ownedVbos array
-     */
-    public void writeDrawRangeRestore(
-        int vboIndex, AccumulatedDraw.RestoreData restoreData
-    ) {
-        ensureCapacity(28);
-        writeInt(GLCommand.DRAW_RANGE_RESTORE);
-        writeInt(vboIndex);
-        writeInt(restoreData.flags);
-        // Last color (4 bytes)
-        writeInt(restoreData.lastColor);
-        // Last normal (4 bytes)
-        writeInt(restoreData.lastNormal);
-        // Last texcoord (2 floats = 8 bytes)
-        writeFloat(restoreData.lastTexCoordU);
-        writeFloat(restoreData.lastTexCoordV);
-    }
-
-    public void writeCallList(int listId) {
-        ensureCapacity(8);
-        writeInt(GLCommand.CALL_LIST);
-        writeInt(listId);
-    }
-
-    public void writeBindVBO(int vbo) {
-        ensureCapacity(8);
-        writeInt(GLCommand.BIND_VBO);
-        writeInt(vbo);
-    }
-
-    public void writeBindVAO(int vao) {
-        ensureCapacity(8);
-        writeInt(GLCommand.BIND_VAO);
-        writeInt(vao);
-    }
-
-    public void writeDrawBuffer(int mode) {
-        ensureCapacity(8);
-        writeInt(GLCommand.DRAW_BUFFER);
-        writeInt(mode);
-    }
-
-    private static final int MAX_DRAW_BUFFERS = 8;
-    // cmd (4) + count (4) + buffers (4 * MAX_DRAW_BUFFERS)
-    private static final int DRAW_BUFFERS_SIZE = 4 + 4 + 4 * MAX_DRAW_BUFFERS;
-
-    public void writeDrawBuffers(int count, int buffer) {
-        ensureCapacity(DRAW_BUFFERS_SIZE);
-        writeInt(GLCommand.DRAW_BUFFERS);
-        writeInt(count);
-        writeInt(buffer);
-        for (int i = 1; i < MAX_DRAW_BUFFERS; i++) {
-            writeInt(0);
-        }
-    }
-
-    public void writeDrawBuffers(int count, IntBuffer bufs) {
-        ensureCapacity(DRAW_BUFFERS_SIZE);
-        writeInt(GLCommand.DRAW_BUFFERS);
-        writeInt(count);
-        final int pos = bufs.position();
-        for (int i = 0; i < count && i < MAX_DRAW_BUFFERS; i++) {
-            writeInt(bufs.get(pos + i));
-        }
-        for (int i = count; i < MAX_DRAW_BUFFERS; i++) {
-            writeInt(0);
-        }
-    }
-
-    // === Complex object reference ===
-
-    public void writeComplexRef(DisplayListCommand cmd) {
-        ensureCapacity(8);
-        final int index = complexObjects.size();
-        complexObjects.add(cmd);
-        writeInt(GLCommand.COMPLEX_REF);
-        writeInt(index);
-    }
-
-    // === Reading methods for optimization pass ===
-
-    private long readPointer = 0;
-
-    /**
-     * Reset read position to the beginning of the buffer.
-     */
-    public void resetRead() {
-        readPointer = basePointer;
-    }
-
-    /**
-     * Check if there's more data to read.
-     */
-    public boolean hasRemaining() {
-        return readPointer < writePointer;
-    }
-
-    /**
-     * Read an int from the current position.
-     */
-    public int readInt() {
-        final int value = memGetInt(readPointer);
-        readPointer += 4;
-        return value;
-    }
-
-    public long readLong() {
-        final long value = memGetLong(readPointer);
-        readPointer += 8;
-        return value;
-    }
-
-    /**
-     * Read a float from the current position.
-     */
-    public float readFloat() {
-        final float value = memGetFloat(readPointer);
-        readPointer += 4;
-        return value;
-    }
-
-    /**
-     * Read a double from the current position.
-     */
-    public double readDouble() {
-        final double value = memGetDouble(readPointer);
-        readPointer += 8;
-        return value;
-    }
-
-    /**
-     * Read a Matrix4f from the current position (16 floats in column-major order).
-     */
-    public Matrix4f readMatrix4f(Matrix4f dest) {
-        dest.m00(readFloat()); dest.m01(readFloat()); dest.m02(readFloat()); dest.m03(readFloat());
-        dest.m10(readFloat()); dest.m11(readFloat()); dest.m12(readFloat()); dest.m13(readFloat());
-        dest.m20(readFloat()); dest.m21(readFloat()); dest.m22(readFloat()); dest.m23(readFloat());
-        dest.m30(readFloat()); dest.m31(readFloat()); dest.m32(readFloat()); dest.m33(readFloat());
-        return dest;
-    }
-
-    // === Lifecycle ===
-
-    public int size() {
-        return (int) (writePointer - basePointer);
-    }
-
-    public long address() {
-        return basePointer;
-    }
-
-    public ByteBuffer toBuffer() {
-        buffer.limit(size());
-        buffer.position(0);
-        return buffer;
-    }
-
-    public Object[] getComplexObjects() {
-        return complexObjects.toArray();
-    }
-
-    public Object getComplexObject(int index) {
-        return complexObjects.get(index);
-    }
-
-    public boolean isEmpty() {
-        return size() == 0 && complexObjects.isEmpty();
-    }
-
-    /**
-     * Clear the buffer for reuse. Does NOT free memory.
-     */
-    public void clear() {
-        writePointer = basePointer;
-        complexObjects.clear();
-    }
-
-    /**
-     * Free the underlying buffer. Must be called when done.
-     */
-    public void free() {
-        if (buffer != null) {
-            memFree(buffer);
-            buffer = null;
-            basePointer = 0;
-            writePointer = 0;
-        }
-    }
-}
@@ -1,12 +1,10 @@
 package com.gtnewhorizons.angelica.glsm.recording;

-import com.gtnewhorizon.gtnhlib.client.opengl.UniversalVAO;
 import com.gtnewhorizon.gtnhlib.client.renderer.vertex.VertexFlags;
 import com.gtnewhorizons.angelica.glsm.DisplayListManager;
 import com.gtnewhorizons.angelica.glsm.GLStateManager;
 import com.gtnewhorizons.angelica.glsm.recording.commands.DisplayListCommand;
 import org.lwjgl.BufferUtils;
-import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL15;

 import java.nio.ByteBuffer;
@@ -14,7 +12,10 @@ import java.nio.DoubleBuffer;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;

-import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.*;
+import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.memAddress;
+import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.memGetDouble;
+import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.memGetFloat;
+import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.memGetInt;

 /**
 * Executes commands from a CommandBuffer
@@ -39,7 +40,13 @@ public final class CommandBufferExecutor {
     * @param complexObjects Array of complex objects (TexImage2DCmd, etc.)
     * @param ownedVbos Array of VBOs owned by the display list (indexed by DrawRange commands)
     */
-    public static void execute(ByteBuffer buffer, Object[] complexObjects, DisplayListVBO ownedVbos) {
+    public static void execute(
+        ByteBuffer buffer,
+        DisplayListCommand[] complexObjects,
+        DisplayListVBO ownedVbos,
+        int list,
+        CompiledDisplayList compiledDisplayList
+    ) {
        long ptr = memAddress(buffer);
        final long end = ptr + buffer.limit();

@@ -343,50 +350,6 @@ public final class CommandBufferExecutor {
                    GLStateManager.glTexParameterf(target, pname, param);
                }

-                // === Double commands ===
-                case GLCommand.TRANSLATE -> {
-                    final double x = memGetDouble(ptr);
-                    final double y = memGetDouble(ptr + 8);
-                    final double z = memGetDouble(ptr + 16);
-                    ptr += 24;
-                    GLStateManager.glTranslated(x, y, z);
-                }
-                case GLCommand.ROTATE -> {
-                    final double angle = memGetDouble(ptr);
-                    final double x = memGetDouble(ptr + 8);
-                    final double y = memGetDouble(ptr + 16);
-                    final double z = memGetDouble(ptr + 24);
-                    ptr += 32;
-                    GLStateManager.glRotated(angle, x, y, z);
-                }
-                case GLCommand.SCALE -> {
-                    final double x = memGetDouble(ptr);
-                    final double y = memGetDouble(ptr + 8);
-                    final double z = memGetDouble(ptr + 16);
-                    ptr += 24;
-                    GLStateManager.glScaled(x, y, z);
-                }
-                case GLCommand.ORTHO -> {
-                    final double left = memGetDouble(ptr);
-                    final double right = memGetDouble(ptr + 8);
-                    final double bottom = memGetDouble(ptr + 16);
-                    final double top = memGetDouble(ptr + 24);
-                    final double zNear = memGetDouble(ptr + 32);
-                    final double zFar = memGetDouble(ptr + 40);
-                    ptr += 48;
-                    GLStateManager.glOrtho(left, right, bottom, top, zNear, zFar);
-                }
-                case GLCommand.FRUSTUM -> {
-                    final double left = memGetDouble(ptr);
-                    final double right = memGetDouble(ptr + 8);
-                    final double bottom = memGetDouble(ptr + 16);
-                    final double top = memGetDouble(ptr + 24);
-                    final double zNear = memGetDouble(ptr + 32);
-                    final double zFar = memGetDouble(ptr + 40);
-                    ptr += 48;
-                    GLStateManager.glFrustum(left, right, bottom, top, zNear, zFar);
-                }
-
                // === Matrix commands ===
                case GLCommand.MULT_MATRIX -> {
                    // Mode-agnostic: just multiply current matrix
@@ -398,6 +361,20 @@ public final class CommandBufferExecutor {
                    MATRIX_BUFFER.flip();
                    GLStateManager.glMultMatrix(MATRIX_BUFFER);
                }
+                case GLCommand.TRANSLATE -> {
+                    final float x = memGetFloat(ptr);
+                    final float y = memGetFloat(ptr + 4);
+                    final float z = memGetFloat(ptr + 8);
+                    ptr += 12;
+                    GLStateManager.glTranslatef(x, y, z);
+                }
+                case GLCommand.SCALE -> {
+                    final float x = memGetFloat(ptr);
+                    final float y = memGetFloat(ptr + 4);
+                    final float z = memGetFloat(ptr + 8);
+                    ptr += 12;
+                    GLStateManager.glScalef(x, y, z);
+                }
                case GLCommand.LOAD_MATRIX -> {
                    MATRIX_BUFFER.clear();
                    for (int i = 0; i < 16; i++) {
@@ -543,10 +520,10 @@ public final class CommandBufferExecutor {
                case GLCommand.COMPLEX_REF -> {
                    final int index = memGetInt(ptr);
                    ptr += 4;
-                    ((DisplayListCommand) complexObjects[index]).execute();
+                    complexObjects[index].execute();
                }

-                default -> throw new IllegalStateException("Unknown command opcode: " + cmd);
+                default -> throw new IllegalStateException("Unknown command opcode: " + cmd + " in display list with ID " + list + "\n" + DisplayListManager.getCompiledDisplayListString(list, compiledDisplayList, null));
            }
        }
    }
@@ -1,166 +0,0 @@
-package com.gtnewhorizons.angelica.glsm.recording;
-
-import com.gtnewhorizons.angelica.glsm.GLStateManager;
-import com.gtnewhorizons.angelica.glsm.recording.commands.DisplayListCommand;
-import org.joml.Matrix4f;
-
-import java.nio.FloatBuffer;
-
-public final class CommandBufferProcessor {
-    private static final Matrix4f tempMatrix = new Matrix4f();
-
-    private CommandBufferProcessor() {}
-
-    /**
-     * Copy a complete command (opcode already read) from raw to final buffer.
-     */
-    public static void copyCommand(CommandBuffer raw, CommandBuffer out) {
-        final int opcode = raw.readInt();
-        copyCommandData(opcode, raw, out);
-    }
-
-    /**
-     * Copy command data based on opcode (opcode already consumed from raw).
-     */
-    public static void copyCommandData(int opcode, CommandBuffer raw, CommandBuffer out) {
-        switch (opcode) {
-            // Single int commands
-            case GLCommand.ENABLE -> out.writeEnable(raw.readInt());
-            case GLCommand.DISABLE -> out.writeDisable(raw.readInt());
-            case GLCommand.CLEAR -> out.writeClear(raw.readInt());
-            case GLCommand.CLEAR_STENCIL -> out.writeClearStencil(raw.readInt());
-            case GLCommand.CULL_FACE -> out.writeCullFace(raw.readInt());
-            case GLCommand.DEPTH_FUNC -> out.writeDepthFunc(raw.readInt());
-            case GLCommand.SHADE_MODEL -> out.writeShadeModel(raw.readInt());
-            case GLCommand.LOGIC_OP -> out.writeLogicOp(raw.readInt());
-            case GLCommand.MATRIX_MODE -> out.writeMatrixMode(raw.readInt());
-            case GLCommand.ACTIVE_TEXTURE -> out.writeActiveTexture(raw.readInt());
-            case GLCommand.USE_PROGRAM -> out.writeUseProgram(raw.readInt());
-            case GLCommand.PUSH_ATTRIB -> out.writePushAttrib(raw.readInt());
-            case GLCommand.POP_ATTRIB -> { raw.readInt(); out.writePopAttrib(); }
-            case GLCommand.LOAD_IDENTITY -> out.writeLoadIdentity();
-            case GLCommand.PUSH_MATRIX -> out.writePushMatrix();
-            case GLCommand.POP_MATRIX -> out.writePopMatrix();
-            case GLCommand.STENCIL_MASK -> out.writeStencilMask(raw.readInt());
-            case GLCommand.DEPTH_MASK -> out.writeDepthMask(raw.readInt() != 0);
-            case GLCommand.FRONT_FACE -> out.writeFrontFace(raw.readInt());
-
-            // Two int commands
-            case GLCommand.BIND_TEXTURE -> out.writeBindTexture(raw.readInt(), raw.readInt());
-            case GLCommand.POLYGON_MODE -> out.writePolygonMode(raw.readInt(), raw.readInt());
-            case GLCommand.COLOR_MATERIAL -> out.writeColorMaterial(raw.readInt(), raw.readInt());
-            case GLCommand.LINE_STIPPLE -> out.writeLineStipple(raw.readInt(), raw.readInt());
-            case GLCommand.STENCIL_MASK_SEPARATE -> out.writeStencilMaskSeparate(raw.readInt(), raw.readInt());
-            case GLCommand.FOGI -> out.writeFogi(raw.readInt(), raw.readInt());
-            case GLCommand.HINT -> out.writeHint(raw.readInt(), raw.readInt());
-
-            // Three int commands
-            case GLCommand.STENCIL_FUNC -> out.writeStencilFunc(raw.readInt(), raw.readInt(), raw.readInt());
-            case GLCommand.STENCIL_OP -> out.writeStencilOp(raw.readInt(), raw.readInt(), raw.readInt());
-            case GLCommand.TEX_PARAMETERI -> out.writeTexParameteri(raw.readInt(), raw.readInt(), raw.readInt());
-
-            // Four int commands
-            case GLCommand.VIEWPORT -> out.writeViewport(raw.readInt(), raw.readInt(), raw.readInt(), raw.readInt());
-            case GLCommand.SCISSOR -> out.writeScissor(raw.readInt(), raw.readInt(), raw.readInt(), raw.readInt());
-            case GLCommand.BLEND_FUNC -> out.writeBlendFunc(raw.readInt(), raw.readInt(), raw.readInt(), raw.readInt());
-            case GLCommand.COLOR_MASK -> out.writeColorMask(raw.readInt() != 0, raw.readInt() != 0, raw.readInt() != 0, raw.readInt() != 0);
-            case GLCommand.STENCIL_FUNC_SEPARATE -> out.writeStencilFuncSeparate(raw.readInt(), raw.readInt(), raw.readInt(), raw.readInt());
-            case GLCommand.STENCIL_OP_SEPARATE -> out.writeStencilOpSeparate(raw.readInt(), raw.readInt(), raw.readInt(), raw.readInt());
-
-            // Float commands
-            case GLCommand.POINT_SIZE -> out.writePointSize(raw.readFloat());
-            case GLCommand.LINE_WIDTH -> out.writeLineWidth(raw.readFloat());
-            case GLCommand.POLYGON_OFFSET -> out.writePolygonOffset(raw.readFloat(), raw.readFloat());
-            case GLCommand.COLOR -> out.writeColor(raw.readFloat(), raw.readFloat(), raw.readFloat(), raw.readFloat());
-            case GLCommand.CLEAR_COLOR -> out.writeClearColor(raw.readFloat(), raw.readFloat(), raw.readFloat(), raw.readFloat());
-
-            // Single double commands
-            case GLCommand.CLEAR_DEPTH -> out.writeClearDepth(raw.readDouble());
-
-            // Four float commands
-            case GLCommand.BLEND_COLOR -> out.writeBlendColor(raw.readFloat(), raw.readFloat(), raw.readFloat(), raw.readFloat());
-
-            // Mixed int+float commands
-            case GLCommand.ALPHA_FUNC -> out.writeAlphaFunc(raw.readInt(), raw.readFloat());
-            case GLCommand.FOGF -> out.writeFogf(raw.readInt(), raw.readFloat());
-            case GLCommand.LIGHTF -> out.writeLightf(raw.readInt(), raw.readInt(), raw.readFloat());
-            case GLCommand.LIGHT_MODELF -> out.writeLightModelf(raw.readInt(), raw.readFloat());
-            case GLCommand.LIGHTI -> out.writeLighti(raw.readInt(), raw.readInt(), raw.readInt());
-            case GLCommand.LIGHT_MODELI -> out.writeLightModeli(raw.readInt(), raw.readInt());
-            case GLCommand.MATERIALF -> out.writeMaterialf(raw.readInt(), raw.readInt(), raw.readFloat());
-            case GLCommand.TEX_PARAMETERF -> out.writeTexParameterf(raw.readInt(), raw.readInt(), raw.readFloat());
-
-            // Double commands
-            case GLCommand.TRANSLATE -> out.writeTranslate(raw.readDouble(), raw.readDouble(), raw.readDouble());
-            case GLCommand.ROTATE -> out.writeRotate(raw.readDouble(), raw.readDouble(), raw.readDouble(), raw.readDouble());
-            case GLCommand.SCALE -> out.writeScale(raw.readDouble(), raw.readDouble(), raw.readDouble());
-            case GLCommand.ORTHO -> out.writeOrtho(raw.readDouble(), raw.readDouble(), raw.readDouble(), raw.readDouble(), raw.readDouble(), raw.readDouble());
-            case GLCommand.FRUSTUM -> out.writeFrustum(raw.readDouble(), raw.readDouble(), raw.readDouble(), raw.readDouble(), raw.readDouble(), raw.readDouble());
-
-            // Matrix commands
-            case GLCommand.MULT_MATRIX -> { out.writeMultMatrix(raw.readMatrix4f(tempMatrix)); }
-            case GLCommand.LOAD_MATRIX -> { out.writeLoadMatrix(raw.readMatrix4f(tempMatrix)); }
-
-            // FloatBuffer commands (inline 4 floats max)
-            case GLCommand.FOG -> {
-                final int pname = raw.readInt();
-                final int count = raw.readInt();
-                final FloatBuffer fb = FloatBuffer.allocate(count);
-                for (int i = 0; i < count; i++) fb.put(raw.readFloat());
-                fb.flip();
-                out.writeFog(pname, fb);
-            }
-            case GLCommand.LIGHT -> {
-                final int light = raw.readInt();
-                final int pname = raw.readInt();
-                final int count = raw.readInt();
-                final FloatBuffer fb = FloatBuffer.allocate(count);
-                for (int i = 0; i < count; i++) fb.put(raw.readFloat());
-                fb.flip();
-                out.writeLight(light, pname, fb);
-            }
-            case GLCommand.LIGHT_MODEL -> {
-                final int pname = raw.readInt();
-                final int count = raw.readInt();
-                final FloatBuffer fb = FloatBuffer.allocate(count);
-                for (int i = 0; i < count; i++) fb.put(raw.readFloat());
-                fb.flip();
-                out.writeLightModel(pname, fb);
-            }
-            case GLCommand.MATERIAL -> {
-                final int face = raw.readInt();
-                final int pname = raw.readInt();
-                final int count = raw.readInt();
-                final FloatBuffer fb = FloatBuffer.allocate(count);
-                for (int i = 0; i < count; i++) fb.put(raw.readFloat());
-                fb.flip();
-                out.writeMaterial(face, pname, fb);
-            }
-
-            // Clip plane command (4 doubles)
-            case GLCommand.CLIP_PLANE -> {
-                final int plane = raw.readInt();
-                final double a = raw.readDouble();
-                final double b = raw.readDouble();
-                final double c = raw.readDouble();
-                final double d = raw.readDouble();
-                out.writeClipPlane(plane, a, b, c, d);
-            }
-
-            // Draw/call commands
-            case GLCommand.DRAW_RANGE -> out.writeDrawRange(raw.readInt());
-            case GLCommand.CALL_LIST -> out.writeCallList(raw.readInt());
-            case GLCommand.BIND_VBO -> out.writeBindVBO(raw.readInt());
-            case GLCommand.BIND_VAO -> out.writeBindVAO(raw.readInt());
-
-            // Complex object reference - transfer the object to output buffer
-            case GLCommand.COMPLEX_REF -> {
-                final int index = raw.readInt();
-                final Object obj = raw.getComplexObject(index);
-                out.writeComplexRef((DisplayListCommand) obj);
-            }
-
-            default -> GLStateManager.LOGGER.warn("[CommandBufferProcessor] Unknown opcode in buffer copy: {}", opcode);
-        }
-    }
-}
@@ -4,376 +4,688 @@ import com.gtnewhorizons.angelica.glsm.recording.commands.DisplayListCommand;
 import com.gtnewhorizons.angelica.glsm.recording.commands.IndexedDrawBatchBuilder;
 import com.gtnewhorizons.angelica.glsm.recording.commands.IndexedDrawCapture;
 import org.joml.Matrix4f;
+import org.joml.Vector3f;

+import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
+import java.util.ArrayList;
+
+import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.*;

-/**
- * Records GL commands to a CommandBuffer during display list compilation.
- */
 public final class CommandRecorder {
-    private final CommandBuffer buffer;
+    private static final int DEFAULT_CAPACITY = 2048; // Guess at typical display list size
+
+    private ByteBuffer buffer;
+    private long basePointer;
+    private long writePointer;
+    private final ArrayList<DisplayListCommand> complexObjects = new ArrayList<>();
    private final IndexedDrawBatchBuilder indexedDraws = new IndexedDrawBatchBuilder();
-    private int commandCount;

    public CommandRecorder() {
-        this.buffer = new CommandBuffer();
-        this.commandCount = 0;
+        this(DEFAULT_CAPACITY);
    }

-    public CommandBuffer getBuffer() {
-        return buffer;
+    public CommandRecorder(int initialCapacity) {
+        this.buffer = memAlloc(initialCapacity);
+        this.basePointer = memAddress0(buffer);
+        this.writePointer = basePointer;
    }

-    public int getCommandCount() {
-        return commandCount;
+    // === Low-level write operations ===
+
+    private void writeInt(int value) {
+        memPutInt(writePointer, value);
+        writePointer += 4;
+    }
+
+    private void writeLong(long value) {
+        memPutLong(writePointer, value);
+        writePointer += 8;
+    }
+
+    private void writeFloat(float value) {
+        memPutFloat(writePointer, value);
+        writePointer += 4;
+    }
+
+    private void writeDouble(double value) {
+        memPutDouble(writePointer, value);
+        writePointer += 8;
+    }
+
+    private void ensureCapacity(int needed) {
+        final int size = size();
+        final int remaining = buffer.capacity() - size;
+        if (remaining < needed) {
+            final int newCapacity = Math.max(buffer.capacity() * 2, buffer.capacity() + needed);
+            buffer = memRealloc(buffer, newCapacity);
+            basePointer = memAddress0(buffer);
+            writePointer = basePointer + size;
+        }
    }

    public IndexedDrawBatchBuilder getIndexedDraws() {
        return indexedDraws;
    }

-    public void recordIndexedDrawCapture(IndexedDrawCapture capture) {
+    public void writeIndexedDrawCapture(IndexedDrawCapture capture) {
        indexedDraws.add(capture);
-        recordComplexCommand(capture.placeholder);
+        writeComplexCommand(capture.placeholder);
    }

    public void free() {
        for (IndexedDrawCapture c : indexedDraws.getCaptures()) {
            c.freeBuffers();
        }
-        buffer.free();
    }

-    // ==================== Recording Methods ====================
+    // === Single int commands ===

-    public void recordEnable(int cap) {
-        buffer.writeEnable(cap);
-        commandCount++;
+    public void writeEnable(int cap) {
+        ensureCapacity(8);
+        writeInt(GLCommand.ENABLE);
+        writeInt(cap);
    }

-    public void recordDisable(int cap) {
-        buffer.writeDisable(cap);
-        commandCount++;
+    public void writeDisable(int cap) {
+        ensureCapacity(8);
+        writeInt(GLCommand.DISABLE);
+        writeInt(cap);
    }

-    public void recordClear(int mask) {
-        buffer.writeClear(mask);
-        commandCount++;
+    public void writeClear(int mask) {
+        ensureCapacity(8);
+        writeInt(GLCommand.CLEAR);
+        writeInt(mask);
    }

-    public void recordClearColor(float r, float g, float b, float a) {
-        buffer.writeClearColor(r, g, b, a);
-        commandCount++;
+    public void writeClearStencil(int s) {
+        ensureCapacity(8);
+        writeInt(GLCommand.CLEAR_STENCIL);
+        writeInt(s);
    }

-    public void recordClearDepth(double depth) {
-        buffer.writeClearDepth(depth);
-        commandCount++;
+    public void writeCullFace(int mode) {
+        ensureCapacity(8);
+        writeInt(GLCommand.CULL_FACE);
+        writeInt(mode);
    }

-    public void recordBlendColor(float r, float g, float b, float a) {
-        buffer.writeBlendColor(r, g, b, a);
-        commandCount++;
+    public void writeDepthFunc(int func) {
+        ensureCapacity(8);
+        writeInt(GLCommand.DEPTH_FUNC);
+        writeInt(func);
    }

-    public void recordClearStencil(int s) {
-        buffer.writeClearStencil(s);
-        commandCount++;
+    public void writeShadeModel(int mode) {
+        ensureCapacity(8);
+        writeInt(GLCommand.SHADE_MODEL);
+        writeInt(mode);
    }

-    public void recordColor(float r, float g, float b, float a) {
-        buffer.writeColor(r, g, b, a);
-        commandCount++;
+    public void writeLogicOp(int opcode) {
+        ensureCapacity(8);
+        writeInt(GLCommand.LOGIC_OP);
+        writeInt(opcode);
    }

-    public void recordColorMask(boolean r, boolean g, boolean b, boolean a) {
-        buffer.writeColorMask(r, g, b, a);
-        commandCount++;
+    public void writeMatrixMode(int mode) {
+        ensureCapacity(8);
+        writeInt(GLCommand.MATRIX_MODE);
+        writeInt(mode);
    }

-    public void recordDepthMask(boolean flag) {
-        buffer.writeDepthMask(flag);
-        commandCount++;
+    public void writeActiveTexture(int texture) {
+        ensureCapacity(8);
+        writeInt(GLCommand.ACTIVE_TEXTURE);
+        writeInt(texture);
    }

-    public void recordFrontFace(int mode) {
-        buffer.writeFrontFace(mode);
-        commandCount++;
+    public void writeUseProgram(int program) {
+        ensureCapacity(8);
+        writeInt(GLCommand.USE_PROGRAM);
+        writeInt(program);
    }

-    public void recordDepthFunc(int func) {
-        buffer.writeDepthFunc(func);
-        commandCount++;
+    public void writePushAttrib(int mask) {
+        ensureCapacity(8);
+        writeInt(GLCommand.PUSH_ATTRIB);
+        writeInt(mask);
    }

-    public void recordBlendFunc(int srcRgb, int dstRgb, int srcAlpha, int dstAlpha) {
-        buffer.writeBlendFunc(srcRgb, dstRgb, srcAlpha, dstAlpha);
-        commandCount++;
+    public void writePopAttrib() {
+        ensureCapacity(8);
+        writeInt(GLCommand.POP_ATTRIB);
+        writeInt(0); // unused padding
    }

-    public void recordAlphaFunc(int func, float ref) {
-        buffer.writeAlphaFunc(func, ref);
-        commandCount++;
+    public void writeLoadIdentity() {
+        ensureCapacity(4);
+        writeInt(GLCommand.LOAD_IDENTITY);
    }

-    public void recordCullFace(int mode) {
-        buffer.writeCullFace(mode);
-        commandCount++;
+    public void writePushMatrix() {
+        ensureCapacity(4);
+        writeInt(GLCommand.PUSH_MATRIX);
    }

-    public void recordShadeModel(int mode) {
-        buffer.writeShadeModel(mode);
-        commandCount++;
+    public void writePopMatrix() {
+        ensureCapacity(4);
+        writeInt(GLCommand.POP_MATRIX);
    }

-    public void recordBindTexture(int target, int texture) {
-        buffer.writeBindTexture(target, texture);
-        commandCount++;
+    public void writeStencilMask(int mask) {
+        ensureCapacity(8);
+        writeInt(GLCommand.STENCIL_MASK);
+        writeInt(mask);
    }

-    public void recordTexParameteri(int target, int pname, int param) {
-        buffer.writeTexParameteri(target, pname, param);
-        commandCount++;
+    public void writeDepthMask(boolean flag) {
+        ensureCapacity(8);
+        writeInt(GLCommand.DEPTH_MASK);
+        writeInt(flag ? 1 : 0);
    }

-    public void recordTexParameterf(int target, int pname, float param) {
-        buffer.writeTexParameterf(target, pname, param);
-        commandCount++;
+    public void writeFrontFace(int mode) {
+        ensureCapacity(8);
+        writeInt(GLCommand.FRONT_FACE);
+        writeInt(mode);
    }

-    public void recordMatrixMode(int mode) {
-        buffer.writeMatrixMode(mode);
-        commandCount++;
-    }
+    // === Two int commands ===

-    public void recordLoadIdentity() {
-        buffer.writeLoadIdentity();
-        commandCount++;
+    public void writeBindTexture(int target, int texture) {
+        ensureCapacity(12);
+        writeInt(GLCommand.BIND_TEXTURE);
+        writeInt(target);
+        writeInt(texture);
    }

-    public void recordPushMatrix() {
-        buffer.writePushMatrix();
-        commandCount++;
+    public void writePolygonMode(int face, int mode) {
+        ensureCapacity(12);
+        writeInt(GLCommand.POLYGON_MODE);
+        writeInt(face);
+        writeInt(mode);
    }

-    public void recordPopMatrix() {
-        buffer.writePopMatrix();
-        commandCount++;
+    public void writeColorMaterial(int face, int mode) {
+        ensureCapacity(12);
+        writeInt(GLCommand.COLOR_MATERIAL);
+        writeInt(face);
+        writeInt(mode);
    }

-    public void recordMultMatrix(Matrix4f matrix) {
-        buffer.writeMultMatrix(matrix);
-        commandCount++;
+    public void writeLineStipple(int factor, int pattern) {
+        ensureCapacity(12);
+        writeInt(GLCommand.LINE_STIPPLE);
+        writeInt(factor);
+        writeInt(pattern);
    }

-    public void recordLoadMatrix(Matrix4f matrix) {
-        buffer.writeLoadMatrix(matrix);
-        commandCount++;
+    public void writeStencilMaskSeparate(int face, int mask) {
+        ensureCapacity(12);
+        writeInt(GLCommand.STENCIL_MASK_SEPARATE);
+        writeInt(face);
+        writeInt(mask);
    }

-    public void recordOrtho(double left, double right, double bottom, double top, double zNear, double zFar) {
-        buffer.writeOrtho(left, right, bottom, top, zNear, zFar);
-        commandCount++;
+    public void writeFogi(int pname, int param) {
+        ensureCapacity(12);
+        writeInt(GLCommand.FOGI);
+        writeInt(pname);
+        writeInt(param);
    }

-    public void recordFrustum(double left, double right, double bottom, double top, double zNear, double zFar) {
-        buffer.writeFrustum(left, right, bottom, top, zNear, zFar);
-        commandCount++;
+    public void writeHint(int target, int mode) {
+        ensureCapacity(12);
+        writeInt(GLCommand.HINT);
+        writeInt(target);
+        writeInt(mode);
    }

-    public void recordViewport(int x, int y, int width, int height) {
-        buffer.writeViewport(x, y, width, height);
-        commandCount++;
-    }
+    // === Three int commands ===

-    public void recordScissor(int x, int y, int width, int height) {
-        buffer.writeScissor(x, y, width, height);
-        commandCount++;
+    public void writeStencilFunc(int func, int ref, int mask) {
+        ensureCapacity(16);
+        writeInt(GLCommand.STENCIL_FUNC);
+        writeInt(func);
+        writeInt(ref);
+        writeInt(mask);
    }

-    public void recordPointSize(float size) {
-        buffer.writePointSize(size);
-        commandCount++;
+    public void writeStencilOp(int fail, int zfail, int zpass) {
+        ensureCapacity(16);
+        writeInt(GLCommand.STENCIL_OP);
+        writeInt(fail);
+        writeInt(zfail);
+        writeInt(zpass);
    }

-    public void recordLineWidth(float width) {
-        buffer.writeLineWidth(width);
-        commandCount++;
+    public void writeTexParameteri(int target, int pname, int param) {
+        ensureCapacity(16);
+        writeInt(GLCommand.TEX_PARAMETERI);
+        writeInt(target);
+        writeInt(pname);
+        writeInt(param);
    }

-    public void recordLineStipple(int factor, int pattern) {
-        buffer.writeLineStipple(factor, pattern);
-        commandCount++;
-    }
-
-    public void recordPolygonOffset(float factor, float units) {
-        buffer.writePolygonOffset(factor, units);
-        commandCount++;
-    }
+    // === Four int commands ===

-    public void recordPolygonMode(int face, int mode) {
-        buffer.writePolygonMode(face, mode);
-        commandCount++;
+    public void writeViewport(int x, int y, int width, int height) {
+        ensureCapacity(20);
+        writeInt(GLCommand.VIEWPORT);
+        writeInt(x);
+        writeInt(y);
+        writeInt(width);
+        writeInt(height);
    }

-    public void recordColorMaterial(int face, int mode) {
-        buffer.writeColorMaterial(face, mode);
-        commandCount++;
+    public void writeScissor(int x, int y, int width, int height) {
+        ensureCapacity(20);
+        writeInt(GLCommand.SCISSOR);
+        writeInt(x);
+        writeInt(y);
+        writeInt(width);
+        writeInt(height);
    }

-    public void recordLogicOp(int opcode) {
-        buffer.writeLogicOp(opcode);
-        commandCount++;
+    public void writeBlendFunc(int srcRgb, int dstRgb, int srcAlpha, int dstAlpha) {
+        ensureCapacity(20);
+        writeInt(GLCommand.BLEND_FUNC);
+        writeInt(srcRgb);
+        writeInt(dstRgb);
+        writeInt(srcAlpha);
+        writeInt(dstAlpha);
    }

-    public void recordActiveTexture(int texture) {
-        buffer.writeActiveTexture(texture);
-        commandCount++;
+    public void writeColorMask(boolean red, boolean green, boolean blue, boolean alpha) {
+        ensureCapacity(20);
+        writeInt(GLCommand.COLOR_MASK);
+        writeInt(red ? 1 : 0);
+        writeInt(green ? 1 : 0);
+        writeInt(blue ? 1 : 0);
+        writeInt(alpha ? 1 : 0);
    }

-    public void recordUseProgram(int program) {
-        buffer.writeUseProgram(program);
-        commandCount++;
+    public void writeStencilFuncSeparate(int face, int func, int ref, int mask) {
+        ensureCapacity(20);
+        writeInt(GLCommand.STENCIL_FUNC_SEPARATE);
+        writeInt(face);
+        writeInt(func);
+        writeInt(ref);
+        writeInt(mask);
    }

-    public void recordPushAttrib(int mask) {
-        buffer.writePushAttrib(mask);
-        commandCount++;
+    public void writeStencilOpSeparate(int face, int sfail, int dpfail, int dppass) {
+        ensureCapacity(20);
+        writeInt(GLCommand.STENCIL_OP_SEPARATE);
+        writeInt(face);
+        writeInt(sfail);
+        writeInt(dpfail);
+        writeInt(dppass);
    }

-    public void recordPopAttrib() {
-        buffer.writePopAttrib();
-        commandCount++;
-    }
+    // === Float commands ===

-    public void recordFogf(int pname, float param) {
-        buffer.writeFogf(pname, param);
-        commandCount++;
+    public void writePointSize(float size) {
+        ensureCapacity(8);
+        writeInt(GLCommand.POINT_SIZE);
+        writeFloat(size);
    }

-    public void recordFogi(int pname, int param) {
-        buffer.writeFogi(pname, param);
-        commandCount++;
+    public void writeLineWidth(float width) {
+        ensureCapacity(8);
+        writeInt(GLCommand.LINE_WIDTH);
+        writeFloat(width);
    }

-    public void recordHint(int target, int mode) {
-        buffer.writeHint(target, mode);
-        commandCount++;
+    public void writePolygonOffset(float factor, float units) {
+        ensureCapacity(12);
+        writeInt(GLCommand.POLYGON_OFFSET);
+        writeFloat(factor);
+        writeFloat(units);
    }

-    public void recordFog(int pname, FloatBuffer params) {
-        buffer.writeFog(pname, params);
-        commandCount++;
+    public void writeColor(float r, float g, float b, float a) {
+        ensureCapacity(20);
+        writeInt(GLCommand.COLOR);
+        writeFloat(r);
+        writeFloat(g);
+        writeFloat(b);
+        writeFloat(a);
    }

-    public void recordLightf(int light, int pname, float param) {
-        buffer.writeLightf(light, pname, param);
-        commandCount++;
+    public void writeClearColor(float r, float g, float b, float a) {
+        ensureCapacity(20);
+        writeInt(GLCommand.CLEAR_COLOR);
+        writeFloat(r);
+        writeFloat(g);
+        writeFloat(b);
+        writeFloat(a);
    }

-    public void recordLighti(int light, int pname, int param) {
-        buffer.writeLighti(light, pname, param);
-        commandCount++;
+    public void writeClearDepth(double depth) {
+        ensureCapacity(12);
+        writeInt(GLCommand.CLEAR_DEPTH);
+        writeDouble(depth);
    }

-    public void recordLight(int light, int pname, FloatBuffer params) {
-        buffer.writeLight(light, pname, params);
-        commandCount++;
+    public void writeBlendColor(float r, float g, float b, float a) {
+        ensureCapacity(20);
+        writeInt(GLCommand.BLEND_COLOR);
+        writeFloat(r);
+        writeFloat(g);
+        writeFloat(b);
+        writeFloat(a);
    }

-    public void recordLightModelf(int pname, float param) {
-        buffer.writeLightModelf(pname, param);
-        commandCount++;
-    }
+    // === Mixed int+float commands ===

-    public void recordLightModeli(int pname, int param) {
-        buffer.writeLightModeli(pname, param);
-        commandCount++;
+    public void writeAlphaFunc(int func, float ref) {
+        ensureCapacity(12);
+        writeInt(GLCommand.ALPHA_FUNC);
+        writeInt(func);
+        writeFloat(ref);
    }

-    public void recordLightModel(int pname, FloatBuffer params) {
-        buffer.writeLightModel(pname, params);
-        commandCount++;
+    public void writeFogf(int pname, float param) {
+        ensureCapacity(12);
+        writeInt(GLCommand.FOGF);
+        writeInt(pname);
+        writeFloat(param);
    }

-    public void recordMaterialf(int face, int pname, float val) {
-        buffer.writeMaterialf(face, pname, val);
-        commandCount++;
+    public void writeLightf(int light, int pname, float param) {
+        ensureCapacity(16);
+        writeInt(GLCommand.LIGHTF);
+        writeInt(light);
+        writeInt(pname);
+        writeFloat(param);
    }

-    public void recordMaterial(int face, int pname, FloatBuffer params) {
-        buffer.writeMaterial(face, pname, params);
-        commandCount++;
+    public void writeLightModelf(int pname, float param) {
+        ensureCapacity(12);
+        writeInt(GLCommand.LIGHT_MODELF);
+        writeInt(pname);
+        writeFloat(param);
    }

-    public void recordClipPlane(int plane, double a, double b, double c, double d) {
-        buffer.writeClipPlane(plane, a, b, c, d);
-        commandCount++;
+    public void writeLighti(int light, int pname, int param) {
+        ensureCapacity(16);
+        writeInt(GLCommand.LIGHTI);
+        writeInt(light);
+        writeInt(pname);
+        writeInt(param);
    }

-    public void recordStencilFunc(int func, int ref, int mask) {
-        buffer.writeStencilFunc(func, ref, mask);
-        commandCount++;
+    public void writeLightModeli(int pname, int param) {
+        ensureCapacity(12);
+        writeInt(GLCommand.LIGHT_MODELI);
+        writeInt(pname);
+        writeInt(param);
    }

-    public void recordStencilFuncSeparate(int face, int func, int ref, int mask) {
-        buffer.writeStencilFuncSeparate(face, func, ref, mask);
-        commandCount++;
+    public void writeMaterialf(int face, int pname, float param) {
+        ensureCapacity(16);
+        writeInt(GLCommand.MATERIALF);
+        writeInt(face);
+        writeInt(pname);
+        writeFloat(param);
    }
-
-    public void recordStencilOp(int fail, int zfail, int zpass) {
-        buffer.writeStencilOp(fail, zfail, zpass);
-        commandCount++;
+
+    public void writeTexParameterf(int target, int pname, float param) {
+        ensureCapacity(16);
+        writeInt(GLCommand.TEX_PARAMETERF);
+        writeInt(target);
+        writeInt(pname);
+        writeFloat(param);
+    }
+
+    // === Transformation commands ===
+
+    public void writeTranslate(Vector3f translationVector) {
+        ensureCapacity(16);
+        writeInt(GLCommand.TRANSLATE);
+        writeFloat(translationVector.x);
+        writeFloat(translationVector.y);
+        writeFloat(translationVector.z);
+    }
+
+    public void writeScale(Vector3f scaleVector) {
+        ensureCapacity(16);
+        writeInt(GLCommand.SCALE);
+        writeFloat(scaleVector.x);
+        writeFloat(scaleVector.y);
+        writeFloat(scaleVector.z);
+    }
+
+    // === Matrix commands ===
+
+    public void writeMultMatrix(Matrix4f matrix) {
+        ensureCapacity(68);
+        writeInt(GLCommand.MULT_MATRIX);
+        writeMatrix4f(matrix);
+    }
+
+    public void writeLoadMatrix(Matrix4f matrix) {
+        ensureCapacity(68);
+        writeInt(GLCommand.LOAD_MATRIX);
+        writeMatrix4f(matrix);
+    }
+
+    /**
+     * Write a Matrix4f to the buffer in column-major order (OpenGL convention).
+     * Uses accessor methods instead of getToAddress() to avoid JOML MemUtil issues.
+     */
+    private void writeMatrix4f(Matrix4f m) {
+        // Column 0
+        writeFloat(m.m00()); writeFloat(m.m01()); writeFloat(m.m02()); writeFloat(m.m03());
+        // Column 1
+        writeFloat(m.m10()); writeFloat(m.m11()); writeFloat(m.m12()); writeFloat(m.m13());
+        // Column 2
+        writeFloat(m.m20()); writeFloat(m.m21()); writeFloat(m.m22()); writeFloat(m.m23());
+        // Column 3
+        writeFloat(m.m30()); writeFloat(m.m31()); writeFloat(m.m32()); writeFloat(m.m33());
+    }
+
+    // === Buffer commands (inline 4 floats) ===
+
+    public void writeFog(int pname, FloatBuffer params) {
+        final int count = Math.min(params.remaining(), 4);
+        ensureCapacity(12 + count * 4);
+        writeInt(GLCommand.FOG);
+        writeInt(pname);
+        writeInt(count);
+        final int pos = params.position();
+        for (int i = 0; i < count; i++) {
+            writeFloat(params.get(pos + i));
+        }
+    }
+
+    public void writeLight(int light, int pname, FloatBuffer params) {
+        final int count = Math.min(params.remaining(), 4);
+        ensureCapacity(16 + count * 4);
+        writeInt(GLCommand.LIGHT);
+        writeInt(light);
+        writeInt(pname);
+        writeInt(count);
+        final int pos = params.position();
+        for (int i = 0; i < count; i++) {
+            writeFloat(params.get(pos + i));
+        }
+    }
+
+    public void writeLightModel(int pname, FloatBuffer params) {
+        final int count = Math.min(params.remaining(), 4);
+        ensureCapacity(12 + count * 4);
+        writeInt(GLCommand.LIGHT_MODEL);
+        writeInt(pname);
+        writeInt(count);
+        final int pos = params.position();
+        for (int i = 0; i < count; i++) {
+            writeFloat(params.get(pos + i));
+        }
+    }
+
+    public void writeMaterial(int face, int pname, FloatBuffer params) {
+        final int count = Math.min(params.remaining(), 4);
+        ensureCapacity(16 + count * 4);
+        writeInt(GLCommand.MATERIAL);
+        writeInt(face);
+        writeInt(pname);
+        writeInt(count);
+        final int pos = params.position();
+        for (int i = 0; i < count; i++) {
+            writeFloat(params.get(pos + i));
+        }
+    }
+
+    public void writeClipPlane(int plane, double a, double b, double c, double d) {
+        ensureCapacity(40);
+        writeInt(GLCommand.CLIP_PLANE);
+        writeInt(plane);
+        writeDouble(a);
+        writeDouble(b);
+        writeDouble(c);
+        writeDouble(d);
+    }
+
+    // === Draw commands ===
+
+    public void writeDrawRange(int vboIndex) {
+        ensureCapacity(8);
+        writeInt(GLCommand.DRAW_RANGE);
+        writeInt(vboIndex);
+    }
+
+    /**
+     * Write a DRAW_RANGE_RESTORE command that draws a VBO range and restores GL current state after.
+     * Used for immediate mode VBOs to restore GL_CURRENT_COLOR, GL_CURRENT_NORMAL, GL_CURRENT_TEXTURE_COORDS.
+     *
+     * @param vboIndex Index into ownedVbos array
+     */
+    public void writeDrawRangeRestore(
+        int vboIndex, AccumulatedDraw.RestoreData restoreData
+    ) {
+        ensureCapacity(28);
+        writeInt(GLCommand.DRAW_RANGE_RESTORE);
+        writeInt(vboIndex);
+        writeInt(restoreData.flags);
+        // Last color (4 bytes)
+        writeInt(restoreData.lastColor);
+        // Last normal (4 bytes)
+        writeInt(restoreData.lastNormal);
+        // Last texcoord (2 floats = 8 bytes)
+        writeFloat(restoreData.lastTexCoordU);
+        writeFloat(restoreData.lastTexCoordV);
+    }
+
+
+    public void writeCallList(int listId) {
+        ensureCapacity(8);
+        writeInt(GLCommand.CALL_LIST);
+        writeInt(listId);
+    }
+
+    public void writeBindVBO(int vbo) {
+        ensureCapacity(8);
+        writeInt(GLCommand.BIND_VBO);
+        writeInt(vbo);
+    }
+
+    public void writeBindVAO(int vao) {
+        ensureCapacity(8);
+        writeInt(GLCommand.BIND_VAO);
+        writeInt(vao);
+    }
+
+    public void writeDrawBuffer(int mode) {
+        ensureCapacity(8);
+        writeInt(GLCommand.DRAW_BUFFER);
+        writeInt(mode);
+    }
+
+    private static final int MAX_DRAW_BUFFERS = 8;
+    // cmd (4) + count (4) + buffers (4 * MAX_DRAW_BUFFERS)
+    private static final int DRAW_BUFFERS_SIZE = 4 + 4 + 4 * MAX_DRAW_BUFFERS;
+
+    public void writeDrawBuffers(int count, int buffer) {
+        ensureCapacity(DRAW_BUFFERS_SIZE);
+        writeInt(GLCommand.DRAW_BUFFERS);
+        writeInt(count);
+        writeInt(buffer);
+        for (int i = 1; i < MAX_DRAW_BUFFERS; i++) {
+            writeInt(0);
+        }
+    }
+
+    public void writeDrawBuffers(int count, IntBuffer bufs) {
+        ensureCapacity(DRAW_BUFFERS_SIZE);
+        writeInt(GLCommand.DRAW_BUFFERS);
+        writeInt(count);
+        final int pos = bufs.position();
+        for (int i = 0; i < count && i < MAX_DRAW_BUFFERS; i++) {
+            writeInt(bufs.get(pos + i));
+        }
+        for (int i = count; i < MAX_DRAW_BUFFERS; i++) {
+            writeInt(0);
+        }
    }

-    public void recordStencilOpSeparate(int face, int sfail, int dpfail, int dppass) {
-        buffer.writeStencilOpSeparate(face, sfail, dpfail, dppass);
-        commandCount++;
-    }
+    // === Complex object reference ===

-    public void recordStencilMask(int mask) {
-        buffer.writeStencilMask(mask);
-        commandCount++;
+    public void writeComplexCommand(DisplayListCommand cmd) {
+        ensureCapacity(8);
+        final int index = complexObjects.size();
+        complexObjects.add(cmd);
+        writeInt(GLCommand.COMPLEX_REF);
+        writeInt(index);
    }

-    public void recordStencilMaskSeparate(int face, int mask) {
-        buffer.writeStencilMaskSeparate(face, mask);
-        commandCount++;
-    }
+    // === Lifecycle ===

-    public void recordCallList(int listId) {
-        buffer.writeCallList(listId);
-        commandCount++;
+    public int size() {
+        return (int) (writePointer - basePointer);
    }

-    public void recordDrawBuffer(int mode) {
-        buffer.writeDrawBuffer(mode);
-        commandCount++;
+    public void delete() {
+        for (IndexedDrawCapture c : indexedDraws.getCaptures()) {
+            c.freeBuffers();
+        }
+        memFree(buffer);
    }

-    public void recordDrawBuffers(int count, int buf) {
-        buffer.writeDrawBuffers(count, buf);
-        commandCount++;
+    /**
+     * Deletes every allocated object & returns a ByteBuffer with the capacity equal to its limit.
+     * This CommandRecorder object cannot be used after calling this anymore.
+     */
+    public ByteBuffer finish() {
+        for (IndexedDrawCapture c : indexedDraws.getCaptures()) {
+            c.freeBuffers();
+        }
+        final int size = size();
+        buffer.limit(size);
+        return memRealloc(buffer, size);
    }

-    public void recordDrawBuffers(int count, IntBuffer bufs) {
-        buffer.writeDrawBuffers(count, bufs);
-        commandCount++;
+    public DisplayListCommand[] getComplexObjects() {
+        return complexObjects.toArray(new DisplayListCommand[complexObjects.size()]);
    }

-    public void recordBindVBO(int vbo) {
-        buffer.writeBindVBO(vbo);
-        commandCount++;
+    public DisplayListCommand getComplexObject(int index) {
+        return complexObjects.get(index);
    }

-    public void recordBindVAO(int vao) {
-        buffer.writeBindVAO(vao);
-        commandCount++;
+    public boolean isEmpty() {
+        return size() == 0;
    }

-    public void recordComplexCommand(DisplayListCommand cmd) {
-        buffer.writeComplexRef(cmd);
-        commandCount++;
+    /**
+     * Clear the buffer for reuse. Does NOT free memory.
+     */
+    public void clear() {
+        writePointer = basePointer;
+        complexObjects.clear();
    }
 }
@@ -32,11 +32,11 @@ public final class CompiledDisplayList {
    public static final CompiledDisplayList EMPTY = new CompiledDisplayList(null, null, null, Collections.emptyList());

    private final ByteBuffer commandBuffer;     // Off-heap command storage, must be freed
-    private final Object[] complexObjects;      // Complex commands (TexImage2D, etc.)
+    private final DisplayListCommand[] complexObjects;      // Complex commands (TexImage2D, etc.)
    private final DisplayListVBO ownedVbos;     // GPU resources referenced by index
    private final List<IndexedDrawBatch> indexedBatches; // Shared VAO/VBO/EBO triples per layout group

-    public CompiledDisplayList(ByteBuffer commandBuffer, Object[] complexObjects, DisplayListVBO ownedVbos, List<IndexedDrawBatch> indexedBatches) {
+    public CompiledDisplayList(ByteBuffer commandBuffer, DisplayListCommand[] complexObjects, DisplayListVBO ownedVbos, List<IndexedDrawBatch> indexedBatches) {
        this.commandBuffer = commandBuffer;
        this.complexObjects = complexObjects;
        this.ownedVbos = ownedVbos;
@@ -47,8 +47,12 @@ public final class CompiledDisplayList {
     * Render this display list by executing all commands.
     */
    public void render() {
+        render(-1);
+    }
+
+    public void render(int list) {
        if (commandBuffer != null && commandBuffer.limit() > 0) {
-            CommandBufferExecutor.execute(commandBuffer, complexObjects, ownedVbos);
+            CommandBufferExecutor.execute(commandBuffer, complexObjects, ownedVbos, list, this);
        }
    }

@@ -57,10 +61,8 @@ public final class CompiledDisplayList {
     */
    public void delete() {
        if (complexObjects != null) {
-            for (Object obj : complexObjects) {
-                if (obj instanceof DisplayListCommand cmd) {
-                    cmd.delete();
-                }
+            for (DisplayListCommand cmd : complexObjects) {
+                cmd.delete();
            }
        }

@@ -92,7 +94,7 @@ public final class CompiledDisplayList {
    /**
     * Get complex objects for inlining into another display list (nested lists).
     */
-    public Object[] getComplexObjects() {
+    public DisplayListCommand[] getComplexObjects() {
        return complexObjects;
    }

@@ -144,8 +146,20 @@ public final class CompiledDisplayList {
        return opcodes;
    }

+    public String getCompiledDisplayListString(int listId, StackTraceElement[] stackTrace) {
+        return DisplayListManager.getCompiledDisplayListString(listId, this, stackTrace);
+    }
+
+    public String toString(int listId, StackTraceElement[] stackTrace) {
+        return getCompiledDisplayListString(listId, stackTrace);
+    }
+
+    public String toString(int listId) {
+        return toString(listId, null);
+    }
+
    @Override
    public String toString() {
-        return DisplayListManager.getCompiledDisplayListString(0, this, null);
+        return toString(0);
    }
 }
@@ -23,6 +23,10 @@ public final class DisplayListVBO {
        return vbos;
    }

+    public SubVBO getVBO(int index) {
+        return vbos[index];
+    }
+
    public void render(int index) {
        vbos[index].render();
    }
@@ -41,6 +45,18 @@ public final class DisplayListVBO {
            this.count = count;
        }

+        public int getStart() {
+            return start;
+        }
+
+        public int getCount() {
+            return count;
+        }
+
+        public int getDrawMode() {
+            return drawMode;
+        }
+
        public void delete() {
            vao.delete();
        }
@@ -68,7 +68,7 @@ public final class DisplayListVBOBuilder {
                    allBuffers.addAll(drawBuffers);
                    int size = 0;
                    for (ByteBuffer buffer : drawBuffers) {
-                        size += buffer.remaining();
+                        size += buffer.limit();
                    }
                    vertexCount = format.getVertexCount(size);
                }
@@ -74,10 +74,7 @@ public final class GLCommand {

    // === Double commands ===
    public static final int TRANSLATE = 70;          // [cmd:4][mode:4][x:8d][y:8d][z:8d] = 32 bytes
-    public static final int ROTATE = 71;             // [cmd:4][mode:4][angle:8d][x:8d][y:8d][z:8d] = 40 bytes
    public static final int SCALE = 72;              // [cmd:4][mode:4][x:8d][y:8d][z:8d] = 32 bytes
-    public static final int ORTHO = 73;              // [cmd:4][left:8d][right:8d][bottom:8d][top:8d][zNear:8d][zFar:8d] = 52 bytes
-    public static final int FRUSTUM = 74;            // [cmd:4][left:8d][right:8d][bottom:8d][top:8d][zNear:8d][zFar:8d] = 52 bytes
    public static final int CLEAR_DEPTH = 75;        // [cmd:4][depth:8d] = 12 bytes

    // === Matrix commands (72 bytes) ===
@@ -167,10 +164,7 @@ public final class GLCommand {
            case MATERIALF -> "MATERIALF";
            case TEX_PARAMETERF -> "TEX_PARAMETERF";
            case TRANSLATE -> "TRANSLATE";
-            case ROTATE -> "ROTATE";
            case SCALE -> "SCALE";
-            case ORTHO -> "ORTHO";
-            case FRUSTUM -> "FRUSTUM";
            case CLEAR_DEPTH -> "CLEAR_DEPTH";
            case MULT_MATRIX -> "MULT_MATRIX";
            case LOAD_MATRIX -> "LOAD_MATRIX";
@@ -235,10 +229,8 @@ public final class GLCommand {
            case GLCommand.DRAW_BUFFERS -> 40;

            // Double commands
-            case GLCommand.TRANSLATE, GLCommand.SCALE -> 28;  // cmd + 3 doubles
+            case GLCommand.TRANSLATE, GLCommand.SCALE -> 16;  // cmd + 3 floats
            case GLCommand.CLEAR_DEPTH -> 12;  // cmd + 1 double
-            case GLCommand.ROTATE -> 36;  // cmd + 4 doubles
-            case GLCommand.ORTHO, GLCommand.FRUSTUM -> 52;  // cmd + 6 doubles

            // Matrix commands
            case GLCommand.MULT_MATRIX, GLCommand.LOAD_MATRIX -> 68;  // cmd + 16 floats
@@ -1,5 +1,6 @@
 package com.gtnewhorizons.angelica.glsm.recording;

+import com.gtnewhorizon.gtnhlib.client.renderer.CallbackTessellator;
 import com.gtnewhorizon.gtnhlib.client.renderer.DirectTessellator;
 import com.gtnewhorizon.gtnhlib.client.renderer.TessellatorManager;
 import com.gtnewhorizon.gtnhlib.client.renderer.vertex.VertexFormatElement.Usage;
@@ -15,7 +16,7 @@ import java.util.Arrays;
 * Used both during display list compilation and for live immediate mode emulation in core profile.
 */
 public final class ImmediateModeRecorder {
-    private static final DirectTessellator tessellator = new DirectTessellator(TessellatorManager.DEFAULT_BUFFER_SIZE);
+    private static final CallbackTessellator tessellator = new CallbackTessellator(TessellatorManager.DEFAULT_BUFFER_SIZE);

    /** Separate tessellator for the splash thread. Nulled after splash completes. */
    private static DirectTessellator splashTessellator;
@@ -29,6 +30,7 @@ public final class ImmediateModeRecorder {
    }

    public static void destroySplashTessellator() {
+        splashTessellator.delete();
        splashTessellator = null;
    }

@@ -5,10 +5,10 @@ import com.gtnewhorizon.gtnhlib.client.renderer.vertex.DefaultVertexFormat;
 import com.gtnewhorizon.gtnhlib.client.renderer.vertex.VertexFlags;
 import com.gtnewhorizon.gtnhlib.client.renderer.vertex.VertexFormat;
 import com.gtnewhorizons.angelica.glsm.GLStateManager;
-import com.gtnewhorizons.angelica.glsm.ITessellatorData;
 import com.gtnewhorizons.angelica.glsm.QuadConverter;
 import com.gtnewhorizons.angelica.glsm.RenderSystem;
 import com.gtnewhorizons.angelica.glsm.ffp.ShaderManager;
+import net.minecraft.client.renderer.Tessellator;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.lwjgl.opengl.GL11;
@@ -69,42 +69,42 @@ public class TessellatorStreamingDrawer {
    /**
     * Draw the vanilla Tessellator's data using streaming VBO+VAO instead of FFP client arrays.
     */
-    public static int draw(ITessellatorData tess) {
-        if (!tess.isDrawing()) {
+    public static int draw(Tessellator tess) {
+        if (!tess.isDrawing) {
            throw new IllegalStateException("Not tesselating!");
        }

-        tess.setDrawing(false);
+        tess.isDrawing = false;

-        final int vertexCount = tess.getVertexCount();
+        final int vertexCount = tess.vertexCount;
        if (vertexCount == 0) {
-            final int result = tess.getRawBufferIndex() * 4;
-            tess.angelica$reset();
+            final int result = tess.rawBufferIndex * 4;
+            tess.reset();
            return result;
        }

        // Determine the optimal vertex format from the tessellator's flags
-        final int flags = VertexFlags.convertToFlags(tess.hasTexture(), tess.hasColor(), tess.hasNormals(), tess.hasBrightness());
+        final int flags = VertexFlags.convertToFlags(tess.hasTexture, tess.hasColor, tess.hasNormals, tess.hasBrightness);
        final VertexFormat format = DefaultVertexFormat.ALL_FORMATS[flags];
        final int vertexSize = format.getVertexSize();

        final int requiredBytes = vertexCount * vertexSize;
        ensureRepackCapacity(requiredBytes);

-        final long writePtr = format.writeToBuffer0(repackAddress, tess.getRawBuffer(), tess.getRawBufferIndex());
+        final long writePtr = format.writeToBuffer0(repackAddress, tess.rawBuffer, tess.rawBufferIndex);
        repackBuffer.position(0);
        repackBuffer.limit((int)(writePtr - repackAddress));

-        uploadAndDraw(repackBuffer, flags, format, vertexSize, tess.getDrawMode(), vertexCount);
+        uploadAndDraw(repackBuffer, flags, format, vertexSize, tess.drawMode, vertexCount);

        // Shrink rawBuffer if oversized
-        if (tess.getRawBufferSize() > 0x20000 && tess.getRawBufferIndex() < (tess.getRawBufferSize() << 3)) {
-            tess.setRawBufferSize(0x10000);
-            tess.setRawBuffer(new int[tess.getRawBufferSize()]);
+        if (tess.rawBufferSize > 0x20000 && tess.rawBufferIndex < (tess.rawBufferSize << 3)) {
+            tess.rawBufferSize = 0x10000;
+            tess.rawBuffer = new int[tess.rawBufferSize];
        }

-        final int result = tess.getRawBufferIndex() * 4;
-        tess.angelica$reset();
+        final int result = tess.rawBufferIndex * 4;
+        tess.reset();
        return result;
    }

@@ -9,6 +9,7 @@ public class TextureInfo {

    @Getter protected final int id;
    protected int internalFormat = -1;
+    protected int resolvedInternalFormat = -1;
    protected int width = -1;
    protected int height = -1;

@@ -34,6 +35,17 @@ public class TextureInfo {
        return internalFormat;
    }

+    public int getResolvedInternalFormat() {
+        if (resolvedInternalFormat == -1) {
+            resolvedInternalFormat = RenderSystem.getTexLevelParameteri(id, 0, GL11.GL_TEXTURE_INTERNAL_FORMAT);
+        }
+        return resolvedInternalFormat;
+    }
+
+    public boolean needsInternalFormatResolve() {
+        return resolvedInternalFormat == -1;
+    }
+
    public int getWidth() {
        if (width == -1) {
            width = RenderSystem.getTexLevelParameteri(id, 0, GL11.GL_TEXTURE_WIDTH);
@@ -5,6 +5,9 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL13;
+import org.lwjgl.opengl.GL21;
+import org.lwjgl.opengl.GL30;

 import java.nio.Buffer;
 import java.util.concurrent.locks.ReentrantLock;
@@ -45,6 +48,7 @@ public class TextureInfoCache {
            final TextureInfo info = getInfo(GLStateManager.getBoundTextureForServerState());
            if (info == null) return;
            info.internalFormat = internalformat;
+            info.resolvedInternalFormat = isGenericCompressedInternalFormat(internalformat) ? -1 : internalformat;
            info.width = width;
            info.height = height;
        }
@@ -55,11 +59,24 @@ public class TextureInfoCache {
            final TextureInfo info = getInfo(GLStateManager.getBoundTextureForServerState());
            if (info == null) return;
            info.internalFormat = internalformat;
+            info.resolvedInternalFormat = isGenericCompressedInternalFormat(internalformat) ? -1 : internalformat;
            info.width = width;
            info.height = height;
        }
    }

+    public static boolean isGenericCompressedInternalFormat(int internalFormat) {
+        return switch (internalFormat) {
+            case GL30.GL_COMPRESSED_RED,
+                 GL30.GL_COMPRESSED_RG,
+                 GL13.GL_COMPRESSED_RGB,
+                 GL13.GL_COMPRESSED_RGBA,
+                 GL21.GL_COMPRESSED_SRGB,
+                 GL21.GL_COMPRESSED_SRGB_ALPHA -> true;
+            default -> false;
+        };
+    }
+
    public void onDeleteTexture(int id) {
        if (id < 0) return;

@@ -107,6 +107,7 @@ class DisplayListCompilationGLSMTest {
        testList = GL11.glGenLists(1);
        GLStateManager.glNewList(testList, GL11.GL_COMPILE_AND_EXECUTE);
        GLStateManager.glTranslatef(10, 0, 0);  // Applied immediately
+        DisplayListManager.flushMatrix();

        FloatBuffer afterTranslate = BufferUtils.createFloatBuffer(16);
        GLStateManager.glGetFloat(GL11.GL_MODELVIEW_MATRIX, afterTranslate);
@@ -216,6 +217,7 @@ class DisplayListCompilationGLSMTest {

        GLStateManager.glTranslatef(10, 0, 0);  // Applied immediately
        GLStateManager.glRotatef(45, 0, 1, 0);  // Applied immediately
+        DisplayListManager.flushMatrix();

        FloatBuffer afterTransforms = BufferUtils.createFloatBuffer(16);
        GLStateManager.glGetFloat(GL11.GL_MODELVIEW_MATRIX, afterTransforms);
@@ -241,6 +243,7 @@ class DisplayListCompilationGLSMTest {

        GLStateManager.glPushMatrix();
        GLStateManager.glTranslatef(10, 0, 0);  // Applied immediately
+        DisplayListManager.flushMatrix();

        FloatBuffer afterTranslate = BufferUtils.createFloatBuffer(16);
        GLStateManager.glGetFloat(GL11.GL_MODELVIEW_MATRIX, afterTranslate);
@@ -94,9 +94,9 @@ class GLSM_DisplayList_Batching_Test {
        // Verify: 3 DrawRangeCmds (one per draw, each with different transform)
        Int2IntMap counts = compiled.getCommandCounts();
        int drawCount = counts.getOrDefault(GLCommand.DRAW_RANGE, 0);
-        int multMatrixCount = counts.getOrDefault(GLCommand.MULT_MATRIX, 0);
-        assertEquals(3, drawCount, "3 draws with different transforms should produce 3 DrawRangeCmds");
-        assertEquals(2, multMatrixCount, "Should have MultMatrix commands for each unique transform");
+        int multMatrixCount = counts.getOrDefault(GLCommand.TRANSLATE, 0);
+        assertEquals(1, drawCount, "3 draws with different transforms should produce 1 DrawRangeCmd (transforms get prebaked)");
+        assertEquals(1, multMatrixCount, "Should have 1 Translate at the end (the transforms in the draws are prebaked)");
    }

    @Test
@@ -140,13 +140,14 @@ class GLSM_DisplayList_Batching_Test {
        // Verify: 3 DrawRangeCmds (different transforms require separate draw commands)
        Int2IntMap counts = compiled.getCommandCounts();
        int drawCount = counts.getOrDefault(GLCommand.DRAW_RANGE, 0);
-        assertEquals(3, drawCount, "Draws with different recorded transforms must produce separate DrawRangeCmds");
+        assertEquals(1, drawCount, "3 Draws with different transforms should get prebaked + merged");
    }

    @Test
    void testDrawsWithSameTransformProduceSingleDrawRangeCmd() {
        CompiledDisplayList compiled = createDisplayList(() -> {
            GLStateManager.glTranslatef(1.0f, 2.0f, 3.0f);
+            GLStateManager.glScalef(2, 1, 3);
            createSimpleDraw();
            createSimpleDraw();
            createSimpleDraw();
@@ -207,7 +208,7 @@ class GLSM_DisplayList_Batching_Test {
        int drawRestoreCount = counts.getOrDefault(GLCommand.DRAW_RANGE_RESTORE, 0);

        // Verify: 2 VBOs (one for format A, one for format B)
-        assertEquals(2, getVBOCount(compiled), "A A B A A pattern should produce 2 VBOs (one per format)");
+        // assertEquals(2, getVBOCount(compiled), "A A B A A pattern should produce 2 VBOs (one per format)");

        // Verify: 2 DrawRangeCmds (all A's merged into 1, B is 1)
        // With format-based batching, all A draws go into the same FormatBuffer
@@ -61,7 +61,6 @@ class GLSM_DisplayList_TransformCollapsing_Test {
        Int2IntMap counts = compiled.getCommandCounts();
        int multMatrixCount = counts.getOrDefault(GLCommand.MULT_MATRIX, 0);
        int individualTransformCount = counts.getOrDefault(GLCommand.TRANSLATE, 0)
-            + counts.getOrDefault(GLCommand.ROTATE, 0)
            + counts.getOrDefault(GLCommand.SCALE, 0);

        assertEquals(1, multMatrixCount,
@@ -420,7 +419,7 @@ class GLSM_DisplayList_TransformCollapsing_Test {
        // Count MultMatrix commands before first PushMatrix
        int multMatrixBeforePushCount = 0;
        for (int i = 0; i < opcodes.size() && i < pushIndex; i++) {
-            if (opcodes.get(i) == GLCommand.MULT_MATRIX) {
+            if (opcodes.get(i) == GLCommand.TRANSLATE) {
                multMatrixBeforePushCount++;
            }
        }
@@ -666,13 +665,11 @@ class GLSM_DisplayList_TransformCollapsing_Test {
        assertNotNull(compiled);

        IntList opcodes = compiled.getCommandOpcodes();
-        int pushIndex = opcodes.indexOf(GLCommand.PUSH_MATRIX);
        int popIndex = opcodes.indexOf(GLCommand.POP_MATRIX);
-        int multMatrixIndex = opcodes.indexOf(GLCommand.MULT_MATRIX);
+        int scaleIndex = opcodes.indexOf(GLCommand.SCALE);
        int drawRangeIndex = opcodes.indexOf(GLCommand.DRAW_RANGE);

-        assertTrue(pushIndex < multMatrixIndex, "Push before MultMatrix");
-        assertTrue(multMatrixIndex < drawRangeIndex, "MultMatrix before DrawRange");
+        assertTrue(scaleIndex == -1, "Scale gets prebaked");
        assertTrue(drawRangeIndex < popIndex, "DrawRange before Pop");
    }

@@ -800,6 +797,7 @@ class GLSM_DisplayList_TransformCollapsing_Test {
            GLStateManager.glNewList(testList, mode);

            GLStateManager.glScalef(0.5f, 0.5f, 1.0f);
+            GLStateManager.glTranslatef(2, 2, 2);
            // Barrier commands between scale and draw
            GLStateManager.glDepthMask(true);
            GLStateManager.disableLighting();
@@ -824,8 +822,8 @@ class GLSM_DisplayList_TransformCollapsing_Test {
            assertEquals(1, counts.getOrDefault(GLCommand.DRAW_RANGE, 0), "1 DrawRange for mode " + mode);

            IntList opcodes = compiled.getCommandOpcodes();
-            assertTrue(opcodes.indexOf(GLCommand.MULT_MATRIX) < opcodes.indexOf(GLCommand.DRAW_RANGE),
-                "MultMatrix before DrawRange for mode " + mode);
+            assertTrue(opcodes.indexOf(GLCommand.MULT_MATRIX) > opcodes.indexOf(GLCommand.DRAW_RANGE),
+                "MultMatrix after DrawRange for mode " + mode);

            GLStateManager.glPushMatrix();
            GLStateManager.glLoadIdentity();
@@ -874,10 +872,10 @@ class GLSM_DisplayList_TransformCollapsing_Test {
        Int2IntMap counts = compiled.getCommandCounts();
        IntList opcodes = compiled.getCommandOpcodes();

-        // Should have exactly 2 MULT_MATRIX (T1 before push, T2 after push)
-        // Bug would produce 3 (T1, T2, spurious T1^-1)
-        assertEquals(2, counts.getOrDefault(GLCommand.MULT_MATRIX, 0),
-            "2 MULT_MATRIX expected (T1 before push, T2 after push)");
+        // Should have exactly 1 MULT_MATRIX (T1 before push, T2 after push is already prebaked, will get discarded.)
+        // No prebaking would produce 2 (last one wouldn't get discarded)
+        assertEquals(1, counts.getOrDefault(GLCommand.MULT_MATRIX, 0),
+            "1 MULT_MATRIX expected (T1 before push, T2 after push is already prebaked, will get discarded.)");

        // Verify ordering
        int firstMultMatrix = opcodes.indexOf(GLCommand.MULT_MATRIX);
@@ -6,6 +6,10 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.lwjgl.BufferUtils;
 import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL13;
+import org.lwjgl.opengl.GL21;
+import org.lwjgl.opengl.GL30;
+import org.lwjgl.opengl.EXTTextureCompressionS3TC;

 import java.lang.reflect.Field;
 import java.nio.ByteBuffer;
@@ -15,6 +19,98 @@ import static org.junit.jupiter.api.Assertions.*;
@ExtendWith(GLSMExtension.class)
 public class GLSM_TextureInfoCache_UnitTest {

+    @Test
+    void testGenericCompressedUploadResolvesToSpecificFormat() {
+        int texId = GL11.glGenTextures();
+        try {
+            GL11.glBindTexture(GL11.GL_TEXTURE_2D, texId);
+            ByteBuffer pixels = BufferUtils.createByteBuffer(64 * 64 * 4);
+            GL11.glTexImage2D(GL11.GL_TEXTURE_2D, 0, GL13.GL_COMPRESSED_RGBA, 64, 64, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, pixels);
+
+            int format = GL11.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, 0, GL11.GL_TEXTURE_INTERNAL_FORMAT);
+            assertNotEquals(-1, format);
+            assertNotEquals(GL30.GL_COMPRESSED_RED, format);
+            assertNotEquals(GL30.GL_COMPRESSED_RG, format);
+            assertNotEquals(GL13.GL_COMPRESSED_RGB, format);
+            assertNotEquals(GL13.GL_COMPRESSED_RGBA, format);
+            assertNotEquals(GL21.GL_COMPRESSED_SRGB, format);
+            assertNotEquals(GL21.GL_COMPRESSED_SRGB_ALPHA, format);
+        } finally {
+            GL11.glDeleteTextures(texId);
+            GL11.glBindTexture(GL11.GL_TEXTURE_2D, 0);
+        }
+    }
+
+    @Test
+    void testNonGenericUploadCachesWithoutRoundtrip() {
+        int texId = GL11.glGenTextures();
+        try {
+            GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, texId);
+            ByteBuffer pixels = BufferUtils.createByteBuffer(64 * 64 * 4);
+            GLStateManager.glTexImage2D(GL11.GL_TEXTURE_2D, 0, GL11.GL_RGBA8, 64, 64, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, pixels);
+
+            TextureInfo info = TextureInfoCache.INSTANCE.getInfo(texId);
+            assertFalse(info.needsInternalFormatResolve());
+            assertEquals(GL11.GL_RGBA8, info.getResolvedInternalFormat());
+            assertEquals(GL11.GL_RGBA8, GL11.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, 0, GL11.GL_TEXTURE_INTERNAL_FORMAT));
+        } finally {
+            GL11.glDeleteTextures(texId);
+            GL11.glBindTexture(GL11.GL_TEXTURE_2D, 0);
+        }
+    }
+
+    @Test
+    void testGenericCompressedPreservesAsPassedInternalFormat() {
+        int texId = GL11.glGenTextures();
+        try {
+            GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, texId);
+            ByteBuffer pixels = BufferUtils.createByteBuffer(64 * 64 * 4);
+            GLStateManager.glTexImage2D(GL11.GL_TEXTURE_2D, 0, GL13.GL_COMPRESSED_RGBA, 64, 64, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, pixels);
+
+            TextureInfo info = TextureInfoCache.INSTANCE.getInfo(texId);
+            assertEquals(GL13.GL_COMPRESSED_RGBA, info.getInternalFormat());
+            assertTrue(info.needsInternalFormatResolve());
+        } finally {
+            GL11.glDeleteTextures(texId);
+            GL11.glBindTexture(GL11.GL_TEXTURE_2D, 0);
+        }
+    }
+
+    @Test
+    void testRepeatedQueryAfterResolveUsesCache() {
+        int texId = GL11.glGenTextures();
+        try {
+            GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, texId);
+            ByteBuffer pixels = BufferUtils.createByteBuffer(64 * 64 * 4);
+            GLStateManager.glTexImage2D(GL11.GL_TEXTURE_2D, 0, GL13.GL_COMPRESSED_RGBA, 64, 64, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, pixels);
+
+            TextureInfo info = TextureInfoCache.INSTANCE.getInfo(texId);
+            assertTrue(info.needsInternalFormatResolve());
+            int first = GLStateManager.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, 0, GL11.GL_TEXTURE_INTERNAL_FORMAT);
+            assertFalse(info.needsInternalFormatResolve());
+            int second = GLStateManager.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, 0, GL11.GL_TEXTURE_INTERNAL_FORMAT);
+            assertEquals(first, second);
+        } finally {
+            GL11.glDeleteTextures(texId);
+            GL11.glBindTexture(GL11.GL_TEXTURE_2D, 0);
+        }
+    }
+
+    @Test
+    void testIsGenericCompressedInternalFormatHelper() {
+        assertTrue(TextureInfoCache.isGenericCompressedInternalFormat(GL30.GL_COMPRESSED_RED));
+        assertTrue(TextureInfoCache.isGenericCompressedInternalFormat(GL30.GL_COMPRESSED_RG));
+        assertTrue(TextureInfoCache.isGenericCompressedInternalFormat(GL13.GL_COMPRESSED_RGB));
+        assertTrue(TextureInfoCache.isGenericCompressedInternalFormat(GL13.GL_COMPRESSED_RGBA));
+        assertTrue(TextureInfoCache.isGenericCompressedInternalFormat(GL21.GL_COMPRESSED_SRGB));
+        assertTrue(TextureInfoCache.isGenericCompressedInternalFormat(GL21.GL_COMPRESSED_SRGB_ALPHA));
+        assertFalse(TextureInfoCache.isGenericCompressedInternalFormat(GL11.GL_RGBA));
+        assertFalse(TextureInfoCache.isGenericCompressedInternalFormat(GL11.GL_RGBA8));
+        assertFalse(TextureInfoCache.isGenericCompressedInternalFormat(EXTTextureCompressionS3TC.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT));
+        assertFalse(TextureInfoCache.isGenericCompressedInternalFormat(0));
+        assertFalse(TextureInfoCache.isGenericCompressedInternalFormat(-1));
+    }
+
    /**
     * Texture deletion is server-side; cache must be invalidated regardless of client caching state.
     */
@@ -21,6 +21,8 @@ class SharedDrawableVaoTest {
    private static final String VERT_330 = "#version 330 core\nvoid main() { gl_Position = vec4(0.0); }\n";
    private static final String FRAG_330 = "#version 330 core\nout vec4 o;\nvoid main() { o = vec4(0.0); }\n";

+    private static boolean ownsDisplay = false;
+
    @BeforeAll
    static void createContext() throws LWJGLException {
        assumeTrue(!Display.isCreated(), "inherited Display -- skipping to avoid profile drift");
@@ -31,11 +33,13 @@ class SharedDrawableVaoTest {
            new PixelFormat().withDepthBits(24).withStencilBits(8),
            new ContextAttribs(4, 1).withProfileCore(true).withForwardCompatible(true));
        GL30.glBindVertexArray(GL30.glGenVertexArrays());
+        ownsDisplay = true;
    }

    @AfterAll
    static void destroyContext() {
-        if (Display.isCreated()) Display.destroy();
+        if (ownsDisplay && Display.isCreated()) Display.destroy();
+        ownsDisplay = false;
    }

    @Test
@@ -128,7 +128,7 @@ class FFPCombineShaderTest {
        setupXaeroState();

        FragmentKey fk = FragmentKey.fromState();
-        VertexKey vk = VertexKey.fromState(true, false, true, false);
+        VertexKey vk = VertexKey.fromState(true, false, true, false, fk.enabledUnitMask());

        String fragSource = FragmentShaderGenerator.generate(fk);
        String vertSource = VertexShaderGenerator.generate(vk);
@@ -207,7 +207,7 @@ class IndexedDrawReplayTest extends DisplayListTestFixture {
            new AttribLayoutKey(new int[]{0}, new int[]{2}, new int[]{GL11.GL_FLOAT}, new boolean[]{false}),
            GL11.GL_TRIANGLES, 4, 6, vtx, idx, new BatchedIndexedDrawCmd());

-        rec.recordIndexedDrawCapture(cap);
+        rec.writeIndexedDrawCapture(cap);
        assertFalse(cap.isFreed());

        rec.free();
@@ -74,6 +74,7 @@ dependencies {
    // LWJGL3
    implementation("org.lwjgl:lwjgl:${lwjglVersion}")
    implementation("org.lwjgl:lwjgl-opengl:${lwjglVersion}")
+    compileOnly("org.lwjgl:lwjgl-sdl:${lwjglVersion}")
    runtimeOnly("org.lwjgl:lwjgl:$lwjglVersion:$lwjglNatives")
    runtimeOnly("org.lwjgl:lwjgl-opengl:$lwjglVersion:$lwjglNatives")

@@ -0,0 +1,40 @@
+package com.gtnewhorizons.angelica.lwjgl3;
+
+import static org.lwjgl.sdl.SDLMessageBox.SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT;
+import static org.lwjgl.sdl.SDLMessageBox.SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT;
+import static org.lwjgl.sdl.SDLMessageBox.SDL_MESSAGEBOX_ERROR;
+import static org.lwjgl.sdl.SDLMessageBox.SDL_ShowMessageBox;
+
+import me.eigenraven.lwjgl3ify.api.Lwjgl3Aware;
+import me.eigenraven.lwjgl3ify.client.MainThreadExec;
+import org.lwjgl.sdl.SDL_MessageBoxButtonData;
+import org.lwjgl.sdl.SDL_MessageBoxData;
+import org.lwjgl.system.MemoryStack;
+
+@Lwjgl3Aware
+public final class MissingDependencySdl {
+
+    private MissingDependencySdl() {}
+
+    public static void showFatal(String title, String message) {
+        MainThreadExec.runOnMainThread(() -> showFatalOnMainThread(title, message));
+    }
+
+    private static void showFatalOnMainThread(String title, String message) {
+        try (MemoryStack stack = MemoryStack.stackPush()) {
+            final SDL_MessageBoxData box = SDL_MessageBoxData.calloc(stack);
+            box.flags(SDL_MESSAGEBOX_ERROR);
+            box.title(stack.UTF8(title));
+            box.message(stack.UTF8(message));
+
+            final SDL_MessageBoxButtonData.Buffer buttons = SDL_MessageBoxButtonData.calloc(1, stack);
+            buttons.get(0).set(
+                SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT | SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT,
+                0,
+                stack.UTF8("OK"));
+            box.buttons(buttons);
+
+            SDL_ShowMessageBox(box, null);
+        }
+    }
+}
@@ -1,8 +1,10 @@
 package com.gtnewhorizons.angelica.api;

+import net.minecraft.item.ItemStack;
+
 /**
 * To be used for modded items that don't have blocks. Baubles for example.
 */
 public interface IDynamicLightProducer {
-    int getLuminance();
+    int getLuminance(ItemStack stack);
 }
@@ -4,7 +4,14 @@ import com.google.common.collect.ImmutableSet;
 import com.gtnewhorizon.gtnhlib.bytebuf.MemoryStack;
 import com.gtnewhorizon.gtnhlib.client.renderer.vao.IndexBuffer;
 import com.gtnewhorizon.gtnhlib.util.font.GlyphReplacements;
+import static com.gtnewhorizons.angelica.client.font.ColorCodeUtils.FORMATTING_CHAR;
+import static com.gtnewhorizons.angelica.client.font.ColorCodeUtils.GRADIENT_PAYLOAD;
+import static com.gtnewhorizons.angelica.client.font.ColorCodeUtils.SECTION_X_LENGTH;
+import static com.gtnewhorizons.angelica.client.font.ColorCodeUtils.SECTION_X_PAYLOAD;
+
+import com.gtnewhorizons.angelica.config.AngelicaConfig;
 import com.gtnewhorizons.angelica.config.FontConfig;
+import com.gtnewhorizons.angelica.hudcaching.HUDCaching;
 import com.gtnewhorizons.angelica.glsm.GLStateManager;
 import com.gtnewhorizons.angelica.glsm.streaming.StreamingUploader;
 import com.gtnewhorizons.angelica.mixins.interfaces.FontRendererAccessor;
@@ -213,12 +220,14 @@ public class BatchingFontRenderer {
        pushQuadIdx();
    }

-    private void pushTexRect(float x, float y, float w, float h, float itOff, int rgba, float uStart, float vStart, float uSz, float vSz) {
+    private void pushTexRect(float x, float y, float w, float h, float itOff, int rgba, float uStart, float vStart, float uSz, float vSz, boolean flipV) {
        ensureCapacity();
-        pushVtx(x + itOff, y, rgba, uStart, vStart, uStart, uStart + uSz, vStart, vStart + vSz);
-        pushVtx(x - itOff, y + h, rgba, uStart, vStart + vSz, uStart, uStart + uSz, vStart, vStart + vSz);
-        pushVtx(x + itOff + w, y, rgba, uStart + uSz, vStart, uStart, uStart + uSz, vStart, vStart + vSz);
-        pushVtx(x - itOff + w, y + h, rgba, uStart + uSz, vStart + vSz, uStart, uStart + uSz, vStart, vStart + vSz);
+        float vTop = flipV ? vStart + vSz : vStart;
+        float vBot = flipV ? vStart : vStart + vSz;
+        pushVtx(x + itOff, y, rgba, uStart, vTop, uStart, uStart + uSz, vStart, vStart + vSz);
+        pushVtx(x - itOff, y + h, rgba, uStart, vBot, uStart, uStart + uSz, vStart, vStart + vSz);
+        pushVtx(x + itOff + w, y, rgba, uStart + uSz, vTop, uStart, uStart + uSz, vStart, vStart + vSz);
+        pushVtx(x - itOff + w, y + h, rgba, uStart + uSz, vBot, uStart, uStart + uSz, vStart, vStart + vSz);
        pushQuadIdx();
    }

@@ -442,6 +451,55 @@ public class BatchingFontRenderer {
        return (what >= fromInclusive) && (what <= toInclusive);
    }

+    /**
+     * Count visible characters from {@code start} to {@code end}, skipping format codes.
+     * Stops at §r, any color code (§0-f, §x), or any color effect (§q, §g).
+     * Style codes (§k-o) and non-terminating effects (§z wave, §v dinnerbone) are skipped.
+     */
+    private static int countVisibleChars(CharSequence str, int start, int end) {
+        int count = 0;
+        for (int i = start; i < end; i++) {
+            char ch = str.charAt(i);
+            if (ch == FORMATTING_CHAR && i + 1 < end) {
+                char code = Character.toLowerCase(str.charAt(i + 1));
+                if (code == 'r' || (code >= '0' && code <= '9') || (code >= 'a' && code <= 'f')
+                    || code == 'x' || code == 'q' || code == 'g') {
+                    break;
+                }
+                i++;
+            } else {
+                count++;
+            }
+        }
+        return Math.max(count, 1);
+    }
+
+    private static int hsvToRgb(float hue, float sat, float val) {
+        int h = (int)(hue / 60f) % 6;
+        float f = hue / 60f - h;
+        float p = val * (1 - sat);
+        float q = val * (1 - f * sat);
+        float t = val * (1 - (1 - f) * sat);
+        float r, g, b;
+        switch (h) {
+            case 0: r=val; g=t; b=p; break;
+            case 1: r=q; g=val; b=p; break;
+            case 2: r=p; g=val; b=t; break;
+            case 3: r=p; g=q; b=val; break;
+            case 4: r=t; g=p; b=val; break;
+            default: r=val; g=p; b=q; break;
+        }
+        return ((int)(r*255) << 16) | ((int)(g*255) << 8) | (int)(b*255);
+    }
+
+    private static final int RAINBOW_LUT_SIZE = 24;
+    private static final int[] RAINBOW_LUT = new int[RAINBOW_LUT_SIZE];
+    static {
+        for (int i = 0; i < RAINBOW_LUT_SIZE; i++) {
+            RAINBOW_LUT[i] = hsvToRgb(i * 15f, 1f, 1f);
+        }
+    }
+
    public boolean forceDefaults() {
        return this.bookMode || this.isSGA || this.isSplash;
    }
@@ -466,7 +524,8 @@ public class BatchingFontRenderer {
        return forceDefaults() ? 1 : FontConfig.fontShadowOffset;
    }

-    private static final char FORMATTING_CHAR = 167; // §
+    private static final double WAVE_TIME_SCALE = 5e-9;
+    private static final float WAVE_FREQUENCY = 0.5f;

    public float drawString(final float anchorX, final float anchorY, final int color, final boolean enableShadow,
        final boolean unicodeFlag, final CharSequence string, int stringOffset, int stringLength) {
@@ -497,6 +556,18 @@ public class BatchingFontRenderer {
            boolean curBold = false;
            boolean curStrikethrough = false;
            boolean curUnderline = false;
+            boolean curRainbow = false;
+            boolean curWave = false;
+            boolean curDinnerbone = false;
+            boolean curGradient = false;
+            boolean curShadow = false;
+            boolean curShadowCustomColor = false;
+            int curShadowColorOverride = 0;
+            int gradientStartRgb = 0, gradientEndRgb = 0;
+            int gradientCharIndex = 0, gradientTotalChars = 0;
+            float gradientStep = 0f;
+            int rainbowCharIndex = 0;
+            int visibleCharIndex = 0;

            float glyphScaleY = getGlyphScaleY();
            float glyphScaleX = getGlyphScaleX();
@@ -534,6 +605,16 @@ public class BatchingFontRenderer {
                        strikethroughStartX = strikethroughEndX;
                    }

+                    if (fmtCode == 'x' && AngelicaConfig.enableRGBColors && charIdx + SECTION_X_PAYLOAD < stringEnd) {
+                        int rgb = ColorCodeUtils.parseHexPairs(string, charIdx + 1, 6);
+                        if (rgb != -1) {
+                            curRainbow = false;
+                            curGradient = false;
+                            curColor = (curColor & 0xFF000000) | (rgb & 0x00FFFFFF);
+                            curShadowColor = (curShadowColor & 0xFF000000) | ((rgb & 0xFCFCFC) >> 2);
+                            charIdx += SECTION_X_PAYLOAD;
+                        }
+                    } else {
                    final boolean is09 = charInRange(fmtCode, '0', '9');
                    final boolean isAF = charInRange(fmtCode, 'a', 'f');
                    if (is09 || isAF) {
@@ -542,6 +623,9 @@ public class BatchingFontRenderer {
                        curStrikethrough = false;
                        curUnderline = false;
                        curItalic = false;
+                        curRainbow = false;
+                        curGradient = false;
+                        // wave/dinnerbone NOT reset — they're positional effects, independent of color

                        final int colorIdx = is09 ? (fmtCode - '0') : (fmtCode - 'a' + 10);
                        final int rgb = this.colorCode[colorIdx];
@@ -562,27 +646,68 @@ public class BatchingFontRenderer {
                        underlineEndX = underlineStartX;
                    } else if (fmtCode == 'o') {
                        curItalic = true;
+                    } else if (fmtCode == 'q' && AngelicaConfig.enableRainbow) {
+                        curRainbow = true;
+                        curGradient = false;
+                        rainbowCharIndex = 0;
+                    } else if (fmtCode == 'z' && AngelicaConfig.enableWaveText) {
+                        curWave = !curWave;
+                    } else if (fmtCode == 'v' && AngelicaConfig.enableDinnerboneText) {
+                        curDinnerbone = !curDinnerbone;
+                    } else if (fmtCode == 'u' && AngelicaConfig.enableDropShadow) {
+                        int customRgb = (charIdx + SECTION_X_LENGTH < stringEnd)
+                            ? ColorCodeUtils.parseSectionXAt(string, charIdx + 1)
+                            : -1;
+                        if (customRgb != -1) {
+                            curShadow = true;
+                            curShadowCustomColor = true;
+                            curShadowColorOverride = customRgb;
+                            charIdx += SECTION_X_LENGTH;
+                        } else {
+                            curShadow = !curShadow;
+                            if (!curShadow) curShadowCustomColor = false;
+                        }
+                    } else if (fmtCode == 'g' && AngelicaConfig.enableGradients && charIdx + GRADIENT_PAYLOAD < stringEnd) {
+                        int color1 = ColorCodeUtils.parseSectionXAt(string, charIdx + 1);
+                        int color2 = ColorCodeUtils.parseSectionXAt(string, charIdx + 1 + SECTION_X_LENGTH);
+                        if (color1 != -1 && color2 != -1) {
+                            curGradient = true;
+                            curRainbow = false;
+                            gradientStartRgb = color1;
+                            gradientEndRgb = color2;
+                            gradientCharIndex = 0;
+                            gradientTotalChars = countVisibleChars(string, charIdx + 1 + GRADIENT_PAYLOAD, stringEnd);
+                            gradientStep = gradientTotalChars > 1 ? 1f / (gradientTotalChars - 1) : 0f;
+                            charIdx += GRADIENT_PAYLOAD;
+                        }
                    } else if (fmtCode == 'r') {
                        curRandom = false;
                        curBold = false;
                        curStrikethrough = false;
                        curUnderline = false;
                        curItalic = false;
+                        curRainbow = false;
+                        curWave = false;
+                        curDinnerbone = false;
+                        curGradient = false;
+                        curShadow = false;
+                        curShadowCustomColor = false;
                        curColor = color;
                        curShadowColor = shadowColor;
                    }
+                    } // close else block for non-§x codes

                    continue;
                }

+                if (chr == ColorCodeUtils.ESCAPED_AMPERSAND) { chr = '&'; }
+
                if (FontConfig.enableCustomFont && FontConfig.enableGlyphReplacements) {
-                    String chrReplacement = GlyphReplacements.customGlyphs.get(String.valueOf(chr));
-                    if (chrReplacement != null) {
-                        char replacement = chrReplacement.charAt(0);
-                        boolean isReplacementCharAvailable =
-                            FontProviderCustom.getPrimary().isGlyphAvailable(replacement)
-                                || FontProviderCustom.getFallback().isGlyphAvailable(replacement);
-                        if (isReplacementCharAvailable) {
+                    final char replacement = GlyphReplacements.getReplacementGlyph(chr);
+                    if (replacement != 0) {
+                        if (FontProviderCustom.getPrimary().isGlyphAvailable(replacement)
+                            || FontProviderCustom.getFallback().isGlyphAvailable(replacement)
+                        ) {
                            chr = replacement;
                        }
                    }
@@ -597,12 +722,31 @@ public class BatchingFontRenderer {
                heightNorth = anchorY + (underlying.FONT_HEIGHT - 1.0f) * (0.5f - glyphScaleY * fontProvider.getYScaleMultiplier() / 2);
                float heightSouth = (underlying.FONT_HEIGHT - 1.0f) * glyphScaleY * fontProvider.getYScaleMultiplier();

+                visibleCharIndex++;
+
                // Check ASCII space, NBSP, NNBSP
                if (chr == ' ' || chr == '\u00A0' || chr == '\u202F') {
                    curX += 4 * this.getWhitespaceScale() + (curBold ? 1 : 0);
                    continue;
                }

+                if (curRainbow) {
+                    int rgbEffect = RAINBOW_LUT[rainbowCharIndex % RAINBOW_LUT_SIZE];
+                    curColor = (curColor & 0xFF000000) | rgbEffect;
+                    curShadowColor = (curShadowColor & 0xFF000000) | ((rgbEffect & 0xFCFCFC) >> 2);
+                    rainbowCharIndex++;
+                }
+                if (curGradient && gradientTotalChars > 0) {
+                    float t = Math.min(gradientCharIndex * gradientStep, 1f);
+                    int gr = (int)((gradientStartRgb >> 16 & 0xFF) * (1-t) + (gradientEndRgb >> 16 & 0xFF) * t);
+                    int gg = (int)((gradientStartRgb >> 8 & 0xFF) * (1-t) + (gradientEndRgb >> 8 & 0xFF) * t);
+                    int gb = (int)((gradientStartRgb & 0xFF) * (1-t) + (gradientEndRgb & 0xFF) * t);
+                    int rgbEffect = (gr << 16) | (gg << 8) | gb;
+                    curColor = (curColor & 0xFF000000) | rgbEffect;
+                    curShadowColor = (curShadowColor & 0xFF000000) | ((rgbEffect & 0xFCFCFC) >> 2);
+                    gradientCharIndex++;
+                }
+
                final float uStart = fontProvider.getUStart(chr);
                final float vStart = fontProvider.getVStart(chr);
                final float xAdvance = fontProvider.getXAdvance(chr) * glyphScaleX;
@@ -616,23 +760,34 @@ public class BatchingFontRenderer {
                final ResourceLocation texture = fontProvider.getTexture(chr);
                final int idxId = idxWriterIndex;

-                if (enableShadow) {
+                // Wave: Y offset via sine wave
+                float renderY = heightNorth;
+                if (curWave) {
+                    float time = HUDCaching.renderingCacheOverride ? 0f : (float)((System.nanoTime() & 0xFFFFFFFFFFFFL) * WAVE_TIME_SCALE);
+                    renderY += (float) Math.sin(visibleCharIndex * WAVE_FREQUENCY + time) * AngelicaConfig.waveAmplitude;
+                }
+
+                final boolean drawShadow = enableShadow || curShadow;
+                if (drawShadow) {
+                    final int effectiveShadowColor = curShadowCustomColor
+                        ? ((curColor & 0xFF000000) | (curShadowColorOverride & 0x00FFFFFF))
+                        : curShadowColor;
                    for (int n = 1; n <= shadowCopies; n++) {
                        final float shadowOffsetPart = shadowOffset * ((float) n / shadowCopies);
-                        pushTexRect(curX + shadowOffsetPart, heightNorth + shadowOffsetPart, glyphW - 1.0f, heightSouth, itOff, curShadowColor, uStart, vStart, uSz, vSz);
+                        pushTexRect(curX + shadowOffsetPart, renderY + shadowOffsetPart, glyphW - 1.0f, heightSouth, itOff, effectiveShadowColor, uStart, vStart, uSz, vSz, curDinnerbone);

                        if (curBold) {
-                            pushTexRect(curX + 2.0f * shadowOffsetPart, heightNorth + shadowOffsetPart, glyphW - 1.0f, heightSouth, itOff, curShadowColor, uStart, vStart, uSz, vSz);
+                            pushTexRect(curX + 2.0f * shadowOffsetPart, renderY + shadowOffsetPart, glyphW - 1.0f, heightSouth, itOff, effectiveShadowColor, uStart, vStart, uSz, vSz, curDinnerbone);
                        }
                    }
                }

-                pushTexRect(curX, heightNorth, glyphW - 1.0f, heightSouth, itOff, curColor, uStart, vStart, uSz, vSz);
+                pushTexRect(curX, renderY, glyphW - 1.0f, heightSouth, itOff, curColor, uStart, vStart, uSz, vSz, curDinnerbone);

                if (curBold) {
                    for (int n = 1; n <= boldCopies; n++) {
                        final float shadowOffsetPart = shadowOffset * ((float) n / boldCopies);
-                        pushTexRect(curX + shadowOffsetPart, heightNorth, glyphW - 1.0f, heightSouth, itOff, curColor, uStart, vStart, uSz, vSz);
+                        pushTexRect(curX + shadowOffsetPart, renderY, glyphW - 1.0f, heightSouth, itOff, curColor, uStart, vStart, uSz, vSz, curDinnerbone);
                    }
                }

@@ -644,7 +799,7 @@ public class BatchingFontRenderer {
                    both:           4(1 + 2 * shadowCopies + boldCopies)
                 */
                int charCount = 1;
-                if (enableShadow) { charCount += shadowCopies * (curBold ? 2 : 1); }
+                if (drawShadow) { charCount += shadowCopies * (curBold ? 2 : 1); }
                if (curBold) { charCount += boldCopies; }
                final int vtxCount = 4 * charCount;
                pushDrawCmd(idxId, vtxCount / 2 * 3, texture, chr > 255);
@@ -653,6 +808,19 @@ public class BatchingFontRenderer {
                if (bookMode) { curX = (int) curX; }
                underlineEndX = curX;
                strikethroughEndX = curX;
+
+                if ((curRainbow || curGradient) && curUnderline && underlineStartX != underlineEndX) {
+                    final int ulIdx = idxWriterIndex;
+                    pushUntexRect(underlineStartX, underlineY, underlineEndX - underlineStartX, glyphScaleY, curColor);
+                    pushDrawCmd(ulIdx, 6, null, false);
+                    underlineStartX = underlineEndX;
+                }
+                if ((curRainbow || curGradient) && curStrikethrough && strikethroughStartX != strikethroughEndX) {
+                    final int stIdx = idxWriterIndex;
+                    pushUntexRect(strikethroughStartX, strikethroughY, strikethroughEndX - strikethroughStartX, glyphScaleY, curColor);
+                    pushDrawCmd(stIdx, 6, null, false);
+                    strikethroughStartX = strikethroughEndX;
+                }
            }

            if (curUnderline && underlineStartX != underlineEndX) {
@@ -678,6 +846,7 @@ public class BatchingFontRenderer {
    }

    public float getCharWidthFine(char chr) {
+        if (chr == ColorCodeUtils.ESCAPED_AMPERSAND) { chr = '&'; }
        if (chr == FORMATTING_CHAR) { return -1; }

        if (chr == ' ' || chr == '\u00A0' || chr == '\u202F') {
@@ -0,0 +1,153 @@
+package com.gtnewhorizons.angelica.client.font;
+
+import com.gtnewhorizons.angelica.config.AngelicaConfig;
+
+/**
+ * Utility for converting {@code &}-based shorthand into {@code §}-based
+ * format codes understood by the batched font renderer.
+ * <p>
+ * {@code &#RRGGBB} -> {@code §x§R§R§G§G§B§B} (RGB color)<br>
+ * {@code &g&#RRGGBB&#RRGGBB} -> {@code §g§x§R§R§G§G§B§B§x§R§R§G§G§B§B} (gradient)<br>
+ * {@code &c}, {@code &l}, {@code &r}, {@code &q}, etc. -> {@code §c}, {@code §l}, {@code §r}, {@code §q}
+ * <p>
+ * Effect codes use low-collision letters to avoid false positives on natural text:
+ * rainbow = {@code &q}, wave = {@code &z}, dinnerbone = {@code &v}, gradient = {@code &g} (only with &#-prefixed colors).
+ */
+public final class ColorCodeUtils {
+
+    private ColorCodeUtils() {}
+
+    public static final char FORMATTING_CHAR = '§';
+    public static final char ESCAPED_AMPERSAND = '';
+
+    public static final int SECTION_X_PAYLOAD = 12;
+    public static final int SECTION_X_LENGTH = 14;
+    public static final int GRADIENT_PAYLOAD = 28;
+    public static final int GRADIENT_LENGTH = 30;
+
+    /** Valid single {@code &} codes. {@code g} is excluded; {@code &g} only converts as part of a gradient. */
+    public static final String VALID_SINGLE_CODES = "0123456789abcdefklmnorqzvu";
+
+    private static final String[] SECTION_PREFIX = new String[128];
+    static {
+        for (int i = 0; i < VALID_SINGLE_CODES.length(); i++) {
+            char c = VALID_SINGLE_CODES.charAt(i);
+            SECTION_PREFIX[c] = String.valueOf(FORMATTING_CHAR) + c;
+        }
+        SECTION_PREFIX['x'] = String.valueOf(FORMATTING_CHAR) + 'x';
+        SECTION_PREFIX['g'] = String.valueOf(FORMATTING_CHAR) + 'g';
+    }
+
+    public static String sectionPrefix(char code) {
+        char c = (code < 128) ? Character.toLowerCase(code) : code;
+        return (c < 128) ? SECTION_PREFIX[c] : null;
+    }
+
+    public static int parseHexPairs(CharSequence str, int start, int count) {
+        int result = 0;
+        for (int i = 0; i < count; i++) {
+            int p = start + i * 2;
+            if (str.charAt(p) != FORMATTING_CHAR) return -1;
+            int digit = Character.digit(str.charAt(p + 1), 16);
+            if (digit == -1) return -1;
+            result = (result << 4) | digit;
+        }
+        return result;
+    }
+
+    public static int parseSectionXAt(CharSequence str, int start) {
+        if (start + SECTION_X_LENGTH > str.length()) return -1;
+        if (str.charAt(start) != FORMATTING_CHAR) return -1;
+        if (Character.toLowerCase(str.charAt(start + 1)) != 'x') return -1;
+        return parseHexPairs(str, start + 2, 6);
+    }
+
+    public static boolean isValidSectionX(CharSequence str, int start) {
+        return parseSectionXAt(str, start) != -1;
+    }
+
+    private static String lastConversionInput;
+    private static String lastConversionOutput;
+
+    public static String convertAmpersandToSectionX(String text) {
+        if (text == null || !AngelicaConfig.enableAmpersandConversion) return text;
+
+        if (text == lastConversionInput) return lastConversionOutput;
+
+        final String out = convertImpl(text);
+        lastConversionInput = text;
+        lastConversionOutput = out;
+        return out;
+    }
+
+    private static String convertImpl(String text) {
+        int idx = text.indexOf('&');
+        if (idx == -1) return text;
+
+        final int len = text.length();
+        StringBuilder sb = null;
+        int last = 0;
+        while (idx != -1 && idx + 1 < len) {
+            if (idx > 0 && text.charAt(idx - 1) == '\\') {
+                if (sb == null) sb = new StringBuilder(len + 16);
+                sb.append(text, last, idx - 1);
+                sb.append(ESCAPED_AMPERSAND);
+                last = idx + 1;
+                idx = text.indexOf('&', last);
+                continue;
+            }
+            if (text.charAt(idx + 1) == '#' && idx + 7 < len) {
+                boolean validHex = true;
+                for (int i = 2; i <= 7; i++) {
+                    if (Character.digit(text.charAt(idx + i), 16) == -1) {
+                        validHex = false;
+                        break;
+                    }
+                }
+                if (validHex) {
+                    if (sb == null) sb = new StringBuilder(len + 16);
+                    sb.append(text, last, idx);
+                    sb.append(FORMATTING_CHAR).append('x');
+                    for (int i = 2; i <= 7; i++) {
+                        sb.append(FORMATTING_CHAR).append(text.charAt(idx + i));
+                    }
+                    last = idx + 8;
+                    idx = text.indexOf('&', last);
+                    continue;
+                }
+            }
+            if (Character.toLowerCase(text.charAt(idx + 1)) == 'g' && idx + 17 < len
+                && text.charAt(idx + 2) == '&' && text.charAt(idx + 3) == '#'
+                && text.charAt(idx + 10) == '&' && text.charAt(idx + 11) == '#') {
+                boolean valid1 = true, valid2 = true;
+                for (int i = 4; i <= 9; i++) {
+                    if (Character.digit(text.charAt(idx + i), 16) == -1) { valid1 = false; break; }
+                }
+                if (valid1) {
+                    for (int i = 12; i <= 17; i++) {
+                        if (Character.digit(text.charAt(idx + i), 16) == -1) { valid2 = false; break; }
+                    }
+                }
+                if (valid1 && valid2) {
+                    if (sb == null) sb = new StringBuilder(len + 16);
+                    sb.append(text, last, idx);
+                    sb.append(FORMATTING_CHAR).append('g');
+                    last = idx + 2;
+                    idx = text.indexOf('&', last);
+                    continue;
+                }
+            }
+            char code = Character.toLowerCase(text.charAt(idx + 1));
+            if (VALID_SINGLE_CODES.indexOf(code) != -1) {
+                if (sb == null) sb = new StringBuilder(len + 16);
+                sb.append(text, last, idx);
+                sb.append(FORMATTING_CHAR).append(text.charAt(idx + 1));
+                last = idx + 2;
+            }
+            idx = text.indexOf('&', idx + 1);
+        }
+        if (sb == null) return text;
+        sb.append(text, last, len);
+        return sb.toString();
+    }
+}
@@ -104,9 +104,7 @@ public class DeferredDrawBatcher {
                subEnd++;

                // Don't try to merge strips, fans, loops or polygons
-                if (drawMode == GL11.GL_TRIANGLE_STRIP || drawMode == GL11.GL_TRIANGLE_FAN || drawMode == GL11.GL_LINE_STRIP ||
-                        drawMode == GL11.GL_LINE_LOOP || drawMode == GL11.GL_QUAD_STRIP || drawMode == GL11.GL_POLYGON)
-                    break;
+                if (GLStateManager.isContinuousDraw(drawMode)) break;
            }

            drawPackedBatch(batchTessellator, ranges, i, subEnd, totalBytes, totalVertices, drawMode, flags);
@@ -0,0 +1,39 @@
+package com.gtnewhorizons.angelica.compat;
+
+import java.util.function.Function;
+
+import com.gtnewhorizon.gtnhlib.util.font.FontRendering;
+import com.gtnewhorizons.angelica.client.font.ColorCodeUtils;
+import com.gtnewhorizons.angelica.config.AngelicaConfig;
+
+public class GTNHLibCompat {
+
+    public static final boolean HAS_TEXT_PREPROCESSOR;
+
+    static {
+        boolean found = false;
+        try {
+            FontRendering.class.getMethod("setTextPreprocessor", Function.class);
+            found = true;
+        } catch (NoSuchMethodException ignored) {}
+        HAS_TEXT_PREPROCESSOR = found;
+    }
+
+    /** Only call when {@link #HAS_TEXT_PREPROCESSOR} is true. */
+    public static void registerPreprocessor() {
+        FontRendering.setTextPreprocessor(new FontRendering.TextPreprocessor() {
+
+            @Override
+            public String apply(String text) {
+                return AngelicaConfig.enableAmpersandConversion
+                        ? ColorCodeUtils.convertAmpersandToSectionX(text)
+                        : text;
+            }
+
+            @Override
+            public boolean handlesAmpCodes() {
+                return AngelicaConfig.enableAmpersandConversion;
+            }
+        });
+    }
+}
@@ -24,6 +24,7 @@ public class ModStatus {
    public static boolean isThaumcraftLoaded;
    public static boolean isThaumicHorizonsLoaded;
    public static boolean isBaublesLoaded;
+    public static boolean isCosmeticArmorReworkedLoaded;
    public static boolean isFluidLoggedLoaded;
    public static boolean isBOPLoaded;

@@ -43,6 +44,7 @@ public class ModStatus {
        isThaumcraftLoaded = Loader.isModLoaded("Thaumcraft");
        isThaumicHorizonsLoaded = Loader.isModLoaded("ThaumicHorizons");
        isBaublesLoaded = Loader.isModLoaded("Baubles");
+        isCosmeticArmorReworkedLoaded = Loader.isModLoaded("cosmeticarmorreworked");
        isFluidLoggedLoaded = Loader.isModLoaded("fluidlogged");

        isHoloInventoryLoaded = Loader.isModLoaded("holoinventory");
@@ -5,6 +5,7 @@ import com.gtnewhorizons.angelica.glsm.GLStateManager;
 import com.gtnewhorizons.angelica.mixins.interfaces.IRenderGlobalExt;
 import cpw.mods.fml.common.Optional;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.Tessellator;
 import vfyjxf.bettercrashes.utils.StateManager;

@Optional.Interface(modid = "angelica", iface = "vfyjxf.bettercrashes.utils.StateManager.IResettable")
@@ -25,6 +26,7 @@ public class BetterCrashesCompat implements StateManager.IResettable {

    @Override
    public void resetState() {
+        Tessellator.instance.isDrawing = false;
        AngelicaMod.LOGGER.info("Reloading SodiumRenderer");
        ((IRenderGlobalExt) Minecraft.getMinecraft().renderGlobal).angelica$reload();
        AngelicaMod.LOGGER.info("Resetting GLStateManager");
@@ -63,6 +63,11 @@ public class AngelicaConfig {
    @Config.RequiresMcRestart
    public static boolean enableVAO;

+    @Config.Comment("Enables DSA (Direct State Access) for faster bindings. Disable if you notice terrible performance.")
+    @Config.DefaultBoolean(true)
+    @Config.RequiresMcRestart
+    public static boolean enableDSA;
+
    @Config.Comment("Enable NotFine features")
    @Config.DefaultBoolean(true)
    @Config.RequiresMcRestart
@@ -107,6 +112,39 @@ public class AngelicaConfig {
    @Config.RequiresMcRestart
    public static boolean enableFontRenderer;

+    @Config.Comment("Enable full RGB color support (16.7M colors) using &#RRGGBB syntax in text")
+    @Config.DefaultBoolean(true)
+    public static boolean enableRGBColors;
+
+    @Config.Comment("Enable gradient text (&g&#start&#end)")
+    @Config.DefaultBoolean(true)
+    public static boolean enableGradients;
+
+    @Config.Comment("Enable rainbow cycling text (&q)")
+    @Config.DefaultBoolean(true)
+    public static boolean enableRainbow;
+
+    @Config.Comment("Enable wave/bounce animated text (&z)")
+    @Config.DefaultBoolean(true)
+    public static boolean enableWaveText;
+
+    @Config.Comment("Enable upside-down text (&v)")
+    @Config.DefaultBoolean(true)
+    public static boolean enableDinnerboneText;
+
+    @Config.Comment("Enable per-segment drop shadow toggle (&u) and colored shadow (&u&#RRGGBB)")
+    @Config.DefaultBoolean(true)
+    public static boolean enableDropShadow;
+
+    @Config.Comment("Wave text amplitude (how far characters bounce)")
+    @Config.DefaultFloat(2.0f)
+    @Config.RangeFloat(min = 1.0f, max = 8.0f)
+    public static float waveAmplitude;
+
+    @Config.Comment("Convert &-prefix format codes (&#RRGGBB, &c, &l, etc.) at render time")
+    @Config.DefaultBoolean(true)
+    public static boolean enableAmpersandConversion;
+
    @Config.Comment("Enable Dynamic Lights")
    @Config.DefaultBoolean(true)
    @Config.RequiresMcRestart
@@ -297,4 +335,9 @@ public class AngelicaConfig {
    @Config.RequiresMcRestart
    public static boolean disableGLVersionPinning;

+    @Config.Comment("Disables GL Error checks. Always set to false in dev env or if LWJGL debug is on. Improves performance.")
+    @Config.DefaultBoolean(true)
+    @Config.RequiresMcRestart
+    public static boolean disableErrorChecks;
+
 }
@@ -1,6 +1,7 @@
 package com.gtnewhorizons.angelica.dynamiclights;

 import baubles.common.lib.PlayerHandler;
+import lain.mods.cos.CosmeticArmorReworked;
 import com.gtnewhorizon.gtnhlib.blockpos.BlockPos;
 import com.gtnewhorizon.gtnhlib.blockpos.IBlockPos;
 import com.gtnewhorizon.gtnhlib.util.CoordinatePacker;
@@ -180,6 +181,19 @@ public class DynamicLights {
        this.lightSourcesLock.writeLock().unlock();
    }

+    /**
+     * Removes all tracked light sources, to call when unloading the client world
+     */
+    public void removeAllLightSources() {
+        this.lightSourcesLock.writeLock().lock();
+
+        this.dynamicLightSources.clear();
+        this.lightSourceCount = 0;
+        rebuildLightSourceArray();
+
+        this.lightSourcesLock.writeLock().unlock();
+    }
+
    /**
     * Removes light sources if the filter matches.
     *
@@ -559,13 +573,13 @@ public class DynamicLights {
     */
    public static int getLuminanceFromItemStack(@NotNull ItemStack stack) {
        final Item item = stack.getItem();
-        if (item instanceof ItemBlock itemBlock) {
+        if (item instanceof IDynamicLightProducer lightProducer) {
+            return lightProducer.getLuminance(stack);
+        } else if (item instanceof ItemBlock itemBlock) {
            final Block block = itemBlock.field_150939_a;
            if (block != null) {
                return block.getLightValue();
            }
-        } else if (item instanceof IDynamicLightProducer lightProducer){
-            return lightProducer.getLuminance();
        }

        if (item == Items.lava_bucket) return Blocks.lava.getLightValue();
@@ -625,6 +639,18 @@ public class DynamicLights {
                        }
                    }
                }
+
+                if (ModStatus.isCosmeticArmorReworkedLoaded) {
+                    final var cosArmor = CosmeticArmorReworked.invMan.getCosArmorInventoryClient(player.getUniqueID());
+                    if (cosArmor != null) {
+                        for (int i = 0; i < cosArmor.getSizeInventory(); i++) {
+                            final var stack = cosArmor.getStackInSlot(i);
+                            if (stack != null) {
+                                luminance = Math.max(luminance, getLuminanceFromItemStack(stack));
+                            }
+                        }
+                    }
+                }
            }

            return luminance;
@@ -0,0 +1,21 @@
+package com.gtnewhorizons.angelica.event;
+
+import net.minecraftforge.eventbus.api.bus.EventBus;
+import net.minecraftforge.eventbus.api.event.MutableEvent;
+
+public final class ChunkBiomeDataChangedEvent extends MutableEvent {
+
+    public static final EventBus<ChunkBiomeDataChangedEvent> BUS = EventBus.create(ChunkBiomeDataChangedEvent.class);
+
+    private static final ChunkBiomeDataChangedEvent INSTANCE = new ChunkBiomeDataChangedEvent();
+
+    public int chunkX;
+    public int chunkZ;
+
+    public static void post(int chunkX, int chunkZ) {
+        if (!BUS.hasListeners()) return;
+        INSTANCE.chunkX = chunkX;
+        INSTANCE.chunkZ = chunkZ;
+        BUS.post(INSTANCE);
+    }
+}
@@ -0,0 +1,25 @@
+package com.gtnewhorizons.angelica.event;
+
+import net.minecraftforge.eventbus.api.bus.CancellableEventBus;
+import net.minecraftforge.eventbus.api.event.RecordEvent;
+import net.minecraftforge.eventbus.api.event.characteristic.Cancellable;
+
+/**
+ * Posted from {@link net.coderbot.iris.pipeline.HandRenderer}'s {@code canRender}
+ * <p>
+ * Cancel the event to prevent the hand from rendering.
+ */
+public record RenderHandEvent() implements RecordEvent, Cancellable {
+
+    public static final CancellableEventBus<RenderHandEvent> BUS = CancellableEventBus.create(RenderHandEvent.class);
+
+    private static final RenderHandEvent INSTANCE = new RenderHandEvent();
+
+    /**
+     * @return true if a listener cancelled the event, meaning the hand should NOT render.
+     */
+    public static boolean post() {
+        if (!BUS.hasListeners()) return false;
+        return BUS.post(INSTANCE);
+    }
+}
@@ -76,7 +76,7 @@ public class HUDCaching {
        GLStateManager.glActiveTexture(GL13.GL_TEXTURE0);
        GLStateManager.enableTexture();

-        if (!AngelicaConfig.hudCachingActive || !GLStateManager.isFramebufferEnabled()) {
+        if (!AngelicaConfig.hudCachingActive || mc.displayWidth < 16 || mc.displayHeight < 16) {
            ingame.renderGameOverlay(partialTicks, hasScreen, mouseX, mouseY);
            return;
        }
@@ -16,7 +16,6 @@ import net.coderbot.iris.pipeline.DeferredWorldRenderingPipeline;
 import net.coderbot.iris.pipeline.WorldRenderingPipeline;
 import net.coderbot.iris.samplers.IrisSamplers;
 import net.coderbot.iris.texture.pbr.PBRTextureManager;
-import net.coderbot.iris.vertices.ImmediateState;

 public class IrisGLSMBridge {

@@ -27,6 +26,7 @@ public class IrisGLSMBridge {
    private static Runnable fogStartListener = null;
    private static Runnable fogEndListener = null;
    private static Runnable fogDensityListener = null;
+    private static Runnable colorModulatorListener = null;

    static {
        StateUpdateNotifiers.alphaFuncNotifier = listener -> alphaFuncListener = listener;
@@ -36,6 +36,7 @@ public class IrisGLSMBridge {
        StateUpdateNotifiers.fogStartNotifier = listener -> fogStartListener = listener;
        StateUpdateNotifiers.fogEndNotifier = listener -> fogEndListener = listener;
        StateUpdateNotifiers.fogDensityNotifier = listener -> fogDensityListener = listener;
+        StateUpdateNotifiers.colorModulatorNotifier = listener -> colorModulatorListener = listener;
    }

    public static void register() {
@@ -109,6 +110,10 @@ public class IrisGLSMBridge {
            }
        });

+        GLSMHooks.SHADER_COLOR_CHANGE.addListener(event -> {
+            if (Iris.enabled && colorModulatorListener != null) colorModulatorListener.run();
+        });
+
        GLSMHooks.FOG_STATE_CHANGE.addListener(event -> {
            if (Iris.enabled) {
                if (fogModeListener != null) fogModeListener.run();
@@ -149,20 +154,37 @@ public class IrisGLSMBridge {
            }
        });

-        GLSMHooks.PROGRAM_CHANGE.addListener(event -> ProgramUniforms.clearActiveUniforms());
+        GLSMHooks.PROGRAM_CHANGE.addListener(event -> {
+            if (!Iris.enabled) return;
+            if (event.postBind) return;
+            ProgramUniforms.clearActiveUniforms();
+        });

        GLSMHooks.PROGRAM_CHANGE.addListener(event -> {
            if (!Iris.enabled) return;
+            if (event.postBind) return;
+
            final WorldRenderingPipeline pipeline = Iris.getPipelineManager().getPipelineNullable();
            if (!(pipeline instanceof DeferredWorldRenderingPipeline drp)) return;
            if (!drp.shouldOverrideShaders()) return;
            if (drp.getActivePassProgramId() == -1) return;

-            if (!ImmediateState.isRenderingLevel || DepthColorStorage.isOwnedProgram(event.newProgram)) {
+            if (DepthColorStorage.isOwnedProgram(event.newProgram)) {
                DepthColorStorage.unlockDepthColor();
-            } else {
-                drp.onModProgramOverride();
            }
        });
+
+        GLSMHooks.PROGRAM_CHANGE.addListener(event -> {
+            if (!Iris.enabled) return;
+            if (!event.postBind) return;
+            WorldRenderingPipeline pipeline = Iris.getPipelineManager().getPipelineNullable();
+            if (pipeline instanceof DeferredWorldRenderingPipeline drp) {
+                DeferredWorldRenderingPipeline.Pass activePass = drp.getActivePassProgram();
+                if (activePass != null && activePass.getProgram() != null && activePass.getProgram().getProgramId() == event.newProgram) {
+                    activePass.getProgram().getUniforms().update();
+                }
+            }
+        });
+
    }
 }
@@ -11,9 +11,11 @@ import com.gtnewhorizons.angelica.config.FontConfig;
 import com.gtnewhorizons.angelica.glsm.loading.DependencyVerifier;
 import com.gtnewhorizons.angelica.glsm.loading.EcosystemNarrowRules;
 import com.gtnewhorizons.angelica.loading.fml.compat.CompatHandlers;
+import com.gtnewhorizons.angelica.lwjgl3.MissingDependencySdl;
 import com.gtnewhorizons.angelica.mixins.Mixins;
 import com.gtnewhorizons.retrofuturabootstrap.SharedConfig;
 import cpw.mods.fml.relauncher.FMLLaunchHandler;
+import cpw.mods.fml.relauncher.FMLRelaunchLog;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
 import jss.notfine.asm.AsmTransformers;
 import jss.notfine.asm.mappings.Namer;
@@ -29,6 +31,8 @@ import org.apache.logging.log4j.core.config.LoggerConfig;
 import org.spongepowered.asm.launch.GlobalProperties;
 import org.spongepowered.asm.service.mojang.MixinServiceLaunchWrapper;

+import javax.swing.JOptionPane;
+import java.awt.GraphicsEnvironment;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -49,8 +53,15 @@ public final class AngelicaClientTweaker implements IFMLLoadingPlugin, IEarlyMix
        Launch.classLoader.addTransformerExclusion("com.gtnewhorizons.angelica.loading");
        Launch.classLoader.addTransformerExclusion("com.gtnewhorizons.angelica.glsm.GLStateManager");

-        if (Launch.blackboard.getOrDefault("angelica.rfbPluginLoaded", Boolean.FALSE) == Boolean.TRUE) {
+        final boolean rfbLoaded = Launch.blackboard.getOrDefault("angelica.rfbPluginLoaded", Boolean.FALSE) == Boolean.TRUE;
+        if (rfbLoaded) {
            addLwjgl3ifyExclusions();
+        } else {
+            // Fucking java 8 and non RFB
+            try {
+                Class.forName("com.gtnewhorizon.gtnhlib.core.GTNHLibCore", true, Launch.classLoader);
+            } catch (ClassNotFoundException ignored) {
+            }
        }

        try {
@@ -80,9 +91,10 @@ public final class AngelicaClientTweaker implements IFMLLoadingPlugin, IEarlyMix
        // packages to avoid interfering with mixin delegation on game classes. AngelicaLateTweaker removes this registration once
        // mixins are setup.
        if (FMLLaunchHandler.side().isClient()) {
-            final boolean rfbLoaded = Launch.blackboard.getOrDefault("angelica.rfbPluginLoaded", Boolean.FALSE) == Boolean.TRUE;
            if (!rfbLoaded) {
-                Launch.classLoader.registerTransformer("com.gtnewhorizons.angelica.loading.fml.transformers.EarlyRedirectorTransformer");
+                final String transformer = "com.gtnewhorizons.angelica.loading.fml.transformers.EarlyRedirectorTransformer";
+                FMLRelaunchLog.finer("Registering transformer %s", transformer);
+                Launch.classLoader.registerTransformer(transformer);
            }
        }
    }
@@ -101,14 +113,37 @@ public final class AngelicaClientTweaker implements IFMLLoadingPlugin, IEarlyMix
    }

    private static void verifyDependencies() {
-        DependencyVerifier.verify(AngelicaTweaker.class, List.of(
-            new DependencyVerifier.Check(
-                "/it/unimi/dsi/fastutil/ints/Int2ObjectMap.class",
-                "Missing dependency: Angelica requires GTNHLib! Download: https://modrinth.com/mod/gtnhlib"),
-            new DependencyVerifier.Check(
-                "/xyz/wagyourtail/jvmdg/exc/MissingStubError.class",
-                "GTNHLib is outdated: Angelica requires GTNHLib 0.9.0 or newer! Download: https://modrinth.com/mod/gtnhlib")
-        ));
+        try {
+            DependencyVerifier.verify(AngelicaTweaker.class, List.of(
+                new DependencyVerifier.Check(
+                    "/it/unimi/dsi/fastutil/ints/Int2ObjectMap.class",
+                    "Missing dependency: Angelica requires GTNHLib! Download: https://modrinth.com/mod/gtnhlib"),
+                new DependencyVerifier.Check(
+                    "/com/gtnewhorizon/gtnhlib/client/renderer/VertexCallbackManager.class",
+                    "GTNHLib is outdated: Angelica requires GTNHLib 0.10.0 or newer! Download: https://modrinth.com/mod/gtnhlib")
+            ));
+        } catch (RuntimeException ex) {
+            fatalDependencyError(ex.getMessage());
+        }
+    }
+
+    private static void fatalDependencyError(String message) {
+        final String title = "Angelica - Missing Dependency";
+        System.err.println("FATAL: " + message);
+        try {
+            LOGGER.fatal(message);
+        } catch (Throwable ignored) {}
+
+        final int lwjgl3ifyMajor = ((Integer) Launch.blackboard.getOrDefault("lwjgl3ify:major-version", Integer.MIN_VALUE));
+        try {
+            if (lwjgl3ifyMajor >= 3) {
+                MissingDependencySdl.showFatal(title, message);
+            } else if (!GraphicsEnvironment.isHeadless()) {
+                JOptionPane.showMessageDialog(null, message, title, JOptionPane.ERROR_MESSAGE);
+            }
+        } catch (Throwable ignored) {}
+
+        Runtime.getRuntime().halt(1);
    }

    @Override
@@ -120,6 +155,10 @@ public final class AngelicaClientTweaker implements IFMLLoadingPlugin, IEarlyMix
            final List<String> notFineTransformers = Arrays.asList(ITransformers.getTransformers(AsmTransformers.class));
            if (!notFineTransformers.isEmpty()) Namer.initNames();
            transformers.addAll(notFineTransformers);
+            final boolean rfbLoaded = Launch.blackboard.getOrDefault("angelica.rfbPluginLoaded", Boolean.FALSE) == Boolean.TRUE;
+            if (!rfbLoaded) {
+                transformers.add("com.gtnewhorizons.angelica.loading.fml.transformers.IsbrhTessellatorAbuseTransformer");
+            }
            transformerClasses = transformers.toArray(new String[0]);
        }
        return transformerClasses;
@@ -8,7 +8,6 @@ import com.gtnewhorizons.angelica.loading.fml.compat.handlers.ThaumcraftCompatHa
 import com.gtnewhorizons.angelica.loading.fml.compat.handlers.ThaumicHorizonsCompatHandler;

 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.function.Supplier;

@@ -45,20 +44,18 @@ public enum CompatHandlers {

    /**
     * Returns extra transformers as well as the main transformer.
-     * Returns an empty list if no handlers registered.
     */
    public static List<String> getTransformers() {
        final List<ICompatHandler> handlers = getHandlers();
-        if (handlers.isEmpty()) {
-            return Collections.emptyList();
-        }
-        List<String> transformers =  new ArrayList<>();
+        List<String> transformers = new ArrayList<>();
        for (ICompatHandler handler : handlers) {
            if (handler.extraTransformers() != null) {
                transformers.addAll(handler.extraTransformers());
            }
        }
-        transformers.add("com.gtnewhorizons.angelica.loading.fml.transformers.GenericCompatTransformer");
+        if (!handlers.isEmpty()) {
+            transformers.add("com.gtnewhorizons.angelica.loading.fml.transformers.GenericCompatTransformer");
+        }
        return transformers;
    }
 }
@@ -1,6 +1,5 @@
 package com.gtnewhorizons.angelica.loading.fml.transformers;

-import com.gtnewhorizons.angelica.loading.AngelicaTweaker;
 import com.gtnewhorizons.angelica.loading.shared.AngelicaClassDump;
 import com.gtnewhorizons.angelica.loading.shared.transformers.AngelicaRedirector;
 import net.minecraft.launchwrapper.IClassTransformer;
@@ -8,6 +8,7 @@ import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.tree.ClassNode;

+/** IClassTransformer wrapper for {@link CeleritasBlockTransform} */
 public class CeleritasBlockTransformer implements IClassTransformer {

    private final CeleritasBlockTransform inner;
@@ -0,0 +1,31 @@
+package com.gtnewhorizons.angelica.loading.fml.transformers;
+
+import com.gtnewhorizons.angelica.loading.AngelicaClientTweaker;
+import com.gtnewhorizons.angelica.loading.shared.AngelicaClassDump;
+import com.gtnewhorizons.angelica.loading.shared.transformers.IsbrhTessellatorAbuseTransform;
+import net.minecraft.launchwrapper.IClassTransformer;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.tree.ClassNode;
+
+/** IClassTransformer wrapper for {@link IsbrhTessellatorAbuseTransform} */
+public class IsbrhTessellatorAbuseTransformer implements IClassTransformer {
+
+    private final IsbrhTessellatorAbuseTransform inner = new IsbrhTessellatorAbuseTransform();
+
+    @Override
+    public byte[] transform(String name, String transformedName, byte[] basicClass) {
+        if (!inner.shouldTransform(basicClass)) return basicClass;
+
+        final ClassReader cr = new ClassReader(basicClass);
+        final ClassNode cn = new ClassNode();
+        cr.accept(cn, 0);
+        if (!inner.transformClassNode(cn, AngelicaClientTweaker.isObfEnv())) return basicClass;
+
+        final ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
+        cn.accept(cw);
+        final byte[] bytes = cw.toByteArray();
+        AngelicaClassDump.dumpClass(transformedName, basicClass, bytes, this);
+        return bytes;
+    }
+}
@@ -2,6 +2,7 @@ package com.gtnewhorizons.angelica.loading.rfb;

 import com.gtnewhorizons.angelica.loading.rfb.transformers.RFBAngelicaRedirector;
 import com.gtnewhorizons.angelica.loading.rfb.transformers.RFBCeleritasBlockTransformer;
+import com.gtnewhorizons.angelica.loading.rfb.transformers.RFBIsbrhTessellatorAbuseTransformer;
 import com.gtnewhorizons.retrofuturabootstrap.api.PluginContext;
 import com.gtnewhorizons.retrofuturabootstrap.api.RetroFuturaBootstrap;
 import com.gtnewhorizons.retrofuturabootstrap.api.RfbClassTransformer;
@@ -28,7 +29,8 @@ public class AngelicaRfbPlugin implements RfbPlugin {
        final boolean isObf = RetroFuturaBootstrap.API.launchClassLoader().findClassMetadata("net.minecraft.world.World") == null;
        return new RfbClassTransformer[] {
            new RFBAngelicaRedirector(),
-            new RFBCeleritasBlockTransformer(isObf)
+            new RFBCeleritasBlockTransformer(isObf),
+            new RFBIsbrhTessellatorAbuseTransformer(isObf)
        };
    }
 }
@@ -52,12 +52,20 @@ public class RFBAngelicaRedirector implements RfbClassTransformer {
    }

    @Override
-    public void transformClass(@NotNull ExtensibleClassLoader classLoader, @NotNull RfbClassTransformer.Context context,
-        @Nullable Manifest manifest, @NotNull String className, @NotNull ClassNodeHandle classNode) {
+    public boolean transformClassIfNeeded(@NotNull ExtensibleClassLoader classLoader,
+                                          @NotNull RfbClassTransformer.Context context, @Nullable Manifest manifest,
+                                          @NotNull String className, @NotNull ClassNodeHandle classNode) {
        final boolean changed = inner.transformClassNode(className, classNode.getNode());
        if (changed) {
            classNode.computeMaxs();
            AngelicaClassDump.dumpRFBClass(className, classNode, this);
        }
+        return changed;
+    }
+
+    @Override
+    public void transformClass(@NotNull ExtensibleClassLoader classLoader, @NotNull RfbClassTransformer.Context context,
+                               @Nullable Manifest manifest, @NotNull String className, @NotNull ClassNodeHandle classNode) {
+        transformClassIfNeeded(classLoader, context, manifest, className, classNode);
    }
 }
@@ -59,12 +59,20 @@ public class RFBCeleritasBlockTransformer implements RfbClassTransformer {
    }

    @Override
-    public void transformClass(@NotNull ExtensibleClassLoader classLoader, @NotNull RfbClassTransformer.Context context,
-                               @Nullable Manifest manifest, @NotNull String className, @NotNull ClassNodeHandle classNode) {
+    public boolean transformClassIfNeeded(@NotNull ExtensibleClassLoader classLoader,
+                                          @NotNull RfbClassTransformer.Context context, @Nullable Manifest manifest,
+                                          @NotNull String className, @NotNull ClassNodeHandle classNode) {
        final boolean changed = inner.transformClassNode(className, classNode.getNode());
        if (changed) {
            classNode.computeMaxs();
            AngelicaClassDump.dumpRFBClass(className, classNode, this);
        }
+        return changed;
+    }
+
+    @Override
+    public void transformClass(@NotNull ExtensibleClassLoader classLoader, @NotNull RfbClassTransformer.Context context,
+                               @Nullable Manifest manifest, @NotNull String className, @NotNull ClassNodeHandle classNode) {
+        transformClassIfNeeded(classLoader, context, manifest, className, classNode);
    }
 }
@@ -0,0 +1,67 @@
+package com.gtnewhorizons.angelica.loading.rfb.transformers;
+
+import com.gtnewhorizons.angelica.loading.shared.AngelicaClassDump;
+import com.gtnewhorizons.angelica.loading.shared.transformers.IsbrhTessellatorAbuseTransform;
+import com.gtnewhorizons.retrofuturabootstrap.api.ClassHeaderMetadata;
+import com.gtnewhorizons.retrofuturabootstrap.api.ClassNodeHandle;
+import com.gtnewhorizons.retrofuturabootstrap.api.ExtensibleClassLoader;
+import com.gtnewhorizons.retrofuturabootstrap.api.RfbClassTransformer;
+import org.intellij.lang.annotations.Pattern;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.jar.Manifest;
+
+/** RfbClassTransformer wrapper for {@link IsbrhTessellatorAbuseTransform} */
+public class RFBIsbrhTessellatorAbuseTransformer implements RfbClassTransformer {
+
+    private final IsbrhTessellatorAbuseTransform inner;
+    private final boolean isObf;
+
+    public RFBIsbrhTessellatorAbuseTransformer(boolean isObf) {
+        this.inner = new IsbrhTessellatorAbuseTransform();
+        this.isObf = isObf;
+    }
+
+    @Pattern("[a-z0-9-]+")
+    @Override
+    public @NotNull String id() {
+        return "isbrh-tessellator-abuse";
+    }
+
+    @Override
+    public @NotNull String @Nullable [] sortAfter() {
+        return new String[] {"*", "mixin:mixin"};
+    }
+
+    @Override
+    public @NotNull String @Nullable [] sortBefore() {
+        return new String[] {"lwjgl3ify:redirect"};
+    }
+
+    @Override
+    public boolean shouldTransformClass(@NotNull ExtensibleClassLoader classLoader,
+        @NotNull RfbClassTransformer.Context context, @Nullable Manifest manifest, @NotNull String className,
+        @NotNull ClassNodeHandle classNode) {
+        if (!classNode.isPresent()) return false;
+        final ClassHeaderMetadata metadata = classNode.getOriginalMetadata();
+        return metadata != null && metadata.binaryInterfaceNames.contains(IsbrhTessellatorAbuseTransform.ISBRH);
+    }
+
+    @Override
+    public boolean transformClassIfNeeded(@NotNull ExtensibleClassLoader classLoader, @NotNull RfbClassTransformer.Context context,
+        @Nullable Manifest manifest, @NotNull String className, @NotNull ClassNodeHandle classNode) {
+        final boolean changed = inner.transformClassNode(classNode.getNode(), this.isObf);
+        if (changed) {
+            classNode.computeMaxs();
+            AngelicaClassDump.dumpRFBClass(className, classNode, this);
+        }
+        return changed;
+    }
+
+    @Override
+    public void transformClass(@NotNull ExtensibleClassLoader classLoader, @NotNull RfbClassTransformer.Context context,
+                               @Nullable Manifest manifest, @NotNull String className, @NotNull ClassNodeHandle classNode) {
+        transformClassIfNeeded(classLoader, context, manifest, className, classNode);
+    }
+}
@@ -0,0 +1,73 @@
+package com.gtnewhorizons.angelica.loading.shared.transformers;
+
+import com.gtnewhorizon.gtnhlib.asm.ClassConstantPoolParser;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.InsnNode;
+import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MethodNode;
+
+public final class IsbrhTessellatorAbuseTransform {
+
+    public static final String ISBRH = "cpw/mods/fml/client/registry/ISimpleBlockRenderingHandler";
+
+    private static final Logger LOGGER = LogManager.getLogger("IsbrhTessellatorAbuse");
+    private static final ClassConstantPoolParser CST_POOL_PARSER = new ClassConstantPoolParser(ISBRH);
+    private static final String TESSELLATOR = "net/minecraft/client/renderer/Tessellator";
+    private static final String RENDER_WORLD_BLOCK_DESC = "(Lnet/minecraft/world/IBlockAccess;IIILnet/minecraft/block/Block;ILnet/minecraft/client/renderer/RenderBlocks;)Z";
+
+    public boolean shouldTransform(byte[] classBytes) {
+        return CST_POOL_PARSER.find(classBytes);
+    }
+
+    public boolean transformClassNode(ClassNode cn, boolean isObf) {
+        MethodNode target = null;
+        for (int i = 0, n = cn.methods.size(); i < n; i++) {
+            final MethodNode mn = cn.methods.get(i);
+            if ("renderWorldBlock".equals(mn.name) && RENDER_WORLD_BLOCK_DESC.equals(mn.desc)) {
+                target = mn;
+                break;
+            }
+        }
+        if (target == null) return false;
+
+        final String draw = isObf ? "func_78381_a" : "draw";
+        final String startDrawingQuads = isObf ? "func_78382_b" : "startDrawingQuads";
+        final String startDrawing = isObf ? "func_78371_b" : "startDrawing";
+
+        boolean changed = false;
+        AbstractInsnNode insn = target.instructions.getFirst();
+        while (insn != null) {
+            final AbstractInsnNode next = insn.getNext();
+            if (insn instanceof MethodInsnNode min && min.getOpcode() == Opcodes.INVOKEVIRTUAL && TESSELLATOR.equals(min.owner)) {
+
+                final int popOp;
+                final boolean pushIntResult;
+                if (min.name.equals(draw) && "()I".equals(min.desc)) {
+                    popOp = Opcodes.POP;
+                    pushIntResult = true;
+                } else if (min.name.equals(startDrawingQuads) && "()V".equals(min.desc)) {
+                    popOp = Opcodes.POP;
+                    pushIntResult = false;
+                } else if (min.name.equals(startDrawing) && "(I)V".equals(min.desc)) {
+                    popOp = Opcodes.POP2;
+                    pushIntResult = false;
+                } else {
+                    insn = next;
+                    continue;
+                }
+
+                target.instructions.insertBefore(insn, new InsnNode(popOp));
+                if (pushIntResult) target.instructions.insertBefore(insn, new InsnNode(Opcodes.ICONST_0));
+                target.instructions.remove(insn);
+                LOGGER.info("Stripped Tessellator.{} from {}#renderWorldBlock", min.name, cn.name);
+                changed = true;
+            }
+            insn = next;
+        }
+        return changed;
+    }
+}
@@ -35,15 +35,19 @@ public enum Mixins implements IMixins {
            , "angelica.MixinGameSettings"
            , "angelica.MixinMinecraft"
            , "angelica.MixinMinecraft_FrameHook"
+            , "angelica.MixinMinecraft_IconifyGuard"
            , "angelica.MixinMinecraftServer"
            , "angelica.bugfixes.MixinItemRenderer_EdgeDepth"
            , "angelica.bugfixes.MixinModelCreeper_AuraBodyInflate"
+            , "angelica.bugfixes.MixinModelSkeleton_LegPelvisZFight"
            , "angelica.bugfixes.MixinModelWither_ArmorCentering"
            , "angelica.bugfixes.MixinRenderBlocks_CrossedSquaresNormal"
            , "angelica.bugfixes.MixinRenderCreeper_AuraDepth"
            , "angelica.bugfixes.MixinRenderGlobal_DeferredEntityOverlay"
            , "angelica.bugfixes.MixinRenderGlobal_DestroyBlock"
+            , "angelica.bugfixes.MixinRenderMooshroom_MushroomTint"
            , "angelica.bugfixes.MixinRendererLivingEntity_DeferredEntityOverlay"
+            , "angelica.bugfixes.MixinRendererLivingEntity_OverlayTint"
            , "angelica.bugfixes.MixinRenderWither_ArmorCentering"
            , "angelica.bugfixes.MixinRendererLivingEntity_EyeDepth"
            , "angelica.debug.MixinMinecraft_FPSCap"
@@ -70,6 +74,12 @@ public enum Mixins implements IMixins {
            .addClientMixins("angelica.gui.MixinGuiMainMenu")
    ),

+    ANGELICA_GL_SPLASH_TEXT(
+        new MixinBuilder("Rewrite 'OpenGL 1.2!' splash to reflect the actual GL context")
+            .setPhase(Phase.EARLY)
+            .addClientMixins("angelica.gui.MixinGuiMainMenuSplash")
+    ),
+
    ANGELICA_FONT_RENDERER(new MixinBuilder()
        .setPhase(Phase.EARLY)
        .setApplyIf(() -> AngelicaConfig.enableFontRenderer)
@@ -122,7 +132,10 @@ public enum Mixins implements IMixins {

    ANGELICA_ITEM_RENDERER_OPTIMIZATION(new MixinBuilder("Optimizes in-world item rendering")
        .setPhase(Phase.EARLY)
-        .addClientMixins("angelica.itemrenderer.MixinItemRenderer")
+        .addClientMixins(
+            "angelica.itemrenderer.MixinItemRenderer",
+            "angelica.itemrenderer.MixinRenderBlocks"
+        )
        .setApplyIf(() -> AngelicaConfig.optimizeInWorldItemRendering)),

    ANGELICA_OPTIMIZE_GLALLOCATION(new MixinBuilder("Replace HashMap with fastutil Int2IntMap in GLAllocation")
@@ -194,6 +207,7 @@ public enum Mixins implements IMixins {
            , "rendering.MixinTileEntity"
            , "rendering.MixinTileEntityMobSpawner"
            , "rendering.MixinTileEntityRendererDispatcher"
+            , "rendering.MixinRenderBlocksEmissive"
        )
    ),

@@ -263,6 +277,8 @@ public enum Mixins implements IMixins {
            , "shaders.MixinRenderNameTag"
            , "shaders.MixinRenderPlayerArmor"
            , "shaders.MixinTileEntityBeaconRenderer"
+            , "shaders.MixinWorldNbtCache"
+            , "shaders.MixinNetHandlerPlayClient_NbtRemesh"
            , "shaders.MixinRenderEndPortal"
            , "shaders.MixinTileEntityRendererDispatcher"
            , "shaders.MixinGlProgram"
@@ -388,7 +404,7 @@ public enum Mixins implements IMixins {
        .addRequiredMod(TargetedMod.MINEFACTORY_RELOADED)
        .setApplyIf(() -> CompatConfig.fixMinefactoryReloaded)
        .addClientMixins("client.minefactoryreloaded.MixinRedNetCableRenderer")),
-    
+
    NTM_SPACE_COMPAT(new MixinBuilder("Multiple fixes for NTM:Space")
            .setPhase(Phase.LATE)
            .addRequiredMod(TargetedMod.NTM_SPACE)
@@ -22,12 +22,15 @@ import com.gtnewhorizons.angelica.iris.IrisGLSMBridge;
 import com.gtnewhorizons.angelica.loading.AngelicaClientTweaker;
 import com.gtnewhorizons.angelica.mixins.interfaces.IGameSettingsExt;
 import com.gtnewhorizons.angelica.render.CloudRenderer;
+import com.gtnewhorizons.angelica.render.EmissiveTextureAutoloader;
 import com.gtnewhorizons.angelica.rendering.AngelicaBlockSafetyRegistry;
 import com.gtnewhorizons.angelica.rendering.celeritas.CeleritasDebugScreenHandler;
 import com.gtnewhorizons.angelica.rendering.celeritas.CeleritasSetup;
 import com.gtnewhorizons.angelica.rendering.celeritas.threading.ChunkTaskRegistry;
 import com.gtnewhorizons.angelica.rendering.celeritas.threading.DefaultChunkTaskProvider;
 import com.gtnewhorizons.angelica.rendering.celeritas.threading.ThreadedChunkTaskProvider;
+import com.gtnewhorizons.angelica.rendering.items.BlockRenderListManager;
+import com.gtnewhorizons.angelica.rendering.items.ItemRenderListManager;
 import com.gtnewhorizons.angelica.utils.AnimationMode;
 import com.gtnewhorizons.angelica.utils.ManagedEnum;
 import com.gtnewhorizons.angelica.zoom.Zoom;
@@ -102,30 +105,11 @@ public final class ClientProxy extends CommonProxy {
        super.preInit(event);
        FMLCommonHandler.instance().bus().register(this);
        MinecraftForge.EVENT_BUS.register(this);
+        MinecraftForge.EVENT_BUS.register(new EmissiveTextureAutoloader());
        ModelRegistry.registerModid(MOD_ID);
        blockError = new BlockError();
    }

-    @SubscribeEvent
-    public void worldLoad(WorldEvent.Load event) {
-        if (GLStateManager.isRunningSplash()) {
-            GLStateManager.setRunningSplash(false);
-            LOGGER.info("World loaded - Enabling GLSM Cache");
-        }
-
-        if (AngelicaConfig.enableCeleritas) {
-            ChunkTaskRegistry.reset();
-            ChunkTaskRegistry.registerProvider(DefaultChunkTaskProvider.INSTANCE);
-            ChunkTaskRegistry.registerProvider(ThreadedChunkTaskProvider.INSTANCE);
-
-            // Register all blocks. Because blockids are unique to a world, this must be done each load
-            GameData.getBlockRegistry().typeSafeIterable().forEach(o -> {
-                AngelicaBlockSafetyRegistry.canBlockRenderOffThread(o, true, true);
-                AngelicaBlockSafetyRegistry.canBlockRenderOffThread(o, false, true);
-            });
-        }
-    }
-
    @Override
    public void init(FMLInitializationEvent event) {
        super.init(event);
@@ -163,6 +147,10 @@ public final class ClientProxy extends CommonProxy {
        if (AngelicaConfig.enableDynamicLights) {
            EntityLightConfig.init(new java.io.File(mc.mcDataDir, "config"));
        }
+        if(AngelicaConfig.optimizeInWorldItemRendering){
+            ItemRenderListManager.registerReloadListener();
+            BlockRenderListManager.registerReloadListener();
+        }

        // Register debug commands in dev environment only
        if (!AngelicaClientTweaker.isObfEnv()) {
@@ -170,7 +158,6 @@ public final class ClientProxy extends CommonProxy {
        }
    }

-
    @Override
    public void postInit(FMLPostInitializationEvent event) {
        super.postInit(event);
@@ -190,11 +177,38 @@ public final class ClientProxy extends CommonProxy {
        }
    }

+    @SubscribeEvent
+    public void worldLoad(WorldEvent.Load event) {
+        if (!event.world.isRemote) return;
+        if (GLStateManager.isRunningSplash()) {
+            GLStateManager.setRunningSplash(false);
+            LOGGER.info("World loaded - Enabling GLSM Cache");
+        }
+
+        if (AngelicaConfig.enableCeleritas) {
+            ChunkTaskRegistry.reset();
+            ChunkTaskRegistry.registerProvider(DefaultChunkTaskProvider.INSTANCE);
+            ChunkTaskRegistry.registerProvider(ThreadedChunkTaskProvider.INSTANCE);
+
+            // Register all blocks. Because blockids are unique to a world, this must be done each load
+            GameData.getBlockRegistry().typeSafeIterable().forEach(o -> {
+                AngelicaBlockSafetyRegistry.canBlockRenderOffThread(o, true, true);
+                AngelicaBlockSafetyRegistry.canBlockRenderOffThread(o, false, true);
+            });
+        }
+    }
+
+    @SubscribeEvent
+    public void onWorldUnload(WorldEvent.Unload event) {
+        if (!event.world.isRemote) return;
+        DynamicLights.get().removeAllLightSources();
+    }
+
    float lastIntegratedTickTime;

    @SubscribeEvent
    public void onTick(TickEvent.ServerTickEvent event) {
-        if (FMLCommonHandler.instance().getSide().isClient() && event.phase == TickEvent.Phase.END) {
+        if (event.phase == TickEvent.Phase.END) {
            final IntegratedServer srv = Minecraft.getMinecraft().getIntegratedServer();
            if (srv != null) {
                final long currentTickTime = srv.tickTimeArray[srv.getTickCounter() % 100];
@@ -0,0 +1,75 @@
+package com.gtnewhorizons.angelica.render;
+
+import java.nio.ByteBuffer;
+
+final class CloudEdges {
+    private static final int CELL_EMPTY_THRESHOLD = 10;
+
+    final int width, height;
+    private final int wMask, hMask;
+    private final boolean whPow2;
+    private final long[] opaqueBits;
+    final int opaqueCount;
+
+    CloudEdges(int width, int height, ByteBuffer rgba) {
+        this.width = width;
+        this.height = height;
+        this.wMask = width - 1;
+        this.hMask = height - 1;
+        this.whPow2 = (width & wMask) == 0 && (height & hMask) == 0;
+        final int total = width * height;
+        final long[] bits = new long[(total + 63) >>> 6];
+        int op = 0;
+        for (int i = 0; i < total; i++) {
+            if ((rgba.get(i * 4 + 3) & 0xFF) >= CELL_EMPTY_THRESHOLD) {
+                bits[i >>> 6] |= 1L << (i & 63);
+                op++;
+            }
+        }
+        this.opaqueBits = bits;
+        this.opaqueCount = op;
+    }
+
+    boolean cellOpaque(int x, int z) {
+        final int xw, zh;
+        if (whPow2) {
+            xw = x & wMask;
+            zh = z & hMask;
+        } else {
+            xw = Math.floorMod(x, width);
+            zh = Math.floorMod(z, height);
+        }
+        final int idx = xw + zh * width;
+        return ((opaqueBits[idx >>> 6] >>> (idx & 63)) & 1L) != 0L;
+    }
+
+    long readOpaqueRowBits(int x0, int z) {
+        final int zMod, x0Mod;
+        if (whPow2) {
+            zMod = z & hMask;
+            x0Mod = x0 & wMask;
+        } else {
+            zMod = Math.floorMod(z, height);
+            x0Mod = Math.floorMod(x0, width);
+        }
+        if (x0Mod + 10 <= width) {
+            return readContigBits(opaqueBits, (long) zMod * width + x0Mod, 10);
+        }
+        final int colsBeforeWrap = width - x0Mod;
+        final long firstPart = readContigBits(opaqueBits, (long) zMod * width + x0Mod, colsBeforeWrap);
+        final long secondPart = readContigBits(opaqueBits, (long) zMod * width, 10 - colsBeforeWrap);
+        return firstPart | (secondPart << colsBeforeWrap);
+    }
+
+    private static long readContigBits(long[] bits, long startBitIdx, int count) {
+        final int wordIdx = (int) (startBitIdx >>> 6);
+        final int bitOff = (int) (startBitIdx & 63);
+        final long mask = count == 64 ? -1L : (1L << count) - 1L;
+        final long w0 = bits[wordIdx];
+        if (bitOff + count <= 64) {
+            return (w0 >>> bitOff) & mask;
+        }
+        final long w1 = bits[wordIdx + 1];
+        return ((w0 >>> bitOff) | (w1 << (64 - bitOff))) & mask;
+    }
+}
@@ -0,0 +1,78 @@
+package com.gtnewhorizons.angelica.render;
+
+import org.embeddedt.embeddium.impl.gl.shader.ShaderBindingContext;
+import org.embeddedt.embeddium.impl.gl.shader.uniform.GlUniformFloat4v;
+import org.embeddedt.embeddium.impl.gl.shader.uniform.GlUniformInt;
+import org.embeddedt.embeddium.impl.gl.shader.uniform.GlUniformMatrix4f;
+
+final class CloudUniforms {
+    static final float ALPHA = 0.8f;
+
+    final GlUniformMatrix4f mvp;
+    final GlUniformFloat4v colorMult;
+    final GlUniformFloat4v fogParams;
+    final GlUniformFloat4v fogColor;
+    final GlUniformInt fogEnabled;
+    final GlUniformInt tex;
+
+    private int lastFogEnabled = -1;
+    private float lastFogR = Float.NaN, lastFogG = Float.NaN, lastFogB = Float.NaN;
+    private float lastColorR = Float.NaN, lastColorG = Float.NaN, lastColorB = Float.NaN;
+    private float lastFogParamX = Float.NaN, lastFogParamY = Float.NaN;
+    private final float[] uploadBuf = new float[4];
+
+    CloudUniforms(ShaderBindingContext ctx) {
+        mvp = ctx.bindUniform("u_MVPMatrix", GlUniformMatrix4f::new);
+        colorMult = ctx.bindUniform("u_ColorMult", GlUniformFloat4v::new);
+        fogParams = ctx.bindUniform("u_FogParams", GlUniformFloat4v::new);
+        fogColor = ctx.bindUniform("u_FogColor", GlUniformFloat4v::new);
+        fogEnabled = ctx.bindUniform("u_FogEnabled", GlUniformInt::new);
+        tex = ctx.bindUniform("u_Tex", GlUniformInt::new);
+    }
+
+    void setFogEnabled(boolean enabled) {
+        final int val = enabled ? 1 : 0;
+        if (val != lastFogEnabled) {
+            lastFogEnabled = val;
+            fogEnabled.setInt(val);
+        }
+    }
+
+    void setFogColor(float r, float g, float b) {
+        if (r != lastFogR || g != lastFogG || b != lastFogB) {
+            lastFogR = r;
+            lastFogG = g;
+            lastFogB = b;
+            uploadBuf[0] = r;
+            uploadBuf[1] = g;
+            uploadBuf[2] = b;
+            uploadBuf[3] = 1.0f;
+            fogColor.set(uploadBuf);
+        }
+    }
+
+    void setFogParams(float x, float y) {
+        if (x != lastFogParamX || y != lastFogParamY) {
+            lastFogParamX = x;
+            lastFogParamY = y;
+            uploadBuf[0] = x;
+            uploadBuf[1] = y;
+            uploadBuf[2] = 0f;
+            uploadBuf[3] = 0f;
+            fogParams.set(uploadBuf);
+        }
+    }
+
+    void setColorMult(float r, float g, float b) {
+        if (r != lastColorR || g != lastColorG || b != lastColorB) {
+            lastColorR = r;
+            lastColorG = g;
+            lastColorB = b;
+            uploadBuf[0] = r;
+            uploadBuf[1] = g;
+            uploadBuf[2] = b;
+            uploadBuf[3] = ALPHA;
+            colorMult.set(uploadBuf);
+        }
+    }
+}
@@ -0,0 +1,79 @@
+package com.gtnewhorizons.angelica.render;
+
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.resources.FallbackResourceManager;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.IResourcePack;
+import net.minecraft.client.resources.SimpleReloadableResourceManager;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.client.event.TextureStitchEvent;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@SideOnly(Side.CLIENT)
+public class EmissiveTextureAutoloader {
+
+    @SubscribeEvent
+    public void onTextureStitchPre(TextureStitchEvent.Pre event) {
+        if (event.map.getTextureType() != 0) return;
+
+        TextureMap map = event.map;
+        EmissiveTextureHelper.clearCache();
+
+        @SuppressWarnings("unchecked")
+        Map<String, ?> registeredSprites = map.mapRegisteredSprites;
+
+        List<String> toRegister = new ArrayList<>();
+
+        for (String baseName : registeredSprites.keySet()) {
+            if (baseName.endsWith("_emissive")) continue;
+
+            String emissiveName = baseName + "_emissive";
+            if (resourceExists(emissiveName)) {
+                toRegister.add(baseName);
+            }
+        }
+
+        for (String baseName : toRegister) {
+            String emissiveName = baseName + "_emissive";
+            IIcon emissiveIcon = map.registerIcon(emissiveName);
+            EmissiveTextureHelper.cacheEmissive(baseName, emissiveIcon);
+        }
+    }
+
+    private boolean resourceExists(String iconName) {
+        ResourceLocation loc = new ResourceLocation(iconName);
+        ResourceLocation full = new ResourceLocation(
+            loc.getResourceDomain(),
+            "textures/blocks/" + loc.getResourcePath() + ".png"
+        );
+
+        final IResourceManager resMan = Minecraft.getMinecraft().getResourceManager();
+        if (resMan instanceof SimpleReloadableResourceManager simple) {
+            FallbackResourceManager fallback = simple.domainResourceManagers.get(full.getResourceDomain());
+            if (fallback != null) {
+                for (IResourcePack rp : fallback.resourcePacks) {
+                    if (rp != null && rp.resourceExists(full)) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+        }
+
+        // Fallback
+        try {
+            resMan.getResource(full);
+            return true;
+        } catch (Exception ignored) {
+            return false;
+        }
+    }
+}
@@ -0,0 +1,54 @@
+package com.gtnewhorizons.angelica.render;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+@SideOnly(Side.CLIENT)
+public final class EmissiveTextureHelper {
+    private static final ConcurrentHashMap<String, IIcon> EMISSIVE_ICON_CACHE = new ConcurrentHashMap<>();
+
+    public static IIcon getEmissiveIcon(Block block, int side, int metadata) {
+        IIcon baseIcon = block.getIcon(side, metadata);
+        if (baseIcon == null) return null;
+
+        String baseIconName = baseIcon.getIconName();
+        if (baseIconName == null) return null;
+
+        return EMISSIVE_ICON_CACHE.get(baseIconName);
+    }
+
+    public static void clearCache() {
+        EMISSIVE_ICON_CACHE.clear();
+    }
+
+    public static void cacheEmissive(String baseIconName, IIcon emissiveIcon) {
+        EMISSIVE_ICON_CACHE.put(baseIconName, emissiveIcon);
+    }
+
+    public static void renderEmissiveBlockOverlay(RenderBlocks renderer, Block block, int x, int y, int z, int metadata) {
+        Tessellator tess = Tessellator.instance;
+
+        for (int side = 0; side < 6; side++) {
+            IIcon icon = getEmissiveIcon(block, side, metadata);
+            if (icon == null) continue;
+
+            tess.setColorOpaque_F(1f, 1f, 1f);
+
+            switch (side) {
+                case 0 -> renderer.renderFaceYNeg(block, x, y, z, icon);
+                case 1 -> renderer.renderFaceYPos(block, x, y, z, icon);
+                case 2 -> renderer.renderFaceZNeg(block, x, y, z, icon);
+                case 3 -> renderer.renderFaceZPos(block, x, y, z, icon);
+                case 4 -> renderer.renderFaceXNeg(block, x, y, z, icon);
+                case 5 -> renderer.renderFaceXPos(block, x, y, z, icon);
+            }
+        }
+    }
+}
@@ -8,9 +8,14 @@ import com.gtnewhorizons.angelica.rendering.celeritas.api.IrisShaderProvider;
 import com.gtnewhorizons.angelica.rendering.celeritas.api.IrisShaderProviderHolder;
 import com.gtnewhorizons.angelica.rendering.celeritas.iris.BlockRenderContext;
 import com.gtnewhorizons.angelica.rendering.celeritas.iris.ContextAwareChunkVertexEncoder;
+import com.prupe.mcpatcher.mal.block.RenderBlocksUtils;
 import it.unimi.dsi.fastutil.objects.Reference2ReferenceMap;
+import net.coderbot.iris.block_rendering.BlockMaterialMapping;
+import net.coderbot.iris.block_rendering.BlockRenderingSettings;
+import net.coderbot.iris.block_rendering.NbtConditionalIdMap;
 import net.coderbot.iris.vertices.ExtendedDataHelper;
 import net.minecraft.block.Block;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
@@ -115,6 +120,10 @@ public abstract class AngelicaChunkBuilderMeshingTask extends ChunkBuilderTask<C
            final Map<Block, BlockRenderLayer> blockTypeIds = provider != null ? provider.getBlockTypeIds() : null;
            final BlockRenderContext blockRenderContext = buildContext.getBlockRenderContext();

+            final NbtConditionalIdMap<Block> teMap = BlockRenderingSettings.INSTANCE.getBlockNbtMap();
+            final net.minecraft.world.World mcWorld = Minecraft.getMinecraft().theWorld;
+            final long currentTick = mcWorld != null ? mcWorld.getTotalWorldTime() : 0L;
+
            final boolean threaded = isThreaded();
            final List<DeferredBlock> deferredBlocks = threaded ? new ArrayList<>() : null;

@@ -189,7 +198,7 @@ public abstract class AngelicaChunkBuilderMeshingTask extends ChunkBuilderTask<C
                                    continue;
                                }

-                                renderBlock(block, meta, x, y, z, pass, tessellator, renderBlocks, buffers, buildContext, blockRenderContext, minX, minY, minZ, materialOverride, isShaderPackOverride);
+                                renderBlock(block, meta, x, y, z, pass, tessellator, renderBlocks, buffers, buildContext, blockRenderContext, minX, minY, minZ, materialOverride, isShaderPackOverride, teMap, currentTick);
                            }
                        }

@@ -202,7 +211,7 @@ public abstract class AngelicaChunkBuilderMeshingTask extends ChunkBuilderTask<C

            // Process deferred blocks on main thread if any
            if (deferredBlocks != null && !deferredBlocks.isEmpty()) {
-                processDeferredBlocks(deferredBlocks, buildContext, buffers, region, minX, minY, minZ);
+                processDeferredBlocks(deferredBlocks, buildContext, buffers, region, minX, minY, minZ, teMap, currentTick);
            }

            final Reference2ReferenceMap<TerrainRenderPass, BuiltSectionMeshParts> meshes =
@@ -233,7 +242,7 @@ public abstract class AngelicaChunkBuilderMeshingTask extends ChunkBuilderTask<C
        }
    }

-    protected void renderBlock(Block block, int metadata, int x, int y, int z, int pass, Tessellator tessellator, RenderBlocks renderBlocks, ChunkBuildBuffers buffers, AngelicaChunkBuildContext buildContext, BlockRenderContext blockRenderContext, int originX, int originY, int originZ, Material materialOverride, boolean isShaderPackOverride) {
+    protected void renderBlock(Block block, int metadata, int x, int y, int z, int pass, Tessellator tessellator, RenderBlocks renderBlocks, ChunkBuildBuffers buffers, AngelicaChunkBuildContext buildContext, BlockRenderContext blockRenderContext, int originX, int originY, int originZ, Material materialOverride, boolean isShaderPackOverride, NbtConditionalIdMap<Block> teMap, long currentTick) {

        final var blockMaterial = block.getMaterial();
        final boolean isFluid = blockMaterial == net.minecraft.block.material.Material.water || blockMaterial == net.minecraft.block.material.Material.lava;
@@ -261,8 +270,35 @@ public abstract class AngelicaChunkBuilderMeshingTask extends ChunkBuilderTask<C
            if (isFluid) {
                contextEncoder.prepareToRenderFluid(blockRenderContext, block, lightValue);
            } else {
-                contextEncoder.prepareToRenderBlock(blockRenderContext, block, metadata,
+                int effectiveMeta = metadata;
+                if (BlockRenderingSettings.INSTANCE.hasSnowyEntries()
+                    && BlockRenderingSettings.INSTANCE.getSnowyBlocks().contains(block)
+                    && RenderBlocksUtils.isSnowCovered(renderBlocks.blockAccess, x, y, z)) {
+                    effectiveMeta |= BlockMaterialMapping.SNOWY_META_BIT;
+                }
+                contextEncoder.prepareToRenderBlock(blockRenderContext, block, effectiveMeta,
                    ExtendedDataHelper.BLOCK_RENDER_TYPE, lightValue);
+                // Check for TileEntity NBT-conditional shader block ID override
+                if (teMap != null && teMap.hasConditions(block)) {
+                    final long packedPos = BlockRenderingSettings.packBlockPos(x, y, z);
+                    int teBlockId = BlockRenderingSettings.getCachedTeNbtId(packedPos, currentTick);
+
+                    if (teBlockId == BlockRenderingSettings.CACHE_MISS) {
+                        final TileEntity te = getBlockAccess().getTileEntity(x, y, z);
+                        if (te != null) {
+                            final NBTTagCompound teNbt = new NBTTagCompound();
+                            te.writeToNBT(teNbt);
+                            teBlockId = teMap.resolve(block, teNbt);
+                        } else {
+                            teBlockId = -1;
+                        }
+                        BlockRenderingSettings.cacheTeNbtId(packedPos, teBlockId, currentTick);
+                    }
+
+                    if (teBlockId != -1) {
+                        blockRenderContext.blockId = (short) teBlockId;
+                    }
+                }
            }
        }

@@ -285,7 +321,7 @@ public abstract class AngelicaChunkBuilderMeshingTask extends ChunkBuilderTask<C
        }
    }

-    private void processDeferredBlocks(List<DeferredBlock> deferredBlocks, AngelicaChunkBuildContext buildContext, ChunkBuildBuffers buffers, IBlockAccess region, int minX, int minY, int minZ) {
+    private void processDeferredBlocks(List<DeferredBlock> deferredBlocks, AngelicaChunkBuildContext buildContext, ChunkBuildBuffers buffers, IBlockAccess region, int minX, int minY, int minZ, NbtConditionalIdMap<Block> teMap, long currentTick) {

        final BlockRenderContext blockRenderContext = buildContext.getBlockRenderContext();

@@ -299,7 +335,7 @@ public abstract class AngelicaChunkBuilderMeshingTask extends ChunkBuilderTask<C
                for (DeferredBlock deferred : deferredBlocks) {
                    renderBlock(deferred.block(), deferred.meta(), deferred.x(), deferred.y(), deferred.z(), deferred.pass(),
                        mainTessellator, mainThreadRenderBlocks, buffers, buildContext,
-                        blockRenderContext, minX, minY, minZ, deferred.materialOverride(), deferred.isShaderPackOverride());
+                        blockRenderContext, minX, minY, minZ, deferred.materialOverride(), deferred.isShaderPackOverride(), teMap, currentTick);
                }
            } finally {
                ((StateAwareTessellator)mainTessellator).angelica$setCeleritasMeshing(false);
@@ -7,6 +7,8 @@ import com.gtnewhorizons.angelica.rendering.celeritas.api.IrisShaderProviderHold
 import com.gtnewhorizons.angelica.rendering.celeritas.threading.ChunkTaskProvider;
 import com.gtnewhorizons.angelica.rendering.celeritas.threading.ChunkTaskRegistry;
 import com.gtnewhorizons.angelica.rendering.celeritas.world.cloned.ClonedChunkSectionCache;
+import it.unimi.dsi.fastutil.longs.LongIterator;
+import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.WorldClient;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -40,6 +42,7 @@ public class AngelicaRenderSectionManager extends RenderSectionManager {
    private final WorldClient world;
    private final ClonedChunkSectionCache sectionCache;
    private final ChunkTaskProvider taskProvider;
+    private final LongOpenHashSet biomeRebuildColumns = new LongOpenHashSet();

    public AngelicaRenderSectionManager(RenderPassConfiguration<?> configuration, WorldClient world, int renderDistance, CommandList commandList, int minSection, int maxSection, int requestedThreads, ChunkTaskProvider taskProvider) {
        super(configuration, () -> new AngelicaChunkBuildContext(configuration, world), AngelicaChunkRenderer::new, renderDistance, commandList, minSection, maxSection, requestedThreads, true  /* hasShadowPass = true for Iris */);
@@ -144,9 +147,35 @@ public class AngelicaRenderSectionManager extends RenderSectionManager {
        this.sectionCache.invalidate(section.getChunkX(), section.getChunkY(), section.getChunkZ());
    }

+    public void onBiomesChanged(int chunkX, int chunkZ) {
+        for (int dx = -1; dx <= 1; dx++) {
+            for (int dz = -1; dz <= 1; dz++) {
+                this.biomeRebuildColumns.add(PositionUtil.packChunk(chunkX + dx, chunkZ + dz));
+            }
+        }
+    }
+
+    private void flushBiomeRebuilds() {
+        if (this.biomeRebuildColumns.isEmpty()) {
+            return;
+        }
+        final int sectionCountY = this.world.getHeight() >> 4;
+        for (final LongIterator it = this.biomeRebuildColumns.iterator(); it.hasNext(); ) {
+            final long column = it.nextLong();
+            final int cx = PositionUtil.unpackChunkX(column);
+            final int cz = PositionUtil.unpackChunkZ(column);
+            for (int cy = 0; cy < sectionCountY; cy++) {
+                this.sectionCache.invalidate(cx, cy, cz);
+                this.scheduleRebuild(cx, cy, cz, false);
+            }
+        }
+        this.biomeRebuildColumns.clear();
+    }
+
    @Override
    public void updateChunks(boolean updateImmediately) {
        this.sectionCache.cleanup();
+        this.flushBiomeRebuilds();
        super.updateChunks(updateImmediately);
    }

@@ -1,6 +1,7 @@
 package com.gtnewhorizons.angelica.rendering.celeritas;

 import com.gtnewhorizons.angelica.config.AngelicaConfig;
+import com.gtnewhorizons.angelica.event.ChunkBiomeDataChangedEvent;
 import com.gtnewhorizons.angelica.glsm.GLStateManager;
 import com.gtnewhorizons.angelica.loading.AngelicaClientTweaker;
 import org.embeddedt.embeddium.impl.gl.device.GLRenderDevice;
@@ -12,8 +13,16 @@ public class CeleritasSetup {
    public static void ensureInitialized() {
        if (!initialized && AngelicaConfig.enableCeleritas) {
            GLRenderDevice.VANILLA_STATE_RESETTER = () -> GLStateManager.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0);
+            ChunkBiomeDataChangedEvent.BUS.addListener(CeleritasSetup::onChunkBiomeDataChanged);
            AngelicaClientTweaker.LOGGER.debug("Celeritas init");
            initialized = true;
        }
    }
+
+    private static void onChunkBiomeDataChanged(ChunkBiomeDataChangedEvent event) {
+        final CeleritasWorldRenderer renderer = CeleritasWorldRenderer.getInstanceOrNull();
+        if (renderer != null && renderer.isActive()) {
+            renderer.getRenderSectionManager().onBiomesChanged(event.chunkX, event.chunkZ);
+        }
+    }
 }
@@ -74,6 +74,10 @@ public class CeleritasWorldRenderer extends SimpleWorldRenderer<WorldClient, Ang
        return instance;
    }

+    public static CeleritasWorldRenderer getInstanceOrNull() {
+        return instance;
+    }
+
    public AngelicaRenderSectionManager getRenderSectionManager() {
        return this.renderSectionManager;
    }
@@ -118,7 +122,16 @@ public class CeleritasWorldRenderer extends SimpleWorldRenderer<WorldClient, Ang
    protected ChunkRenderMatrices createChunkRenderMatrices() {
        final boolean shadowPass = renderSectionManager.isInShadowPass();
        final Matrix4f projection = shadowPass ? ShadowRenderer.PROJECTION : RenderingState.INSTANCE.getProjectionMatrix();
-        final Matrix4f modelView = shadowPass ? ShadowRenderer.MODELVIEW : RenderingState.INSTANCE.getModelViewMatrix();
+        Matrix4f modelView = shadowPass ? ShadowRenderer.MODELVIEW : RenderingState.INSTANCE.getModelViewMatrix();
+        if (!shadowPass) {
+            // Minecraft's setupCameraTransform bakes translate(0, -eyeHeight, 0) into the modelview.
+            // Chunk rendering passes eye position to drawChunkLayer so vertices arrive at
+            // the shader as (vert_world - eye).
+            final Entity view = mc.renderViewEntity;
+            if (view != null) {
+                modelView = new Matrix4f(modelView).translate(0f, view.getEyeHeight(), 0f);
+            }
+        }
        return new ChunkRenderMatrices(projection, modelView);
    }

@@ -26,6 +26,11 @@ public class IrisExtendedChunkVertexEncoder implements ContextAwareChunkVertexEn
    private static final int NORMAL_OFFSET = IrisExtendedChunkVertexType.VERTEX_FORMAT.getAttribute("iris_Normal").getPointer();
    private static final int MC_ENTITY_OFFSET = IrisExtendedChunkVertexType.VERTEX_FORMAT.getAttribute("mc_Entity").getPointer();
    private static final int MID_BLOCK_OFFSET = IrisExtendedChunkVertexType.VERTEX_FORMAT.getAttribute("at_midBlock").getPointer();
+    private static final int A_TEXCOORD_OFFSET = IrisExtendedChunkVertexType.VERTEX_FORMAT.getAttribute("a_TexCoord").getPointer();
+
+    // One unit of UV-space shift toward the quad centroid. Stops bilinear /
+    // mipmap sampling from bleeding pixels from neighboring atlas cells.
+    private static final float TEX_CENTROID_BIAS = 1.0f / 32768.0f;

    private final ChunkVertexEncoder baseEncoder = IrisExtendedChunkVertexType.BASE_TYPE.createEncoder();
    private final CeleritasQuadView quad = new CeleritasQuadView();
@@ -98,6 +103,14 @@ public class IrisExtendedChunkVertexEncoder implements ContextAwareChunkVertexEn
            memPutInt(ptr + MID_TEX_OFFSET - STRIDE * 2, midUV);
            memPutInt(ptr + MID_TEX_OFFSET - STRIDE * 3, midUV);

+            for (int vIdx = 0; vIdx < 4; vIdx++) {
+                final long uvBase = ptr - (long) (3 - vIdx) * STRIDE + A_TEXCOORD_OFFSET;
+                final float vU = memGetFloat(uvBase);
+                final float vV = memGetFloat(uvBase + 4L);
+                memPutFloat(uvBase, vU + (vU < midU ? TEX_CENTROID_BIAS : -TEX_CENTROID_BIAS));
+                memPutFloat(uvBase + 4L, vV + (vV < midV ? TEX_CENTROID_BIAS : -TEX_CENTROID_BIAS));
+            }
+
            quad.setup(ptr, STRIDE);
            NormalHelper.computeFaceNormal(normal, quad);
            final int packedNormal = NormI8.pack(normal);
@@ -1,6 +1,5 @@
 package com.gtnewhorizons.angelica.rendering.celeritas.world.cloned;

-import com.falsepattern.endlessids.mixin.helpers.ChunkBiomeHook;
 import com.gtnewhorizons.angelica.api.BlockLightProvider;
 import com.gtnewhorizons.angelica.api.SectionLightData;
 import com.gtnewhorizons.angelica.compat.ExtendedBlockStorageExt;
@@ -20,6 +19,7 @@ import net.minecraft.world.ChunkPosition;
 import net.minecraft.world.EnumSkyBlock;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.biome.WorldChunkManager;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.NibbleArray;
 import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
@@ -62,50 +62,51 @@ public class ClonedChunkSection {
        this.pos = pos;
        this.data = new ExtendedBlockStorageExt(chunk, section);

-        final int bArrLength;
-        if (ModStatus.isEIDBiomeLoaded) {
-            bArrLength = ((ChunkBiomeHook) chunk).getBiomeShortArray().length;
-        } else {
-            bArrLength = chunk.getBiomeArray().length;
-        }
-        this.biomeData = new BiomeGenBase[bArrLength];
+        this.biomeData = new BiomeGenBase[16 * 16];

        copyBlockEntities(chunk, pos);

-        // Fill biome data
-        for (int z = pos.getMinZ(); z <= pos.getMaxZ(); z++) {
-            for (int x = pos.getMinX(); x <= pos.getMaxX(); x++) {
-                this.biomeData[(x & 15) | ((z & 15) << 4)] = world.getBiomeGenForCoords(x, z);
-            }
-        }
+        fillBiomeData(chunk);

        this.sectionLightData = BlockLightProvider.getInstance().prepareSectionData(chunk, pos.y);
    }

+    private void fillBiomeData(Chunk chunk) {
+        final WorldChunkManager wcm = world.getWorldChunkManager();
+        for (int lz = 0; lz < 16; lz++) {
+            for (int lx = 0; lx < 16; lx++) {
+                this.biomeData[lx | (lz << 4)] = chunk.getBiomeGenForWorldCoords(lx, lz, wcm);
+            }
+        }
+    }
+
    @SuppressWarnings("unchecked")
    private void copyBlockEntities(Chunk chunk, ChunkSectionPos pos) {
        this.tileEntities.clear();

        final ConcurrentTileEntityMap map = ((IChunkTileEntityMapHolder) chunk).angelica$getConcurrentTEMap();

-        map.withReadLock(() -> {
+        map.readLock();
+        try {
            final Object2ObjectOpenHashMap<ChunkPosition, TileEntity> delegate = map.getDelegate();

-            if (delegate.isEmpty()) return;
+            if (!delegate.isEmpty()) {
+                final int minY = pos.getMinY();
+                final int maxY = pos.getMaxY();

-            final int minY = pos.getMinY();
-            final int maxY = pos.getMaxY();
+                for (Object2ObjectMap.Entry<ChunkPosition, TileEntity> entry : Object2ObjectMaps.fastIterable(delegate)) {
+                    final ChunkPosition tePos = entry.getKey();
+                    if (tePos.chunkPosY < minY || tePos.chunkPosY > maxY) continue;

-            for (Object2ObjectMap.Entry<ChunkPosition, TileEntity> entry : Object2ObjectMaps.fastIterable(delegate)) {
-                final ChunkPosition tePos = entry.getKey();
-                if (tePos.chunkPosY < minY || tePos.chunkPosY > maxY) continue;
-
-                final TileEntity te = entry.getValue();
-                if (te != null && !te.isInvalid()) {
-                    this.tileEntities.put(ChunkSectionPos.packLocal(tePos.chunkPosX & 15, tePos.chunkPosY & 15, tePos.chunkPosZ & 15), te);
+                    final TileEntity te = entry.getValue();
+                    if (te != null && !te.isInvalid()) {
+                        this.tileEntities.put(ChunkSectionPos.packLocal(tePos.chunkPosX & 15, tePos.chunkPosY & 15, tePos.chunkPosZ & 15), te);
+                    }
                }
            }
-        });
+        } finally {
+            map.readUnlock();
+        }

        this.tileEntities.trim();
    }
@@ -21,7 +21,13 @@ public class ClonedChunkSectionCache {

    public synchronized void cleanup() {
        this.time = getMonotonicTimeSource();
-        this.byPosition.values().removeIf(entry -> this.time > (entry.getLastUsedTimestamp() + MAX_CACHE_DURATION));
+        while (!this.byPosition.isEmpty()) {
+            final ClonedChunkSection oldest = this.byPosition.get(this.byPosition.firstLongKey());
+            if (this.time <= oldest.getLastUsedTimestamp() + MAX_CACHE_DURATION) {
+                break;
+            }
+            this.byPosition.removeFirst();
+        }
    }

    public synchronized ClonedChunkSection acquire(int x, int y, int z) {
@@ -32,18 +38,17 @@ public class ClonedChunkSectionCache {
            while (this.byPosition.size() >= MAX_CACHE_SIZE) {
                this.byPosition.removeFirst();
            }
-            section = this.createSection(x, y, z);
+            section = this.createSection(key, x, y, z);
        }

        section.setLastUsedTimestamp(this.time);
        return section;
    }

-    private ClonedChunkSection createSection(int x, int y, int z) {
+    private ClonedChunkSection createSection(long key, int x, int y, int z) {
        final ClonedChunkSection section = new ClonedChunkSection(this, this.world);
-        final ChunkSectionPos pos = ChunkSectionPos.from(x, y, z);
-        section.init(pos);
-        this.byPosition.putAndMoveToLast(pos.asLong(), section);
+        section.init(ChunkSectionPos.from(x, y, z));
+        this.byPosition.putAndMoveToLast(key, section);
        return section;
    }

@@ -0,0 +1,87 @@
+package com.gtnewhorizons.angelica.rendering.items;
+
+import com.gtnewhorizons.angelica.glsm.DisplayListManager;
+import com.gtnewhorizons.angelica.glsm.GLStateManager;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
+import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.IReloadableResourceManager;
+import org.lwjgl.opengl.GL11;
+
+public class BlockRenderListManager {
+    private static final BlockMeta key = new BlockMeta();
+
+    private static final Object2IntOpenHashMap<BlockMeta> displayListMap = new Object2IntOpenHashMap<>();
+
+
+    private static final int ISBRH_CUTOFF = 40;
+
+    private static final boolean[] notISBRH = new boolean[ISBRH_CUTOFF];
+
+    static {
+        for (int i : new int[]
+            { 0, 31, 39, 16, 26, 1, 19, 23, 13, 6, 2, 10, 27, 11, 21, 32, 35, 34, 38 }
+        ) {
+            notISBRH[i] = true;
+        }
+    }
+
+    public static boolean isISBRH(int renderType) {
+        return renderType >= ISBRH_CUTOFF || renderType < 0 || !notISBRH[renderType];
+    }
+
+    public static int getDisplayList(Block block, int meta) {
+        key.block = block;
+        key.meta = meta;
+        return displayListMap.getInt(key);
+    }
+
+    public static int startCompiling() {
+        final int list = GLStateManager.glGenLists(1);
+        GLStateManager.glNewList(list, GL11.GL_COMPILE);
+        return list;
+    }
+
+    public static void endCompiling(int list, Block block, int meta) {
+        DisplayListManager.discardMatrixTransforms();
+        GLStateManager.glEndList();
+        displayListMap.put(new BlockMeta(block, meta), list);
+    }
+
+    public static void registerReloadListener(){
+        IReloadableResourceManager resourceManager = (IReloadableResourceManager) Minecraft.getMinecraft()
+            .getResourceManager();
+        resourceManager.registerReloadListener(_ -> {
+            for (int list : displayListMap.values()) {
+                GLStateManager.glDeleteLists(list, 1);
+            }
+            displayListMap.clear();
+        });
+    }
+
+
+    private static final class BlockMeta {
+        private Block block;
+        private int meta;
+
+        public BlockMeta() {
+
+        }
+
+        public BlockMeta(Block block, int meta) {
+            this.block = block;
+            this.meta = meta;
+        }
+
+        @Override
+        public int hashCode() {
+            return (block.hashCode() * 31 + meta) * 31;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (!(obj instanceof BlockMeta other)) return false;
+            return block == other.block && meta == other.meta;
+        }
+    }
+}
@@ -23,7 +23,7 @@
 * along with FalseTweaks. If not, see <https://www.gnu.org/licenses/>.
 */

-package com.gtnewhorizons.angelica.rendering;
+package com.gtnewhorizons.angelica.rendering.items;

 import com.gtnewhorizon.gtnhlib.client.renderer.DirectTessellator;
 import com.gtnewhorizon.gtnhlib.client.renderer.TessellatorManager;
@@ -37,6 +37,7 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.IReloadableResourceManager;
 import org.lwjgl.opengl.GL11;

 public class ItemRenderListManager {
@@ -98,6 +99,17 @@ public class ItemRenderListManager {
        return Minecraft.getMinecraft().thePlayer.ticksExisted;
    }

+    public static void registerReloadListener(){
+        IReloadableResourceManager resourceManager = (IReloadableResourceManager) Minecraft.getMinecraft()
+            .getResourceManager();
+        resourceManager.registerReloadListener(_ -> {
+            for (CachedVBO value : vboCache.values()) {
+                value.delete();
+            }
+            vboCache.clear();
+        });
+    }
+
    public static final class CachedVBO {
        private final IVertexArrayObject vertexBuffer;
        private final IndexBuffer ebo;
@@ -42,6 +42,14 @@ public class ConcurrentTileEntityMap implements Map<ChunkPosition, TileEntity> {
        }
    }

+    public void readLock() {
+        lock.readLock().lock();
+    }
+
+    public void readUnlock() {
+        lock.readLock().unlock();
+    }
+
    public void withWriteLock(Runnable action) {
        lock.writeLock().lock();
        try {
@@ -158,6 +158,34 @@ final class BlockOrientation extends RenderBlockState {
        return origIcon == neighbor.getIcon(blockAccess, neighborX, neighborY, neighborZ, getTextureFaceOrig());
    }

+    @Override
+    public BlockOrientation copy() {
+        BlockOrientation copy = new BlockOrientation();
+        copy.x = x;
+        copy.y = y;
+        copy.z = z;
+        copy.metadata = metadata;
+        copy.altMetadata = altMetadata;
+        copy.metadataBits = metadataBits;
+        copy.renderType = renderType;
+        copy.blockFace = blockFace;
+        copy.textureFace = textureFace;
+        copy.textureFaceOrig = textureFaceOrig;
+        copy.rotateUV = rotateUV;
+
+        copy.blockAccess = blockAccess;
+        copy.block = block;
+        copy.useAO = useAO;
+        copy.inWorld = inWorld;
+        copy.matcher = matcher;
+        copy.offsetsComputed = offsetsComputed;
+        copy.haveOffsets = haveOffsets;
+        copy.dx = dx;
+        copy.dy = dy;
+        copy.dz = dz;
+        return copy;
+    }
+
    void setBlock(Block block, IBlockAccess blockAccess, int x, int y, int z) {
        this.block = block;
        this.blockAccess = blockAccess;
@@ -15,6 +15,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.IBlockAccess;

+import com.github.bsideup.jabel.Desugar;
 import com.prupe.mcpatcher.MCLogger;
 import com.prupe.mcpatcher.MCPatcherUtils;
 import com.prupe.mcpatcher.mal.block.BlockAPI;
@@ -43,13 +44,16 @@ public class CTMUtils {
    private static Overrides newOverrides = null;
    private static TileLoader tileLoader;

-    private static final ThreadLocal<TileOverrideImpl.CTMCompact> CURRENT_COMPACT = new ThreadLocal<>();
+    @Desugar
+    public record CTMCompactContext(TileOverrideImpl.CTMCompact compact, RenderBlockState renderBlockState) {}

-    public static void setCurrentCompact(TileOverrideImpl.CTMCompact compact) {
-        CURRENT_COMPACT.set(compact);
+    private static final ThreadLocal<CTMCompactContext> CURRENT_COMPACT = new ThreadLocal<>();
+
+    public static void setCurrentCompact(TileOverrideImpl.CTMCompact compact, RenderBlockState renderBlockState) {
+        CURRENT_COMPACT.set(new CTMCompactContext(compact, renderBlockState.copy()));
    }

-    public static TileOverrideImpl.CTMCompact getCurrentCompact() {
+    public static CTMCompactContext getCurrentCompact() {
        return CURRENT_COMPACT.get();
    }

@@ -180,6 +184,7 @@ public class CTMUtils {
            local.renderBlockState.setBlock(block, blockAccess, x, y, z);
            local.renderBlockState.setFace(face);
            TileOverride lastOverride = local.ijkIterator.go(local.renderBlockState, icon);
+            local.renderBlockState.blockAccess = null;
            if (lastOverride != null) {
                return skipDefaultRendering(block) ? RenderBlocksUtils.blankIcon : local.ijkIterator.getIcon();
            }
@@ -1,70 +1,18 @@
 package com.prupe.mcpatcher.ctm;

-import com.github.bsideup.jabel.Desugar;
 import it.unimi.dsi.fastutil.ints.Int2IntMap;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;

 public final class CompactCtmQuadProcessor {

-    private static final int LEFT = 0;
-    private static final int UP_LEFT = 1;
-    private static final int UP = 2;
-    private static final int UP_RIGHT = 3;
-    private static final int RIGHT = 4;
-    private static final int DOWN_RIGHT = 5;
-    private static final int DOWN = 6;
-    private static final int DOWN_LEFT = 7;
-
    private static final int SPRITE_DEFAULT = 0;
    private static final int SPRITE_ALL = 1;
    private static final int SPRITE_HORIZONTAL = 2;
    private static final int SPRITE_VERTICAL = 3;
    private static final int SPRITE_MIXED = 4;

-    private static final int[] CTM_47_BY_CONNECTIONS = {
-        0,3,0,3,12,5,12,15,0,3,0,3,12,5,12,15,
-        1,2,1,2,4,7,4,29,1,2,1,2,13,31,13,14,
-        0,3,0,3,12,5,12,15,0,3,0,3,12,5,12,15,
-        1,2,1,2,4,7,4,29,1,2,1,2,13,31,13,14,
-        36,17,36,17,24,19,24,43,36,17,36,17,24,19,24,43,
-        16,18,16,18,6,46,6,21,16,18,16,18,28,9,28,22,
-        36,17,36,17,24,19,24,43,36,17,36,17,24,19,24,43,
-        37,40,37,40,30,8,30,34,37,40,37,40,25,23,25,45,
-        0,3,0,3,12,5,12,15,0,3,0,3,12,5,12,15,
-        1,2,1,2,4,7,4,29,1,2,1,2,13,31,13,14,
-        0,3,0,3,12,5,12,15,0,3,0,3,12,5,12,15,
-        1,2,1,2,4,7,4,29,1,2,1,2,13,31,13,14,
-        36,39,36,39,24,41,24,27,36,39,36,39,24,41,24,27,
-        16,42,16,42,6,20,6,10,16,42,16,42,28,35,28,44,
-        36,39,36,39,24,41,24,27,36,39,36,39,24,41,24,27,
-        37,38,37,38,30,11,30,32,37,38,37,38,25,33,25,26
-    };
-
-    /**
-     * Face-local basis:
-     * right = increasing U on the face
-     * down  = increasing V on the face
-     */
-    private static final FaceBasis[] FACE_BASIS = {
-        new FaceBasis( 1,  0,  0,  0,  0,  1), // 0: Y-
-        new FaceBasis( 1,  0,  0,  0,  0,  1), // 1: Y+
-        new FaceBasis(-1,  0,  0,  0, -1,  0), // 2: Z-
-        new FaceBasis( 1,  0,  0,  0, -1,  0), // 3: Z+
-        new FaceBasis( 0,  0,  1,  0, -1,  0), // 4: X-
-        new FaceBasis( 0,  0, -1,  0, -1,  0)  // 5: X+
-    };
-
-    /**
-     * Neighbor offsets in face-local coordinates:
-     * 0 = left, 1 = up-left, 2 = up, 3 = up-right,
-     * 4 = right, 5 = down-right, 6 = down, 7 = down-left
-     */
-    private static final int[] RIGHT_FACTOR = {-1, -1, 0, 1, 1, 1, 0, -1};
-    private static final int[] DOWN_FACTOR  = { 0, -1, -1, -1, 0, 1, 1, 1};
-
    /**
     * Quadrant side references:
     * 0 = top-left
@@ -72,41 +20,58 @@ public final class CompactCtmQuadProcessor {
     * 2 = bottom-right
     * 3 = bottom-left
     */
-    private static final int[] QUAD_A = {LEFT, UP, RIGHT, DOWN};
-    private static final int[] QUAD_B = {UP, RIGHT, DOWN, LEFT};
-    private static final int[] QUAD_DIAG = {UP_LEFT, UP_RIGHT, DOWN_RIGHT, DOWN_LEFT};
+    private static final int[] QUAD_A    = {RenderBlockState.REL_L, RenderBlockState.REL_U,
+                                            RenderBlockState.REL_R, RenderBlockState.REL_D};
+    private static final int[] QUAD_B    = {RenderBlockState.REL_U, RenderBlockState.REL_R,
+                                            RenderBlockState.REL_D, RenderBlockState.REL_L};
+    private static final int[] QUAD_DIAG = {RenderBlockState.REL_UL, RenderBlockState.REL_UR,
+                                            RenderBlockState.REL_DR, RenderBlockState.REL_DL};
+
+    /** Maps split-face quadrant (0=TL,1=TR,2=BR,3=BL face-local) to RenderBlocks per-face TL/TR/BR/BL orientation. */
+    private static final int[][] RENDER_FACE_QUADRANT_MAP = {
+        {3, 2, 1, 0}, // Y-
+        {2, 3, 0, 1}, // Y+
+        {3, 0, 1, 2}, // Z-
+        {0, 1, 2, 3}, // Z+
+        {3, 0, 1, 2}, // X-
+        {1, 2, 3, 0}  // X+
+    };
+    private static final float[] QUADRANT_MIN_U = {0.0f, 0.5f, 0.5f, 0.0f};
+    private static final float[] QUADRANT_MIN_V = {0.0f, 0.0f, 0.5f, 0.5f};

    private final IIcon[] sprites;
    private final CompactConnectingCtmProperties props;
+    private final TileOverrideImpl.CTMCompact override;

-    CompactCtmQuadProcessor(IIcon[] sprites, CompactConnectingCtmProperties props) {
+    CompactCtmQuadProcessor(IIcon[] sprites, CompactConnectingCtmProperties props, TileOverrideImpl.CTMCompact compact) {
        this.sprites = new IIcon[5];
        if (sprites != null) {
            System.arraycopy(sprites, 0, this.sprites, 0, Math.min(sprites.length, this.sprites.length));
        }
        this.props = props;
+        this.override = compact;
    }

-    public boolean processFace(RenderBlocks rb, IBlockAccess world, int x, int y, int z, int face, IIcon origIcon) {
-        int connections = CtmConnectionHelper.getConnections(world, x, y, z, face, props.getInnerSeams());
+    public boolean processFace(RenderBlocks rb, RenderBlockState renderBlockState, IIcon origIcon) {
+        int neighborBits = override.getNeighborBits(renderBlockState, origIcon);

-        int ctmIndex = CTM_47_BY_CONNECTIONS[connections & 0xFF];
+        int ctmIndex = TileOverride.neighborMap[neighborBits & 0xFF];
        IIcon replacement = getReplacementIcon(ctmIndex);
        if (replacement != null) {
-            renderWholeFace(rb, world, x, y, z, face, replacement);
+            renderWholeFace(rb, renderBlockState, replacement);
            return true;
        }

-        if (connections == 0 || connections == 0xFF) {
-            IIcon sprite = sprites[getCompactSpriteIndex(connections)];
+        if (neighborBits == 0 || neighborBits == 0xFF) {
+            IIcon sprite = sprites[getCompactSpriteIndex(neighborBits)];
            if (sprite != null) {
-                renderWholeFace(rb, world, x, y, z, face, sprite);
+                renderWholeFace(rb, renderBlockState, sprite);
                return true;
            }
            return false;
        }

-        renderSplitFace(rb, world, x, y, z, face, connections);
+        renderSplitFace(rb, renderBlockState, neighborBits);
        return true;
    }

@@ -136,54 +101,137 @@ public final class CompactCtmQuadProcessor {
            return SPRITE_ALL;
        }

-        if ((connections & ((1 << LEFT) | (1 << RIGHT))) == ((1 << LEFT) | (1 << RIGHT))) {
+        if ((connections & ((1 << RenderBlockState.REL_L) | (1 << RenderBlockState.REL_R))) ==
+            ((1 << RenderBlockState.REL_L) | (1 << RenderBlockState.REL_R))) {
            return SPRITE_HORIZONTAL;
        }

-        if ((connections & ((1 << UP) | (1 << DOWN))) == ((1 << UP) | (1 << DOWN))) {
+        if ((connections & ((1 << RenderBlockState.REL_U) | (1 << RenderBlockState.REL_D))) ==
+            ((1 << RenderBlockState.REL_U) | (1 << RenderBlockState.REL_D))) {
            return SPRITE_VERTICAL;
        }

        return SPRITE_DEFAULT;
    }

-    private void renderSplitFace(RenderBlocks rb, IBlockAccess world, int x, int y, int z, int face, int connections) {
-        Block block = world.getBlock(x, y, z);
+    private void renderSplitFace(RenderBlocks rb, RenderBlockState renderBlockState, int connections) {
+        final int face = renderBlockState.getBlockFace();

-        double minX = rb.renderMinX;
-        double minY = rb.renderMinY;
-        double minZ = rb.renderMinZ;
-        double maxX = rb.renderMaxX;
-        double maxY = rb.renderMaxY;
-        double maxZ = rb.renderMaxZ;
+        final double minX = rb.renderMinX, minY = rb.renderMinY, minZ = rb.renderMinZ;
+        final double maxX = rb.renderMaxX, maxY = rb.renderMaxY, maxZ = rb.renderMaxZ;
+
+        // Without AO the corner color/brightness fields are unused; skip the lighting dance.
+        final boolean ao = rb.enableAO;
+
+        final float rTL, rTR, rBL, rBR, gTL, gTR, gBL, gBR, bTL, bTR, bBL, bBR;
+        final int brTL, brTR, brBL, brBR;
+        if (ao) {
+            rTL = rb.colorRedTopLeft;       rTR = rb.colorRedTopRight;
+            rBL = rb.colorRedBottomLeft;    rBR = rb.colorRedBottomRight;
+            gTL = rb.colorGreenTopLeft;     gTR = rb.colorGreenTopRight;
+            gBL = rb.colorGreenBottomLeft;  gBR = rb.colorGreenBottomRight;
+            bTL = rb.colorBlueTopLeft;      bTR = rb.colorBlueTopRight;
+            bBL = rb.colorBlueBottomLeft;   bBR = rb.colorBlueBottomRight;
+            brTL = rb.brightnessTopLeft;    brTR = rb.brightnessTopRight;
+            brBL = rb.brightnessBottomLeft; brBR = rb.brightnessBottomRight;
+        } else {
+            rTL = rTR = rBL = rBR = 0f;
+            gTL = gTR = gBL = gBR = 0f;
+            bTL = bTR = bBL = bBR = 0f;
+            brTL = brTR = brBL = brBR = 0;
+        }

        for (int q = 0; q < 4; q++) {
-            IIcon icon = sprites[getQuadrantSprite(q, connections)];
+            final IIcon icon = sprites[getQuadrantSprite(q, connections)];
            if (icon == null) {
                continue;
            }

+            if (ao) {
+                applyQuadrantLighting(rb, face, q, rTL, rTR, rBL, rBR, gTL, gTR, gBL, gBR, bTL, bTR, bBL, bBR, brTL, brTR, brBL, brBR);
+            }
            setQuadrantBounds(rb, face, q, minX, minY, minZ, maxX, maxY, maxZ);
            rb.overrideBlockTexture = icon;
-            renderFace(rb, block, x, y, z, face, icon);
+            renderFace(rb, renderBlockState, icon);
        }

+        if (ao) {
+            rb.colorRedTopLeft = rTL;       rb.colorRedTopRight = rTR;
+            rb.colorRedBottomLeft = rBL;    rb.colorRedBottomRight = rBR;
+            rb.colorGreenTopLeft = gTL;     rb.colorGreenTopRight = gTR;
+            rb.colorGreenBottomLeft = gBL;  rb.colorGreenBottomRight = gBR;
+            rb.colorBlueTopLeft = bTL;      rb.colorBlueTopRight = bTR;
+            rb.colorBlueBottomLeft = bBL;   rb.colorBlueBottomRight = bBR;
+            rb.brightnessTopLeft = brTL;    rb.brightnessTopRight = brTR;
+            rb.brightnessBottomLeft = brBL; rb.brightnessBottomRight = brBR;
+        }
        rb.overrideBlockTexture = null;
        rb.setRenderBounds(minX, minY, minZ, maxX, maxY, maxZ);
    }

-    private void renderWholeFace(RenderBlocks rb, IBlockAccess world, int x, int y, int z, int face, IIcon icon) {
-        Block block = world.getBlock(x, y, z);
+    private static void applyQuadrantLighting(RenderBlocks rb, int face, int quadrant, float rTL, float rTR, float rBL, float rBR, float gTL, float gTR, float gBL, float gBR, float bTL, float bTR, float bBL, float bBR, int brTL, int brTR, int brBL, int brBR) {
+        final int rq = RENDER_FACE_QUADRANT_MAP[face][quadrant];
+        final float u0 = QUADRANT_MIN_U[rq], u1 = u0 + 0.5f;
+        final float v0 = QUADRANT_MIN_V[rq], v1 = v0 + 0.5f;
+
+        rb.colorRedTopLeft      = bilerp(rTL, rTR, rBL, rBR, u0, v0);
+        rb.colorRedTopRight     = bilerp(rTL, rTR, rBL, rBR, u1, v0);
+        rb.colorRedBottomLeft   = bilerp(rTL, rTR, rBL, rBR, u0, v1);
+        rb.colorRedBottomRight  = bilerp(rTL, rTR, rBL, rBR, u1, v1);
+
+        rb.colorGreenTopLeft     = bilerp(gTL, gTR, gBL, gBR, u0, v0);
+        rb.colorGreenTopRight    = bilerp(gTL, gTR, gBL, gBR, u1, v0);
+        rb.colorGreenBottomLeft  = bilerp(gTL, gTR, gBL, gBR, u0, v1);
+        rb.colorGreenBottomRight = bilerp(gTL, gTR, gBL, gBR, u1, v1);
+
+        rb.colorBlueTopLeft      = bilerp(bTL, bTR, bBL, bBR, u0, v0);
+        rb.colorBlueTopRight     = bilerp(bTL, bTR, bBL, bBR, u1, v0);
+        rb.colorBlueBottomLeft   = bilerp(bTL, bTR, bBL, bBR, u0, v1);
+        rb.colorBlueBottomRight  = bilerp(bTL, bTR, bBL, bBR, u1, v1);
+
+        rb.brightnessTopLeft     = bilerpLight(brTL, brTR, brBL, brBR, u0, v0);
+        rb.brightnessTopRight    = bilerpLight(brTL, brTR, brBL, brBR, u1, v0);
+        rb.brightnessBottomLeft  = bilerpLight(brTL, brTR, brBL, brBR, u0, v1);
+        rb.brightnessBottomRight = bilerpLight(brTL, brTR, brBL, brBR, u1, v1);
+    }
+
+    private static float bilerp(float c00, float c10, float c01, float c11, float u, float v) {
+        final float top = c00 + (c10 - c00) * u;
+        final float bot = c01 + (c11 - c01) * u;
+        return top + (bot - top) * v;
+    }
+
+    /** Brightness packs sky in upper 16 bits, block in lower; bilerp each independently then repack. */
+    private static int bilerpLight(int c00, int c10, int c01, int c11, float u, float v) {
+        final int b00 = c00 & 0xFFFF, b10 = c10 & 0xFFFF, b01 = c01 & 0xFFFF, b11 = c11 & 0xFFFF;
+        final int s00 = c00 >>> 16,   s10 = c10 >>> 16,   s01 = c01 >>> 16,   s11 = c11 >>> 16;
+
+        final float bTop = b00 + (b10 - b00) * u;
+        final float bBot = b01 + (b11 - b01) * u;
+        final float sTop = s00 + (s10 - s00) * u;
+        final float sBot = s01 + (s11 - s01) * u;
+
+        final int block = Math.round(bTop + (bBot - bTop) * v);
+        final int sky   = Math.round(sTop + (sBot - sTop) * v);
+        return (sky << 16) | (block & 0xFFFF);
+    }
+
+    private void renderWholeFace(RenderBlocks rb, RenderBlockState renderBlockState, IIcon icon) {
        IIcon saved = rb.overrideBlockTexture;
        rb.overrideBlockTexture = icon;
        try {
-            renderFace(rb, block, x, y, z, face, icon);
+            renderFace(rb, renderBlockState, icon);
        } finally {
            rb.overrideBlockTexture = saved;
        }
    }

-    private void renderFace(RenderBlocks rb, Block block, int x, int y, int z, int face, IIcon icon) {
+    private void renderFace(RenderBlocks rb, RenderBlockState renderBlockState, IIcon icon) {
+        int face = renderBlockState.getBlockFace();
+        Block block = renderBlockState.getBlock();
+        int x = renderBlockState.getX();
+        int y = renderBlockState.getY();
+        int z = renderBlockState.getZ();
        boolean originalFlip = rb.field_152631_f;
        rb.field_152631_f = (face == 2 || face == 5);
        try {
@@ -271,52 +319,10 @@ public final class CompactCtmQuadProcessor {

        if (connA ^ connB) {
            int connectedBit = connA ? sideA : sideB;
-            return (connectedBit == LEFT || connectedBit == RIGHT) ? SPRITE_VERTICAL : SPRITE_HORIZONTAL;
+            return (connectedBit == RenderBlockState.REL_L || connectedBit == RenderBlockState.REL_R) ? SPRITE_VERTICAL
+                : SPRITE_HORIZONTAL;
        }

        return SPRITE_DEFAULT;
    }
-
-    @Desugar
-    private record FaceBasis(int rightX, int rightY, int rightZ, int downX, int downY, int downZ) { }
-
-    private static final class CtmConnectionHelper {
-
-        public static int getConnections(IBlockAccess world, int x, int y, int z, int face, boolean innerSeams) {
-            Block self = world.getBlock(x, y, z);
-            FaceBasis basis = FACE_BASIS[face];
-
-            int bits = 0;
-
-            for (int i = 0; i < 8; i++) {
-                int dx = RIGHT_FACTOR[i] * basis.rightX + DOWN_FACTOR[i] * basis.downX;
-                int dy = RIGHT_FACTOR[i] * basis.rightY + DOWN_FACTOR[i] * basis.downY;
-                int dz = RIGHT_FACTOR[i] * basis.rightZ + DOWN_FACTOR[i] * basis.downZ;
-
-                int nx = x + dx;
-                int ny = y + dy;
-                int nz = z + dz;
-
-                if (world.getBlock(nx, ny, nz) != self) {
-                    continue;
-                }
-
-                if (innerSeams && !shouldRenderInnerSeam(world, nx, ny, nz, face)) {
-                    continue;
-                }
-
-                bits |= (1 << i);
-            }
-
-            return bits;
-        }
-
-        private static boolean shouldRenderInnerSeam(IBlockAccess world, int x, int y, int z, int face) {
-            int[] normal = RenderBlockState.NORMALS[face];
-            int sx = x + normal[0];
-            int sy = y + normal[1];
-            int sz = z + normal[2];
-            return world.getBlock(sx, sy, sz).shouldSideBeRendered(world, sx, sy, sz, face);
-        }
-    }
 }
@@ -139,4 +139,6 @@ abstract public class RenderBlockState {

    abstract public boolean shouldConnectByTile(Block neighbor, IIcon origIcon, int neighborX, int neighborY,
        int neighborZ);
+
+    abstract public RenderBlockState copy();
 }
Author	SHA1	Message	Date
Caedis	eef3d2f50a	feat(hand): add cancellable RenderHandEvent for canRender (#1806 )	2026-06-01 20:38:27 +00:00
tiffit	3da597ab18	Improve perf of EmissiveTextureAutoloader.resourceExists (#1805 )	2026-06-01 13:34:23 -07:00
Jason Mitchell	0e79380618	More class loading order fun with java 8... (#1804 )	2026-05-31 20:56:00 -07:00
tiffit	b639d5c646	Add compat for hodgepodge's async icon loading (#1799 )	2026-05-31 15:28:27 -07:00
Jason Mitchell	0d209d426d	Document why I did this so I remember next time someone asks about this cursed function (#1802 )	2026-05-31 15:12:45 -07:00
danyadev	bf24084033	switch to new RFB transform signature (#1421 )	2026-05-29 09:35:31 -07:00
tiffit	9267ecc735	Remove registerIcons call in MCPF MixinTextureMap (#1795 )	2026-05-28 13:12:10 -07:00
Jason Mitchell Eclipse-Sol Logan Phillips	dcc8d8deed	Make shader based clouds work with iris shaderpacks, and port optimizations from #1685 (#1793 ) * Make shader based clouds work with iris shaderpacks, and port optimizations from #1685 Co-Authored-By: Eclipse-Sol <[email protected]> * Yeet GL_QUADS * Optimize a little more --------- Co-authored-by: Eclipse-Sol <[email protected]> Co-authored-by: Logan Phillips <[email protected]>	2026-05-28 10:31:17 -04:00
Jason Mitchell	5dc4f1fab8	Fix tests (#1791 )	2026-05-27 18:41:41 -07:00
CaedisandJason Mitchell	d3cea1bfe4	fix: refresh ClonedChunkSection biome data on cache hit (#1769 ) Co-authored-by: Jason Mitchell <[email protected]>	2026-05-27 16:45:29 -07:00
DanandRanzu	5db2b248d7	add per-segment drop shadow (&u) (#1754 ) Co-authored-by: Ranzu <[email protected]>	2026-05-27 16:44:54 -07:00
Eclipse-Sol	21ab526284	Fix shadow map from being clobbered on Windows (#1789 )	2026-05-27 16:43:51 -07:00
MassAnarchy	4c8ea679ef	Fix GL_FEEDBACK readback using correct attribute 0 VBO (#1783 )	2026-05-27 16:43:03 -07:00
Eclipse-Sol	2317379df2	Add gbuffer_lightning (#1787 )	2026-05-27 16:41:51 -07:00
Death Fuel	24dae49c7f	Mark ClientFixer as incompatible (#1786 )	2026-05-26 16:03:22 -07:00
Eclipse-Sol	865de3cbab	Fix issues that directly affects Euphoria Patches + Complementary (#1782 )	2026-05-26 14:11:33 -07:00
Jason Mitchell	9c45549e35	Resolve generic compressed image formats (#1781 )	2026-05-25 11:50:18 -07:00
Jason Mitchell	2a20198292	Fixes crash with FFP shader linking (#1780 )	2026-05-24 17:31:46 -07:00
Eclipse-SolandJason Mitchell	f0b68f93af	Port modern's damage overlay (#1777 ) Co-authored-by: Jason Mitchell <[email protected]>	2026-05-24 10:48:42 -07:00
Eclipse-SolandJason Mitchell	dd1d3aa518	Add NBT matching to list of valid block/item entries (#1771 ) Co-authored-by: Jason Mitchell <[email protected]>	2026-05-23 23:08:48 -07:00
Jason Mitchell	c9633fd745	Fix osx crash (#1778 )	2026-05-23 22:03:59 -07:00
DarkShadow44	e2e94b2958	Fix DH framebuffer UNSUPPORTED after resize (#1741 )	2026-05-23 21:19:45 -07:00
tiffit	3046b043a0	clear block and item renderlist on resource reload (#1773 )	2026-05-23 17:45:31 -07:00
Apis035andCaedis	8a6c8035db	Add view bobbing mode (#1761 ) * Add view bobbing mode * Fix missing import --------- Co-authored-by: Caedis <[email protected]>	2026-05-21 23:11:35 +02:00
Alexdoru	2b15370c00	Properly do the fml/rfb registration for IsbrhTessellatorAbuseTransformer (#1770 )	2026-05-20 09:56:16 -07:00
Jason Mitchell	3ca9e32191	Stop burying the error due to things catching RuntimeExceptions.... (#1767 )	2026-05-19 08:53:05 -07:00
sisyphussy	efbca29381	Add cached block item renderer (#1730 )	2026-05-19 08:03:51 -07:00
Jason Mitchell	9c1b6c75ff	Fix crash on windows (#1766 )	2026-05-19 08:02:37 -07:00
sisyphussy	fa91b70528	Display list stuff (#1750 )	2026-05-18 12:46:48 -07:00
Jason Mitchell	61de8385ca	Minecraft is a dirty dirty liar. (#1764 )	2026-05-18 12:39:30 -07:00
Jason Mitchell	962e7527a4	Register later (#1763 )	2026-05-18 12:39:20 -07:00
Jason Mitchell	2ab2713fe9	Stops draw/startDrawing in ISBRH (#1759 )	2026-05-17 21:08:18 -07:00
Jason Mitchell	7cf652cd4e	Misc fixes - Journeymap and Xaeros (#1756 )	2026-05-17 10:23:10 -07:00
Jason Mitchell	48eba2fd96	Properly end the dynamic lighting profiler section (#1751 )	2026-05-16 12:20:09 -07:00
Apis035	356ba376fe	Adjust options screen width (#1748 )	2026-05-15 08:47:28 -07:00
Eclipse-Sol	ef6b0742a9	Fix skeleton legs from being jammed into their pelvis (#1747 )	2026-05-14 15:26:25 -07:00
Kaiz	787929d0bd	Handle recoverable block render failures in celeritas meshing (#1705 )	2026-05-10 10:00:43 -07:00
VortexSo4 VortexSo4 ah-OOG-ah	0e1fd9d0e9	add auto emissive overlay for any block (#1710 ) Co-authored-by: VortexSo4 <[email protected]> Co-authored-by: ah-OOG-ah <[email protected]>	2026-05-10 02:12:08 -04:00
Ruling-0	58938e82a7	Compact CTM Fixes (#1726 )	2026-05-09 11:42:42 -07:00
Branan Riley	be6c8c85b5	Detect vanilla AO at a higher level (#1733 )	2026-05-09 11:41:59 -07:00
ABKQPOandCaedis	39bca37d0d	Adjust IDynamicLightProducer to allow passing an ItemStack parameter (#1734 ) Co-authored-by: Caedis <[email protected]>	2026-05-08 20:31:22 -07:00
czqwq	1c61be04a7	Fix Already tesselating logs (#1729 )	2026-05-08 20:30:08 -07:00
Dan Death Fuel Jason Mitchell	7a97cd9386	Add RGB color system (#1669 ) Co-authored-by: Death Fuel <[email protected]> Co-authored-by: Jason Mitchell <[email protected]>	2026-05-08 18:36:51 -07:00
Kotmatross	5b09bde7a0	[NTM:Space] Fix mixins in obfuscated environment (#1738 )	2026-05-08 18:24:29 +02:00
Ruling-0	edc0081b7c	Fix CTM inventory texture bleed (#1721 )	2026-05-04 12:25:51 -07:00
Alexdoru	913256b032	fix world client leak in CTMUtils (#1724 )	2026-05-04 12:24:25 -07:00
sisyphussy	e1f5083d3e	Fix intel detection (#1722 )	2026-05-04 12:23:50 -07:00
sisyphussy	b55e693ad2	Remove DSA from GLSM & other stuff (#1723 )	2026-05-04 12:23:38 -07:00
sisyphussy	21c01a1aa4	Fix terrible performance on Intel (#1718 )	2026-05-03 14:32:58 -07:00
Caedis	83a26b2291	Add Cosmetic Armor support for Dynamic Lights (#1708 )	2026-05-03 14:31:49 -07:00
Kotmatross	7e44c1efcb	Fix stale uniforms when switching shader program (#1715 )	2026-05-03 14:30:46 -07:00
VortexSo4	155f209db5	remove ctm guide as it is worse than wiki (#1706 )	2026-04-30 11:03:18 -07:00
SpacEagle17	c4a6c165a0	Increase MAX_COLOR_BUFFERS limit to 32 (#1704 )	2026-04-28 12:33:51 -07:00
Eclipse-Sol	624fe6b453	Add targeting of snow-covered blocks. (#1696 )	2026-04-26 15:26:10 -07:00
YoshyandJason Mitchell	fd45fda0ab	Fix AO Lighting for compact CTM (#1697 ) Co-authored-by: Jason Mitchell <[email protected]>	2026-04-26 12:55:24 -07:00
Alexdoru	00fc97a611	Fix dynamic lights world client leaks (#1700 )	2026-04-26 10:01:46 -07:00
Alexdoru	445dc487b9	fix world client leak caused by lambda in IrisExclusiveUniforms$WorldInfoUniforms (#1701 )	2026-04-26 09:56:08 -07:00