From d85589c41a3ac6d3abbc58b3f0be2356518ec783 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 21 Mar 2026 15:22:04 -0500 Subject: [PATCH] minor comment changes --- .../distanthorizons/common/AbstractModInitializer.java | 6 +++--- .../common/render/openGl/GlDhRenderApiDefinition.java | 6 ------ .../common/render/openGl/glObject/buffer/GLBuffer.java | 3 ++- .../distanthorizons/common/wrappers/DependencySetup.java | 1 + 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java b/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java index 76211be17..3c7c167b1 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java @@ -234,9 +234,9 @@ public abstract class AbstractModInitializer CompletableFuture future = new CompletableFuture<>(); // This method may be called from either the render thread, - // or some other random setup thread. - // In order to avoid confusion we're always going to run - // this setup on our own thread. + // or some other random setup thread depending on the mod loader. + // In order to avoid confusion/inconsistent problems, we're always going + // to run setup on our own thread. Thread dhSetupThread = new Thread(() -> { try diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/GlDhRenderApiDefinition.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/GlDhRenderApiDefinition.java index 215347eac..d7cc51d92 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/GlDhRenderApiDefinition.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/GlDhRenderApiDefinition.java @@ -45,12 +45,6 @@ public class GlDhRenderApiDefinition extends AbstractDhRenderApiDefinition @Override public IDhVanillaFadeRenderer getVanillaFadeRenderer() { return GlVanillaFadeRenderer.INSTANCE; } @Override public IDhTestTriangleRenderer getTestTriangleRenderer() { return GlTestTriangleRenderer.INSTANCE; } - @Override - public void bindRenderers() - { - super.bindRenderers(); - } - //endregion diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/glObject/buffer/GLBuffer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/glObject/buffer/GLBuffer.java index 2cd787f6e..0f47de122 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/glObject/buffer/GLBuffer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/glObject/buffer/GLBuffer.java @@ -165,12 +165,13 @@ public class GLBuffer implements AutoCloseable BUFFER_ID_TO_PHANTOM.remove(id); } + bufferCount.decrementAndGet(); + // destroy the buffer if it exists, // the buffer may not exist if the destroy method is called twice if (GL32.glIsBuffer(id)) { GLMC.glDeleteBuffers(id); - bufferCount.decrementAndGet(); if (Config.Client.Advanced.Debugging.logBufferGarbageCollection.get()) { diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java index b0d03841a..8d257a2cf 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java @@ -80,6 +80,7 @@ public class DependencySetup SingletonInjector.INSTANCE.bind(IConfigGui.class, ClassicConfigGUI.CONFIG_CORE_INTERFACE); } + /** will be called from a DH thread, not the render thread */ public static void setRenderingApiBindings() { EDhApiRenderApi renderingApiEnum = Config.Client.Advanced.Graphics.Experimental.renderingApi.get();