Merge branch 'main' of https://gitlab.com/jeseibel/distant-horizons

build.gradle

@@ -200,7 +200,7 @@ subprojects { p ->
         implementation("org.apache.logging.log4j:log4j-core:${rootProject.log4j_version}")
 
         // JOML
-        implementation("org.joml:joml:${rootProject.joml_version}")
+        forgeShadowMe("org.joml:joml:${rootProject.joml_version}")
 
         // JUnit tests
         implementation("org.junit.jupiter:junit-jupiter:5.8.2")
@@ -300,6 +300,9 @@ subprojects { p ->
         // Sqlite Database
         //At the moment, there is a bug in this library which doesnt allow it to be relocated
 //        relocate "org.sqlite", "${librariesLocation}.sqlite"
+        
+        // JOML
+        relocate "org.joml", "${librariesLocation}.joml"
 
         // NightConfig (includes Toml & Json)
         relocate "com.electronwill.nightconfig", "${librariesLocation}.electronwill.nightconfig"

common/src/main/java/com/seibel/distanthorizons/common/wrappers/McObjectConverter.java

@@ -23,12 +23,6 @@ import java.nio.FloatBuffer;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
-#if MC_VER < MC_1_19_4
-import com.mojang.math.Matrix4f;
-#else
-import org.joml.Matrix4f;
-#endif
-
 import com.seibel.distanthorizons.core.enums.EDhDirection;
 import com.seibel.distanthorizons.core.pos.DhBlockPos;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
@@ -51,8 +45,29 @@ public class McObjectConverter
 	{
 		return y * 4 + x;
 	}
+	
+	
+	/** 4x4 float matrix converter */
+	@Deprecated
+	public static Mat4f Convert(
+			#if MC_VER < MC_1_19_4 com.mojang.math.Matrix4f 
+			#else org.joml.Matrix4f #endif 
+			mcMatrix)
+	{
+		FloatBuffer buffer = FloatBuffer.allocate(16);
+		storeMatrix(mcMatrix, buffer);
+		Mat4f matrix = new Mat4f(buffer);
+        #if MC_VER < MC_1_19_4
+		matrix.transpose(); // In 1.19.3 and later, we no longer need to transpose it
+        #endif
+		return matrix;
+	}
 	/** Taken from Minecraft's com.mojang.math.Matrix4f class from 1.18.2 */
-	private static void storeMatrix(Matrix4f matrix, FloatBuffer buffer)
+	private static void storeMatrix(
+			#if MC_VER < MC_1_19_4 com.mojang.math.Matrix4f 
+			#else org.joml.Matrix4f #endif
+			matrix, 
+			FloatBuffer buffer)
 	{
         #if MC_VER < MC_1_19_4
 		matrix.store(buffer);
@@ -77,18 +92,6 @@ public class McObjectConverter
         #endif
 	}
 	
-	/** 4x4 float matrix converter */
-	public static Mat4f Convert(Matrix4f mcMatrix)
-	{
-		FloatBuffer buffer = FloatBuffer.allocate(16);
-		storeMatrix(mcMatrix, buffer);
-		Mat4f matrix = new Mat4f(buffer);
-        #if MC_VER < MC_1_19_4
-		matrix.transpose(); // In 1.19.3 and later, we no longer need to transpose it
-        #endif
-		return matrix;
-	}
-	
 	
 	static final Direction[] directions;
 	static final EDhDirection[] lodDirections;

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java

@@ -24,7 +24,10 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrappe
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockState;
 import org.apache.logging.log4j.Logger;
 
@@ -84,6 +87,8 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	 * Should be between {@link IBlockStateWrapper#FULLY_OPAQUE} and {@link IBlockStateWrapper#FULLY_OPAQUE}
 	 */
 	private int opacity = -1;
+	/** used by the Iris shader mod to determine how each LOD should be rendered */
+	private byte irisBlockMaterialId = 0;
 	
 	
 	
@@ -115,7 +120,8 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	{
 		this.blockState = blockState;
 		this.serialString = this.serialize(levelWrapper);
-		LOGGER.trace("Created BlockStateWrapper ["+this.serialString+"] for ["+blockState+"]");
+		this.irisBlockMaterialId = this.calculateIrisBlockMaterialId();
+		LOGGER.trace("Created BlockStateWrapper ["+this.serialString+"] for ["+blockState+"] with material ID ["+this.irisBlockMaterialId+"]");
 	}
 	
 	
@@ -273,6 +279,9 @@ public class BlockStateWrapper implements IBlockStateWrapper
         #endif
 	}
 	
+	@Override
+	public byte getIrisBlockMaterialId() { return this.irisBlockMaterialId; }
+	
 	@Override
 	public String toString() { return this.getSerialString(); }
 	
@@ -454,4 +463,108 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	
 	
 	
+	//==============//
+	// Iris methods //
+	//==============//
+	
+	private byte calculateIrisBlockMaterialId() 
+	{
+		if (this.blockState == null)
+		{
+			return IrisBlockMaterial.AIR;
+		}
+		
+		
+		String serialString = this.getSerialString().toLowerCase();
+		
+		if (this.blockState.is(BlockTags.LEAVES) 
+			|| serialString.contains("bamboo") 
+			|| serialString.contains("cactus")
+			|| serialString.contains("chorus_flower")
+			|| serialString.contains("mushroom")
+			) 
+		{
+			return IrisBlockMaterial.LEAVES;
+		}
+		else if (this.isLiquid() || this.blockState.is(Blocks.WATER))
+		{
+			return IrisBlockMaterial.WATER;
+		}
+		else if (this.blockState.getSoundType() == SoundType.WOOD
+				|| serialString.contains("root")
+				#if MC_VER >= MC_1_19_4
+				|| this.blockState.getSoundType() == SoundType.CHERRY_WOOD
+				#endif
+				) 
+		{
+			return IrisBlockMaterial.WOOD;
+		}
+		else if (this.blockState.getSoundType() == SoundType.METAL
+				#if MC_VER >= MC_1_19_2
+				|| this.blockState.getSoundType() == SoundType.COPPER
+				#endif
+				#if MC_VER >= MC_1_20_4
+				|| this.blockState.getSoundType() == SoundType.COPPER_BULB
+				|| this.blockState.getSoundType() == SoundType.COPPER_GRATE
+				#endif
+				) 
+		{
+			return IrisBlockMaterial.METAL;
+		}
+		else if (
+			serialString.contains("dirt")
+			|| serialString.contains("grass_block")
+			|| serialString.contains("gravel")
+			|| serialString.contains("mud")
+			|| serialString.contains("podzol")
+			|| serialString.contains("mycelium")
+			)
+		{
+			return IrisBlockMaterial.DIRT;
+		} 
+		else if (this.blockState.is(Blocks.LAVA)) 
+		{
+			return IrisBlockMaterial.LAVA;
+		}
+		#if MC_VER >= MC_1_17_1
+		else if (this.blockState.getSoundType() == SoundType.DEEPSLATE
+				|| this.blockState.getSoundType() == SoundType.DEEPSLATE_BRICKS
+				|| this.blockState.getSoundType() == SoundType.DEEPSLATE_TILES 
+				|| this.blockState.getSoundType() == SoundType.POLISHED_DEEPSLATE
+				|| serialString.contains("deepslate") ) 
+		{
+			return IrisBlockMaterial.DEEPSLATE;
+		} 
+		#endif
+		else if (this.serialString.contains("snow"))
+		{
+			return IrisBlockMaterial.SNOW;
+		} 
+		else if (serialString.contains("sand"))
+		{
+			return IrisBlockMaterial.SAND;
+		}
+		else if (serialString.contains("terracotta"))
+		{
+			return IrisBlockMaterial.TERRACOTTA;
+		} 
+		else if (this.blockState.is(BlockTags.BASE_STONE_NETHER)) 
+		{
+			return IrisBlockMaterial.NETHER_STONE;
+		} 
+		else if (serialString.contains("stone")
+				|| serialString.contains("ore")) 
+		{
+			return IrisBlockMaterial.STONE;
+		}
+		else if (this.blockState.getLightEmission() > 0) 
+		{
+			return IrisBlockMaterial.ILLUMINATED;
+		}
+		else
+		{
+			return IrisBlockMaterial.UNKOWN;
+		}
+	}
+	
 }

common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java

@@ -21,6 +21,7 @@ package com.seibel.distanthorizons.common.wrappers.minecraft;
 
 import java.awt.Color;
 import java.lang.invoke.MethodHandles;
+import java.nio.FloatBuffer;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -40,8 +41,9 @@ import com.seibel.distanthorizons.core.render.DhApiRenderProxy;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.ILightMapWrapper;
 
 #if MC_VER < MC_1_19_4
-import com.mojang.math.Vector3f;
+import org.joml.Vector3f;
 #else
+import org.joml.Matrix4f;
 import org.joml.Vector3f;
 #endif
 #if MC_VER >= MC_1_20_2
@@ -78,6 +80,7 @@ import net.minecraft.world.level.material.FogType;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 import org.apache.logging.log4j.Logger;
+import org.joml.Matrix4f;
 
 
 /**
@@ -116,8 +119,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 	public Vec3f getLookAtVector()
 	{
 		Camera camera = MC.gameRenderer.getMainCamera();
-		Vector3f cameraDir = camera.getLookVector();
-		return new Vec3f(cameraDir.x(), cameraDir.y(), cameraDir.z());
+		return new Vec3f(camera.getLookVector().x(), camera.getLookVector().y(), camera.getLookVector().z());
 	}
 	
 	@Override
@@ -148,6 +150,23 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 		return new Vec3d(projectedView.x, projectedView.y, projectedView.z);
 	}
 	
+	@Override
+	public Mat4f getWorldViewMatrix()
+	{
+		Camera camera = MC.gameRenderer.getMainCamera();
+		Vector3f cameraVec3 = new Vector3f(
+				(float)camera.getPosition().x,
+				(float)camera.getPosition().y,
+				(float)camera.getPosition().z);
+		cameraVec3 = cameraVec3.negate();
+		
+		Matrix4f matWorldView = new Matrix4f()
+				.rotateX((float)Math.toRadians(camera.getXRot()))
+				.rotateY((float)Math.toRadians(camera.getYRot() + 180f))
+				.translate(cameraVec3);
+		return new Mat4f(matWorldView);
+	}
+	
 	@Override
 	public Mat4f getDefaultProjectionMatrix(float partialTicks)
 	{
@@ -261,12 +280,6 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 	@Override
 	public int getTargetFrameBuffer()
 	{
-		int frameBufferOverrideId = DhApiRenderProxy.INSTANCE.targetFrameBufferOverride;
-		if (frameBufferOverrideId != -1)
-		{
-			return frameBufferOverrideId;
-		}
-		
 		// used so we can access the framebuffer shaders end up rendering to
 		if (AbstractOptifineAccessor.optifinePresent())
 		{

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java

@@ -19,24 +19,24 @@
 
 package com.seibel.distanthorizons.common.wrappers.worldGeneration.step;
 
-import java.util.ArrayList;
-
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.DhLitWorldGenRegion;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
 
-import net.minecraft.ReportedException;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.ProtoChunk;
 import net.minecraft.world.level.levelgen.Heightmap;
-#if MC_VER >= MC_1_18_2
-#endif
+import org.apache.logging.log4j.Logger;
+
 
 public final class StepFeatures
 {
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	
 	public static final ChunkStatus STATUS = ChunkStatus.FEATURES;
 	
 	private final BatchGenerationEnvironment environment;
@@ -51,36 +51,44 @@ public final class StepFeatures
 			ThreadedParameters tParams, DhLitWorldGenRegion worldGenRegion,
 			ArrayGridList<ChunkWrapper> chunkWrappers)
 	{
-		ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
-		
 		for (ChunkWrapper chunkWrapper : chunkWrappers)
 		{
 			ChunkAccess chunk = chunkWrapper.getChunk();
-			if (chunk.getStatus().isOrAfter(STATUS)) continue;
-			((ProtoChunk) chunk).setStatus(STATUS);
-			chunksToDo.add(chunk);
-		}
-		
-		for (ChunkAccess chunk : chunksToDo)
-		{
+			if (chunk.getStatus().isOrAfter(STATUS))
+			{
+				continue;
+			}
+			
+			if (chunk instanceof ProtoChunk)
+			{
+				((ProtoChunk) chunk).setStatus(STATUS);
+			}
+			
+			
 			try
 			{
 				#if MC_VER < MC_1_18_2
 				worldGenRegion.setOverrideCenter(chunk.getPos());
 				environment.params.generator.applyBiomeDecoration(worldGenRegion, tParams.structFeat);
 				#else
-				environment.params.generator.applyBiomeDecoration(worldGenRegion, chunk,
-						tParams.structFeat.forWorldGenRegion(worldGenRegion));
+				if (worldGenRegion.hasChunk(chunkWrapper.getChunkPos().x, chunkWrapper.getChunkPos().z))
+				{
+					this.environment.params.generator.applyBiomeDecoration(worldGenRegion, chunk, tParams.structFeat.forWorldGenRegion(worldGenRegion));
+				}
+				else
+				{
+					LOGGER.warn("Unable to generate features for chunk at pos ["+chunkWrapper.getChunkPos()+"], world gen region doesn't contain the chunk.");
+				}
 				#endif
 				
 				Heightmap.primeHeightmaps(chunk, STATUS.heightmapsAfter());
 				BatchGenerationEnvironment.clearDistantGenerationMixinData();
 			}
-			catch (ReportedException e)
+			catch (Exception e)
 			{
-				e.printStackTrace();
+				LOGGER.warn("Unexpected issue when generating features for chunk at pos ["+chunkWrapper.getChunkPos()+"], error: ["+e.getMessage()+"].", e);
 				// FIXME: Features concurrent modification issue. Something about cocobeans might just
-				// error out. For now just retry.
+				//  error out. For now just retry.
 			}
 		}
 	}

fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java

@@ -189,9 +189,6 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		// render event //
 		//==============//
 
-        //Define this in the MixinLevelRenderer so that it works with sodium without any changes to the code
-        // TODO: If all else is fine, can we remove these commented code
-		// Client Render Level
 		WorldRenderEvents.AFTER_SETUP.register((renderContext) ->
 		{
 			this.clientApi.renderLods(ClientLevelWrapper.getWrapper(renderContext.world()),

fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java

@@ -93,8 +93,8 @@ public class FabricMain extends AbstractModInitializer implements ClientModIniti
 		this.tryCreateModCompatAccessor("starlight", IStarlightAccessor.class, StarlightAccessor::new);
 		this.tryCreateModCompatAccessor("optifine", IOptifineAccessor.class, OptifineAccessor::new);
 		this.tryCreateModCompatAccessor("bclib", IBCLibAccessor.class, BCLibAccessor::new);
-		#if MC_VER != MC_1_17_1 && MC_VER <= MC_1_20_1
-		// 1.17.1 won't support this since there isn't a matching Iris version
+		#if MC_VER >= MC_1_19_4
+		// 1.19.4 is the lowest version Iris supports DH
 		this.tryCreateModCompatAccessor("iris", IIrisAccessor.class, IrisAccessor::new);
 		#endif
 	}

fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java

@@ -23,12 +23,17 @@ import com.mojang.blaze3d.vertex.PoseStack;
 #if MC_VER < MC_1_19_4
 import com.mojang.math.Matrix4f;
 #else
-import net.minecraft.client.Camera;
-import net.minecraft.client.renderer.GameRenderer;
-import net.minecraft.client.renderer.LightTexture;
 import org.joml.Matrix4f;
 #endif
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
+import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
+import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
+import com.seibel.distanthorizons.core.api.internal.ClientApi;
+import com.seibel.distanthorizons.coreapi.util.math.Mat4f;
+import net.minecraft.client.Camera;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GameRenderer;
+import net.minecraft.client.renderer.LightTexture;
 import com.seibel.distanthorizons.core.config.Config;
 import net.minecraft.client.Camera;
 import net.minecraft.client.multiplayer.ClientLevel;
@@ -37,6 +42,7 @@ import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.world.level.lighting.LevelLightEngine;
+import org.lwjgl.opengl.GL15;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -62,27 +68,6 @@ public class MixinLevelRenderer
 {
     @Shadow
     private ClientLevel level;
-    @Unique
-    private static float previousPartialTicks = 0;
-
-    // Inject rendering at first call to renderChunkLayer
-    // HEAD or RETURN
-	#if MC_VER < MC_1_17_1
-	@Inject(at = @At("RETURN"), method = "renderSky(Lcom/mojang/blaze3d/vertex/PoseStack;F)V")
-	private void renderSky(PoseStack matrixStackIn, float partialTicks, CallbackInfo callback)
-	{
-		// get the partial ticks since renderBlockLayer doesn't
-		// have access to them
-		previousPartialTicks = partialTicks;
-	}
-	#else
-    @Inject(method = "renderClouds", at = @At("HEAD"), cancellable = true)
-    public void renderClouds(PoseStack poseStack, Matrix4f projectionMatrix, float tickDelta, double cameraX, double cameraY, double cameraZ, CallbackInfo ci) {
-        // get the partial ticks since renderChunkLayer doesn't
-        // have access to them
-        previousPartialTicks = tickDelta;
-    }
-    #endif
 
 	#if MC_VER < MC_1_17_1
     @Inject(at = @At("HEAD"),
@@ -106,6 +91,28 @@ public class MixinLevelRenderer
 	private void renderChunkLayer(RenderType renderType, PoseStack modelViewMatrixStack, double camX, double camY, double camZ, Matrix4f projectionMatrix, CallbackInfo callback)
     #endif
     {
+		#if MC_VER == MC_1_16_5
+	    // get the matrices from the OpenGL fixed pipeline
+	    float[] mcProjMatrixRaw = new float[16];
+	    GL15.glGetFloatv(GL15.GL_PROJECTION_MATRIX, mcProjMatrixRaw);
+	    Mat4f mcProjectionMatrix = new Mat4f(mcProjMatrixRaw);
+	    mcProjectionMatrix.transpose();
+	    
+	    Mat4f mcModelViewMatrix = McObjectConverter.Convert(matrixStackIn.last().pose());
+		
+		#else
+		// get the matrices directly from MC
+		Mat4f mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrixStack.last().pose());
+		Mat4f mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
+		#endif
+	    
+	    if (renderType.equals(RenderType.translucent())) {
+		    ClientApi.INSTANCE.renderDeferredLods(ClientLevelWrapper.getWrapper(this.level),
+				    mcModelViewMatrix,
+				    mcProjectionMatrix,
+				    Minecraft.getInstance().getFrameTime());
+	    }
+		
 		// FIXME completely disables rendering when sodium is installed
 		if (Config.Client.Advanced.Debugging.lodOnlyMode.get())
 		{

fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/IrisAccessor.java

@@ -19,7 +19,7 @@
 
 package com.seibel.distanthorizons.fabric.wrappers.modAccessor;
 
-#if MC_VER != MC_1_17_1 && MC_VER <= MC_1_20_1
+#if MC_VER >= MC_1_19_4
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IIrisAccessor;
 import net.coderbot.iris.Iris;

fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/ModChecker.java

@@ -22,6 +22,8 @@ package com.seibel.distanthorizons.fabric.wrappers.modAccessor;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker;
 import net.fabricmc.loader.api.FabricLoader;
 
+import java.io.File;
+
 public class ModChecker implements IModChecker
 {
 	public static final ModChecker INSTANCE = new ModChecker();
@@ -32,4 +34,10 @@ public class ModChecker implements IModChecker
 		return FabricLoader.getInstance().isModLoaded(modid);
 	}
 	
+	@Override
+	public File modLocation(String modid)
+	{
+		return new File(FabricLoader.getInstance().getModContainer(modid).get().getOrigin().getPaths().get(0).toUri());
+	}
+	
 }

forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java

@@ -24,6 +24,7 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Matrix4f;
 #else
 import net.minecraft.client.Camera;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.LightTexture;
 import org.joml.Matrix4f;
@@ -36,18 +37,17 @@ import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
 import com.seibel.distanthorizons.coreapi.util.math.Mat4f;
 import net.minecraft.client.Camera;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.client.renderer.RenderType;
-import net.minecraft.world.level.lighting.LevelLightEngine;
 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.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.nio.FloatBuffer;
@@ -58,17 +58,13 @@ import org.lwjgl.opengl.GL15;
 
 
 /**
- * This class is used to mix in my rendering code
+ * This class is used to mix in DH's rendering code
  * before Minecraft starts rendering blocks.
  * If this wasn't done, and we used Forge's
  * render last event, the LODs would render on top
  * of the normal terrain. <br><br>
  *
  * This is also the mixin for rendering the clouds
- *
- * @author coolGi
- * @author James Seibel
- * @version 12-31-2021
  */
 @Mixin(LevelRenderer.class)
 public class MixinLevelRenderer
@@ -92,13 +88,15 @@ public class MixinLevelRenderer
 	public void renderClouds(PoseStack poseStack, Matrix4f projectionMatrix, float partialTicks, double cameraX, double cameraY, double cameraZ, CallbackInfo ci) 
 	#endif
 	{
+		// FIXME this is only called when clouds are enabled and vanilla render distance is far enough
+		//  not having the parital ticks doesn't appear to be critical currently, but might cause weird issues down the line
+		
 		// get the partial ticks since renderBlockLayer doesn't
 		// have access to them
 		previousPartialTicks = partialTicks;
 	}
 	
 	
-	// TODO: Can we move this to forge's client proxy similarly to how fabric does it
 	#if MC_VER < MC_1_17_1
     @Inject(at = @At("HEAD"),
 			method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDD)V",
@@ -142,7 +140,7 @@ public class MixinLevelRenderer
 		// only render before solid blocks
 		if (renderType.equals(RenderType.solid()))
 		{
-			ClientApi.INSTANCE.renderLods(ClientLevelWrapper.getWrapper(level), mcModelViewMatrix, mcProjectionMatrix, previousPartialTicks);
+			ClientApi.INSTANCE.renderLods(ClientLevelWrapper.getWrapper(this.level), mcModelViewMatrix, mcProjectionMatrix, Minecraft.getInstance().getFrameTime());
 			
 			// experimental proof-of-concept option
 			if (Config.Client.Advanced.Graphics.AdvancedGraphics.seamlessOverdraw.get())
@@ -157,6 +155,10 @@ public class MixinLevelRenderer
 				projectionMatrix.set(matrixFloatArray);
 				#endif
 			}
+		} 
+		else if (renderType.equals(RenderType.translucent())) 
+		{
+			ClientApi.INSTANCE.renderDeferredLods(ClientLevelWrapper.getWrapper(this.level), mcModelViewMatrix, mcProjectionMatrix, Minecraft.getInstance().getFrameTime());
 		}
 		
 		if (Config.Client.Advanced.Debugging.lodOnlyMode.get())

