[Creator] Add test online option.

creator-tools/src/main/java/com/skcraft/launcher/creator/controller/PackManagerController.java

@@ -20,20 +20,19 @@ import com.skcraft.launcher.auth.OfflineSession;
 import com.skcraft.launcher.auth.Session;
 import com.skcraft.launcher.builder.BuilderConfig;
 import com.skcraft.launcher.builder.FnPatternList;
-import com.skcraft.launcher.creator.model.creator.Pack;
+import com.skcraft.launcher.creator.Creator;
+import com.skcraft.launcher.creator.model.creator.*;
 import com.skcraft.launcher.creator.controller.task.*;
 import com.skcraft.launcher.creator.dialog.*;
 import com.skcraft.launcher.creator.dialog.BuildDialog.BuildOptions;
 import com.skcraft.launcher.creator.dialog.DeployServerDialog.DeployOptions;
-import com.skcraft.launcher.creator.model.creator.ManifestEntry;
-import com.skcraft.launcher.creator.model.creator.Problem;
-import com.skcraft.launcher.creator.model.creator.Workspace;
 import com.skcraft.launcher.creator.model.swing.PackTableModel;
 import com.skcraft.launcher.creator.server.TestServer;
 import com.skcraft.launcher.creator.server.TestServerBuilder;
 import com.skcraft.launcher.creator.swing.PackDirectoryFilter;
 import com.skcraft.launcher.dialog.ConfigurationDialog;
 import com.skcraft.launcher.dialog.ConsoleFrame;
+import com.skcraft.launcher.dialog.LoginDialog;
 import com.skcraft.launcher.dialog.ProgressDialog;
 import com.skcraft.launcher.model.modpack.LaunchModifier;
 import com.skcraft.launcher.persistence.Persistence;
@@ -64,6 +63,7 @@ public class PackManagerController {
     private static final Pattern FILENAME_SANITIZE = Pattern.compile("[^a-z0-9_\\-\\.]+");
 
     @Getter private final File workspaceDir;
+    @Getter private final Creator creator;
     @Getter private final File workspaceFile;
     @Getter private final File dataDir;
     @Getter private final File distDir;
@@ -78,19 +78,22 @@ public class PackManagerController {
     private final PackManagerFrame frame;
     private PackTableModel packTableModel;
 
-    public PackManagerController(PackManagerFrame frame, File workspaceDir) throws IOException {
+    public PackManagerController(PackManagerFrame frame, File workspaceDir, Creator creator) throws IOException {
         this.workspaceDir = workspaceDir;
+        this.creator = creator;
         this.dataDir = Workspace.getDataDir(workspaceDir);
         workspaceFile = Workspace.getWorkspaceFile(workspaceDir);
 
         this.distDir = new File(workspaceDir, "_upload");
         File launcherDir = new File(dataDir, "staging/launcher");
+        File launcherConfigDir = new File(creator.getDataDir(), "launcher");
         this.webRoot = new File(dataDir, "staging/www");
 
         launcherDir.mkdirs();
+        launcherConfigDir.mkdirs();
         webRoot.mkdirs();
 
-        this.launcher = new Launcher(launcherDir);
+        this.launcher = new Launcher(launcherDir, creator.getDataDir());
         this.executor = launcher.getExecutor();
         this.frame = frame;
 
@@ -215,6 +218,23 @@ public class PackManagerController {
         }
     }
 
+    private boolean isOfflineEnabled() {
+        CreatorConfig config = creator.getConfig();
+
+        if (config.isOfflineEnabled()) {
+            return true;
+        } else {
+            Session session = LoginDialog.showLoginRequest(frame, launcher);
+            if (session != null) {
+                config.setOfflineEnabled(true);
+                Persistence.commitAndForget(config);
+                return true;
+            } else {
+                return false;
+            }
+        }
+    }
+
     public boolean canAddPackDir(File dir) {
         try {
             if (dir.exists() && !dir.isDirectory()) {
@@ -315,7 +335,7 @@ public class PackManagerController {
                             if (e.isControlDown()) {
                                 SwingHelper.browseDir(optional.get().getDirectory(), frame);
                             } else {
-                                startTest(optional.get());
+                                startTest(optional.get(), false);
                             }
                         }
                     }
@@ -459,7 +479,16 @@ public class PackManagerController {
 
             if (optional.isPresent()) {
                 Pack pack = optional.get();
-                startTest(pack);
+                startTest(pack, false);
+            }
+        });
+
+        frame.getTestOnlineMenuItem().addActionListener(e -> {
+            Optional<Pack> optional = getSelectedPack(true);
+
+            if (optional.isPresent()) {
+                Pack pack = optional.get();
+                startTest(pack, true);
             }
         });
 
@@ -508,7 +537,8 @@ public class PackManagerController {
                     ServerDeploy deploy = new ServerDeploy(pack.getSourceDir(), options);
                     Deferred<?> deferred = Deferreds.makeDeferred(executor.submit(deploy), executor)
                             .handleAsync(r -> SwingHelper.showMessageDialog(frame, "Server deployment complete!", "Success", null, JOptionPane.INFORMATION_MESSAGE),
-                                    ex -> {},
+                                    ex -> {
+                                    },
                                     SwingExecutor.INSTANCE);
                     ProgressDialog.showProgress(frame, deferred, deploy, "Deploying files...", "Deploying server files...");
                     SwingHelper.addErrorDialogCallback(frame, deferred);
@@ -525,7 +555,8 @@ public class PackManagerController {
                         GenerateListingController controller = new GenerateListingController(dialog, workspace, loaded, executor);
                         controller.setOutputDir(distDir);
                         controller.show();
-                    }, ex -> {}, SwingExecutor.INSTANCE);
+                    }, ex -> {
+                    }, SwingExecutor.INSTANCE);
             ProgressDialog.showProgress(frame, deferred, new SettableProgress("Searching...", -1), "Searching for manifests...", "Searching for manifests...");
             SwingHelper.addErrorDialogCallback(frame, deferred);
         });
