Changing the configuration to the new ingame config function

fixed a bug when zooming on large map

build.gradle

@@ -25,28 +25,27 @@ repositories {
 ext.configFile = file "build.properties"
 
 configFile.withReader {
-    // Load config. It shall from now be referenced as simply config or project.config
-    def prop = new Properties()
-    prop.load(it)
-    project.ext.config = new ConfigSlurper().parse prop
+// Load config. It shall from now be referenced as simply config or project.config
+def prop = new Properties()
+prop.load(it)
+project.ext.config = new ConfigSlurper().parse prop
 }
 
-group= config.mod_group
-archivesBaseName = config.mod_name
-
 dependencies {
 }
 
+group= config.mod_group
 version = config.mod_version
+archivesBaseName = config.mod_name
+
+
 minecraft {
 version = config.mc_version + "-" + config.forge_version
 runDir = "eclipse"
 mappings = config.mcp_version
+replace '@MOD_VERSION@', config.mod_version
 }
 
-
-def root = project.projectDir.parentFile
-
 processResources
 {
     // this will ensure that this task is redone when the versions change.
@@ -67,17 +66,13 @@ processResources
     }
 }
 
-version = "${project.minecraft.version}-${project.version}"
-
 jar {
-//classifier = 'universal'
+classifier = 'universal'
 }
 
-
 task sourceJar(type: Jar) {
-    from sourceSets.main.java
-    from new File(root, "dev")
-    classifier = 'sources'
+    from sourceSets.main.allSource
+    classifier = 'src'
 }
 
 task devJar(type: Jar) {
@@ -86,5 +81,6 @@ classifier = 'dev'
 }
 
 artifacts {
-    		archives sourceJar, devJar
+    		archives sourceJar
+			archives devJar
 }

build.properties

@@ -2,5 +2,5 @@ mod_name=MapWriter
 mod_group=vectron
 mc_version=1.8
 forge_version=11.14.1.1334
-mcp_version=snapshot_20150309
+mcp_version=snapshot_20150319
 mod_version=2.2.3

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Oct 29 18:00:54 CDT 2013
+#Wed Jul 02 15:54:47 CDT 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip

gradlew.bat

@@ -1,90 +1,90 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

src/main/java/mapwriter/ChunkManager.java

@@ -7,6 +7,7 @@
 import mapwriter.region.MwChunk;
 import mapwriter.tasks.SaveChunkTask;
 import mapwriter.tasks.UpdateSurfaceChunksTask;
+import mapwriter.util.Config;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
 
@@ -96,7 +97,7 @@ public void updateUndergroundChunks() {
 	}
 
 	public void updateSurfaceChunks() {
-		int chunksToUpdate = Math.min(this.chunkMap.size(), this.mw.chunksPerTick);
+		int chunksToUpdate = Math.min(this.chunkMap.size(), Config.chunksPerTick);
 		MwChunk[] chunkArray = new MwChunk[chunksToUpdate];
 		for (int i = 0; i < chunksToUpdate; i++) {
 			Map.Entry<Chunk, Integer> entry = this.chunkMap.getNextEntry();
@@ -106,7 +107,7 @@ public void updateSurfaceChunks() {
 				Chunk chunk = entry.getKey();
 
 				int flags = entry.getValue();
-				if (MwUtil.distToChunkSq(this.mw.playerXInt, this.mw.playerZInt, chunk) <= this.mw.maxChunkSaveDistSq) {
+				if (MwUtil.distToChunkSq(this.mw.playerXInt, this.mw.playerZInt, chunk) <= Config.maxChunkSaveDistSq) {
 					flags |= (VISIBLE_FLAG | VIEWED_FLAG);
 				} else {
 					flags &= ~VISIBLE_FLAG;
@@ -139,8 +140,8 @@ public void forceChunks(MwChunk[] chunkArray){
 	}
 
 	private void addSaveChunkTask(Chunk chunk) {
-		if ((this.mw.multiplayer && this.mw.regionFileOutputEnabledMP) || 
-			(!this.mw.multiplayer && this.mw.regionFileOutputEnabledSP)) {
+		if ((this.mw.multiplayer && Config.regionFileOutputEnabledMP) || 
+			(!this.mw.multiplayer && Config.regionFileOutputEnabledSP)) {
 			if (!chunk.isEmpty()) {
 				this.mw.executor.addTask2(new SaveChunkTask(copyToMwChunk(chunk), this.mw.regionManager));
 			}