diff --git a/src/main/java/backsun/lod/objects/LodDimensionalStorage.java b/src/main/java/backsun/lod/objects/LodDimension.java similarity index 97% rename from src/main/java/backsun/lod/objects/LodDimensionalStorage.java rename to src/main/java/backsun/lod/objects/LodDimension.java index c2763976d..be45b319f 100644 --- a/src/main/java/backsun/lod/objects/LodDimensionalStorage.java +++ b/src/main/java/backsun/lod/objects/LodDimension.java @@ -5,13 +5,13 @@ import net.minecraft.client.Minecraft; import net.minecraft.world.DimensionType; /** - * This object holds the LOD regions - * of a given dimension. + * This object holds all loaded LOD regions + * for a given dimension. * * @author James Seibel * @version 01-30-2021 */ -public class LodDimensionalStorage +public class LodDimension { public final DimensionType dimension; @@ -26,7 +26,7 @@ public class LodDimensionalStorage private LodRegionFileHandler rfHandler; - public LodDimensionalStorage(DimensionType newDimension, int newMaxWidth) + public LodDimension(DimensionType newDimension, int newMaxWidth) { dimension = newDimension; width = newMaxWidth; diff --git a/src/main/java/backsun/lod/objects/LodStorage.java b/src/main/java/backsun/lod/objects/LodWorld.java similarity index 55% rename from src/main/java/backsun/lod/objects/LodStorage.java rename to src/main/java/backsun/lod/objects/LodWorld.java index b3928c146..e80f1e6a0 100644 --- a/src/main/java/backsun/lod/objects/LodStorage.java +++ b/src/main/java/backsun/lod/objects/LodWorld.java @@ -9,29 +9,29 @@ import java.util.Hashtable; * @author James Seibel * @version 01-30-2021 */ -public class LodStorage +public class LodWorld { /** * Key = Dimension id (as an int) */ - private Dictionary LodDimensions; + private Dictionary LodDimensions; public String worldName; - public LodStorage() + public LodWorld() { - LodDimensions = new Hashtable(); + LodDimensions = new Hashtable(); } - public void addLodDimensionalStorage(LodDimensionalStorage newStorage) + public void addLodDimension(LodDimension newStorage) { LodDimensions.put(newStorage.dimension.getId(), newStorage); } - public LodDimensionalStorage getLodDimensionalStorage(int dimensionId) + public LodDimension getLodDimension(int dimensionId) { return LodDimensions.get(dimensionId); } diff --git a/src/main/java/backsun/lod/proxy/ClientProxy.java b/src/main/java/backsun/lod/proxy/ClientProxy.java index 2bdc92e28..38c7827f0 100644 --- a/src/main/java/backsun/lod/proxy/ClientProxy.java +++ b/src/main/java/backsun/lod/proxy/ClientProxy.java @@ -4,9 +4,9 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import backsun.lod.objects.LodChunk; -import backsun.lod.objects.LodDimensionalStorage; +import backsun.lod.objects.LodDimension; import backsun.lod.objects.LodRegion; -import backsun.lod.objects.LodStorage; +import backsun.lod.objects.LodWorld; import backsun.lod.renderer.LodRenderer; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; @@ -27,7 +27,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class ClientProxy extends CommonProxy { private LodRenderer renderer; - private LodStorage lodStorage; + private LodWorld lodWorld; private ExecutorService lodGenThreadPool = Executors.newFixedThreadPool(1); // TODO make this change dynamically based on the render distance @@ -48,24 +48,24 @@ public class ClientProxy extends CommonProxy @SubscribeEvent public void renderWorldLastEvent(RenderWorldLastEvent event) { - // We can't render anything if the lodStorage is null - if (lodStorage == null) + // We can't render anything if the lodWorld is null + if (lodWorld == null) return; Minecraft mc = Minecraft.getMinecraft(); int dimId = mc.player.dimension; - LodDimensionalStorage regions = lodStorage.getLodDimensionalStorage(dimId); + LodDimension lodDim = lodWorld.getLodDimension(dimId); double playerX = mc.player.posX; double playerZ = mc.player.posZ; - int xOffset = ((int)playerX / (LodChunk.WIDTH * LodRegion.SIZE)) - regions.getCenterX(); - int zOffset = ((int)playerZ / (LodChunk.WIDTH * LodRegion.SIZE)) - regions.getCenterZ(); + int xOffset = ((int)playerX / (LodChunk.WIDTH * LodRegion.SIZE)) - lodDim.getCenterX(); + int zOffset = ((int)playerZ / (LodChunk.WIDTH * LodRegion.SIZE)) - lodDim.getCenterZ(); if (xOffset != 0 || zOffset != 0) { - regions.move(xOffset, zOffset); + lodDim.move(xOffset, zOffset); } @@ -147,27 +147,27 @@ public class ClientProxy extends CommonProxy Thread thread = new Thread(() -> { LodChunk lod = new LodChunk(chunk, mc.world); - LodDimensionalStorage regions; + LodDimension lodDim; - if (lodStorage == null) - lodStorage = new LodStorage(); + if (lodWorld == null) + lodWorld = new LodWorld(); - if (lodStorage.getLodDimensionalStorage(dimId) == null) + if (lodWorld.getLodDimension(dimId) == null) { DimensionType dim = DimensionType.getById(chunk.getWorld().provider.getDimension()); - regions = new LodDimensionalStorage(dim, regionWidth); - lodStorage.addLodDimensionalStorage(regions); + lodDim = new LodDimension(dim, regionWidth); + lodWorld.addLodDimension(lodDim); } else { - regions = lodStorage.getLodDimensionalStorage(dimId); + lodDim = lodWorld.getLodDimension(dimId); } - regions.addLod(lod); + lodDim.addLod(lod); if (renderer != null) { - renderer.regions = regions; + renderer.regions = lodDim; } }); diff --git a/src/main/java/backsun/lod/renderer/LodRenderer.java b/src/main/java/backsun/lod/renderer/LodRenderer.java index 9ec9c9dca..3a6620aef 100644 --- a/src/main/java/backsun/lod/renderer/LodRenderer.java +++ b/src/main/java/backsun/lod/renderer/LodRenderer.java @@ -5,7 +5,7 @@ import java.awt.Color; import org.lwjgl.opengl.GL11; import org.lwjgl.util.glu.Project; -import backsun.lod.objects.LodDimensionalStorage; +import backsun.lod.objects.LodDimension; import backsun.lod.objects.LodChunk; import backsun.lod.util.OfConfig; import backsun.lod.util.enums.ColorDirection; @@ -42,7 +42,7 @@ public class LodRenderer private OfConfig ofConfig; - public LodDimensionalStorage regions = null; + public LodDimension regions = null; diff --git a/src/main/java/backsun/lod/util/LodRegionFileHandler.java b/src/main/java/backsun/lod/util/LodRegionFileHandler.java index 9dfc0aafa..c929bc523 100644 --- a/src/main/java/backsun/lod/util/LodRegionFileHandler.java +++ b/src/main/java/backsun/lod/util/LodRegionFileHandler.java @@ -8,7 +8,7 @@ import java.io.IOException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import backsun.lod.objects.LodDimensionalStorage; +import backsun.lod.objects.LodDimension; import backsun.lod.objects.LodChunk; import backsun.lod.objects.LodRegion; import net.minecraft.client.Minecraft; @@ -24,7 +24,7 @@ import net.minecraft.world.storage.ISaveHandler; */ public class LodRegionFileHandler { - private LodDimensionalStorage loadedRegion = null; + private LodDimension loadedRegion = null; public long regionLastWriteTime[][]; // String s = Minecraft.getMinecraftDir().getCanonicalPath() + "/saves/" + world.getSaveHandler().getSaveDirectoryName() + "/data/AA/World" + world.provider.dimensionId + ".dat"; @@ -39,7 +39,7 @@ public class LodRegionFileHandler private boolean waitingToSaveRegions = false; - public LodRegionFileHandler(ISaveHandler newSaveHandler, LodDimensionalStorage newLoadedRegion) + public LodRegionFileHandler(ISaveHandler newSaveHandler, LodDimension newLoadedRegion) { saveHandler = newSaveHandler; @@ -49,7 +49,7 @@ public class LodRegionFileHandler } loadedRegion = newLoadedRegion; - // these two variable are used in sync with the LodDimensionalStorage + // these two variable are used in sync with the LodDimension regionLastWriteTime = new long[loadedRegion.getWidth()][loadedRegion.getWidth()]; for(int i = 0; i < loadedRegion.getWidth(); i++) for(int j = 0; j < loadedRegion.getWidth(); j++)