From 7b764241bf5255ef79d7179303badf1482f9cb07 Mon Sep 17 00:00:00 2001
From: sk89q <the.sk89q@gmail.com>
Date: Mon, 20 Jul 2015 15:03:15 -0700
Subject: [PATCH] Add GUI for building and testing modpacks.

---
 build-tools/build.gradle                      |  20 ++
 .../launcher/buildtools/BuildDialog.java      | 105 +++++++
 .../launcher/buildtools/BuildTools.java       | 282 ++++++++++++++++++
 .../launcher/buildtools/DirectoryRemover.java |  60 ++++
 .../launcher/buildtools}/LatestHandler.java   |   2 +-
 .../buildtools}/LocalHttpServerBuilder.java   |   3 +-
 .../launcher/buildtools/ModpackBuilder.java   |  76 +++++
 .../launcher/buildtools}/NewsHandler.java     |   2 +-
 .../launcher/buildtools}/PackagesHandler.java |   2 +-
 .../launcher/buildtools/ToolArguments.java    |  23 ++
 .../launcher/buildtools/ToolsFrame.java       |  59 ++++
 .../com/skcraft/launcher/buildtools/build.png | Bin 0 -> 601 bytes
 .../com/skcraft/launcher/buildtools/clean.png | Bin 0 -> 899 bytes
 .../skcraft/launcher/buildtools/header.png    | Bin 0 -> 3437 bytes
 .../com/skcraft/launcher/buildtools/icon.png  | Bin 0 -> 647 bytes
 .../com/skcraft/launcher/buildtools/log.png   | Bin 0 -> 418 bytes
 .../skcraft/launcher/buildtools/options.png   | Bin 0 -> 1034 bytes
 .../com/skcraft/launcher/buildtools/test.png  | Bin 0 -> 752 bytes
 settings.gradle                               |   2 +-
 staging-tool/build.gradle                     |  32 --
 staging-tool/scripts/HOW_TO_USE.html          |  35 ---
 staging-tool/scripts/build.bat                |   3 -
 staging-tool/scripts/build_and_launch.bat     |  14 -
 staging-tool/scripts/http_server.bat          |   2 -
 staging-tool/scripts/launch.bat               |   5 -
 staging-tool/scripts/reset_build.bat          |   3 -
 staging-tool/scripts/reset_launcher.bat       |   3 -
 .../launcher/staging/StagingArguments.java    |  29 --
 .../launcher/staging/StagingServer.java       |  36 ---
 .../com/skcraft/launcher/launcher.properties  |  21 --
 30 files changed, 631 insertions(+), 188 deletions(-)
 create mode 100644 build-tools/build.gradle
 create mode 100644 build-tools/src/main/java/com/skcraft/launcher/buildtools/BuildDialog.java
 create mode 100644 build-tools/src/main/java/com/skcraft/launcher/buildtools/BuildTools.java
 create mode 100644 build-tools/src/main/java/com/skcraft/launcher/buildtools/DirectoryRemover.java
 rename {staging-tool/src/main/java/com/skcraft/launcher/staging => build-tools/src/main/java/com/skcraft/launcher/buildtools}/LatestHandler.java (96%)
 rename {staging-tool/src/main/java/com/skcraft/launcher/staging => build-tools/src/main/java/com/skcraft/launcher/buildtools}/LocalHttpServerBuilder.java (94%)
 create mode 100644 build-tools/src/main/java/com/skcraft/launcher/buildtools/ModpackBuilder.java
 rename {staging-tool/src/main/java/com/skcraft/launcher/staging => build-tools/src/main/java/com/skcraft/launcher/buildtools}/NewsHandler.java (96%)
 rename {staging-tool/src/main/java/com/skcraft/launcher/staging => build-tools/src/main/java/com/skcraft/launcher/buildtools}/PackagesHandler.java (98%)
 create mode 100644 build-tools/src/main/java/com/skcraft/launcher/buildtools/ToolArguments.java
 create mode 100644 build-tools/src/main/java/com/skcraft/launcher/buildtools/ToolsFrame.java
 create mode 100644 build-tools/src/main/resources/com/skcraft/launcher/buildtools/build.png
 create mode 100644 build-tools/src/main/resources/com/skcraft/launcher/buildtools/clean.png
 create mode 100644 build-tools/src/main/resources/com/skcraft/launcher/buildtools/header.png
 create mode 100644 build-tools/src/main/resources/com/skcraft/launcher/buildtools/icon.png
 create mode 100644 build-tools/src/main/resources/com/skcraft/launcher/buildtools/log.png
 create mode 100644 build-tools/src/main/resources/com/skcraft/launcher/buildtools/options.png
 create mode 100644 build-tools/src/main/resources/com/skcraft/launcher/buildtools/test.png
 delete mode 100644 staging-tool/build.gradle
 delete mode 100644 staging-tool/scripts/HOW_TO_USE.html
 delete mode 100644 staging-tool/scripts/build.bat
 delete mode 100644 staging-tool/scripts/build_and_launch.bat
 delete mode 100644 staging-tool/scripts/http_server.bat
 delete mode 100644 staging-tool/scripts/launch.bat
 delete mode 100644 staging-tool/scripts/reset_build.bat
 delete mode 100644 staging-tool/scripts/reset_launcher.bat
 delete mode 100644 staging-tool/src/main/java/com/skcraft/launcher/staging/StagingArguments.java
 delete mode 100644 staging-tool/src/main/java/com/skcraft/launcher/staging/StagingServer.java
 delete mode 100644 staging-tool/src/main/resources/com/skcraft/launcher/launcher.properties

