Asset rework + loading bar for export

Author: DecDuck

README.md

@@ -2,12 +2,19 @@
 # KleiCreator
 KleiCreator is a GUI tool for creating mods for the games made by Klei Entertainment. It uses a the Java Runtime Environment and cross-platform libraries to enable mods to be made on any platform.  
 
-### Download/Install
-There are 3 different versions you can download:
- 1. Release: This is an official release, so we've spent some time making sure it's stable and the features are implemented well. You can download the latest from: [Releases](https://github.com/deepcoredev/kleicreator/releases)
- 2. [TO BE SETUP] Master branch: This is a semi-official release. It's built automatically and most likely doesn't have any horrible bugs. You can download it by going [here]() and then click on the dots next to the entry that says "master".
- 3. [TO BE SETUP] Development branch: This is a working branch. Expect unstable versions, breaking changes, things that can corrupt work. However, this is the most current version. You can download it by going [here]() and then click on the dots next to the entry that says "development".
-
-#### Colours:
-Gray: 5b5b5b
-Orange: ffb400
+## About
+KleiCreator runs in the JVM (Java virtual machine), and maintains cross-platform compatibility. Additionally, it supports plugins, allowing anyone to extend its functionality without needing to modify and distribute their own version of KleiCreator.
+
+## Plugins
+As with a lot of Java applications, plugins are compiled and packaged as `.jar` files. Currently, there is no official documentation for the process of creating plugins, but it can be reverse-engineered by looking through the source code of the SDK. Documentation, however, is on the way.
+
+## Using
+KleiCreator can be downloaded from any release, usually called `app-X.X.X.jar`, with an accompanying SDK. These releases are generally quite stable, and automatically check for updates that are newer than themselves.
+
+## Contributing
+KleiCreator is open-source, and as with every OSS project, every contribution counts. If you're contributing by writing code and implementing features, fork this repository, commit your changes, then create a Pull Request to get it merged into the root codebase. If you're contributing through testing, create issues with the problem you've found and hopefully a developer will take a look at them and fix the issue.
+
+### Styles
+If you're making any assets for KleiCreator, the colours used in the logo are:
+ - Gray: 5b5b5b
+ - Orange: ffb400

app/src/main/java/kleicreator/export/Exporter.java

@@ -1,6 +1,7 @@
 package kleicreator.export;
 
 
+import kleicreator.frames.LoadingStartup;
 import kleicreator.master.Master;
 import kleicreator.plugin.PluginHandler;
 import kleicreator.sdk.constants.Constants;
@@ -24,9 +25,10 @@
 import java.nio.file.StandardCopyOption;
 
 public class Exporter {
-    private static ExportDialog exportDialog;
+    private static LoadingStartup exportDialog;
     private static JFrame exportWindowFrame;
-    private static int points;
+    private static int maxJobs;
+    private static int jobs;
 
     public static void Export() {
         try {
@@ -107,17 +109,11 @@ private static void CopyResources(String outputLocation) {
     }
 
     private static void InitLoading() {
-        exportDialog = new ExportDialog();
-        exportWindowFrame = new JFrame("Exporting...");
+        exportDialog = new LoadingStartup();
         Logger.Debug("Exporting...");
         Logger.Debug("Starting exporting init");
-        exportWindowFrame.setIconImage(Master.icon.getImage());
-        exportWindowFrame.setContentPane(exportDialog.getExportWindowFrame());
-        exportWindowFrame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
-        exportWindowFrame.pack();
-        exportWindowFrame.setLocationRelativeTo(null);
-        exportWindowFrame.setVisible(true);
-        points = 6 + Mod.items.size();
+        maxJobs = 6 + Mod.items.size();
+        jobs = 0;
         Logger.Debug("Finished Init");
     }
 
@@ -135,21 +131,19 @@ private static void Write(Template toWrite, String fileLocation) {
     }
 
     private static void MoveLoading() {
-        int currentValue = exportDialog.getExportProgressBar().getValue();
-        float eachPointValue = 100 / points;
-        exportDialog.getExportProgressBar().setValue(currentValue + (int) eachPointValue);
-        exportWindowFrame.pack();
+        jobs++;
+        exportDialog.SetProgress((int) (((float)jobs/maxJobs)*100), "Exporting...");
     }
 
     private static void Done(String finishedLocation) {
-        JOptionPane.showMessageDialog(ModLoader.modEditorFrame, "Done!");
-        exportDialog.getExportProgressBar().setValue(100);
-        exportWindowFrame.dispose();
+        Logger.Log("Finished export");
+        exportDialog.SetProgress(100, "Done!");
+        JOptionPane.showMessageDialog(ModLoader.modEditorFrame, "Successfully completed export!", "Export complete", JOptionPane.INFORMATION_MESSAGE);
+        exportDialog.Destroy();
         try {
             Desktop.getDesktop().open(new File(finishedLocation));
         } catch (IOException e) {
             Logger.Error(e);
         }
-        Logger.Log("Finished export");
     }
 }

app/src/main/java/kleicreator/frames/LoadingStartup.java

@@ -14,25 +14,41 @@ public class LoadingStartup {
     private JFrame frame;
 
     public LoadingStartup() {
-        frame = new JFrame("KleiCreator | Loading...");
-        frame.setContentPane(loadingBar);
-        frame.setUndecorated(true);
-        frame.setIconImage(Master.icon.getImage());
-        frame.setType(Window.Type.UTILITY);
+        SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                frame = new JFrame("KleiCreator | Loading...");
+                frame.setContentPane(loadingBar);
+                frame.setUndecorated(true);
+                frame.setIconImage(Master.icon.getImage());
+                frame.setType(Window.Type.UTILITY);
 
-        frame.pack();
-        frame.setLocationRelativeTo(null);
-        frame.setVisible(true);
+                frame.toFront();
+                frame.pack();
+                frame.setLocationRelativeTo(null);
+                frame.setVisible(true);
+            }
+        });
     }
 
     public void SetProgress(int value, String text) {
-        progressBar.setValue(value);
-        progressBar.setString(text);
-        frame.pack();
+        SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                progressBar.setValue(value);
+                progressBar.setString(text);
+                progressBar.repaint();
+            }
+        });
     }
 
     public void Destroy() {
-        frame.dispose();
+        SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                frame.dispose();
+            }
+        });
     }
 
     {

app/src/main/java/kleicreator/master/Master.java

@@ -78,7 +78,7 @@ public static void Main(String[] args) {
         Config.SaveData("kleicreator.copyresources", false, false);
 
         try {
-            Object o = Config.GetData("kleicreator.theme");
+            Object o = Dark; //Config.GetData("kleicreator.theme");
             if (Light.equals(o)) {
                 UIManager.setLookAndFeel(new FlatLightLaf());
                 darkMode = false;
@@ -178,12 +178,12 @@ public void actionPerformed(ActionEvent e) {
 
                     panel.add(new JLabel("KleiCreator"));
 
-                    JComboBox theme = new JComboBox();
-                    panel.add(theme);
-                    for (GlobalTheme t : GlobalTheme.values()) {
-                        theme.addItem(t.toString());
-                    }
-                    theme.setSelectedIndex(((GlobalTheme) Config.GetData("kleicreator.theme")).ordinal());
+                    //JComboBox theme = new JComboBox();
+                    //panel.add(theme);
+                    //for (GlobalTheme t : GlobalTheme.values()) {
+                    //    theme.addItem(t.toString());
+                    //}
+                    //theme.setSelectedIndex(((GlobalTheme) Config.GetData("kleicreator.theme")).ordinal());
 
                     JCheckBox askSaveOnLeave = new JCheckBox("Ask Save On Leave");
                     panel.add(askSaveOnLeave);
@@ -198,7 +198,7 @@ public void actionPerformed(ActionEvent e) {
                     saveButton.addActionListener(new ActionListener() {
                         @Override
                         public void actionPerformed(ActionEvent e) {
-                            Config.SaveData("kleicreator.theme", GlobalTheme.valueOf(theme.getSelectedItem().toString()));
+                            //Config.SaveData("kleicreator.theme", GlobalTheme.valueOf(theme.getSelectedItem().toString()));
                             Config.SaveData("kleicreator.asksaveonleave", askSaveOnLeave.isSelected());
                             Config.SaveData("kleicreator.copyresources", copyResources.isSelected());
                             PluginHandler.TriggerEvent("OnConfigSave", configDialogFrame);

app/src/main/java/kleicreator/modloader/ModLoaderActions.java

@@ -109,8 +109,13 @@ public static void SetupListeners() {
         modEditor.getModItemSelect().addActionListener(e -> Update());
 
         modEditor.getModExport().addActionListener(e -> {
-            Exporter.Export();
-            Logger.Debug("Exported");
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    Exporter.Export();
+                    Logger.Debug("Exported");
+                }
+            }).start();
         });
 
         modEditor.getModSpeechReloadSpeech().addActionListener(e -> {