From 151ca3902ffaad80283e916a0e57b78701dfa00e Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sun, 21 Nov 2021 15:27:23 -0600 Subject: [PATCH] Replace MinecraftRenderWrapper with the interface --- src/main/java/com/seibel/lod/core/render/LodRenderer.java | 4 ++-- src/main/java/com/seibel/lod/core/render/RenderUtil.java | 5 +++-- .../java/com/seibel/lod/core/util/DetailDistanceUtil.java | 4 ++-- src/main/java/com/seibel/lod/core/util/LodUtil.java | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) 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 8782a693f..b797d807f 100644 --- a/src/main/java/com/seibel/lod/core/render/LodRenderer.java +++ b/src/main/java/com/seibel/lod/core/render/LodRenderer.java @@ -50,9 +50,9 @@ import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory; 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.IMinecraftRenderWrapper; import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper; import com.seibel.lod.core.wrapperInterfaces.minecraft.IProfilerWrapper; -import com.seibel.lod.forge.wrappers.minecraft.MinecraftRenderWrapper; /** * This is where all the magic happens.
@@ -64,7 +64,7 @@ import com.seibel.lod.forge.wrappers.minecraft.MinecraftRenderWrapper; public class LodRenderer { private static final IMinecraftWrapper MC = SingletonHandler.get(IMinecraftWrapper.class); - private static final MinecraftRenderWrapper MC_RENDER = MinecraftRenderWrapper.INSTANCE; + private static final IMinecraftRenderWrapper MC_RENDER = SingletonHandler.get(IMinecraftRenderWrapper.class); private static final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class); private static final IReflectionHandler REFLECTION_HANDLER = SingletonHandler.get(IReflectionHandler.class); private static final IWrapperFactory FACTORY = SingletonHandler.get(IWrapperFactory.class); diff --git a/src/main/java/com/seibel/lod/core/render/RenderUtil.java b/src/main/java/com/seibel/lod/core/render/RenderUtil.java index b3dd210cf..2d1a49aa0 100644 --- a/src/main/java/com/seibel/lod/core/render/RenderUtil.java +++ b/src/main/java/com/seibel/lod/core/render/RenderUtil.java @@ -21,9 +21,10 @@ package com.seibel.lod.core.render; import com.seibel.lod.core.objects.math.Vec3f; import com.seibel.lod.core.util.LodUtil; +import com.seibel.lod.core.util.SingletonHandler; import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper; import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper; -import com.seibel.lod.forge.wrappers.minecraft.MinecraftRenderWrapper; +import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; /** * This holds miscellaneous helper code @@ -34,7 +35,7 @@ import com.seibel.lod.forge.wrappers.minecraft.MinecraftRenderWrapper; */ public class RenderUtil { - private static final MinecraftRenderWrapper MC_RENDER = MinecraftRenderWrapper.INSTANCE; + private static final IMinecraftRenderWrapper MC_RENDER = SingletonHandler.get(IMinecraftRenderWrapper.class); /** diff --git a/src/main/java/com/seibel/lod/core/util/DetailDistanceUtil.java b/src/main/java/com/seibel/lod/core/util/DetailDistanceUtil.java index 981327270..219c236ee 100644 --- a/src/main/java/com/seibel/lod/core/util/DetailDistanceUtil.java +++ b/src/main/java/com/seibel/lod/core/util/DetailDistanceUtil.java @@ -23,7 +23,7 @@ import com.seibel.lod.core.enums.config.DistanceGenerationMode; import com.seibel.lod.core.enums.config.HorizontalQuality; import com.seibel.lod.core.enums.config.HorizontalResolution; import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton; -import com.seibel.lod.forge.wrappers.minecraft.MinecraftRenderWrapper; +import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; /** * @@ -33,7 +33,7 @@ import com.seibel.lod.forge.wrappers.minecraft.MinecraftRenderWrapper; public class DetailDistanceUtil { private static final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class); - private static final MinecraftRenderWrapper MC_RENDER = MinecraftRenderWrapper.INSTANCE; + private static final IMinecraftRenderWrapper MC_RENDER = SingletonHandler.get(IMinecraftRenderWrapper.class); private static final double genMultiplier = 1.0; private static final double treeGenMultiplier = 1.0; diff --git a/src/main/java/com/seibel/lod/core/util/LodUtil.java b/src/main/java/com/seibel/lod/core/util/LodUtil.java index 1dcd2cdea..84e745b92 100644 --- a/src/main/java/com/seibel/lod/core/util/LodUtil.java +++ b/src/main/java/com/seibel/lod/core/util/LodUtil.java @@ -35,10 +35,10 @@ import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory; 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.IMinecraftRenderWrapper; import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper; import com.seibel.lod.core.wrapperInterfaces.world.IDimensionTypeWrapper; import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper; -import com.seibel.lod.forge.wrappers.minecraft.MinecraftRenderWrapper; /** * This class holds methods and constants that may be used in multiple places. @@ -49,7 +49,7 @@ import com.seibel.lod.forge.wrappers.minecraft.MinecraftRenderWrapper; public class LodUtil { private static final IMinecraftWrapper MC = SingletonHandler.get(IMinecraftWrapper.class); - private static final MinecraftRenderWrapper MC_RENDER = MinecraftRenderWrapper.INSTANCE; + private static final IMinecraftRenderWrapper MC_RENDER = SingletonHandler.get(IMinecraftRenderWrapper.class); private static final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class); private static final IWrapperFactory FACTORY = SingletonHandler.get(IWrapperFactory.class);