From 8ecd5dd9cbf57f0e8ba7cbaa75289d5270176027 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Tue, 30 Apr 2024 18:57:07 -0500 Subject: [PATCH] Fix optifine 1.16 support --- .../distanthorizons/core/render/renderer/LodRenderer.java | 7 ++++--- .../core/wrapperInterfaces/misc/ILightMapWrapper.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/LodRenderer.java b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/LodRenderer.java index 584e275f1..bc754b520 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/LodRenderer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/LodRenderer.java @@ -57,6 +57,9 @@ import org.apache.logging.log4j.LogManager; import org.lwjgl.opengl.GL32; import java.awt.*; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; import java.time.Duration; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; @@ -425,7 +428,7 @@ public class LodRenderer combinedMatrix.multiply(renderEventParam.dhModelViewMatrix); // Note: this can be very slow if a lot of boxes are being rendered - DebugRenderer.INSTANCE.render(combinedMatrix); + DebugRenderer.INSTANCE.render(combinedMatrix); profiler.popPush("LOD cleanup"); } @@ -591,8 +594,6 @@ public class LodRenderer { if (this.usingMcFrameBuffer && framebufferOverride == null) { - // recreating the GL State at this point is necessary in order to get the correct depth texture - minecraftGlState.saveState(); if (ENABLE_DUMP_GL_STATE) { tickLogger.debug("Re-saving GL state due to Optifine presence: " + minecraftGlState); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/misc/ILightMapWrapper.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/misc/ILightMapWrapper.java index d16cbfa44..9d601653b 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/misc/ILightMapWrapper.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/misc/ILightMapWrapper.java @@ -28,7 +28,7 @@ import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindab public interface ILightMapWrapper extends IBindable { - // Returns the binded texture position + /** Returns the bound texture position */ void bind(); void unbind();