forge/src/main/java/com/seibel/distanthorizons/forge/wrappers/modAccessor/ModChecker.java

@@ -22,6 +22,8 @@ package com.seibel.distanthorizons.forge.wrappers.modAccessor;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker;
 import net.minecraftforge.fml.ModList;
 
+import java.io.File;
+
 public class ModChecker implements IModChecker
 {
 	public static final ModChecker INSTANCE = new ModChecker();
@@ -32,4 +34,10 @@ public class ModChecker implements IModChecker
 		return ModList.get().isLoaded(modid);
 	}
 	
+	@Override
+	public File modLocation(String modid)
+	{
+		return ModList.get().getModFileById(modid).getFile().getFilePath().toFile();
+	}
+	
 }

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinLevelRenderer.java

@@ -24,6 +24,7 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Matrix4f;
 #else
 import net.minecraft.client.Camera;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.LightTexture;
 import org.joml.Matrix4f;
@@ -51,17 +52,13 @@ import org.lwjgl.opengl.GL15;
 
 
 /**
- * This class is used to mix in my rendering code
+ * This class is used to mix in DH's rendering code
  * before Minecraft starts rendering blocks.
  * If this wasn't done, and we used Forge's
  * render last event, the LODs would render on top
  * of the normal terrain. <br><br>
  *
  * This is also the mixin for rendering the clouds
- *
- * @author coolGi
- * @author James Seibel
- * @version 12-31-2021
  */
 @Mixin(LevelRenderer.class)
 public class MixinLevelRenderer