diff --git a/build-tools/build.gradle b/build-tools/build.gradle
new file mode 100644
index 0000000..4259bbc
--- /dev/null
+++ b/build-tools/build.gradle
@@ -0,0 +1,20 @@
+apply plugin: 'com.github.johnrengelman.shadow'
+
+dependencies {
+    compile project(':launcher-builder')
+    compile 'org.eclipse.jetty:jetty-server:9.3.1.v20150714'
+}
+
+jar {
+    manifest {
+        attributes("Main-Class": "com.skcraft.launcher.buildtools.BuildTools")
+    }
+}
+
+shadowJar {
+    dependencies {
+        exclude(dependency('org.projectlombok:lombok'))
+    }
+}
+
+build.dependsOn(shadowJar)
diff --git a/build-tools/src/main/java/com/skcraft/launcher/buildtools/BuildDialog.java b/build-tools/src/main/java/com/skcraft/launcher/buildtools/BuildDialog.java
new file mode 100644
index 0000000..91ad7e6
--- /dev/null
+++ b/build-tools/src/main/java/com/skcraft/launcher/buildtools/BuildDialog.java
@@ -0,0 +1,105 @@
+/*
+ * SK's Minecraft Launcher
+ * Copyright (C) 2010-2014 Albert Pham <http://www.sk89q.com> and contributors
+ * Please see LICENSE.txt for license information.
+ */
+
+package com.skcraft.launcher.buildtools;
+
+import com.skcraft.launcher.swing.SwingHelper;
+import lombok.Data;
+import lombok.Getter;
+import net.miginfocom.swing.MigLayout;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class BuildDialog extends JDialog {
+
+    private final JTextField versionText = new JTextField(20);
+    private final JTextField manifestFilenameText = new JTextField(30);
+    private final JCheckBox cleanCheck = new JCheckBox("Delete previously generated files first");
+    @Getter
+    private BuildOptions options;
+
+    public BuildDialog(Window parent) {
+        super(parent, "Build Release", ModalityType.DOCUMENT_MODAL);
+
+        setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+        initComponents();
+        setResizable(false);
+        pack();
+        setLocationRelativeTo(null);
+    }
+
+    private void initComponents() {
+        JPanel container = new JPanel();
+        container.setLayout(new MigLayout("insets dialog"));
+
+        container.add(new JLabel("Version:"));
+        container.add(versionText, "span");
+
+        container.add(new JLabel("Manifest Filename:"));
+        container.add(manifestFilenameText, "span");
+
+        container.add(cleanCheck, "span, gapbottom 20");
+
+        JButton buildButton = new JButton("Build...");
+        JButton cancelButton = new JButton("Cancel");
+
+        container.add(buildButton, "tag ok, span, split 2, sizegroup bttn");
+        container.add(cancelButton, "tag cancel, sizegroup bttn");
+
+        add(container, BorderLayout.CENTER);
+
+        buildButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                returnValue();
+            }
+        });
+
+        cancelButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                dispose();
+            }
+        });
+    }
+
+    private void returnValue() {
+        String version = versionText.getText().trim();
+        String manifestFilename = manifestFilenameText.getText().trim();
+
+        if (version.isEmpty()) {
+            SwingHelper.showErrorDialog(this, "A version string must be entered.", "Error");
+            return;
+        }
+
+        if (manifestFilename.isEmpty()) {
+            SwingHelper.showErrorDialog(this, "A manifest filename must be entered.", "Error");
+            return;
+        }
+
+        options = new BuildOptions(version, manifestFilename, cleanCheck.isSelected());
+        dispose();
+    }
+
+    public static BuildOptions showBuildDialog(Window parent, String version, String manifestName) {
+        BuildDialog dialog = new BuildDialog(parent);
+        dialog.versionText.setText(version);
+        dialog.manifestFilenameText.setText(manifestName);
+        dialog.setVisible(true);
+        return dialog.getOptions();
+    }
+
+    @Data
+    public static class BuildOptions {
+        private final String version;
+        private final String manifestFilename;
+        private final boolean clean;
+    }
+
+}
diff --git a/build-tools/src/main/java/com/skcraft/launcher/buildtools/BuildTools.java b/build-tools/src/main/java/com/skcraft/launcher/buildtools/BuildTools.java
new file mode 100644
index 0000000..75a3278
--- /dev/null
+++ b/build-tools/src/main/java/com/skcraft/launcher/buildtools/BuildTools.java
@@ -0,0 +1,282 @@
+/*
+ * SK's Minecraft Launcher
+ * Copyright (C) 2010-2014 Albert Pham <http://www.sk89q.com> and contributors
+ * Please see LICENSE.txt for license information.
+ */
+
+package com.skcraft.launcher.buildtools;
+
+import com.beust.jcommander.JCommander;
+import com.google.common.base.Strings;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.skcraft.concurrency.ObservableFuture;
+import com.skcraft.launcher.Instance;
+import com.skcraft.launcher.InstanceList;
+import com.skcraft.launcher.Launcher;
+import com.skcraft.launcher.auth.OfflineSession;
+import com.skcraft.launcher.auth.Session;
+import com.skcraft.launcher.builder.BuilderConfig;
+import com.skcraft.launcher.buildtools.BuildDialog.BuildOptions;
+import com.skcraft.launcher.dialog.ConfigurationDialog;
+import com.skcraft.launcher.dialog.ConsoleFrame;
+import com.skcraft.launcher.dialog.ProgressDialog;
+import com.skcraft.launcher.launch.LaunchOptions;
+import com.skcraft.launcher.launch.LaunchOptions.UpdatePolicy;
+import com.skcraft.launcher.persistence.Persistence;
+import com.skcraft.launcher.swing.SwingHelper;
+import lombok.extern.java.Log;
+import org.eclipse.jetty.server.Server;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.io.IOException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.regex.Pattern;
+
+@Log
+public class BuildTools {
+
+    private static DateFormat VERSION_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss");
+    private static Pattern FILENAME_SANITIZE = Pattern.compile("[^a-z0-9_\\-\\.]+");
+
+    private final Launcher launcher;
+    private String configFilename = "modpack.json";
+    private final int port;
+    private final File inputDir;
+    private final File wwwDir;
+    private final File distDir;
+
+    @SuppressWarnings("ResultOfMethodCallIgnored")
+    public BuildTools(File baseDir, int port) throws IOException {
+        File launcherDir = new File(baseDir, "staging/launcher");
+        inputDir = baseDir;
+        wwwDir = new File(baseDir, "staging/www");
+        distDir = new File(baseDir, "dist");
+
+        this.port = port;
+
+        launcherDir.mkdirs();
+        wwwDir.mkdirs();
+
+        launcher = new Launcher(launcherDir);
+        launcher.getProperties().setProperty("packageListUrl", "http://localhost:" + port + "/packages.json");
+    }
+
+    public String generateManifestName() {
+        File file = new File(inputDir, configFilename);
+        if (file.exists()) {
+            BuilderConfig config = Persistence.read(file, BuilderConfig.class, true);
+            if (config != null) {
+                String name = Strings.nullToEmpty(config.getName());
+                name = name.toLowerCase();
+                name = FILENAME_SANITIZE.matcher(name).replaceAll("-");
+                name = name.trim();
+                if (!name.isEmpty()) {
+                    return name + ".json";
+                }
+            }
+        }
+
+        return "my_modpack.json";
+    }
+
+    public String getCurrentModpackName() {
+        File file = new File(inputDir, configFilename);
+        if (file.exists()) {
+            BuilderConfig config = Persistence.read(file, BuilderConfig.class, true);
+            if (config != null) {
+                return config.getName();
+            }
+        }
+
+        return null;
+    }
+
+    public Instance findCurrentInstsance(List<Instance> instances) {
+        String expected = getCurrentModpackName();
+
+        for (Instance instance : instances) {
+            if (instance.getName().equals(expected)) {
+                return instance;
+            }
+        }
+
+        return null;
+    }
+
+    public void startHttpServer() throws Exception {
+        LocalHttpServerBuilder builder = new LocalHttpServerBuilder();
+        builder.setBaseDir(wwwDir);
+        builder.setPort(port);
+
+        Server server = builder.build();
+        server.start();
+    }
+
+    private void showMainWindow() {
+        final ToolsFrame frame = new ToolsFrame();
+
+        frame.getBuildButton().addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                BuildOptions options = BuildDialog.showBuildDialog(frame, generateVersionFromDate(), generateManifestName());
+                if (options != null) {
+                    ConsoleFrame.showMessages();
+
+                    distDir.mkdirs();
+                    ModpackBuilder runnable = new ModpackBuilder(inputDir, distDir, options.getVersion(), options.getManifestFilename(), options.isClean());
+                    ObservableFuture<ModpackBuilder> future = new ObservableFuture<ModpackBuilder>(launcher.getExecutor().submit(runnable), runnable);
+                    ProgressDialog.showProgress(frame, future, "Building modpack...", "Building modpack for release...");
+
+                    Futures.addCallback(future, new FutureCallback<ModpackBuilder>() {
+                        @Override
+                        public void onSuccess(ModpackBuilder result) {
+                            SwingHelper.browseDir(distDir, frame);
+                        }
+
+                        @Override
+                        public void onFailure(Throwable t) {
+                        }
+                    });
+
+                    SwingHelper.addErrorDialogCallback(frame, future);
+                }
+            }
+        });
+
+        frame.getTestButton().addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                ConsoleFrame.showMessages();
+
+                ModpackBuilder runnable = new ModpackBuilder(inputDir, wwwDir, generateVersionFromDate(), "staging.json", false);
+                ObservableFuture<ModpackBuilder> future = new ObservableFuture<ModpackBuilder>(launcher.getExecutor().submit(runnable), runnable);
+                ProgressDialog.showProgress(frame, future, "Preparing files...", "Preparing files for launch...");
+                SwingHelper.addErrorDialogCallback(frame, future);
+
+                Futures.addCallback(future, new FutureCallback<ModpackBuilder>() {
+                    @Override
+                    public void onSuccess(ModpackBuilder result) {
+                        launchInstance(frame);
+                        ConsoleFrame.hideMessages();
+                    }
+
+                    @Override
+                    public void onFailure(Throwable t) {
+                    }
+                });
+            }
+        });
+
+        frame.getOptionsButton().addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                ConfigurationDialog configDialog = new ConfigurationDialog(frame, launcher);
+                configDialog.setVisible(true);
+            }
+        });
+
+        frame.getClearInstanceButton().addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                DirectoryRemover remover = new DirectoryRemover(launcher.getInstancesDir());
+                ObservableFuture<DirectoryRemover> future = new ObservableFuture<DirectoryRemover>(launcher.getExecutor().submit(remover), remover);
+                ProgressDialog.showProgress(frame, future, "Removing files...", "Removing files...");
+                SwingHelper.addErrorDialogCallback(frame, future);
+            }
+        });
+
+        frame.getClearWebRootButton().addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                DirectoryRemover remover = new DirectoryRemover(wwwDir);
+                ObservableFuture<DirectoryRemover> future = new ObservableFuture<DirectoryRemover>(launcher.getExecutor().submit(remover), remover);
+                ProgressDialog.showProgress(frame, future, "Removing files...", "Removing files...");
+                SwingHelper.addErrorDialogCallback(frame, future);
+            }
+        });
+
+        frame.getOpenConsoleButton().addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                ConsoleFrame.showMessages();
+            }
+        });
+
+        frame.setVisible(true);
+    }
+
+    private void launchInstance(final Window window) {
+        String expectedName = getCurrentModpackName();
+
+        final InstanceList instanceList = launcher.getInstances();
+        InstanceList.Enumerator loader = instanceList.createEnumerator();
+        ObservableFuture<InstanceList> future = new ObservableFuture<InstanceList>(launcher.getExecutor().submit(loader), loader);
+        ProgressDialog.showProgress(window, future, "Loading modpacks...", "Loading modpacks...");
+        SwingHelper.addErrorDialogCallback(window, future);
+
+        Futures.addCallback(future, new FutureCallback<InstanceList>() {
+            @Override
+            public void onSuccess(InstanceList result) {
+                Session session = new OfflineSession("Player");
+
+                Instance instance = findCurrentInstsance(instanceList.getInstances());
+
+                if (instance != null) {
+                    LaunchOptions options = new LaunchOptions.Builder()
+                            .setInstance(instance)
+                            .setUpdatePolicy(UpdatePolicy.ALWAYS_UPDATE)
+                            .setWindow(window)
+                            .setSession(session)
+                            .build();
+
+                    launcher.getLaunchSupervisor().launch(options);
+                } else {
+                    SwingHelper.showErrorDialog(window,
+                            "After generating the necessary files, it appears the modpack can't be found in the " +
+                                    "launcher. Did you change modpack.json while the launcher was launching?", "Launch Error");
+                }
+            }
+
+            @Override
+            public void onFailure(Throwable t) {
+            }
+        });
+    }
+
+    public static void main(String[] args) throws Exception {
+        ToolArguments options = new ToolArguments();
+        new JCommander(options, args);
+
+        final BuildTools main = new BuildTools(options.getDir(), options.getPort());
+        main.startHttpServer();
+
+        SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+                    main.showMainWindow();
+                } catch (Throwable t) {
+                    log.log(Level.WARNING, "Load failure", t);
+                    SwingHelper.showErrorDialog(null, "Failed to launch build tools!", "Build tools error", t);
+                }
+            }
+        });
+    }
+
+    public static String generateVersionFromDate() {
+        Date today = Calendar.getInstance().getTime();
+        return VERSION_DATE_FORMAT.format(today);
+    }
+
+}
diff --git a/build-tools/src/main/java/com/skcraft/launcher/buildtools/DirectoryRemover.java b/build-tools/src/main/java/com/skcraft/launcher/buildtools/DirectoryRemover.java
new file mode 100644
index 0000000..1ba9072
--- /dev/null
+++ b/build-tools/src/main/java/com/skcraft/launcher/buildtools/DirectoryRemover.java
@@ -0,0 +1,60 @@
+/*
+ * SK's Minecraft Launcher
+ * Copyright (C) 2010-2014 Albert Pham <http://www.sk89q.com> and contributors
+ * Please see LICENSE.txt for license information.
+ */
+
+package com.skcraft.launcher.buildtools;
+
+import com.skcraft.concurrency.ProgressObservable;
+import com.skcraft.launcher.LauncherException;
+import com.skcraft.launcher.LauncherUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+
+import static com.skcraft.launcher.LauncherUtils.checkInterrupted;
+
+public class DirectoryRemover implements Callable<DirectoryRemover>, ProgressObservable {
+
+    private final File dir;
+
+    public DirectoryRemover(File dir) {
+        this.dir = dir;
+    }
+
+    @Override
+    public DirectoryRemover call() throws Exception {
+        checkInterrupted();
+
+        Thread.sleep(1000);
+
+        List<File> failures = new ArrayList<File>();
+
+        try {
+            LauncherUtils.interruptibleDelete(dir, failures);
+        } catch (IOException e) {
+            Thread.sleep(1000);
+            LauncherUtils.interruptibleDelete(dir, failures);
+        }
+
+        if (failures.size() > 0) {
+            throw new LauncherException(failures.size() + " failed to delete", failures.size() + " file(s) failed to delete.");
+        }
+
+        return this;
+    }
+
+    @Override
+    public double getProgress() {
+        return -1;
+    }
+
+    @Override
+    public String getStatus() {
+        return "Removing files...";
+    }
+}
diff --git a/staging-tool/src/main/java/com/skcraft/launcher/staging/LatestHandler.java b/build-tools/src/main/java/com/skcraft/launcher/buildtools/LatestHandler.java
similarity index 96%
rename from staging-tool/src/main/java/com/skcraft/launcher/staging/LatestHandler.java
rename to build-tools/src/main/java/com/skcraft/launcher/buildtools/LatestHandler.java
index b0ff28a..d4ecc0b 100644
--- a/staging-tool/src/main/java/com/skcraft/launcher/staging/LatestHandler.java
+++ b/build-tools/src/main/java/com/skcraft/launcher/buildtools/LatestHandler.java
@@ -4,7 +4,7 @@
  * Please see LICENSE.txt for license information.
  */
 
