Make the multi-implementation methods a bit nicer to work with

makamys · Jan 8, 2024 · 3dfe82e · 3dfe82e
1 parent 9d83b4a
commit 3dfe82e
Show file tree

Hide file tree

Showing 9 changed files with 536 additions and 458 deletions.
diff --git a/src/main/java/makamys/neodymium/Neodymium.java b/src/main/java/makamys/neodymium/Neodymium.java
@@ -7,9 +7,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import makamys.neodymium.renderer.compat.RenderUtil;
+import makamys.neodymium.renderer.compat.RenderUtilRPLE;
+import makamys.neodymium.renderer.compat.RenderUtilShaderRPLE;
+import makamys.neodymium.renderer.compat.RenderUtilShaders;
+import makamys.neodymium.renderer.compat.RenderUtilVanilla;
 import org.apache.commons.lang3.tuple.Pair;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 import cpw.mods.fml.client.event.ConfigChangedEvent;
 import cpw.mods.fml.common.FMLCommonHandler;
@@ -18,7 +21,6 @@
 import cpw.mods.fml.common.event.FMLConstructionEvent;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.common.network.FMLNetworkEvent.ClientConnectedToServerEvent;
@@ -49,6 +51,8 @@ public class Neodymium
     private boolean renderDebugText = false;
 
     public static NeoRenderer renderer;
+
+    public static RenderUtil util;
 
     private static World rendererWorld;
 
@@ -97,6 +101,17 @@ private void onPlayerWorldChanged(World newWorld) {
     	    List<Warning> criticalWarns = warnsAndCriticalWarns.getRight();
 
     	    if(criticalWarns.isEmpty()) {
+                boolean rple = Compat.isRPLEModPresent();
+                boolean optiFineShaders = Compat.isOptiFineShadersEnabled();
+                if (rple && optiFineShaders) {
+                    util = RenderUtilShaderRPLE.INSTANCE;
+                } else if (optiFineShaders) {
+                    util = RenderUtilShaders.INSTANCE;
+                } else if (rple) {
+                    util = RenderUtilRPLE.INSTANCE;
+                } else {
+                    util = RenderUtilVanilla.INSTANCE;
+                }
     	        renderer = new NeoRenderer(newWorld);
     	        renderer.hasIncompatibilities = !warns.isEmpty() || !criticalWarns.isEmpty();
     	    }

diff --git a/src/main/java/makamys/neodymium/renderer/ChunkMesh.java b/src/main/java/makamys/neodymium/renderer/ChunkMesh.java
@@ -197,7 +197,7 @@ private ByteBuffer createBuffer(List<? extends MeshQuad> quads, int quadCount) {
                     if(subMeshStart[subMeshStartIdx] == -1) {
                         subMeshStart[subMeshStartIdx] = i;
                     }
-                    quad.writeToBuffer(out, stride);
+                    Neodymium.util.writeMeshQuadToBuffer(quad, out, stride);
                     i++;
                 } else if(sortByNormals){
                     break;
@@ -301,12 +301,12 @@ public double distSq(Entity player) {
     public static void setCaptureTarget(ChunkMesh cm) {
         meshCaptureTarget = cm;
     }
-    
+
     public static class Flags {
-        boolean hasTexture;
-        boolean hasBrightness;
-        boolean hasColor;
-        boolean hasNormals;
+        public boolean hasTexture;
+        public boolean hasBrightness;
+        public boolean hasColor;
+        public boolean hasNormals;
 
         public Flags(byte flags) {
             hasTexture = (flags & 1) != 0;