Major restructuring of Vars class- made global state less messy

core/src/io/anuke/mindustry/ai/PassTileGraph.java

@@ -1,11 +1,10 @@
 package io.anuke.mindustry.ai;
 
-import static io.anuke.mindustry.Vars.worldsize;
-
 import com.badlogic.gdx.ai.pfa.Connection;
 import com.badlogic.gdx.ai.pfa.indexed.IndexedGraph;
 import com.badlogic.gdx.utils.Array;
 
+import io.anuke.mindustry.World;
 import io.anuke.mindustry.world.Tile;
 /**Tilegraph that ignores player-made tiles.*/
 public class PassTileGraph implements IndexedGraph<Tile>{
@@ -28,11 +27,11 @@ public class PassTileGraph implements IndexedGraph<Tile>{
 
 	@Override
 	public int getIndex(Tile node){
-		return node.x+node.y*worldsize;
+		return node.x+node.y*World.worldsize;
 	}
 
 	@Override
 	public int getNodeCount(){
-		return worldsize*worldsize;
+		return World.worldsize*World.worldsize;
 	}
 }

core/src/io/anuke/mindustry/ai/Pathfind.java

@@ -1,13 +1,12 @@
 package io.anuke.mindustry.ai;
 
-import static io.anuke.mindustry.Vars.*;
-
 import com.badlogic.gdx.ai.pfa.DefaultGraphPath;
 import com.badlogic.gdx.ai.pfa.PathFinder;
 import com.badlogic.gdx.ai.pfa.indexed.IndexedAStarPathFinder;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.utils.Array;
 
+import io.anuke.mindustry.World;
 import io.anuke.mindustry.entities.Enemy;
 import io.anuke.mindustry.world.Tile;
 public class Pathfind{
@@ -52,8 +51,8 @@ public class Pathfind{
 	
 	static public void updatePath(){
 		if(paths.size == 0){
-			pathSequences = new Tile[spawnpoints.size][0];
-			for(int i = 0; i < spawnpoints.size; i ++){
+			pathSequences = new Tile[World.spawnpoints.size][0];
+			for(int i = 0; i < World.spawnpoints.size; i ++){
 				DefaultGraphPath<Tile> path = new DefaultGraphPath<>();
 				paths.add(path);
 			}
@@ -64,8 +63,8 @@ public class Pathfind{
 			
 			path.clear();
 			passpathfinder.searchNodePath(
-					spawnpoints.get(i), 
-					core, heuristic, path);
+					World.spawnpoints.get(i), 
+					World.core, heuristic, path);
 			
 			pathSequences[i] = new Tile[path.getCount()];