-package com.skcraft.launcher.staging;
+package com.skcraft.launcher.buildtools;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.skcraft.launcher.selfupdate.LatestVersionInfo;
diff --git a/staging-tool/src/main/java/com/skcraft/launcher/staging/LocalHttpServerBuilder.java b/build-tools/src/main/java/com/skcraft/launcher/buildtools/LocalHttpServerBuilder.java
similarity index 94%
rename from staging-tool/src/main/java/com/skcraft/launcher/staging/LocalHttpServerBuilder.java
rename to build-tools/src/main/java/com/skcraft/launcher/buildtools/LocalHttpServerBuilder.java
index 175740b..bb78ad3 100644
--- a/staging-tool/src/main/java/com/skcraft/launcher/staging/LocalHttpServerBuilder.java
+++ b/build-tools/src/main/java/com/skcraft/launcher/buildtools/LocalHttpServerBuilder.java
@@ -4,7 +4,7 @@
  * Please see LICENSE.txt for license information.
  */
 
-package com.skcraft.launcher.staging;
+package com.skcraft.launcher.buildtools;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.eclipse.jetty.server.Handler;
@@ -47,6 +47,7 @@ public class LocalHttpServerBuilder {
         ResourceHandler resourceHandler = new ResourceHandler();
         resourceHandler.setDirectoriesListed(true);
         resourceHandler.setResourceBase(baseDir.getAbsolutePath());
+        resourceHandler.setMinMemoryMappedContentLength(-1); // Causes file locking on Windows
 
         ContextHandler rootContext = new ContextHandler();
         rootContext.setContextPath("/");
diff --git a/build-tools/src/main/java/com/skcraft/launcher/buildtools/ModpackBuilder.java b/build-tools/src/main/java/com/skcraft/launcher/buildtools/ModpackBuilder.java
new file mode 100644
index 0000000..3f0764a
--- /dev/null
+++ b/build-tools/src/main/java/com/skcraft/launcher/buildtools/ModpackBuilder.java
@@ -0,0 +1,76 @@
+/*
+ * SK's Minecraft Launcher
+ * Copyright (C) 2010-2014 Albert Pham <http://www.sk89q.com> and contributors
+ * Please see LICENSE.txt for license information.
+ */
+
+package com.skcraft.launcher.buildtools;
+
+import com.skcraft.concurrency.ProgressObservable;
+import com.skcraft.launcher.LauncherException;
+import com.skcraft.launcher.LauncherUtils;
+import com.skcraft.launcher.builder.PackageBuilder;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+
+class ModpackBuilder implements Callable<ModpackBuilder>, ProgressObservable {
+
+    private final File inputDir;
+    private final File outputDir;
+    private final String version;
+    private final String manifestFilename;
+    private final boolean clean;
+
+    public ModpackBuilder(File inputDir, File outputDir, String version, String manifestFilename, boolean clean) {
+        this.inputDir = inputDir;
+        this.outputDir = outputDir;
+        this.version = version;
+        this.manifestFilename = manifestFilename;
+        this.clean = clean;
+    }
+
+    @Override
+    public ModpackBuilder call() throws Exception {
+        if (clean) {
+            List<File> failures = new ArrayList<File>();
+
+            try {
+                LauncherUtils.interruptibleDelete(outputDir, failures);
+            } catch (IOException e) {
+                Thread.sleep(1000);
+                LauncherUtils.interruptibleDelete(outputDir, failures);
+            }
+
+            if (failures.size() > 0) {
+                throw new LauncherException(failures.size() + " failed to delete", "There were " + failures.size() + " failures during cleaning.");
+            }
+        }
+
+        //noinspection ResultOfMethodCallIgnored
+        outputDir.mkdirs();
+
+        String[] args = {
+                "--version", version,
+                "--manifest-dest", new File(outputDir, manifestFilename).getAbsolutePath(),
+                "-i", inputDir.getAbsolutePath(),
+                "-o", outputDir.getAbsolutePath()
+        };
+        PackageBuilder.main(args);
+
+        return this;
+    }
+
+    @Override
+    public double getProgress() {
+        return -1;
+    }
+
+    @Override
+    public String getStatus() {
+        return "Building modpack...";
+    }
+}
diff --git a/staging-tool/src/main/java/com/skcraft/launcher/staging/NewsHandler.java b/build-tools/src/main/java/com/skcraft/launcher/buildtools/NewsHandler.java
similarity index 96%
rename from staging-tool/src/main/java/com/skcraft/launcher/staging/NewsHandler.java
rename to build-tools/src/main/java/com/skcraft/launcher/buildtools/NewsHandler.java
index 08e9cac..83e9338 100644
--- a/staging-tool/src/main/java/com/skcraft/launcher/staging/NewsHandler.java
+++ b/build-tools/src/main/java/com/skcraft/launcher/buildtools/NewsHandler.java
@@ -4,7 +4,7 @@
  * Please see LICENSE.txt for license information.
  */
 
-package com.skcraft.launcher.staging;
+package com.skcraft.launcher.buildtools;
 
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.AbstractHandler;
diff --git a/staging-tool/src/main/java/com/skcraft/launcher/staging/PackagesHandler.java b/build-tools/src/main/java/com/skcraft/launcher/buildtools/PackagesHandler.java
similarity index 98%
rename from staging-tool/src/main/java/com/skcraft/launcher/staging/PackagesHandler.java
rename to build-tools/src/main/java/com/skcraft/launcher/buildtools/PackagesHandler.java
index 9e63019..797b111 100644
--- a/staging-tool/src/main/java/com/skcraft/launcher/staging/PackagesHandler.java
+++ b/build-tools/src/main/java/com/skcraft/launcher/buildtools/PackagesHandler.java
@@ -4,7 +4,7 @@
  * Please see LICENSE.txt for license information.
  */
 
-package com.skcraft.launcher.staging;
+package com.skcraft.launcher.buildtools;
 
 import com.beust.jcommander.internal.Lists;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/build-tools/src/main/java/com/skcraft/launcher/buildtools/ToolArguments.java b/build-tools/src/main/java/com/skcraft/launcher/buildtools/ToolArguments.java
new file mode 100644
index 0000000..67dbfa5
--- /dev/null
+++ b/build-tools/src/main/java/com/skcraft/launcher/buildtools/ToolArguments.java
@@ -0,0 +1,23 @@
+/*
+ * SK's Minecraft Launcher
+ * Copyright (C) 2010-2014 Albert Pham <http://www.sk89q.com> and contributors
+ * Please see LICENSE.txt for license information.
+ */
+
+package com.skcraft.launcher.buildtools;
+
+import com.beust.jcommander.Parameter;
+import lombok.Data;
+
+import java.io.File;
+
+@Data
+public class ToolArguments {
+
+    @Parameter(names = "--dir")
+    private File dir = new File(".");
+
+    @Parameter(names = "--port")
+    private int port = 28888;
+
+}
diff --git a/build-tools/src/main/java/com/skcraft/launcher/buildtools/ToolsFrame.java b/build-tools/src/main/java/com/skcraft/launcher/buildtools/ToolsFrame.java
new file mode 100644
index 0000000..b471c9b
--- /dev/null
+++ b/build-tools/src/main/java/com/skcraft/launcher/buildtools/ToolsFrame.java
@@ -0,0 +1,59 @@
+/*
+ * SK's Minecraft Launcher
+ * Copyright (C) 2010-2014 Albert Pham <http://www.sk89q.com> and contributors
+ * Please see LICENSE.txt for license information.
+ */
+
+package com.skcraft.launcher.buildtools;
+
+import com.skcraft.launcher.swing.SwingHelper;
+import lombok.Data;
+import lombok.extern.java.Log;
+import net.miginfocom.swing.MigLayout;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+
+@Log
+@Data
+public class ToolsFrame extends JFrame {
+
+    private final JButton buildButton = new JButton("Build for Release", SwingHelper.readImageIcon(ToolsFrame.class, "build.png"));
+    private final JButton testButton = new JButton("Run Modpack", SwingHelper.readImageIcon(ToolsFrame.class, "test.png"));
+    private final JButton optionsButton = new JButton("Test Launcher Options", SwingHelper.readImageIcon(ToolsFrame.class, "options.png"));
+    private final JButton clearInstanceButton = new JButton("Delete Instance from Test Launcher", SwingHelper.readImageIcon(ToolsFrame.class, "clean.png"));
+    private final JButton clearWebRootButton = new JButton("Delete Generated Modpack Files", SwingHelper.readImageIcon(ToolsFrame.class, "clean.png"));
+    private final JButton openConsoleButton = new JButton("Re-open Console", SwingHelper.readImageIcon(ToolsFrame.class, "log.png"));
+
+    public ToolsFrame() {
+        super("Modpack Build Tools");
+
+        setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+        initComponents();
+        pack();
+        setLocationRelativeTo(null);
+
+        SwingHelper.setIconImage(this, ToolsFrame.class, "icon.png");
+    }
+
+    private void initComponents() {
+        JPanel container = new JPanel();
+        container.setLayout(new MigLayout("fill, insets dialog, wrap 1", "", ""));
+
+        BufferedImage header = SwingHelper.readIconImage(ToolsFrame.class, "header.png");
+        if (header != null) {
+            add(new JLabel(new ImageIcon(header)), BorderLayout.NORTH);
+        }
+
+        container.add(buildButton, "grow, tag ok");
+        container.add(testButton, "grow, tag ok");
+        container.add(optionsButton, "grow, tag ok");
+        container.add(clearInstanceButton, "grow, tag ok");
+        container.add(clearWebRootButton, "grow, tag ok");
+        container.add(openConsoleButton, "grow, tag ok");
+
+        add(container, BorderLayout.CENTER);
+    }
+
+}
diff --git a/build-tools/src/main/resources/com/skcraft/launcher/buildtools/build.png b/build-tools/src/main/resources/com/skcraft/launcher/buildtools/build.png
new file mode 100644
index 0000000000000000000000000000000000000000..9360f7da970b51183929759c202e06476ba5e35e
GIT binary patch
literal 601
zcmV-f0;c_mP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00006VoOIv0RI60
z0RN!9r;`8x0uD(;K~zW$?Nv`m6k!zqeKWf=vpX|Vfh1B^ic5qR*rgQdj|Wd-30?$2
z3F#7H_maE`8F;Qs8VDW)|6L>^GP<c9f;#POcd<=T{MYWz&VIdtopHw9f!#bP=*Ro`
z-uwOD`@Na>F${3jYc^&+nU5PoOG`XxKMUuaz51ECWyhtQ%r9v!!NcHYl=vzzL>YMB
z_jNOoW5O6=Eev=**dUE|d`UOX+>w6}=4+H&$W8R(VYp|iQ@q;IW3!aVlYdP!o??L<
zfmR&f+)S=={d{e7;%)P{$BTx6-R}38CfZ}7C!*l>BlK&!`ci2hZey}Wh+|9*3c?u)
z*vkSL4yGxJwr2u=wECOXv4zgS&gzZZbx42wg%ziY9D%lD!(FK1z=+iR>@3r(9Ng_F
zB11$MP#t2him#{wWGRHjdy`0qD@Aa;v2@%u0e28NhYwjMS6sN(q_VY7ZmPhqBqWmK
z_?_aYrTN8#9JX5rE?)ZlA|#1?oanpAFB)y$qho6nhOWTVnBcN)JB4h;0D^X5$%4BX
zU?*jl0h$b`wD%EzucRg>jpN-{z@Q7ar6dt}dLIx48}UCqO=xx`SD0)GJ-B}0O%(qI
z2X#D6GzAH2aT!HcopsYi@M2J2$DvAiSts|uozo^|jqY?@$A4TKWj&%_GQ+x?@_h01
no9!a9iT2^l#PZ<;PIUD@Z>fZE*1BPE00000NkvXXu0mjf1hyCW

literal 0
HcmV?d00001

diff --git a/build-tools/src/main/resources/com/skcraft/launcher/buildtools/clean.png b/build-tools/src/main/resources/com/skcraft/launcher/buildtools/clean.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c5d82744490d0ac2b6d001f8c2a75861eeb0fa4
GIT binary patch
literal 899
zcmV-}1AP36P)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00006VoOIv0RI60
z0RN!9r;`8x12{=UK~zW$?Nx1PO>r3iJ^yoe&Sp1+6`Hb*eX!O-iDF)&iHqdr8~Gqf
zC`C~e@xez-N%3JyNqNc5T0>)AKKUS1YI)hhWD_%cz32ST<2iTtT=#!>G3BFw&+q@d
z{hsrj|I@#7fdA_+CP10oc!zr&poO-wVl|VgFEck9d&&CSI~mx+jAP9=S6>ZlRA>a6
znX189kZ>_R-ocaNAG~|<cRVx5{RvAqG*n1~Q^K1?ghQg!Vl;6qYZZK}Y|S+KU^z$#
z>y4ma@LQR?<7uAn>&rrN1R!u=2WAqH<eu76BT9}*4`Hg8unw#*q3%@rmn!<X^PnWF
z1c7{YwLTvhA&irR!T5W97_47LY~9+>##6$0E?vFub|sh(|IG2Z$G6sf|LFrcn}B#}
zid5v<US-N2p@K1y!X-)Af<Ojb<ed(TOc>(|6U2Oil`4`qY#I0(xsQxhy`g?K`CKQV
zO78m9D!N<{%H=0FYC1zF)D#+{(aSg88RvS5XTqHhV{tEt3N&%~qieC?vKU!qc)xM@
z0w!FW7i-y9TI*S)J(EgNxxRkH$2>DW?2YOq{4l>%cj&uAEpACrrX4#``+iq@W9N#Q
zfuDhHr!P|6*jSUip<$dtBbVkTX9g5)2Y9#S3%!pTy32?Eg~2YP+n&&Ur1fa;>%OvL
z$tT4pYwE-6D?cWk)Hb3CKX8KEQ6c$KL5X05=uRJUD!`YN0@|#y_Jc1@6!y4d-#xgw
zdX7X5A;S}gn+g^}`ORXQIT<>%Y?0wGCm8;BM&gBsz~+eJhQZk0jVEuNm0ClFD~yl~
zr{1n(pSQ}W#F5eT%fp4KimWWA9HxiizV!eX-<)awMA{6UO_I{=kUaMc9G$OT!R2BU
zDySj_iYk-nN#oS1k_o0|v}CX;X=iOYn*<zwiahk&7s0e8@YB%p_FpvAcxjrKF26{N
zhvb5!S%#5j8PN=foAbAEudd|*j-ppaH^@*W5s;HEZG$sZMf1^<QD&HFrV-6@_zKE(
zzg0(Ls7g(?3glZJGJ51Yw}`3}&%;12J*p;QA=kq})Q-uIZLR!4XG?s)jHyxdfBAP4
Z_yO!lB;yAg0e}Di002ovPDHLkV1fWYvQGd2

literal 0
HcmV?d00001

diff --git a/build-tools/src/main/resources/com/skcraft/launcher/buildtools/header.png b/build-tools/src/main/resources/com/skcraft/launcher/buildtools/header.png
new file mode 100644
index 0000000000000000000000000000000000000000..f58b1a0fb0f44f3ab92eb58b1c32ac02c4773970
GIT binary patch
literal 3437
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
UGMJxGwEP2PXXA)3-RB+q9~U_@S^xk5

literal 0
HcmV?d00001

diff --git a/build-tools/src/main/resources/com/skcraft/launcher/buildtools/icon.png b/build-tools/src/main/resources/com/skcraft/launcher/buildtools/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..03aa713b55c7ba951ec35a54e8211e099f45e045
GIT binary patch
literal 647
zcmV;20(kw2P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv0RI60
z0RN!9r;`8x0z64XK~z`??O44^13?g;J&l%<Jb?<)LR3=NYGWjYg^i-oN=y)Z0tG7t
zOG#lDJ7a4jh>%8YBp?=c27Cks3qc6C&ISUxpImOUx8U7Q*ty%iot@e5o7uY|0Q4gU
zhyh}N7$63S0b+m{Fp~kM8+KuHf4pV2<{9vju)a80Un%y}xU1E^!>$=rPb&c{+k2;+
z!x3(75I>)m1#9<L)hAr9ty#J(7j|~16~K#aWo#QNqN7uWbs2Bj)(nOnTie442lm+R
zg}C5xIYzZblsOcwO&b9SVhEsvpTE_wtM#x*^2JgafD3iBA#VD_(q}pzmWhCP#7W;S
zJBQTaVR^kg1}VP4z)m|Rqy{XD##hA>Jk7UwrkkQ4Mi?-$E-Q37@N;ojk)XN)_vkd8
z-zqHu<2U$J0X(k$f6ce9@OuYTaPMi9q&45V!b<?-vq?kVg~wA@cnJXTd)8$m)?H6s
zkz}x;B4s=Q(xvcZb}EqBkLG*eyy|4s{-p^>r!%S;l-5V>-}ocoDTMgLC>CzLgLL?M
z(R&hS&T<EM)z?)0v!!1LX5%w}2+)_T@vtoY6?kbp2P4Y`Ppi&G?cew#Ae{kGe}`o=
zB5MEA1oW%KWC6+QN9~`EfNTVc6PL0}BGr%DzoRM=JMC8q3Y|C$Rf4YQ8UGF-0$dqk
z+>kQBxRAR5QwF#QF>Xj1U|h&ufGGo9gcvuZ3@|R_F2LS@ggD=D>CliEAO?s5Vt^PR
h28aP-fEY+11Am8WW9(G%%2)sZ002ovPDHLkV1ktI7*PNK

literal 0
HcmV?d00001

diff --git a/build-tools/src/main/resources/com/skcraft/launcher/buildtools/log.png b/build-tools/src/main/resources/com/skcraft/launcher/buildtools/log.png
new file mode 100644
index 0000000000000000000000000000000000000000..296df88733186ff5c2e31969868f63d969be7598
GIT binary patch
literal 418
zcmV;T0bTxyP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00006VoOIv0RI60
z0RN!9r;`8x0ar;xK~zW$V_+BsB!mDXvf6Z;ZNC5iG4=rkg^|TcWB-5ipMj}x)-jK*
zFnugA2AKZG*b1~j1<WR!U=(Cv{ND!D4!48}$U#QD$Q*LnjQ<(<koBTlf-FZhHVZbB
ztbJt|1Vq`fN#Pay@cJji(aldV)UaTP00kai|H$z2Ayz4%EN=AU+aIiwSWSBS{5t~^
z3+W;G@6SKtEpdxcVi1+$#Hs<G;Ol4K88*(mg`otiPp~P(&`E*-R!g+ZMHsmGSaBNj
z;=vb&$G1P@lt-7qY6%M~69X$7?l>VezOY(y>BuW|$56z_?OckCMb%6jOa3#yM79QN
za3K^hUSMSWe;dIk%=-7A;Rh2VV;8bYoR%;$GOT|4;Zw}&t6{&8HIT!`9$fz!=DwBs
z97zoeK#s!ZlfIe9JxUmWl>$fs)p3UPjvNMt|G;{S>PC+mNPGwY0D){z7K-8|sQ>@~
M07*qoM6N<$g5%A%p#T5?

literal 0
HcmV?d00001

diff --git a/build-tools/src/main/resources/com/skcraft/launcher/buildtools/options.png b/build-tools/src/main/resources/com/skcraft/launcher/buildtools/options.png
new file mode 100644
index 0000000000000000000000000000000000000000..39b0a414ae8f3d57fbb00e2384426a64551c9e40
GIT binary patch
literal 1034
zcmV+l1oiugP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00006VoOIv0RI60
z0RN!9r;`8x1HVZ`K~zW$-BV3yTvZhQ?tL>&Ow&xJO{djXh+U*KyJp>`7B_+*E~;QA
zLER_~+NPk*l*gnZwj&0GTIgb?-Bb{NHj1FDf-6B?C<s-s5Slc9ld+lUWM<yGe&_vV
z-ehWAijVX6edpYJ?mO>3;Q#WdfAb<)``uwUiLU_DyH&4R$}*>l_PHOoxb9J+JKe#y
ztWhY8f+m)6^ceAuO*D&k7KMWkDS8+mE8o^6J5!jVK5N^ymwVMN48iD=u~h*uFehHL
zKO6`kCTA``Ii4$A2yy6R-(>Q9;e@NrEhdHkjnnxQ2CoyRsc@PtxNZwtCtxMRNt=66
z>MC43!+IH?l%6WhPJbeSsB9)4Hc$R%YxfUrg&uDVP_2})L3LV9j}v1hlIR~yqdzrB
z7;VFt*8`Z}ZS@_yV!yT_gcc)u$LXKk-oRjOaUPY`CA2q?dcl>IC9E#qg^`m887NyG
zt~n3R2M|FMqYT`OAsPDe@*?WBY6!dfdUXTqtlOS6Z@&EY+yUW(CW>A3dn6iEPa2zb
zJh=at7YD{Dn9mecj`(vb2T4n*v97tf$tV)m;%epgV=Kb&&BXcoQttiZ8tzS^qm|WV
zY^<*_^u-u;`n#LgKJpRp)C;dnar$#1-jm*ofxY_$E^&V2rHkjj5g;18iG;w7*)u=!
zhx<ZMs}Va{y|r-YW8p(x>sMD8*QuT~8~zY@>hIedNHW$$2yk+~XSo;n=Kjdt7;&Ur
zj$yxw?*^Gvh<qPwGGP}+`CmLOsYEg<F4W$1)nw83tS1I02z#lXB$B&4&q<6;*q6ov
z;5p@4n(>*!8KsQeFmIuJ_~rRK%tYcaD)O5D%!3?foCRP}J;@v%MzW{Ji)retJ6+08
zUt`RWHfw({$RA;mVN}H!<)sD4&5`(@v~N!e>CC}c39sJD_1Uu-zM1jHRkGh$XS?X8
zgw?5`1K9OQUkJPU9_9!4bFYr9GA1t#gw|q2b=`f3et{Z^)*3^PK91DB478PqcnJij
zhBDa4yi(CNlA@|#hZD8vHYzfaWOJ9Y>|O*P1N_dVU(;s+49LA{ZZ_b!4lHf8&%eS=
zuCwkr)*Yg93w5%TKl`m0({LZ!K!&Z_4Tf{P#m_%sRgV^Dr>7E5a)hJ2#g*R1y&TWh
z2R2_i7DlA5YE_RYg-IUft@Z}okITjGpxK$rIacO7%Vg7He!AGncVgX1bj2ES^R}fN
zsIGixVf<@$W&`XR{KC`x!BKGhK53xbq}I26^dGQ)18ZU^fRM>x#{d8T07*qoM6N<$
Eg4W>prT_o{

literal 0
HcmV?d00001

diff --git a/build-tools/src/main/resources/com/skcraft/launcher/buildtools/test.png b/build-tools/src/main/resources/com/skcraft/launcher/buildtools/test.png
new file mode 100644
index 0000000000000000000000000000000000000000..7acd97a40d63a9f0225ee97ac5866400819defa4
GIT binary patch
literal 752
zcmV<M0uTL(P)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00006VoOIv0RI60
z0RN!9r;`8x0;NerK~zW$?NnPx6j2!d{+V&Tg<6!hNRUzau(D)yQCu^E42gQ_q1Qs6
z6d~zVY9R<B*o~lw2qLJLqA2UB%Y#OemkJ^gt;8}c6jyDroN;zf=Zt%naoTZRpB>JB
z{_nq?@0|b446ycO&;d%98ysMsqPc}<AhySu%YeSwJkPP9j|^wbZfkZU6)uh--^gY)
zV90aE`3`Fe4a>hQiQ+7D+Re2zt&kaT`h}eZ3ba+yjKIrDS`txgF3^O~PSH(s(&<ZO
zuZTnz^7bH0mDb92MkL$UD>zb?IZN7$x9|7+?>Hj!;yiY5db}bMrolR~9s~5h{KZYI
zEBy)6RawQZ(L_LH+W7>;VcxF#Z7PT#NMYJJ>0eH#B?<S<x9|_KQ7#f=K%5J>5V58!
zy+*T)xoN&1w-6BSnLkQIPk4sP#ci03SVP<1oR@A1t|Xye-KWLO?hT*E3fzjNKeA)X
z^n#*Ro!y@^EPZyJlH}@pwkd8JJ#`mumF;}mW#v<z2dLZ%)<42;-?V&k8aiHwuJ*<u
zkM5}!e+cQ9T9H6%@k3;${?PZ}Rg%DpoveluJOOIhWts36ft78vaCt{3eD`0J8`=6}
zQExeI(|@mU(VTI^+c#KS6}oFn<FIoO%v%Wd_RHept@Qx!1AEjDdOeKl&^<&;iw_{+
zzs|FpxFpAtlZ1PWrgcB3P9JK&1|`NniewtVMkWxy*a7^S0hJV51Xg%6#~e^Rj)TFQ
zC>Wb;4EGwRV0)I3kiuF6mu@3>I%-Qv0pE>+-VB32d;>inNG4>@Mp1M54!7AEJ|%~i
zM2lc#d|!n>H<E@#<bIkGGvF=ZvIxceqslM3_*GyjB!SSO?mwl9riz|c2zymR_^7I8
iOY83Z@m1BY75xKxF2yh+fn8$&0000<MNUMnLSTaD>SI{|

literal 0
HcmV?d00001

diff --git a/settings.gradle b/settings.gradle
index fabc5b8..a88f495 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,3 @@
 rootProject.name = 'launcher-parent'
 
-include 'launcher', 'launcher-fancy', 'launcher-builder', 'launcher-bootstrap', 'staging-tool'
+include 'launcher', 'launcher-fancy', 'launcher-builder', 'launcher-bootstrap', 'build-tools'
diff --git a/staging-tool/build.gradle b/staging-tool/build.gradle
deleted file mode 100644
index 43934e0..0000000
--- a/staging-tool/build.gradle
+++ /dev/null
@@ -1,32 +0,0 @@
-apply plugin: 'com.github.johnrengelman.shadow'
-
-dependencies {
-    compile project(':launcher-builder')
-    compile 'org.eclipse.jetty:jetty-server:9.3.1.v20150714'
-}
-
-shadowJar {
-    dependencies {
-        exclude(dependency('org.projectlombok:lombok'))
-    }
-}
-
-task createDist(type: Copy) {
-    dependsOn jar, shadowJar
-
-    def destDir = file("${buildDir}/dist/stagingtool")
-    destDir.parentFile.deleteDir()
-    destDir.mkdirs()
-
-    destinationDir destDir
-
-    from("${buildDir}/libs/${shadowJar.baseName}-${version}-all.jar") {
-        rename { f -> "staging-tool.jar" }
-    }
-
-    from("${projectDir}/scripts")
-
-}
-
-build.dependsOn(shadowJar)
-build.dependsOn(createDist)
diff --git a/staging-tool/scripts/HOW_TO_USE.html b/staging-tool/scripts/HOW_TO_USE.html
deleted file mode 100644
index 4b1bfe5..0000000
--- a/staging-tool/scripts/HOW_TO_USE.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>How to Use</title>
-<style>
-body { margin: 0; padding: 20px; }
-body { font-family: Calibri, Arial, sans-serif; font-size: 12pt; }
-#content { max-width: 600px; }
-code { background: #ccc; font-family: Consolas, monospace; font-size: 0.9em; }
-</style>
-</head>
-<body>
-<div id="content">
-<h1>How to Use</h1>
-
-<p>This tool lets you test the modpack locally.</p>
-
-<p>It should be a <code>stagingtool</code> folder within the modpack folder.</p>
-
-<h2>Usage</h2>
-
-<p>Basically, whenever you want to test the modpack, use <code>build_and_launch.bat</code> to build the modpack output files, start a local web server, and open the launcher.</p>
-
-<p>There are other files that you can run too:</p>
-
-<ul>
-    <li><code>build.bat</code> just builds the modpack output files only</li>
-    <li><code>http_server.bat</code> just runs the local web server only</li>
-    <li><code>launch.bat</code> just runs the staging launcher only</li>
-    <li><code>reset_build.bat</code> deletes all the generated modpack output files, but there is rarely a situation where you would need to do this</li>
-    <li><code>reset_launcher.bat</code> deletes downloaded instances, so you can use the launcher as someone who hasn't yet downloaded the modpack yet</li>
-</ul>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/staging-tool/scripts/build.bat b/staging-tool/scripts/build.bat
deleted file mode 100644
index 2fbba1d..0000000
--- a/staging-tool/scripts/build.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-
-java -cp staging-tool.jar com.skcraft.launcher.builder.PackageBuilder --version "%DATE% %TIME%" --input ..\ --output www --manifest-dest "www/staging.json" 
\ No newline at end of file
diff --git a/staging-tool/scripts/build_and_launch.bat b/staging-tool/scripts/build_and_launch.bat
deleted file mode 100644
index 00cf748..0000000
--- a/staging-tool/scripts/build_and_launch.bat
+++ /dev/null
@@ -1,14 +0,0 @@
-@echo off
-
-call build.bat
-if ERRORLEVEL 0 goto Launch
-
-:Launch
-call launch.bat
-goto End
-
-:Error
-echo "ERROR -- Modpack building failed!"
-pause
-
-:End
\ No newline at end of file
diff --git a/staging-tool/scripts/http_server.bat b/staging-tool/scripts/http_server.bat
deleted file mode 100644
index 946b03e..0000000
--- a/staging-tool/scripts/http_server.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-java -cp staging-tool.jar com.skcraft.launcher.staging.StagingServer --www-dir www
\ No newline at end of file
diff --git a/staging-tool/scripts/launch.bat b/staging-tool/scripts/launch.bat
deleted file mode 100644
index b180f7c..0000000
--- a/staging-tool/scripts/launch.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo off
-
-mkdir launcher
-cd launcher
-java -cp ..\staging-tool.jar com.skcraft.launcher.staging.StagingServer --www-dir ..\www --launch
\ No newline at end of file
diff --git a/staging-tool/scripts/reset_build.bat b/staging-tool/scripts/reset_build.bat
deleted file mode 100644
index 223e0de..0000000
--- a/staging-tool/scripts/reset_build.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-
-del /f /s /q www
\ No newline at end of file
diff --git a/staging-tool/scripts/reset_launcher.bat b/staging-tool/scripts/reset_launcher.bat
deleted file mode 100644
index b286db3..0000000
--- a/staging-tool/scripts/reset_launcher.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-
-del /f /s /q launcher\instances
\ No newline at end of file
diff --git a/staging-tool/src/main/java/com/skcraft/launcher/staging/StagingArguments.java b/staging-tool/src/main/java/com/skcraft/launcher/staging/StagingArguments.java
deleted file mode 100644
index 9395d55..0000000
--- a/staging-tool/src/main/java/com/skcraft/launcher/staging/StagingArguments.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * SK's Minecraft Launcher
- * Copyright (C) 2010-2014 Albert Pham <http://www.sk89q.com> and contributors
- * Please see LICENSE.txt for license information.
- */
-
-package com.skcraft.launcher.staging;
-
-import com.beust.jcommander.Parameter;
-import lombok.Data;
-
-import java.io.File;
-
-/**
- * The command line arguments that the staging tool accepts.
- */
-@Data
-public class StagingArguments {
-
-    @Parameter(names = "--www-dir")
-    private File wwwDir = new File(".");
-
-    @Parameter(names = "--port")
-    private Integer port = 28888;
-
-    @Parameter(names = "--launch")
-    private boolean launch = false;
-
-}
diff --git a/staging-tool/src/main/java/com/skcraft/launcher/staging/StagingServer.java b/staging-tool/src/main/java/com/skcraft/launcher/staging/StagingServer.java
deleted file mode 100644
index 34e561c..0000000
--- a/staging-tool/src/main/java/com/skcraft/launcher/staging/StagingServer.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * SK's Minecraft Launcher
- * Copyright (C) 2010-2014 Albert Pham <http://www.sk89q.com> and contributors
- * Please see LICENSE.txt for license information.
- */
-
-package com.skcraft.launcher.staging;
-
-import com.beust.jcommander.JCommander;
-import com.skcraft.launcher.Launcher;
-import org.eclipse.jetty.server.Server;
-
-import java.io.File;
-
-public class StagingServer {
-
-    public static void main(String[] args) throws Exception {
-        StagingArguments options = new StagingArguments();
-        new JCommander(options, args);
-
-        File wwwDir = options.getWwwDir();
-        wwwDir.mkdirs();
-
-        LocalHttpServerBuilder builder = new LocalHttpServerBuilder();
-        builder.setBaseDir(wwwDir);
-        builder.setPort(options.getPort());
-
-        Server server = builder.build();
-        server.start();
-
-        if (options.isLaunch()) {
-            Launcher.main(new String[0]);
-        }
-    }
-
-}
diff --git a/staging-tool/src/main/resources/com/skcraft/launcher/launcher.properties b/staging-tool/src/main/resources/com/skcraft/launcher/launcher.properties
deleted file mode 100644
index 10a62df..0000000
--- a/staging-tool/src/main/resources/com/skcraft/launcher/launcher.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# SK's Minecraft Launcher
-# Copyright (C) 2010-2014 Albert Pham <http://www.sk89q.com> and contributors
-# Please see LICENSE.txt for license information.
-#
-
-version=${project.version}
-agentName=Minecraft
-offlinePlayerName=Player
-
-versionManifestUrl=https://s3.amazonaws.com/Minecraft.Download/versions/%1$s/%1$s.json
-librariesSource=https://libraries.minecraft.net/
-jarUrl=http://s3.amazonaws.com/Minecraft.Download/versions/%1$s/%1$s.jar
-assetsIndexUrl=https://s3.amazonaws.com/Minecraft.Download/indexes/%s.json
-assetsSource=http://resources.download.minecraft.net/
-yggdrasilAuthUrl=https://authserver.mojang.com/authenticate
-resetPasswordUrl=https://minecraft.net/resetpassword
-
-newsUrl=http://localhost:28888/news.html
-packageListUrl=http://localhost:28888/packages.json
-selfUpdateUrl=http://localhost:28888/latest.json