Fix init error by moving bufferFactory to ClientApi

This commit is contained in:
tom lee
2022-02-22 11:35:42 +08:00
parent fa3d07edb5
commit d39912e235
5 changed files with 7 additions and 9 deletions
@@ -36,10 +36,9 @@ import org.apache.logging.log4j.Logger;
*/
public class ApiShared
{
public ApiShared INSTANCE = new ApiShared();
public static final Logger LOGGER = LogManager.getLogger(ModInfo.NAME);
public ApiShared INSTANCE = new ApiShared();
public static final LodBufferBuilderFactory lodBufferBuilderFactory = new LodBufferBuilderFactory();
public static final LodWorld lodWorld = new LodWorld();
public static final LodBuilder lodBuilder = new LodBuilder();
@@ -32,6 +32,7 @@ import org.apache.logging.log4j.Logger;
import org.lwjgl.glfw.GLFW;
import com.seibel.lod.core.ModInfo;
import com.seibel.lod.core.builders.bufferBuilding.LodBufferBuilderFactory;
import com.seibel.lod.core.enums.config.DistanceGenerationMode;
import com.seibel.lod.core.objects.lod.LodDimension;
import com.seibel.lod.core.objects.math.Mat4f;
@@ -63,8 +64,9 @@ public class ClientApi
= Collections.synchronizedList(new LinkedList<WeakReference<SpamReducedLogger>>());
public static final ClientApi INSTANCE = new ClientApi();
public static LodRenderer renderer = new LodRenderer(ApiShared.lodBufferBuilderFactory);
public static final LodBufferBuilderFactory lodBufferBuilderFactory = new LodBufferBuilderFactory();
public static LodRenderer renderer = new LodRenderer(lodBufferBuilderFactory);
private static final IMinecraftWrapper MC = SingletonHandler.get(IMinecraftWrapper.class);
private static final IMinecraftRenderWrapper MC_RENDER = SingletonHandler.get(IMinecraftRenderWrapper.class);
@@ -170,7 +172,7 @@ public class ClientApi
}
if (prefLoggerEnabled) {
lodDim.dumpRamUsage();
ApiShared.lodBufferBuilderFactory.dumpBufferMemoryUsage();
lodBufferBuilderFactory.dumpBufferMemoryUsage();
}
LagSpikeCatcher updateToBeLoadedChunk = new LagSpikeCatcher();
@@ -179,7 +179,7 @@ public class EventApi {
ApiShared.previousVertQual = null;
// TODO: Check if after the refactoring, is this still needed
ClientApi.renderer = new LodRenderer(ApiShared.lodBufferBuilderFactory);
ClientApi.renderer = new LodRenderer(ClientApi.lodBufferBuilderFactory);
ClientApi.INSTANCE.rendererDisabledBecauseOfExceptions = false;
}
@@ -56,7 +56,6 @@ import com.seibel.lod.core.util.SingletonHandler;
import com.seibel.lod.core.util.SpamReducedLogger;
import com.seibel.lod.core.util.StatsMap;
import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper;
@@ -27,7 +27,6 @@ import java.util.concurrent.TimeUnit;
import org.lwjgl.opengl.GL32;
import com.seibel.lod.core.api.ApiShared;
import com.seibel.lod.core.api.ClientApi;
import com.seibel.lod.core.builders.bufferBuilding.LodBufferBuilderFactory;
import com.seibel.lod.core.builders.lodBuilding.LodBuilder;
import com.seibel.lod.core.enums.rendering.DebugMode;
@@ -36,7 +35,6 @@ import com.seibel.lod.core.enums.rendering.FogDistance;
import com.seibel.lod.core.handlers.IReflectionHandler;
import com.seibel.lod.core.objects.RenderRegion;
import com.seibel.lod.core.objects.lod.LodDimension;
import com.seibel.lod.core.objects.lod.LodDimension.PosComsumer;
import com.seibel.lod.core.objects.math.Mat4f;
import com.seibel.lod.core.objects.math.Vec3d;
import com.seibel.lod.core.render.objects.LightmapTexture;