From bd0e5e9bbe4831723bf820f6f9339183749d84be Mon Sep 17 00:00:00 2001 From: flying sheep Date: Fri, 12 Apr 2013 15:06:29 +0200 Subject: [PATCH 1/2] cherry-picked classpath entry --- .classpath | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.classpath b/.classpath index 05d4813d..8966faec 100644 --- a/.classpath +++ b/.classpath @@ -3,6 +3,6 @@ - + From bd562306b3efd125c3a5a035ee79f03274eaf527 Mon Sep 17 00:00:00 2001 From: flying sheep Date: Fri, 12 Apr 2013 15:36:37 +0200 Subject: [PATCH 2/2] added preliminary command line option --- src/MoF/MapViewer.java | 2 +- src/MoF/Project.java | 26 +++++++------------------- src/amidst/Amidst.java | 13 ++++++++++++- src/amidst/Options.java | 13 ++++++++++++- 4 files changed, 32 insertions(+), 22 deletions(-) diff --git a/src/MoF/MapViewer.java b/src/MoF/MapViewer.java index 79fbacd3..a2d8b3e9 100644 --- a/src/MoF/MapViewer.java +++ b/src/MoF/MapViewer.java @@ -143,7 +143,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) { diff --git a/src/MoF/Project.java b/src/MoF/Project.java index a750f75f..df03494a 100644 --- a/src/MoF/Project.java +++ b/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 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(); @@ -122,15 +119,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 Fragment getFragment(int x, int y) { Fragment frag = new Fragment(x, y, FRAGMENT_SIZE); diff --git a/src/amidst/Amidst.java b/src/amidst/Amidst.java index 355b9b36..b348ee80 100644 --- a/src/amidst/Amidst.java +++ b/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(); + FinderWindow w = new FinderWindow(); + //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() { diff --git a/src/amidst/Options.java b/src/amidst/Options.java index 02dd3d94..0bb2cb58 100644 --- a/src/amidst/Options.java +++ b/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 + ")"; + } }