remove qualifiers

LICENSE.md

@@ -1,5 +0,0 @@
-# Copyright 2025 MCRcortex
-All rights reserved.
-Do not redistribute.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version "1.11-SNAPSHOT"
+    id 'fabric-loom' version "1.10-SNAPSHOT"
     id 'maven-publish'
 }
 
@@ -108,7 +108,7 @@ dependencies {
     modRuntimeOnlyMsk "maven.modrinth:sodium:mc1.21.6-0.6.13-fabric"
     modCompileOnly "maven.modrinth:sodium:mc1.21.6-0.6.13-fabric"
 
-    modImplementation("maven.modrinth:lithium:mc1.21.8-0.18.0-fabric")
+    modImplementation("maven.modrinth:lithium:mc1.21.7-0.18.0-fabric")
 
     //modRuntimeOnlyMsk "drouarb:nvidium:0.4.1-beta4:1.21.6@jar"
     modCompileOnly "drouarb:nvidium:0.4.1-beta4:1.21.6@jar"
@@ -117,7 +117,7 @@ dependencies {
     modRuntimeOnlyMsk("maven.modrinth:modmenu:15.0.0-beta.3")
 
     modCompileOnly("maven.modrinth:iris:1.9.1+1.21.7-fabric")
-    modRuntimeOnlyMsk("maven.modrinth:iris:1.9.1+1.21.7-fabric")
+    //modRuntimeOnlyMsk("maven.modrinth:iris:1.9.1+1.21.7-fabric")
 
     //modCompileOnly("maven.modrinth:starlight:1.1.3+1.20.4")
 
@@ -134,8 +134,6 @@ dependencies {
     //modImplementation('io.github.douira:glsl-transformer:2.0.1')
 
     modCompileOnly("maven.modrinth:vivecraft:1.21.1-1.1.14-b2-fabric")
-
-    modCompileOnly("maven.modrinth:flashback:rNCr1Rbs")
 }
 
 

gradle.properties

@@ -6,15 +6,14 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.21.8
+minecraft_version=1.21.7
-yarn_mappings=1.21.8+build.1
+yarn_mappings=1.21.7+build.1
 loader_version=0.16.14
-loom_version=1.11-SNAPSHOT
 
 # Fabric API
-fabric_version=0.129.0+1.21.8
+fabric_version=0.128.1+1.21.7
 
 # Mod Properties
-mod_version = 0.2.5-alpha
+mod_version = 0.2.3-alpha
 maven_group = me.cortex
 archives_base_name = voxy

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/me/cortex/voxy/client/ClientImportManager.java

@@ -1,6 +1,8 @@
 package me.cortex.voxy.client;
 
+import me.cortex.voxy.client.taskbar.Taskbar;
 import me.cortex.voxy.common.Logger;
+import me.cortex.voxy.common.thread.ServiceThreadPool;
 import me.cortex.voxy.commonImpl.ImportManager;
 import me.cortex.voxy.commonImpl.importers.IDataImporter;
 import net.minecraft.client.MinecraftClient;
@@ -10,6 +12,7 @@ import net.minecraft.text.Text;
 import net.minecraft.util.math.MathHelper;
 
 import java.util.UUID;
+import java.util.function.BooleanSupplier;
 
 public class ClientImportManager extends ImportManager {
     protected class ClientImportTask extends ImportTask {

src/main/java/me/cortex/voxy/client/RenderStatistics.java

@@ -2,10 +2,6 @@ package me.cortex.voxy.client;
 
 import me.cortex.voxy.common.world.WorldEngine;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
 public class RenderStatistics {
     public static boolean enabled = false;
 
@@ -13,24 +9,4 @@ public class RenderStatistics {
     public static final int[] hierarchicalRenderSections = new int[WorldEngine.MAX_LOD_LAYER+1];
     public static final int[] visibleSections = new int[WorldEngine.MAX_LOD_LAYER+1];
     public static final int[] quadCount = new int[WorldEngine.MAX_LOD_LAYER+1];
-
-
-    public static void addDebug(List<String> debug) {
-        if (!enabled) {
-            return;
-        }
-        debug.add("HTC: [" + Arrays.stream(flipCopy(RenderStatistics.hierarchicalTraversalCounts)).mapToObj(Integer::toString).collect(Collectors.joining(", "))+"]");
-        debug.add("HRS: [" + Arrays.stream(flipCopy(RenderStatistics.hierarchicalRenderSections)).mapToObj(Integer::toString).collect(Collectors.joining(", "))+"]");
-        debug.add("VS: [" + Arrays.stream(flipCopy(RenderStatistics.visibleSections)).mapToObj(Integer::toString).collect(Collectors.joining(", "))+"]");
-        debug.add("QC: [" + Arrays.stream(flipCopy(RenderStatistics.quadCount)).mapToObj(Integer::toString).collect(Collectors.joining(", "))+"]");
-    }
-
-    private static int[] flipCopy(int[] array) {
-        int[] ret = new int[array.length];
-        int i = ret.length;
-        for (int j : array) {
-            ret[--i] = j;
-        }
-        return ret;
-    }
 }

src/main/java/me/cortex/voxy/client/TimingStatistics.java

@@ -1,5 +1,6 @@
 package me.cortex.voxy.client;
 
+import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
 
 public class TimingStatistics {

src/main/java/me/cortex/voxy/client/VoxyClient.java

@@ -7,6 +7,7 @@ import me.cortex.voxy.common.Logger;
 import me.cortex.voxy.commonImpl.VoxyCommon;
 import net.fabricmc.api.ClientModInitializer;
         import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 import net.fabricmc.loader.api.FabricLoader;
 
 import java.util.HashSet;
@@ -16,8 +17,9 @@ import java.util.function.Function;
 public class VoxyClient implements ClientModInitializer {
     private static final HashSet<String> FREX = new HashSet<>();
 
-
+    @Override
-    public static void initVoxyClient() {
+    public void onInitializeClient() {
+        ClientLifecycleEvents.CLIENT_STARTED.register(client->{
             Capabilities.init();//Ensure clinit is called
 
             boolean systemSupported = Capabilities.INSTANCE.compute && Capabilities.INSTANCE.indirectParameters;
@@ -35,10 +37,9 @@ public class VoxyClient implements ClientModInitializer {
             } else {
                 Logger.error("Voxy is unsupported on your system.");
             }
-    }
+        });
+
 
-    @Override
-    public void onInitializeClient() {
         ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> {
             if (VoxyCommon.isAvailable()) {
                 dispatcher.register(VoxyCommands.register());

src/main/java/me/cortex/voxy/client/VoxyClientInstance.java

@@ -1,6 +1,5 @@
 package me.cortex.voxy.client;
 
-import me.cortex.voxy.client.compat.FlashbackCompat;
 import me.cortex.voxy.client.config.VoxyConfig;
 import me.cortex.voxy.common.Logger;
 import me.cortex.voxy.common.config.ConfigBuildCtx;
@@ -17,24 +16,25 @@ import me.cortex.voxy.commonImpl.WorldIdentifier;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.util.WorldSavePath;
 
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 
 public class VoxyClientInstance extends VoxyInstance {
     public static boolean isInGame = false;
 
     private final SectionStorageConfig storageConfig;
-    private final Path basePath;
+    private final Path basePath = getBasePath();
-    private final boolean noIngestOverride;
     public VoxyClientInstance() {
         super(VoxyConfig.CONFIG.serviceThreads);
-        var path = FlashbackCompat.getReplayStoragePath();
+        try {
-        this.noIngestOverride = path != null;
+            Files.createDirectories(this.basePath);
-        if (path == null) {
+        } catch (Exception e) {
-            path = getBasePath();
+            throw new RuntimeException(e);
         }
-        this.basePath = path;
+        this.storageConfig = getCreateStorageConfig(this.basePath);
-        this.storageConfig = getCreateStorageConfig(path);
     }
 
     @Override
@@ -46,17 +46,34 @@ public class VoxyClientInstance extends VoxyInstance {
     protected SectionStorage createStorage(WorldIdentifier identifier) {
         var ctx = new ConfigBuildCtx();
         ctx.setProperty(ConfigBuildCtx.BASE_SAVE_PATH, this.basePath.toString());
-        ctx.setProperty(ConfigBuildCtx.WORLD_IDENTIFIER, identifier.getWorldId());
+        ctx.setProperty(ConfigBuildCtx.WORLD_IDENTIFIER, getWorldId(identifier));
         ctx.pushPath(ConfigBuildCtx.DEFAULT_STORAGE_PATH);
         return this.storageConfig.build(ctx);
     }
 
-    public static SectionStorageConfig getCreateStorageConfig(Path path) {
+    private static String bytesToHex(byte[] hash) {
+        StringBuilder hexString = new StringBuilder(2 * hash.length);
+        for (byte b : hash) {
+            String hex = Integer.toHexString(0xff & b);
+            if (hex.length() == 1) {
+                hexString.append('0');
+            }
+            hexString.append(hex);
+        }
+        return hexString.toString();
+    }
+
+    private static String getWorldId(WorldIdentifier identifier) {
+        String data = identifier.biomeSeed + identifier.key.toString();
         try {
-            Files.createDirectories(path);
+            return bytesToHex(MessageDigest.getInstance("SHA-256").digest(data.getBytes())).substring(0, 32);
-        } catch (Exception e) {
+        } catch (
+                NoSuchAlgorithmException e) {
             throw new RuntimeException(e);
         }
+    }
+
+    private static SectionStorageConfig getCreateStorageConfig(Path path) {
         var json = path.resolve("config.json");
         Config config = null;
         if (Files.exists(json)) {
@@ -89,15 +106,6 @@ public class VoxyClientInstance extends VoxyInstance {
         return config.sectionStorageConfig;
     }
 
-    public Path getStorageBasePath() {
-        return this.basePath;
-    }
-
-    @Override
-    public boolean isIngestEnabled(WorldIdentifier worldId) {
-        return !this.noIngestOverride;
-    }
-
     private static class Config {
         public int version = 1;
         public SectionStorageConfig sectionStorageConfig;

src/main/java/me/cortex/voxy/client/VoxyCommands.java

@@ -6,6 +6,7 @@ import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 import me.cortex.voxy.client.core.IGetVoxyRenderSystem;
+import me.cortex.voxy.common.world.WorldEngine;
 import me.cortex.voxy.commonImpl.VoxyCommon;
 import me.cortex.voxy.commonImpl.WorldIdentifier;
 import me.cortex.voxy.commonImpl.importers.DHImporter;

src/main/java/me/cortex/voxy/client/compat/FlashbackCompat.java

@@ -1,42 +0,0 @@
-package me.cortex.voxy.client.compat;
-
-import com.moulberry.flashback.Flashback;
-import com.moulberry.flashback.playback.ReplayServer;
-import com.moulberry.flashback.record.FlashbackMeta;
-import me.cortex.voxy.common.Logger;
-import me.cortex.voxy.common.config.section.SectionStorageConfig;
-import net.fabricmc.loader.api.FabricLoader;
-import org.apache.commons.logging.Log;
-
-import java.nio.file.Path;
-
-public class FlashbackCompat {
-    public static final boolean FLASHBACK_INSTALLED = FabricLoader.getInstance().isModLoaded("flashback");
-
-    public static Path getReplayStoragePath() {
-        if (!FLASHBACK_INSTALLED) {
-            return null;
-        }
-        return getReplayStoragePath0();
-    }
-
-    private static Path getReplayStoragePath0() {
-        ReplayServer replayServer = Flashback.getReplayServer();
-        if (replayServer != null) {
-            FlashbackMeta meta = replayServer.getMetadata();
-            if (meta != null) {
-                var path = ((IFlashbackMeta)meta).getVoxyPath();
-                if (path != null) {
-                    Logger.info("Flashback replay server exists and meta exists");
-                    if (path.exists()) {
-                        Logger.info("Flashback voxy path exists in filesystem, using this as lod data source");
-                        return path.toPath();
-                    } else {
-                        Logger.warn("Flashback meta had voxy path saved but path doesnt exist");
-                    }
-                }
-            }
-        }
-        return null;
-    }
-}

src/main/java/me/cortex/voxy/client/compat/IFlashbackMeta.java

@@ -1,8 +0,0 @@
-package me.cortex.voxy.client.compat;
-
-import java.io.File;
-
-public interface IFlashbackMeta {
-    void setVoxyPath(File path);
-    File getVoxyPath();
-}

src/main/java/me/cortex/voxy/client/config/VoxyConfig.java

@@ -34,7 +34,7 @@ public class VoxyConfig implements OptionStorage<VoxyConfig> {
     public boolean useEnvironmentalFog = false;
     public boolean renderStatistics = false;
 
-    private static VoxyConfig loadOrCreate() {
+    public static VoxyConfig loadOrCreate() {
         if (VoxyCommon.isAvailable()) {
             var path = getConfigPath();
             if (Files.exists(path)) {
@@ -79,8 +79,4 @@ public class VoxyConfig implements OptionStorage<VoxyConfig> {
     public VoxyConfig getData() {
         return this;
     }
-
-    public boolean isRenderingEnabled() {
-        return VoxyCommon.isAvailable() && this.enabled && this.enableRendering;
-    }
 }

src/main/java/me/cortex/voxy/client/core/AbstractRenderPipeline.java

@@ -1,237 +0,0 @@
-package me.cortex.voxy.client.core;
-
-import me.cortex.voxy.client.RenderStatistics;
-import me.cortex.voxy.client.TimingStatistics;
-import me.cortex.voxy.client.core.gl.Capabilities;
-import me.cortex.voxy.client.core.model.ModelBakerySubsystem;
-import me.cortex.voxy.client.core.rendering.Viewport;
-import me.cortex.voxy.client.core.rendering.hierachical.AsyncNodeManager;
-import me.cortex.voxy.client.core.rendering.hierachical.HierarchicalOcclusionTraverser;
-import me.cortex.voxy.client.core.rendering.hierachical.NodeCleaner;
-import me.cortex.voxy.client.core.rendering.post.FullscreenBlit;
-import me.cortex.voxy.client.core.rendering.section.AbstractSectionRenderer;
-import me.cortex.voxy.client.core.rendering.util.DownloadStream;
-import me.cortex.voxy.common.util.TrackedObject;
-import org.joml.Matrix4f;
-import org.lwjgl.opengl.GL30;
-import org.lwjgl.system.MemoryUtil;
-
-import java.util.List;
-import java.util.function.BooleanSupplier;
-
-import static org.lwjgl.opengl.GL11C.GL_ALWAYS;
-import static org.lwjgl.opengl.GL11C.GL_DEPTH_TEST;
-import static org.lwjgl.opengl.GL11C.GL_EQUAL;
-import static org.lwjgl.opengl.GL11C.GL_KEEP;
-import static org.lwjgl.opengl.GL11C.GL_NEAREST;
-import static org.lwjgl.opengl.GL11C.GL_REPLACE;
-import static org.lwjgl.opengl.GL11C.GL_STENCIL_TEST;
-import static org.lwjgl.opengl.GL11C.glColorMask;
-import static org.lwjgl.opengl.GL11C.glDisable;
-import static org.lwjgl.opengl.GL11C.glEnable;
-import static org.lwjgl.opengl.GL11C.glStencilFunc;
-import static org.lwjgl.opengl.GL11C.glStencilMask;
-import static org.lwjgl.opengl.GL11C.glStencilOp;
-import static org.lwjgl.opengl.GL30C.GL_FRAMEBUFFER;
-import static org.lwjgl.opengl.GL30C.glBindFramebuffer;
-import static org.lwjgl.opengl.GL42.GL_DEPTH_BUFFER_BIT;
-import static org.lwjgl.opengl.GL42.GL_LEQUAL;
-import static org.lwjgl.opengl.GL42.GL_NOTEQUAL;
-import static org.lwjgl.opengl.GL42.glDepthFunc;
-import static org.lwjgl.opengl.GL42.*;
-import static org.lwjgl.opengl.GL45.glClearNamedFramebufferfi;
-import static org.lwjgl.opengl.GL45C.glBindTextureUnit;
-import static org.lwjgl.opengl.GL45C.glBlitNamedFramebuffer;
-
-public abstract class AbstractRenderPipeline extends TrackedObject {
-    private final BooleanSupplier frexStillHasWork;
-
-    private final AsyncNodeManager nodeManager;
-    private final NodeCleaner nodeCleaner;
-    private final HierarchicalOcclusionTraverser traversal;
-
-    protected AbstractSectionRenderer<?,?> sectionRenderer;
-
-    private final FullscreenBlit depthMaskBlit = new FullscreenBlit("voxy:post/fullscreen2.vert", "voxy:post/noop.frag");
-    private final FullscreenBlit depthSetBlit = new FullscreenBlit("voxy:post/fullscreen2.vert", "voxy:post/depth0.frag");
-    protected AbstractRenderPipeline(AsyncNodeManager nodeManager, NodeCleaner nodeCleaner, HierarchicalOcclusionTraverser traversal, BooleanSupplier frexSupplier) {
-        this.frexStillHasWork = frexSupplier;
-        this.nodeManager = nodeManager;
-        this.nodeCleaner = nodeCleaner;
-        this.traversal = traversal;
-    }
-
-    //Allows pipelines to configure model baking system
-    public void setupExtraModelBakeryData(ModelBakerySubsystem modelService) {}
-
-    public final void setSectionRenderer(AbstractSectionRenderer<?,?> sectionRenderer) {//Stupid java ordering not allowing something pre super
-        if (this.sectionRenderer != null) throw new IllegalStateException();
-        this.sectionRenderer = sectionRenderer;
-    }
-
-    //Called before the pipeline starts running, used to update uniforms etc
-    public void preSetup(Viewport<?> viewport) {
-
-    }
-
-    protected abstract int setup(Viewport<?> viewport, int sourceFramebuffer, int srcWidth, int srcHeight);
-    protected abstract void postOpaquePreTranslucent(Viewport<?> viewport);
-    protected void finish(Viewport<?> viewport, int sourceFrameBuffer, int srcWidth, int srcHeight) {
-        glDisable(GL_STENCIL_TEST);
-        glBindFramebuffer(GL_FRAMEBUFFER, sourceFrameBuffer);
-    }
-
-    public void runPipeline(Viewport<?> viewport, int sourceFrameBuffer, int srcWidth, int srcHeight) {
-        int depthTexture = this.setup(viewport, sourceFrameBuffer, srcWidth, srcHeight);
-
-        var rs = ((AbstractSectionRenderer)this.sectionRenderer);
-        rs.renderOpaque(viewport);
-        this.innerPrimaryWork(viewport, depthTexture);
-        rs.buildDrawCalls(viewport);
-        rs.renderTemporal(viewport);
-
-        this.postOpaquePreTranslucent(viewport);
-
-        rs.renderTranslucent(viewport);
-
-        this.finish(viewport, sourceFrameBuffer, srcWidth, srcHeight);
-        glBindFramebuffer(GL_FRAMEBUFFER, sourceFrameBuffer);
-    }
-
-    protected void initDepthStencil(int sourceFrameBuffer, int targetFb, int srcWidth, int srcHeight, int width, int height) {
-        glClearNamedFramebufferfi(targetFb, GL_DEPTH_STENCIL, 0, 1.0f, 1);
-        glBlitNamedFramebuffer(sourceFrameBuffer, targetFb, 0,0, srcWidth, srcHeight, 0,0, width, height, GL_DEPTH_BUFFER_BIT, GL_NEAREST);
-
-        glBindFramebuffer(GL30.GL_FRAMEBUFFER, targetFb);
-
-        /*
-        if (Capabilities.INSTANCE.isMesa){
-            glClearStencil(1);
-            glClear(GL_STENCIL_BUFFER_BIT);
-        }*/
-
-        //This whole thing is hell, we basicly want to create a mask stenicel/depth mask specificiclly
-        // in theory we could do this in a single pass by passing in the depth buffer from the sourceFrambuffer
-        // but the current implmentation does a 2 pass system
-        glEnable(GL_STENCIL_TEST);
-        glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
-        glStencilFunc(GL_ALWAYS, 0, 0xFF);
-        glStencilMask(0xFF);
-
-        glEnable(GL_DEPTH_TEST);
-        glDepthFunc(GL_NOTEQUAL);//If != 1 pass
-        glColorMask(false,false,false,false);
-        //We do here
-        this.depthMaskBlit.blit();
-        glDisable(GL_DEPTH_TEST);
-
-        //Blit depth 0 where stencil is 0
-        glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
-        glStencilFunc(GL_EQUAL, 0, 0xFF);
-
-        this.depthSetBlit.blit();
-
-        glDepthFunc(GL_LEQUAL);
-        glColorMask(true,true,true,true);
-
-        //Make voxy terrain render only where there isnt mc terrain
-        glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
-        glStencilFunc(GL_EQUAL, 1, 0xFF);
-    }
-
-    private static final long SCRATCH = MemoryUtil.nmemAlloc(4*4*4);
-    protected static void transformBlitDepth(FullscreenBlit blitShader, int srcDepthTex, int dstFB, Viewport<?> viewport, Matrix4f targetTransform) {
-        glBindFramebuffer(GL30.GL_FRAMEBUFFER, dstFB);
-
-        blitShader.bind();
-        glBindTextureUnit(0, srcDepthTex);
-        new Matrix4f(viewport.MVP).invert().getToAddress(SCRATCH);
-        nglUniformMatrix4fv(1, 1, false, SCRATCH);//inverse fromProjection
-        targetTransform.getToAddress(SCRATCH);//new Matrix4f(tooProjection).mul(vp.modelView).get(data);
-        nglUniformMatrix4fv(2, 1, false, SCRATCH);//tooProjection
-
-        glEnable(GL_DEPTH_TEST);
-        //We keep the stencil test on with the emitting, only to where non terrain is rendered
-        blitShader.blit();
-        glDisable(GL_STENCIL_TEST);
-        glDisable(GL_DEPTH_TEST);
-    }
-
-    protected void innerPrimaryWork(Viewport<?> viewport, int depthBuffer) {
-
-        //Compute the mip chain
-        viewport.hiZBuffer.buildMipChain(depthBuffer, viewport.width, viewport.height);
-
-        do {
-            TimingStatistics.main.stop();
-            TimingStatistics.dynamic.start();
-
-            TimingStatistics.D.start();
-            //Tick download stream
-            DownloadStream.INSTANCE.tick();
-            TimingStatistics.D.stop();
-
-            this.nodeManager.tick(this.traversal.getNodeBuffer(), this.nodeCleaner);
-            //glFlush();
-
-            this.nodeCleaner.tick(this.traversal.getNodeBuffer());//Probably do this here??
-
-            TimingStatistics.dynamic.stop();
-            TimingStatistics.main.start();
-
-            glMemoryBarrier(GL_FRAMEBUFFER_BARRIER_BIT | GL_PIXEL_BUFFER_BARRIER_BIT);
-
-            TimingStatistics.I.start();
-            this.traversal.doTraversal(viewport);
-            TimingStatistics.I.stop();
-        } while (this.frexStillHasWork.getAsBoolean());
-    }
-
-    @Override
-    protected void free0() {
-        this.sectionRenderer.free();
-        this.depthMaskBlit.delete();
-        this.depthSetBlit.delete();
-        super.free0();
-    }
-
-    public void addDebug(List<String> debug) {
-        this.sectionRenderer.addDebug(debug);
-        RenderStatistics.addDebug(debug);
-    }
-
-    //Binds the framebuffer and any other bindings needed for rendering
-    public abstract void setupAndBindOpaque(Viewport<?> viewport);
-    public abstract void setupAndBindTranslucent(Viewport<?> viewport);
-
-
-    public void bindUniforms() {
-        this.bindUniforms(-1);
-    }
-
-    public void bindUniforms(int index) {
-    }
-
-    //null means no function, otherwise return the taa injection function
-    public String taaFunction(String functionName) {
-        return this.taaFunction(-1, functionName);
-    }
-
-    public String taaFunction(int uboBindingPoint, String functionName) {
-        return null;
-    }
-
-    //null means dont transform the shader
-    public String patchOpaqueShader(AbstractSectionRenderer<?,?> renderer, String input) {
-        return null;
-    }
-
-    //Returning null means apply the same patch as the opaque
-    public String patchTranslucentShader(AbstractSectionRenderer<?,?> renderer, String input) {
-        return null;
-    }
-
-    //Null means no scaling factor
-    public float[] getRenderScalingFactor() {return null;}
-
-}

src/main/java/me/cortex/voxy/client/core/IrisVoxyRenderPipeline.java

@@ -1,262 +0,0 @@
-package me.cortex.voxy.client.core;
-
-import me.cortex.voxy.client.core.gl.GlBuffer;
-import me.cortex.voxy.client.core.model.ModelBakerySubsystem;
-import me.cortex.voxy.client.core.rendering.Viewport;
-import me.cortex.voxy.client.core.rendering.hierachical.AsyncNodeManager;
-import me.cortex.voxy.client.core.rendering.hierachical.HierarchicalOcclusionTraverser;
-import me.cortex.voxy.client.core.rendering.hierachical.NodeCleaner;
-import me.cortex.voxy.client.core.rendering.post.FullscreenBlit;
-import me.cortex.voxy.client.core.rendering.section.AbstractSectionRenderer;
-import me.cortex.voxy.client.core.rendering.util.DepthFramebuffer;
-import me.cortex.voxy.client.core.rendering.util.UploadStream;
-import me.cortex.voxy.client.iris.IrisVoxyRenderPipelineData;
-import net.irisshaders.iris.shaderpack.materialmap.WorldRenderingSettings;
-import org.joml.Matrix4f;
-import org.lwjgl.opengl.GL30;
-
-import java.util.List;
-import java.util.function.BooleanSupplier;
-
-import static org.lwjgl.opengl.GL11.GL_DEPTH_BUFFER_BIT;
-import static org.lwjgl.opengl.GL30C.*;
-import static org.lwjgl.opengl.GL31.GL_UNIFORM_BUFFER;
-import static org.lwjgl.opengl.GL45C.*;
-
-public class IrisVoxyRenderPipeline extends AbstractRenderPipeline {
-    private final IrisVoxyRenderPipelineData data;
-    private final FullscreenBlit depthBlit = new FullscreenBlit("voxy:post/blit_texture_depth_cutout.frag");
-    public final DepthFramebuffer fb = new DepthFramebuffer(GL_DEPTH24_STENCIL8);
-    public final DepthFramebuffer fbTranslucent = new DepthFramebuffer(GL_DEPTH24_STENCIL8);
-
-    private final GlBuffer shaderUniforms;
-
-    public IrisVoxyRenderPipeline(IrisVoxyRenderPipelineData data, AsyncNodeManager nodeManager, NodeCleaner nodeCleaner, HierarchicalOcclusionTraverser traversal, BooleanSupplier frexSupplier) {
-        super(nodeManager, nodeCleaner, traversal, frexSupplier);
-        this.data = data;
-        if (this.data.thePipeline != null) {
-            throw new IllegalStateException("Pipeline data already bound");
-        }
-        this.data.thePipeline = this;
-
-        //Bind the drawbuffers
-        var oDT = this.data.opaqueDrawTargets;
-        int[] binding = new int[oDT.length];
-        for (int i = 0; i < oDT.length; i++) {
-            binding[i] = GL30.GL_COLOR_ATTACHMENT0+i;
-            glNamedFramebufferTexture(this.fb.framebuffer.id, GL30.GL_COLOR_ATTACHMENT0+i, oDT[i], 0);
-        }
-        glNamedFramebufferDrawBuffers(this.fb.framebuffer.id, binding);
-
-        var tDT = this.data.translucentDrawTargets;
-        binding = new int[tDT.length];
-        for (int i = 0; i < tDT.length; i++) {
-            binding[i] = GL30.GL_COLOR_ATTACHMENT0+i;
-            glNamedFramebufferTexture(this.fbTranslucent.framebuffer.id, GL30.GL_COLOR_ATTACHMENT0+i, tDT[i], 0);
-        }
-        glNamedFramebufferDrawBuffers(this.fbTranslucent.framebuffer.id, binding);
-
-        this.fb.framebuffer.verify();
-        this.fbTranslucent.framebuffer.verify();
-
-        if (data.getUniforms() != null) {
-            this.shaderUniforms = new GlBuffer(data.getUniforms().size());
-        } else {
-            this.shaderUniforms = null;
-        }
-    }
-
-    @Override
-    public void setupExtraModelBakeryData(ModelBakerySubsystem modelService) {
-        modelService.factory.setCustomBlockStateMapping(WorldRenderingSettings.INSTANCE.getBlockStateIds());
-    }
-
-    @Override
-    public void free() {
-        if (this.data.thePipeline != this) {
-            throw new IllegalStateException();
-        }
-        this.data.thePipeline = null;
-
-        this.depthBlit.delete();
-        this.fb.free();
-        this.fbTranslucent.free();
-
-        if (this.shaderUniforms != null) {
-            this.shaderUniforms.free();
-        }
-
-        super.free0();
-    }
-
-    @Override
-    public void preSetup(Viewport<?> viewport) {
-        super.preSetup(viewport);
-        if (this.shaderUniforms != null) {
-            //Update the uniforms
-            long ptr = UploadStream.INSTANCE.uploadTo(this.shaderUniforms);
-            this.data.getUniforms().updater().accept(ptr);
-            UploadStream.INSTANCE.commit();
-        }
-    }
-
-    @Override
-    protected int setup(Viewport<?> viewport, int sourceFramebuffer, int srcWidth, int srcHeight) {
-
-        this.fb.resize(viewport.width, viewport.height);
-        this.fbTranslucent.resize(viewport.width, viewport.height);
-
-        if (false) {//TODO: only do this if shader specifies
-            //Clear the colour component
-            glBindFramebuffer(GL_FRAMEBUFFER, this.fb.framebuffer.id);
-            glClearColor(0, 0, 0, 0);
-            glClear(GL_COLOR_BUFFER_BIT);
-        }
-
-        if (this.data.useViewportDims) {
-            srcWidth = viewport.width;
-            srcHeight = viewport.height;
-        }
-        this.initDepthStencil(sourceFramebuffer, this.fb.framebuffer.id, srcWidth, srcHeight, viewport.width, viewport.height);
-        return this.fb.getDepthTex().id;
-    }
-
-    @Override
-    protected void postOpaquePreTranslucent(Viewport<?> viewport) {
-        int msk = GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT;
-        if (true) {//TODO: make shader specified
-            if (false) {//TODO: only do this if shader specifies
-                glBindFramebuffer(GL_FRAMEBUFFER, this.fbTranslucent.framebuffer.id);
-                glClearColor(0, 0, 0, 0);
-                glClear(GL_COLOR_BUFFER_BIT);
-            }
-        } else {
-            msk |= GL_COLOR_BUFFER_BIT;
-        }
-        glBlitNamedFramebuffer(this.fb.framebuffer.id, this.fbTranslucent.framebuffer.id, 0,0, viewport.width, viewport.height, 0,0, viewport.width, viewport.height, msk, GL_NEAREST);
-    }
-
-    @Override
-    protected void finish(Viewport<?> viewport, int sourceFrameBuffer, int srcWidth, int srcHeight) {
-        if (this.data.renderToVanillaDepth && srcWidth == viewport.width  && srcHeight == viewport.height) {//We can only depthblit out if destination size is the same
-            glColorMask(false, false, false, false);
-            AbstractRenderPipeline.transformBlitDepth(this.depthBlit,
-                    this.fbTranslucent.getDepthTex().id, sourceFrameBuffer,
-                    viewport, new Matrix4f(viewport.vanillaProjection).mul(viewport.modelView));
-            glColorMask(true, true, true, true);
-        }
-    }
-
-
-    @Override
-    public void bindUniforms() {
-        this.bindUniforms(UNIFORM_BINDING_POINT);
-    }
-
-    @Override
-    public void bindUniforms(int bindingPoint) {
-        if (this.shaderUniforms != null) {
-            GL30.glBindBufferBase(GL_UNIFORM_BUFFER, bindingPoint, this.shaderUniforms.id);// todo: dont randomly select this to 5
-        }
-    }
-
-    private void doBindings() {
-        this.bindUniforms();
-        if (this.data.getSsboSet() != null) {
-            this.data.getSsboSet().bindingFunction().accept(10);
-        }
-        if (this.data.getImageSet() != null) {
-            this.data.getImageSet().bindingFunction().accept(6);
-        }
-    }
-    @Override
-    public void setupAndBindOpaque(Viewport<?> viewport) {
-        this.fb.bind();
-        this.doBindings();
-    }
-
-    @Override
-    public void setupAndBindTranslucent(Viewport<?> viewport) {
-        this.fbTranslucent.bind();
-        this.doBindings();
-        if (this.data.getBlender() != null) {
-            this.data.getBlender().run();
-        }
-    }
-
-    @Override
-    public void addDebug(List<String> debug) {
-        debug.add("Using: " + this.getClass().getSimpleName());
-        super.addDebug(debug);
-    }
-
-    private static final int UNIFORM_BINDING_POINT = 5;//TODO make ths binding point... not randomly 5
-
-    private StringBuilder buildGenericShaderHeader(AbstractSectionRenderer<?, ?> renderer, String input) {
-        StringBuilder builder = new StringBuilder(input).append("\n\n\n");
-
-        if (this.data.getUniforms() != null) {
-            builder.append("layout(binding = "+UNIFORM_BINDING_POINT+", std140) uniform ShaderUniformBindings ")
-                    .append(this.data.getUniforms().layout())
-                    .append(";\n\n");
-        }
-
-        if (this.data.getSsboSet() != null) {
-            builder.append("#define BUFFER_BINDING_INDEX_BASE 10\n");//TODO: DONT RANDOMLY MAKE THIS 10
-            builder.append(this.data.getSsboSet().layout()).append("\n\n");
-        }
-
-        if (this.data.getImageSet() != null) {
-            builder.append("#define BASE_SAMPLER_BINDING_INDEX 6\n");//TODO: DONT RANDOMLY MAKE THIS 6
-            builder.append(this.data.getImageSet().layout()).append("\n\n");
-        }
-
-        return builder.append("\n\n");
-    }
-
-
-
-    @Override
-    public String patchOpaqueShader(AbstractSectionRenderer<?, ?> renderer, String input) {
-        var builder = this.buildGenericShaderHeader(renderer, input);
-
-        builder.append(this.data.opaqueFragPatch());
-
-        return builder.toString();
-    }
-
-    @Override
-    public String patchTranslucentShader(AbstractSectionRenderer<?, ?> renderer, String input) {
-        if (this.data.translucentFragPatch() == null) return null;
-
-        var builder = this.buildGenericShaderHeader(renderer, input);
-        builder.append(this.data.translucentFragPatch());
-        return builder.toString();
-    }
-
-    @Override
-    public String taaFunction(String functionName) {
-        return this.taaFunction(UNIFORM_BINDING_POINT, functionName);
-    }
-
-    @Override
-    public String taaFunction(int uboBindingPoint, String functionName) {
-        var builder = new StringBuilder();
-
-        if (this.data.getUniforms() != null) {
-            builder.append("layout(binding = "+uboBindingPoint+", std140) uniform ShaderUniformBindings ")
-                    .append(this.data.getUniforms().layout())
-                    .append(";\n\n");
-        }
-
-        builder.append("vec2 ").append(functionName).append("()\n");
-        builder.append(this.data.TAA);
-        builder.append("\n");
-        return builder.toString();
-    }
-
-    @Override
-    public float[] getRenderScalingFactor() {
-        return this.data.resolutionScale;
-    }
-}

src/main/java/me/cortex/voxy/client/core/NormalRenderPipeline.java

@@ -1,150 +0,0 @@
-package me.cortex.voxy.client.core;
-
-import me.cortex.voxy.client.config.VoxyConfig;
-import me.cortex.voxy.client.core.gl.GlFramebuffer;
-import me.cortex.voxy.client.core.gl.GlTexture;
-import me.cortex.voxy.client.core.gl.shader.Shader;
-import me.cortex.voxy.client.core.gl.shader.ShaderType;
-import me.cortex.voxy.client.core.rendering.Viewport;
-import me.cortex.voxy.client.core.rendering.hierachical.AsyncNodeManager;
-import me.cortex.voxy.client.core.rendering.hierachical.HierarchicalOcclusionTraverser;
-import me.cortex.voxy.client.core.rendering.hierachical.NodeCleaner;
-import me.cortex.voxy.client.core.rendering.post.FullscreenBlit;
-import me.cortex.voxy.client.core.rendering.util.DepthFramebuffer;
-import net.minecraft.client.MinecraftClient;
-import org.joml.Matrix4f;
-import org.lwjgl.system.MemoryStack;
-
-import java.util.function.BooleanSupplier;
-
-import static org.lwjgl.opengl.ARBComputeShader.glDispatchCompute;
-import static org.lwjgl.opengl.ARBShaderImageLoadStore.glBindImageTexture;
-import static org.lwjgl.opengl.GL11.GL_BLEND;
-import static org.lwjgl.opengl.GL11.GL_ONE;
-import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA;
-import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA;
-import static org.lwjgl.opengl.GL11.glEnable;
-import static org.lwjgl.opengl.GL11C.GL_NEAREST;
-import static org.lwjgl.opengl.GL11C.GL_RGBA8;
-import static org.lwjgl.opengl.GL14.glBlendFuncSeparate;
-import static org.lwjgl.opengl.GL15.GL_READ_WRITE;
-import static org.lwjgl.opengl.GL30C.*;
-import static org.lwjgl.opengl.GL43.GL_DEPTH_STENCIL_TEXTURE_MODE;
-import static org.lwjgl.opengl.GL45C.glBindTextureUnit;
-import static org.lwjgl.opengl.GL45C.glTextureParameterf;
-
-public class NormalRenderPipeline extends AbstractRenderPipeline {
-    private GlTexture colourTex;
-    private GlTexture colourSSAOTex;
-    private final GlFramebuffer fbSSAO = new GlFramebuffer();
-    private final DepthFramebuffer fb = new DepthFramebuffer(GL_DEPTH24_STENCIL8);
-
-    private final boolean useEnvFog;
-    private final FullscreenBlit finalBlit;
-
-    private final Shader ssaoCompute = Shader.make()
-            .add(ShaderType.COMPUTE, "voxy:post/ssao.comp")
-            .compile();
-
-    protected NormalRenderPipeline(AsyncNodeManager nodeManager, NodeCleaner nodeCleaner, HierarchicalOcclusionTraverser traversal, BooleanSupplier frexSupplier) {
-        super(nodeManager, nodeCleaner, traversal, frexSupplier);
-        this.useEnvFog = VoxyConfig.CONFIG.useEnvironmentalFog;
-        this.finalBlit = new FullscreenBlit("voxy:post/blit_texture_depth_cutout.frag",
-                a->a.defineIf("USE_ENV_FOG", this.useEnvFog).define("EMIT_COLOUR"));
-    }
-
-    @Override
-    protected int setup(Viewport<?> viewport, int sourceFB, int srcWidth, int srcHeight) {
-        if (this.colourTex == null || this.colourTex.getHeight() != viewport.height || this.colourTex.getWidth() != viewport.width) {
-            if (this.colourTex != null) {
-                this.colourTex.free();
-                this.colourSSAOTex.free();
-            }
-            this.fb.resize(viewport.width, viewport.height);
-
-            this.colourTex = new GlTexture().store(GL_RGBA8, 1, viewport.width, viewport.height);
-            this.colourSSAOTex = new GlTexture().store(GL_RGBA8, 1, viewport.width, viewport.height);
-
-            this.fb.framebuffer.bind(GL_COLOR_ATTACHMENT0, this.colourTex).verify();
-            this.fbSSAO.bind(GL_DEPTH_STENCIL_ATTACHMENT, this.fb.getDepthTex()).bind(GL_COLOR_ATTACHMENT0, this.colourSSAOTex).verify();
-
-
-            glTextureParameterf(this.colourTex.id, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-            glTextureParameterf(this.colourTex.id, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-            glTextureParameterf(this.colourSSAOTex.id, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-            glTextureParameterf(this.colourSSAOTex.id, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-            glTextureParameterf(this.fb.getDepthTex().id, GL_DEPTH_STENCIL_TEXTURE_MODE, GL_DEPTH_COMPONENT);
-        }
-
-        this.initDepthStencil(sourceFB, this.fb.framebuffer.id, viewport.width, viewport.height, viewport.width, viewport.height);
-
-        return this.fb.getDepthTex().id;
-    }
-
-    @Override
-    protected void postOpaquePreTranslucent(Viewport<?> viewport) {
-        this.ssaoCompute.bind();
-        try (var stack = MemoryStack.stackPush()) {
-            long ptr = stack.nmalloc(4*4*4);
-            viewport.MVP.getToAddress(ptr);
-            nglUniformMatrix4fv(3, 1, false, ptr);//MVP
-            viewport.MVP.invert(new Matrix4f()).getToAddress(ptr);
-            nglUniformMatrix4fv(4, 1, false, ptr);//invMVP
-        }
-
-
-        glBindImageTexture(0, this.colourSSAOTex.id, 0, false,0, GL_READ_WRITE, GL_RGBA8);
-        glBindTextureUnit(1, this.fb.getDepthTex().id);
-        glBindTextureUnit(2, this.colourTex.id);
-
-        glDispatchCompute((viewport.width+31)/32, (viewport.height+31)/32, 1);
-
-        glBindFramebuffer(GL_FRAMEBUFFER, this.fbSSAO.id);
-    }
-
-    @Override
-    protected void finish(Viewport<?> viewport, int sourceFrameBuffer, int srcWidth, int srcHeight) {
-        this.finalBlit.bind();
-        if (this.useEnvFog) {
-            float start = viewport.fogParameters.environmentalStart();
-            float end = viewport.fogParameters.environmentalEnd();
-            float invEndFogDelta = 1f/(end-start);
-            float endDistance = MinecraftClient.getInstance().gameRenderer.getViewDistanceBlocks()*1.5f;
-            glUniform3f(4, endDistance, invEndFogDelta, Math.abs(start)*invEndFogDelta);
-            glUniform3f(5, viewport.fogParameters.red(), viewport.fogParameters.green(), viewport.fogParameters.blue());
-        }
-
-        glBindTextureUnit(3, this.colourSSAOTex.id);
-
-        //Do alpha blending
-
-        glEnable(GL_BLEND);
-        glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-        AbstractRenderPipeline.transformBlitDepth(this.finalBlit, this.fb.getDepthTex().id, sourceFrameBuffer, viewport, new Matrix4f(viewport.vanillaProjection).mul(viewport.modelView));
-        glDisable(GL_BLEND);
-        //glBlitNamedFramebuffer(this.fbSSAO.id, sourceFrameBuffer, 0,0, viewport.width, viewport.height, 0,0, viewport.width, viewport.height, GL_COLOR_BUFFER_BIT, GL_NEAREST);
-    }
-
-    @Override
-    public void setupAndBindOpaque(Viewport<?> viewport) {
-        this.fb.bind();
-    }
-
-    @Override
-    public void setupAndBindTranslucent(Viewport<?> viewport) {
-        glBindFramebuffer(GL_FRAMEBUFFER, this.fbSSAO.id);
-    }
-
-    @Override
-    public void free() {
-        this.finalBlit.delete();
-        this.ssaoCompute.free();
-        this.fb.free();
-        this.fbSSAO.free();
-        if (this.colourTex != null) {
-            this.colourTex.free();
-            this.colourSSAOTex.free();
-        }
-        super.free0();
-    }
-}

src/main/java/me/cortex/voxy/client/core/RenderPipelineFactory.java

@@ -1,48 +0,0 @@
-package me.cortex.voxy.client.core;
-
-import me.cortex.voxy.client.core.rendering.hierachical.AsyncNodeManager;
-import me.cortex.voxy.client.core.rendering.hierachical.HierarchicalOcclusionTraverser;
-import me.cortex.voxy.client.core.rendering.hierachical.NodeCleaner;
-import me.cortex.voxy.client.core.util.IrisUtil;
-import me.cortex.voxy.client.iris.IGetIrisVoxyPipelineData;
-import me.cortex.voxy.common.Logger;
-import net.irisshaders.iris.Iris;
-import net.irisshaders.iris.api.v0.IrisApi;
-
-import java.util.function.BooleanSupplier;
-
-public class RenderPipelineFactory {
-    public static AbstractRenderPipeline createPipeline(AsyncNodeManager nodeManager, NodeCleaner nodeCleaner, HierarchicalOcclusionTraverser traversal, BooleanSupplier frexSupplier) {
-        //Note this is where will choose/create e.g. IrisRenderPipeline or normal pipeline
-        AbstractRenderPipeline pipeline = null;
-        if (IrisUtil.IRIS_INSTALLED && IrisUtil.SHADER_SUPPORT) {
-            pipeline = createIrisPipeline(nodeManager, nodeCleaner, traversal, frexSupplier);
-        }
-        if (pipeline == null) {
-            pipeline = new NormalRenderPipeline(nodeManager, nodeCleaner, traversal, frexSupplier);
-        }
-        return pipeline;
-    }
-
-    private static AbstractRenderPipeline createIrisPipeline(AsyncNodeManager nodeManager, NodeCleaner nodeCleaner, HierarchicalOcclusionTraverser traversal, BooleanSupplier frexSupplier) {
-        var irisPipe = Iris.getPipelineManager().getPipelineNullable();
-        if (irisPipe == null) {
-            return null;
-        }
-        if (irisPipe instanceof IGetIrisVoxyPipelineData getVoxyPipeData) {
-            var pipeData = getVoxyPipeData.voxy$getPipelineData();
-            if (pipeData == null) {
-                return null;
-            }
-            Logger.info("Creating voxy iris render pipeline");
-            try {
-                return new IrisVoxyRenderPipeline(pipeData, nodeManager, nodeCleaner, traversal, frexSupplier);
-            } catch (Exception e) {
-                Logger.error("Failed to create iris render pipeline", e);
-                IrisUtil.disableIrisShaders();
-                return null;
-            }
-        }
-        return null;
-    }
-}

src/main/java/me/cortex/voxy/client/core/VoxyRenderSystem.java

@@ -8,124 +8,60 @@ import me.cortex.voxy.client.config.VoxyConfig;
 import me.cortex.voxy.client.core.gl.Capabilities;
 import me.cortex.voxy.client.core.gl.GlBuffer;
 import me.cortex.voxy.client.core.gl.GlTexture;
-import me.cortex.voxy.client.core.model.ModelBakerySubsystem;
-import me.cortex.voxy.client.core.model.ModelStore;
 import me.cortex.voxy.client.core.rendering.ChunkBoundRenderer;
 import me.cortex.voxy.client.core.rendering.RenderDistanceTracker;
-import me.cortex.voxy.client.core.rendering.Viewport;
+import me.cortex.voxy.client.core.rendering.RenderService;
-import me.cortex.voxy.client.core.rendering.ViewportSelector;
+import me.cortex.voxy.client.core.rendering.post.PostProcessing;
-import me.cortex.voxy.client.core.rendering.building.RenderGenerationService;
-import me.cortex.voxy.client.core.rendering.hierachical.AsyncNodeManager;
-import me.cortex.voxy.client.core.rendering.hierachical.HierarchicalOcclusionTraverser;
-import me.cortex.voxy.client.core.rendering.hierachical.NodeCleaner;
-import me.cortex.voxy.client.core.rendering.section.AbstractSectionRenderer;
-import me.cortex.voxy.client.core.rendering.section.MDICSectionRenderer;
-import me.cortex.voxy.client.core.rendering.section.MeshEXTSectionRenderer;
-import me.cortex.voxy.client.core.rendering.section.geometry.BasicSectionGeometryData;
-import me.cortex.voxy.client.core.rendering.section.geometry.IGeometryData;
 import me.cortex.voxy.client.core.rendering.util.DownloadStream;
 import me.cortex.voxy.client.core.rendering.util.PrintfDebugUtil;
+import me.cortex.voxy.client.core.rendering.util.SharedIndexBuffer;
 import me.cortex.voxy.client.core.rendering.util.UploadStream;
-import me.cortex.voxy.client.core.util.GPUTiming;
 import me.cortex.voxy.client.core.util.IrisUtil;
 import me.cortex.voxy.common.Logger;
 import me.cortex.voxy.common.thread.ServiceThreadPool;
 import me.cortex.voxy.common.world.WorldEngine;
-import me.cortex.voxy.commonImpl.VoxyCommon;
 import net.caffeinemc.mods.sodium.client.render.chunk.ChunkRenderMatrices;
 import net.caffeinemc.mods.sodium.client.util.FogParameters;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.Camera;
+import net.minecraft.client.render.Frustum;
 import org.joml.Matrix4f;
 import org.joml.Matrix4fc;
 import org.lwjgl.opengl.GL11;
 
-import java.util.Arrays;
 import java.util.List;
 
 import static org.lwjgl.opengl.GL11.GL_VIEWPORT;
 import static org.lwjgl.opengl.GL11.glGetIntegerv;
-import static org.lwjgl.opengl.GL11C.*;
+import static org.lwjgl.opengl.GL11C.glFinish;
-import static org.lwjgl.opengl.GL30C.*;
+import static org.lwjgl.opengl.GL30C.GL_DRAW_FRAMEBUFFER_BINDING;
+import static org.lwjgl.opengl.GL30C.glBindFramebuffer;
 import static org.lwjgl.opengl.GL33.glBindSampler;
-import static org.lwjgl.opengl.GL43.GL_SHADER_STORAGE_BUFFER;
-import static org.lwjgl.opengl.GL43C.GL_SHADER_STORAGE_BUFFER_BINDING;
 
 public class VoxyRenderSystem {
+    private final RenderService renderer;
+    private final PostProcessing postProcessing;
     private final WorldEngine worldIn;
-
-
-    private final ModelBakerySubsystem modelService;
-    private final RenderGenerationService renderGen;
-    private final IGeometryData geometryData;
-    private final AsyncNodeManager nodeManager;
-    private final NodeCleaner nodeCleaner;
-    private final HierarchicalOcclusionTraverser traversal;
-
-
     private final RenderDistanceTracker renderDistanceTracker;
     public final ChunkBoundRenderer chunkBoundRenderer;
 
-    private final ViewportSelector<?> viewportSelector;
-
-    private final AbstractRenderPipeline pipeline;
-
-    private static AbstractSectionRenderer<?,?> createSectionRenderer(AbstractRenderPipeline pipeline, ModelStore modelStore, IGeometryData geometryData) {
-        //TODO: need todo a thing where selects optimal section render based on if supports the pipeline and geometry data type
-        //return new MDICSectionRenderer(pipeline, modelStore, (BasicSectionGeometryData) geometryData);//We only have MDIC backend... for now
-        return new MeshEXTSectionRenderer(pipeline, modelStore, (BasicSectionGeometryData) geometryData);
-    }
-
     public VoxyRenderSystem(WorldEngine world, ServiceThreadPool threadPool) {
         //Keep the world loaded, NOTE: this is done FIRST, to keep and ensure that even if the rest of loading takes more
         // than timeout, we keep the world acquired
         world.acquireRef();
-
-        //Fking HATE EVERYTHING AAAAAAAAAAAAAAAA
-        int[] oldBufferBindings = new int[10];
-        for (int i = 0; i < oldBufferBindings.length; i++) {
-            oldBufferBindings[i] = glGetIntegeri(GL_SHADER_STORAGE_BUFFER_BINDING, i);
-        }
-
         try {
             //wait for opengl to be finished, this should hopefully ensure all memory allocations are free
             glFinish();
             glFinish();
 
             this.worldIn = world;
-
+            this.renderer = new RenderService(world, threadPool);
-            long geometryCapacity = getGeometryBufferSize();
+            this.postProcessing = new PostProcessing();
-            {
-
-
-                this.modelService = new ModelBakerySubsystem(world.getMapper());
-                this.renderGen = new RenderGenerationService(world, this.modelService, threadPool, false, () -> true);
-
-                this.geometryData = new BasicSectionGeometryData(1 << 20, geometryCapacity);
-
-                this.nodeManager = new AsyncNodeManager(1 << 21, this.geometryData, this.renderGen);
-                this.nodeCleaner = new NodeCleaner(this.nodeManager);
-                this.traversal = new HierarchicalOcclusionTraverser(this.nodeManager, this.nodeCleaner, this.renderGen);
-
-                world.setDirtyCallback(this.nodeManager::worldEvent);
-
-                Arrays.stream(world.getMapper().getBiomeEntries()).forEach(this.modelService::addBiome);
-                world.getMapper().setBiomeCallback(this.modelService::addBiome);
-
-                this.nodeManager.start();
-            }
-
-            this.pipeline = RenderPipelineFactory.createPipeline(this.nodeManager, this.nodeCleaner, this.traversal, this::frexStillHasWork);
-            this.pipeline.setupExtraModelBakeryData(this.modelService);//Configure the model service
-            var sectionRenderer = createSectionRenderer(this.pipeline, this.modelService.getStore(), this.geometryData);
-            this.pipeline.setSectionRenderer(sectionRenderer);
-            this.viewportSelector = new ViewportSelector<>(sectionRenderer::createViewport);
-
-            {
             int minSec = MinecraftClient.getInstance().world.getBottomSectionCoord() >> 5;
             int maxSec = (MinecraftClient.getInstance().world.getTopSectionCoord() - 1) >> 5;
 
             //Do some very cheeky stuff for MiB
-                if (VoxyCommon.IS_MINE_IN_ABYSS) {//TODO: make this somehow configurable
+            if (false) {
                 minSec = -8;
                 maxSec = 7;
             }
@@ -133,212 +69,35 @@ public class VoxyRenderSystem {
             this.renderDistanceTracker = new RenderDistanceTracker(20,
                     minSec,
                     maxSec,
-                        this.nodeManager::addTopLevel,
+                    this.renderer::addTopLevelNode,
-                        this.nodeManager::removeTopLevel);
+                    this.renderer::removeTopLevelNode);
 
             this.renderDistanceTracker.setRenderDistance(VoxyConfig.CONFIG.sectionRenderDistance);
-            }
 
-            this.chunkBoundRenderer = new ChunkBoundRenderer(this.pipeline);
+            this.chunkBoundRenderer = new ChunkBoundRenderer();
-
-            Logger.info("Voxy render system created with " + geometryCapacity + " geometry capacity, using pipeline '" + this.pipeline.getClass().getSimpleName() + "' with renderer '" + sectionRenderer.getClass().getSimpleName() + "'");
         } catch (RuntimeException e) {
             world.releaseRef();//If something goes wrong, we must release the world first
             throw e;
         }
-
-        for (int i = 0; i < oldBufferBindings.length; i++) {
-            glBindBufferBase(GL_SHADER_STORAGE_BUFFER, i, oldBufferBindings[i]);
-        }
     }
 
-
+    public void setRenderDistance(int renderDistance) {
-    public Viewport<?> setupViewport(ChunkRenderMatrices matrices, FogParameters fogParameters, double cameraX, double cameraY, double cameraZ) {
+        this.renderDistanceTracker.setRenderDistance(renderDistance);
-        var viewport = this.getViewport();
-        if (viewport == null) {
-            return null;
     }
 
-        //Do some very cheeky stuff for MiB
-        if (VoxyCommon.IS_MINE_IN_ABYSS) {
-            int sector = (((int)Math.floor(cameraX)>>4)+512)>>10;
-            cameraX -= sector<<14;//10+4
-            cameraY += (16+(256-32-sector*30))*16;
-        }
-
-        //cameraY += 100;
-        var projection = computeProjectionMat(matrices.projection());//RenderSystem.getProjectionMatrix();
-        //var projection = ShadowMatrices.createOrthoMatrix(160, -16*300, 16*300);
-        //var projection = new Matrix4f(matrices.projection());
-
-        int[] dims = new int[4];
-        glGetIntegerv(GL_VIEWPORT, dims);
-
-        int width = dims[2];
-        int height = dims[3];
-
-        {//Apply render scaling factor
-            var factor = this.pipeline.getRenderScalingFactor();
-            if (factor != null) {
-                width = (int) (width*factor[0]);
-                height = (int) (height*factor[1]);
-            }
-        }
-
-        viewport
-                .setVanillaProjection(matrices.projection())
-                .setProjection(projection)
-                .setModelView(new Matrix4f(matrices.modelView()))
-                .setCamera(cameraX, cameraY, cameraZ)
-                .setScreenSize(width, height)
-                .setFogParameters(fogParameters)
-                .update();
-        viewport.frameId++;
-
-        return viewport;
-    }
-
-    public void renderOpaque(Viewport<?> viewport) {
-        if (viewport == null) {
-            return;
-        }
-
-        TimingStatistics.resetSamplers();
-
-        long startTime = System.nanoTime();
-        TimingStatistics.all.start();
-        GPUTiming.INSTANCE.marker();//Start marker
-        TimingStatistics.main.start();
-
-        //TODO: optimize
-        int[] oldBufferBindings = new int[10];
-        for (int i = 0; i < oldBufferBindings.length; i++) {
-            oldBufferBindings[i] = glGetIntegeri(GL_SHADER_STORAGE_BUFFER_BINDING, i);
-        }
-
-
-        int oldFB = GL11.glGetInteger(GL_DRAW_FRAMEBUFFER_BINDING);
-        int boundFB = oldFB;
-
-        int[] dims = new int[4];
-        glGetIntegerv(GL_VIEWPORT, dims);
-
-        glViewport(0,0, viewport.width, viewport.height);
-
-        //var target = DefaultTerrainRenderPasses.CUTOUT.getTarget();
-        //boundFB = ((net.minecraft.client.texture.GlTexture) target.getColorAttachment()).getOrCreateFramebuffer(((GlBackend) RenderSystem.getDevice()).getFramebufferManager(), target.getDepthAttachment());
-        if (boundFB == 0) {
-            throw new IllegalStateException("Cannot use the default framebuffer as cannot source from it");
-        }
-
-        //this.autoBalanceSubDivSize();
-
-        this.pipeline.preSetup(viewport);
-
-        TimingStatistics.E.start();
-        if (!IrisUtil.irisShadowActive()) {
-            this.chunkBoundRenderer.render(viewport);
-        } else {
-            viewport.depthBoundingBuffer.clear(0);
-        }
-        TimingStatistics.E.stop();
-
-
-        //The entire rendering pipeline (excluding the chunkbound thing)
-        this.pipeline.runPipeline(viewport, boundFB, dims[2], dims[3]);
-
-
-        TimingStatistics.main.stop();
-        TimingStatistics.postDynamic.start();
-
-        PrintfDebugUtil.tick();
-
-        //As much dynamic runtime stuff here
-        {
-            //Tick upload stream (this is ok to do here as upload ticking is just memory management)
-            UploadStream.INSTANCE.tick();
-
-            while (this.renderDistanceTracker.setCenterAndProcess(viewport.cameraX, viewport.cameraZ) && VoxyClient.isFrexActive());//While FF is active, run until everything is processed
-
-            //Done here as is allows less gl state resetup
-            this.modelService.tick(Math.max(3_000_000-(System.nanoTime()-startTime), 500_000));
-        }
-        GPUTiming.INSTANCE.marker();
-        TimingStatistics.postDynamic.stop();
-
-        GPUTiming.INSTANCE.tick();
-
-        glBindFramebuffer(GlConst.GL_FRAMEBUFFER, oldFB);
-        glViewport(dims[0], dims[1], dims[2], dims[3]);
-
-        {//Reset state manager stuffs
-            glUseProgram(0);
-            glEnable(GL_DEPTH_TEST);
-
-            GlStateManager._glBindVertexArray(0);//Clear binding
-
-            GlStateManager._activeTexture(GlConst.GL_TEXTURE1);
-            for (int i = 0; i < 12; i++) {
-                GlStateManager._activeTexture(GlConst.GL_TEXTURE0+i);
-                GlStateManager._bindTexture(0);
-                glBindSampler(i, 0);
-            }
-
-            IrisUtil.clearIrisSamplers();//Thanks iris (sigh)
-
-            //TODO: should/needto actually restore all of these, not just clear them
-            //Clear all the bindings
-            for (int i = 0; i < oldBufferBindings.length; i++) {
-                glBindBufferBase(GL_SHADER_STORAGE_BUFFER, i, oldBufferBindings[i]);
-            }
-
-            //((SodiumShader) Iris.getPipelineManager().getPipelineNullable().getSodiumPrograms().getProgram(DefaultTerrainRenderPasses.CUTOUT).getInterface()).setupState(DefaultTerrainRenderPasses.CUTOUT, fogParameters);
-        }
-
-        TimingStatistics.all.stop();
-
-        /*
-        TimingStatistics.F.start();
-        this.postProcessing.setup(viewport.width, viewport.height, boundFB);
-        TimingStatistics.F.stop();
-
-        this.renderer.renderFarAwayOpaque(viewport, this.chunkBoundRenderer.getDepthBoundTexture());
-
-
-        TimingStatistics.F.start();
-        //Compute the SSAO of the rendered terrain, TODO: fix it breaking depth or breaking _something_ am not sure what
-        this.postProcessing.computeSSAO(viewport.MVP);
-        TimingStatistics.F.stop();
-
-        TimingStatistics.G.start();
-        //We can render the translucent directly after as it is the furthest translucent objects
-        this.renderer.renderFarAwayTranslucent(viewport, this.chunkBoundRenderer.getDepthBoundTexture());
-        TimingStatistics.G.stop();
-
-
-        TimingStatistics.F.start();
-        this.postProcessing.renderPost(viewport, matrices.projection(), boundFB);
-        TimingStatistics.F.stop();
-         */
-    }
-
-
 
     private void autoBalanceSubDivSize() {
         //only increase quality while there are very few mesh queues, this stops,
         // e.g. while flying and is rendering alot of low quality chunks
-        boolean canDecreaseSize = this.renderGen.getTaskCount() < 300;
+        boolean canDecreaseSize = this.renderer.getMeshQueueCount() < 5000;
-        int MIN_FPS = 55;
+        float CHANGE_PER_SECOND = 30;
-        int MAX_FPS = 65;
-        float INCREASE_PER_SECOND = 60;
-        float DECREASE_PER_SECOND = 30;
         //Auto fps targeting
-        if (MinecraftClient.getInstance().getCurrentFps() < MIN_FPS) {
+        if (MinecraftClient.getInstance().getCurrentFps() < 45) {
-            VoxyConfig.CONFIG.subDivisionSize = Math.min(VoxyConfig.CONFIG.subDivisionSize + INCREASE_PER_SECOND / Math.max(1f, MinecraftClient.getInstance().getCurrentFps()), 256);
+            VoxyConfig.CONFIG.subDivisionSize = Math.min(VoxyConfig.CONFIG.subDivisionSize + CHANGE_PER_SECOND / Math.max(1f, MinecraftClient.getInstance().getCurrentFps()), 256);
         }
 
-        if (MAX_FPS < MinecraftClient.getInstance().getCurrentFps() && canDecreaseSize) {
+        if (55 < MinecraftClient.getInstance().getCurrentFps() && canDecreaseSize) {
-            VoxyConfig.CONFIG.subDivisionSize = Math.max(VoxyConfig.CONFIG.subDivisionSize - DECREASE_PER_SECOND / Math.max(1f, MinecraftClient.getInstance().getCurrentFps()), 28);
+            VoxyConfig.CONFIG.subDivisionSize = Math.max(VoxyConfig.CONFIG.subDivisionSize - CHANGE_PER_SECOND / Math.max(1f, MinecraftClient.getInstance().getCurrentFps()), 30);
         }
     }
 
@@ -365,41 +124,119 @@ public class VoxyRenderSystem {
         ).mulLocal(makeProjectionMatrix(16, 16*3000));
     }
 
-    private boolean frexStillHasWork() {
+    public void renderOpaque(ChunkRenderMatrices matrices, FogParameters fogParameters, double cameraX, double cameraY, double cameraZ) {
-        if (!VoxyClient.isFrexActive()) {
-            return false;
-        }
-        //If frex is running we must tick everything to ensure correctness
-        UploadStream.INSTANCE.tick();
-        //Done here as is allows less gl state resetup
-        this.modelService.tick(100_000_000);
-        GL11.glFinish();
-        return this.nodeManager.hasWork() || this.renderGen.getTaskCount()!=0 || !this.modelService.areQueuesEmpty();
-    }
-
-    public void setRenderDistance(int renderDistance) {
-        this.renderDistanceTracker.setRenderDistance(renderDistance);
-    }
-
-    public Viewport<?> getViewport() {
         if (IrisUtil.irisShadowActive()) {
-            return null;
+            return;
         }
-        return this.viewportSelector.getViewport();
+        TimingStatistics.resetSamplers();
+
+
+        //Do some very cheeky stuff for MiB
+        if (false) {
+            int sector = (((int)Math.floor(cameraX)>>4)+512)>>10;
+            cameraX -= sector<<14;//10+4
+            cameraY += (16+(256-32-sector*30))*16;
         }
 
+        long startTime = System.nanoTime();
+        TimingStatistics.all.start();
+        TimingStatistics.main.start();
 
 
 
+        int oldFB = GL11.glGetInteger(GL_DRAW_FRAMEBUFFER_BINDING);
+        int boundFB = oldFB;
+
+        //var target = DefaultTerrainRenderPasses.CUTOUT.getTarget();
+        //boundFB = ((net.minecraft.client.texture.GlTexture) target.getColorAttachment()).getOrCreateFramebuffer(((GlBackend) RenderSystem.getDevice()).getFramebufferManager(), target.getDepthAttachment());
+        if (boundFB == 0) {
+            throw new IllegalStateException("Cannot use the default framebuffer as cannot source from it");
+        }
+
+        //this.autoBalanceSubDivSize();
+
+        var projection = computeProjectionMat(matrices.projection());//RenderSystem.getProjectionMatrix();
+        //var projection = new Matrix4f(matrices.projection());
+
+        int[] dims = new int[4];
+        glGetIntegerv(GL_VIEWPORT, dims);
+        var viewport = this.renderer.getViewport();
+
+        viewport
+                .setProjection(projection)
+                .setModelView(new Matrix4f(matrices.modelView()))
+                .setCamera(cameraX, cameraY, cameraZ)
+                .setScreenSize(dims[2], dims[3])
+                .setFogParameters(fogParameters)
+                .update();
+        viewport.frameId++;
+
+        TimingStatistics.E.start();
+        this.chunkBoundRenderer.render(viewport);
+        TimingStatistics.E.stop();
+
+        TimingStatistics.F.start();
+        this.postProcessing.setup(viewport.width, viewport.height, boundFB);
+        TimingStatistics.F.stop();
+
+        this.renderer.renderFarAwayOpaque(viewport, this.chunkBoundRenderer.getDepthBoundTexture());
+
+
+        TimingStatistics.F.start();
+        //Compute the SSAO of the rendered terrain, TODO: fix it breaking depth or breaking _something_ am not sure what
+        this.postProcessing.computeSSAO(viewport.MVP);
+        TimingStatistics.F.stop();
+
+        TimingStatistics.G.start();
+        //We can render the translucent directly after as it is the furthest translucent objects
+        this.renderer.renderFarAwayTranslucent(viewport, this.chunkBoundRenderer.getDepthBoundTexture());
+        TimingStatistics.G.stop();
+
+
+        TimingStatistics.F.start();
+        this.postProcessing.renderPost(viewport, matrices.projection(), boundFB);
+        TimingStatistics.F.stop();
+
+        TimingStatistics.main.stop();
+        TimingStatistics.postDynamic.start();
+
+        PrintfDebugUtil.tick();
+
+        //As much dynamic runtime stuff here
+        {
+            //Tick upload stream (this is ok to do here as upload ticking is just memory management)
+            UploadStream.INSTANCE.tick();
+
+            while (this.renderDistanceTracker.setCenterAndProcess(cameraX, cameraZ) && VoxyClient.isFrexActive());//While FF is active, run until everything is processed
+
+            //Done here as is allows less gl state resetup
+            this.renderer.tickModelService(Math.max(3_000_000-(System.nanoTime()-startTime), 500_000));
+        }
+        TimingStatistics.postDynamic.stop();
+
+        glBindFramebuffer(GlConst.GL_FRAMEBUFFER, oldFB);
+
+        {//Reset state manager stuffs
+            GlStateManager._glBindVertexArray(0);//Clear binding
+
+            GlStateManager._activeTexture(GlConst.GL_TEXTURE0);
+            GlStateManager._bindTexture(0);
+            glBindSampler(0, 0);
+
+            GlStateManager._activeTexture(GlConst.GL_TEXTURE1);
+            GlStateManager._bindTexture(0);
+            glBindSampler(1, 0);
+
+            GlStateManager._activeTexture(GlConst.GL_TEXTURE2);
+            GlStateManager._bindTexture(0);
+            glBindSampler(2, 0);
+        }
+        TimingStatistics.all.stop();
+    }
 
     public void addDebugInfo(List<String> debug) {
         debug.add("Buf/Tex [#/Mb]: [" + GlBuffer.getCount() + "/" + (GlBuffer.getTotalSize()/1_000_000) + "],[" + GlTexture.getCount() + "/" + (GlTexture.getEstimatedTotalSize()/1_000_000)+"]");
-        {
+        this.renderer.addDebugData(debug);
-            this.modelService.addDebugData(debug);
-            this.renderGen.addDebugData(debug);
-            this.nodeManager.addDebug(debug);
-            this.pipeline.addDebug(debug);
-        }
         {
             TimingStatistics.update();
             debug.add("Voxy frame runtime (millis): " + TimingStatistics.dynamic.pVal() + ", " + TimingStatistics.main.pVal()+ ", " + TimingStatistics.postDynamic.pVal()+ ", " + TimingStatistics.all.pVal());
@@ -413,62 +250,11 @@ public class VoxyRenderSystem {
         Logger.info("Flushing download stream");
         DownloadStream.INSTANCE.flushWaitClear();
         Logger.info("Shutting down rendering");
-        try {
+        try {this.renderer.shutdown();this.chunkBoundRenderer.free();} catch (Exception e) {Logger.error("Error shutting down renderer", e);}
-            //Cleanup callbacks
+        Logger.info("Shutting down post processor");
-            this.worldIn.setDirtyCallback(null);
+        if (this.postProcessing!=null){try {this.postProcessing.shutdown();} catch (Exception e) {Logger.error("Error shutting down post processor", e);}}
-            this.worldIn.getMapper().setBiomeCallback(null);
-            this.worldIn.getMapper().setStateCallback(null);
-
-            this.nodeManager.stop();
-
-            this.modelService.shutdown();
-            this.renderGen.shutdown();
-            this.traversal.free();
-            this.nodeCleaner.free();
-
-            this.geometryData.free();
-            this.chunkBoundRenderer.free();
-
-            this.viewportSelector.free();
-        } catch (Exception e) {Logger.error("Error shutting down renderer components", e);}
-        Logger.info("Shutting down render pipeline");
-        try {this.pipeline.free();} catch (Exception e){Logger.error("Error releasing render pipeline", e);}
-
-
-
-        Logger.info("Flushing download stream");
-        DownloadStream.INSTANCE.flushWaitClear();
 
         //Release hold on the world
         this.worldIn.releaseRef();
-        Logger.info("Render shutdown completed");
-    }
-
-    private static long getGeometryBufferSize() {
-        long geometryCapacity = Math.min((1L<<(64-Long.numberOfLeadingZeros(Capabilities.INSTANCE.ssboMaxSize-1)))<<1, 1L<<32)-1024/*(1L<<32)-1024*/;
-        if (Capabilities.INSTANCE.isIntel) {
-            geometryCapacity = Math.max(geometryCapacity, 1L<<30);//intel moment, force min 1gb
-        }
-
-        //Limit to available dedicated memory if possible
-        if (Capabilities.INSTANCE.canQueryGpuMemory) {
-            //512mb less than avalible,
-            long limit = Capabilities.INSTANCE.getFreeDedicatedGpuMemory() - (long)(1.5*1024*1024*1024);//1.5gb vram buffer
-            // Give a minimum of 512 mb requirement
-            limit = Math.max(512*1024*1024, limit);
-
-            geometryCapacity = Math.min(geometryCapacity, limit);
-        }
-        //geometryCapacity = 1<<28;
-        //geometryCapacity = 1<<30;//1GB test
-        var override = System.getProperty("voxy.geometryBufferSizeOverrideMB", "");
-        if (!override.isEmpty()) {
-            geometryCapacity = Long.parseLong(override)*1024L*1024L;
-        }
-        return geometryCapacity;
-    }
-
-    public WorldEngine getEngine() {
-        return this.worldIn;
     }
 }

src/main/java/me/cortex/voxy/client/core/gl/Capabilities.java

@@ -25,13 +25,11 @@ public class Capabilities {
     public final boolean indirectParameters;
     public final boolean isIntel;
     public final boolean subgroup;
-    public final boolean sparseBuffer;
-    public final boolean isNvidia;
 
     public Capabilities() {
         var cap = GL.getCapabilities();
-        this.sparseBuffer = cap.GL_ARB_sparse_buffer;
         this.compute = cap.glDispatchComputeIndirect != 0;
+        this.subgroup = cap.GL_KHR_shader_subgroup;
         this.indirectParameters = cap.glMultiDrawElementsIndirectCountARB != 0;
         this.repFragTest = cap.GL_NV_representative_fragment_test;
         this.meshShaders = cap.GL_NV_mesh_shader;
@@ -46,25 +44,11 @@ public class Capabilities {
                     uint64_t a = 1234;
                 }
                 """);
-        if (cap.GL_KHR_shader_subgroup) {
-            this.subgroup = testShaderCompilesOk(ShaderType.COMPUTE, """
-                #version 430
-                #extension GL_KHR_shader_subgroup_basic : require
-                #extension GL_KHR_shader_subgroup_arithmetic : require
-                layout(local_size_x=32) in;
-                void main() {
-                    uint a = subgroupExclusiveAdd(gl_LocalInvocationIndex);
-                }
-                """);
-        } else {
-            this.subgroup = false;
-        }
 
         this.ssboMaxSize = glGetInteger64(GL_MAX_SHADER_STORAGE_BLOCK_SIZE);
 
         this.isMesa = glGetString(GL_VERSION).toLowerCase().contains("mesa");
         this.isIntel = glGetString(GL_VENDOR).toLowerCase().contains("intel");
-        this.isNvidia = glGetString(GL_VENDOR).toLowerCase().contains("nvidia");
 
         if (this.canQueryGpuMemory) {
             this.totalDedicatedMemory = glGetInteger64(GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX)*1024;//Since its in Kb

src/main/java/me/cortex/voxy/client/core/gl/GlBuffer.java

@@ -2,11 +2,10 @@ package me.cortex.voxy.client.core.gl;
 
 import me.cortex.voxy.common.util.TrackedObject;
 import org.lwjgl.opengl.GL11;
-import org.lwjgl.system.MemoryUtil;
 
-import static org.lwjgl.opengl.ARBSparseBuffer.GL_SPARSE_STORAGE_BIT_ARB;
 import static org.lwjgl.opengl.GL11.GL_UNSIGNED_BYTE;
 import static org.lwjgl.opengl.GL15.glDeleteBuffers;
+import static org.lwjgl.opengl.GL44C.glBufferStorage;
 import static org.lwjgl.opengl.GL45C.*;
 
 public class GlBuffer extends TrackedObject {
@@ -19,21 +18,12 @@ public class GlBuffer extends TrackedObject {
     public GlBuffer(long size) {
         this(size, 0);
     }
-    public GlBuffer(long size, boolean zero) {
-        this(size, 0, zero);
-    }
 
     public GlBuffer(long size, int flags) {
-        this(size, flags, true);
-    }
-
-    public GlBuffer(long size, int flags, boolean zero) {
         this.id = glCreateBuffers();
         this.size = size;
         glNamedBufferStorage(this.id, size, flags);
-        if ((flags&GL_SPARSE_STORAGE_BIT_ARB)==0 && zero) {
         this.zero();
-        }
 
         COUNT++;
         TOTAL_SIZE += size;
@@ -68,8 +58,7 @@ public class GlBuffer extends TrackedObject {
         glPixelStorei(GL11.GL_UNPACK_SKIP_ROWS, 0);
         glPixelStorei(GL11.GL_UNPACK_SKIP_PIXELS, 0);
 
-        MemoryUtil.memPutInt(SCRATCH, data);
+        glClearNamedBufferData(this.id, GL_R32UI, GL_RED_INTEGER, GL_UNSIGNED_INT, new int[]{data});
-        nglClearNamedBufferData(this.id, GL_R32UI, GL_RED_INTEGER, GL_UNSIGNED_INT, SCRATCH);
         return this;
     }
 
@@ -84,6 +73,4 @@ public class GlBuffer extends TrackedObject {
     public GlBuffer name(String name) {
         return GlDebug.name(name, this);
     }
-
-    private static final long SCRATCH = MemoryUtil.nmemAlloc(4);
 }

src/main/java/me/cortex/voxy/client/core/gl/GlRenderBuffer.java

@@ -2,6 +2,7 @@ package me.cortex.voxy.client.core.gl;
 
 import me.cortex.voxy.common.util.TrackedObject;
 
+import static org.lwjgl.opengl.GL11C.*;
 import static org.lwjgl.opengl.GL45C.*;
 
 public class GlRenderBuffer extends TrackedObject {

src/main/java/me/cortex/voxy/client/core/gl/GlTexture.java

@@ -2,6 +2,8 @@ package me.cortex.voxy.client.core.gl;
 
 import me.cortex.voxy.common.util.TrackedObject;
 
+import static org.lwjgl.opengl.ARBFramebufferObject.glDeleteFramebuffers;
+import static org.lwjgl.opengl.ARBFramebufferObject.glGenFramebuffers;
 import static org.lwjgl.opengl.GL11.GL_RGBA8;
 import static org.lwjgl.opengl.GL11C.*;
 import static org.lwjgl.opengl.GL30.GL_DEPTH24_STENCIL8;

src/main/java/me/cortex/voxy/client/core/gl/GlVertexArray.java

@@ -4,12 +4,9 @@ import me.cortex.voxy.common.util.TrackedObject;
 
 import java.util.Arrays;
 
-import static org.lwjgl.opengl.GL30.glGenVertexArrays;
 import static org.lwjgl.opengl.GL45C.*;
 
 public class GlVertexArray extends TrackedObject {
-    public static final int STATIC_VAO = glGenVertexArrays();
-
     public final int id;
     private int[] indices = new int[0];
     private int stride;

src/main/java/me/cortex/voxy/client/core/gl/shader/AutoBindingShader.java

@@ -14,6 +14,7 @@ import static org.lwjgl.opengl.GL30.glBindBufferRange;
 import static org.lwjgl.opengl.GL31.GL_UNIFORM_BUFFER;
 import static org.lwjgl.opengl.GL33.glBindSampler;
 import static org.lwjgl.opengl.GL43.GL_SHADER_STORAGE_BUFFER;
+import static org.lwjgl.opengl.GL44.*;
 
 
 //TODO: rewrite the entire shader builder system

src/main/java/me/cortex/voxy/client/core/gl/shader/GenericsProcessor.java

@@ -0,0 +1,12 @@
+package me.cortex.voxy.client.core.gl.shader;
+
+import java.util.regex.Pattern;
+
+public class GenericsProcessor implements IShaderProcessor {
+    private static final Pattern GENERIC_DEFINE = Pattern.compile("#defineGen (?<name>[A-Za-z0-9]+)<(?<generic>[A-Za-z0-9]*)>");
+    private static final Pattern GENERIC_USE = Pattern.compile("(?<type>[A-Za-z0-9]+)<(?<generic>[A-Za-z0-9]*)>");
+    @Override
+    public String process(ShaderType type, String source) {
+        return null;
+    }
+}

src/main/java/me/cortex/voxy/client/core/gl/shader/Shader.java

@@ -1,6 +1,7 @@
 package me.cortex.voxy.client.core.gl.shader;
 
 import me.cortex.voxy.client.core.gl.Capabilities;
+import me.cortex.voxy.client.core.gl.GlBuffer;
 import me.cortex.voxy.client.core.gl.GlDebug;
 import me.cortex.voxy.common.Logger;
 import me.cortex.voxy.common.util.ThreadUtils;
@@ -77,13 +78,6 @@ public class Shader extends TrackedObject {
             this.processor = processor;
         }
 
-        public Builder<T> clone() {
-            var clone = new Builder<>(this.constructor, this.processor);
-            clone.defines.putAll(this.defines);
-            clone.sources.putAll(this.sources);
-            return clone;
-        }
-
         public Builder<T> define(String name) {
             this.defines.put(name, "");
             return this;

src/main/java/me/cortex/voxy/client/core/model/ModelBakerySubsystem.java

@@ -1,22 +1,33 @@
 package me.cortex.voxy.client.core.model;
 
 
+import it.unimi.dsi.fastutil.ints.IntLinkedOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
-import me.cortex.voxy.common.Logger;
+import me.cortex.voxy.client.TimingStatistics;
+import me.cortex.voxy.client.core.gl.GlFramebuffer;
+import me.cortex.voxy.client.core.rendering.building.BuiltSection;
+import me.cortex.voxy.client.core.rendering.util.RawDownloadStream;
 import me.cortex.voxy.common.world.other.Mapper;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.util.Identifier;
+import org.lwjgl.opengl.GL11;
 
+import java.lang.invoke.VarHandle;
 import java.util.List;
 import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.locks.StampedLock;
 
+import static org.lwjgl.opengl.ARBFramebufferObject.GL_COLOR_ATTACHMENT0;
+import static org.lwjgl.opengl.GL11.GL_COLOR_BUFFER_BIT;
 import static org.lwjgl.opengl.GL11.glGetInteger;
+import static org.lwjgl.opengl.GL11C.GL_NEAREST;
 import static org.lwjgl.opengl.GL30.GL_FRAMEBUFFER;
 import static org.lwjgl.opengl.GL30.GL_FRAMEBUFFER_BINDING;
+import static org.lwjgl.opengl.GL30C.GL_DRAW_FRAMEBUFFER_BINDING;
 import static org.lwjgl.opengl.GL30C.glBindFramebuffer;
+import static org.lwjgl.opengl.GL45.glBlitNamedFramebuffer;
 
 public class ModelBakerySubsystem {
     //Redo to just make it request the block faces with the async texture download stream which
@@ -24,13 +35,11 @@ public class ModelBakerySubsystem {
 
     private final ModelStore storage = new ModelStore();
     public final ModelFactory factory;
-    private final Mapper mapper;
     private final AtomicInteger blockIdCount = new AtomicInteger();
     private final ConcurrentLinkedDeque<Integer> blockIdQueue = new ConcurrentLinkedDeque<>();//TODO: replace with custom DS
     private final ConcurrentLinkedDeque<Mapper.BiomeEntry> biomeQueue = new ConcurrentLinkedDeque<>();
 
     public ModelBakerySubsystem(Mapper mapper) {
-        this.mapper = mapper;
         this.factory = new ModelFactory(mapper, this.storage);
     }
 
@@ -104,19 +113,15 @@ public class ModelBakerySubsystem {
     }
 
     //This is on this side only and done like this as only worker threads call this code
-    private final ReentrantLock seenIdsLock = new ReentrantLock();
+    private final StampedLock seenIdsLock = new StampedLock();
-    private final IntOpenHashSet seenIds = new IntOpenHashSet(6000);//TODO: move to a lock free concurrent hashmap
+    private final IntOpenHashSet seenIds = new IntOpenHashSet(6000);
     public void requestBlockBake(int blockId) {
-        if (this.mapper.getBlockStateCount() < blockId) {
+        long stamp = this.seenIdsLock.writeLock();
-            Logger.error("Error, got bakeing request for out of range state id. StateId: " + blockId + " max id: " + this.mapper.getBlockStateCount(), new Exception());
-            return;
-        }
-        this.seenIdsLock.lock();
         if (!this.seenIds.add(blockId)) {
-            this.seenIdsLock.unlock();
+            this.seenIdsLock.unlockWrite(stamp);
             return;
         }
-        this.seenIdsLock.unlock();
+        this.seenIdsLock.unlockWrite(stamp);
         this.blockIdQueue.add(blockId);
         this.blockIdCount.incrementAndGet();
     }

src/main/java/me/cortex/voxy/client/core/model/ModelFactory.java

@@ -1,7 +1,6 @@
 package me.cortex.voxy.client.core.model;
 
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
-import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import it.unimi.dsi.fastutil.objects.ObjectSet;
@@ -20,6 +19,7 @@ import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.color.block.BlockColorProvider;
 import net.minecraft.client.render.BlockRenderLayer;
+import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.RenderLayers;
 import net.minecraft.fluid.FluidState;
 import net.minecraft.registry.Registries;
@@ -41,6 +41,9 @@ import java.util.*;
 import static me.cortex.voxy.client.core.model.ModelStore.MODEL_SIZE;
 import static org.lwjgl.opengl.ARBDirectStateAccess.nglTextureSubImage2D;
 import static org.lwjgl.opengl.GL11.*;
+import static org.lwjgl.opengl.GL33.glDeleteSamplers;
+import static org.lwjgl.opengl.GL33.glGenSamplers;
+import static org.lwjgl.opengl.GL45C.glTextureSubImage2D;
 
 //Manages the storage and updating of model states, textures and colours
 
@@ -119,7 +122,6 @@ public class ModelFactory {
 
     public final Deque<Runnable> resultJobs = new ArrayDeque<>();
 
-    private Object2IntMap<BlockState> customBlockStateIdMapping;
 
     //TODO: NOTE!!! is it worth even uploading as a 16x16 texture, since automatic lod selection... doing 8x8 textures might be perfectly ok!!!
     // this _quarters_ the memory requirements for the texture atlas!!! WHICH IS HUGE saving
@@ -143,10 +145,6 @@ public class ModelFactory {
         this.downstream.tick();
     }
 
-    public void setCustomBlockStateMapping(Object2IntMap<BlockState> mapping) {
-        this.customBlockStateIdMapping = mapping;
-    }
-
     public boolean addEntry(int blockId) {
         if (this.idMappings[blockId] != -1) {
             return false;
@@ -273,6 +271,12 @@ public class ModelFactory {
 
         int checkMode = blockRenderLayer==BlockRenderLayer.SOLID?TextureUtils.WRITE_CHECK_STENCIL:TextureUtils.WRITE_CHECK_ALPHA;
 
+        if (Capabilities.INSTANCE.isMesa) {
+            //Mesa does not work with GL_DEPTH_STENCIL_TEXTURE_MODE GL_STENCIL_INDEX
+            // the sampler in the compute shader always reads zero even when stencil is guarenteed not to be zero
+            // (e.g. clearing with stencil 10)
+            checkMode = TextureUtils.WRITE_CHECK_ALPHA;
+        }
 
         var colourProvider = getColourProvider(blockState.getBlock());
 
@@ -436,18 +440,17 @@ public class ModelFactory {
         modelFlags |= blockRenderLayer == BlockRenderLayer.CUTOUT?0:8;//Dont use mipmaps (AND ALSO FKING SPECIFIES IF IT HAS AO, WHY??? GREAT QUESTION, TODO FIXE THIS)
 
         //modelFlags |= blockRenderLayer == RenderLayer.getSolid()?0:1;// should discard alpha
-        MemoryUtil.memPutInt(uploadPtr, modelFlags); uploadPtr += 4;
+        MemoryUtil.memPutInt(uploadPtr, modelFlags);
-
 
         //Temporary override to always be non biome specific
         if (colourProvider == null) {
-            MemoryUtil.memPutInt(uploadPtr, -1);//Set the default to nothing so that its faster on the gpu
+            MemoryUtil.memPutInt(uploadPtr + 4, -1);//Set the default to nothing so that its faster on the gpu
         } else if (!isBiomeColourDependent) {
-            MemoryUtil.memPutInt(uploadPtr, captureColourConstant(colourProvider, blockState, DEFAULT_BIOME)|0xFF000000);
+            MemoryUtil.memPutInt(uploadPtr + 4, captureColourConstant(colourProvider, blockState, DEFAULT_BIOME)|0xFF000000);
         } else if (!this.biomes.isEmpty()) {
             //Populate the list of biomes for the model state
             int biomeIndex = this.modelsRequiringBiomeColours.size() * this.biomes.size();
-            MemoryUtil.memPutInt(uploadPtr, biomeIndex);
+            MemoryUtil.memPutInt(uploadPtr + 4, biomeIndex);
             this.modelsRequiringBiomeColours.add(new Pair<>(modelId, blockState));
             //NOTE: UploadStream.INSTANCE is called _after_ uploadPtr is finished being used, this is cause the upload pointer
             // may be invalidated as soon as another upload stream is invoked
@@ -456,22 +459,11 @@ public class ModelFactory {
                 MemoryUtil.memPutInt(clrUploadPtr, captureColourConstant(colourProvider, blockState, biome)|0xFF000000); clrUploadPtr += 4;
             }
         }
-        uploadPtr += 4;
-
-        //have 32 bytes of free space after here
-
-        //install the custom mapping id if it exists
-        if (this.customBlockStateIdMapping != null && this.customBlockStateIdMapping.containsKey(blockState)) {
-            MemoryUtil.memPutInt(uploadPtr, this.customBlockStateIdMapping.getInt(blockState));
-        } else {
-            MemoryUtil.memPutInt(uploadPtr, 0);
-        } uploadPtr += 4;
 
 
         //Note: if the layer isSolid then need to fill all the points in the texture where alpha == 0 with the average colour
         // of the surrounding blocks but only within the computed face size bounds
-
+        //TODO
-        //TODO callback to inject extra data into the model data
 
 
         this.putTextures(modelId, textureData);
@@ -505,7 +497,7 @@ public class ModelFactory {
 
         int i = 0;
         for (var entry : this.modelsRequiringBiomeColours) {
-            var colourProvider = getColourProvider(entry.getRight().getBlock());
+            var colourProvider = MinecraftClient.getInstance().getBlockColors().providers.get(Registries.BLOCK.getRawId(entry.getRight().getBlock()));
             if (colourProvider == null) {
                 throw new IllegalStateException();
             }

src/main/java/me/cortex/voxy/client/core/model/ModelStore.java

@@ -2,9 +2,6 @@ package me.cortex.voxy.client.core.model;
 
 import me.cortex.voxy.client.core.gl.GlBuffer;
 import me.cortex.voxy.client.core.gl.GlTexture;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.texture.SpriteAtlasTexture;
-import net.minecraft.util.Identifier;
 
 import static org.lwjgl.opengl.GL11.*;
 import static org.lwjgl.opengl.GL11C.GL_NEAREST;
@@ -30,15 +27,11 @@ public class ModelStore {
         this.textures = new GlTexture().store(GL_RGBA8, Integer.numberOfTrailingZeros(ModelFactory.MODEL_TEXTURE_SIZE), ModelFactory.MODEL_TEXTURE_SIZE*3*256,ModelFactory.MODEL_TEXTURE_SIZE*2*256).name("ModelTextures");
 
 
-        //Limit the mips of the texture to match that of the terrain atlas
-        int mipLvl = ((SpriteAtlasTexture) MinecraftClient.getInstance().getTextureManager()
-                .getTexture(Identifier.of("minecraft", "textures/atlas/blocks.png")))
-                .mipLevel;
 
         glSamplerParameteri(this.blockSampler, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_LINEAR);
         glSamplerParameteri(this.blockSampler, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
         glSamplerParameteri(this.blockSampler, GL_TEXTURE_MIN_LOD, 0);
-        glSamplerParameteri(this.blockSampler, GL_TEXTURE_MAX_LOD, mipLvl);//Integer.numberOfTrailingZeros(ModelFactory.MODEL_TEXTURE_SIZE)
+        glSamplerParameteri(this.blockSampler, GL_TEXTURE_MAX_LOD, Integer.numberOfTrailingZeros(ModelFactory.MODEL_TEXTURE_SIZE));
     }
 
 

src/main/java/me/cortex/voxy/client/core/model/TextureUtils.java

@@ -1,7 +1,7 @@
 package me.cortex.voxy.client.core.model;
 
 import net.caffeinemc.mods.sodium.client.util.color.ColorSRGB;
-import net.minecraft.client.texture.MipmapHelper;
+import net.minecraft.util.math.ColorHelper;
 
 //Texturing utils to manipulate data from the model bakery
 public class TextureUtils {
@@ -178,12 +178,8 @@ public class TextureUtils {
 
 
     public static int mipColours(int one, int two, int three, int four) {
-        if (true) {
-            return MipmapHelper.blend(one, two, three, four, false);
-        } else {
         return weightedAverageColor(weightedAverageColor(one, two), weightedAverageColor(three, four));
     }
-    }
 
     //TODO: FIXME!!! ITS READING IT AS ABGR??? isnt the format RGBA??
     private static int weightedAverageColor(int a, int b) {

src/main/java/me/cortex/voxy/client/core/model/bakery/BakedBlockEntityModel.java

@@ -1,10 +1,12 @@
 package me.cortex.voxy.client.core.model.bakery;
 
+import com.mojang.blaze3d.textures.GpuTexture;
 import me.cortex.voxy.common.Logger;
 import net.minecraft.block.BlockEntityProvider;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.gl.GlGpuBuffer;
+import net.minecraft.client.render.*;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;

src/main/java/me/cortex/voxy/client/core/model/bakery/GlViewCapture.java

@@ -1,20 +1,20 @@
 package me.cortex.voxy.client.core.model.bakery;
 
+import me.cortex.voxy.client.core.gl.GlBuffer;
 import me.cortex.voxy.client.core.gl.GlFramebuffer;
 import me.cortex.voxy.client.core.gl.GlTexture;
 import me.cortex.voxy.client.core.gl.shader.Shader;
 import me.cortex.voxy.client.core.gl.shader.ShaderType;
-import org.lwjgl.system.MemoryStack;
-import org.lwjgl.system.MemoryUtil;
 
+import static org.lwjgl.opengl.ARBDirectStateAccess.glClearNamedFramebufferfv;
 import static org.lwjgl.opengl.ARBDirectStateAccess.glTextureParameteri;
-import static org.lwjgl.opengl.ARBDirectStateAccess.nglClearNamedFramebufferfv;
 import static org.lwjgl.opengl.ARBShaderImageLoadStore.GL_FRAMEBUFFER_BARRIER_BIT;
 import static org.lwjgl.opengl.ARBShaderImageLoadStore.GL_PIXEL_BUFFER_BARRIER_BIT;
 import static org.lwjgl.opengl.ARBShaderImageLoadStore.GL_SHADER_IMAGE_ACCESS_BARRIER_BIT;
 import static org.lwjgl.opengl.ARBShaderImageLoadStore.GL_TEXTURE_UPDATE_BARRIER_BIT;
 import static org.lwjgl.opengl.ARBShaderImageLoadStore.glMemoryBarrier;
 import static org.lwjgl.opengl.GL11.*;
+import static org.lwjgl.opengl.GL11.GL_STENCIL_INDEX;
 import static org.lwjgl.opengl.GL30.*;
 import static org.lwjgl.opengl.GL43.*;
 import static org.lwjgl.opengl.GL45.glClearNamedFramebufferfi;
@@ -42,8 +42,6 @@ public class GlViewCapture {
         this.framebuffer = new GlFramebuffer().bind(GL_COLOR_ATTACHMENT0, this.colourTex).bind(GL_DEPTH_STENCIL_ATTACHMENT, this.depthTex).verify().name("ModelFramebuffer");
 
         glTextureParameteri(this.stencilTex.id, GL_DEPTH_STENCIL_TEXTURE_MODE, GL_STENCIL_INDEX);
-        glTextureParameteri(this.stencilTex.id, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-        glTextureParameteri(this.stencilTex.id, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 
         this.copyOutShader = Shader.makeAuto()
                 .define("WIDTH", width)
@@ -65,16 +63,10 @@ public class GlViewCapture {
         glBindBufferRange(GL_SHADER_STORAGE_BUFFER, 3, buffer, offset, (this.width*3L)*(this.height*2L)*4L*2);//its 2*4 because colour + depth stencil
         glMemoryBarrier(GL_FRAMEBUFFER_BARRIER_BIT|GL_TEXTURE_UPDATE_BARRIER_BIT|GL_PIXEL_BUFFER_BARRIER_BIT|GL_SHADER_IMAGE_ACCESS_BARRIER_BIT);//Am not sure if barriers are right
         glDispatchCompute(3, 2, 1);
-        glBindBufferRange(GL_SHADER_STORAGE_BUFFER, 3, 0, 0, 4);//WHY DOES THIS FIX FUCKING BINDING ISSUES HERE WHEN DOING THIS IN THE RENDER SYSTEM DOESNT
     }
 
     public void clear() {
-        try (var stack = MemoryStack.stackPush()) {
+        glClearNamedFramebufferfv(this.framebuffer.id, GL_COLOR, 0, new float[]{0,0,0,0});
-            long ptr = stack.nmalloc(4*4);
-            MemoryUtil.memPutLong(ptr, 0);
-            MemoryUtil.memPutLong(ptr+8, 0);
-            nglClearNamedFramebufferfv(this.framebuffer.id, GL_COLOR, 0, ptr);
-        }
         glClearNamedFramebufferfi(this.framebuffer.id, GL_DEPTH_STENCIL, 0, 1.0f, 0);
     }
 

src/main/java/me/cortex/voxy/client/core/model/bakery/ModelTextureBakery.java

@@ -10,6 +10,7 @@ import net.minecraft.fluid.FluidState;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
+import net.minecraft.util.math.RotationAxis;
 import net.minecraft.util.math.random.LocalRandom;
 import net.minecraft.world.BlockRenderView;
 import net.minecraft.world.LightType;
@@ -72,7 +73,7 @@ public class ModelTextureBakery {
                 var quads = part.getQuads(direction);
                 for (var quad : quads) {
                     //TODO: add meta specifiying quad has a tint
-                    //quad.hasTint()
+
                     this.vc.quad(quad, meta);
                 }
             }
@@ -242,7 +243,6 @@ public class ModelTextureBakery {
             }
             glBindVertexArray(0);
         } else {//Is fluid, slow path :(
-
             if (!(state.getBlock() instanceof FluidBlock)) throw new IllegalStateException();
 
             var mat = new Matrix4f();
@@ -301,7 +301,6 @@ public class ModelTextureBakery {
         }
 
 
-
         //"Restore" gl state
         glViewport(viewdat[0], viewdat[1], viewdat[2], viewdat[3]);
         glDisable(GL_STENCIL_TEST);

src/main/java/me/cortex/voxy/client/core/rendering/ChunkBoundRenderer.java

@@ -1,13 +1,13 @@
 package me.cortex.voxy.client.core.rendering;
 
+import it.unimi.dsi.fastutil.longs.Long2ByteOpenHashMap;
 import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap;
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
-import me.cortex.voxy.client.core.AbstractRenderPipeline;
 import me.cortex.voxy.client.core.gl.GlBuffer;
-import me.cortex.voxy.client.core.gl.GlVertexArray;
+import me.cortex.voxy.client.core.gl.GlFramebuffer;
+import me.cortex.voxy.client.core.gl.GlTexture;
 import me.cortex.voxy.client.core.gl.shader.AutoBindingShader;
 import me.cortex.voxy.client.core.gl.shader.Shader;
-import me.cortex.voxy.client.core.gl.shader.ShaderLoader;
 import me.cortex.voxy.client.core.gl.shader.ShaderType;
 import me.cortex.voxy.client.core.rendering.util.SharedIndexBuffer;
 import me.cortex.voxy.client.core.rendering.util.UploadStream;
@@ -26,8 +26,10 @@ import static org.lwjgl.opengl.GL15.GL_ELEMENT_ARRAY_BUFFER;
 import static org.lwjgl.opengl.GL15.glBindBuffer;
 import static org.lwjgl.opengl.GL30.glBindVertexArray;
 import static org.lwjgl.opengl.GL30C.*;
+import static org.lwjgl.opengl.GL31.GL_UNIFORM_BUFFER;
 import static org.lwjgl.opengl.GL31.glDrawElementsInstanced;
 import static org.lwjgl.opengl.GL42.glDrawElementsInstancedBaseInstance;
+import static org.lwjgl.opengl.GL45.glClearNamedFramebufferfv;
 
 //This is a render subsystem, its very simple in what it does
 // it renders an AABB around loaded chunks, thats it
@@ -37,28 +39,20 @@ public class ChunkBoundRenderer {
     private final GlBuffer uniformBuffer = new GlBuffer(128);
     private final Long2IntOpenHashMap chunk2idx = new Long2IntOpenHashMap(INIT_MAX_CHUNK_COUNT);
     private long[] idx2chunk = new long[INIT_MAX_CHUNK_COUNT];
-    private final Shader rasterShader;
+    private final Shader rasterShader = Shader.makeAuto()
-
+            .add(ShaderType.VERTEX, "voxy:chunkoutline/outline.vsh")
-    private final LongOpenHashSet addQueue = new LongOpenHashSet();
-    private final LongOpenHashSet remQueue = new LongOpenHashSet();
-
-    private final AbstractRenderPipeline pipeline;
-    public ChunkBoundRenderer(AbstractRenderPipeline pipeline) {
-        this.chunk2idx.defaultReturnValue(-1);
-        this.pipeline = pipeline;
-
-        String vert = ShaderLoader.parse("voxy:chunkoutline/outline.vsh");
-        String taa = pipeline.taaFunction("getTAA");
-        if (taa != null) {
-            vert = vert+"\n\n\n"+taa;
-        }
-        this.rasterShader = Shader.makeAuto()
-                .addSource(ShaderType.VERTEX, vert)
-                .defineIf("TAA", taa != null)
             .add(ShaderType.FRAGMENT, "voxy:chunkoutline/outline.fsh")
             .compile()
             .ubo(0, this.uniformBuffer)
             .ssbo(1, this.chunkPosBuffer);
+
+    private GlTexture depthBuffer = new GlTexture().store(GL_DEPTH_COMPONENT24, 1, 128, 128);
+    private final GlFramebuffer frameBuffer = new GlFramebuffer().bind(GL_DEPTH_ATTACHMENT, this.depthBuffer).verify();
+    private final LongOpenHashSet addQueue = new LongOpenHashSet();
+    private final LongOpenHashSet remQueue = new LongOpenHashSet();
+
+    public ChunkBoundRenderer() {
+        this.chunk2idx.defaultReturnValue(-1);
     }
 
     public void addSection(long pos) {
@@ -80,14 +74,18 @@ public class ChunkBoundRenderer {
             this.remQueue.forEach(this::_remPos);//TODO: REPLACE WITH SCATTER COMPUTE
             this.remQueue.clear();
             if (this.chunk2idx.isEmpty()&&!wasEmpty) {//When going from stuff to nothing need to clear the depth buffer
-                viewport.depthBoundingBuffer.clear(0);
+                glClearNamedFramebufferfv(this.frameBuffer.id, GL_DEPTH, 0, new float[]{0});
             }
         }
 
+        if (this.depthBuffer.getWidth() != viewport.width || this.depthBuffer.getHeight() != viewport.height) {
+            this.depthBuffer.free();
+            this.depthBuffer = new GlTexture().store(GL_DEPTH_COMPONENT24, 1, viewport.width, viewport.height);
+            this.frameBuffer.bind(GL_DEPTH_ATTACHMENT, this.depthBuffer).verify();
+        }
+
         if (this.chunk2idx.isEmpty() && this.addQueue.isEmpty()) return;
 
-        viewport.depthBoundingBuffer.clear(0);
-
         long ptr = UploadStream.INSTANCE.upload(this.uniformBuffer, 0, 128);
         long matPtr = ptr; ptr += 4*4*4;
 
@@ -118,16 +116,16 @@ public class ChunkBoundRenderer {
             glFrontFace(GL_CW);//Reverse winding order
 
             //"reverse depth buffer" it goes from 0->1 where 1 is far away
+            glClearNamedFramebufferfv(this.frameBuffer.id, GL_DEPTH, 0, new float[]{0});
             glEnable(GL_CULL_FACE);
             glEnable(GL_DEPTH_TEST);
             glDepthFunc(GL_GREATER);
         }
 
-        glBindVertexArray(GlVertexArray.STATIC_VAO);
+        glBindVertexArray(RenderService.STATIC_VAO);
-        viewport.depthBoundingBuffer.bind();
+        glBindFramebuffer(GL_FRAMEBUFFER, this.frameBuffer.id);
         this.rasterShader.bind();
         glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, SharedIndexBuffer.INSTANCE_BB_BYTE.id());
-        this.pipeline.bindUniforms();
 
         //Batch the draws into groups of size 32
         int count = this.chunk2idx.size();
@@ -226,8 +224,15 @@ public class ChunkBoundRenderer {
     }
 
     public void free() {
+        this.depthBuffer.free();
+        this.frameBuffer.free();
+
         this.rasterShader.free();
         this.uniformBuffer.free();
         this.chunkPosBuffer.free();
     }
+
+    public GlTexture getDepthBoundTexture() {
+        return this.depthBuffer;
+    }
 }

src/main/java/me/cortex/voxy/client/core/rendering/GeometryCache.java

@@ -4,6 +4,7 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap;
 import me.cortex.voxy.client.core.rendering.building.BuiltSection;
 
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.locks.StampedLock;
 
 //CPU side cache for section geometry, not thread safe
 public class GeometryCache {

src/main/java/me/cortex/voxy/client/core/rendering/RenderService.java

@@ -0,0 +1,251 @@
+package me.cortex.voxy.client.core.rendering;
+
+import me.cortex.voxy.client.RenderStatistics;
+import me.cortex.voxy.client.TimingStatistics;
+import me.cortex.voxy.client.VoxyClient;
+import me.cortex.voxy.client.core.gl.Capabilities;
+import me.cortex.voxy.client.core.gl.GlTexture;
+import me.cortex.voxy.client.core.model.ModelBakerySubsystem;
+import me.cortex.voxy.client.core.rendering.building.RenderGenerationService;
+import me.cortex.voxy.client.core.rendering.hierachical.AsyncNodeManager;
+import me.cortex.voxy.client.core.rendering.hierachical.HierarchicalOcclusionTraverser;
+import me.cortex.voxy.client.core.rendering.hierachical.NodeCleaner;
+import me.cortex.voxy.client.core.rendering.section.*;
+import me.cortex.voxy.client.core.rendering.section.geometry.*;
+import me.cortex.voxy.client.core.rendering.util.DownloadStream;
+import me.cortex.voxy.client.core.rendering.util.UploadStream;
+import me.cortex.voxy.common.Logger;
+import me.cortex.voxy.common.world.WorldEngine;
+import me.cortex.voxy.common.thread.ServiceThreadPool;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.lwjgl.opengl.GL42.*;
+
+public class RenderService<T extends AbstractSectionRenderer<J, Q>, J extends Viewport<J>, Q extends IGeometryData> {
+    public static final int STATIC_VAO = glGenVertexArrays();
+
+    private final ViewportSelector<?> viewportSelector;
+    private final Q geometryData;
+    private final AbstractSectionRenderer<J, Q> sectionRenderer;
+
+    private final AsyncNodeManager nodeManager;
+    private final NodeCleaner nodeCleaner;
+    private final HierarchicalOcclusionTraverser traversal;
+    private final ModelBakerySubsystem modelService;
+    private final RenderGenerationService renderGen;
+
+    private final WorldEngine world;
+
+    private static long getGeometryBufferSize() {
+        long geometryCapacity = Math.min((1L<<(64-Long.numberOfLeadingZeros(Capabilities.INSTANCE.ssboMaxSize-1)))<<1, 1L<<32)-1024/*(1L<<32)-1024*/;
+        if (Capabilities.INSTANCE.isIntel) {
+            geometryCapacity = Math.max(geometryCapacity, 1L<<30);//intel moment, force min 1gb
+        }
+
+        //Limit to available dedicated memory if possible
+        if (Capabilities.INSTANCE.canQueryGpuMemory) {
+            //512mb less than avalible,
+            long limit = Capabilities.INSTANCE.getFreeDedicatedGpuMemory() - 1024*1024*1024;
+            // Give a minimum of 512 mb requirement
+            limit = Math.max(512*1024*1024, limit);
+
+            geometryCapacity = Math.min(geometryCapacity, limit);
+        }
+        //geometryCapacity = 1<<28;
+        //geometryCapacity = 1<<30;//1GB test
+        var override = System.getProperty("voxy.geometryBufferSizeOverrideMB", "");
+        if (!override.isEmpty()) {
+            geometryCapacity = Long.parseLong(override)*1024L*1024L;
+        }
+        return geometryCapacity;
+    }
+
+    @SuppressWarnings("unchecked")
+    public RenderService(WorldEngine world, ServiceThreadPool serviceThreadPool) {
+        this.world = world;
+        this.modelService = new ModelBakerySubsystem(world.getMapper());
+
+        long geometryCapacity = getGeometryBufferSize();
+
+        this.geometryData = (Q) new BasicSectionGeometryData(1<<20, geometryCapacity);
+
+        //Max sections: ~500k
+        //this.sectionRenderer = (T) new MDICSectionRenderer(this.modelService.getStore(), (BasicSectionGeometryData) this.geometryData);
+        //this.sectionRenderer = (T) new MeshSectionRenderer(this.modelService.getStore(), (BasicSectionGeometryData) this.geometryData);
+        this.sectionRenderer = (T) new MeshEXTSectionRenderer(this.modelService.getStore(), (BasicSectionGeometryData) this.geometryData);
+        Logger.info("Using renderer: " + this.sectionRenderer.getClass().getSimpleName() + " with geometry buffer of: " + geometryCapacity + " bytes");
+
+        //Do something incredibly hacky, we dont need to keep the reference to this around, so just connect and discard
+
+        this.viewportSelector = new ViewportSelector<>(this.sectionRenderer::createViewport);
+        this.renderGen = new RenderGenerationService(world, this.modelService, serviceThreadPool,
+                this.sectionRenderer.getGeometryManager() instanceof IUsesMeshlets,
+                ()->true);
+
+        this.nodeManager = new AsyncNodeManager(1<<21, this.geometryData, this.renderGen);
+        this.nodeCleaner = new NodeCleaner(this.nodeManager);
+
+        this.traversal = new HierarchicalOcclusionTraverser(this.nodeManager, this.nodeCleaner, this.renderGen);
+
+        world.setDirtyCallback(this.nodeManager::worldEvent);
+
+        Arrays.stream(world.getMapper().getBiomeEntries()).forEach(this.modelService::addBiome);
+        world.getMapper().setBiomeCallback(this.modelService::addBiome);
+
+        this.nodeManager.start();
+    }
+
+    public void addTopLevelNode(long pos) {
+        this.nodeManager.addTopLevel(pos);
+    }
+
+    public void removeTopLevelNode(long pos) {
+        this.nodeManager.removeTopLevel(pos);
+    }
+
+    public void tickModelService(long budget) {
+        this.modelService.tick(budget);
+    }
+
+    private boolean frexStillHasWork() {
+        if (!VoxyClient.isFrexActive()) {
+            return false;
+        }
+        //If frex is running we must tick everything to ensure correctness
+        UploadStream.INSTANCE.tick();
+        //Done here as is allows less gl state resetup
+        this.modelService.tick(100_000_000);
+        glFinish();
+        return this.nodeManager.hasWork() || this.renderGen.getTaskCount()!=0 || !this.modelService.areQueuesEmpty();
+    }
+
+    public void renderFarAwayOpaque(J viewport, GlTexture depthBoundTexture) {
+        //LightMapHelper.tickLightmap();
+
+        //Render previous geometry with the abstract renderer
+        //Execute the hieracial selector
+        // render delta sections
+
+        //Hieracial is not an abstract thing but
+        // the section renderer is as it might have different backends, but they all accept a buffer containing the section list
+
+
+        TimingStatistics.G.start();
+        this.sectionRenderer.renderOpaque(viewport, depthBoundTexture);
+        TimingStatistics.G.stop();
+
+        {
+            int depthBuffer = glGetFramebufferAttachmentParameteri(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME);
+
+            //Compute the mip chain
+            viewport.hiZBuffer.buildMipChain(depthBuffer, viewport.width, viewport.height);
+        }
+
+        do {
+            //NOTE: need to do the upload and download tick here, after the section renderer renders the world, to ensure "stable"
+            // sections
+            {
+                TimingStatistics.main.stop();
+                TimingStatistics.dynamic.start();
+
+            /*
+            this.sectionUpdateQueue.consume(128);
+
+            //if (this.modelService.getProcessingCount() < 750)
+            {//Very bad hack to try control things
+                this.geometryUpdateQueue.consumeNano(Math.max(3_000_000 - (System.nanoTime() - frameStart), 50_000));
+            }
+
+            if (this.nodeManager.writeChanges(this.traversal.getNodeBuffer())) {//TODO: maybe move the node buffer out of the traversal class
+                UploadStream.INSTANCE.commit();
+            }*/
+
+
+                TimingStatistics.D.start();
+                //Tick download stream
+                DownloadStream.INSTANCE.tick();
+                TimingStatistics.D.stop();
+
+                this.nodeManager.tick(this.traversal.getNodeBuffer(), this.nodeCleaner);
+                //glFlush();
+
+                this.nodeCleaner.tick(this.traversal.getNodeBuffer());//Probably do this here??
+
+                TimingStatistics.dynamic.stop();
+                TimingStatistics.main.start();
+            }
+
+            glMemoryBarrier(GL_FRAMEBUFFER_BARRIER_BIT | GL_PIXEL_BUFFER_BARRIER_BIT);
+
+            TimingStatistics.I.start();
+            this.traversal.doTraversal(viewport);
+            TimingStatistics.I.stop();
+
+        } while (this.frexStillHasWork());
+
+
+        TimingStatistics.H.start();
+        this.sectionRenderer.buildDrawCalls(viewport);
+        TimingStatistics.H.stop();
+
+        TimingStatistics.G.start();
+        this.sectionRenderer.renderTemporal(viewport, depthBoundTexture);
+        TimingStatistics.G.stop();
+    }
+
+    public void renderFarAwayTranslucent(J viewport, GlTexture depthBoundTexture) {
+        this.sectionRenderer.renderTranslucent(viewport, depthBoundTexture);
+    }
+
+    public void addDebugData(List<String> debug) {
+        this.modelService.addDebugData(debug);
+        this.renderGen.addDebugData(debug);
+        this.sectionRenderer.addDebug(debug);
+        this.nodeManager.addDebug(debug);
+
+        if (RenderStatistics.enabled) {
+            debug.add("HTC: [" + Arrays.stream(flipCopy(RenderStatistics.hierarchicalTraversalCounts)).mapToObj(Integer::toString).collect(Collectors.joining(", "))+"]");
+            debug.add("HRS: [" + Arrays.stream(flipCopy(RenderStatistics.hierarchicalRenderSections)).mapToObj(Integer::toString).collect(Collectors.joining(", "))+"]");
+            debug.add("VS: [" + Arrays.stream(flipCopy(RenderStatistics.visibleSections)).mapToObj(Integer::toString).collect(Collectors.joining(", "))+"]");
+            debug.add("QC: [" + Arrays.stream(flipCopy(RenderStatistics.quadCount)).mapToObj(Integer::toString).collect(Collectors.joining(", "))+"]");
+        }
+    }
+
+    private static int[] flipCopy(int[] array) {
+        int[] ret = new int[array.length];
+        int i = ret.length;
+        for (int j : array) {
+            ret[--i] = j;
+        }
+        return ret;
+    }
+
+    public void shutdown() {
+        //Cleanup callbacks
+        this.world.setDirtyCallback(null);
+        this.world.getMapper().setBiomeCallback(null);
+        this.world.getMapper().setStateCallback(null);
+
+        this.nodeManager.stop();
+
+        this.modelService.shutdown();
+        this.renderGen.shutdown();
+        this.viewportSelector.free();
+        this.sectionRenderer.free();
+        this.traversal.free();
+        this.nodeCleaner.free();
+
+        this.geometryData.free();
+    }
+
+    public Viewport<?> getViewport() {
+        return this.viewportSelector.getViewport();
+    }
+
+    public int getMeshQueueCount() {
+        return this.renderGen.getTaskCount();
+    }
+}

src/main/java/me/cortex/voxy/client/core/rendering/Viewport.java

@@ -1,8 +1,8 @@
 package me.cortex.voxy.client.core.rendering;
 
 import me.cortex.voxy.client.core.gl.GlBuffer;
-import me.cortex.voxy.client.core.rendering.util.DepthFramebuffer;
 import me.cortex.voxy.client.core.rendering.util.HiZBuffer;
+import me.cortex.voxy.client.core.rendering.util.HiZBuffer2;
 import net.caffeinemc.mods.sodium.client.util.FogParameters;
 import net.minecraft.util.math.MathHelper;
 import org.joml.*;
@@ -12,8 +12,6 @@ import java.lang.reflect.Field;
 public abstract class Viewport <A extends Viewport<A>> {
     //public final HiZBuffer2 hiZBuffer = new HiZBuffer2();
     public final HiZBuffer hiZBuffer = new HiZBuffer();
-    public final DepthFramebuffer depthBoundingBuffer = new DepthFramebuffer();
-
     private static final Field planesField;
     static {
         try {
@@ -27,9 +25,8 @@ public abstract class Viewport <A extends Viewport<A>> {
     public int width;
     public int height;
     public int frameId;
-    public Matrix4f vanillaProjection = new Matrix4f();
+    public Matrix4f projection;
-    public Matrix4f projection = new Matrix4f();
+    public Matrix4f modelView;
-    public Matrix4f modelView = new Matrix4f();
     public final FrustumIntersection frustum = new FrustumIntersection();
     public final Vector4f[] frustumPlanes;
     public double cameraX;
@@ -57,12 +54,6 @@ public abstract class Viewport <A extends Viewport<A>> {
 
     protected void delete0() {
         this.hiZBuffer.free();
-        this.depthBoundingBuffer.free();
-    }
-
-    public A setVanillaProjection(Matrix4fc projection) {
-        this.vanillaProjection.set(projection);
-        return (A) this;
     }
 
     public A setProjection(Matrix4f projection) {
@@ -111,8 +102,6 @@ public abstract class Viewport <A extends Viewport<A>> {
                 (float) (this.cameraY-(sy<<5)),
                 (float) (this.cameraZ-(sz<<5)));
 
-        this.depthBoundingBuffer.resize(this.width, this.height);
-
         return (A) this;
     }
 

src/main/java/me/cortex/voxy/client/core/rendering/ViewportSelector.java

@@ -1,6 +1,6 @@
 package me.cortex.voxy.client.core.rendering;
 
-import me.cortex.voxy.client.core.util.IrisUtil;
+import me.cortex.voxy.client.core.rendering.Viewport;
 import net.fabricmc.loader.api.FabricLoader;
 import org.vivecraft.client_vr.ClientDataHolderVR;
 
@@ -20,28 +20,19 @@ public class ViewportSelector <T extends Viewport<?>> {
         this.defaultViewport = viewportCreator.get();
     }
 
-    private T getOrCreate(Object holder) {
-        return this.extraViewports.computeIfAbsent(holder, a->this.creator.get());
-    }
-
     private T getVivecraftViewport() {
         var cdh = ClientDataHolderVR.getInstance();
         var pass = cdh.currentPass;
         if (pass == null) {
             return this.defaultViewport;
         }
-        return this.getOrCreate(pass);
+        return this.extraViewports.computeIfAbsent(pass, a->this.creator.get());
     }
 
-    private static final Object IRIS_SHADOW_OBJECT = new Object();
     public T getViewport() {
         if (VIVECRAFT_INSTALLED) {
             return getVivecraftViewport();
         }
-
-        if (IrisUtil.irisShadowActive()) {
-            return this.getOrCreate(IRIS_SHADOW_OBJECT);
-        }
         return this.defaultViewport;
     }
 

src/main/java/me/cortex/voxy/client/core/rendering/building/RenderDataFactory.java

@@ -18,7 +18,6 @@ import java.util.Arrays;
 
 public class RenderDataFactory {
     private static final boolean CHECK_NEIGHBOR_FACE_OCCLUSION = true;
-    private static final boolean DISABLE_CULL_SAME_OCCLUDES = false;
 
     private static final boolean VERIFY_MESHING = VoxyCommon.isVerificationFlagOn("verifyMeshing");
 
@@ -341,7 +340,7 @@ public class RenderDataFactory {
     private static final long LM = (0xFFL<<55);
 
     private static boolean shouldMeshNonOpaqueBlockFace(int face, long quad, long meta, long neighborQuad, long neighborMeta) {
-        if (((quad^neighborQuad)&(0xFFFFL<<26))==0 && (DISABLE_CULL_SAME_OCCLUDES || ModelQueries.faceOccludes(meta, face))) return false;//This is a hack, if the neigbor and this are the same, dont mesh the face// TODO: FIXME
+        if (((quad^neighborQuad)&(0xFFFFL<<26))==0) return false;//This is a hack, if the neigbor and this are the same, dont mesh the face
         if (!ModelQueries.faceExists(meta, face)) return false;//Dont mesh if no face
         //if (ModelQueries.faceCanBeOccluded(meta, face)) //TODO: maybe enable this
             if (ModelQueries.faceOccludes(neighborMeta, face^1)) return false;
@@ -753,7 +752,7 @@ public class RenderDataFactory {
                         //Check and test if can cull W.R.T neighbor
                         if (Mapper.getBlockId(neighborId) != 0) {//Not air
                             int modelId = this.modelMan.getModelId(Mapper.getBlockId(neighborId));
-                            if (modelId == ((A>>26)&0xFFFF)) {//TODO: FIXME, this technically isnt correct as need to check self occulsion, thinks?
+                            if (modelId == ((A>>26)&0xFFFF)) {
                                 fail = true;
                             } else {
                                 long meta = this.modelMan.getModelMetadataFromClientId(modelId);
@@ -767,7 +766,7 @@ public class RenderDataFactory {
                         long nA = this.sectionData[(idx+skipAmount) * 2];
                         long nB = this.sectionData[(idx+skipAmount) * 2 + 1];
                         boolean failB = false;
-                        if ((nA&(0xFFFFL<<26)) == (A&(0xFFFFL<<26))) {//TODO: FIXME, this technically isnt correct as need to check self occulsion, thinks?
+                        if ((nA&(0xFFFFL<<26)) == (A&(0xFFFFL<<26))) {
                             failB = true;
                         } else {
                             if (ModelQueries.faceOccludes(nB, (axis << 1) | (side))) {

src/main/java/me/cortex/voxy/client/core/rendering/building/RenderGenerationService.java

@@ -4,12 +4,12 @@ import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
 import me.cortex.voxy.client.core.model.IdNotYetComputedException;
 import me.cortex.voxy.client.core.model.ModelBakerySubsystem;
-import me.cortex.voxy.common.thread.ServiceSlice;
-import me.cortex.voxy.common.thread.ServiceThreadPool;
 import me.cortex.voxy.common.util.Pair;
 import me.cortex.voxy.common.world.WorldEngine;
 import me.cortex.voxy.common.world.WorldSection;
 import me.cortex.voxy.common.world.other.Mapper;
+import me.cortex.voxy.common.thread.ServiceSlice;
+import me.cortex.voxy.common.thread.ServiceThreadPool;
 
 import java.util.List;
 import java.util.concurrent.PriorityBlockingQueue;
@@ -51,9 +51,9 @@ public class RenderGenerationService {
     private final AtomicInteger holdingSectionCount = new AtomicInteger();//Used to limit section holding
 
     private final AtomicInteger taskQueueCount = new AtomicInteger();
-    private final PriorityBlockingQueue<BuildTask> taskQueue = new PriorityBlockingQueue<>(5000, (a,b)-> Long.compareUnsigned(a.priority, b.priority));
+    private final PriorityBlockingQueue<BuildTask> taskQueue = new PriorityBlockingQueue<>(320000, (a,b)-> Long.compareUnsigned(a.priority, b.priority));
     private final StampedLock taskMapLock = new StampedLock();
-    private final Long2ObjectOpenHashMap<BuildTask> taskMap = new Long2ObjectOpenHashMap<>(5000);
+    private final Long2ObjectOpenHashMap<BuildTask> taskMap = new Long2ObjectOpenHashMap<>(320000);
 
     private final WorldEngine world;
     private final ModelBakerySubsystem modelBakery;
@@ -141,17 +141,6 @@ public class RenderGenerationService {
             section = task.section;
         }
 
-
-        {//Remove the task from the map, this is done before we check for null sections as well the task map needs to be correct
-            long stamp = this.taskMapLock.writeLock();
-            var rtask = this.taskMap.remove(task.position);
-            if (rtask != task) {
-                this.taskMapLock.unlockWrite(stamp);
-                throw new IllegalStateException();
-            }
-            this.taskMapLock.unlockWrite(stamp);
-        }
-
         if (section == null) {
             if (this.resultConsumer != null) {
                 this.resultConsumer.accept(BuiltSection.empty(task.position));
@@ -161,6 +150,15 @@ public class RenderGenerationService {
         section.assertNotFree();
         BuiltSection mesh = null;
 
+        {
+            long stamp = this.taskMapLock.writeLock();
+            var rtask = this.taskMap.remove(task.position);
+            if (rtask != task) {
+                this.taskMapLock.unlockWrite(stamp);
+                throw new IllegalStateException();
+            }
+            this.taskMapLock.unlockWrite(stamp);
+        }
 
         try {
             mesh = factory.generateMesh(section);

src/main/java/me/cortex/voxy/client/core/rendering/hierachical/AsyncNodeManager.java

@@ -1,8 +1,6 @@
 package me.cortex.voxy.client.core.rendering.hierachical;
 
-import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
+import it.unimi.dsi.fastutil.ints.*;
-import it.unimi.dsi.fastutil.ints.IntConsumer;
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
 import me.cortex.voxy.client.TimingStatistics;
 import me.cortex.voxy.client.core.gl.GlBuffer;
@@ -19,7 +17,7 @@ import me.cortex.voxy.client.core.rendering.util.UploadStream;
 import me.cortex.voxy.common.Logger;
 import me.cortex.voxy.common.util.AllocationArena;
 import me.cortex.voxy.common.util.MemoryBuffer;
-import me.cortex.voxy.common.util.UnsafeUtil;
+import me.cortex.voxy.common.world.WorldEngine;
 import me.cortex.voxy.common.world.WorldSection;
 import org.lwjgl.system.MemoryUtil;
 
@@ -518,8 +516,8 @@ public class AsyncNodeManager {
                 int copies = upload.dataUploadPoints.size();
                 int scratchSize = (int) upload.arena.getSize() * 8;
                 long ptr = UploadStream.INSTANCE.rawUploadAddress(scratchSize + copies * 16);
-                UnsafeUtil.memcpy(upload.scratchHeaderBuffer.address, UploadStream.INSTANCE.getBaseAddress() + ptr, copies * 16L);
+                MemoryUtil.memCopy(upload.scratchHeaderBuffer.address, UploadStream.INSTANCE.getBaseAddress() + ptr, copies * 16L);
-                UnsafeUtil.memcpy(upload.scratchDataBuffer.address, UploadStream.INSTANCE.getBaseAddress() + ptr + copies * 16L, scratchSize);
+                MemoryUtil.memCopy(upload.scratchDataBuffer.address, UploadStream.INSTANCE.getBaseAddress() + ptr + copies * 16L, scratchSize);
                 UploadStream.INSTANCE.commit();//Commit the buffer
 
                 this.multiMemcpy.bind();

src/main/java/me/cortex/voxy/client/core/rendering/hierachical/DebugRenderer.java

@@ -1,11 +1,11 @@
 package me.cortex.voxy.client.core.rendering.hierachical;
 
 import me.cortex.voxy.client.core.gl.GlBuffer;
-import me.cortex.voxy.client.core.gl.GlVertexArray;
 import me.cortex.voxy.client.core.gl.shader.Shader;
 import me.cortex.voxy.client.core.gl.shader.ShaderType;
-import me.cortex.voxy.client.core.rendering.Viewport;
+import me.cortex.voxy.client.core.rendering.RenderService;
 import me.cortex.voxy.client.core.rendering.util.SharedIndexBuffer;
+import me.cortex.voxy.client.core.rendering.Viewport;
 import me.cortex.voxy.client.core.rendering.util.UploadStream;
 import net.minecraft.util.math.MathHelper;
 import org.joml.Matrix4f;
@@ -67,7 +67,7 @@ public class DebugRenderer {
 
         glEnable(GL_DEPTH_TEST);
         this.debugShader.bind();
-        glBindVertexArray(GlVertexArray.STATIC_VAO);
+        glBindVertexArray(RenderService.STATIC_VAO);
         glBindBuffer(GL_DRAW_INDIRECT_BUFFER, this.drawBuffer.id);
         GL15.glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, SharedIndexBuffer.INSTANCE_BYTE.id());
         glBindBufferBase(GL_UNIFORM_BUFFER, 0, this.uniformBuffer.id);

src/main/java/me/cortex/voxy/client/core/rendering/hierachical/HierarchicalOcclusionTraverser.java

@@ -12,7 +12,6 @@ import me.cortex.voxy.client.core.rendering.building.RenderGenerationService;
 import me.cortex.voxy.client.core.rendering.util.DownloadStream;
 import me.cortex.voxy.client.core.rendering.util.PrintfDebugUtil;
 import me.cortex.voxy.client.core.rendering.util.UploadStream;
-import me.cortex.voxy.common.Logger;
 import me.cortex.voxy.common.util.MemoryBuffer;
 import me.cortex.voxy.common.world.WorldEngine;
 import org.lwjgl.system.MemoryUtil;
@@ -131,9 +130,7 @@ public class HierarchicalOcclusionTraverser {
 
         //Use clear buffer, yes know is a bad idea, TODO: replace
         //Add the new top level node to the queue
-        MemoryUtil.memPutInt(SCRATCH, id);
+        glClearNamedBufferSubData(this.topNodeIds.id, GL_R32UI, aid*4L, 4, GL_RED_INTEGER, GL_UNSIGNED_INT, new int[]{id});
-        nglClearNamedBufferSubData(this.topNodeIds.id, GL_R32UI, aid * 4L, 4, GL_RED_INTEGER, GL_UNSIGNED_INT, SCRATCH);
-
         if (this.topNode2idxMapping.put(id, aid) != -1) {
             throw new IllegalStateException();
         }
@@ -160,10 +157,8 @@ public class HierarchicalOcclusionTraverser {
         this.idx2topNodeMapping[idx] = endTLNId;//Set the old to the new
         if (this.topNode2idxMapping.put(endTLNId, idx) == -1)
             throw new IllegalStateException();
-
         //Move it server side, from end to new idx
-        MemoryUtil.memPutInt(SCRATCH, endTLNId);
+        glClearNamedBufferSubData(this.topNodeIds.id, GL_R32UI, idx*4L, 4, GL_RED_INTEGER, GL_UNSIGNED_INT, new int[]{endTLNId});
-        nglClearNamedBufferSubData(this.topNodeIds.id, GL_R32UI, idx*4L, 4, GL_RED_INTEGER, GL_UNSIGNED_INT, SCRATCH);
     }
 
     private static void setFrustum(Viewport<?> viewport, long ptr) {
@@ -325,8 +320,7 @@ public class HierarchicalOcclusionTraverser {
     private void forwardDownloadResult(long ptr, long size) {
         int count = MemoryUtil.memGetInt(ptr);ptr += 8;//its 8 since we need to skip the second value (which is empty)
         if (count < 0 || count > 50000) {
-            Logger.error(new IllegalStateException("Count unexpected extreme value: " + count + " things may get weird"));
+            throw new IllegalStateException("Count unexpected extreme value: " + count);
-            return;
         }
         if (count > (this.requestBuffer.size()>>3)-1) {
             //This should not break the synchonization between gpu and cpu as in the traversal shader is
@@ -363,6 +357,4 @@ public class HierarchicalOcclusionTraverser {
         this.scratchQueueB.free();
         glDeleteSamplers(this.hizSampler);
     }
-
-    private static final long SCRATCH = MemoryUtil.nmemAlloc(32);//32 bytes of scratch memory
 }

src/main/java/me/cortex/voxy/client/core/rendering/hierachical/NodeCleaner.java

@@ -5,12 +5,13 @@ import me.cortex.voxy.client.core.gl.GlBuffer;
 import me.cortex.voxy.client.core.gl.shader.AutoBindingShader;
 import me.cortex.voxy.client.core.gl.shader.Shader;
 import me.cortex.voxy.client.core.gl.shader.ShaderType;
-import me.cortex.voxy.client.core.rendering.util.DownloadStream;
 import me.cortex.voxy.client.core.rendering.util.PrintfDebugUtil;
+import me.cortex.voxy.client.core.rendering.util.DownloadStream;
 import me.cortex.voxy.client.core.rendering.util.UploadStream;
 import org.lwjgl.opengl.ARBDirectStateAccess;
 import org.lwjgl.system.MemoryUtil;
 
+import static org.lwjgl.opengl.ARBDirectStateAccess.glCopyNamedBufferSubData;
 import static org.lwjgl.opengl.GL30C.glBindBufferRange;
 import static org.lwjgl.opengl.GL42C.glMemoryBarrier;
 import static org.lwjgl.opengl.GL43C.*;

src/main/java/me/cortex/voxy/client/core/rendering/hierachical/NodeManager.java

@@ -18,6 +18,7 @@ import me.cortex.voxy.common.world.WorldEngine;
 import org.lwjgl.system.MemoryUtil;
 
 import java.util.List;
+import java.util.function.Consumer;
 
 import static me.cortex.voxy.common.world.WorldEngine.MAX_LOD_LAYER;
 import static me.cortex.voxy.common.world.WorldEngine.UPDATE_TYPE_BLOCK_BIT;

src/main/java/me/cortex/voxy/client/core/rendering/post/FullscreenBlit.java

@@ -2,13 +2,11 @@ package me.cortex.voxy.client.core.rendering.post;
 
 import me.cortex.voxy.client.core.gl.shader.Shader;
 import me.cortex.voxy.client.core.gl.shader.ShaderType;
-import me.cortex.voxy.client.core.rendering.util.SharedIndexBuffer;
 
 import java.util.function.Function;
 
-import static org.lwjgl.opengl.GL11C.*;
+import static org.lwjgl.opengl.GL11C.GL_TRIANGLES;
-import static org.lwjgl.opengl.GL15C.GL_ELEMENT_ARRAY_BUFFER;
+import static org.lwjgl.opengl.GL11C.glDrawArrays;
-import static org.lwjgl.opengl.GL15C.glBindBuffer;
 import static org.lwjgl.opengl.GL30C.glBindVertexArray;
 import static org.lwjgl.opengl.GL45C.glCreateVertexArrays;
 
@@ -19,18 +17,9 @@ public class FullscreenBlit {
     public FullscreenBlit(String fragId) {
         this(fragId, (a)->a);
     }
-
-    public FullscreenBlit(String vertId, String fragId) {
-        this(vertId, fragId, (a)->a);
-    }
-
     public <T extends Shader> FullscreenBlit(String fragId, Function<Shader.Builder<T>, Shader.Builder<T>> builder) {
-        this("voxy:post/fullscreen.vert", fragId, builder);
-    }
-
-    public <T extends Shader> FullscreenBlit(String vertId, String fragId, Function<Shader.Builder<T>, Shader.Builder<T>> builder) {
         this.shader = builder.apply((Shader.Builder<T>) Shader.make()
-                .add(ShaderType.VERTEX, vertId)
+                .add(ShaderType.VERTEX, "voxy:post/fullscreen.vert")
                 .add(ShaderType.FRAGMENT, fragId))
                 .compile();
     }
@@ -42,8 +31,7 @@ public class FullscreenBlit {
     public void blit() {
         glBindVertexArray(EMPTY_VAO);
         this.shader.bind();
-        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, SharedIndexBuffer.INSTANCE_BYTE.id());
+        glDrawArrays(GL_TRIANGLES, 0, 6);
-        glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, 0);
         glBindVertexArray(0);
     }
 

src/main/java/me/cortex/voxy/client/core/rendering/post/PostProcessing.java

@@ -0,0 +1,202 @@
+package me.cortex.voxy.client.core.rendering.post;
+
+import me.cortex.voxy.client.config.VoxyConfig;
+import me.cortex.voxy.client.core.gl.GlFramebuffer;
+import me.cortex.voxy.client.core.gl.GlTexture;
+import me.cortex.voxy.client.core.gl.shader.Shader;
+import me.cortex.voxy.client.core.gl.shader.ShaderType;
+import me.cortex.voxy.client.core.rendering.Viewport;
+import me.cortex.voxy.client.core.rendering.util.GlStateCapture;
+import org.joml.Matrix4f;
+import org.joml.Matrix4fc;
+
+import static org.lwjgl.opengl.ARBComputeShader.glDispatchCompute;
+import static org.lwjgl.opengl.ARBShaderImageLoadStore.glBindImageTexture;
+import static org.lwjgl.opengl.GL15.GL_READ_WRITE;
+import static org.lwjgl.opengl.GL20.glUniformMatrix4fv;
+import static org.lwjgl.opengl.GL30C.*;
+import static org.lwjgl.opengl.GL30C.GL_DEPTH24_STENCIL8;
+import static org.lwjgl.opengl.GL43.GL_DEPTH_STENCIL_TEXTURE_MODE;
+import static org.lwjgl.opengl.GL45C.*;
+
+public class PostProcessing {
+    private final boolean useEnvFog = VoxyConfig.CONFIG.useEnvironmentalFog;
+    private final GlFramebuffer framebuffer;
+    private final GlFramebuffer framebufferSSAO;
+    private int width;
+    private int height;
+    private GlTexture colour;
+    private GlTexture colourSSAO;
+    private GlTexture depthStencil;
+    private boolean didSSAO;
+    private final FullscreenBlit setDepth0 = new FullscreenBlit("voxy:post/depth0.frag");
+    private final FullscreenBlit emptyBlit = new FullscreenBlit("voxy:post/noop.frag");
+    //private final FullscreenBlit blitTexture = new FullscreenBlit("voxy:post/blit_texture_cutout.frag");
+    private final FullscreenBlit blitTexture = new FullscreenBlit("voxy:post/blit_texture_depth_cutout.frag",
+            a->a.defineIf("USE_ENV_FOG", useEnvFog));
+    private final Shader ssaoComp = Shader.make()
+            .add(ShaderType.COMPUTE, "voxy:post/ssao.comp")
+            .compile();
+    private final GlStateCapture glStateCapture = GlStateCapture.make()
+            .addCapability(GL_STENCIL_TEST)
+            .addCapability(GL_DEPTH_TEST)
+            .addTexture(GL_TEXTURE0)
+            .addTexture(GL_TEXTURE1)
+            .addTexture(GL_TEXTURE2)
+            .build();
+
+    public PostProcessing() {
+        this.framebuffer = new GlFramebuffer();
+        this.framebufferSSAO = new GlFramebuffer();
+    }
+
+    public void setSize(int width, int height) {
+        if (this.width != width || this.height != height) {
+            this.width = width;
+            this.height = height;
+            if (this.colour != null) {
+                if (this.colourSSAO != null) {
+                    this.colourSSAO.free();
+                }
+                this.colour.free();
+                this.depthStencil.free();
+            }
+
+            this.colour = new GlTexture().store(GL_RGBA8, 1, width, height);
+            this.colourSSAO = new GlTexture().store(GL_RGBA8, 1, width, height);
+            this.depthStencil = new GlTexture().store(GL_DEPTH24_STENCIL8, 1, width, height);
+
+            glTextureParameterf(this.colour.id, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+            glTextureParameterf(this.colour.id, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+            glTextureParameterf(this.colourSSAO.id, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+            glTextureParameterf(this.colourSSAO.id, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+            glTextureParameterf(this.depthStencil.id, GL_DEPTH_STENCIL_TEXTURE_MODE, GL_DEPTH_COMPONENT);
+
+            this.framebuffer.bind(GL_COLOR_ATTACHMENT0, this.colour)
+                    .bind(GL_DEPTH_STENCIL_ATTACHMENT, this.depthStencil)
+                    .verify();
+
+            this.framebufferSSAO.bind(GL_COLOR_ATTACHMENT0, this.colourSSAO)
+                    .bind(GL_DEPTH_STENCIL_ATTACHMENT, this.depthStencil)
+                    .verify();
+        }
+    }
+
+
+
+    public void shutdown() {
+        this.framebuffer.free();
+        this.framebufferSSAO.free();
+        if (this.colourSSAO != null) this.colourSSAO.free();
+        if (this.colour != null) this.colour.free();
+        if (this.depthStencil != null) this.depthStencil.free();
+        this.emptyBlit.delete();
+        this.setDepth0.delete();
+        this.blitTexture.delete();
+        this.ssaoComp.free();
+    }
+
+    public void setup(int width, int height, int sourceFB) {
+        //TODO: use the raw depth texture instead
+        //TODO: when blitting, also set the depth value of where the mask is created to 0 (I.E. closest to the camera)
+        // cause of hiz computing, it makes alot of sections visible
+        this.didSSAO = false;
+        this.glStateCapture.capture();
+
+        this.setSize(width, height);
+        glBindFramebuffer(GL_FRAMEBUFFER, this.framebuffer.id);
+
+        //glClearColor(0,0,0,0);//TODO: RESTORE THIS TO THE ORIGINAL VALUE
+
+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+        glBlitNamedFramebuffer(sourceFB, this.framebuffer.id, 0,0, width, height, 0,0, width, height, GL_DEPTH_BUFFER_BIT, GL_NEAREST);
+
+        //Create a stencil mask of terrain generated by minecraft
+        glEnable(GL_STENCIL_TEST);
+        glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
+        glStencilFunc(GL_ALWAYS, 1, 0xFF);
+        glStencilMask(0xFF);
+
+        glEnable(GL_DEPTH_TEST);
+        glDepthMask(false);
+        glColorMask(false,false,false,false);
+        this.emptyBlit.blit();
+        glDepthMask(true);
+
+        glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
+        //Set depth to 0 w.r.t mask
+        glStencilFunc(GL_EQUAL, 0, 0xFF);
+        this.setDepth0.blit();
+        glDisable(GL_DEPTH_TEST);
+        glColorMask(true,true,true,true);
+
+        //Make voxy terrain render only where there isnt mc terrain
+        glStencilFunc(GL_EQUAL, 1, 0xFF);
+
+
+        //TODO: need to figure out how to do translucency cause doing it normally will cause water to have double translucency (i think)
+    }
+
+    //Computes ssao on the current framebuffer data and updates it
+    // this means that translucency wont be effected etc
+    public void computeSSAO(Matrix4f mvp) {
+        this.didSSAO = true;
+
+        this.ssaoComp.bind();
+        float[] data = new float[4*4];
+        mvp.get(data);
+        glUniformMatrix4fv(3, false, data);//MVP
+        mvp.invert(new Matrix4f()).get(data);
+        glUniformMatrix4fv(4, false, data);//invMVP
+
+        glBindImageTexture(0, this.colourSSAO.id, 0, false,0, GL_READ_WRITE, GL_RGBA8);
+        glBindTextureUnit(1, this.depthStencil.id);
+        glBindTextureUnit(2, this.colour.id);
+
+        glDispatchCompute((this.width+31)/32, (this.height+31)/32, 1);
+
+        glBindFramebuffer(GL_FRAMEBUFFER, this.framebufferSSAO.id);
+    }
+
+
+    //Executes the post processing and emits to whatever framebuffer is currently bound via a blit
+    public void renderPost(Viewport vp, Matrix4fc tooProjection, int outputFB) {
+        glDisable(GL_STENCIL_TEST);
+
+
+
+        glBindFramebuffer(GL_FRAMEBUFFER, outputFB);
+
+        //This will need to be replaced with a blit shader to raster with respect to the stencil
+        //glBlitNamedFramebuffer(this.framebuffer.id, outputFB, 0,0, this.width, this.height, 0,0, this.width, this.height, GL_COLOR_BUFFER_BIT, GL_NEAREST);
+
+
+        this.blitTexture.bind();
+
+        float[] data = new float[4*4];
+        new Matrix4f(vp.MVP).invert().get(data);
+        glUniformMatrix4fv(2, false, data);//inverse fromProjection
+        new Matrix4f(tooProjection).mul(vp.modelView).get(data);
+        glUniformMatrix4fv(3, false, data);//tooProjection
+        if (useEnvFog) {
+            float start = vp.fogParameters.environmentalStart();
+            float end = vp.fogParameters.environmentalEnd();
+            float invEndFogDelta = 1f/(end-start);
+            glUniform3f(4, vp.fogParameters.environmentalEnd()/2f, invEndFogDelta, start*invEndFogDelta);
+            glUniform3f(5, vp.fogParameters.red(), vp.fogParameters.green(), vp.fogParameters.blue());
+        }
+
+        glBindTextureUnit(0, this.didSSAO?this.colourSSAO.id:this.colour.id);
+
+        glBindTextureUnit(1, this.depthStencil.id);
+        //glTextureParameteri(this.depthStencil.id, GL_DEPTH_STENCIL_TEXTURE_MODE, GL_DEPTH_COMPONENT);
+
+        glEnable(GL_DEPTH_TEST);
+        glDepthMask(true);
+        this.blitTexture.blit();
+        glDisable(GL_DEPTH_TEST);
+        glDepthMask(true);
+
+        this.glStateCapture.restore();
+    }
+}

src/main/java/me/cortex/voxy/client/core/rendering/section/AbstractSectionRenderer.java

@@ -1,6 +1,7 @@
 package me.cortex.voxy.client.core.rendering.section;
 
 
+import me.cortex.voxy.client.core.gl.GlTexture;
 import me.cortex.voxy.client.core.model.ModelStore;
 import me.cortex.voxy.client.core.rendering.Viewport;
 import me.cortex.voxy.client.core.rendering.section.geometry.IGeometryData;
@@ -16,10 +17,10 @@ public abstract class AbstractSectionRenderer <T extends Viewport<T>, J extends
         this.modelStore = modelStore;
     }
 
-    public abstract void renderOpaque(T viewport);
+    public abstract void renderOpaque(T viewport, GlTexture depthBoundTexture);
     public abstract void buildDrawCalls(T viewport);
-    public abstract void renderTemporal(T viewport);
+    public abstract void renderTemporal(T viewport, GlTexture depthBoundTexture);
-    public abstract void renderTranslucent(T viewport);
+    public abstract void renderTranslucent(T viewport, GlTexture depthBoundTexture);
     public abstract T createViewport();
     public abstract void free();
 

src/main/java/me/cortex/voxy/client/core/rendering/section/MDICSectionRenderer.java

@@ -2,18 +2,17 @@ package me.cortex.voxy.client.core.rendering.section;
 
 
 import me.cortex.voxy.client.RenderStatistics;
-import me.cortex.voxy.client.core.AbstractRenderPipeline;
 import me.cortex.voxy.client.core.gl.Capabilities;
 import me.cortex.voxy.client.core.gl.GlBuffer;
-import me.cortex.voxy.client.core.gl.GlVertexArray;
+import me.cortex.voxy.client.core.gl.GlTexture;
 import me.cortex.voxy.client.core.gl.shader.Shader;
-import me.cortex.voxy.client.core.gl.shader.ShaderLoader;
 import me.cortex.voxy.client.core.gl.shader.ShaderType;
 import me.cortex.voxy.client.core.model.ModelStore;
 import me.cortex.voxy.client.core.rendering.section.geometry.BasicSectionGeometryData;
-import me.cortex.voxy.client.core.rendering.util.DownloadStream;
 import me.cortex.voxy.client.core.rendering.util.LightMapHelper;
+import me.cortex.voxy.client.core.rendering.RenderService;
 import me.cortex.voxy.client.core.rendering.util.SharedIndexBuffer;
+import me.cortex.voxy.client.core.rendering.util.DownloadStream;
 import me.cortex.voxy.client.core.rendering.util.UploadStream;
 import me.cortex.voxy.common.Logger;
 import me.cortex.voxy.common.world.WorldEngine;
@@ -35,6 +34,7 @@ import static org.lwjgl.opengl.GL40C.GL_DRAW_INDIRECT_BUFFER;
 import static org.lwjgl.opengl.GL42.glMemoryBarrier;
 import static org.lwjgl.opengl.GL43.*;
 import static org.lwjgl.opengl.GL45.glBindTextureUnit;
+import static org.lwjgl.opengl.GL45.glClearNamedBufferData;
 import static org.lwjgl.opengl.NVRepresentativeFragmentTest.GL_REPRESENTATIVE_FRAGMENT_TEST_NV;
 
 //Uses MDIC to render the sections
@@ -42,8 +42,11 @@ public class MDICSectionRenderer extends AbstractSectionRenderer<MDICViewport, B
     private static final int TRANSLUCENT_OFFSET = 400_000;//in draw calls
     private static final int TEMPORAL_OFFSET = 500_000;//in draw calls
     private static final int STATISTICS_BUFFER_BINDING = 8;
-    private final Shader terrainShader;
+    private final Shader terrainShader = Shader.make()
-    private final Shader translucentTerrainShader;
+            .defineIf("DEBUG_RENDER", false)
+            .add(ShaderType.VERTEX, "voxy:lod/gl46/quads2.vert")
+            .add(ShaderType.FRAGMENT, "voxy:lod/gl46/quads.frag")
+            .compile();
 
     private final Shader commandGenShader = Shader.make()
             .define("TRANSLUCENT_WRITE_BASE", 1024)
@@ -67,8 +70,7 @@ public class MDICSectionRenderer extends AbstractSectionRenderer<MDICViewport, B
             .compile();
 
     private final Shader prefixSumShader = Shader.make()
-            //Use subgroup prefix sum if possible otherwise use dodgy... slow prefix sum
+            .add(ShaderType.COMPUTE, "voxy:util/prefixsum/inital3.comp")
-            .add(ShaderType.COMPUTE, Capabilities.INSTANCE.subgroup?"voxy:util/prefixsum/inital3.comp":"voxy:util/prefixsum/simple.comp")
             .define("IO_BUFFER", 0)
             .compile();
 
@@ -88,53 +90,8 @@ public class MDICSectionRenderer extends AbstractSectionRenderer<MDICViewport, B
     //Statistics
     private final GlBuffer statisticsBuffer = new GlBuffer(1024).zero();
 
-    private final AbstractRenderPipeline pipeline;
+    public MDICSectionRenderer(ModelStore modelStore, BasicSectionGeometryData geometryData) {
-    public MDICSectionRenderer(AbstractRenderPipeline pipeline, ModelStore modelStore, BasicSectionGeometryData geometryData) {
         super(modelStore, geometryData);
-        this.pipeline = pipeline;
-        //The pipeline can be used to transform the renderer in abstract ways
-
-        String vertex = ShaderLoader.parse("voxy:lod/gl46/quads2.vert");
-        String taa = pipeline.taaFunction("taaShift");
-        if (taa != null) {
-            vertex += "\n"+taa;//inject it at the end
-        }
-        var builder = Shader.make()
-                .defineIf("TAA_PATCH", taa != null)
-                .defineIf("DEBUG_RENDER", false)
-                .addSource(ShaderType.VERTEX, vertex);
-
-        String frag = ShaderLoader.parse("voxy:lod/gl46/quads.frag");
-
-        String opaqueFrag = pipeline.patchOpaqueShader(this, frag);
-        opaqueFrag = opaqueFrag==null?frag:opaqueFrag;
-
-        //TODO: find a more robust/nicer way todo this
-        this.terrainShader = tryCompilePatchedOrNormal(builder, opaqueFrag, frag);
-
-        String translucentFrag = pipeline.patchTranslucentShader(this, frag);
-        if (translucentFrag != null) {
-            this.translucentTerrainShader = tryCompilePatchedOrNormal(builder, translucentFrag, frag);
-        } else {
-            this.translucentTerrainShader = this.terrainShader;
-        }
-    }
-
-    private static Shader tryCompilePatchedOrNormal(Shader.Builder<?> builder, String shader, String original) {
-        boolean patched = shader != original;//This is the correct comparison type (reference)
-        try {
-            return builder.clone()
-                    .defineIf("PATCHED_SHADER", patched)
-                    .addSource(ShaderType.FRAGMENT, shader)
-                    .compile();
-        } catch (RuntimeException e) {
-            if (patched) {
-                Logger.error("Failed to compile shader patch, using normal pipeline to prevent errors", e);
-                return tryCompilePatchedOrNormal(builder, original, original);
-            } else {
-                throw e;
-            }
-        }
     }
 
     private void uploadUniformBuffer(MDICViewport viewport) {
@@ -157,30 +114,28 @@ public class MDICSectionRenderer extends AbstractSectionRenderer<MDICViewport, B
     }
 
 
-    private void bindRenderingBuffers(MDICViewport viewport) {
+    private void bindRenderingBuffers(MDICViewport viewport, GlTexture depthBoundTexture) {
         glBindBufferBase(GL_UNIFORM_BUFFER, 0, this.uniform.id);
         glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, this.geometryManager.getGeometryBuffer().id);
         glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, this.geometryManager.getMetadataBuffer().id);
         this.modelStore.bind(3, 4, 0);
         glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 5, viewport.positionScratchBuffer.id);
         LightMapHelper.bind(1);
-        glBindTextureUnit(2, viewport.depthBoundingBuffer.getDepthTex().id);
+        glBindTextureUnit(2, depthBoundTexture.id);
 
         glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, SharedIndexBuffer.INSTANCE.id());
         glBindBuffer(GL_DRAW_INDIRECT_BUFFER, viewport.drawCallBuffer.id);
         glBindBuffer(GL_PARAMETER_BUFFER_ARB, viewport.drawCountCallBuffer.id);
     }
 
-    private void renderTerrain(MDICViewport viewport, long indirectOffset, long drawCountOffset, int maxDrawCount) {
+    private void renderTerrain(MDICViewport viewport, GlTexture depthBoundTexture, long indirectOffset, long drawCountOffset, int maxDrawCount) {
         //RenderLayer.getCutoutMipped().startDrawing();
 
-
         glDisable(GL_CULL_FACE);
         glEnable(GL_DEPTH_TEST);
         this.terrainShader.bind();
-        glBindVertexArray(GlVertexArray.STATIC_VAO);//Needs to be before binding
+        glBindVertexArray(RenderService.STATIC_VAO);//Needs to be before binding
-        this.pipeline.setupAndBindOpaque(viewport);
+        this.bindRenderingBuffers(viewport, depthBoundTexture);
-        this.bindRenderingBuffers(viewport);
 
         glMemoryBarrier(GL_COMMAND_BARRIER_BIT|GL_SHADER_STORAGE_BARRIER_BIT);//Barrier everything is needed
         glProvokingVertex(GL_FIRST_VERTEX_CONVENTION);
@@ -197,27 +152,25 @@ public class MDICSectionRenderer extends AbstractSectionRenderer<MDICViewport, B
     }
 
     @Override
-    public void renderOpaque(MDICViewport viewport) {
+    public void renderOpaque(MDICViewport viewport, GlTexture dbt) {
         if (this.geometryManager.getSectionCount() == 0) return;
 
         this.uploadUniformBuffer(viewport);
 
-        this.renderTerrain(viewport, 0, 4*3, Math.min((int)(this.geometryManager.getSectionCount()*4.4+128), 400_000));
+        this.renderTerrain(viewport, dbt, 0, 4*3, Math.min((int)(this.geometryManager.getSectionCount()*4.4+128), 400_000));
     }
 
     @Override
-    public void renderTranslucent(MDICViewport viewport) {
+    public void renderTranslucent(MDICViewport viewport, GlTexture depthBoundTexture) {
         if (this.geometryManager.getSectionCount() == 0) return;
-
         glEnable(GL_BLEND);
         glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
         glDisable(GL_CULL_FACE);
         glEnable(GL_DEPTH_TEST);
-        this.translucentTerrainShader.bind();
+        this.terrainShader.bind();
-        glBindVertexArray(GlVertexArray.STATIC_VAO);//Needs to be before binding
+        glBindVertexArray(RenderService.STATIC_VAO);//Needs to be before binding
-        this.pipeline.setupAndBindTranslucent(viewport);
+        this.bindRenderingBuffers(viewport, depthBoundTexture);
-        this.bindRenderingBuffers(viewport);
 
         glMemoryBarrier(GL_COMMAND_BARRIER_BIT|GL_SHADER_STORAGE_BARRIER_BIT);//Barrier everything is needed
         glProvokingVertex(GL_FIRST_VERTEX_CONVENTION);
@@ -256,7 +209,7 @@ public class MDICSectionRenderer extends AbstractSectionRenderer<MDICViewport, B
             if (Capabilities.INSTANCE.repFragTest) {
                 glEnable(GL_REPRESENTATIVE_FRAGMENT_TEST_NV);
             }
-            glBindVertexArray(GlVertexArray.STATIC_VAO);
+            glBindVertexArray(RenderService.STATIC_VAO);
             glBindBufferBase(GL_UNIFORM_BUFFER, 0, this.uniform.id);
             glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, this.geometryManager.getMetadataBuffer().id);
             glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, viewport.visibilityBuffer.id);
@@ -337,10 +290,10 @@ public class MDICSectionRenderer extends AbstractSectionRenderer<MDICViewport, B
     }
 
     @Override
-    public void renderTemporal(MDICViewport viewport) {
+    public void renderTemporal(MDICViewport viewport, GlTexture dbt) {
         if (this.geometryManager.getSectionCount() == 0) return;
         //Render temporal
-        this.renderTerrain(viewport, TEMPORAL_OFFSET*5*4, 4*5, Math.min(this.geometryManager.getSectionCount(), 100_000));
+        this.renderTerrain(viewport, dbt, TEMPORAL_OFFSET*5*4, 4*5, Math.min(this.geometryManager.getSectionCount(), 100_000));
     }
 
     @Override
@@ -356,9 +309,6 @@ public class MDICSectionRenderer extends AbstractSectionRenderer<MDICViewport, B
 
     @Override
     public void free() {
-        if (this.terrainShader != this.translucentTerrainShader) {
-            this.translucentTerrainShader.free();
-        }
         this.uniform.free();
         this.distanceCountBuffer.free();
         this.terrainShader.free();

src/main/java/me/cortex/voxy/client/core/rendering/section/MDICViewport.java

@@ -8,7 +8,7 @@ public class MDICViewport extends Viewport<MDICViewport> {
     public final GlBuffer drawCountCallBuffer = new GlBuffer(1024).zero();
     public final GlBuffer drawCallBuffer = new GlBuffer(5*4*(400_000+100_000+100_000)).zero();//400k draw calls
     public final GlBuffer positionScratchBuffer  = new GlBuffer(8*400000).zero();//400k positions
-    public final GlBuffer indirectLookupBuffer = new GlBuffer(HierarchicalOcclusionTraverser.MAX_QUEUE_SIZE *4+4);//In theory, this could be global/not unique to the viewport
+    public final GlBuffer indirectLookupBuffer = new GlBuffer(HierarchicalOcclusionTraverser.MAX_QUEUE_SIZE *4+4);
     public final GlBuffer visibilityBuffer;
 
     public MDICViewport(int maxSectionCount) {

src/main/java/me/cortex/voxy/client/core/rendering/section/MeshEXTSectionRenderer.java

@@ -2,14 +2,13 @@ package me.cortex.voxy.client.core.rendering.section;
 
 
 import me.cortex.voxy.client.RenderStatistics;
-import me.cortex.voxy.client.core.AbstractRenderPipeline;
 import me.cortex.voxy.client.core.gl.Capabilities;
 import me.cortex.voxy.client.core.gl.GlBuffer;
 import me.cortex.voxy.client.core.gl.GlTexture;
-import me.cortex.voxy.client.core.gl.GlVertexArray;
 import me.cortex.voxy.client.core.gl.shader.Shader;
 import me.cortex.voxy.client.core.gl.shader.ShaderType;
 import me.cortex.voxy.client.core.model.ModelStore;
+import me.cortex.voxy.client.core.rendering.RenderService;
 import me.cortex.voxy.client.core.rendering.section.geometry.BasicSectionGeometryData;
 import me.cortex.voxy.client.core.rendering.util.DownloadStream;
 import me.cortex.voxy.client.core.rendering.util.LightMapHelper;
@@ -64,10 +63,8 @@ public class MeshEXTSectionRenderer extends AbstractSectionRenderer<MeshViewport
     //Statistics
     private final GlBuffer statisticsBuffer = new GlBuffer(1024).zero();
 
-    private final AbstractRenderPipeline pipeline;
+    public MeshEXTSectionRenderer(ModelStore modelStore, BasicSectionGeometryData geometryData) {
-    public MeshEXTSectionRenderer(AbstractRenderPipeline pipeline, ModelStore modelStore, BasicSectionGeometryData geometryData) {
         super(modelStore, geometryData);
-        this.pipeline = pipeline;
         glClearNamedBufferSubData(this.cullAndMeshDrawCommand.id, GL_R32UI,0, 4, GL_RED_INTEGER, GL_UNSIGNED_INT, new int[]{6*2*3});//count
         glClearNamedBufferSubData(this.cullAndMeshDrawCommand.id, GL_R32UI,8, 4, GL_RED_INTEGER, GL_UNSIGNED_INT, new int[]{(1<<16)*6*2});//firstIndex
         glClearNamedBufferSubData(this.cullAndMeshDrawCommand.id, GL_R32UI,5*4+4, 4, GL_RED_INTEGER, GL_UNSIGNED_INT, new int[]{1});//y
@@ -99,7 +96,7 @@ public class MeshEXTSectionRenderer extends AbstractSectionRenderer<MeshViewport
     }
 
 
-    private void bindRenderingBuffers(MeshViewport viewport) {
+    private void bindRenderingBuffers(MeshViewport viewport, GlTexture depthBoundTexture) {
         glBindBufferBase(GL_UNIFORM_BUFFER, 0, this.uniform.id);
         glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, viewport.getRenderList().id);
         glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, this.geometryManager.getMetadataBuffer().id);
@@ -107,7 +104,7 @@ public class MeshEXTSectionRenderer extends AbstractSectionRenderer<MeshViewport
         glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 4, this.geometryManager.getGeometryBuffer().id);
         this.modelStore.bind(5, 6, 0);
         LightMapHelper.bind(1);
-        glBindTextureUnit(2, viewport.depthBoundingBuffer.getDepthTex().id);
+        glBindTextureUnit(2, depthBoundTexture.id);
 
         glBindBuffer(GL_DRAW_INDIRECT_BUFFER, this.cullAndMeshDrawCommand.id);
 
@@ -116,13 +113,12 @@ public class MeshEXTSectionRenderer extends AbstractSectionRenderer<MeshViewport
         }
     }
 
-    private void renderTerrain(MeshViewport viewport) {
+    private void renderTerrain(MeshViewport viewport, GlTexture depthBoundTexture) {
         //RenderLayer.getCutoutMipped().startDrawing();
         glDisable(GL_CULL_FACE);
         glEnable(GL_DEPTH_TEST);
         this.terrainShader.bind();
-        this.pipeline.setupAndBindOpaque(viewport);
+        this.bindRenderingBuffers(viewport, depthBoundTexture);
-        this.bindRenderingBuffers(viewport);
 
         glMemoryBarrier(GL_COMMAND_BARRIER_BIT|GL_SHADER_STORAGE_BARRIER_BIT);//Barrier everything is needed
 
@@ -138,12 +134,12 @@ public class MeshEXTSectionRenderer extends AbstractSectionRenderer<MeshViewport
     }
 
     @Override
-    public void renderOpaque(MeshViewport viewport) {
+    public void renderOpaque(MeshViewport viewport, GlTexture dbt) {
         if (this.geometryManager.getSectionCount() == 0) return;
 
         this.uploadUniformBuffer(viewport);
 
-        this.renderTerrain(viewport);
+        this.renderTerrain(viewport, dbt);
 
         //We need todo the statistics here as rastering is part of them, download then clear
         if (RenderStatistics.enabled) {
@@ -163,7 +159,7 @@ public class MeshEXTSectionRenderer extends AbstractSectionRenderer<MeshViewport
     }
 
     @Override
-    public void renderTranslucent(MeshViewport viewport) {
+    public void renderTranslucent(MeshViewport viewport, GlTexture depthBoundTexture) {
         return;
     }
 
@@ -183,7 +179,7 @@ public class MeshEXTSectionRenderer extends AbstractSectionRenderer<MeshViewport
             if (Capabilities.INSTANCE.repFragTest) {
                 glEnable(GL_REPRESENTATIVE_FRAGMENT_TEST_NV);
             }
-            glBindVertexArray(GlVertexArray.STATIC_VAO);
+            glBindVertexArray(RenderService.STATIC_VAO);
             glBindBufferBase(GL_UNIFORM_BUFFER, 0, this.uniform.id);
             glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, this.geometryManager.getMetadataBuffer().id);
             glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, viewport.visibilityBuffer.id);
@@ -205,7 +201,7 @@ public class MeshEXTSectionRenderer extends AbstractSectionRenderer<MeshViewport
     }
 
     @Override
-    public void renderTemporal(MeshViewport viewport) {
+    public void renderTemporal(MeshViewport viewport, GlTexture dbt) {
         return;
     }
 

src/main/java/me/cortex/voxy/client/core/rendering/section/MeshSectionRenderer.java

@@ -0,0 +1,228 @@
+package me.cortex.voxy.client.core.rendering.section;
+
+
+import me.cortex.voxy.client.RenderStatistics;
+import me.cortex.voxy.client.core.gl.Capabilities;
+import me.cortex.voxy.client.core.gl.GlBuffer;
+import me.cortex.voxy.client.core.gl.GlTexture;
+import me.cortex.voxy.client.core.gl.shader.Shader;
+import me.cortex.voxy.client.core.gl.shader.ShaderType;
+import me.cortex.voxy.client.core.model.ModelStore;
+import me.cortex.voxy.client.core.rendering.RenderService;
+import me.cortex.voxy.client.core.rendering.section.geometry.BasicSectionGeometryData;
+import me.cortex.voxy.client.core.rendering.util.DownloadStream;
+import me.cortex.voxy.client.core.rendering.util.LightMapHelper;
+import me.cortex.voxy.client.core.rendering.util.SharedIndexBuffer;
+import me.cortex.voxy.client.core.rendering.util.UploadStream;
+import me.cortex.voxy.common.Logger;
+import me.cortex.voxy.common.world.WorldEngine;
+import org.joml.Matrix4f;
+import org.lwjgl.system.MemoryUtil;
+
+import java.util.List;
+
+import static org.lwjgl.opengl.ARBIndirectParameters.GL_PARAMETER_BUFFER_ARB;
+import static org.lwjgl.opengl.ARBIndirectParameters.glMultiDrawElementsIndirectCountARB;
+import static org.lwjgl.opengl.GL11.*;
+import static org.lwjgl.opengl.GL11C.GL_UNSIGNED_INT;
+import static org.lwjgl.opengl.GL15.GL_ELEMENT_ARRAY_BUFFER;
+import static org.lwjgl.opengl.GL15.glBindBuffer;
+import static org.lwjgl.opengl.GL30.glBindBufferBase;
+import static org.lwjgl.opengl.GL30.glBindVertexArray;
+import static org.lwjgl.opengl.GL30C.GL_R32UI;
+import static org.lwjgl.opengl.GL30C.GL_RED_INTEGER;
+import static org.lwjgl.opengl.GL31.GL_UNIFORM_BUFFER;
+import static org.lwjgl.opengl.GL33.glBindSampler;
+import static org.lwjgl.opengl.GL40C.GL_DRAW_INDIRECT_BUFFER;
+import static org.lwjgl.opengl.GL42.glMemoryBarrier;
+import static org.lwjgl.opengl.GL43.*;
+import static org.lwjgl.opengl.GL45.*;
+import static org.lwjgl.opengl.GL45C.glClearNamedBufferData;
+import static org.lwjgl.opengl.NVMeshShader.glDrawMeshTasksIndirectNV;
+import static org.lwjgl.opengl.NVRepresentativeFragmentTest.GL_REPRESENTATIVE_FRAGMENT_TEST_NV;
+
+//Uses MDIC to render the sections
+public class MeshSectionRenderer extends AbstractSectionRenderer<MeshViewport, BasicSectionGeometryData> {
+    private static final int STATISTICS_BUFFER_BINDING = 8;
+    private final Shader terrainShader = Shader.make()
+            .define("MESH_SIZE", 32)//16
+
+            .defineIf("HAS_STATISTICS", RenderStatistics.enabled)
+            .defineIf("STATISTICS_BUFFER_BINDING", RenderStatistics.enabled, STATISTICS_BUFFER_BINDING)
+
+            .add(ShaderType.TASK, "voxy:lod/mesh/task.glsl")
+            .add(ShaderType.MESH, "voxy:lod/mesh/mesh.glsl")
+            .add(ShaderType.FRAGMENT, "voxy:lod/mesh/frag.glsl")
+            .compile();
+
+    private final Shader cullShader = Shader.make()
+            .add(ShaderType.VERTEX, "voxy:lod/gl46/cull/raster.vert")
+            .add(ShaderType.FRAGMENT, "voxy:lod/gl46/cull/raster.frag")
+            .compile();
+
+    private final GlBuffer uniform = new GlBuffer(1024).zero();
+    private final GlBuffer cullAndMeshDrawCommand = new GlBuffer(7*4).zero();//TODO: this needs tobe in the viewport
+
+    //Statistics
+    private final GlBuffer statisticsBuffer = new GlBuffer(1024).zero();
+
+    public MeshSectionRenderer(ModelStore modelStore, BasicSectionGeometryData geometryData) {
+        super(modelStore, geometryData);
+        glClearNamedBufferSubData(this.cullAndMeshDrawCommand.id, GL_R32UI,0, 4, GL_RED_INTEGER, GL_UNSIGNED_INT, new int[]{6*2*3});//count
+        glClearNamedBufferSubData(this.cullAndMeshDrawCommand.id, GL_R32UI,8, 4, GL_RED_INTEGER, GL_UNSIGNED_INT, new int[]{(1<<16)*6*2});//firstIndex
+    }
+
+    private void uploadUniformBuffer(MeshViewport viewport) {
+        long ptr = UploadStream.INSTANCE.upload(this.uniform, 0, 1024);
+        
+        var mat = new Matrix4f(viewport.MVP);
+        mat.translate(-viewport.innerTranslation.x, -viewport.innerTranslation.y, -viewport.innerTranslation.z);
+        mat.getToAddress(ptr); ptr += 4*4*4;
+
+        viewport.section.getToAddress(ptr); ptr += 4*3;
+
+        if (viewport.frameId<0) {
+            Logger.error("Frame ID negative, this will cause things to break, wrapping around");
+            viewport.frameId &= 0x7fffffff;
+        }
+        MemoryUtil.memPutInt(ptr, viewport.frameId&0x7fffffff); ptr += 4;
+        viewport.innerTranslation.getToAddress(ptr); ptr += 4*3;
+
+        ptr += 4;// padd
+
+        MemoryUtil.memPutFloat(ptr, viewport.width); ptr += 4;
+        MemoryUtil.memPutFloat(ptr, viewport.height); ptr += 4;
+
+        UploadStream.INSTANCE.commit();
+    }
+
+
+    private void bindRenderingBuffers(MeshViewport viewport, GlTexture depthBoundTexture) {
+        glBindBufferBase(GL_UNIFORM_BUFFER, 0, this.uniform.id);
+        glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, viewport.getRenderList().id);
+        glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, this.geometryManager.getMetadataBuffer().id);
+        glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 3, viewport.visibilityBuffer.id);
+        glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 4, this.geometryManager.getGeometryBuffer().id);
+        this.modelStore.bind(5, 6, 0);
+        LightMapHelper.bind(1);
+        glBindTextureUnit(2, depthBoundTexture.id);
+
+        glBindBuffer(GL_DRAW_INDIRECT_BUFFER, this.cullAndMeshDrawCommand.id);
+
+        if (RenderStatistics.enabled) {
+            glBindBufferBase(GL_SHADER_STORAGE_BUFFER, STATISTICS_BUFFER_BINDING, this.statisticsBuffer.id);
+        }
+    }
+
+    private void renderTerrain(MeshViewport viewport, GlTexture depthBoundTexture) {
+        //RenderLayer.getCutoutMipped().startDrawing();
+        glDisable(GL_CULL_FACE);
+        glEnable(GL_DEPTH_TEST);
+        this.terrainShader.bind();
+        this.bindRenderingBuffers(viewport, depthBoundTexture);
+
+        glMemoryBarrier(GL_COMMAND_BARRIER_BIT|GL_SHADER_STORAGE_BARRIER_BIT);//Barrier everything is needed
+
+        glDrawMeshTasksIndirectNV(20);
+
+        glEnable(GL_CULL_FACE);
+        glBindSampler(0, 0);
+        glBindTextureUnit(0, 0);
+        glBindSampler(1, 0);
+        glBindTextureUnit(1, 0);
+
+        //RenderLayer.getCutoutMipped().endDrawing();
+    }
+
+    @Override
+    public void renderOpaque(MeshViewport viewport, GlTexture dbt) {
+        if (this.geometryManager.getSectionCount() == 0) return;
+
+        this.uploadUniformBuffer(viewport);
+
+        this.renderTerrain(viewport, dbt);
+
+        //We need todo the statistics here as rastering is part of them, download then clear
+        if (RenderStatistics.enabled) {
+            DownloadStream.INSTANCE.download(this.statisticsBuffer, down->{
+                final int LAYERS = WorldEngine.MAX_LOD_LAYER+1;
+                for (int i = 0; i < LAYERS; i++) {
+                    RenderStatistics.visibleSections[i] = MemoryUtil.memGetInt(down.address+i*4L);
+                }
+
+                for (int i = 0; i < LAYERS; i++) {
+                    RenderStatistics.quadCount[i] = MemoryUtil.memGetInt(down.address+LAYERS*4L+i*4L);
+                }
+            });
+
+            this.statisticsBuffer.zero();
+        }
+    }
+
+    @Override
+    public void renderTranslucent(MeshViewport viewport, GlTexture depthBoundTexture) {
+        return;
+    }
+
+    @Override
+    public void buildDrawCalls(MeshViewport viewport) {
+        if (this.geometryManager.getSectionCount() == 0) return;
+        this.uploadUniformBuffer(viewport);
+        //Can do a sneeky trick, since the sectionRenderList is a list to things to render, it invokes the culler
+        // which only marks visible sections
+
+
+        {//Test occlusion
+            glCopyNamedBufferSubData(viewport.getRenderList().id, this.cullAndMeshDrawCommand.id, 0, 4, 4);//Copy counts to the draw buffer
+            glCopyNamedBufferSubData(viewport.getRenderList().id, this.cullAndMeshDrawCommand.id, 0, 20, 4);//Copy counts to the draw buffer
+
+            this.cullShader.bind();
+            if (Capabilities.INSTANCE.repFragTest) {
+                glEnable(GL_REPRESENTATIVE_FRAGMENT_TEST_NV);
+            }
+            glBindVertexArray(RenderService.STATIC_VAO);
+            glBindBufferBase(GL_UNIFORM_BUFFER, 0, this.uniform.id);
+            glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, this.geometryManager.getMetadataBuffer().id);
+            glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, viewport.visibilityBuffer.id);
+            glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 3, viewport.getRenderList().id);
+            glBindBuffer(GL_DRAW_INDIRECT_BUFFER, this.cullAndMeshDrawCommand.id);
+            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, SharedIndexBuffer.INSTANCE.id());
+            glEnable(GL_DEPTH_TEST);
+            glColorMask(false, false, false, false);
+            glDepthMask(false);
+            glMemoryBarrier(GL_SHADER_STORAGE_BARRIER_BIT|GL_COMMAND_BARRIER_BIT);
+            glDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_BYTE, 0);
+            glDepthMask(true);
+            glColorMask(true, true, true, true);
+            glDisable(GL_DEPTH_TEST);
+            if (Capabilities.INSTANCE.repFragTest) {
+                glDisable(GL_REPRESENTATIVE_FRAGMENT_TEST_NV);
+            }
+        }
+    }
+
+    @Override
+    public void renderTemporal(MeshViewport viewport, GlTexture dbt) {
+        return;
+    }
+
+    @Override
+    public void addDebug(List<String> lines) {
+        super.addDebug(lines);
+        //lines.add("SC/GS: " + this.geometryManager.getSectionCount() + "/" + (this.geometryManager.getGeometryUsed()/(1024*1024)));//section count/geometry size (MB)
+    }
+
+    @Override
+    public MeshViewport createViewport() {
+        return new MeshViewport(this.geometryManager.getMaxSectionCount());
+    }
+
+    @Override
+    public void free() {
+        this.cullAndMeshDrawCommand.free();
+        this.uniform.free();
+        this.terrainShader.free();
+        this.cullShader.free();
+        this.statisticsBuffer.free();
+    }
+}

src/main/java/me/cortex/voxy/client/core/rendering/section/geometry/BasicAsyncGeometryManager.java

@@ -107,14 +107,12 @@ public class BasicAsyncGeometryManager implements IGeometryManager {
     private SectionMeta createMeta(BuiltSection section) {
         if ((section.geometryBuffer.size%GEOMETRY_ELEMENT_SIZE)!=0) throw new IllegalStateException();
         int size = (int) (section.geometryBuffer.size/GEOMETRY_ELEMENT_SIZE);
-        //clamp size upwards
-        int upsized = (size+1023)&~1023;
         //Address
-        int addr = (int)this.allocationHeap.alloc(upsized);
+        int addr = (int)this.allocationHeap.alloc(size);
         if (addr == -1) {
-            throw new IllegalStateException("Geometry OOM. requested allocation size (in elements): " + size + ", Heap size at top remaining: " + (this.allocationHeap.getLimit()-this.allocationHeap.getSize()) + ", used elements: " + this.usedCapacity);
+            throw new IllegalStateException("Geometry OOM");
         }
-        this.usedCapacity += upsized;
+        this.usedCapacity += size;
         //Create upload
         if (this.heapUploads.put(addr, section.geometryBuffer) != null) {
             throw new IllegalStateException("Addr: " + addr);

src/main/java/me/cortex/voxy/client/core/rendering/section/geometry/BasicSectionGeometryData.java

@@ -1,14 +1,6 @@
 package me.cortex.voxy.client.core.rendering.section.geometry;
 
-import me.cortex.voxy.client.core.gl.Capabilities;
 import me.cortex.voxy.client.core.gl.GlBuffer;
-import me.cortex.voxy.common.Logger;
-import me.cortex.voxy.common.util.ThreadUtils;
-
-import static org.lwjgl.opengl.ARBSparseBuffer.*;
-import static org.lwjgl.opengl.GL11C.*;
-import static org.lwjgl.opengl.GL15C.GL_ARRAY_BUFFER;
-import static org.lwjgl.opengl.GL15C.glBindBuffer;
 
 public class BasicSectionGeometryData implements IGeometryData {
     public static final int SECTION_METADATA_SIZE = 32;
@@ -25,46 +17,7 @@ public class BasicSectionGeometryData implements IGeometryData {
         if ((geometryCapacity%8)!=0) {
             throw new IllegalStateException();
         }
-        long start = System.currentTimeMillis();
+        this.geometryBuffer = new GlBuffer(geometryCapacity);
-        String msg = "Creating and zeroing " + (geometryCapacity/(1024*1024)) + "MB geometry buffer";
-        if (Capabilities.INSTANCE.canQueryGpuMemory) {
-            msg += " driver states " + (Capabilities.INSTANCE.getFreeDedicatedGpuMemory()/(1024*1024)) + "MB of free memory";
-        }
-        Logger.info(msg);
-        Logger.info("if your game crashes/exits here without any other log message, try manually decreasing the geometry capacity");
-        glGetError();//Clear any errors
-        GlBuffer buffer = null;
-        if (!(Capabilities.INSTANCE.isNvidia && ThreadUtils.isWindows)) {
-            buffer = new GlBuffer(geometryCapacity, false);//Only do this if we are not on nvidia
-            //TODO: FIXME: TEST, see if the issue is that we are trying to zero the entire buffer, try only zeroing increments
-            // or dont zero it at all
-        } else {
-            Logger.info("Running on windows nvidia, using workaround sparse buffer allocation");
-        }
-        int error = glGetError();
-        if (error != GL_NO_ERROR || buffer == null) {
-            if ((buffer == null || error == GL_OUT_OF_MEMORY) && Capabilities.INSTANCE.sparseBuffer) {
-                if (buffer != null) {
-                    Logger.error("Failed to allocate geometry buffer, attempting workaround with sparse buffers");
-                    buffer.free();
-                }
-                buffer = new GlBuffer(geometryCapacity, GL_SPARSE_STORAGE_BIT_ARB);
-                glBindBuffer(GL_ARRAY_BUFFER, buffer.id);
-                glBufferPageCommitmentARB(GL_ARRAY_BUFFER, 0, geometryCapacity, true);
-                glBindBuffer(GL_ARRAY_BUFFER, 0);
-                //buffer.zero();
-                error = glGetError();
-                if (error != GL_NO_ERROR) {
-                    buffer.free();
-                    throw new IllegalStateException("Unable to allocate geometry buffer using workaround, got gl error " + error);
-                }
-            } else {
-                throw new IllegalStateException("Unable to allocate geometry buffer, got gl error " + error);
-            }
-        }
-        this.geometryBuffer = buffer;
-        long delta = System.currentTimeMillis() - start;
-        Logger.info("Successfully allocated the geometry buffer in " + delta + "ms");
     }
 
     public GlBuffer getGeometryBuffer() {
@@ -94,31 +47,6 @@ public class BasicSectionGeometryData implements IGeometryData {
     @Override
     public void free() {
         this.sectionMetadataBuffer.free();
-
-        long gpuMemory = 0;
-        if (Capabilities.INSTANCE.canQueryGpuMemory) {
-            glFinish();
-            gpuMemory = Capabilities.INSTANCE.getFreeDedicatedGpuMemory();
-        }
-        glFinish();
         this.geometryBuffer.free();
-        glFinish();
-        if (Capabilities.INSTANCE.canQueryGpuMemory) {
-            long releaseSize = (long) (this.geometryBuffer.size()*0.75);//if gpu memory usage drops by 75% of the expected value assume we freed it
-            if (Capabilities.INSTANCE.getFreeDedicatedGpuMemory()-gpuMemory<=releaseSize) {
-                Logger.info("Attempting to wait for gpu memory to release");
-                long start = System.currentTimeMillis();
-
-                long TIMEOUT = 2500;
-
-                while (System.currentTimeMillis() - start > TIMEOUT) {//Wait up to 2.5 seconds for memory to release
-                    glFinish();
-                    if (Capabilities.INSTANCE.getFreeDedicatedGpuMemory() - gpuMemory > releaseSize) break;
-                }
-                if (Capabilities.INSTANCE.getFreeDedicatedGpuMemory() - gpuMemory <= releaseSize) {
-                    Logger.warn("Failed to wait for gpu memory to be freed, this could indicate an issue with the driver");
-                }
-            }
-        }
     }
 }

src/main/java/me/cortex/voxy/client/core/rendering/util/ComputeUtils.java

@@ -7,8 +7,12 @@ import org.lwjgl.system.MemoryUtil;
 
 import java.util.function.Supplier;
 
+import static org.lwjgl.opengl.GL15.glBindBuffer;
 import static org.lwjgl.opengl.GL20.glUniform1i;
+import static org.lwjgl.opengl.GL20.glUseProgram;
 import static org.lwjgl.opengl.GL30.glBindBufferBase;
+import static org.lwjgl.opengl.GL30.glUniform1ui;
+import static org.lwjgl.opengl.GL31.GL_UNIFORM_BUFFER;
 import static org.lwjgl.opengl.GL43.GL_SHADER_STORAGE_BUFFER;
 import static org.lwjgl.opengl.GL43C.glDispatchCompute;
 

src/main/java/me/cortex/voxy/client/core/rendering/util/DepthFramebuffer.java

@@ -1,59 +0,0 @@
-package me.cortex.voxy.client.core.rendering.util;
-
-import me.cortex.voxy.client.core.gl.GlFramebuffer;
-import me.cortex.voxy.client.core.gl.GlTexture;
-import org.lwjgl.system.MemoryStack;
-
-import static org.lwjgl.opengl.ARBDirectStateAccess.nglClearNamedFramebufferfv;
-import static org.lwjgl.opengl.GL11C.GL_DEPTH;
-import static org.lwjgl.opengl.GL14.GL_DEPTH_COMPONENT24;
-import static org.lwjgl.opengl.GL30C.*;
-
-public class DepthFramebuffer {
-    private final int depthType;
-    private GlTexture depthBuffer;
-    public final GlFramebuffer framebuffer = new GlFramebuffer();
-
-    public DepthFramebuffer() {
-        this(GL_DEPTH_COMPONENT24);
-    }
-
-    public DepthFramebuffer(int depthType) {
-        this.depthType = depthType;
-    }
-
-    public void resize(int width, int height) {
-        if (this.depthBuffer == null || this.depthBuffer.getWidth() != width || this.depthBuffer.getHeight() != height) {
-            if (this.depthBuffer != null) {
-                this.depthBuffer.free();
-            }
-            this.depthBuffer = new GlTexture().store(this.depthType, 1, width, height);
-            this.framebuffer.bind(this.depthType == GL_DEPTH24_STENCIL8?GL_DEPTH_STENCIL_ATTACHMENT: GL_DEPTH_ATTACHMENT, this.depthBuffer).verify();
-        }
-    }
-
-    public void clear() {
-        this.clear(1.0f);
-    }
-
-    public void clear(float depth) {
-        try (var stack = MemoryStack.stackPush()) {
-            nglClearNamedFramebufferfv(this.framebuffer.id, GL_DEPTH, 0, stack.nfloat(depth));
-        }
-    }
-
-    public GlTexture getDepthTex() {
-        return this.depthBuffer;
-    }
-
-    public void free() {
-        this.framebuffer.free();
-        if (this.depthBuffer != null) {
-            this.depthBuffer.free();
-        }
-    }
-
-    public void bind() {
-        glBindFramebuffer(GL_FRAMEBUFFER, this.framebuffer.id);
-    }
-}

src/main/java/me/cortex/voxy/client/core/rendering/util/DownloadStream.java

@@ -18,7 +18,7 @@ import static org.lwjgl.opengl.GL11.glFinish;
 import static org.lwjgl.opengl.GL30C.GL_MAP_READ_BIT;
 import static org.lwjgl.opengl.GL42.GL_BUFFER_UPDATE_BARRIER_BIT;
 import static org.lwjgl.opengl.GL42.glMemoryBarrier;
-import static org.lwjgl.opengl.GL44.GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT;
+import static org.lwjgl.opengl.GL44.*;
 import static org.lwjgl.opengl.GL45.glCopyNamedBufferSubData;
 
 public class DownloadStream {
@@ -149,21 +149,6 @@ public class DownloadStream {
     }
 
     //Synchonize force flushes everything
-    public void waitDiscard() {
-        glFinish();
-        var fence = new GlFence();
-        glFinish();
-        while (!fence.signaled())
-            Thread.onSpinWait();
-        fence.free();
-        while (!this.frames.isEmpty()) {
-            var frame = this.frames.pop();
-            while (!frame.fence.signaled()) Thread.onSpinWait();
-            frame.allocations.forEach(this.allocationArena::free);
-            frame.fence.free();
-        }
-    }
-
     public void flushWaitClear() {
         glFinish();
         this.tick();

src/main/java/me/cortex/voxy/client/core/rendering/util/GlStateCapture.java

@@ -5,6 +5,8 @@ import it.unimi.dsi.fastutil.ints.IntArrayList;
 import static org.lwjgl.opengl.GL11.*;
 import static org.lwjgl.opengl.GL13.GL_ACTIVE_TEXTURE;
 import static org.lwjgl.opengl.GL13.glActiveTexture;
+import static org.lwjgl.opengl.GL13C.GL_TEXTURE0;
+import static org.lwjgl.opengl.GL33.glBindSampler;
 
 public class GlStateCapture {
     private final int[] capabilityIds;

src/main/java/me/cortex/voxy/client/core/rendering/util/HiZBuffer.java

@@ -2,9 +2,9 @@ package me.cortex.voxy.client.core.rendering.util;
 
 import me.cortex.voxy.client.core.gl.GlFramebuffer;
 import me.cortex.voxy.client.core.gl.GlTexture;
-import me.cortex.voxy.client.core.gl.GlVertexArray;
 import me.cortex.voxy.client.core.gl.shader.Shader;
 import me.cortex.voxy.client.core.gl.shader.ShaderType;
+import me.cortex.voxy.client.core.rendering.RenderService;
 import org.lwjgl.opengl.GL11;
 
 import static org.lwjgl.opengl.ARBDirectStateAccess.*;
@@ -17,6 +17,7 @@ import static org.lwjgl.opengl.GL33C.glDeleteSamplers;
 import static org.lwjgl.opengl.GL33C.glSamplerParameteri;
 import static org.lwjgl.opengl.GL42C.GL_FRAMEBUFFER_BARRIER_BIT;
 import static org.lwjgl.opengl.GL42C.glMemoryBarrier;
+import static org.lwjgl.opengl.GL43C.glCopyImageSubData;
 import static org.lwjgl.opengl.GL45C.glTextureBarrier;
 
 public class HiZBuffer {
@@ -75,7 +76,7 @@ public class HiZBuffer {
             }
             this.alloc(Integer.highestOneBit(width), Integer.highestOneBit(height));
         }
-        glBindVertexArray(GlVertexArray.STATIC_VAO);
+        glBindVertexArray(RenderService.STATIC_VAO);
         int boundFB = GL11.glGetInteger(GL_DRAW_FRAMEBUFFER_BINDING);
         this.hiz.bind();
         glBindFramebuffer(GL_FRAMEBUFFER, this.fb.id);
@@ -127,6 +128,6 @@ public class HiZBuffer {
     }
 
     public int getPackedLevels() {
-        return (this.width<<16)|this.height;//+1
+        return ((Integer.numberOfTrailingZeros(this.width))<<16)|(Integer.numberOfTrailingZeros(this.height));//+1
     }
 }

src/main/java/me/cortex/voxy/client/core/rendering/util/HiZBuffer2.java

@@ -2,15 +2,16 @@ package me.cortex.voxy.client.core.rendering.util;
 
 import me.cortex.voxy.client.core.gl.GlFramebuffer;
 import me.cortex.voxy.client.core.gl.GlTexture;
-import me.cortex.voxy.client.core.gl.GlVertexArray;
 import me.cortex.voxy.client.core.gl.shader.Shader;
 import me.cortex.voxy.client.core.gl.shader.ShaderType;
+import me.cortex.voxy.client.core.rendering.RenderService;
 import org.lwjgl.opengl.GL11;
 
 import static org.lwjgl.opengl.ARBDirectStateAccess.*;
 import static org.lwjgl.opengl.ARBShaderImageLoadStore.GL_TEXTURE_FETCH_BARRIER_BIT;
 import static org.lwjgl.opengl.GL11C.*;
 import static org.lwjgl.opengl.GL30C.*;
+import static org.lwjgl.opengl.GL30C.glBindVertexArray;
 import static org.lwjgl.opengl.GL33.glBindSampler;
 import static org.lwjgl.opengl.GL33.glGenSamplers;
 import static org.lwjgl.opengl.GL33C.glDeleteSamplers;
@@ -83,7 +84,7 @@ public class HiZBuffer2 {
         {//Mip down to initial chain
             int boundFB = GL11.glGetInteger(GL_DRAW_FRAMEBUFFER_BINDING);
 
-            glBindVertexArray(GlVertexArray.STATIC_VAO);
+            glBindVertexArray(RenderService.STATIC_VAO);
             this.hizInitial.bind();
             glBindFramebuffer(GL_FRAMEBUFFER, this.fb.id);
 

src/main/java/me/cortex/voxy/client/core/rendering/util/LightMapHelper.java

@@ -1,8 +1,15 @@
 package me.cortex.voxy.client.core.rendering.util;
 
+import me.cortex.voxy.client.core.gl.GlBuffer;
+import me.cortex.voxy.client.core.gl.GlTexture;
+import me.cortex.voxy.client.core.rendering.util.UploadStream;
 import net.minecraft.client.MinecraftClient;
+import org.lwjgl.system.MemoryUtil;
 
-import static org.lwjgl.opengl.GL33.glBindSampler;
+import static org.lwjgl.opengl.ARBUniformBufferObject.glBindBufferBase;
+import static org.lwjgl.opengl.GL11.glBindTexture;
+import static org.lwjgl.opengl.GL33.*;
+import static org.lwjgl.opengl.GL43.GL_SHADER_STORAGE_BUFFER;
 import static org.lwjgl.opengl.GL45.glBindTextureUnit;
 
 public class LightMapHelper {

src/main/java/me/cortex/voxy/client/core/rendering/util/UploadStream.java

@@ -15,8 +15,11 @@ import static me.cortex.voxy.common.util.AllocationArena.SIZE_LIMIT;
 import static org.lwjgl.opengl.ARBDirectStateAccess.glCopyNamedBufferSubData;
 import static org.lwjgl.opengl.ARBMapBufferRange.*;
 import static org.lwjgl.opengl.GL11.glFinish;
+import static org.lwjgl.opengl.GL42.GL_UNIFORM_BARRIER_BIT;
 import static org.lwjgl.opengl.GL42.glMemoryBarrier;
 import static org.lwjgl.opengl.GL42C.GL_BUFFER_UPDATE_BARRIER_BIT;
+import static org.lwjgl.opengl.GL43.GL_SHADER_STORAGE_BARRIER_BIT;
+import static org.lwjgl.opengl.GL44.GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT;
 import static org.lwjgl.opengl.GL44.GL_MAP_COHERENT_BIT;
 import static org.lwjgl.opengl.GL45C.glFlushMappedNamedBufferRange;
 
@@ -41,10 +44,6 @@ public class UploadStream {
         data.cpyTo(this.upload(buffer, destOffset, data.size));
     }
 
-    public long uploadTo(GlBuffer buffer) {
-        return this.upload(buffer, 0, buffer.size());
-    }
-
     public long upload(GlBuffer buffer, long destOffset, long size) {
         long addr = this.rawUploadAddress((int) size);
 
@@ -106,15 +105,14 @@ public class UploadStream {
     }
 
     public void commit() {
+        if (this.uploadList.isEmpty()) {
+            return;
+        }
         if ((!USE_COHERENT)&&this.caddr != -1) {
             //Flush this allocation
             glFlushMappedNamedBufferRange(this.uploadBuffer.id, this.caddr, this.offset);
         }
 
-        if (this.uploadList.isEmpty()) {
-            return;
-        }
-
         glMemoryBarrier(GL_BUFFER_UPDATE_BARRIER_BIT);
         //Execute all the copies
         for (var entry : this.uploadList) {

src/main/java/me/cortex/voxy/client/core/util/GPUTiming.java

@@ -1,165 +0,0 @@
-package me.cortex.voxy.client.core.util;
-
-import it.unimi.dsi.fastutil.ints.IntArrayFIFOQueue;
-import it.unimi.dsi.fastutil.objects.ObjectArrayFIFOQueue;
-import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import me.cortex.voxy.client.core.gl.GlBuffer;
-import me.cortex.voxy.client.core.rendering.util.DownloadStream;
-import me.cortex.voxy.common.util.MemoryBuffer;
-import me.cortex.voxy.common.util.Pair;
-import me.cortex.voxy.common.util.TrackedObject;
-import org.lwjgl.system.MemoryUtil;
-
-import java.util.Arrays;
-import java.util.function.Consumer;
-
-import static org.lwjgl.opengl.ARBTimerQuery.GL_TIMESTAMP;
-import static org.lwjgl.opengl.ARBTimerQuery.glQueryCounter;
-import static org.lwjgl.opengl.GL11.glFinish;
-import static org.lwjgl.opengl.GL11.glFlush;
-import static org.lwjgl.opengl.GL15.glDeleteQueries;
-import static org.lwjgl.opengl.GL15.glGenQueries;
-import static org.lwjgl.opengl.GL15C.*;
-import static org.lwjgl.opengl.GL33.glGetQueryObjecti64;
-import static org.lwjgl.opengl.GL42.glMemoryBarrier;
-import static org.lwjgl.opengl.GL44.GL_QUERY_RESULT_NO_WAIT;
-import static org.lwjgl.opengl.GL45.glGetQueryBufferObjectui64v;
-
-public class GPUTiming {
-    public static GPUTiming INSTANCE = new GPUTiming();
-
-    private final GlTimestampQuerySet timingSet = new GlTimestampQuerySet();
-
-    public void marker() {
-        this.timingSet.capture(0);
-    }
-
-    public void tick() {
-        this.timingSet.download((meta,data)->{
-            long current = data[0];
-            for (int i = 1; i < meta.length; i++) {
-                long next = data[i];
-                long delta = next - current;
-                //System.out.println(delta);
-                current = next;
-            }
-        });
-        this.timingSet.tick();
-    }
-
-    public void free() {
-        this.timingSet.free();
-    }
-
-    public interface TimingDataConsumer {
-        void accept(int[] metadata, long[] timings);
-    }
-    private static final class GlTimestampQuerySet extends TrackedObject {
-        private record InflightRequest(int[] queries, int[] meta, TimingDataConsumer callback) {
-            private boolean callbackIfReady(IntArrayFIFOQueue queryPool) {
-                boolean ready = glGetQueryObjecti(this.queries[this.queries.length-1], GL_QUERY_RESULT_AVAILABLE) == GL_TRUE;
-                if (!ready) {
-                    return false;
-                }
-                long[] results = new long[this.queries.length];
-                for (int i = 0; i < this.queries.length; i++) {
-                    results[i] = glGetQueryObjecti64(this.queries[i], GL_QUERY_RESULT);
-                    queryPool.enqueue(this.queries[i]);
-                }
-                this.callback.accept(this.meta, results);
-                return true;
-            }
-        }
-        private final IntArrayFIFOQueue POOL = new IntArrayFIFOQueue();
-        private final ObjectArrayFIFOQueue<InflightRequest> INFLIGHT = new ObjectArrayFIFOQueue();
-
-        private final int[] queries = new int[64];
-        private final int[] metadata = new int[64];
-        private int index;
-
-
-        public void capture(int metadata) {
-            if (this.index > this.metadata.length) {
-                throw new IllegalStateException();
-            }
-            int slot = this.index++;
-            this.metadata[slot] = metadata;
-            int query = this.getQuery();
-            glQueryCounter(query, GL_TIMESTAMP);
-            this.queries[slot] = query;
-
-        }
-
-        public void download(TimingDataConsumer consumer) {
-            var queries = Arrays.copyOf(this.queries, this.index);
-            var metadata = Arrays.copyOf(this.metadata, this.index);
-            this.index = 0;
-            this.INFLIGHT.enqueue(new InflightRequest(queries, metadata, consumer));
-        }
-
-        public void tick() {
-            while (!INFLIGHT.isEmpty()) {
-                if (INFLIGHT.first().callbackIfReady(POOL)) {
-                    INFLIGHT.dequeue();
-                } else {
-                    break;
-                }
-            }
-        }
-
-        private int getQuery() {
-            if (POOL.isEmpty()) {
-                return glGenQueries();
-            } else {
-                return POOL.dequeueInt();
-            }
-        }
-
-        @Override
-        public void free() {
-            super.free0();
-            while (!POOL.isEmpty()) {
-                glDeleteQueries(POOL.dequeueInt());
-            }
-            while (!INFLIGHT.isEmpty()) {
-                glDeleteQueries(INFLIGHT.dequeue().queries);
-            }
-        }
-    }
-    /*
-    private static final class GlTimestampQuerySet extends TrackedObject {
-        private final int query = glGenQueries();
-        public final GlBuffer store;
-        public final int[] metadata;
-        public int index;
-        public GlTimestampQuerySet(int maxCount) {
-            this.store = new GlBuffer(maxCount*8L);
-            this.metadata = new int[maxCount];
-        }
-
-        public void capture(int metadata) {
-            if (this.index>this.metadata.length) {
-                throw new IllegalStateException();
-            }
-            int slot = this.index++;
-            this.metadata[slot] = metadata;
-            glQueryCounter(this.query, GL_TIMESTAMP);//This should be gpu side, so should be fast
-            glFinish();
-            glGetQueryBufferObjectui64v(this.query, this.store.id, GL_QUERY_RESULT_NO_WAIT, slot*8L);
-            glMemoryBarrier(-1);
-        }
-
-        public void download(TimingDataConsumer consumer) {
-            var meta = Arrays.copyOf(this.metadata, this.index);
-            this.index = 0;
-            //DownloadStream.INSTANCE.download(this.store, buffer->consumer.accept(meta, buffer));
-        }
-
-        @Override
-        public void free() {
-            super.free0();
-            glDeleteQueries(this.query);
-            this.store.free();
-        }
-    }*/
-}

src/main/java/me/cortex/voxy/client/core/util/IrisUtil.java

@@ -1,26 +1,11 @@
 package me.cortex.voxy.client.core.util;
 
-import me.cortex.voxy.client.core.VoxyRenderSystem;
-import me.cortex.voxy.client.core.rendering.Viewport;
-import net.caffeinemc.mods.sodium.client.render.chunk.ChunkRenderMatrices;
-import net.caffeinemc.mods.sodium.client.util.FogParameters;
 import net.fabricmc.loader.api.FabricLoader;
-import net.irisshaders.iris.Iris;
-import net.irisshaders.iris.api.v0.IrisApi;
-import net.irisshaders.iris.gl.IrisRenderSystem;
 import net.irisshaders.iris.shadows.ShadowRenderer;
+import org.spongepowered.asm.mixin.Unique;
 
 public class IrisUtil {
-    public record CapturedViewportParameters(ChunkRenderMatrices matrices, FogParameters parameters, double x, double y, double z) {
+    private static final boolean IRIS_INSTALLED = FabricLoader.getInstance().isModLoaded("iris");
-        public Viewport<?> apply(VoxyRenderSystem vrs) {
-            return vrs.setupViewport(this.matrices, this.parameters, this.x, this.y, this.z);
-        }
-    }
-
-    public static CapturedViewportParameters CAPTURED_VIEWPORT_PARAMETERS;
-
-    public static final boolean IRIS_INSTALLED = FabricLoader.getInstance().isModLoaded("iris");
-    public static final boolean SHADER_SUPPORT = true;//System.getProperty("voxy.enableExperimentalIrisPipeline", "false").equalsIgnoreCase("true");
 
 
     private static boolean irisShadowActive0() {
@@ -30,28 +15,4 @@ public class IrisUtil {
     public static boolean irisShadowActive() {
         return IRIS_INSTALLED && irisShadowActive0();
     }
-
-    public static void clearIrisSamplers() {
-        if (IRIS_INSTALLED) clearIrisSamplers0();
-    }
-
-    private static void clearIrisSamplers0() {
-        for (int i = 0; i < 16; i++) {
-            IrisRenderSystem.bindSamplerToUnit(i, 0);
-        }
-    }
-
-    private static boolean irisShaderPackEnabled0() {
-        return Iris.isPackInUseQuick();
-    }
-
-    public static boolean irisShaderPackEnabled() {
-        return IRIS_INSTALLED && irisShaderPackEnabled0();
-    }
-    public static void disableIrisShaders() {
-        if(IRIS_INSTALLED) disableIrisShaders0();
-    }
-    private static void disableIrisShaders0() {
-        IrisApi.getInstance().getConfig().setShadersEnabledAndApply(false);//Disable shaders
-    }
 }

src/main/java/me/cortex/voxy/client/iris/IGetIrisVoxyPipelineData.java

@@ -1,5 +0,0 @@
-package me.cortex.voxy.client.iris;
-
-public interface IGetIrisVoxyPipelineData {
-    IrisVoxyRenderPipelineData voxy$getPipelineData();
-}

src/main/java/me/cortex/voxy/client/iris/IGetVoxyPatchData.java

@@ -1,5 +0,0 @@
-package me.cortex.voxy.client.iris;
-
-public interface IGetVoxyPatchData {
-    IrisShaderPatch voxy$getPatchData();
-}

src/main/java/me/cortex/voxy/client/iris/IrisShaderPatch.java

@@ -1,330 +0,0 @@
-package me.cortex.voxy.client.iris;
-
-import com.google.gson.*;
-import com.google.gson.annotations.JsonAdapter;
-import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap;
-import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-import me.cortex.voxy.client.core.util.IrisUtil;
-import me.cortex.voxy.common.Logger;
-import net.irisshaders.iris.api.v0.IrisApi;
-import net.irisshaders.iris.shaderpack.ShaderPack;
-import net.irisshaders.iris.shaderpack.include.AbsolutePackPath;
-
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Type;
-import java.util.function.Function;
-import java.util.function.IntSupplier;
-
-import static org.lwjgl.opengl.GL11.*;
-import static org.lwjgl.opengl.GL33.*;
-import static org.lwjgl.opengl.GL40.glBlendFuncSeparatei;
-
-public class IrisShaderPatch {
-    public static final int VERSION = ((IntSupplier)()->1).getAsInt();
-
-    public static final boolean IMPERSONATE_DISTANT_HORIZONS = System.getProperty("voxy.impersonateDHShader", "false").equalsIgnoreCase("true");
-
-
-
-    private static final class SSBODeserializer implements JsonDeserializer<Int2ObjectOpenHashMap<String>> {
-        @Override
-        public Int2ObjectOpenHashMap<String> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-            Int2ObjectOpenHashMap<String> ret = new Int2ObjectOpenHashMap<>();
-            if (json==null) return null;
-            try {
-                for (var entry : json.getAsJsonObject().entrySet()) {
-                    ret.put(Integer.parseInt(entry.getKey()), entry.getValue().getAsString());
-                }
-            } catch (Exception e) {
-                Logger.error(e);
-            }
-            return ret;
-        }
-    }
-    private static final class SamplerDeserializer implements JsonDeserializer<Object2ObjectLinkedOpenHashMap<String, String>> {
-        @Override
-        public Object2ObjectLinkedOpenHashMap<String, String> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-            Object2ObjectLinkedOpenHashMap<String, String> ret = new Object2ObjectLinkedOpenHashMap<>();
-            if (json==null) return null;
-            try {
-                if (json.isJsonArray()) {
-                    for (var entry : json.getAsJsonArray()) {
-                        var name = entry.getAsString();
-                        var type = "sampler2D";
-                        if (name.matches("shadowtex")) {
-                            type = "sampler2DShadow";
-                        }
-                        ret.put(name, type);
-                    }
-                } else {
-                    for (var entry : json.getAsJsonObject().entrySet()) {
-                        String type = "sampler2D";
-                        if (entry.getValue().isJsonNull()) {
-                            if (entry.getKey().matches("shadowtex")) {
-                                type = "sampler2DShadow";
-                            }
-                        } else {
-                            type = entry.getValue().getAsString();
-                        }
-                        ret.put(entry.getKey(), type);
-                    }
-                }
-            } catch (Exception e) {
-                Logger.error(e);
-            }
-            return ret;
-        }
-    }
-
-    public record BlendState(int buffer, boolean off, int sRBG, int dRGb, int sA, int dA) {
-        public static BlendState ALL_OFF = new BlendState(-1, true, 0,0,0,0);
-    }
-
-
-    private static final class BlendStateDeserializer implements JsonDeserializer<Int2ObjectMap<BlendState>> {
-        private static int parseType(String type) {
-            type = type.toUpperCase();
-            return switch (type) {
-                case "GL_ZERO" -> GL_ZERO;
-                case "GL_ONE" -> GL_ONE;
-                case "GL_SRC_COLOR" -> GL_SRC_COLOR;
-                case "GL_ONE_MINUS_SRC_COLOR" -> GL_ONE_MINUS_SRC_COLOR;
-                case "GL_SRC_ALPHA" -> GL_SRC_ALPHA;
-                case "GL_ONE_MINUS_SRC_ALPHA" -> GL_ONE_MINUS_SRC_ALPHA;
-                case "GL_DST_ALPHA" -> GL_DST_ALPHA;
-                case "GL_ONE_MINUS_DST_ALPHA" -> GL_ONE_MINUS_DST_ALPHA;
-                case "GL_DST_COLOR" -> GL_DST_COLOR;
-                case "GL_ONE_MINUS_DST_COLOR" -> GL_ONE_MINUS_DST_COLOR;
-                case "GL_SRC_ALPHA_SATURATE" -> GL_SRC_ALPHA_SATURATE;
-                case "GL_SRC1_COLOR" -> GL_SRC1_COLOR;
-                case "GL_ONE_MINUS_SRC1_COLOR" -> GL_ONE_MINUS_SRC1_COLOR;
-                case "GL_ONE_MINUS_SRC1_ALPHA" -> GL_ONE_MINUS_SRC1_ALPHA;
-                default -> -1;
-            };
-        }
-        @Override
-        public Int2ObjectMap<BlendState> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-            if (json==null) return null;
-            Int2ObjectMap<BlendState> ret = new Int2ObjectOpenHashMap<>();
-            try {
-                if (json.isJsonPrimitive()) {
-                    if (json.getAsString().equalsIgnoreCase("off")) {
-                        ret.put(-1, BlendState.ALL_OFF);
-                        return ret;
-                    }
-                } else if (json.isJsonObject()) {
-                    for (var entry : json.getAsJsonObject().entrySet()) {
-                        int buffer = Integer.parseInt(entry.getKey());
-                        BlendState state;
-                        var val = entry.getValue();
-                        if (val.isJsonArray()) {
-                            int[] v = val.getAsJsonArray().asList().stream().mapToInt(a->parseType(a.getAsString())).toArray();
-                            state = new BlendState(buffer, false, v[0], v[1], v[2], v[3]);
-                        } else if (val.isJsonPrimitive()) {
-                            if (val.getAsString().equalsIgnoreCase("off")) {
-                                state = new BlendState(buffer, true, 0,0,0,0);
-                            } else {
-                                state = new BlendState(buffer, true, -1,-1,-1,-1);
-                            }
-                        } else {
-                            state = null;
-                        }
-                        ret.put(buffer, state);
-                    }
-                    return ret;
-                }
-            } catch (Exception e) {
-                Logger.error(e);
-            }
-            Logger.error("Failed to parse blend state: " + json);
-            return ret;
-        }
-    }
-
-    private static class PatchGson {
-        public int version;//TODO maybe replace with semver?
-        public int[] opaqueDrawBuffers;
-        public int[] translucentDrawBuffers;
-        public String[] uniforms;
-        @JsonAdapter(SamplerDeserializer.class)
-        public Object2ObjectLinkedOpenHashMap<String, String> samplers;
-        public String opaquePatchData;
-        public String translucentPatchData;
-        @JsonAdapter(SSBODeserializer.class)
-        public Int2ObjectOpenHashMap<String> ssbos;
-        @JsonAdapter(BlendStateDeserializer.class)
-        public Int2ObjectOpenHashMap<BlendState> blending;
-        public String taaOffset;
-        public boolean excludeLodsFromVanillaDepth;
-        public float[] renderScale;
-        public boolean useViewportDims;
-        public boolean checkValid() {
-            return this.opaqueDrawBuffers != null && this.translucentDrawBuffers != null && this.uniforms != null && this.opaquePatchData != null;
-        }
-    }
-
-
-
-    private final PatchGson patchData;
-    private final ShaderPack pack;
-    private final Int2ObjectMap<String> ssbos;
-    private IrisShaderPatch(PatchGson patchData, ShaderPack pack) {
-        this.patchData = patchData;
-        this.pack = pack;
-
-        if (patchData.ssbos == null) {
-            this.ssbos = new Int2ObjectOpenHashMap<>();
-        } else {
-            this.ssbos = patchData.ssbos;
-        }
-    }
-
-    public boolean useViewportDims() {
-        return this.patchData.useViewportDims;
-    }
-
-    public Int2ObjectMap<String> getSSBOs() {
-        return new Int2ObjectLinkedOpenHashMap<>(this.ssbos);
-    }
-    public String getPatchOpaqueSource() {
-        return this.patchData.opaquePatchData;
-    }
-    public String getPatchTranslucentSource() {
-        return this.patchData.translucentPatchData;
-    }
-    public String getTAAShift() {
-        return this.patchData.taaOffset == null?"{return vec2(0.0);}":this.patchData.taaOffset;
-    }
-    public String[] getUniformList() {
-        return this.patchData.uniforms;
-    }
-    public Object2ObjectLinkedOpenHashMap<String, String> getSamplerSet() {
-        return this.patchData.samplers;
-    }
-
-
-    public int[] getOpqaueTargets() {
-        return this.patchData.opaqueDrawBuffers;
-    }
-
-    public int[] getTranslucentTargets() {
-        return this.patchData.translucentDrawBuffers;
-    }
-
-    public boolean emitToVanillaDepth() {
-        return !this.patchData.excludeLodsFromVanillaDepth;
-    }
-
-    public float[] getRenderScale() {
-        if (this.patchData.renderScale == null || this.patchData.renderScale.length==0) {
-            return new float[]{1,1};
-        }
-        if (this.patchData.renderScale.length == 1) {
-            return new float[]{this.patchData.renderScale[0],this.patchData.renderScale[0]};
-        }
-        return new float[]{Math.max(0.01f,this.patchData.renderScale[0]),Math.max(0.01f,this.patchData.renderScale[1])};
-    }
-
-    public Runnable createBlendSetup() {
-        if (this.patchData.blending == null || this.patchData.blending.isEmpty()) {
-            return ()->{};//No blending change
-        }
-        return ()->{
-            final var BS = this.patchData.blending;
-            //Set inital state
-            var init = BS.getOrDefault(-1, null);
-            if (init != null) {
-                if (init.off) {
-                    glDisable(GL_BLEND);
-                } else {
-                    glEnable(GL_BLEND);
-                    glBlendFuncSeparate(init.sRBG, init.dRGb, init.sA, init.dA);
-                }
-            }
-            for (var entry:BS.int2ObjectEntrySet()) {
-                if (entry.getIntKey() == -1) continue;
-                final var s = entry.getValue();
-                if (s.off) {
-                    glDisablei(GL_BLEND, s.buffer);
-                } else {
-                    glEnablei(GL_BLEND, s.buffer);
-                    glBlendFuncSeparatei(s.buffer, s.sRBG, s.dRGb, s.sA, s.dA);
-                }
-            }
-        };
-    }
-
-    private static final Gson GSON = new GsonBuilder()
-            .excludeFieldsWithModifiers(Modifier.PRIVATE)
-            .setStrictness(Strictness.LENIENT)
-            .create();
-
-    public static IrisShaderPatch makePatch(ShaderPack ipack, AbsolutePackPath directory, Function<AbsolutePackPath, String> sourceProvider) {
-        String voxyPatchData = sourceProvider.apply(directory.resolve("voxy.json"));
-        if (voxyPatchData == null) {//No voxy patch data in shaderpack
-            return null;
-        }
-
-        //A more graceful exit on blank string
-        if (voxyPatchData.isBlank()) {
-            return null;
-        }
-
-        //Escape things
-        voxyPatchData = voxyPatchData.replace("\\", "\\\\");
-
-        PatchGson patchData = null;
-        try {
-            //TODO: basicly find any "commented out" quotation marks and escape them (if the line, when stripped starts with a // or /* then escape all quotation marks in that line)
-            {
-                StringBuilder builder = new StringBuilder(voxyPatchData.length());
-                //Rebuild the patch, replacing commented out " with \"
-                for (var line : voxyPatchData.split("\n")) {
-                    int idx = line.indexOf("//");
-                    if (idx != -1) {
-                        builder.append(line, 0, idx);
-                        builder.append(line.substring(idx).replace("\"","\\\""));
-                    } else {
-                        builder.append(line);
-                    }
-                    builder.append("\n");
-                }
-                voxyPatchData = builder.toString();
-            }
-            patchData = GSON.fromJson(voxyPatchData, PatchGson.class);
-            if (patchData == null) {
-                return null;
-            }
-
-            {//Inject data from the auxilery files if they are present
-                var opaque = sourceProvider.apply(directory.resolve("voxy_opaque.glsl"));
-                if (opaque != null) {
-                    patchData.opaquePatchData = opaque;
-                }
-                var translucent = sourceProvider.apply(directory.resolve("voxy_translucent.glsl"));
-                if (translucent != null) {
-                    patchData.translucentPatchData = translucent;
-                }
-            }
-
-            if (!patchData.checkValid()) {
-                throw new IllegalStateException("voxy json patch not valid: " + voxyPatchData);
-            }
-        } catch (Exception e) {
-            patchData = null;
-            Logger.error("Failed to parse patch data gson",e);
-            throw new ShaderLoadError("Failed to parse patch data gson",e);
-        }
-        if (patchData == null) {
-            return null;
-        }
-        if (patchData.version != VERSION) {
-            Logger.error("Shader has voxy patch data, but patch version is incorrect. expected " + VERSION + " got "+patchData.version);
-            throw new IllegalStateException("Shader version mismatch expected " + VERSION + " got "+patchData.version);
-        }
-        return new IrisShaderPatch(patchData, ipack);
-    }
-}

src/main/java/me/cortex/voxy/client/iris/IrisVoxyRenderPipelineData.java

@@ -1,445 +0,0 @@
-package me.cortex.voxy.client.iris;
-
-import com.google.common.collect.ImmutableSet;
-import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import kroppeb.stareval.function.FunctionReturn;
-import kroppeb.stareval.function.Type;
-import me.cortex.voxy.client.core.IrisVoxyRenderPipeline;
-import me.cortex.voxy.client.mixin.iris.CustomUniformsAccessor;
-import me.cortex.voxy.client.mixin.iris.IrisRenderingPipelineAccessor;
-import me.cortex.voxy.common.Logger;
-import net.irisshaders.iris.gl.buffer.ShaderStorageBufferHolder;
-import net.irisshaders.iris.gl.image.ImageHolder;
-import net.irisshaders.iris.gl.sampler.GlSampler;
-import net.irisshaders.iris.gl.sampler.SamplerHolder;
-import net.irisshaders.iris.gl.state.ValueUpdateNotifier;
-import net.irisshaders.iris.gl.texture.InternalTextureFormat;
-import net.irisshaders.iris.gl.texture.TextureType;
-import net.irisshaders.iris.gl.uniform.*;
-import net.irisshaders.iris.pipeline.IrisRenderingPipeline;
-import net.irisshaders.iris.targets.RenderTarget;
-import net.irisshaders.iris.targets.RenderTargets;
-import net.irisshaders.iris.uniforms.custom.CustomUniforms;
-import net.irisshaders.iris.uniforms.custom.cached.*;
-import org.joml.*;
-import org.lwjgl.system.MemoryUtil;
-
-import java.util.*;
-import java.util.function.IntConsumer;
-import java.util.function.IntSupplier;
-import java.util.function.LongConsumer;
-import java.util.stream.Collectors;
-
-import static org.lwjgl.opengl.ARBDirectStateAccess.glBindTextureUnit;
-import static org.lwjgl.opengl.ARBUniformBufferObject.glBindBufferBase;
-import static org.lwjgl.opengl.GL33C.glBindSampler;
-import static org.lwjgl.opengl.GL43C.GL_SHADER_STORAGE_BUFFER;
-
-public class IrisVoxyRenderPipelineData {
-    public IrisVoxyRenderPipeline thePipeline;
-    public final int[] opaqueDrawTargets;
-    public final int[] translucentDrawTargets;
-    private final String opaquePatch;
-    private final String translucentPatch;
-    private final StructLayout uniforms;
-    private final Runnable blendingSetup;
-    private final ImageSet imageSet;
-    private final SSBOSet ssboSet;
-    public final boolean renderToVanillaDepth;
-    public final float[] resolutionScale;
-    public final String TAA;
-    public final boolean useViewportDims;
-
-    private IrisVoxyRenderPipelineData(IrisShaderPatch patch, int[] opaqueDrawTargets, int[] translucentDrawTargets, StructLayout uniformSet, Runnable blendingSetup, ImageSet imageSet, SSBOSet ssboSet) {
-        this.opaqueDrawTargets = opaqueDrawTargets;
-        this.translucentDrawTargets = translucentDrawTargets;
-        this.opaquePatch = patch.getPatchOpaqueSource();
-        this.translucentPatch = patch.getPatchTranslucentSource();
-        this.uniforms = uniformSet;
-        this.blendingSetup = blendingSetup;
-        this.imageSet = imageSet;
-        this.ssboSet = ssboSet;
-        this.renderToVanillaDepth = patch.emitToVanillaDepth();
-        this.TAA = patch.getTAAShift();
-        this.resolutionScale = patch.getRenderScale();
-        this.useViewportDims = patch.useViewportDims();
-    }
-
-    public SSBOSet getSsboSet() {
-        return this.ssboSet;
-    }
-
-    public ImageSet getImageSet() {
-        return this.imageSet;
-    }
-
-    public StructLayout getUniforms() {
-        return this.uniforms;
-    }
-    public Runnable getBlender() {
-        return this.blendingSetup;
-    }
-    public String opaqueFragPatch() {
-        return this.opaquePatch;
-    }
-    public String translucentFragPatch() {
-        return this.translucentPatch;
-    }
-
-
-    public static IrisVoxyRenderPipelineData buildPipeline(IrisRenderingPipeline ipipe, IrisShaderPatch patch, CustomUniforms cu, ShaderStorageBufferHolder ssboHolder) {
-        var uniforms = createUniformLayoutStructAndUpdater(createUniformSet(cu, patch));
-
-        var imageSet = createImageSet(ipipe, patch);
-
-        var ssboSet = createSSBOLayouts(patch.getSSBOs(), ssboHolder);
-
-        var opaqueDrawTargets = getDrawBuffers(patch.getOpqaueTargets(), ipipe.getFlippedAfterPrepare(), ((IrisRenderingPipelineAccessor)ipipe).getRenderTargets());
-        var translucentDrawTargets = getDrawBuffers(patch.getTranslucentTargets(), ipipe.getFlippedAfterPrepare(), ((IrisRenderingPipelineAccessor)ipipe).getRenderTargets());
-
-
-
-        //TODO: need to transform the string patch with the uniform decleration aswell as sampler declerations
-        return new IrisVoxyRenderPipelineData(patch, opaqueDrawTargets, translucentDrawTargets, uniforms, patch.createBlendSetup(), imageSet, ssboSet);
-    }
-
-    private static int[] getDrawBuffers(int[] targets, ImmutableSet<Integer> stageWritesToAlt, RenderTargets rt) {
-        int[] targetTextures = new int[targets.length];
-        for(int i = 0; i < targets.length; i++) {
-            RenderTarget target = rt.getOrCreate(targets[i]);
-            int textureId = stageWritesToAlt.contains(targets[i]) ? target.getAltTexture() : target.getMainTexture();
-            targetTextures[i] = textureId;
-        }
-        return targetTextures;
-    }
-
-    public record StructLayout(int size, String layout, LongConsumer updater) {}
-    private static StructLayout createUniformLayoutStructAndUpdater(CachedUniform[] uniforms) {
-        if (uniforms.length == 0) {
-            return null;
-        }
-
-        List<CachedUniform>[] ordering = new List[]{new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>()};
-
-        //Creates an optimial struct layout for the uniforms
-        for (var uniform : uniforms) {
-            int order = getUniformOrdering(Type.convert(uniform.getType()));
-            ordering[order].add(uniform);
-        }
-
-        //Emit the ordering, note this is not optimial, but good enough, e.g. if have even number of align 2, emit that after align 4
-        int pos = 0;
-        Int2ObjectLinkedOpenHashMap<CachedUniform> layout = new Int2ObjectLinkedOpenHashMap<>();
-        for (var uniform : ordering[0]) {//Emit exact align 4
-            layout.put(pos, uniform); pos += getSizeAndAlignment(Type.convert(uniform.getType()))>>5;
-        }
-        if (!ordering[1].isEmpty() && (ordering[1].size()&1)==0) {
-            //Emit all the align 2 as there is an even number of them
-            for (var uniform : ordering[1]) {
-                layout.put(pos, uniform); pos += getSizeAndAlignment(Type.convert(uniform.getType()))>>5;
-            }
-            ordering[1].clear();
-        }
-        //Emit align 3
-        for (var uniform : ordering[2]) {//Emit size odd, alignment must be 4
-            layout.put(pos, uniform); pos += getSizeAndAlignment(Type.convert(uniform.getType()))>>5;
-            //We must get a size 1 to pad to align 4
-            if (!ordering[3].isEmpty()) {//Size 1
-                uniform = ordering[3].removeFirst();
-                layout.put(pos, uniform); pos += getSizeAndAlignment(Type.convert(uniform.getType()))>>5;
-            } else {//Padding must be injected
-                pos += 1;
-            }
-        }
-
-        //Emit align 2
-        for (var uniform : ordering[1]) {
-            layout.put(pos, uniform); pos += getSizeAndAlignment(Type.convert(uniform.getType()))>>5;
-        }
-
-        //Emit align 1
-        for (var uniform : ordering[3]) {
-            layout.put(pos, uniform); pos += getSizeAndAlignment(Type.convert(uniform.getType()))>>5;
-        }
-
-        if (layout.size()!=uniforms.length) {
-            throw new IllegalStateException();
-        }
-
-        //We have our ordering and aligned offsets, generate an updater aswell as the layout
-
-        String structLayout;
-        {
-            StringBuilder struct = new StringBuilder("{\n");
-            for (var pair : layout.int2ObjectEntrySet()) {
-                struct.append("\t").append(pair.getValue().getType().toString()).append(" ").append(pair.getValue().getName()).append(";\n");
-            }
-            struct.append("}");
-            structLayout = struct.toString();
-        }
-
-        LongConsumer updater;
-        {
-            FunctionReturn cacheRetObj = new FunctionReturn();
-            LongConsumer[] updaters = new LongConsumer[uniforms.length];
-            int i = 0;
-            for (var pair : layout.int2ObjectEntrySet()) {
-                updaters[i++] = createWriter(pair.getIntKey()*4L, cacheRetObj, pair.getValue());
-            }
-
-            updater = ptr -> {
-                for (var u : updaters) {
-                    u.accept(ptr);
-                }
-            };//Writes all the uniforms to the locations
-        }
-        return new StructLayout(pos*4, structLayout, updater);//*4 since each slot is 4 bytes
-    }
-
-    private static LongConsumer createWriter(long offset, FunctionReturn ret, CachedUniform uniform) {
-        if (uniform instanceof BooleanCachedUniform bcu) {
-            return ptr->{ptr += offset;
-                bcu.writeTo(ret);
-                MemoryUtil.memPutInt(ptr, ret.booleanReturn?1:0);
-            };
-        } else if (uniform instanceof FloatCachedUniform fcu) {
-            return ptr->{ptr += offset;
-                fcu.writeTo(ret);
-                MemoryUtil.memPutFloat(ptr, ret.floatReturn);
-            };
-        } else if (uniform instanceof IntCachedUniform icu) {
-            return ptr->{ptr += offset;
-                icu.writeTo(ret);
-                MemoryUtil.memPutInt(ptr, ret.intReturn);
-            };
-        } else if (uniform instanceof Float2VectorCachedUniform v2fcu) {
-            return ptr->{ptr += offset;
-                v2fcu.writeTo(ret);
-                ((Vector2f)ret.objectReturn).getToAddress(ptr);
-            };
-        } else if (uniform instanceof Float3VectorCachedUniform v3fcu) {
-            return ptr->{ptr += offset;
-                v3fcu.writeTo(ret);
-                ((Vector3f)ret.objectReturn).getToAddress(ptr);
-            };
-        } else if (uniform instanceof Float4VectorCachedUniform v4fcu) {
-            return ptr->{ptr += offset;
-                v4fcu.writeTo(ret);
-                ((Vector4f)ret.objectReturn).getToAddress(ptr);
-            };
-        } else if (uniform instanceof Int2VectorCachedUniform v2icu) {
-            return ptr->{ptr += offset;
-                v2icu.writeTo(ret);
-                ((Vector2i)ret.objectReturn).getToAddress(ptr);
-            };
-        } else if (uniform instanceof Int3VectorCachedUniform v3icu) {
-            return ptr->{ptr += offset;
-                v3icu.writeTo(ret);
-                ((Vector3i)ret.objectReturn).getToAddress(ptr);
-            };
-        } else if (uniform instanceof Float4MatrixCachedUniform f4mcu) {
-            return ptr->{ptr += offset;
-                f4mcu.writeTo(ret);
-                ((Matrix4f)ret.objectReturn).getToAddress(ptr);
-            };
-        } else {
-            throw new IllegalStateException("Unknown uniform type " + uniform.getClass().getName());
-        }
-    }
-
-
-    private static int P(int size, int align) {
-        return size<<5|align;
-    }
-    private static int getSizeAndAlignment(UniformType type) {
-        return switch (type) {
-            case INT, FLOAT -> P(1,1);//Size, Alignment
-            case MAT3 -> P(4+4+3,4);//is funky as each row is a vec3 padded to a vec4
-            case MAT4 -> P(4*4,4);
-            case VEC2, VEC2I -> P(2,2);
-            case VEC3, VEC3I -> P(3,4);
-            case VEC4, VEC4I -> P(4,4);
-        };
-    }
-    private static int getUniformOrdering(UniformType type) {
-        return switch (type) {
-            case MAT4, VEC4, VEC4I -> 0;
-            case VEC2, VEC2I -> 1;
-            case VEC3, VEC3I, MAT3 -> 2;
-            case INT, FLOAT -> 3;
-        };
-    }
-
-    private static CachedUniform[] createUniformSet(CustomUniforms cu, IrisShaderPatch patch) {
-        //This is a fking awful hack... but it works thinks
-        LocationalUniformHolder uniformBuilder = new LocationalUniformHolder() {
-            @Override
-            public LocationalUniformHolder addUniform(UniformUpdateFrequency uniformUpdateFrequency, Uniform uniform) {
-                return this;
-            }
-
-            @Override
-            public OptionalInt location(String uniformName, UniformType uniformType) {
-                //Yes am aware how performant inefficent this is... just dont care tbh since is on setup and is small
-                var names = patch.getUniformList();
-                for (int i = 0; i < names.length; i++) {
-                    if (names[i].equals(uniformName)) {
-                        return OptionalInt.of(i);//Have a base uniform offset of 10
-                    }
-                }
-                return OptionalInt.empty();
-            }
-
-            @Override
-            public UniformHolder externallyManagedUniform(String s, UniformType uniformType) {
-                return null;
-            }
-        };
-        cu.assignTo(uniformBuilder);
-        cu.mapholderToPass(uniformBuilder, patch);
-
-        CachedUniform[] uniforms = new CachedUniform[patch.getUniformList().length];
-        ((CustomUniformsAccessor)cu).getLocationMap().get(patch).object2IntEntrySet().forEach(entry->uniforms[entry.getIntValue()] = entry.getKey());
-        int i = 0;
-        int j = 0;
-        for (var uniform : uniforms) {
-            if (uniform == null) {
-                Logger.error("Unknown uniform at location "+j + " skipping");
-            } else {
-                uniforms[i++] = uniform;//This shuffles the uniforms down till its compacted
-            }
-            j++;
-        }
-        //In _theory_ this should work?
-        return Arrays.copyOf(uniforms, i);
-    }
-
-    private record TextureWSampler(String name, IntSupplier texture, int sampler) { }
-    public record ImageSet(String layout, IntConsumer bindingFunction) {
-
-    }
-    private static ImageSet createImageSet(IrisRenderingPipeline ipipe, IrisShaderPatch patch) {
-        var samplerDataSet = patch.getSamplerSet();
-        Set<String> samplerNameSet = new LinkedHashSet<>(samplerDataSet.keySet());
-        if (samplerNameSet.isEmpty()) return null;
-        Set<TextureWSampler> samplerSet = new LinkedHashSet<>();
-        SamplerHolder samplerBuilder = new SamplerHolder() {
-            @Override
-            public boolean hasSampler(String s) {
-                return samplerNameSet.contains(s);
-            }
-
-            public boolean hasSampler(String... names) {
-                for (var name : names) {
-                    if (samplerNameSet.contains(name)) return true;
-                }
-                return false;
-            }
-
-            private String name(String... names) {
-                for (var name : names) {
-                    if (samplerNameSet.contains(name)) return name;
-                }
-                return null;
-            }
-
-            @Override
-            public boolean addDefaultSampler(TextureType type, IntSupplier texture, ValueUpdateNotifier notifier, GlSampler sampler, String... names) {
-                Logger.error("Unsupported default sampler");
-                return false;
-            }
-
-            @Override
-            public boolean addDynamicSampler(TextureType type, IntSupplier texture, GlSampler sampler, String... names) {
-                return this.addDynamicSampler(type, texture, null, sampler, names);
-            }
-
-            @Override
-            public boolean addDynamicSampler(TextureType type, IntSupplier texture, ValueUpdateNotifier notifier, GlSampler sampler, String... names) {
-                if (!this.hasSampler(names)) return false;
-                samplerSet.add(new TextureWSampler(this.name(names), texture, sampler!=null?sampler.getId():-1));
-                return true;
-            }
-
-            @Override
-            public void addExternalSampler(int texture, String... names) {
-                if (!this.hasSampler(names)) return;
-                samplerSet.add(new TextureWSampler(this.name(names), ()->texture, -1));
-            }
-        };
-
-        //Unsupported
-        ImageHolder imageBuilder = new ImageHolder() {
-            @Override
-            public boolean hasImage(String s) {
-                return false;
-            }
-
-            @Override
-            public void addTextureImage(IntSupplier intSupplier, InternalTextureFormat internalTextureFormat, String s) {
-
-            }
-        };
-
-        ipipe.addGbufferOrShadowSamplers(samplerBuilder, imageBuilder, ipipe::getFlippedAfterPrepare, false, true, true, false);
-
-        //samplerSet contains our samplers
-        if (samplerSet.size() != samplerNameSet.size()) {
-            Logger.error("Did not find all requested samplers. Found [" + samplerSet.stream().map(a->a.name).collect(Collectors.joining()) + "] expected " + samplerNameSet);
-        }
-
-        //TODO: generate a layout (defines) for all the samplers with the correct types
-
-        StringBuilder builder = new StringBuilder();
-        TextureWSampler[] samplers = new TextureWSampler[samplerSet.size()];
-        int i = 0;
-        for (var entry : samplerSet) {
-            samplers[i]=entry;
-
-            String samplerType = samplerDataSet.get(entry.name);
-            builder.append("layout(binding=(BASE_SAMPLER_BINDING_INDEX+").append(i).append(")) uniform ").append(samplerType).append(" ").append(entry.name).append(";\n");
-            i++;
-        }
-
-
-        IntConsumer bindingFunction = base->{
-            for (int j = 0; j < samplers.length; j++) {
-                int unit = j+base;
-                var ts = samplers[j];
-                glBindTextureUnit(unit, ts.texture.getAsInt());
-                if (ts.sampler != -1) {
-                    glBindSampler(unit, ts.sampler);
-                }//TODO: might need to bind sampler 0
-            }
-        };
-        return new ImageSet(builder.toString(), bindingFunction);
-    }
-
-    public record SSBOSet(String layout, IntConsumer bindingFunction){}
-    private record SSBOBinding(int irisIndex, int bindingOffset) {}
-    private static SSBOSet createSSBOLayouts(Int2ObjectMap<String> ssbos, ShaderStorageBufferHolder ssboStore) {
-        if (ssboStore == null) return null;//If there is no store, there cannot be any ssbos
-        if (ssbos.isEmpty()) return null;
-        String header = "";
-        if (ssbos.containsKey(-1)) header = ssbos.remove(-1);
-        StringBuilder builder = new StringBuilder(header);
-        builder.append("\n");
-        SSBOBinding[] bindings = new SSBOBinding[ssbos.size()];
-        int i = 0;
-        for (var entry : ssbos.int2ObjectEntrySet()) {
-            var val = entry.getValue();
-            bindings[i] = new SSBOBinding(entry.getIntKey(), i);
-            builder.append("layout(binding = (BUFFER_BINDING_INDEX_BASE+").append(i).append(")) restrict buffer IrisBufferBinding").append(i);
-            builder.append(" ").append(val).append(";\n");
-            i++;
-        }
-        //ssboStore.getBufferIndex()
-        IntConsumer bindingFunction = base->{
-            for (var binding : bindings) {
-                glBindBufferBase(GL_SHADER_STORAGE_BUFFER, base+binding.bindingOffset, ssboStore.getBufferIndex(binding.irisIndex));
-            }
-        };
-        return new SSBOSet(builder.toString(), bindingFunction);
-    }
-}

src/main/java/me/cortex/voxy/client/iris/ShaderLoadError.java

@@ -1,11 +0,0 @@
-package me.cortex.voxy.client.iris;
-
-public class ShaderLoadError extends RuntimeException {
-    public ShaderLoadError(String reason) {
-        super(reason);
-    }
-
-    public ShaderLoadError(String reason, Exception cause) {
-        super(reason, cause);
-    }
-}

src/main/java/me/cortex/voxy/client/iris/VoxySamplers.java

@@ -1,54 +0,0 @@
-package me.cortex.voxy.client.iris;
-
-import net.irisshaders.iris.gl.sampler.SamplerHolder;
-import net.irisshaders.iris.gl.texture.TextureType;
-import net.irisshaders.iris.pipeline.IrisRenderingPipeline;
-
-public class VoxySamplers {
-    public static void addSamplers(IrisRenderingPipeline pipeline, SamplerHolder samplers) {
-        var patchData = ((IGetVoxyPatchData)pipeline).voxy$getPatchData();
-        if (patchData != null) {
-            String[] opaqueNames = new String[]{"vxDepthTexOpaque"};
-            String[] translucentNames = new String[]{"vxDepthTexTrans"};
-
-            if (IrisShaderPatch.IMPERSONATE_DISTANT_HORIZONS) {
-                opaqueNames = new String[]{"vxDepthTexOpaque", "dhDepthTex1"};
-                translucentNames = new String[]{"vxDepthTexTrans", "dhDepthTex", "dhDepthTex0"};
-            }
-
-            //TODO replace ()->0 with the actual depth texture id
-            samplers.addDynamicSampler(TextureType.TEXTURE_2D, () -> {
-                var pipeData = ((IGetIrisVoxyPipelineData)pipeline).voxy$getPipelineData();
-                if (pipeData == null) {
-                    return 0;
-                }
-                if (pipeData.thePipeline == null) {
-                    return 0;
-                }
-
-                //In theory the first frame could be null
-                var dt = pipeData.thePipeline.fb.getDepthTex();
-                if (dt == null) {
-                    return 0;
-                }
-                return dt.id;
-            }, null, opaqueNames);
-
-            samplers.addDynamicSampler(TextureType.TEXTURE_2D, () -> {
-                var pipeData = ((IGetIrisVoxyPipelineData)pipeline).voxy$getPipelineData();
-                if (pipeData == null) {
-                    return 0;
-                }
-                if (pipeData.thePipeline == null) {
-                    return 0;
-                }
-                //In theory the first frame could be null
-                var dt = pipeData.thePipeline.fbTranslucent.getDepthTex();
-                if (dt == null) {
-                    return 0;
-                }
-                return dt.id;
-            }, null, translucentNames);
-        }
-    }
-}

src/main/java/me/cortex/voxy/client/iris/VoxyUniforms.java

@@ -1,106 +0,0 @@
-package me.cortex.voxy.client.iris;
-
-import me.cortex.voxy.client.config.VoxyConfig;
-import me.cortex.voxy.client.core.IGetVoxyRenderSystem;
-import net.irisshaders.iris.gl.uniform.UniformHolder;
-import net.minecraft.client.MinecraftClient;
-import org.joml.Matrix4f;
-import org.joml.Matrix4fc;
-
-import java.util.function.Supplier;
-
-import static net.irisshaders.iris.gl.uniform.UniformUpdateFrequency.PER_FRAME;
-
-public class VoxyUniforms {
-
-    public static Matrix4f getViewProjection() {//This is 1 frame late ;-; cries, since the update occurs _before_ the voxy render pipeline
-        var getVrs = (IGetVoxyRenderSystem) MinecraftClient.getInstance().worldRenderer;
-        if (getVrs == null || getVrs.getVoxyRenderSystem() == null) {
-            return new Matrix4f();
-        }
-        var vrs = getVrs.getVoxyRenderSystem();
-        return new Matrix4f(vrs.getViewport().MVP);
-    }
-
-    public static Matrix4f getModelView() {//This is 1 frame late ;-; cries, since the update occurs _before_ the voxy render pipeline
-        var getVrs = (IGetVoxyRenderSystem) MinecraftClient.getInstance().worldRenderer;
-        if (getVrs == null || getVrs.getVoxyRenderSystem() == null) {
-            return new Matrix4f();
-        }
-        var vrs = getVrs.getVoxyRenderSystem();
-        return new Matrix4f(vrs.getViewport().modelView);
-    }
-
-    public static Matrix4f getProjection() {//This is 1 frame late ;-; cries, since the update occurs _before_ the voxy render pipeline
-        var getVrs = (IGetVoxyRenderSystem) MinecraftClient.getInstance().worldRenderer;
-        if (getVrs == null || getVrs.getVoxyRenderSystem() == null) {
-            return new Matrix4f();
-        }
-        var vrs = getVrs.getVoxyRenderSystem();
-        var mat = vrs.getViewport().projection;
-        if (mat == null) {
-            return new Matrix4f();
-        }
-        return new Matrix4f(mat);
-    }
-
-    public static void addUniforms(UniformHolder uniforms) {
-        uniforms
-                .uniform1i(PER_FRAME, "vxRenderDistance", ()-> VoxyConfig.CONFIG.sectionRenderDistance*32)//In chunks
-                .uniformMatrix(PER_FRAME, "vxViewProj", VoxyUniforms::getViewProjection)
-                .uniformMatrix(PER_FRAME, "vxViewProjInv", new Inverted(VoxyUniforms::getViewProjection))
-                .uniformMatrix(PER_FRAME, "vxViewProjPrev", new PreviousMat(VoxyUniforms::getViewProjection))
-                .uniformMatrix(PER_FRAME, "vxModelView", VoxyUniforms::getModelView)
-                .uniformMatrix(PER_FRAME, "vxModelViewInv", new Inverted(VoxyUniforms::getModelView))
-                .uniformMatrix(PER_FRAME, "vxModelViewPrev", new PreviousMat(VoxyUniforms::getModelView))
-                .uniformMatrix(PER_FRAME, "vxProj", VoxyUniforms::getProjection)
-                .uniformMatrix(PER_FRAME, "vxProjInv", new Inverted(VoxyUniforms::getProjection))
-                .uniformMatrix(PER_FRAME, "vxProjPrev", new PreviousMat(VoxyUniforms::getProjection));
-
-        if (IrisShaderPatch.IMPERSONATE_DISTANT_HORIZONS) {
-            uniforms
-                    .uniform1f(PER_FRAME, "dhNearPlane", ()->16)//Presently hardcoded in voxy
-                    .uniform1f(PER_FRAME, "dhFarPlane", ()->16*3000)//Presently hardcoded in voxy
-
-                    .uniform1i(PER_FRAME, "dhRenderDistance", ()-> VoxyConfig.CONFIG.sectionRenderDistance*32*16)//In blocks
-                    .uniformMatrix(PER_FRAME, "dhProjection", VoxyUniforms::getProjection)
-                    .uniformMatrix(PER_FRAME, "dhProjectionInverse", new Inverted(VoxyUniforms::getProjection))
-                    .uniformMatrix(PER_FRAME, "dhPreviousProjection", new PreviousMat(VoxyUniforms::getProjection));
-        }
-    }
-
-
-
-
-    private record Inverted(Supplier<Matrix4fc> parent) implements Supplier<Matrix4fc> {
-        private Inverted(Supplier<Matrix4fc> parent) {
-            this.parent = parent;
-        }
-
-        public Matrix4fc get() {
-            Matrix4f copy = new Matrix4f(this.parent.get());
-            copy.invert();
-            return copy;
-        }
-
-        public Supplier<Matrix4fc> parent() {
-            return this.parent;
-        }
-    }
-
-    private static class PreviousMat implements Supplier<Matrix4fc> {
-        private final Supplier<Matrix4fc> parent;
-        private Matrix4f previous;
-
-        PreviousMat(Supplier<Matrix4fc> parent) {
-            this.parent = parent;
-            this.previous = new Matrix4f();
-        }
-
-        public Matrix4fc get() {
-            Matrix4f previous = this.previous;
-            this.previous = new Matrix4f(this.parent.get());
-            return previous;
-        }
-    }
-}

src/main/java/me/cortex/voxy/client/mixin/flashback/MixinFlashbackMeta.java

@@ -1,45 +0,0 @@
-package me.cortex.voxy.client.mixin.flashback;
-
-import com.google.gson.JsonObject;
-import com.moulberry.flashback.record.FlashbackMeta;
-import me.cortex.voxy.client.compat.IFlashbackMeta;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import java.io.File;
-
-@Mixin(value = FlashbackMeta.class, remap = false)
-public class MixinFlashbackMeta implements IFlashbackMeta {
-    @Unique private File voxyPath;
-
-    @Override
-    public void setVoxyPath(File path) {
-        this.voxyPath = path;
-    }
-
-    @Override
-    public File getVoxyPath() {
-        return this.voxyPath;
-    }
-
-    @Inject(method = "toJson", at = @At("RETURN"))
-    private void voxy$injectSaveVoxyPath(CallbackInfoReturnable<JsonObject> cir) {
-        var val = cir.getReturnValue();
-        if (val != null && this.voxyPath != null) {
-            val.addProperty("voxy_storage_path", this.voxyPath.getAbsoluteFile().getPath());
-        }
-    }
-
-    @Inject(method = "fromJson", at = @At("RETURN"))
-    private static void voxy$injectGetVoxyPath(JsonObject meta, CallbackInfoReturnable<FlashbackMeta> cir) {
-        var val = cir.getReturnValue();
-        if (val != null && meta != null) {
-            if (meta.has("voxy_storage_path")) {
-                ((IFlashbackMeta)val).setVoxyPath(new File(meta.get("voxy_storage_path").getAsString()));
-            }
-        }
-    }
-}

src/main/java/me/cortex/voxy/client/mixin/flashback/MixinFlashbackRecorder.java

@@ -1,29 +0,0 @@
-package me.cortex.voxy.client.mixin.flashback;
-
-import com.moulberry.flashback.record.FlashbackMeta;
-import com.moulberry.flashback.record.Recorder;
-import me.cortex.voxy.client.VoxyClientInstance;
-import me.cortex.voxy.client.compat.IFlashbackMeta;
-import me.cortex.voxy.commonImpl.VoxyCommon;
-import net.minecraft.registry.DynamicRegistryManager;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(value = Recorder.class, remap = false)
-public class MixinFlashbackRecorder {
-    @Shadow @Final private FlashbackMeta metadata;
-
-    @Inject(method = "<init>", at = @At("TAIL"))
-    private void voxy$getStoragePath(DynamicRegistryManager registryAccess, CallbackInfo retInf) {
-        if (VoxyCommon.isAvailable()) {
-            var instance = VoxyCommon.getInstance();
-            if (instance instanceof VoxyClientInstance ci) {
-                ((IFlashbackMeta)this.metadata).setVoxyPath(ci.getStorageBasePath().toFile());
-            }
-        }
-    }
-}

src/main/java/me/cortex/voxy/client/mixin/iris/CustomUniformsAccessor.java

@@ -1,14 +0,0 @@
-package me.cortex.voxy.client.mixin.iris;
-
-import it.unimi.dsi.fastutil.objects.Object2IntMap;
-import net.irisshaders.iris.uniforms.custom.CustomUniforms;
-import net.irisshaders.iris.uniforms.custom.cached.CachedUniform;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import java.util.Map;
-
-@Mixin(value = CustomUniforms.class, remap = false)
-public interface CustomUniformsAccessor {
-    @Accessor Map<Object, Object2IntMap<CachedUniform>> getLocationMap();
-}

src/main/java/me/cortex/voxy/client/mixin/iris/IrisRenderingPipelineAccessor.java

@@ -1,12 +0,0 @@
-package me.cortex.voxy.client.mixin.iris;
-
-import net.irisshaders.iris.pipeline.IrisRenderingPipeline;
-import net.irisshaders.iris.targets.RenderTargets;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(value = IrisRenderingPipeline.class, remap = false)
-public interface IrisRenderingPipelineAccessor {
-    @Accessor
-    RenderTargets getRenderTargets();
-}

src/main/java/me/cortex/voxy/client/mixin/iris/MixinIris.java

@@ -1,25 +0,0 @@
-package me.cortex.voxy.client.mixin.iris;
-
-import me.cortex.voxy.client.iris.ShaderLoadError;
-import me.cortex.voxy.common.Logger;
-import net.irisshaders.iris.Iris;
-import net.irisshaders.iris.shaderpack.ShaderPack;
-import net.irisshaders.iris.shaderpack.materialmap.NamespacedId;
-import net.irisshaders.iris.shaderpack.programs.ProgramSet;
-import net.minecraft.util.Identifier;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-@Mixin(value = Iris.class, remap = false)
-public class MixinIris {
-    @Redirect(method = "createPipeline", at = @At(value = "INVOKE", target = "Lnet/irisshaders/iris/shaderpack/ShaderPack;getProgramSet(Lnet/irisshaders/iris/shaderpack/materialmap/NamespacedId;)Lnet/irisshaders/iris/shaderpack/programs/ProgramSet;"))
-    private static ProgramSet voxy$redirectProgramSet(ShaderPack shaderPack, NamespacedId dim) {
-        try {
-            return shaderPack.getProgramSet(dim);
-        } catch (ShaderLoadError e) {
-            Logger.error(e);
-            return null;
-        }
-    }
-}

src/main/java/me/cortex/voxy/client/mixin/iris/MixinIrisRenderingPipeline.java

@@ -1,63 +0,0 @@
-package me.cortex.voxy.client.mixin.iris;
-
-import me.cortex.voxy.client.core.IGetVoxyRenderSystem;
-import me.cortex.voxy.client.core.util.IrisUtil;
-import me.cortex.voxy.client.iris.IGetIrisVoxyPipelineData;
-import me.cortex.voxy.client.iris.IGetVoxyPatchData;
-import me.cortex.voxy.client.iris.IrisShaderPatch;
-import me.cortex.voxy.client.iris.IrisVoxyRenderPipelineData;
-import net.irisshaders.iris.gl.buffer.ShaderStorageBufferHolder;
-import net.irisshaders.iris.pipeline.IrisRenderingPipeline;
-import net.irisshaders.iris.shaderpack.programs.ProgramSet;
-import net.irisshaders.iris.uniforms.custom.CustomUniforms;
-import net.minecraft.client.MinecraftClient;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(value = IrisRenderingPipeline.class, remap = false)
-public class MixinIrisRenderingPipeline implements IGetVoxyPatchData, IGetIrisVoxyPipelineData {
-    @Shadow @Final private CustomUniforms customUniforms;
-    @Shadow private ShaderStorageBufferHolder shaderStorageBufferHolder;
-    @Unique IrisShaderPatch patchData;
-    @Unique
-    IrisVoxyRenderPipelineData pipeline;
-
-    @Inject(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/irisshaders/iris/pipeline/transform/ShaderPrinter;resetPrintState()V", shift = At.Shift.AFTER))
-    private void voxy$injectPatchDataStore(ProgramSet programSet, CallbackInfo ci) {
-        if (IrisUtil.SHADER_SUPPORT) {
-            this.patchData = ((IGetVoxyPatchData) programSet).voxy$getPatchData();
-        }
-    }
-
-    @Inject(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/irisshaders/iris/pipeline/IrisRenderingPipeline;createSetupComputes([Lnet/irisshaders/iris/shaderpack/programs/ComputeSource;Lnet/irisshaders/iris/shaderpack/programs/ProgramSet;Lnet/irisshaders/iris/shaderpack/texture/TextureStage;)[Lnet/irisshaders/iris/gl/program/ComputeProgram;"))
-    private void voxy$injectPipeline(ProgramSet programSet, CallbackInfo ci) {
-        if (this.patchData != null) {
-            this.pipeline = IrisVoxyRenderPipelineData.buildPipeline((IrisRenderingPipeline)(Object)this, this.patchData, this.customUniforms, this.shaderStorageBufferHolder);
-        }
-    }
-
-    @Inject(method = "beginLevelRendering", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/opengl/GlStateManager;_activeTexture(I)V", shift = At.Shift.BEFORE), remap = true)
-    private void voxy$injectViewportSetup(CallbackInfo ci) {
-        if (IrisUtil.CAPTURED_VIEWPORT_PARAMETERS != null) {
-            var renderer = ((IGetVoxyRenderSystem) MinecraftClient.getInstance().worldRenderer).getVoxyRenderSystem();
-            if (renderer != null) {
-                IrisUtil.CAPTURED_VIEWPORT_PARAMETERS.apply(renderer);
-            }
-        }
-    }
-
-    @Override
-    public IrisShaderPatch voxy$getPatchData() {
-        return this.patchData;
-    }
-
-    @Override
-    public IrisVoxyRenderPipelineData voxy$getPipelineData() {
-        return this.pipeline;
-    }
-}

src/main/java/me/cortex/voxy/client/mixin/iris/MixinIrisSamplers.java

@@ -1,25 +0,0 @@
-package me.cortex.voxy.client.mixin.iris;
-
-import com.google.common.collect.ImmutableSet;
-import me.cortex.voxy.client.iris.VoxySamplers;
-import net.irisshaders.iris.gl.sampler.SamplerHolder;
-import net.irisshaders.iris.pipeline.IrisRenderingPipeline;
-import net.irisshaders.iris.pipeline.WorldRenderingPipeline;
-import net.irisshaders.iris.samplers.IrisSamplers;
-import net.irisshaders.iris.targets.RenderTargets;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.function.Supplier;
-
-@Mixin(value = IrisSamplers.class, remap = false)
-public class MixinIrisSamplers {
-    @Inject(method = "addRenderTargetSamplers", at = @At("TAIL"))
-    private static void voxy$injectSamplers(SamplerHolder samplers, Supplier<ImmutableSet<Integer>> flipped, RenderTargets renderTargets, boolean isFullscreenPass, WorldRenderingPipeline pipeline, CallbackInfo ci) {
-        if (pipeline instanceof IrisRenderingPipeline ipipe) {
-            VoxySamplers.addSamplers(ipipe, samplers);
-        }
-    }
-}

src/main/java/me/cortex/voxy/client/mixin/iris/MixinMatrixUniforms.java

@@ -1,24 +0,0 @@
-package me.cortex.voxy.client.mixin.iris;
-
-import me.cortex.voxy.client.config.VoxyConfig;
-import me.cortex.voxy.client.core.util.IrisUtil;
-import me.cortex.voxy.client.iris.VoxyUniforms;
-import net.irisshaders.iris.gl.uniform.UniformHolder;
-import net.irisshaders.iris.shaderpack.IdMap;
-import net.irisshaders.iris.shaderpack.properties.PackDirectives;
-import net.irisshaders.iris.uniforms.CommonUniforms;
-import net.irisshaders.iris.uniforms.FrameUpdateNotifier;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(value = CommonUniforms.class, remap = false)
-public class MixinMatrixUniforms {
-    @Inject(method = "addNonDynamicUniforms", at = @At("HEAD"))//Am so angry ims this is what IS REQUIRED TODO, because we need to override the uniforms of dh
-    private static void voxy$InjectMatrixUniforms(UniformHolder uniforms, IdMap idMap, PackDirectives directives, FrameUpdateNotifier updateNotifier, CallbackInfo ci) {
-        if (VoxyConfig.CONFIG.isRenderingEnabled() && IrisUtil.SHADER_SUPPORT) {
-            VoxyUniforms.addUniforms(uniforms);
-        }
-    }
-}

src/main/java/me/cortex/voxy/client/mixin/iris/MixinPackRenderTargetDirectives.java

@@ -1,23 +0,0 @@
-package me.cortex.voxy.client.mixin.iris;
-
-import com.google.common.collect.ImmutableSet;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import net.irisshaders.iris.shaderpack.properties.PackRenderTargetDirectives;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import java.util.Set;
-
-@Mixin(value = PackRenderTargetDirectives.class, remap = false)
-public class MixinPackRenderTargetDirectives {
-    @Redirect(method = "<clinit>", at = @At(value = "INVOKE", target = "Lcom/google/common/collect/ImmutableSet$Builder;build()Lcom/google/common/collect/ImmutableSet;"))
-    private static ImmutableSet<Integer> voxy$injectExtraColourTex(ImmutableSet.Builder<Integer> builder) {
-        int limit = System.getProperty("voxy.IrisExtremeColourTexOverride", "false").equalsIgnoreCase("true")?200:20;
-        for (int i = 16; i < limit; i++) {
-            builder.add(i);
-        }
-        return builder.build();
-    }
-}

src/main/java/me/cortex/voxy/client/mixin/iris/MixinProgramSet.java

@@ -1,51 +0,0 @@
-package me.cortex.voxy.client.mixin.iris;
-
-import me.cortex.voxy.client.config.VoxyConfig;
-import me.cortex.voxy.client.core.util.IrisUtil;
-import me.cortex.voxy.client.iris.IGetVoxyPatchData;
-import me.cortex.voxy.client.iris.IrisShaderPatch;
-import net.irisshaders.iris.shaderpack.ShaderPack;
-import net.irisshaders.iris.shaderpack.include.AbsolutePackPath;
-import net.irisshaders.iris.shaderpack.programs.ProgramSet;
-import net.irisshaders.iris.shaderpack.properties.PackDirectives;
-import net.irisshaders.iris.shaderpack.properties.ShaderProperties;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.function.Function;
-
-@Mixin(value = ProgramSet.class, remap = false)
-public class MixinProgramSet implements IGetVoxyPatchData {
-    @Shadow @Final private PackDirectives packDirectives;
-    @Unique IrisShaderPatch patchData;
-
-    @Inject(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/irisshaders/iris/shaderpack/programs/ProgramSet;locateDirectives()V", shift = At.Shift.BEFORE))
-    private void voxy$injectPatchMaker(AbsolutePackPath directory, Function<AbsolutePackPath, String> sourceProvider, ShaderProperties shaderProperties, ShaderPack pack, CallbackInfo ci) {
-        if (VoxyConfig.CONFIG.isRenderingEnabled() && IrisUtil.SHADER_SUPPORT) {
-            this.patchData = IrisShaderPatch.makePatch(pack, directory, sourceProvider);
-        }
-        /*
-        if (this.patchData != null) {
-            //Inject directives from voxy
-            DispatchingDirectiveHolder ddh = new DispatchingDirectiveHolder();
-            this.packDirectives.acceptDirectivesFrom(ddh);
-            CommentDirectiveParser.findDirective(this.patchData.getPatchSource(), CommentDirective.Type.RENDERTARGETS)
-                    .map(dir->Arrays.stream(dir.getDirective().split(","))
-                            .mapToInt(Integer::parseInt).toArray())
-                    .ifPresent(ddh::processDirective);
-
-        }
-         */
-    }
-
-
-    @Override
-    public IrisShaderPatch voxy$getPatchData() {
-        return this.patchData;
-    }
-}

src/main/java/me/cortex/voxy/client/mixin/iris/MixinShaderPackSourceNames.java

@@ -1,20 +0,0 @@
-package me.cortex.voxy.client.mixin.iris;
-
-import com.google.common.collect.ImmutableList;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import net.irisshaders.iris.shaderpack.include.ShaderPackSourceNames;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-@Mixin(value = ShaderPackSourceNames.class, remap = false)
-public class MixinShaderPackSourceNames {
-    @WrapOperation(method = "findPotentialStarts", at = @At(value = "INVOKE", target = "Lcom/google/common/collect/ImmutableList;builder()Lcom/google/common/collect/ImmutableList$Builder;"))
-    private static ImmutableList.Builder<String> voxy$injectVoxyShaderPatch(Operation<ImmutableList.Builder<String>> original){
-        var builder = original.call();
-        builder.add("voxy.json");
-        builder.add("voxy_opaque.glsl");
-        builder.add("voxy_translucent.glsl");
-        return builder;
-    }
-}

src/main/java/me/cortex/voxy/client/mixin/iris/MixinStandardMacros.java

@@ -1,33 +0,0 @@
-package me.cortex.voxy.client.mixin.iris;
-
-import com.google.common.collect.ImmutableList;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import me.cortex.voxy.client.config.VoxyConfig;
-import me.cortex.voxy.client.core.util.IrisUtil;
-import me.cortex.voxy.client.iris.IrisShaderPatch;
-import net.irisshaders.iris.gl.shader.StandardMacros;
-import net.irisshaders.iris.helpers.StringPair;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-
-import java.util.Collection;
-import java.util.List;
-
-@Mixin(value = StandardMacros.class, remap = false)
-public abstract class MixinStandardMacros {
-    @Shadow
-    private static void define(List<StringPair> defines, String key){}
-
-    @WrapOperation(method = "createStandardEnvironmentDefines", at = @At(value = "INVOKE", target = "Lcom/google/common/collect/ImmutableList;copyOf(Ljava/util/Collection;)Lcom/google/common/collect/ImmutableList;"))
-    private static ImmutableList<StringPair> voxy$injectVoxyDefine(Collection<StringPair> list, Operation<ImmutableList<StringPair>> original) {
-        if (VoxyConfig.CONFIG.isRenderingEnabled() && IrisUtil.SHADER_SUPPORT) {
-            define((List<StringPair>) list, "VOXY");
-            if (IrisShaderPatch.IMPERSONATE_DISTANT_HORIZONS) {
-                define((List<StringPair>) list, "DISTANT_HORIZONS");
-            }
-        }
-        return ImmutableList.copyOf(list);
-    }
-}

src/main/java/me/cortex/voxy/client/mixin/iris/MixinWorldRenderer.java

@@ -1,52 +0,0 @@
-package me.cortex.voxy.client.mixin.iris;
-
-import com.mojang.blaze3d.buffers.GpuBufferSlice;
-import me.cortex.voxy.client.core.IGetVoxyRenderSystem;
-import me.cortex.voxy.client.core.VoxyRenderSystem;
-import me.cortex.voxy.client.core.util.IrisUtil;
-import net.caffeinemc.mods.sodium.client.render.chunk.ChunkRenderMatrices;
-import net.caffeinemc.mods.sodium.client.util.FogStorage;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.Camera;
-import net.minecraft.client.render.RenderTickCounter;
-import net.minecraft.client.render.WorldRenderer;
-import net.minecraft.client.util.ObjectAllocator;
-import org.joml.Matrix4f;
-import org.joml.Vector4f;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import static org.lwjgl.opengl.GL11C.glViewport;
-
-@Mixin(WorldRenderer.class)
-public class MixinWorldRenderer {
-    @Shadow @Final private MinecraftClient client;
-
-    @Inject(method = "render", at = @At("HEAD"), order = 100)
-    private void voxy$injectIrisCompat(
-            ObjectAllocator allocator,
-            RenderTickCounter tickCounter,
-            boolean renderBlockOutline,
-            Camera camera,
-            Matrix4f positionMatrix,
-            Matrix4f projectionMatrix,
-            GpuBufferSlice fog,
-            Vector4f fogColor,
-            boolean shouldRenderSky,
-            CallbackInfo ci) {
-        if (IrisUtil.irisShaderPackEnabled()) {
-            var renderer = ((IGetVoxyRenderSystem) this).getVoxyRenderSystem();
-            if (renderer != null) {
-                //Fixthe fucking viewport dims, fuck iris
-                glViewport(0,0,MinecraftClient.getInstance().getFramebuffer().textureWidth, MinecraftClient.getInstance().getFramebuffer().textureHeight);
-
-                var pos = camera.getCameraPos();
-                IrisUtil.CAPTURED_VIEWPORT_PARAMETERS = new IrisUtil.CapturedViewportParameters(new ChunkRenderMatrices(projectionMatrix, positionMatrix), ((FogStorage) this.client.gameRenderer).sodium$getFogParameters(), pos.x, pos.y, pos.z);
-            }
-        }
-    }
-}

src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinClientLoginNetworkHandler.java

@@ -1,21 +1,28 @@
 package me.cortex.voxy.client.mixin.minecraft;
 
-import me.cortex.voxy.client.VoxyClient;
+import me.cortex.voxy.client.LoadException;
 import me.cortex.voxy.client.VoxyClientInstance;
 import me.cortex.voxy.client.config.VoxyConfig;
 import me.cortex.voxy.commonImpl.VoxyCommon;
-import net.minecraft.client.network.ClientPlayNetworkHandler;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.network.*;
+import net.minecraft.network.ClientConnection;
+import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.s2c.play.GameJoinS2CPacket;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import java.time.Duration;
+import java.util.function.Consumer;
+
 @Mixin(ClientPlayNetworkHandler.class)
 public class MixinClientLoginNetworkHandler {
-    @Inject(method = "onGameJoin", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/packet/s2c/play/GameJoinS2CPacket;commonPlayerSpawnInfo()Lnet/minecraft/network/packet/s2c/play/CommonPlayerSpawnInfo;"))
+    @Inject(method = "onGameJoin", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerInteractionManager;<init>(Lnet/minecraft/client/MinecraftClient;Lnet/minecraft/client/network/ClientPlayNetworkHandler;)V", shift = At.Shift.BY, by = 2))
     private void voxy$init(GameJoinS2CPacket packet, CallbackInfo ci) {
-        if (VoxyCommon.isAvailable() && !VoxyClientInstance.isInGame) {
+        if (VoxyCommon.isAvailable()) {
             VoxyClientInstance.isInGame = true;
             if (VoxyConfig.CONFIG.enabled) {
                 if (VoxyCommon.getInstance() != null) {

src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinDebugHud.java

@@ -13,7 +13,7 @@ import java.util.List;
 
 @Mixin(DebugHud.class)
 public class MixinDebugHud {
-    @Inject(method = "getRightText", at = @At("RETURN"))
+    @Inject(method = "getRightText", at = @At("TAIL"))
     private void injectDebug(CallbackInfoReturnable<List<String>> cir) {
         var ret = cir.getReturnValue();
         var instance = VoxyCommon.getInstance();

src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinMinecraftClient.java

@@ -1,8 +1,12 @@
 package me.cortex.voxy.client.mixin.minecraft;
 
 import me.cortex.voxy.client.VoxyClientInstance;
+import me.cortex.voxy.client.config.VoxyConfig;
 import me.cortex.voxy.commonImpl.VoxyCommon;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.RunArgs;
+import net.minecraft.client.gui.screen.DownloadingTerrainScreen;
+import net.minecraft.client.world.ClientWorld;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -12,7 +16,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public class MixinMinecraftClient {
     @Inject(method = "disconnect(Lnet/minecraft/client/gui/screen/Screen;Z)V", at = @At("TAIL"))
     private void voxy$injectWorldClose(CallbackInfo ci) {
-        if (VoxyCommon.isAvailable() && VoxyClientInstance.isInGame) {
+        if (VoxyCommon.isAvailable()) {
             VoxyCommon.shutdownInstance();
             VoxyClientInstance.isInGame = false;
         }

src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinRenderSystem.java

@@ -1,23 +0,0 @@
-package me.cortex.voxy.client.mixin.minecraft;
-
-
-import com.mojang.blaze3d.shaders.ShaderType;
-import com.mojang.blaze3d.systems.RenderSystem;
-import me.cortex.voxy.client.VoxyClient;
-import net.minecraft.util.Identifier;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.function.BiFunction;
-
-//Thanks iris for making me need todo this ;-; _irritater_
-@Mixin(RenderSystem.class)
-public class MixinRenderSystem {
-    //We need to inject before iris to initalize our systems
-    @Inject(method = "initRenderer", order = 900, remap = false, at = @At("RETURN"))
-    private static void voxy$injectInit(long windowHandle, int debugVerbosity, boolean sync, BiFunction<Identifier, ShaderType, String> shaderSourceGetter, boolean renderDebugLabels, CallbackInfo ci) {
-        VoxyClient.initVoxyClient();
-    }
-}

src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinWindow.java

@@ -15,7 +15,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public class MixinWindow {
     @Inject(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/Window;throwOnGlError()V"))
     private void injectInitWindow(WindowEventHandler eventHandler, MonitorTracker monitorTracker, WindowSettings settings, String fullscreenVideoMode, String title, CallbackInfo ci) {
-        //System.load("C:\\Users\\Cortex\\Desktop\\minecraft\\mesabuild\\mesa\\builddir\\src\\gallium\\targets\\wgl\\libgallium_wgl.dll");
         //System.load("C:\\Program Files\\RenderDoc\\renderdoc.dll");
         var prop = System.getProperty("voxy.forceGpuSelectionIndex", "NO");
         if (!prop.equals("NO")) {

src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinWorldRenderer.java

@@ -4,15 +4,15 @@ import me.cortex.voxy.client.VoxyClientInstance;
 import me.cortex.voxy.client.config.VoxyConfig;
 import me.cortex.voxy.client.core.IGetVoxyRenderSystem;
 import me.cortex.voxy.client.core.VoxyRenderSystem;
-import me.cortex.voxy.client.core.util.IrisUtil;
 import me.cortex.voxy.common.Logger;
 import me.cortex.voxy.common.world.WorldEngine;
 import me.cortex.voxy.commonImpl.VoxyCommon;
 import me.cortex.voxy.commonImpl.WorldIdentifier;
-import net.minecraft.client.render.Frustum;
+import net.minecraft.client.render.*;
-import net.minecraft.client.render.WorldRenderer;
+import net.minecraft.client.util.ObjectAllocator;
 import net.minecraft.client.world.ClientWorld;
 import org.jetbrains.annotations.Nullable;
+import org.joml.Matrix4f;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -62,7 +62,7 @@ public abstract class MixinWorldRenderer implements IGetVoxyRenderSystem {
     @Override
     public void createRenderer() {
         if (this.renderer != null) throw new IllegalStateException("Cannot have multiple renderers");
-        if (!VoxyConfig.CONFIG.isRenderingEnabled()) {
+        if ((!VoxyConfig.CONFIG.enableRendering)||(!VoxyConfig.CONFIG.enabled)) {
             Logger.info("Not creating renderer due to disabled");
             return;
         }
@@ -80,14 +80,6 @@ public abstract class MixinWorldRenderer implements IGetVoxyRenderSystem {
             Logger.error("Null world selected");
             return;
         }
-        try {
         this.renderer = new VoxyRenderSystem(world, instance.getThreadPool());
-        } catch (RuntimeException e) {
-            if (IrisUtil.irisShaderPackEnabled()) {
-                IrisUtil.disableIrisShaders();
-            } else {
-                throw e;
-            }
-        }
     }
 }

src/main/java/me/cortex/voxy/client/mixin/nvidium/MixinRenderPipeline.java

@@ -18,7 +18,7 @@ public class MixinRenderPipeline {
     private void voxy$injectRender(TerrainRenderPass pass, Viewport frustum, FogParameters fogParameters, ChunkRenderMatrices crm, double px, double py, double pz, CallbackInfo ci) {
         var renderer = ((IGetVoxyRenderSystem) MinecraftClient.getInstance().worldRenderer).getVoxyRenderSystem();
         if (renderer != null) {
-            renderer.renderOpaque(renderer.setupViewport(crm, fogParameters, px, py, pz));
+            renderer.renderOpaque(crm, fogParameters, px, py, pz);
         }
     }
 }

src/main/java/me/cortex/voxy/client/mixin/sodium/AccessorChunkTracker.java

@@ -1,12 +0,0 @@
-package me.cortex.voxy.client.mixin.sodium;
-
-import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap;
-import net.caffeinemc.mods.sodium.client.render.chunk.map.ChunkTracker;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(value = ChunkTracker.class, remap = false)
-public interface AccessorChunkTracker {
-    @Accessor
-    Long2IntOpenHashMap getChunkStatus();
-}

src/main/java/me/cortex/voxy/client/mixin/sodium/MixinDefaultChunkRenderer.java

@@ -1,8 +1,6 @@
 package me.cortex.voxy.client.mixin.sodium;
 
 import me.cortex.voxy.client.core.IGetVoxyRenderSystem;
-import me.cortex.voxy.client.core.rendering.Viewport;
-import me.cortex.voxy.client.core.util.IrisUtil;
 import net.caffeinemc.mods.sodium.client.gl.device.CommandList;
 import net.caffeinemc.mods.sodium.client.render.chunk.ChunkRenderMatrices;
 import net.caffeinemc.mods.sodium.client.render.chunk.DefaultChunkRenderer;
@@ -12,6 +10,8 @@ import net.caffeinemc.mods.sodium.client.render.chunk.terrain.TerrainRenderPass;
 import net.caffeinemc.mods.sodium.client.render.viewport.CameraTransform;
 import net.caffeinemc.mods.sodium.client.util.FogParameters;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.util.math.MatrixStack;
+import org.joml.Matrix4f;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -25,13 +25,7 @@ public class MixinDefaultChunkRenderer {
         if (renderPass == DefaultTerrainRenderPasses.CUTOUT) {
             var renderer = ((IGetVoxyRenderSystem) MinecraftClient.getInstance().worldRenderer).getVoxyRenderSystem();
             if (renderer != null) {
-                Viewport<?> viewport = null;
+                renderer.renderOpaque(matrices, fogParameters, camera.x, camera.y, camera.z);
-                if (IrisUtil.irisShaderPackEnabled()) {
-                    viewport = renderer.getViewport();
-                } else {
-                    viewport = renderer.setupViewport(matrices, fogParameters, camera.x, camera.y, camera.z);
-                }
-                renderer.renderOpaque(viewport);
             }
         }
     }

src/main/java/me/cortex/voxy/client/mixin/sodium/MixinRenderSectionManager.java

@@ -5,18 +5,15 @@ import me.cortex.voxy.client.config.VoxyConfig;
 import me.cortex.voxy.client.core.IGetVoxyRenderSystem;
 import me.cortex.voxy.client.core.VoxyRenderSystem;
 import me.cortex.voxy.common.world.service.VoxelIngestService;
-import me.cortex.voxy.commonImpl.VoxyCommon;
-import me.cortex.voxy.commonImpl.WorldIdentifier;
 import net.caffeinemc.mods.sodium.client.gl.device.CommandList;
 import net.caffeinemc.mods.sodium.client.render.chunk.RenderSection;
 import net.caffeinemc.mods.sodium.client.render.chunk.RenderSectionManager;
 import net.caffeinemc.mods.sodium.client.render.chunk.data.BuiltSectionInfo;
-import net.caffeinemc.mods.sodium.client.render.chunk.map.ChunkTrackerHolder;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.util.math.ChunkSectionPos;
-import net.minecraft.world.LightType;
+import net.minecraft.world.chunk.WorldChunk;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -41,7 +38,6 @@ public class MixinRenderSectionManager {
                 system.chunkBoundRenderer.reset();
             }
         }
-        this.bottomSectionY = this.level.getBottomY()>>4;
     }
 
     @Inject(method = "onChunkRemoved", at = @At("HEAD"))
@@ -80,21 +76,16 @@ public class MixinRenderSectionManager {
         }
     }*/
 
-    @Unique private long cachedChunkPos = -1;
-    @Unique private int cachedChunkStatus;
-    @Unique private int bottomSectionY;
-
     @Redirect(method = "updateSectionInfo", at = @At(value = "INVOKE", target = "Lnet/caffeinemc/mods/sodium/client/render/chunk/RenderSection;setInfo(Lnet/caffeinemc/mods/sodium/client/render/chunk/data/BuiltSectionInfo;)Z"))
     private boolean voxy$updateOnUpload(RenderSection instance, BuiltSectionInfo info) {
-        boolean wasBuilt = instance.getFlags()!=0;
+        boolean wasBuilt = instance.isBuilt();
         int flags = instance.getFlags();
         if (!instance.setInfo(info)) {
             return false;
         }
-        if (wasBuilt == (instance.getFlags()!=0)) {//Only want to do stuff on change
+        if (wasBuilt == instance.isBuilt()) {//Only want to do stuff on change
             return true;
         }
-
         flags |= instance.getFlags();
         if (flags == 0)//Only process things with stuff
             return true;
@@ -103,41 +94,8 @@ public class MixinRenderSectionManager {
         if (system == null) {
             return true;
         }
-        int x = instance.getChunkX(), y = instance.getChunkY(), z = instance.getChunkZ();
+        long pos = ChunkSectionPos.asLong(instance.getChunkX(), instance.getChunkY(), instance.getChunkZ());
-
-        if (wasBuilt) {
-            var tracker = ((AccessorChunkTracker)ChunkTrackerHolder.get(this.level)).getChunkStatus();
-            //in theory the cache value could be wrong but is so soso unlikely and at worst means we either duplicate ingest a chunk
-            // which... could be bad ;-; or we dont ingest atall which is ok!
-            long key = ChunkPos.toLong(x, z);
-            if (key != this.cachedChunkPos) {
-                this.cachedChunkPos = key;
-                this.cachedChunkStatus = tracker.getOrDefault(key, 0);
-            }
-            if (this.cachedChunkStatus == 3) {//If this chunk still has surrounding chunks
-                var section = this.level.getChunk(x,z).getSection(y-this.bottomSectionY);
-                var lp = this.level.getLightingProvider();
-
-                var csp = ChunkSectionPos.from(x,y,z);
-                var blp = lp.get(LightType.BLOCK).getLightSection(csp);
-                var slp = lp.get(LightType.SKY).getLightSection(csp);
-
-                //Note: we dont do this check and just blindly ingest, it shouldbe ok :tm:
-                //if (blp != null || slp != null)
-                    VoxelIngestService.rawIngest(system.getEngine(), section, x,y,z, blp==null?null:blp.copy(), slp==null?null:slp.copy());
-            }
-        }
-
-        //Do some very cheeky stuff for MiB
-        if (VoxyCommon.IS_MINE_IN_ABYSS) {
-            int sector = (x+512)>>10;
-            x-=sector<<10;
-            y+=16+(256-32-sector*30);
-        }
-        long pos = ChunkSectionPos.asLong(x,y,z);
         if (wasBuilt) {//Remove
-            //TODO: on chunk remove do ingest if is surrounded by built chunks (or when the tracker says is ok)
-
             system.chunkBoundRenderer.removeSection(pos);
         } else {//Add
             system.chunkBoundRenderer.addSection(pos);

src/main/java/me/cortex/voxy/client/taskbar/WindowsTaskbar.java

@@ -1,9 +1,10 @@
 package me.cortex.voxy.client.taskbar;
 
 import com.sun.jna.Pointer;
-import com.sun.jna.platform.win32.COM.COMInvoker;
 import com.sun.jna.platform.win32.*;
+import com.sun.jna.platform.win32.COM.COMInvoker;
 import com.sun.jna.ptr.PointerByReference;
+import me.cortex.voxy.common.util.TrackedObject;
 import org.lwjgl.glfw.GLFWNativeWin32;
 
 public class WindowsTaskbar extends COMInvoker implements Taskbar.ITaskbar {

src/main/java/me/cortex/voxy/common/config/compressors/LZMACompressor.java

@@ -1,5 +1,17 @@
 package me.cortex.voxy.common.config.compressors;
 
+import me.cortex.voxy.common.config.ConfigBuildCtx;
+import me.cortex.voxy.common.util.MemoryBuffer;
+import me.cortex.voxy.common.util.Pair;
+import me.cortex.voxy.common.util.ThreadLocalMemoryBuffer;
+import me.cortex.voxy.common.util.UnsafeUtil;
+import me.cortex.voxy.common.world.SaveLoadSystem;
+import org.lwjgl.system.MemoryUtil;
+import org.tukaani.xz.*;
+
+import java.io.IOException;
+import java.io.InputStream;
+
 /*
 public class LZMACompressor implements StorageCompressor {
     private static final ThreadLocal<Pair<byte[], ResettableArrayCache>> CACHE_THREAD_LOCAL = ThreadLocal.withInitial(()->new Pair<>(new byte[SaveLoadSystem.BIGGEST_SERIALIZED_SECTION_SIZE], new ResettableArrayCache(new ArrayCache())));

src/main/java/me/cortex/voxy/common/config/compressors/StorageCompressor.java

@@ -2,6 +2,8 @@ package me.cortex.voxy.common.config.compressors;
 
 import me.cortex.voxy.common.util.MemoryBuffer;
 
+import java.nio.ByteBuffer;
+
 public interface StorageCompressor {
     MemoryBuffer compress(MemoryBuffer saveData);
 

src/main/java/me/cortex/voxy/common/config/compressors/ZSTDCompressor.java

@@ -5,6 +5,8 @@ import me.cortex.voxy.common.util.MemoryBuffer;
 import me.cortex.voxy.common.util.ThreadLocalMemoryBuffer;
 import me.cortex.voxy.common.world.SaveLoadSystem;
 
+import java.lang.ref.Cleaner;
+
 import static me.cortex.voxy.common.util.GlobalCleaner.CLEANER;
 import static org.lwjgl.util.zstd.Zstd.*;
 

src/main/java/me/cortex/voxy/common/config/section/SectionSerializationStorage.java

@@ -7,12 +7,14 @@ import me.cortex.voxy.common.config.storage.StorageBackend;
 import me.cortex.voxy.common.config.storage.StorageConfig;
 import me.cortex.voxy.common.util.ThreadLocalMemoryBuffer;
 import me.cortex.voxy.common.world.SaveLoadSystem;
+import me.cortex.voxy.common.world.SaveLoadSystem2;
 import me.cortex.voxy.common.world.SaveLoadSystem3;
 import me.cortex.voxy.common.world.WorldSection;
 import me.cortex.voxy.common.world.other.Mapper;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.LongConsumer;
 
 public class SectionSerializationStorage extends SectionStorage {

src/main/java/me/cortex/voxy/common/config/storage/StorageBackend.java

@@ -1,10 +1,13 @@
 package me.cortex.voxy.common.config.storage;
 
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import me.cortex.voxy.common.config.IMappingStorage;
 import me.cortex.voxy.common.util.MemoryBuffer;
 
+import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.LongConsumer;
 
 public abstract class StorageBackend implements IMappingStorage {