@@ -575,6 +606,10 @@ public class PackManagerController {
         menuItem.addActionListener(e -> frame.getTestMenuItem().doClick());
         popup.add(menuItem);
 
+        menuItem = new JMenuItem("Test Online");
+        menuItem.addActionListener(e -> frame.getTestOnlineMenuItem().doClick());
+        popup.add(menuItem);
+
         menuItem = new JMenuItem("Build...");
         menuItem.addActionListener(e -> frame.getBuildMenuItem().doClick());
         popup.add(menuItem);
@@ -676,8 +711,22 @@ public class PackManagerController {
         }
     }
 
-    private void startTest(Pack pack) {
+    private void startTest(Pack pack, boolean online) {
-        Session session = new OfflineSession("Player");
+        Session session;
+
+        if (online) {
+            session = LoginDialog.showLoginRequest(frame, launcher);
+            if (session == null) {
+                return;
+            }
+        } else {
+            if (!isOfflineEnabled()) {
+                return;
+            }
+
+            session = new OfflineSession("Player");
+        }
+
         String version = generateVersionFromDate();
 
         PackBuilder builder = new PackBuilder(pack, webRoot, version, "staging.json", false);

creator-tools/src/main/java/com/skcraft/launcher/creator/controller/WelcomeController.java

@@ -53,7 +53,7 @@ public class WelcomeController {
     private boolean openWorkspace(File dir) {
         try {
             PackManagerFrame frame = new PackManagerFrame();
-            PackManagerController controller = new PackManagerController(frame, dir);
+            PackManagerController controller = new PackManagerController(frame, dir, creator);
             addRecentEntry(dir);
             controller.show();
             return true;

creator-tools/src/main/java/com/skcraft/launcher/creator/dialog/PackManagerFrame.java

@@ -38,7 +38,8 @@ public class PackManagerFrame extends JFrame {
     @Getter private final JMenuItem editConfigMenuItem = new JMenuItem("Edit modpack.json...");
     @Getter private final JMenuItem openFolderMenuItem = new JMenuItem("Open Directory");
     @Getter private final JMenuItem checkProblemsMenuItem = new JMenuItem("Scan for Problems...");
-    @Getter private final JMenuItem testMenuItem = new JMenuItem("Test Pack");
+    @Getter private final JMenuItem testMenuItem = new JMenuItem("Test");
+    @Getter private final JMenuItem testOnlineMenuItem = new JMenuItem("Test Online");
     @Getter private final JMenuItem optionsMenuItem = new JMenuItem("Test Launcher Options...");
     @Getter private final JMenuItem clearInstanceMenuItem = new JMenuItem("Delete Test Launcher Instances");
     @Getter private final JMenuItem clearWebRootMenuItem = new JMenuItem("Empty Test Web Server");
@@ -105,6 +106,7 @@ public class PackManagerFrame extends JFrame {
         editConfigMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_E, Event.CTRL_MASK));
         openFolderMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, Event.CTRL_MASK | Event.SHIFT_MASK));
         testMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F5, 0));
+        testOnlineMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F6, 0));
         buildMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F10, Event.SHIFT_MASK));
         deployServerMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F9, Event.SHIFT_MASK));
         docsMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F1, 0));
@@ -141,6 +143,7 @@ public class PackManagerFrame extends JFrame {
         menu.setMnemonic('t');
         menuBar.add(menu);
         menu.add(testMenuItem);
+        menu.add(testOnlineMenuItem);
         menu.addSeparator();
         menu.add(optionsMenuItem);
         menu.addSeparator();

creator-tools/src/main/java/com/skcraft/launcher/creator/model/creator/CreatorConfig.java

@@ -15,6 +15,7 @@ import java.util.List;
 public class CreatorConfig {
 
     private List<RecentEntry> recentEntries = Lists.newArrayList();
+    private boolean offlineEnabled;
 
     public void setRecentEntries(List<RecentEntry> recentEntries) {
         this.recentEntries = recentEntries != null ? recentEntries : Lists.newArrayList();

launcher/src/main/java/com/skcraft/launcher/Launcher.java

@@ -70,6 +70,18 @@ public final class Launcher {
      * @throws java.io.IOException on load error
      */
     public Launcher(@NonNull File baseDir) throws IOException {
+        this(baseDir, baseDir);
+    }
+
+    /**
+     * Create a new launcher instance with the given base and configuration
+     * directories.
+     *
+     * @param baseDir the base directory
+     * @param configDir the config directory
+     * @throws java.io.IOException on load error
+     */
+    public Launcher(@NonNull File baseDir, @NonNull File configDir) throws IOException {
         SharedLocale.loadBundle("com.skcraft.launcher.lang.Launcher", Locale.getDefault());
 
         this.baseDir = baseDir;
@@ -77,8 +89,8 @@ public final class Launcher {
                 "launcher.properties", "com.skcraft.launcher.propertiesFile");
         this.instances = new InstanceList(this);
         this.assets = new AssetsRoot(new File(baseDir, "assets"));
-        this.config = Persistence.load(new File(baseDir, "config.json"), Configuration.class);
+        this.config = Persistence.load(new File(configDir, "config.json"), Configuration.class);
-        this.accounts = Persistence.load(new File(baseDir, "accounts.dat"), AccountList.class);
+        this.accounts = Persistence.load(new File(configDir, "accounts.dat"), AccountList.class);
 
         if (accounts.getSize() > 0) {
             accounts.setSelectedItem(accounts.getElementAt(0));