integrate map directory

src/main/java/baritone/chunk/WorldData.java

@@ -31,6 +31,10 @@ public class WorldData {
         this.waypoints = new Waypoints(directory.resolve("waypoints"));
     }
 
+    public Path getMapDirectory() {
+        return directory.resolve("map");
+    }
+
     void onClose() {
         new Thread() {
             public void run() {

src/main/java/baritone/map/Map.java

@@ -1,14 +1,13 @@
 package baritone.map;
 
-import baritone.Baritone;
 import baritone.behavior.Behavior;
+import baritone.chunk.WorldProvider;
 import baritone.event.events.ChunkEvent;
 import net.minecraft.util.math.ChunkPos;
 
 import javax.imageio.ImageIO;
 import java.awt.*;
 import java.awt.image.BufferedImage;
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -63,7 +62,7 @@ public class Map extends Behavior {
     }
 
     public Path getImagePath() {
-        return new File(new File(Baritone.INSTANCE.getDir(), "map"), "full-map.png").toPath();
+        return WorldProvider.INSTANCE.getCurrentWorld().getMapDirectory().resolve("full-map.png");
     }
 
 }

src/main/java/baritone/map/MapChunk.java

@@ -1,6 +1,6 @@
 package baritone.map;
 
-import baritone.Baritone;
+import baritone.chunk.WorldProvider;
 import baritone.utils.BlockStateInterface;
 import baritone.utils.pathing.BetterBlockPos;
 import net.minecraft.block.material.MapColor;
@@ -12,7 +12,6 @@ import net.minecraft.world.chunk.Chunk;
 import javax.imageio.ImageIO;
 import java.awt.*;
 import java.awt.image.BufferedImage;
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -54,7 +53,7 @@ public class MapChunk {
     }
 
     public Path getImagePath() {
-        return new File(new File(Baritone.INSTANCE.getDir(), "map"), "chunk" + chunk.x + "-" + chunk.z + ".png").toPath();
+        return WorldProvider.INSTANCE.getCurrentWorld().getMapDirectory().resolve("chunk" + chunk.x + "-" + chunk.z + ".png");
     }
 
     public Chunk getChunk() {
@@ -65,7 +64,7 @@ public class MapChunk {
      * getColor is a re-implementation of the Minecraft ItemMap's
      * surface mapping system. This is significantly less convoluted
      * than the poorly de-obfuscated code.
-     *
+     * <p>
      * We perform shading of the given coordinate relative to the
      * position one to the north of the coordinate, as can be seen
      * in Minecraft's maps.