merged master

src/MoF/MapViewer.java

@@ -111,7 +111,7 @@ public class MapViewer extends JComponent implements MouseListener, MouseWheelLi
 		g2d.setColor(new Color(25, 25, 25));
 		g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
 		g2d.setFont(new Font("arial", Font.BOLD, 15));
-		g2d.drawString(proj.seedText, 20, 30);
+		g2d.drawString(Options.instance.getSeedMessage(), 20, 30);
 		if (mTracking) { 
 			Point p = this.getMousePosition();
 			if (p!=null) {

src/MoF/Project.java

@@ -1,5 +1,6 @@
 package MoF;
 
+import amidst.Options;
 import amidst.map.MapObject;
 import amidst.map.MapObjectPlayer;
 
@@ -11,9 +12,9 @@ import java.util.TimerTask;
 
 import javax.swing.JPanel;
 
+@Deprecated //TODO: we should remove this and integrate it into Options
 public class Project extends JPanel {
 	private static final long serialVersionUID = 1132526465987018165L;
-	private long seed;
 	
 	public MapViewer map;
 	private MapInfoPanel minfo;
@@ -25,13 +26,11 @@ public class Project extends JPanel {
 	public boolean saveLoaded;
 	public SaveLoader save;
 	
-	public String seedText;
-	
 	public Project(String seed) {
 		this(stringToLong(seed));
-		this.seedText = "Seed: \"" + seed + "\" (" + this.seed +  ")";
+		Options.instance.seedText = seed;
 		
-		Google.track("seed/" + seed + "/" + this.seed);
+		Google.track("seed/" + seed + "/" + Options.instance.seed);
 	}
 	
 	public Project(long seed) {
@@ -43,24 +42,22 @@ public class Project extends JPanel {
 		saveLoaded = true;
 		save = file;
 		
-		Google.track("seed/file/" + this.seed);
+		Google.track("seed/file/" + Options.instance.seed);
 		List<MapObjectPlayer> players = file.getPlayers();
 		manager.setPlayerData(players);
 	}
 	
 	public Project(String seed, SaveLoader.Type type) {
 		this(stringToLong(seed), type);
-		this.seedText = "Seed: \"" + seed + "\" (" + this.seed +  ")";
 		
-		Google.track("seed/" + seed + "/" + this.seed);
+		Google.track("seed/" + seed + "/" + Options.instance.seed);
 	}
 	
 	public Project(long seed, SaveLoader.Type type) {
 		SaveLoader.genType = type;
 		saveLoaded = false;
 		//Enter seed data:
-		this.seed = seed;
-		this.seedText = "Seed: " + seed;
+		Options.instance.seed = seed;
 		
 		manager = new ChunkManager(seed);
 		manager.start();
@@ -123,15 +120,6 @@ public class Project extends JPanel {
 			}
 		}
 	}
-	public long getSeed() {
-		return seed;
-	}
-	public void setSeed(String seed) {
-		this.seed = stringToLong(seed);
-	}
-	public void setSeed(long seed) {
-		this.seed = seed;
-	}
 	
 	
 	public void moveMapTo(int x, int y) {

src/amidst/Amidst.java

@@ -2,7 +2,10 @@ package amidst;
 
 import MoF.FinderWindow;
 import MoF.Google;
+import MoF.Project;
+import MoF.SaveLoader;
 
+import java.io.File;
 import java.io.IOException;
 
 public class Amidst {
@@ -14,7 +17,15 @@ public class Amidst {
 		Google.startTracking();
 		Google.track("Run");
 		//TODO: load options
-		new FinderWindow(); //as long as we design it well, we won’t need a reference to it ;)
+		FinderWindow w = new FinderWindow(); //as long as we design it well, we won’t need a reference to it ;)
+		//TODO: redesign, move to optipns
+		if (args.length > 0) {
+			File dat = new File(args[0]);
+			if (dat.isFile())
+				w.setProject(new Project(new SaveLoader(dat)));
+			else
+				w.setProject(new Project(args[0]));
+		}
 	}
 	
 	public static String version() {

src/amidst/Options.java

@@ -7,7 +7,9 @@ import javax.swing.JToggleButton.ToggleButtonModel;
  */
 public enum Options {
 	instance;
-
+	
+	public long seed;
+	public String seedText;
 	public ToggleButtonModel showSlimeChunks;
 	public ToggleButtonModel showGrid;
 	public ToggleButtonModel showNetherFortresses;
@@ -15,6 +17,8 @@ public enum Options {
 	public boolean saveEnabled;
 	
 	private Options() {
+		seed = 0L;
+		seedText = null;
 		showSlimeChunks      = new ToggleButtonModel();
 		showGrid             = new ToggleButtonModel();
 		showNetherFortresses = new ToggleButtonModel();
@@ -22,4 +26,11 @@ public enum Options {
 		showIcons.setSelected(true);
 		saveEnabled = true;
 	}
+	
+	public String getSeedMessage() {
+		if (seedText == null)
+			return "Seed: " + seed;
+		else
+			return "Seed: \"" + seedText + "\" (" + seed +  ")";
+	}
 }