diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFogRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFogRenderer.java index c18e71ce2..e9790bed0 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFogRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFogRenderer.java @@ -69,8 +69,6 @@ public class BlazeDhFogRenderer implements IDhFogRenderer { public static final DhLogger LOGGER = new DhLoggerBuilder().build(); - private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class); - private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class); private static final AbstractDhRenderApiDefinition RENDER_API_DEF = SingletonInjector.INSTANCE.get(AbstractDhRenderApiDefinition.class); private static final GpuDevice GPU_DEVICE = RenderSystem.getDevice(); @@ -203,7 +201,7 @@ public class BlazeDhFogRenderer implements IDhFogRenderer fogColor.getBlue() / 255.0f, fogColor.getAlpha() / 255.0f) // uFogColor .putFloat(1.f / lodDrawDistance) //uFogScale - .putFloat(1.f / MC.getWrappedClientLevel().getMaxHeight()) //uFogVerticalScale + .putFloat(1.f / renderParams.clientLevelWrapper.getMaxHeight()) //uFogVerticalScale .putInt(0) //uFogDebugMode // 0 = normal // 1 = render everything with fog color // 7 = use debug rendering .putInt(fogRenderParams.getFarFogFalloff().value) //uFogFalloffType @@ -230,7 +228,7 @@ public class BlazeDhFogRenderer implements IDhFogRenderer .putInt(fogRenderParams.getHeightFogDirection().fogAppliesDown ? 1 : 0) // uHeightFogAppliesDown .putInt(useSphericalFog ? 1 : 0) // uUseSphericalFog .putInt(heightFogMixingMode.value) // uHeightFogMixingMode - .putFloat((float)MC_RENDER.getCameraExactPosition().y) // uCameraBlockYPos + .putFloat((float)renderParams.exactCameraPosition.y) // uCameraBlockYPos .putMat4f(inverseMvmProjMatrix) // uInvMvmProj diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fog/GlDhFogShader.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fog/GlDhFogShader.java index 46738c2cb..84040eb78 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fog/GlDhFogShader.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fog/GlDhFogShader.java @@ -41,9 +41,7 @@ public class GlDhFogShader extends GlAbstractShaderRenderer { public static final GlDhFogShader INSTANCE = new GlDhFogShader(); - private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class); private static final MinecraftGLWrapper GLMC = MinecraftGLWrapper.INSTANCE; - private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class); @@ -172,7 +170,7 @@ public class GlDhFogShader extends GlAbstractShaderRenderer // Fog uniforms this.shader.setUniform(this.uFogColor, this.fogRenderParams.getFogColor()); this.shader.setUniform(this.uFogScale, 1.f / lodDrawDistance); - this.shader.setUniform(this.uFogVerticalScale, 1.f / MC.getWrappedClientLevel().getMaxHeight()); + this.shader.setUniform(this.uFogVerticalScale, 1.f / renderParams.clientLevelWrapper.getMaxHeight()); this.shader.setUniform(this.uFogDebugMode, 0); // 0 = normal // 1 = render everything with fog color // 7 = use debug rendering this.shader.setUniform(this.uFogFalloffType, this.fogRenderParams.getFarFogFalloff().value); diff --git a/coreSubProjects b/coreSubProjects index 28a8bc39f..a4e2003e0 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 28a8bc39f22403cefd169f252fdad0e2954fce96 +Subproject commit a4e2003e0e9853238d294cc7d433234e181ba3da