Move configs to Config class

5 files changed, 22 insertions, 18 deletions

diff --git a/src/main/java/makamys/neodymium/renderer/ChunkMesh.java b/src/main/java/makamys/neodymium/renderer/ChunkMesh.java
index baf906a..ee76b06 100644
--- a/src/main/java/makamys/neodymium/renderer/ChunkMesh.java
+++ b/src/main/java/makamys/neodymium/renderer/ChunkMesh.java
@@ -14,6 +14,7 @@ import java.util.stream.Collectors;
 
 import org.lwjgl.BufferUtils;
 
+import makamys.neodymium.Config;
 import makamys.neodymium.MixinConfigPlugin;
 import makamys.neodymium.Neodymium;
 import makamys.neodymium.ducks.IWorldRenderer;
@@ -84,7 +85,7 @@ public class ChunkMesh extends Mesh {
         int tessellatorYOffset = fr ? yOffset : 0;
         int tessellatorZOffset = fr ? zOffset : 0;
         
-        boolean optimize = Neodymium.optimizeChunkMeshes;
+        boolean optimize = Config.optimizeChunkMeshes;
         
         ChunkMesh.Flags flags = new ChunkMesh.Flags(t.hasTexture, t.hasBrightness, t.hasColor, t.hasNormals);
         
diff --git a/src/main/java/makamys/neodymium/renderer/GPUMemoryManager.java b/src/main/java/makamys/neodymium/renderer/GPUMemoryManager.java
index a57c4a5..81493cd 100644
--- a/src/main/java/makamys/neodymium/renderer/GPUMemoryManager.java
+++ b/src/main/java/makamys/neodymium/renderer/GPUMemoryManager.java
@@ -12,6 +12,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import makamys.neodymium.Config;
 import makamys.neodymium.Neodymium;
 import makamys.neodymium.renderer.Mesh.GPUStatus;
 import makamys.neodymium.util.GuiHelper;
@@ -30,7 +31,7 @@ public class GPUMemoryManager {
     public GPUMemoryManager() {
         VBO = glGenBuffers();
         
-        bufferSize = Neodymium.VRAMSize * 1024 * 1024;
+        bufferSize = Config.VRAMSize * 1024 * 1024;
         
         glBindBuffer(GL_ARRAY_BUFFER, VBO);
         
diff --git a/src/main/java/makamys/neodymium/renderer/NeoChunk.java b/src/main/java/makamys/neodymium/renderer/NeoChunk.java
index 2a5651f..79deedf 100644
--- a/src/main/java/makamys/neodymium/renderer/NeoChunk.java
+++ b/src/main/java/makamys/neodymium/renderer/NeoChunk.java
@@ -2,6 +2,7 @@ package makamys.neodymium.renderer;
 
 import java.util.List;
 
+import makamys.neodymium.Config;
 import makamys.neodymium.Neodymium;
 import net.minecraft.entity.Entity;
 import net.minecraft.world.chunk.Chunk;
@@ -101,7 +102,7 @@ public class NeoChunk {
 	
 	public void tick(Entity player) {
 		double distSq = distSq(player);
-		if(Neodymium.disableSimpleMeshes || distSq < Math.pow((Neodymium.renderer.renderRange / 2) * 16, 2)) {
+		if(Config.disableSimpleMeshes || distSq < Math.pow((Neodymium.renderer.renderRange / 2) * 16, 2)) {
 		    setLOD(2);
 		} else if(distSq < Math.pow((Neodymium.renderer.renderRange) * 16, 2)) {
 		    setLOD(1);
@@ -164,7 +165,7 @@ public class NeoChunk {
 	}
 	
 	public void receiveChunk(Chunk chunk) {
-	    if(!Neodymium.disableSimpleMeshes) {
+	    if(!Config.disableSimpleMeshes) {
 	        putSimpleMeshes(SimpleChunkMesh.generateSimpleMeshes(chunk));
 	    }
 	}
diff --git a/src/main/java/makamys/neodymium/renderer/NeoRenderer.java b/src/main/java/makamys/neodymium/renderer/NeoRenderer.java
index e721a62..f14c408 100644
--- a/src/main/java/makamys/neodymium/renderer/NeoRenderer.java
+++ b/src/main/java/makamys/neodymium/renderer/NeoRenderer.java
@@ -63,6 +63,7 @@ import org.lwjgl.input.Keyboard;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.util.vector.Matrix4f;
 
+import makamys.neodymium.Config;
 import makamys.neodymium.Neodymium;
 import makamys.neodymium.ducks.IWorldRenderer;
 import makamys.neodymium.renderer.Mesh.GPUStatus;
@@ -162,13 +163,13 @@ public class NeoRenderer {
                 mem.runGC(false);
             }
             lastGCTime = System.currentTimeMillis();
-            if(lastSaveTime == -1 || (System.currentTimeMillis() - lastSaveTime) > saveInterval && Neodymium.saveMeshes) {
+            if(lastSaveTime == -1 || (System.currentTimeMillis() - lastSaveTime) > saveInterval && Config.saveMeshes) {
                 onSave();
                 lastSaveTime = System.currentTimeMillis();
             }
             
             if(rendererActive && renderWorld) {
-                if(frameCount % Neodymium.sortFrequency == 0) {
+                if(frameCount % Config.sortFrequency == 0) {
                     sort();
                 }
                 
@@ -215,7 +216,7 @@ public class NeoRenderer {
             piFirst[i].limit(sentMeshes[i].size());
             piCount[i].limit(sentMeshes[i].size());
             for(Mesh mesh : sentMeshes[i]) {
-                if(mesh.visible && (Neodymium.maxMeshesPerFrame == -1 || renderedMeshes < Neodymium.maxMeshesPerFrame)) {
+                if(mesh.visible && (Config.maxMeshesPerFrame == -1 || renderedMeshes < Config.maxMeshesPerFrame)) {
                     renderedMeshes++;
                     piFirst[i].put(mesh.iFirst);
                     piCount[i].put(mesh.iCount);
@@ -277,19 +278,19 @@ public class NeoRenderer {
     }
     
     public float getFarPlaneDistanceMultiplier() {
-        return (float)Neodymium.farPlaneDistanceMultiplier;
+        return (float)Config.farPlaneDistanceMultiplier;
     }
     
     public void afterSetupFog(int mode, float alpha, float farPlaneDistance) {
         EntityLivingBase entity = Minecraft.getMinecraft().renderViewEntity;
         if(Neodymium.fogEventWasPosted && !Minecraft.getMinecraft().theWorld.provider.doesXZShowFog((int)entity.posX, (int)entity.posZ)) {
-            GL11.glFogf(GL11.GL_FOG_START, mode < 0 ? 0 : farPlaneDistance * (float)Neodymium.fogStart);
-            GL11.glFogf(GL11.GL_FOG_END, mode < 0 ? farPlaneDistance/4 : farPlaneDistance * (float)Neodymium.fogEnd);
+            GL11.glFogf(GL11.GL_FOG_START, mode < 0 ? 0 : farPlaneDistance * (float)Config.fogStart);
+            GL11.glFogf(GL11.GL_FOG_END, mode < 0 ? farPlaneDistance/4 : farPlaneDistance * (float)Config.fogEnd);
         }
     }
     
     private void handleKeyboard() {
-        if(Neodymium.debugPrefix == 0 || (Neodymium.debugPrefix != -1 && Keyboard.isKeyDown(Neodymium.debugPrefix))) {
+        if(Config.debugPrefix == 0 || (Config.debugPrefix != -1 && Keyboard.isKeyDown(Config.debugPrefix))) {
             if(Keyboard.isKeyDown(Keyboard.KEY_F) && !wasDown[Keyboard.KEY_F]) {
                 rendererActive = !rendererActive;
             }
@@ -454,7 +455,7 @@ public class NeoRenderer {
             int fragmentShader;
             fragmentShader = glCreateShader(GL_FRAGMENT_SHADER);
             
-            glShaderSource(fragmentShader, Util.readFile(Neodymium.enableFog ? "shaders/chunk_fog.frag" : "shaders/chunk.frag"));
+            glShaderSource(fragmentShader, Util.readFile(Config.enableFog ? "shaders/chunk_fog.frag" : "shaders/chunk.frag"));
             glCompileShader(fragmentShader);
             
             if(glGetShaderi(fragmentShader, GL_COMPILE_STATUS) == 0) {
@@ -501,7 +502,7 @@ public class NeoRenderer {
     }
     
     public void onWorldRendererPost(WorldRenderer wr) {
-        if(Neodymium.disableChunkMeshes) return;
+        if(Config.disableChunkMeshes) return;
         
         int x = Math.floorDiv(wr.posX, 16);
         int y = Math.floorDiv(wr.posY, 16);
@@ -536,7 +537,7 @@ public class NeoRenderer {
     }
     
     public synchronized void serverTick() {
-        int chunkLoadsRemaining = Neodymium.chunkLoadsPerTick;
+        int chunkLoadsRemaining = Config.chunkLoadsPerTick;
         while(!serverChunkLoadQueue.isEmpty() && chunkLoadsRemaining-- > 0) {
             ChunkCoordIntPair coords = serverChunkLoadQueue.remove(0);
             ChunkProviderServer chunkProviderServer = Minecraft.getMinecraft().getIntegratedServer().worldServerForDimension(world.provider.dimensionId).theChunkProviderServer;
@@ -575,7 +576,7 @@ public class NeoRenderer {
     }
     
     public void lodChunkChanged(NeoChunk lodChunk) {
-        int newLOD = (!lodChunk.hasChunkMeshes() && lodChunk.lod == 2) ? (Neodymium.disableSimpleMeshes ? 0 : 1) : lodChunk.lod;
+        int newLOD = (!lodChunk.hasChunkMeshes() && lodChunk.lod == 2) ? (Config.disableSimpleMeshes ? 0 : 1) : lodChunk.lod;
         for(SimpleChunkMesh sm : lodChunk.simpleMeshes) {
             if(sm != null) {
                 if(lodChunk.isFullyVisible() && newLOD == 1) {
diff --git a/src/main/java/makamys/neodymium/renderer/SimpleChunkMesh.java b/src/main/java/makamys/neodymium/renderer/SimpleChunkMesh.java
index d3d2501..0c21fe8 100644
--- a/src/main/java/makamys/neodymium/renderer/SimpleChunkMesh.java
+++ b/src/main/java/makamys/neodymium/renderer/SimpleChunkMesh.java
@@ -6,7 +6,7 @@ import java.util.List;
 
 import org.lwjgl.BufferUtils;
 
-import makamys.neodymium.Neodymium;
+import makamys.neodymium.Config;
 import makamys.neodymium.util.MCUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockGrass;
@@ -31,7 +31,7 @@ public class SimpleChunkMesh extends Mesh {
 	}
 	
 	private static boolean isBad(Block block) {
-	    for(Class clazz : Neodymium.blockClassBlacklist) {
+	    for(Class clazz : Config.blockClassBlacklist) {
 	        if(clazz.isInstance(block)) {
 	            return true;
 	        }
@@ -112,7 +112,7 @@ public class SimpleChunkMesh extends Mesh {
 						}
 						color = (0xFF << 24) | ((color >> 16 & 0xFF) << 0) | ((color >> 8 & 0xFF) << 8) | ((color >> 0 & 0xFF) << 16);
 						
-						if((Neodymium.forceVanillaBiomeTemperature ? MCUtil.getBiomeTemperatureVanilla(biome, worldX, y, worldZ)
+						if((Config.forceVanillaBiomeTemperature ? MCUtil.getBiomeTemperatureVanilla(biome, worldX, y, worldZ)
 						        : biome.getFloatTemperature(worldX, y, worldZ)) < 0.15f) {
 						    
 						    builder.addCube(divX, divZ, worldY + 0.2f, 1f, Blocks.snow_layer.getIcon(1, 0), 0xFFFFFFFF, brightnessMult);