@@ -88,13 +85,15 @@ public class MixinLevelRenderer
 	public void renderClouds(PoseStack poseStack, Matrix4f projectionMatrix, float partialTicks, double cameraX, double cameraY, double cameraZ, CallbackInfo ci) 
 	#endif
 	{
+		// FIXME this is only called when clouds are enabled and vanilla render distance is far enough
+		//  not having the partial ticks doesn't appear to be critical currently, but might cause weird issues down the line
+		
 		// get the partial ticks since renderBlockLayer doesn't
 		// have access to them
 		previousPartialTicks = partialTicks;
 	}
 	
 	
-	// TODO: Can we move this to forge's client proxy similarly to how fabric does it
 	#if MC_VER < MC_1_17_1
     @Inject(at = @At("HEAD"),
 			method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDD)V",
@@ -138,7 +137,7 @@ public class MixinLevelRenderer
 		// only render before solid blocks
 		if (renderType.equals(RenderType.solid()))
 		{
-			ClientApi.INSTANCE.renderLods(ClientLevelWrapper.getWrapper(level), mcModelViewMatrix, mcProjectionMatrix, previousPartialTicks);
+			ClientApi.INSTANCE.renderLods(ClientLevelWrapper.getWrapper(level), mcModelViewMatrix, mcProjectionMatrix, Minecraft.getInstance().getFrameTime());
 			
 			// experimental proof-of-concept option
 			if (Config.Client.Advanced.Graphics.AdvancedGraphics.seamlessOverdraw.get())
@@ -153,6 +152,10 @@ public class MixinLevelRenderer
 				projectionMatrix.set(matrixFloatArray);
 				#endif
 			}
+		} 
+		else if (renderType.equals(RenderType.translucent())) 
+		{
+			ClientApi.INSTANCE.renderDeferredLods(ClientLevelWrapper.getWrapper(level), mcModelViewMatrix, mcProjectionMatrix, Minecraft.getInstance().getFrameTime());
 		}
 		
 		if (Config.Client.Advanced.Debugging.lodOnlyMode.get())