diff --git a/src/main/java/com/seibel/lod/core/builders/lodBuilding/bufferBuilding/LodBufferBuilderFactory.java b/src/main/java/com/seibel/lod/core/builders/lodBuilding/bufferBuilding/LodBufferBuilderFactory.java index d5b4d2611..08b71ed6b 100644 --- a/src/main/java/com/seibel/lod/core/builders/lodBuilding/bufferBuilding/LodBufferBuilderFactory.java +++ b/src/main/java/com/seibel/lod/core/builders/lodBuilding/bufferBuilding/LodBufferBuilderFactory.java @@ -135,10 +135,6 @@ public class LodBufferBuilderFactory { // only allow one generation process to happen at a time if (builderThreadRunning) return false; - if (MC.getCurrentLightMap() == null) - // the lighting hasn't loaded yet - return false; - builderThreadRunning = true; Runnable thread = () -> generateLodBuffersThread(renderer, lodDim, playerX, playerY, playerZ, fullRegen); diff --git a/src/main/java/com/seibel/lod/core/render/LodRenderer.java b/src/main/java/com/seibel/lod/core/render/LodRenderer.java index a5e4c8ce3..699723980 100644 --- a/src/main/java/com/seibel/lod/core/render/LodRenderer.java +++ b/src/main/java/com/seibel/lod/core/render/LodRenderer.java @@ -169,6 +169,8 @@ public class LodRenderer // which blindness relies on. return; } + if (MC_RENDER.getLightmapWrapper() == null) + return; // get MC's shader program // Save all MC render state diff --git a/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftClientWrapper.java b/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftClientWrapper.java index c464d367d..a01cd3bf9 100644 --- a/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftClientWrapper.java +++ b/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftClientWrapper.java @@ -70,20 +70,7 @@ public interface IMinecraftClientWrapper extends IBindable IDimensionTypeWrapper getCurrentDimension(); String getCurrentDimensionId(); - - /** This texture changes every frame */ - ILightMapWrapper getCurrentLightMap(); - - /** - * Returns the color int at the given pixel coordinates - * from the current lightmap. - * @param blockLight x location in texture space - * @param skyLight z location in texture space - */ - int getColorIntFromLightMap(int blockLight, int skyLight); - - - + //=============// // Simple gets // //=============// diff --git a/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftRenderWrapper.java b/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftRenderWrapper.java index 49f6ae193..d73c0170f 100644 --- a/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftRenderWrapper.java +++ b/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftRenderWrapper.java @@ -35,6 +35,7 @@ import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper; import com.seibel.lod.core.wrapperInterfaces.misc.ILightMapWrapper; import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor; import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper; +import org.jetbrains.annotations.Nullable; /** * Contains everything related to @@ -130,22 +131,8 @@ public interface IMinecraftRenderWrapper extends IBindable } return renderedPos; } - - /** @returns null if there was a issue getting the lightmap */ - @Deprecated - int[] getLightmapPixels(); ILightMapWrapper getLightmapWrapper(); - - /** @returns -1 if there was an issue getting the lightmap */ - @Deprecated - int getLightmapTextureHeight(); - /** @returns -1 if there was an issue getting the lightmap */ - @Deprecated - int getLightmapTextureWidth(); - /** @returns -1 if there was an issue getting the lightmap */ - @Deprecated - int getLightmapGLFormat(); // Try and disable vanilla fog. Return true if successful, or false if not able to. boolean tryDisableVanillaFog(); diff --git a/src/main/java/com/seibel/lod/core/wrapperInterfaces/misc/ILightMapWrapper.java b/src/main/java/com/seibel/lod/core/wrapperInterfaces/misc/ILightMapWrapper.java index e74e0c4e6..8be904ecf 100644 --- a/src/main/java/com/seibel/lod/core/wrapperInterfaces/misc/ILightMapWrapper.java +++ b/src/main/java/com/seibel/lod/core/wrapperInterfaces/misc/ILightMapWrapper.java @@ -27,8 +27,6 @@ import com.seibel.lod.core.handlers.dependencyInjection.IBindable; */ public interface ILightMapWrapper extends IBindable { - @Deprecated - int getLightValue(int skyLight, int blockLight); // Returns the binded texture position void bind();