fix ordering of changed elements with optimized structure

Fix release workflow

.github/workflows/release.yml

@@ -2,55 +2,68 @@ name: Release Build
 
 on:
   release:
-    types: [created]
+    types: [ created ]
+  workflow_dispatch:
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
 
-    - name: Get Version
-      id: get_version
-      shell: bash
-      run: |
-        echo "Reading version from file:"
-        cat res/ATCS_latest
-        echo ""
-        VERSION=$(tr -d '[:space:]' < "res/ATCS_latest")
-        echo "Processed version: $VERSION"
-        echo "VERSION=$VERSION" >> $GITHUB_ENV
-        echo "Environment variable set to: $VERSION"
+      - name: Get Version
+        id: get_version
+        shell: bash
+        run: |
+          echo "Reading version from file:"
+          cat res/ATCS_latest
+          echo ""
+          VERSION=$(tr -d '[:space:]' < "res/ATCS_latest")
+          echo "Processed version: $VERSION"
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+          echo "Environment variable set to: $VERSION"
 
-    - name: Set up JDK
-      uses: actions/setup-java@v2
-      with:
-        java-version: '11'
-        distribution: 'temurin'
+      - name: Set up JDK
+        uses: actions/setup-java@v2
+        with:
+          java-version: '11'
+          distribution: 'temurin'
 
-    - name: Build JAR
-      shell: bash
-      run: |
-        cd packaging
-        chmod +x package.sh
-        echo "Building JAR and ZIP for version: ${{ env.VERSION }}"
-        ./package.sh -windows
-        echo "Created artifacts:"
-        ls -la common/ATCS.jar
-        ls -la ATCS_${{ env.VERSION }}.zip
+      - name: Build JAR
+        shell: bash
+        run: |
+          cd packaging
+          chmod +x package.sh
+          echo "Building JAR and ZIP for version: ${{ env.VERSION }}"
+          ./package.sh
+          echo "Created artifacts:"
+          ls -la common/ATCS.jar
+          ls -la ATCS_${{ env.VERSION }}.zip
 
-    - name: Install NSIS
-      uses: joncloud/makensis-action@v4
-      with:
-        script-file: packaging/Windows/ATCS_Installer.nsi
-        arguments: /DVERSION="${{ env.VERSION }}"
+      - name: Upload Release Assets (zip)
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          files: |
+            ./packaging/ATCS_${{ env.VERSION }}.zip
 
-    - name: Upload Release Assets
-      uses: softprops/action-gh-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        files: |
-          ./packaging/ATCS_${{ env.VERSION }}.zip
-          ./packaging/ATCS_${{ env.VERSION }}_Setup.exe
+      - name: 'Install makensis (apt)'
+        run: sudo apt update && sudo apt install -y nsis nsis-pluginapi
+        continue-on-error: true
+
+      - name: Create Windows-Installer with NSIS
+        uses: joncloud/makensis-action@v4
+        with:
+          script-file: packaging/Windows/ATCS_Installer.nsi
+          arguments: -DVERSION="${{ env.VERSION }}"
+        continue-on-error: true
+
+      - name: Upload Release Assets (exe)
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          files: ./packaging/ATCS_${{ env.VERSION }}_Setup.exe
+        continue-on-error: true

.idea/artifacts/ATContentStudio_jar.xml

@@ -10,7 +10,6 @@
         <element id="extracted-dir" path="$PROJECT_DIR$/lib/jsoup-1.10.2.jar" path-in-jar="/" />
         <element id="extracted-dir" path="$PROJECT_DIR$/lib/json_simple-1.1.jar" path-in-jar="/" />
         <element id="extracted-dir" path="$PROJECT_DIR$/lib/ui.jar" path-in-jar="/" />
-        <element id="extracted-dir" path="$PROJECT_DIR$/lib/AndorsTrainer_v0.1.5.jar" path-in-jar="/" />
         <element id="extracted-dir" path="$PROJECT_DIR$/lib/jide-oss.jar" path-in-jar="/" />
       </element>
     </root>

.idea/codeStyles/Project.xml

@@ -10,5 +10,10 @@
       <option name="BINARY_OPERATION_WRAP" value="5" />
       <option name="SOFT_MARGINS" value="120" />
     </codeStyleSettings>
+    <codeStyleSettings language="JSON">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="4" />
+      </indentOptions>
+    </codeStyleSettings>
   </code_scheme>
 </component>

createProject.bat

@@ -61,6 +61,8 @@ if not exist %2\%1\.gitignore (
 
     echo .workspace > .gitignore
     echo .project >> .gitignore
+    echo .workspace.json >> .gitignore
+    echo .project.json >> .gitignore
     echo altered/drawable >> .gitignore
     echo altered/drawable/* >> .gitignore
     echo created/drawable >> .gitignore

packaging/Windows/ATCS_Installer.nsi

@@ -67,22 +67,22 @@ Section install
   FileWrite $9 '$\r$\n'
   FileWrite $9 'set "ATCS_DIR=%~dp0"$\r$\n'
   FileWrite $9 'set "MAX_MEM=1024M"$\r$\n'
-  FileWrite $9 'set "CP=%ATCS_DIR%lib\*"$\r$\n'
+  FileWrite $9 'REM required minimum java version is 11$\r$\n'
   FileWrite $9 'set "JAVA=$R0"$\r$\n'
-  FileWrite $9 'set "JAVA_OPTS="$\r$\n'
+  FileWrite $9 'set "JAVA_OPTS=-DFONT_SCALE=1.0 -Dswing.aatext=true"$\r$\n'
   FileWrite $9 'set "ENV_FILE=%ATCS_DIR%ATCS.env.bat"$\r$\n'
-  FileWrite $9 'set "MAIN_CLASS=com.gpl.rpg.atcontentstudio.ATContentStudio"$\r$\n'
   FileWrite $9 '$\r$\n'
   FileWrite $9 'if exist "%ENV_FILE%" ($\r$\n'
   FileWrite $9 '  call "%ENV_FILE%"$\r$\n'
   FileWrite $9 ') else ($\r$\n'
   FileWrite $9 '  echo REM set "MAX_MEM=%MAX_MEM%">"%ENV_FILE%"$\r$\n'
+  FileWrite $9 '  echo REM required minimum java version is 11$\r$\n'
   FileWrite $9 '  echo REM set "JAVA=%JAVA%">>"%ENV_FILE%"$\r$\n'
   FileWrite $9 '  echo REM set "JAVA_OPTS=%JAVA_OPTS%">>"%ENV_FILE%"$\r$\n'
   FileWrite $9 '  echo.>>"%ENV_FILE%"$\r$\n'
   FileWrite $9 ')$\r$\n'
   FileWrite $9 '$\r$\n'
-  FileWrite $9 'start "" "%JAVA%" %JAVA_OPTS% -Xmx%MAX_MEM% -jar ATCS.jar$\r$\n'
+  FileWrite $9 'start "" "%JAVA%" %JAVA_OPTS% -Xmx%MAX_MEM% -jar "%ATCS_DIR%\ATCS.jar"$\r$\n'
   FileClose $9
 
   WriteUninstaller "$INSTDIR\Uninstall.exe"

packaging/common/ATCS.cmd

@@ -2,6 +2,7 @@
 
 set "ATCS_DIR=%~dp0"
 set "MAX_MEM=1024M"
+REM required minimum java version is 11
 set "JAVA=java.exe"
 set "JAVA_OPTS=-DFONT_SCALE=1.0 -Dswing.aatext=true"
 set "ENV_FILE=%ATCS_DIR%ATCS.env.bat"
@@ -10,6 +11,7 @@ if exist "%ENV_FILE%" (
   call "%ENV_FILE%"
 ) else (
   echo REM set "MAX_MEM=%MAX_MEM%">"%ENV_FILE%"
+  echo REM required minimum java version is 11
   echo REM set "JAVA=%JAVA%">>"%ENV_FILE%"
   echo REM set "JAVA_OPTS=%JAVA_OPTS%">>"%ENV_FILE%"
   echo.>>"%ENV_FILE%"

packaging/common/ATCS.sh

@@ -1,9 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+# get the directory of this script
 ATCS_DIR="$(dirname "$(readlink -f "$0" || greadlink -f "$0" || stat -f "$0")")"
 echo "ATCS_DIR: '${ATCS_DIR}'"
 
 MAX_MEM="512M"
-JAVA="java"
+JAVA="java" # minimum required version is Java 11
 JAVA_OPTS='-DFONT_SCALE=1.0 -Dswing.aatext=true'
 
 ENV_FILE="${ATCS_DIR}/ATCS.env"
@@ -13,7 +15,7 @@ if [ -f "${ENV_FILE}" ]; then
 else
   {
     echo "#MAX_MEM=\"${MAX_MEM}\""
-    echo "#JAVA=\"${JAVA}\""
+    echo "#JAVA=\"${JAVA}\" # minimum required version is Java 11"
     echo "#JAVA_OPTS=\"${JAVA_OPTS}\""
     echo ""
   }>"${ENV_FILE}"

packaging/package.sh

@@ -13,8 +13,8 @@ else
 fi
 
 # --- Configuration ---
-PACKAGING_DIR=$(dirname "$(readlink -f "$0" || greadlink -f "$0" || stat -f "$0")")
-ATCS_SOURCE_DIR=$(dirname "${PACKAGING_DIR}")
+PACKAGING_DIR=$(dirname "$(readlink -f "$0" || greadlink -f "$0" || stat -f "$0")") # Directory of this script
+ATCS_SOURCE_DIR=$(dirname "${PACKAGING_DIR}") # Parent directory of this script, assumed to be ATCS source root
 TEMP_DIR="${PACKAGING_DIR}/tmp"
 JAR_LOCATION="${PACKAGING_DIR}/ATCS.jar" # Output JAR location as per script
 MANIFEST_LOCATION="${PACKAGING_DIR}/Manifest.txt"
@@ -31,7 +31,6 @@ EXTRA_SOURCE_DIRS=(
 
 # --- Libraries to include ---
 LIBRARIES=(
-  "AndorsTrainer_v0.1.5.jar"
   "bsh-2.0b4.jar"
   "jide-oss.jar"
   "json_simple-1.1.jar"

res/ATCS_latest

@@ -1 +1 @@
-v0.6.21
+v0.6.24

res/spritesheets.properties

@@ -45,6 +45,7 @@ atcs.spritesheet.items_weapons.category=item
 atcs.spritesheet.items_weapons_2.category=item
 atcs.spritesheet.items_weapons_3.category=item
 
+atcs.spritesheet.monsters_antison.category=monster
 atcs.spritesheet.monsters_armor1.category=monster
 atcs.spritesheet.monsters_arulirs.category=monster
 
@@ -132,3 +133,6 @@ atcs.spritesheet.monsters_newb_3.sizey=64
 atcs.spritesheet.monsters_newb_4.category=monster
 atcs.spritesheet.monsters_newb_4.sizex=32
 atcs.spritesheet.monsters_newb_4.sizey=64
+atcs.spritesheet.monsters_1x2.category=monster
+atcs.spritesheet.monsters_1x2.sizex=32
+atcs.spritesheet.monsters_1x2.sizey=64

src/com/gpl/rpg/atcontentstudio/ATContentStudio.java

@@ -20,6 +20,10 @@ import java.io.InputStreamReader;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.net.http.HttpTimeoutException;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.*;
 import java.util.logging.Level;
@@ -61,22 +65,8 @@ public class ATContentStudio {
 
         ConfigCache.init();
 
-        try {
-            String laf = ConfigCache.getFavoriteLaFClassName();
-            if (laf == null)
-                laf = UIManager.getSystemLookAndFeelClassName();
-            UIManager.setLookAndFeel(laf);
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        } catch (InstantiationException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        } catch (UnsupportedLookAndFeelException e) {
-            e.printStackTrace();
-        }
-
-        scaleUIFont();
+        String laf = ConfigCache.getFavoriteLaFClassName();
+        setLookAndFeel(laf);
 
         // Need to keep a strong reference to it, to avoid garbage collection that'll
         // reset this setting.
@@ -112,7 +102,6 @@ public class ATContentStudio {
                             frame.setVisible(true);
                             frame.setDefaultCloseOperation(StudioFrame.DO_NOTHING_ON_CLOSE);
                         }
-
                     });
                     for (File f : ConfigCache.getKnownWorkspaces()) {
                         if (workspaceRoot.equals(f)) {
@@ -130,6 +119,34 @@ public class ATContentStudio {
         });
     }
 
+    public static void setLookAndFeel(String laf) {
+        if (laf == null)
+        {
+            System.out.println("No look and feel specified, using system default.");
+            laf = UIManager.getSystemLookAndFeelClassName();
+        }
+        System.out.println("Info: Setting look and feel to: " + laf);
+
+        try {
+            UIManager.setLookAndFeel(laf);
+        } catch (ClassNotFoundException e) {
+            System.err.println("Failed to load system look and feel. ");
+            System.err.println("Installed look and feel classes: ");
+            for (UIManager.LookAndFeelInfo info : UIManager.getInstalledLookAndFeels()) {
+                System.err.println("  " + info.getName() + " (" + info.getClassName() + ")");
+            }
+            System.err.println("Tried to load: " + laf + " but got this error:");
+
+            e.printStackTrace();
+        } catch (InstantiationException | UnsupportedLookAndFeelException | IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        var newLaF = UIManager.getLookAndFeel();
+        System.out.println("Using look and feel: " + newLaF.getName() + " (" + newLaF.getClass().getName() + ")");
+
+        scaleUIFont();
+    }
+
     private static void checkUpdate() {
         BufferedReader in = null;
         try {
@@ -152,13 +169,13 @@ public class ATContentStudio {
                 style.append("font-weight:" + (font.isBold() ? "bold" : "normal") + ";");
                 style.append("font-size:" + font.getSize() + "pt;");
                 style.append("background-color: rgb(" + color.getRed() + "," + color.getGreen() + "," + color.getBlue()
-                                     + ");");
+                        + ");");
 
                 JEditorPane ep = new JEditorPane("text/html",
-                                                 "<html><body style=\"" + style + "\">" + "You are not running the latest ATCS version.<br/>"
-                                                         + "You can get the latest version (" + lastLine + ") by clicking the link below.<br/>"
-                                                         + "<a href=\"" + DOWNLOAD_URL + "\">" + DOWNLOAD_URL + "</a><br/>" + "<br/>"
-                                                         + "</body></html>");
+                        "<html><body style=\"" + style + "\">" + "You are not running the latest ATCS version.<br/>"
+                                + "You can get the latest version (" + lastLine + ") by clicking the link below.<br/>"
+                                + "<a href=\"" + DOWNLOAD_URL + "\">" + DOWNLOAD_URL + "</a><br/>" + "<br/>"
+                                + "</body></html>");
 
                 ep.setEditable(false);
                 ep.setBorder(null);
@@ -183,8 +200,14 @@ public class ATContentStudio {
             }
         } catch (MalformedURLException e) {
             e.printStackTrace();
+        } catch (HttpTimeoutException e) {
+            System.out.println("Could not connect to url to check for updates (timeout): " + CHECK_UPDATE_URL);
         } catch (IOException e) {
-            e.printStackTrace();
+            if (e.getMessage() != null && e.getMessage().startsWith("Server returned HTTP response code:")) {
+                System.out.println("Could not fetch current version from server to check for updates (non-success-status): " + e.getMessage());
+            } else {
+                System.out.println("Could not check for updates: '" + CHECK_UPDATE_URL + "' - " + e.getMessage());
+            }
         } finally {
             try {
                 if (in != null)

src/com/gpl/rpg/atcontentstudio/io/JsonSerializable.java

@@ -0,0 +1,8 @@
+package com.gpl.rpg.atcontentstudio.io;
+
+import java.util.Map;
+
+public interface JsonSerializable {
+    Map toMap();
+    void fromMap(Map map);
+}

src/com/gpl/rpg/atcontentstudio/model/GameSource.java

@@ -1,5 +1,6 @@
 package com.gpl.rpg.atcontentstudio.model;
 
+import com.gpl.rpg.atcontentstudio.io.JsonSerializable;
 import com.gpl.rpg.atcontentstudio.model.Project.ResourceSet;
 import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
 import com.gpl.rpg.atcontentstudio.model.maps.TMXMapSet;
@@ -24,7 +25,7 @@ import java.io.*;
 import java.util.List;
 import java.util.*;
 
-public class GameSource implements ProjectTreeNode, Serializable {
+public class GameSource implements ProjectTreeNode, Serializable, JsonSerializable {
 
     private static final long serialVersionUID = -1512979360971918158L;
 
@@ -38,6 +39,22 @@ public class GameSource implements ProjectTreeNode, Serializable {
     public transient WriterModeDataSet writerModeDataSet;
     private transient SavedSlotCollection v;
 
+
+    @Override
+    public Map toMap() {
+        Map map = new HashMap();
+        map.put("type", type.toString());
+        map.put("baseFolder", baseFolder.getPath());
+        return map;
+    }
+
+    @Override
+    public void fromMap(Map map) {
+        if(map==null)return;
+        type = Enum.valueOf(Type.class, (String)map.get("type"));
+        baseFolder = new File((String) map.get("baseFolder"));
+    }
+
     public static enum Type {
         source,
         referenced,
@@ -52,6 +69,10 @@ public class GameSource implements ProjectTreeNode, Serializable {
 
     public transient Map<String, List<String>> referencedSourceFiles = null;
 
+    public GameSource(Map json, Project parent) {
+        fromMap(json);
+        refreshTransients(parent);
+    }
     public GameSource(File folder, Project parent) {
         this.parent = parent;
         this.baseFolder = folder;

src/com/gpl/rpg/atcontentstudio/model/Preferences.java

@@ -1,19 +1,53 @@
 package com.gpl.rpg.atcontentstudio.model;
 
+import com.gpl.rpg.atcontentstudio.io.JsonSerializable;
+
 import java.awt.*;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
-public class Preferences implements Serializable {
+public class Preferences implements Serializable, JsonSerializable {
 
     private static final long serialVersionUID = 2455802658424031276L;
 
     public Dimension windowSize = null;
-    public Map<String, Integer> splittersPositions = new HashMap<String, Integer>();
+    public Map<String, Integer> splittersPositions = new HashMap<>();
 
     public Preferences() {
 
     }
 
+    @Override
+    public Map toMap() {
+        Map map = new HashMap();
+
+        if(windowSize!= null){
+            Map windowSizeMap = new HashMap<>();
+            windowSizeMap.put("width", windowSize.width);
+            windowSizeMap.put("height", windowSize.height);
+            map.put("windowSize", windowSizeMap);
+        }
+
+        map.put("splittersPositions", splittersPositions);
+        return map;
+    }
+
+    @Override
+    public void fromMap(Map map) {
+        if(map == null) return;
+
+        Map windowSize1 = (Map) map.get("windowSize");
+        if(windowSize1 != null){
+            windowSize = new Dimension(((Number) windowSize1.get("width")).intValue(), ((Number) windowSize1.get("height")).intValue());
+        }
+
+        Map<String, Number> splitters = (Map<String, Number>) map.get("splittersPositions");
+        Map<String, Integer> splittersInt = new HashMap<>(splitters.size());
+        for (Map.Entry<String, Number> entry : splitters. entrySet()){
+            splittersInt.put(entry.getKey(), entry.getValue().intValue());
+        }
+        splittersPositions = splittersInt;
+
+    }
 }

src/com/gpl/rpg/atcontentstudio/model/Workspace.java

@@ -2,27 +2,29 @@ package com.gpl.rpg.atcontentstudio.model;
 
 import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.Notification;
+import com.gpl.rpg.atcontentstudio.io.JsonSerializable;
 import com.gpl.rpg.atcontentstudio.io.SettingsSave;
 import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
 import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
 import com.gpl.rpg.atcontentstudio.ui.ProjectsTree.ProjectsTreeModel;
 import com.gpl.rpg.atcontentstudio.ui.WorkerDialog;
+import com.gpl.rpg.atcontentstudio.utils.FileUtils;
+import org.jsoup.SerializationException;
 
 import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 import java.awt.*;
-import java.io.File;
-import java.io.IOException;
-import java.io.Serializable;
+import java.io.*;
 import java.nio.file.Files;
 import java.util.List;
 import java.util.*;
 
-public class Workspace implements ProjectTreeNode, Serializable {
+public class Workspace implements ProjectTreeNode, Serializable, JsonSerializable {
 
     private static final long serialVersionUID = 7938633033601384956L;
 
     public static final String WS_SETTINGS_FILE = ".workspace";
+    public static final String WS_SETTINGS_FILE_JSON = ".workspace.json";
 
     public static Workspace activeWorkspace;
 
@@ -38,6 +40,7 @@ public class Workspace implements ProjectTreeNode, Serializable {
     public transient ProjectsTreeModel projectsTreeModel = null;
 
     public Workspace(File workspaceRoot) {
+        boolean freshWorkspace = false;
         baseFolder = workspaceRoot;
         if (!workspaceRoot.exists()) {
             try {
@@ -49,44 +52,105 @@ public class Workspace implements ProjectTreeNode, Serializable {
             }
         }
         settings = new WorkspaceSettings(this);
-        settingsFile = new File(workspaceRoot, WS_SETTINGS_FILE);
+        settingsFile = new File(workspaceRoot, WS_SETTINGS_FILE_JSON);
         if (!settingsFile.exists()) {
             try {
                 settingsFile.createNewFile();
+                freshWorkspace = true;
             } catch (IOException e) {
                 Notification.addError("Error creating workspace datafile: "
                                               + e.getMessage());
                 e.printStackTrace();
             }
+            Notification.addSuccess("New workspace created: "
+                                            + workspaceRoot.getAbsolutePath());
         }
-        Notification.addSuccess("New workspace created: "
-                                        + workspaceRoot.getAbsolutePath());
-        save();
+        if (freshWorkspace)
+            save();
+    }
+
+    @Override
+    public Map toMap() {
+        Map map = new HashMap();
+        map.put("serialVersionUID", serialVersionUID);
+        map.put("preferences", preferences.toMap());
+        map.put("projectsName", (new ArrayList<String>(projectsName)));
+        map.put("projectsOpenByName", projectsOpenByName);
+        List<String> l = new ArrayList<>(knownMapSourcesFolders.size());
+        for (File f: knownMapSourcesFolders){
+            l.add(f.getPath());
+        }
+        map.put("knownMapSourcesFolders", l);
+        return map;
+    }
+
+    @Override
+    public void fromMap(Map map) {
+        if(serialVersionUID != (long) map.get("serialVersionUID")){
+            throw new SerializationException("wrong seriaVersionUID");
+        }
+
+        preferences.fromMap((Map) map.get("preferences"));
+
+        projectsName = new HashSet<>((List<String>) map.getOrDefault("projectsName", new HashSet<String>()));
+
+        projectsOpenByName = (Map<String, Boolean>) map.getOrDefault("projectsOpenByName", new HashMap<String, Boolean>() );
+
+        List<String> knownMapSourcesFolders1 = (List<String>) map.getOrDefault("knownMapSourcesFolders", new ArrayList<String>());
+        knownMapSourcesFolders = new HashSet<>();
+        if (knownMapSourcesFolders1 != null){
+            int size = knownMapSourcesFolders1.size();
+            for (String path: knownMapSourcesFolders1) {
+                //TODO: catch invalid paths...?
+                knownMapSourcesFolders.add(new File(path));
+            }
+        }
+
     }
 
     public static void setActive(File workspaceRoot) {
         Workspace w;
-        File f = new File(workspaceRoot, WS_SETTINGS_FILE);
-        if (!workspaceRoot.exists() || !f.exists()) {
-            w = new Workspace(workspaceRoot);
+        File f2 = new File(workspaceRoot, WS_SETTINGS_FILE_JSON);
+        if (f2.exists()) {
+            w = loadWorkspaceFromJson(workspaceRoot, f2);
+            w.refreshTransients();
         } else {
-            w = (Workspace) SettingsSave.loadInstance(f, "Workspace");
-            if (w == null) {
+            Notification.addInfo("Could not find json workspace file. Checking for binary file");
+            File f = new File(workspaceRoot, WS_SETTINGS_FILE);
+            if (!workspaceRoot.exists() || !f.exists()) {
                 w = new Workspace(workspaceRoot);
             } else {
-                w.refreshTransients();
+                w = (Workspace) SettingsSave.loadInstance(f, "Workspace");
+                if (w == null) {
+                    w = new Workspace(workspaceRoot);
+                } else {
+                    w.settingsFile = f2;
+                    w.baseFolder = workspaceRoot;
+                    Notification.addInfo("Switched workspace to json format.");
+                    w.refreshTransients();
+                }
+                w.save();
             }
         }
         activeWorkspace = w;
     }
 
+    private static Workspace loadWorkspaceFromJson(File workspaceRoot, File settingsFile) {
+        Workspace w = w = new Workspace(workspaceRoot);
+        Map json = FileUtils.mapFromJsonFile(settingsFile);
+        if (json!= null) {
+            w.fromMap(json);
+        }
+        return w;
+    }
+
     public static void saveActive() {
         activeWorkspace.save();
     }
 
     public void save() {
         settings.save();
-        SettingsSave.saveInstance(this, settingsFile, "Workspace");
+        FileUtils.writeStringToFile(FileUtils.toJsonString(this), settingsFile, "Workspace");
     }
 
     @Override
@@ -356,5 +420,4 @@ public class Workspace implements ProjectTreeNode, Serializable {
         }
         return false;
     }
-
 }

src/com/gpl/rpg/atcontentstudio/model/WorkspaceSettings.java

@@ -1,8 +1,7 @@
 package com.gpl.rpg.atcontentstudio.model;
 
 import com.gpl.rpg.atcontentstudio.Notification;
-import com.gpl.rpg.atcontentstudio.io.JsonPrettyWriter;
-import org.json.simple.JSONObject;
+import com.gpl.rpg.atcontentstudio.utils.FileUtils;
 import org.json.simple.parser.JSONParser;
 
 import java.io.*;
@@ -108,22 +107,8 @@ public class WorkspaceSettings {
         }
 
         json.put(VERSION_KEY, SETTINGS_VERSION);
-        StringWriter writer = new JsonPrettyWriter();
-        try {
-            JSONObject.writeJSONString(json, writer);
-        } catch (IOException e) {
-            //Impossible with a StringWriter
-        }
-        String toWrite = writer.toString();
-        try {
-            FileWriter w = new FileWriter(file);
-            w.write(toWrite);
-            w.close();
-            Notification.addSuccess("Workspace settings saved.");
-        } catch (IOException e) {
-            Notification.addError("Error while saving workspace settings : " + e.getMessage());
-            e.printStackTrace();
-        }
+        String toWrite = FileUtils.toJsonString(json);
+        FileUtils.writeStringToFile(toWrite, file, "Workspace settings");
     }
 
     public void resetDefault() {

src/com/gpl/rpg/atcontentstudio/model/gamedata/GameDataCategory.java

@@ -1,31 +1,115 @@
 package com.gpl.rpg.atcontentstudio.model.gamedata;
 
 import com.gpl.rpg.atcontentstudio.Notification;
-import com.gpl.rpg.atcontentstudio.io.JsonPrettyWriter;
 import com.gpl.rpg.atcontentstudio.model.*;
-import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
-import org.json.simple.JSONArray;
+import com.gpl.rpg.atcontentstudio.utils.FileUtils;
 
 import javax.swing.tree.TreeNode;
 import java.awt.*;
-import java.io.*;
-import java.util.List;
+import java.io.File;
 import java.util.*;
+import java.util.List;
 
-public class GameDataCategory<E extends JSONElement> extends ArrayList<E> implements ProjectTreeNode, Serializable {
+public class GameDataCategory<E extends JSONElement> implements ProjectTreeNode {
+    //region Data
+    private final ArrayList<String> keyList = new ArrayList<>();
+    private final HashMap<String, E> dataMap = new HashMap<>();
+
+    //endregion
 
-    private static final long serialVersionUID = 5486008219704443733L;
 
     public GameDataSet parent;
     public String name;
 
     public GameDataCategory(GameDataSet parent, String name) {
-        super();
         this.parent = parent;
         this.name = name;
     }
 
+    //region Helpers
+    public E get(String key) {
+        return dataMap.get(key);
+    }
+
+    public E get(int index) {
+        String key = keyList.get(index);
+        return dataMap.get(key);
+    }
+
+    public E getIgnoreCase(String key) {
+        for (String k : keyList) {
+            if (k.equalsIgnoreCase(key)) {
+                return dataMap.get(k);
+            }
+        }
+        return null;
+    }
+
+    public E put(String key, E element) {
+        if (!dataMap.containsKey(key)) {
+            keyList.add(key);
+        }
+        return dataMap.put(key, element);
+    }
+
+    public void add(E quest) {
+        String key = quest.id;
+        put(key, quest);
+    }
+
+    public E remove(String key) {
+        if (dataMap.containsKey(key)) {
+            keyList.remove(key);
+        }
+        return dataMap.remove(key);
+    }
+
+    public E remove(int index) {
+        String key = keyList.get(index);
+        keyList.remove(index);
+        return dataMap.remove(key);
+    }
+
+    public boolean removeGeneric(JSONElement element){
+        return remove((E) element);
+    }
+    public boolean remove(E element) {
+        String key = element.id;
+        int index = getProject().getNodeIndex(element);
+        boolean result = false;
+        if (dataMap.containsKey(key)) {
+            keyList.remove(key);
+            dataMap.remove(key);
+            result = true;
+        }
+        getProject().fireElementRemoved(element, index);
+        return result;
+    }
+
+    public int size() {
+        return dataMap.size();
+    }
+    public int indexOf(String key) {
+        return keyList.indexOf(key);
+    }
+    public int indexOf(E element) {
+        String key = element.id;
+        return keyList.indexOf(key);
+    }
+
+    public ArrayList<E> toList() {
+        ArrayList<E> list = new ArrayList<>();
+        for (String key : keyList) {
+            list.add(dataMap.get(key));
+        }
+        return list;
+    }
+
+    //endregion
+
+    //region copied implementation of ProjectTreeNode
+
     @Override
     public TreeNode getChildAt(int childIndex) {
         return get(childIndex);
@@ -43,7 +127,7 @@ public class GameDataCategory<E extends JSONElement> extends ArrayList<E> implem
 
     @Override
     public int getIndex(TreeNode node) {
-        return indexOf(node);
+        return indexOf((E) node);
     }
 
     @Override
@@ -58,7 +142,7 @@ public class GameDataCategory<E extends JSONElement> extends ArrayList<E> implem
 
     @Override
     public Enumeration<E> children() {
-        return Collections.enumeration(this);
+        return Collections.enumeration(toList());
     }
 
     @Override
@@ -86,7 +170,7 @@ public class GameDataCategory<E extends JSONElement> extends ArrayList<E> implem
     @Override
     public void notifyCreated() {
         childrenAdded(new ArrayList<ProjectTreeNode>());
-        for (E node : this) {
+        for (E node : toList()) {
             node.notifyCreated();
         }
     }
@@ -132,10 +216,15 @@ public class GameDataCategory<E extends JSONElement> extends ArrayList<E> implem
     }
 
     @Override
-    public Type getDataType() {
+    public GameSource.Type getDataType() {
         return parent.getDataType();
     }
 
+    @Override
+    public boolean isEmpty() {
+        return dataMap.isEmpty();
+    }
+
     @SuppressWarnings("rawtypes")
     public void save(File jsonFile) {
         if (getDataType() != GameSource.Type.created && getDataType() != GameSource.Type.altered) {
@@ -143,7 +232,7 @@ public class GameDataCategory<E extends JSONElement> extends ArrayList<E> implem
             return;
         }
         List<Map> dataToSave = new ArrayList<Map>();
-        for (E element : this) {
+        for (E element : toList()) {
             if (element.jsonFile.equals(jsonFile)) {
                 dataToSave.add(element.toJson());
             }
@@ -157,26 +246,13 @@ public class GameDataCategory<E extends JSONElement> extends ArrayList<E> implem
 
             return;
         }
-        StringWriter writer = new JsonPrettyWriter();
-        try {
-            JSONArray.writeJSONString(dataToSave, writer);
-        } catch (IOException e) {
-            //Impossible with a StringWriter
-        }
-        String toWrite = writer.toString();
-        try {
-            FileWriter w = new FileWriter(jsonFile);
-            w.write(toWrite);
-            w.close();
-            for (E element : this) {
+
+        String toWrite = FileUtils.toJsonString(dataToSave);
+        if(FileUtils.writeStringToFile(toWrite, jsonFile, "JSON file '"+jsonFile.getAbsolutePath()+"'")){
+            for (E element : dataMap.values()) {
                 element.state = GameDataElement.State.saved;
             }
-            Notification.addSuccess("Json file " + jsonFile.getAbsolutePath() + " saved.");
-        } catch (IOException e) {
-            Notification.addError("Error while writing json file " + jsonFile.getAbsolutePath() + " : " + e.getMessage());
-            e.printStackTrace();
         }
-
     }
 
 
@@ -185,7 +261,8 @@ public class GameDataCategory<E extends JSONElement> extends ArrayList<E> implem
         GameDataCategory<? extends JSONElement> impactedCategory = null;
         String impactedFileName = fileName;
         Map<String, Integer> containedIds = new LinkedHashMap<String, Integer>();
-        for (JSONElement node : this) {
+        ArrayList<E> list = toList();
+        for (JSONElement node : list) {
             if (node.getDataType() == GameSource.Type.created && getProject().baseContent.gameData.getGameDataElement(node.getClass(), node.id) != null) {
                 if (getProject().alteredContent.gameData.getGameDataElement(node.getClass(), node.id) != null) {
                     events.add(new SaveEvent(SaveEvent.Type.moveToAltered, node, true, "Element ID matches one already present in the altered game content. Change this ID before saving."));
@@ -214,7 +291,7 @@ public class GameDataCategory<E extends JSONElement> extends ArrayList<E> implem
         for (String key : containedIds.keySet()) {
             if (containedIds.get(key) > 1) {
                 E node = null;
-                for (E n : this) {
+                for (E n : list) {
                     if (key.equals(n.id)) {
                         node = n;
                         break;
@@ -230,19 +307,15 @@ public class GameDataCategory<E extends JSONElement> extends ArrayList<E> implem
         return events;
     }
 
-    public boolean remove(E o) {
-        int index = getProject().getNodeIndex(o);
-        boolean result = super.remove(o);
-        getProject().fireElementRemoved(o, index);
-        return result;
-    }
-
     @Override
     public boolean needsSaving() {
-        for (E node : this) {
+        for (E node : dataMap.values()) {
             if (node.needsSaving()) return true;
         }
         return false;
     }
 
+    //endregion
+
 }
+

src/com/gpl/rpg/atcontentstudio/model/gamedata/GameDataSet.java

@@ -13,9 +13,9 @@ import javax.swing.tree.TreeNode;
 import java.awt.*;
 import java.io.File;
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Enumeration;
+import java.util.*;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 public class GameDataSet implements ProjectTreeNode, Serializable {
@@ -67,7 +67,7 @@ public class GameDataSet implements ProjectTreeNode, Serializable {
         items = new GameDataCategory<Item>(this, Item.getStaticDesc());
         itemCategories = new GameDataCategory<ItemCategory>(this, ItemCategory.getStaticDesc());
         npcs = new GameDataCategory<NPC>(this, NPC.getStaticDesc());
-        quests = new GameDataCategory<Quest>(this, Quest.getStaticDesc());
+        quests = new GameDataCategory<>(this, Quest.getStaticDesc());
 
         v.add(actorConditions);
         v.add(dialogues);
@@ -159,7 +159,9 @@ public class GameDataSet implements ProjectTreeNode, Serializable {
             }
 
         } else if (parent.type != GameSource.Type.referenced) {
-            for (File f : baseFolder.listFiles()) {
+            List<File> files = new ArrayList<File>(Arrays.stream(baseFolder.listFiles()).collect(Collectors.toList()));
+            Collections.sort(files,Comparator.comparing(x->x.getName()));
+            for (File f : files) {
                 if (f.getName().startsWith("actorconditions_")) {
                     ActorCondition.fromJson(f, actorConditions);
                 } else if (f.getName().startsWith("conversationlist_")) {
@@ -256,82 +258,42 @@ public class GameDataSet implements ProjectTreeNode, Serializable {
 
     public ActorCondition getActorCondition(String id) {
         if (actorConditions == null) return null;
-        for (ActorCondition gde : actorConditions) {
-            if (id.equals(gde.id)) {
-                return gde;
-            }
-        }
-        return null;
+        return actorConditions.get(id);
     }
 
     public Dialogue getDialogue(String id) {
         if (dialogues == null) return null;
-        for (Dialogue gde : dialogues) {
-            if (id.equals(gde.id)) {
-                return gde;
-            }
-        }
-        return null;
+        return dialogues.get(id);
     }
 
     public Droplist getDroplist(String id) {
         if (droplists == null) return null;
-        for (Droplist gde : droplists) {
-            if (id.equals(gde.id)) {
-                return gde;
-            }
-        }
-        return null;
+        return droplists.get(id);
     }
 
     public Item getItem(String id) {
         if (items == null) return null;
-        for (Item gde : items) {
-            if (id.equals(gde.id)) {
-                return gde;
-            }
-        }
-        return null;
+        return items.get(id);
     }
 
     public ItemCategory getItemCategory(String id) {
         if (itemCategories == null) return null;
-        for (ItemCategory gde : itemCategories) {
-            if (id.equals(gde.id)) {
-                return gde;
-            }
-        }
-        return null;
+        return itemCategories.get(id);
     }
 
     public NPC getNPC(String id) {
         if (npcs == null) return null;
-        for (NPC gde : npcs) {
-            if (id.equals(gde.id)) {
-                return gde;
-            }
-        }
-        return null;
+        return npcs.get(id);
     }
 
     public NPC getNPCIgnoreCase(String id) {
         if (npcs == null) return null;
-        for (NPC gde : npcs) {
-            if (id.equalsIgnoreCase(gde.id)) {
-                return gde;
-            }
-        }
-        return null;
+        return npcs.getIgnoreCase(id);
     }
 
     public Quest getQuest(String id) {
         if (quests == null) return null;
-        for (Quest gde : quests) {
-            if (id.equals(gde.id)) {
-                return gde;
-            }
-        }
-        return null;
+        return quests.get(id);
     }
 
     @Override

src/com/gpl/rpg/atcontentstudio/model/gamedata/Item.java

@@ -36,6 +36,8 @@ public class Item extends JSONElement {
     public String description = null;
     public HitEffect hit_effect = null;
     public HitReceivedEffect hit_received_effect = null;
+    public HitEffect miss_effect = null;
+    public HitReceivedEffect miss_received_effect = null;
     public DeathEffect kill_effect = null;
     public EquipEffect equip_effect = null;
 
@@ -193,6 +195,16 @@ public class Item extends JSONElement {
             this.hit_received_effect = parseHitReceivedEffect(hitReceivedEffect);
         }
 
+        Map missEffect = (Map) itemJson.get("missEffect");
+        if (missEffect != null) {
+            this.miss_effect = parseHitEffect(missEffect);
+        }
+
+        Map missReceivedEffect = (Map) itemJson.get("missReceivedEffect");
+        if (missReceivedEffect != null) {
+            this.miss_received_effect = parseHitReceivedEffect(missReceivedEffect);
+        }
+
         Map killEffect = (Map) itemJson.get("killEffect");
         if (killEffect == null) {
             killEffect = (Map) itemJson.get("useEffect");
@@ -225,6 +237,8 @@ public class Item extends JSONElement {
 
         linkEffects(this.hit_effect, proj, this);
         linkEffects(this.hit_received_effect, proj, this);
+        linkEffects(this.miss_effect, proj, this);
+        linkEffects(this.miss_received_effect, proj, this);
         linkEffects(this.kill_effect, proj, this);
         this.state = State.linked;
     }
@@ -294,6 +308,14 @@ public class Item extends JSONElement {
             clone.hit_received_effect = new HitReceivedEffect();
             copyHitReceivedEffectValues(clone.hit_received_effect, this.hit_received_effect, clone);
         }
+        if (this.miss_effect != null) {
+            clone.miss_effect = new HitEffect();
+            copyHitEffectValues(clone.miss_effect, this.miss_effect, clone);
+        }
+        if (this.miss_received_effect != null) {
+            clone.miss_received_effect = new HitReceivedEffect();
+            copyHitReceivedEffectValues(clone.miss_received_effect, this.miss_received_effect, clone);
+        }
         if (this.kill_effect != null) {
             clone.kill_effect = new DeathEffect();
             copyDeathEffectValues(clone.kill_effect, this.kill_effect, clone);
@@ -317,6 +339,18 @@ public class Item extends JSONElement {
                 actorConditionElementChanged(this.hit_effect.conditions_source, oldOne, newOne, this);
                 actorConditionElementChanged(this.hit_effect.conditions_target, oldOne, newOne, this);
             }
+            if (this.hit_received_effect != null) {
+                actorConditionElementChanged(this.hit_received_effect.conditions_source, oldOne, newOne, this);
+                actorConditionElementChanged(this.hit_received_effect.conditions_target, oldOne, newOne, this);
+            }
+            if (this.miss_effect != null) {
+                actorConditionElementChanged(this.miss_effect.conditions_source, oldOne, newOne, this);
+                actorConditionElementChanged(this.miss_effect.conditions_target, oldOne, newOne, this);
+            }
+            if (this.miss_received_effect != null) {
+                actorConditionElementChanged(this.miss_received_effect.conditions_source, oldOne, newOne, this);
+                actorConditionElementChanged(this.miss_received_effect.conditions_target, oldOne, newOne, this);
+            }
 
             if (this.kill_effect != null) {
                 actorConditionElementChanged(this.kill_effect.conditions_source, oldOne, newOne, this);
@@ -381,6 +415,8 @@ public class Item extends JSONElement {
         }
         writeHitEffectToMap(itemJson, this.hit_effect, "hitEffect");
         writeHitReceivedEffectToMap(itemJson, this.hit_received_effect, "hitReceivedEffect");
+        writeHitEffectToMap(itemJson, this.miss_effect, "missEffect");
+        writeHitReceivedEffectToMap(itemJson, this.miss_received_effect, "missReceivedEffect");
 
         String key;
         if (this.category != null && this.category.action_type != null && this.category.action_type == ItemCategory.ActionType.equip) {

src/com/gpl/rpg/atcontentstudio/model/gamedata/JSONElement.java

@@ -4,6 +4,7 @@ import com.gpl.rpg.atcontentstudio.Notification;
 import com.gpl.rpg.atcontentstudio.io.JsonPrettyWriter;
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.model.SaveEvent;
+import com.gpl.rpg.atcontentstudio.utils.FileUtils;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
@@ -73,16 +74,10 @@ public abstract class JSONElement extends GameDataElement {
     public abstract Map toJson();
 
     public String toJsonString() {
-        StringWriter writer = new JsonPrettyWriter();
-        try {
-            JSONObject.writeJSONString(this.toJson(), writer);
-        } catch (IOException e) {
-            //Impossible with a StringWriter
-        }
-        return writer.toString();
+        Map json = this.toJson();
+        return FileUtils.toJsonString(json);
     }
 
-
     @Override
     public GameDataSet getDataSet() {
         if (parent == null) {

src/com/gpl/rpg/atcontentstudio/model/gamedata/NPC.java

@@ -38,6 +38,7 @@ public class NPC extends JSONElement {
     public Integer attack_damage_min = null;
     public String spawngroup_id = null;
     public String faction_id = null;
+    public Integer horizontalFlipChance = null;
     public String dialogue_id = null;
     public String droplist_id = null;
     public Integer attack_cost = null;
@@ -155,6 +156,7 @@ public class NPC extends JSONElement {
         }
         this.spawngroup_id = (String) npcJson.get("spawnGroup");
         this.faction_id = (String) npcJson.get("faction");
+        this.horizontalFlipChance = JSONElement.getInteger((Number) npcJson.get("horizontalFlipChance"));
         this.dialogue_id = (String) npcJson.get("phraseID");
         this.droplist_id = (String) npcJson.get("droplistID");
         this.attack_cost = JSONElement.getInteger((Number) npcJson.get("attackCost"));
@@ -244,6 +246,7 @@ public class NPC extends JSONElement {
         }
         clone.droplist_id = this.droplist_id;
         clone.faction_id = this.faction_id;
+        clone.horizontalFlipChance = this.horizontalFlipChance;
         if (this.hit_effect != null) {
             clone.hit_effect = new HitEffect();
             copyHitEffectValues(clone.hit_effect, this.hit_effect, clone);
@@ -302,6 +305,7 @@ public class NPC extends JSONElement {
         writeMinMaxToMap(npcJson, "attackDamage", this.attack_damage_min, attack_damage_max, 0);
         if (this.spawngroup_id != null) npcJson.put("spawnGroup", this.spawngroup_id);
         if (this.faction_id != null) npcJson.put("faction", this.faction_id);
+        if (this.horizontalFlipChance != null) npcJson.put("horizontalFlipChance", this.horizontalFlipChance);
         if (this.dialogue != null) {
             npcJson.put("phraseID", this.dialogue.id);
         } else if (this.dialogue_id != null) {

src/com/gpl/rpg/atcontentstudio/model/gamedata/Quest.java

@@ -186,5 +186,4 @@ public class Quest extends JSONElement {
         }
         return null;
     }
-
 }

src/com/gpl/rpg/atcontentstudio/model/gamedata/Requirement.java

@@ -64,7 +64,8 @@ public class Requirement extends JSONElement {
         date,
         dateEquals,
         time,
-        timeEquals
+        timeEquals,
+        skillIncrease
     }
 
     public enum SkillID {
@@ -166,6 +167,7 @@ public class Requirement extends JSONElement {
             case dateEquals:
             case time:
             case timeEquals:
+            case skillIncrease:
                 break;
         }
         if (this.required_obj != null) this.required_obj.addBacklink((GameDataElement) this.parent);

src/com/gpl/rpg/atcontentstudio/model/saves/SavedGame.java

@@ -1,185 +0,0 @@
-package com.gpl.rpg.atcontentstudio.model.saves;
-
-import com.gpl.rpg.andorstrainer.io.SavedGameIO;
-import com.gpl.rpg.atcontentstudio.model.GameDataElement;
-import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
-import com.gpl.rpg.atcontentstudio.model.Project;
-import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
-import com.gpl.rpg.atcontentstudio.model.SaveEvent;
-import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
-import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
-
-import javax.swing.tree.TreeNode;
-import java.awt.*;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-
-public class SavedGame extends GameDataElement {
-
-    private static final long serialVersionUID = -6443495534761084990L;
-
-    public File savedFile;
-    transient public com.gpl.rpg.andorstrainer.model.SavedGame loadedSave = null;
-    transient public SavedGamesSet parent;
-
-    public SavedGame(SavedGamesSet parent, File f) throws IOException {
-        savedFile = f;
-        refreshTransients(parent);
-    }
-
-    public void refreshTransients(SavedGamesSet parent) throws IOException {
-        this.parent = parent;
-        this.loadedSave = SavedGameIO.loadFile(savedFile);
-        if (this.loadedSave == null) {
-            throw new IOException("Unable to load save: " + savedFile.getAbsolutePath());
-        }
-    }
-
-    @Override
-    public Enumeration<ProjectTreeNode> children() {
-        return null;
-    }
-
-    @Override
-    public boolean getAllowsChildren() {
-        return false;
-    }
-
-    @Override
-    public TreeNode getChildAt(int arg0) {
-        return null;
-    }
-
-    @Override
-    public int getChildCount() {
-        return 0;
-    }
-
-    @Override
-    public int getIndex(TreeNode arg0) {
-        return 0;
-    }
-
-    @Override
-    public TreeNode getParent() {
-        return parent;
-    }
-
-    @Override
-    public boolean isLeaf() {
-        return true;
-    }
-
-    @Override
-    public void childrenAdded(List<ProjectTreeNode> path) {
-        path.add(0, this);
-        parent.childrenAdded(path);
-    }
-
-    @Override
-    public void childrenChanged(List<ProjectTreeNode> path) {
-        path.add(0, this);
-        parent.childrenChanged(path);
-    }
-
-    @Override
-    public void childrenRemoved(List<ProjectTreeNode> path) {
-        path.add(0, this);
-        parent.childrenRemoved(path);
-    }
-
-    @Override
-    public void notifyCreated() {
-        childrenAdded(new ArrayList<ProjectTreeNode>());
-    }
-
-    @Override
-    public String getDesc() {
-        return (needsSaving() ? "*" : "") + loadedSave.displayInfo;
-    }
-
-    @Override
-    public Project getProject() {
-        return parent.getProject();
-    }
-
-    @Override
-    public Image getIcon() {
-        return DefaultIcons.getHeroIcon();
-    }
-
-    @Override
-    public Image getLeafIcon() {
-        return DefaultIcons.getHeroIcon();
-    }
-
-    @Override
-    public Image getClosedIcon() {
-        return null;
-    }
-
-    @Override
-    public Image getOpenIcon() {
-        return null;
-    }
-
-    @Override
-    public GameDataSet getDataSet() {
-        return null;
-    }
-
-    @Override
-    public Type getDataType() {
-        return null;
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return false;
-    }
-
-    @Override
-    public void parse() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void link() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public GameDataElement clone() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public void elementChanged(GameDataElement oldOne, GameDataElement newOne) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public String getProjectFilename() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public void save() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public List<SaveEvent> attemptSave() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-}

src/com/gpl/rpg/atcontentstudio/model/saves/SavedGamesSet.java

@@ -1,188 +0,0 @@
-package com.gpl.rpg.atcontentstudio.model.saves;
-
-import com.gpl.rpg.atcontentstudio.Notification;
-import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
-import com.gpl.rpg.atcontentstudio.model.Project;
-import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
-import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
-import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
-
-import javax.swing.tree.TreeNode;
-import java.awt.*;
-import java.io.File;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Vector;
-
-public class SavedGamesSet implements ProjectTreeNode, Serializable {
-
-    private static final long serialVersionUID = -6565834239789184087L;
-
-    public Vector<SavedGame> saves; //For simulations.
-
-    public Project parent;
-
-    public SavedGamesSet(Project parent) {
-        this.parent = parent;
-        saves = new Vector<SavedGame>();
-    }
-
-    public void refreshTransients() {
-        for (SavedGame save : saves) {
-            try {
-                save.refreshTransients(this);
-            } catch (IOException e) {
-                Notification.addError(e.getMessage());
-            }
-        }
-    }
-
-    public void addSave(File f) {
-        try {
-            ProjectTreeNode higherEmptyParent = this;
-            while (higherEmptyParent != null) {
-                if (higherEmptyParent.getParent() != null && ((ProjectTreeNode) higherEmptyParent.getParent()).isEmpty())
-                    higherEmptyParent = (ProjectTreeNode) higherEmptyParent.getParent();
-                else break;
-            }
-            if (higherEmptyParent == this && !this.isEmpty()) higherEmptyParent = null;
-            SavedGame node = new SavedGame(this, f);
-            saves.add(node);
-            if (higherEmptyParent != null) higherEmptyParent.notifyCreated();
-            else node.notifyCreated();
-        } catch (IOException e) {
-            Notification.addError(e.getMessage());
-        }
-    }
-
-    public SavedGame getSave(File f) {
-        for (SavedGame save : saves) {
-            if (save.savedFile.equals(f)) return save;
-        }
-        return null;
-    }
-
-    @Override
-    public Enumeration<? extends ProjectTreeNode> children() {
-        return saves.elements();
-    }
-
-    @Override
-    public boolean getAllowsChildren() {
-        return true;
-    }
-
-    @Override
-    public TreeNode getChildAt(int arg0) {
-        return saves.elementAt(arg0);
-    }
-
-    @Override
-    public int getChildCount() {
-        return saves.size();
-    }
-
-    @Override
-    public int getIndex(TreeNode arg0) {
-        return saves.indexOf(arg0);
-    }
-
-    @Override
-    public TreeNode getParent() {
-        return parent;
-    }
-
-    @Override
-    public boolean isLeaf() {
-        return false;
-    }
-
-    @Override
-    public void childrenAdded(List<ProjectTreeNode> path) {
-        path.add(0, this);
-        parent.childrenAdded(path);
-    }
-
-    @Override
-    public void childrenChanged(List<ProjectTreeNode> path) {
-        path.add(0, this);
-        parent.childrenChanged(path);
-    }
-
-    @Override
-    public void childrenRemoved(List<ProjectTreeNode> path) {
-        if (path.size() == 1 && this.getChildCount() == 1) {
-            childrenRemoved(new ArrayList<ProjectTreeNode>());
-        } else {
-            path.add(0, this);
-            parent.childrenRemoved(path);
-        }
-    }
-
-    @Override
-    public void notifyCreated() {
-        childrenAdded(new ArrayList<ProjectTreeNode>());
-        for (SavedGame s : saves) {
-            s.notifyCreated();
-        }
-    }
-
-    @Override
-    public String getDesc() {
-        return (needsSaving() ? "*" : "") + "Saved games";
-    }
-
-    @Override
-    public Project getProject() {
-        return parent.getProject();
-    }
-
-
-    @Override
-    public Image getIcon() {
-        return getOpenIcon();
-    }
-
-    @Override
-    public Image getClosedIcon() {
-        return DefaultIcons.getSavClosedIcon();
-    }
-
-    @Override
-    public Image getLeafIcon() {
-        return DefaultIcons.getSavClosedIcon();
-    }
-
-    @Override
-    public Image getOpenIcon() {
-        return DefaultIcons.getSavOpenIcon();
-    }
-
-
-    @Override
-    public GameDataSet getDataSet() {
-        return null;
-    }
-
-    @Override
-    public Type getDataType() {
-        return null;
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return saves.isEmpty();
-    }
-
-
-    @Override
-    public boolean needsSaving() {
-        for (ProjectTreeNode node : saves) {
-            if (node.needsSaving()) return true;
-        }
-        return false;
-    }
-}

src/com/gpl/rpg/atcontentstudio/model/sprites/SpriteSheetSet.java

@@ -10,9 +10,7 @@ import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 import javax.swing.tree.TreeNode;
 import java.awt.*;
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
+import java.util.*;
 import java.util.List;
 
 public class SpriteSheetSet implements ProjectTreeNode {
@@ -44,6 +42,7 @@ public class SpriteSheetSet implements ProjectTreeNode {
                 }
             }
         }
+        spritesheets.sort(Comparator.comparing(s -> s.id));
     }
 
     @Override

src/com/gpl/rpg/atcontentstudio/model/tools/i18n/PotGenerator.java

@@ -19,12 +19,12 @@ public class PotGenerator {
 
         GameSource gsrc = proj.baseContent;
 
-        for (ActorCondition ac : gsrc.gameData.actorConditions) {
+        for (ActorCondition ac : gsrc.gameData.actorConditions.toList()) {
             pushString(stringsResources, resourcesStrings, ac.display_name, getPotContextComment(ac));
             pushString(stringsResources, resourcesStrings, ac.description, getPotContextComment(ac) + ":description");
         }
 
-        for (Dialogue d : gsrc.gameData.dialogues) {
+        for (Dialogue d : gsrc.gameData.dialogues.toList()) {
             pushString(stringsResources, resourcesStrings, d.message, getPotContextComment(d));
             if (d.replies == null) continue;
             for (Dialogue.Reply r : d.replies) {
@@ -34,20 +34,20 @@ public class PotGenerator {
             }
         }
 
-        for (ItemCategory ic : gsrc.gameData.itemCategories) {
+        for (ItemCategory ic : gsrc.gameData.itemCategories.toList()) {
             pushString(stringsResources, resourcesStrings, ic.name, getPotContextComment(ic));
         }
 
-        for (Item i : gsrc.gameData.items) {
+        for (Item i : gsrc.gameData.items.toList()) {
             pushString(stringsResources, resourcesStrings, i.name, getPotContextComment(i));
             pushString(stringsResources, resourcesStrings, i.description, getPotContextComment(i) + ":description");
         }
 
-        for (NPC npc : gsrc.gameData.npcs) {
+        for (NPC npc : gsrc.gameData.npcs.toList()) {
             pushString(stringsResources, resourcesStrings, npc.name, getPotContextComment(npc));
         }
 
-        for (Quest q : gsrc.gameData.quests) {
+        for (Quest q : gsrc.gameData.quests.toList()) {
             if (q.visible_in_log != null && q.visible_in_log != 0) {
                 pushString(stringsResources, resourcesStrings, q.name, getPotContextComment(q));
                 for (QuestStage qs : q.stages) {

src/com/gpl/rpg/atcontentstudio/model/tools/resoptimizer/ResourcesCompactor.java

@@ -3,10 +3,7 @@ package com.gpl.rpg.atcontentstudio.model.tools.resoptimizer;
 import com.gpl.rpg.atcontentstudio.io.JsonPrettyWriter;
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.model.Project;
-import com.gpl.rpg.atcontentstudio.model.gamedata.ActorCondition;
-import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
-import com.gpl.rpg.atcontentstudio.model.gamedata.Item;
-import com.gpl.rpg.atcontentstudio.model.gamedata.NPC;
+import com.gpl.rpg.atcontentstudio.model.gamedata.*;
 import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
 import com.gpl.rpg.atcontentstudio.model.maps.TMXMapSet;
 import com.gpl.rpg.atcontentstudio.model.sprites.SpriteSheetSet;
@@ -81,12 +78,13 @@ public class ResourcesCompactor {
         File folder = new File(baseFolder.getAbsolutePath() + File.separator + GameDataSet.DEFAULT_REL_PATH_IN_SOURCE);
         if (!folder.exists()) folder.mkdirs();
 
-        for (ActorCondition ac : proj.baseContent.gameData.actorConditions) {
+        ArrayList<ActorCondition> actorConditions = proj.baseContent.gameData.actorConditions.toList();
+        for (ActorCondition ac : actorConditions) {
             if (filesCovered.contains(ac.jsonFile)) continue;
             File currentFile = ac.jsonFile;
             filesCovered.add(currentFile);
             List<Map> dataToSave = new ArrayList<Map>();
-            for (ActorCondition acond : proj.baseContent.gameData.actorConditions) {
+            for (ActorCondition acond : actorConditions) {
                 if (!acond.jsonFile.equals(currentFile)) continue;
                 Map json = acond.toJson();
                 json.put("iconID", convertObjectSprite(acond.icon_id).toStringID());
@@ -96,12 +94,13 @@ public class ResourcesCompactor {
             writeJson(dataToSave, target);
         }
 
-        for (Item it : proj.baseContent.gameData.items) {
+        ArrayList<Item> items = proj.baseContent.gameData.items.toList();
+        for (Item it : items) {
             if (filesCovered.contains(it.jsonFile)) continue;
             File currentFile = it.jsonFile;
             filesCovered.add(currentFile);
             List<Map> dataToSave = new ArrayList<Map>();
-            for (Item item : proj.baseContent.gameData.items) {
+            for (Item item : items) {
                 if (!item.jsonFile.equals(currentFile)) continue;
                 Map json = item.toJson();
                 json.put("iconID", convertObjectSprite(item.icon_id).toStringID());
@@ -112,12 +111,13 @@ public class ResourcesCompactor {
         }
 
 
-        for (NPC np : proj.baseContent.gameData.npcs) {
+        ArrayList<NPC> npcs = proj.baseContent.gameData.npcs.toList();
+        for (NPC np : npcs) {
             if (filesCovered.contains(np.jsonFile)) continue;
             File currentFile = np.jsonFile;
             filesCovered.add(currentFile);
             List<Map> dataToSave = new ArrayList<Map>();
-            for (NPC npc : proj.baseContent.gameData.npcs) {
+            for (NPC npc : npcs) {
                 if (!npc.jsonFile.equals(currentFile)) continue;
                 Map json = npc.toJson();
                 if (proj.getImage(npc.icon_id).getWidth(null) == TILE_WIDTH_IN_PIXELS || proj.getImage(npc.icon_id).getHeight(null) == TILE_HEIGHT_IN_PIXELS) {
@@ -145,16 +145,12 @@ public class ResourcesCompactor {
     private Minify jsonMinifier = new Minify();
 
     private void writeJson(List<Map> dataToSave, File target) {
-        StringWriter writer = new JsonPrettyWriter();
-        try {
-            JSONArray.writeJSONString(dataToSave, writer);
-        } catch (IOException e) {
-            //Impossible with a StringWriter
-        }
-        String toWrite = writer.toString();
+        String toWrite = FileUtils.toJsonString(dataToSave);
+        toWrite = jsonMinifier.minify(toWrite);
+        FileUtils.writeStringToFile(toWrite, target, null);
         try {
             FileWriter w = new FileWriter(target);
-            w.write(jsonMinifier.minify(toWrite));
+            w.write(toWrite);
             w.close();
         } catch (IOException e) {
             e.printStackTrace();

src/com/gpl/rpg/atcontentstudio/model/tools/writermode/WriterModeDataSet.java

@@ -6,6 +6,7 @@ import com.gpl.rpg.atcontentstudio.model.*;
 import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
 import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
+import com.gpl.rpg.atcontentstudio.utils.FileUtils;
 import org.json.simple.JSONArray;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
@@ -155,24 +156,12 @@ public class WriterModeDataSet implements ProjectTreeNode, Serializable {
 
             return;
         }
-        StringWriter writer = new JsonPrettyWriter();
-        try {
-            JSONArray.writeJSONString(dataToSave, writer);
-        } catch (IOException e) {
-            //Impossible with a StringWriter
-        }
-        String toWrite = writer.toString();
-        try {
-            FileWriter w = new FileWriter(writerFile);
-            w.write(toWrite);
-            w.close();
+
+        String toWrite = FileUtils.toJsonString(dataToSave);
+        if(FileUtils.writeStringToFile(toWrite, writerFile, "Json file " + writerFile.getAbsolutePath())) {
             for (WriterModeData element : writerModeDataList) {
                 element.state = GameDataElement.State.saved;
             }
-            Notification.addSuccess("Json file " + writerFile.getAbsolutePath() + " saved.");
-        } catch (IOException e) {
-            Notification.addError("Error while writing json file " + writerFile.getAbsolutePath() + " : " + e.getMessage());
-            e.printStackTrace();
         }
     }
 

src/com/gpl/rpg/atcontentstudio/ui/EditorsArea.java

@@ -4,13 +4,11 @@ import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
 import com.gpl.rpg.atcontentstudio.model.gamedata.*;
 import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
 import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment;
-import com.gpl.rpg.atcontentstudio.model.saves.SavedGame;
 import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet;
 import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeData;
 import com.gpl.rpg.atcontentstudio.ui.gamedataeditors.*;
 import com.gpl.rpg.atcontentstudio.ui.map.TMXMapEditor;
 import com.gpl.rpg.atcontentstudio.ui.map.WorldMapEditor;
-import com.gpl.rpg.atcontentstudio.ui.saves.SavedGameEditor;
 import com.gpl.rpg.atcontentstudio.ui.sprites.SpritesheetEditor;
 import com.gpl.rpg.atcontentstudio.ui.tools.writermode.WriterModeEditor;
 import com.jidesoft.swing.JideTabbedPane;
@@ -129,15 +127,6 @@ public class EditorsArea extends JPanel {
     }
 
 
-    public void openEditor(SavedGame save) {
-        if (editors.containsKey(save)) {
-            tabHolder.setSelectedComponent(editors.get(save));
-            return;
-        }
-        openEditor(new SavedGameEditor(save));
-    }
-
-
     public void openEditor(WorldmapSegment node) {
         if (editors.containsKey(node)) {
             tabHolder.setSelectedComponent(editors.get(node));

src/com/gpl/rpg/atcontentstudio/ui/ProjectsTree.java

@@ -1,6 +1,5 @@
 package com.gpl.rpg.atcontentstudio.ui;
 
-import com.gpl.rpg.andorstrainer.AndorsTrainer;
 import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
 import com.gpl.rpg.atcontentstudio.model.Workspace;
@@ -8,7 +7,6 @@ import com.gpl.rpg.atcontentstudio.model.bookmarks.BookmarkEntry;
 import com.gpl.rpg.atcontentstudio.model.gamedata.JSONElement;
 import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
 import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment;
-import com.gpl.rpg.atcontentstudio.model.saves.SavedGame;
 import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet;
 import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeData;
 import com.jidesoft.swing.TreeSearchable;
@@ -36,12 +34,6 @@ public class ProjectsTree extends JPanel {
 
     private JPopupMenu popupMenu;
 
-    private Thread konamiTimeout = null;
-    private boolean exit = false;
-    private int timeout = 200;
-    private Integer[] konamiBuffer = new Integer[]{null, null, null, null, null, null, null, null, null, null};
-    private boolean konamiCodeEntered = false;
-
     public ProjectsTree() {
         super();
         setLayout(new BorderLayout());
@@ -68,22 +60,6 @@ public class ProjectsTree extends JPanel {
                     if (projectsTree.getSelectionPath() != null) {
                         itemAction((ProjectTreeNode) projectsTree.getSelectionPath().getLastPathComponent());
                     }
-                } else {
-                    if (konamiTimeout == null) {
-                        startKonamiCount();
-                    }
-                    int i = 0;
-                    while (i < konamiBuffer.length && konamiBuffer[i] != null) {
-                        i++;
-                    }
-                    if (i < konamiBuffer.length) {
-                        konamiBuffer[i] = e.getKeyCode();
-                        if (!compareBuffers()) {
-                            exit = true;
-                        } else {
-                            resetTimeout();
-                        }
-                    }
                 }
             }
         });
@@ -198,10 +174,6 @@ public class ProjectsTree extends JPanel {
             addNextSeparator = true;
             popupMenu.add(new JMenuItem(actions.createWorldmap));
         }
-        if (actions.loadSave.isEnabled()) {
-            addNextSeparator = true;
-            popupMenu.add(new JMenuItem(actions.loadSave));
-        }
         if (addNextSeparator) {
             popupMenu.add(new JSeparator());
             addNextSeparator = false;
@@ -245,311 +217,6 @@ public class ProjectsTree extends JPanel {
             popupMenu.add(new JSeparator());
             addNextSeparator = false;
         }
-
-        if (konamiCodeEntered) {
-            JMenuItem openTrainer = new JMenuItem("Start Andor's Trainer...");
-            popupMenu.add(openTrainer);
-            popupMenu.addSeparator();
-            openTrainer.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    new Thread() {
-                        public void run() {
-                            AndorsTrainer.startApp(false);
-                        }
-                    }.start();
-                }
-            });
-        }
-
-//		if (projectsTree.getSelectionPath() == null || projectsTree.getSelectionPath().getLastPathComponent() == null) {
-//			JMenuItem addProject = new JMenuItem("Create project...");
-//			popupMenu.add(addProject);
-//			addProject.addActionListener(new ActionListener() {
-//				@Override
-//				public void actionPerformed(ActionEvent e) {
-//					new ProjectCreationWizard().setVisible(true);
-//				}
-//			});
-//			popupMenu.addSeparator();
-//		} else if (projectsTree.getSelectionPaths().length > 1) {
-//			boolean deleteAll = false;
-//			final List<GameDataElement> elementsToDelete = new ArrayList<GameDataElement>();
-//			for (TreePath selected : projectsTree.getSelectionPaths()) {
-//				if (selected.getLastPathComponent() instanceof GameDataElement && ((GameDataElement)selected.getLastPathComponent()).writable) {
-//					elementsToDelete.add((GameDataElement) selected.getLastPathComponent());
-//					deleteAll = true;
-//				} else {
-//					deleteAll = false;
-//					break;
-//				}
-//			}
-//			if (deleteAll) {
-//				JMenuItem deleteItems = new JMenuItem("Delete all selected elements");
-//				popupMenu.add(deleteItems);
-//				deleteItems.addActionListener(new ActionListener() {
-//					@Override
-//					public void actionPerformed(ActionEvent e) {
-//						final Map<GameDataCategory<JSONElement>, Set<File>> impactedCategories = new IdentityHashMap<GameDataCategory<JSONElement>, Set<File>>();
-//						for (GameDataElement element : elementsToDelete) {
-//							ATContentStudio.frame.closeEditor(element);
-//							element.childrenRemoved(new ArrayList<ProjectTreeNode>());
-//							if (element instanceof JSONElement) {
-//								@SuppressWarnings("unchecked")
-//								GameDataCategory<JSONElement> category = (GameDataCategory<JSONElement>) element.getParent();
-//								category.remove(element);
-//								if (impactedCategories.get(category) == null) {
-//									impactedCategories.put(category, new HashSet<File>());
-//								}
-//								impactedCategories.get(category).add(((JSONElement) element).jsonFile);
-//							} else if (element instanceof TMXMap) {
-//								TMXMapSet parent = (TMXMapSet) element.getParent();
-//								parent.tmxMaps.remove(element);
-//							}
-//						}
-//						new Thread() {
-//							@Override
-//							public void run() {
-//								final List<SaveEvent> events = new ArrayList<SaveEvent>();
-//								List<SaveEvent> catEvents = null;
-//								for (GameDataCategory<JSONElement> category : impactedCategories.keySet()) {
-//									for (File f : impactedCategories.get(category)) {
-//										catEvents = category.attemptSave(true, f.getName());
-//										if (catEvents.isEmpty()) {
-//											category.save(f);
-//										} else {
-//											events.addAll(catEvents);
-//										}
-//									}
-//								}
-//								if (!events.isEmpty()) {
-//									new SaveItemsWizard(events, null).setVisible(true);
-//								}
-//							}
-//						}.start();
-//					}
-//				});
-//			}
-//			
-//			popupMenu.addSeparator();
-//		} else {
-//			final ProjectTreeNode selected = (ProjectTreeNode) projectsTree.getSelectionPath().getLastPathComponent();
-//			if (selected instanceof Project) {
-//				JMenuItem closeProject = new JMenuItem("Close Project...");
-//				JMenuItem deleteProject = new JMenuItem("Delete Project...");
-//				popupMenu.add(closeProject);
-//				popupMenu.add(deleteProject);
-//				popupMenu.addSeparator();
-//				closeProject.addActionListener(new ActionListener() {
-//					@Override
-//					public void actionPerformed(ActionEvent e) {
-//						Workspace.closeProject((Project) selected);
-//					}
-//				});
-//				deleteProject.addActionListener(new ActionListener() {
-//					@Override
-//					public void actionPerformed(ActionEvent e) {
-//						int confirm = JOptionPane.showConfirmDialog(ProjectsTree.this, "Are you sure you wish to delete this project ?\nAll files created for it will be deleted too...", "Delete this project ?", JOptionPane.OK_CANCEL_OPTION);
-//						if (confirm == JOptionPane.OK_OPTION) {
-//							Workspace.deleteProject(((Project)projectsTree.getSelectionPath().getLastPathComponent()));
-//						}
-//					}
-//				});
-//			}
-//			if (selected instanceof ClosedProject) {
-//				JMenuItem openProject = new JMenuItem("Open Project...");
-//				JMenuItem deleteProject = new JMenuItem("Delete Project...");
-//				popupMenu.add(openProject);
-//				popupMenu.add(deleteProject);
-//				popupMenu.addSeparator();
-//				openProject.addActionListener(new ActionListener() {
-//					@Override
-//					public void actionPerformed(ActionEvent e) {
-//						Workspace.openProject(((ClosedProject)selected));
-//					}
-//				});
-//				deleteProject.addActionListener(new ActionListener() {
-//					@Override
-//					public void actionPerformed(ActionEvent e) {
-//						int confirm = JOptionPane.showConfirmDialog(ProjectsTree.this, "Are you sure you wish to delete this project ?\nAll files created for it will be deleted too...", "Delete this project ?", JOptionPane.OK_CANCEL_OPTION);
-//						if (confirm == JOptionPane.OK_OPTION) {
-//							Workspace.deleteProject(((ClosedProject)selected));
-//						}
-//					}
-//				});
-//			}
-//			if (selected.getProject() != null) {
-//				final Project proj = ((ProjectTreeNode)selected).getProject();
-//				JMenuItem createGDE = new JMenuItem("Create Game Data Element (JSON)");
-//				popupMenu.add(createGDE);
-//				createGDE.addActionListener(new ActionListener() {
-//					@Override
-//					public void actionPerformed(ActionEvent e) {
-//						new JSONCreationWizard(proj).setVisible(true);
-//					}
-//				});
-//				JMenuItem importJson = new JMenuItem("Import JSON data");
-//				popupMenu.add(importJson);
-//				importJson.addActionListener(new ActionListener() {
-//					@Override
-//					public void actionPerformed(ActionEvent e) {
-//						new JSONImportWizard(proj).setVisible(true);
-//					}
-//				});
-//				//TODO move somewhere else
-//				JMenu compareElementsMenu = new JMenu("Open comparator for...");
-//				JMenuItem compareItems = new JMenuItem("Items");
-//				compareElementsMenu.add(compareItems);
-//				compareItems.addActionListener(new ActionListener() {
-//					@Override
-//					public void actionPerformed(ActionEvent e) {
-//						ATContentStudio.frame.editors.openEditor(new ItemsTableView(selected.getProject()));
-//					}
-//				});
-//				JMenuItem compareNPCs = new JMenuItem("NPCs");
-//				compareElementsMenu.add(compareNPCs);
-//				compareNPCs.addActionListener(new ActionListener() {
-//					@Override
-//					public void actionPerformed(ActionEvent e) {
-//						ATContentStudio.frame.editors.openEditor(new NPCsTableView(selected.getProject()));
-//					}
-//				});
-//				popupMenu.add(compareElementsMenu);
-//				
-//				JMenuItem exportProjectPackage = new JMenuItem("Export project");
-//				exportProjectPackage.addActionListener(new ActionListener() {
-//					@Override
-//					public void actionPerformed(ActionEvent e) {
-//						JFileChooser chooser = new JFileChooser() {
-//							private static final long serialVersionUID = 8039332384370636746L;
-//							public boolean accept(File f) {
-//								return f.isDirectory() || f.getName().endsWith(".zip") || f.getName().endsWith(".ZIP"); 
-//							}
-//						};
-//						chooser.setMultiSelectionEnabled(false);
-//						int result = chooser.showSaveDialog(ATContentStudio.frame);
-//						if (result == JFileChooser.APPROVE_OPTION) {
-//							selected.getProject().generateExportPackage(chooser.getSelectedFile());
-//						}
-//					}
-//				});
-//				popupMenu.add(exportProjectPackage);
-//				popupMenu.addSeparator();
-//			}
-//			if (selected instanceof GameDataElement) {
-//				final GameDataElement node = ((GameDataElement)selected); 
-//				if (node.state == GameDataElement.State.modified){
-//					JMenuItem saveItem = new JMenuItem("Save this element");
-//					saveItem.addActionListener(new ActionListener() {
-//						@Override
-//						public void actionPerformed(ActionEvent e) {
-//							node.save();
-//							ATContentStudio.frame.nodeChanged(node);
-//						}
-//					});
-//					popupMenu.add(saveItem);
-//				}
-//				
-//				JMenuItem deleteItem = null;
-//				if (node.getDataType() == GameSource.Type.created) {
-//					deleteItem = new JMenuItem("Delete this element");
-//				} else if (node.getDataType() == GameSource.Type.altered) {
-//					deleteItem = new JMenuItem("Revert to original");
-//				} 
-//				if (deleteItem != null) {
-//					popupMenu.add(deleteItem);
-//					deleteItem.addActionListener(new ActionListener() {
-//						@SuppressWarnings("unchecked")
-//						@Override
-//						public void actionPerformed(ActionEvent e) {
-//							ATContentStudio.frame.closeEditor(node);
-//							new Thread() {
-//								@Override
-//								public void run() {
-//									node.childrenRemoved(new ArrayList<ProjectTreeNode>());
-//									if (node.getParent() instanceof GameDataCategory<?>) {
-//										((GameDataCategory<?>)node.getParent()).remove(node);
-//										List<SaveEvent> events = node.attemptSave();
-//										if (events == null || events.isEmpty()) {
-//											node.save();
-//										} else {
-//											new SaveItemsWizard(events, null).setVisible(true);
-//										}
-//									}
-//								}
-//							}.start();
-//						}
-//					});
-//				}
-//				popupMenu.addSeparator();
-//				
-//			}
-//			if (selected instanceof Project || selected instanceof SavedGamesSet) {
-//				JMenuItem addSave = new JMenuItem("Load saved game...");
-//				popupMenu.add(addSave);
-//				popupMenu.addSeparator();
-//				addSave.addActionListener(new ActionListener() {
-//					@Override
-//					public void actionPerformed(ActionEvent e) {
-//						JFileChooser chooser = new JFileChooser("Select an Andor's Trail save file");
-//						if (chooser.showOpenDialog(ATContentStudio.frame) == JFileChooser.APPROVE_OPTION) {
-//							selected.getProject().addSave(chooser.getSelectedFile());
-//							selected.getProject().save();
-//						}
-//					}
-//				});
-//				
-//			}
-//		}
-//		if (konamiCodeEntered) {
-//			JMenuItem openTrainer = new JMenuItem("Start Andor's Trainer...");
-//			popupMenu.add(openTrainer);
-//			popupMenu.addSeparator();
-//			openTrainer.addActionListener(new ActionListener() {
-//				@Override
-//				public void actionPerformed(ActionEvent e) {
-//					new Thread() {
-//						public void run() {
-//							AndorsTrainer.startApp(false);
-//						}
-//					}.start();
-//				}
-//			});
-//		}
-//		JMenu changeLaF = new JMenu("Change Look and Feel");
-//		for (final LookAndFeelInfo i : UIManager.getInstalledLookAndFeels()) {
-//			final JMenuItem lafItem = new JMenuItem("Switch to "+i.getName());
-//			changeLaF.add(lafItem);
-//			lafItem.addActionListener(new ActionListener() {
-//				@Override
-//				public void actionPerformed(ActionEvent e) {
-//					try {
-//						UIManager.setLookAndFeel(i.getClassName());
-//						SwingUtilities.updateComponentTreeUI(ATContentStudio.frame);
-//						ConfigCache.setFavoriteLaFClassName(i.getClassName());
-//					} catch (ClassNotFoundException e1) {
-//						e1.printStackTrace();
-//					} catch (InstantiationException e1) {
-//						e1.printStackTrace();
-//					} catch (IllegalAccessException e1) {
-//						e1.printStackTrace();
-//					} catch (UnsupportedLookAndFeelException e1) {
-//						e1.printStackTrace();
-//					}
-//				}
-//			});
-//		}
-//		popupMenu.add(changeLaF);
-//		popupMenu.addSeparator();
-//		JMenuItem showAbout = new JMenuItem("About...");
-//		popupMenu.add(showAbout);
-//		popupMenu.addSeparator();
-//		showAbout.addActionListener(new ActionListener() {
-//			@Override
-//			public void actionPerformed(ActionEvent e) {
-//				ATContentStudio.frame.showAbout();
-//			}
-//		});
     }
 
     public void popupActivated(MouseEvent e) {
@@ -584,10 +251,6 @@ public class ProjectsTree extends JPanel {
             ATContentStudio.frame.openEditor((WriterModeData) node);
         } else if (node instanceof BookmarkEntry) {
             ATContentStudio.frame.openEditor(((BookmarkEntry) node).bookmarkedElement);
-        } else if (node instanceof SavedGame) {
-            if (konamiCodeEntered) {
-                ATContentStudio.frame.openEditor((SavedGame) node);
-            }
         }
     }
 
@@ -704,65 +367,4 @@ public class ProjectsTree extends JPanel {
         projectsTree.scrollPathToVisible(tp);
     }
 
-    protected void startKonamiCount() {
-        resetTimeout();
-        exit = false;
-        konamiTimeout = new Thread() {
-            @Override
-            public void run() {
-                while (!exit && timeout > 0) {
-                    try {
-                        Thread.sleep(10);
-                    } catch (InterruptedException e) {
-                    }
-                    timeout -= 10;
-                }
-                konamiTimeout = null;
-                konamiBuffer = new Integer[]{null, null, null, null, null, null, null, null, null, null};
-            }
-        };
-        konamiTimeout.start();
-    }
-
-    protected void resetTimeout() {
-        timeout = 400;
-    }
-
-    protected boolean compareBuffers() {
-        if (konamiBuffer[0] == null) return true;
-        else if (konamiBuffer[0] != KeyEvent.VK_UP) return false;
-
-        if (konamiBuffer[1] == null) return true;
-        else if (konamiBuffer[1] != KeyEvent.VK_UP) return false;
-
-        if (konamiBuffer[2] == null) return true;
-        else if (konamiBuffer[2] != KeyEvent.VK_DOWN) return false;
-
-        if (konamiBuffer[3] == null) return true;
-        else if (konamiBuffer[3] != KeyEvent.VK_DOWN) return false;
-
-        if (konamiBuffer[4] == null) return true;
-        else if (konamiBuffer[4] != KeyEvent.VK_LEFT) return false;
-
-        if (konamiBuffer[5] == null) return true;
-        else if (konamiBuffer[5] != KeyEvent.VK_RIGHT) return false;
-
-        if (konamiBuffer[6] == null) return true;
-        else if (konamiBuffer[6] != KeyEvent.VK_LEFT) return false;
-
-        if (konamiBuffer[7] == null) return true;
-        else if (konamiBuffer[7] != KeyEvent.VK_RIGHT) return false;
-
-        if (konamiBuffer[8] == null) return true;
-        else if (konamiBuffer[8] != KeyEvent.VK_B) return false;
-
-        if (konamiBuffer[9] == null) return true;
-        else if (konamiBuffer[9] != KeyEvent.VK_A) return false;
-
-        konamiCodeEntered = true;
-
-        exit = true;
-        return true;
-    }
-
 }

src/com/gpl/rpg/atcontentstudio/ui/SaveItemsWizard.java

@@ -163,7 +163,7 @@ public class SaveItemsWizard extends JDialog {
                 @Override
                 public void actionPerformed(ActionEvent e) {
 
-                    Map<GameDataCategory<JSONElement>, Set<File>> jsonToSave = new IdentityHashMap<GameDataCategory<JSONElement>, Set<File>>();
+                    Map<GameDataCategory<JSONElement>, Set<File>> jsonToSave = new IdentityHashMap<>();
                     for (SaveEvent event : movedToCreatedList) {
                         if (event.target instanceof JSONElement) {
                             if (!jsonToSave.containsKey(event.target.getParent())) {

src/com/gpl/rpg/atcontentstudio/ui/StudioFrame.java

@@ -8,7 +8,6 @@ import com.gpl.rpg.atcontentstudio.model.Workspace;
 import com.gpl.rpg.atcontentstudio.model.gamedata.JSONElement;
 import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
 import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment;
-import com.gpl.rpg.atcontentstudio.model.saves.SavedGame;
 import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet;
 import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeData;
 
@@ -127,7 +126,6 @@ public class StudioFrame extends JFrame {
         projectMenu.add(new JMenuItem(actions.importJSON));
         projectMenu.add(new JMenuItem(actions.createMap));
         projectMenu.add(new JMenuItem(actions.createWorldmap));
-        projectMenu.add(new JMenuItem(actions.loadSave));
         getJMenuBar().add(projectMenu);
 
         JMenu toolsMenu = new JMenu("Tools");
@@ -147,20 +145,10 @@ public class StudioFrame extends JFrame {
             lafItem.addActionListener(new ActionListener() {
                 @Override
                 public void actionPerformed(ActionEvent e) {
-                    try {
-                        UIManager.setLookAndFeel(i.getClassName());
-                        ATContentStudio.scaleUIFont();
-                        SwingUtilities.updateComponentTreeUI(ATContentStudio.frame);
-                        ConfigCache.setFavoriteLaFClassName(i.getClassName());
-                    } catch (ClassNotFoundException e1) {
-                        e1.printStackTrace();
-                    } catch (InstantiationException e1) {
-                        e1.printStackTrace();
-                    } catch (IllegalAccessException e1) {
-                        e1.printStackTrace();
-                    } catch (UnsupportedLookAndFeelException e1) {
-                        e1.printStackTrace();
-                    }
+                    String lookAndFeel = i.getClassName();
+                    ATContentStudio.setLookAndFeel(lookAndFeel);
+                    SwingUtilities.updateComponentTreeUI(ATContentStudio.frame);
+                    ConfigCache.setFavoriteLaFClassName(lookAndFeel);
                 }
             });
         }
@@ -204,10 +192,6 @@ public class StudioFrame extends JFrame {
         }
     }
 
-    public void openEditor(SavedGame save) {
-        editors.openEditor(save);
-    }
-
     public void openEditor(WorldmapSegment node) {
         editors.openEditor(node);
     }
@@ -237,5 +221,4 @@ public class StudioFrame extends JFrame {
         editors.showAbout();
     }
 
-
 }

src/com/gpl/rpg/atcontentstudio/ui/WorkspaceActions.java

@@ -6,7 +6,6 @@ import com.gpl.rpg.atcontentstudio.model.gamedata.*;
 import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
 import com.gpl.rpg.atcontentstudio.model.maps.Worldmap;
 import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment;
-import com.gpl.rpg.atcontentstudio.model.saves.SavedGamesSet;
 import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeData;
 import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeDataSet;
 import com.gpl.rpg.atcontentstudio.ui.tools.BeanShellView;
@@ -122,7 +121,7 @@ public class WorkspaceActions {
                         if (element.getParent() instanceof GameDataCategory<?>) {
                             @SuppressWarnings("unchecked")
                             GameDataCategory<JSONElement> category = (GameDataCategory<JSONElement>) element.getParent();
-                            category.remove(element);
+                            category.remove((JSONElement) element);
                             if (impactedCategories.get(category) == null) {
                                 impactedCategories.put(category, new HashSet<File>());
                             }
@@ -190,7 +189,7 @@ public class WorkspaceActions {
                         node.childrenRemoved(new ArrayList<ProjectTreeNode>());
                         if (node instanceof JSONElement) {
                             if (node.getParent() instanceof GameDataCategory<?>) {
-                                ((GameDataCategory<?>) node.getParent()).remove(node);
+                                ((GameDataCategory<?>) node.getParent()).removeGeneric((JSONElement) node);
                                 List<SaveEvent> events = node.attemptSave();
                                 if (events == null || events.isEmpty()) {
                                     node.save();
@@ -315,22 +314,6 @@ public class WorkspaceActions {
         }
     };
 
-    public ATCSAction loadSave = new ATCSAction("Load saved game...", "Opens the saved game loading wizard") {
-        public void actionPerformed(ActionEvent e) {
-            if (!(selectedNode instanceof Project || selectedNode instanceof SavedGamesSet)) return;
-            JFileChooser chooser = new JFileChooser("Select an Andor's Trail save file");
-            if (chooser.showOpenDialog(ATContentStudio.frame) == JFileChooser.APPROVE_OPTION) {
-                selectedNode.getProject().addSave(chooser.getSelectedFile());
-                selectedNode.getProject().save();
-            }
-        }
-
-        public void selectionChanged(ProjectTreeNode selectedNode, TreePath[] selectedPaths) {
-            setEnabled(selectedNode instanceof Project || selectedNode instanceof SavedGamesSet);
-        }
-
-    };
-
     public ATCSAction compareItems = new ATCSAction("Items comparator", "Opens an editor showing all the items of the project in a table") {
         public void actionPerformed(ActionEvent e) {
             if (selectedNode == null || selectedNode.getProject() == null) return;
@@ -466,7 +449,6 @@ public class WorkspaceActions {
         actions.add(createGDE);
         actions.add(createMap);
         actions.add(importJSON);
-        actions.add(loadSave);
         actions.add(compareItems);
         actions.add(compareNPCs);
         actions.add(exportProject);

src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/CommonEditor.java

@@ -26,7 +26,7 @@ public class CommonEditor {
         private static final long serialVersionUID = 7987880146189575234L;
 
         @Override
-        public Component getListCellRendererComponent(@SuppressWarnings("rawtypes") JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+        public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
             Component c = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
             if (c instanceof JLabel) {
                 JLabel label = (JLabel) c;
@@ -68,7 +68,7 @@ public class CommonEditor {
         private static final long serialVersionUID = 7987880146189575234L;
 
         @Override
-        public Component getListCellRendererComponent(@SuppressWarnings("rawtypes") JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+        public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
             Component c = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
             if (c instanceof JLabel) {
                 JLabel label = (JLabel) c;
@@ -90,7 +90,7 @@ public class CommonEditor {
         }
     }
 
-    public static class HitRecievedEffectPane<EFFECT extends Common.HitReceivedEffect, LIST_MODEL_SOURCE, ELEMENT extends Common.TimedActorConditionEffect, MODEL extends OrderedListenerListModel<LIST_MODEL_SOURCE, ELEMENT>> extends HitEffectPane<EFFECT, LIST_MODEL_SOURCE, ELEMENT, MODEL> {
+    public static class HitReceivedEffectPane<EFFECT extends Common.HitReceivedEffect> extends HitEffectPane<EFFECT> {
         /// this should just be a convenience field, to access it, without casting. DO NOT SET WITHOUT ALSO SETTING THE FIELD IN THE SUPER-CLASS!
         EFFECT effect;
         private JSpinner hitReceivedEffectHPMinTarget;
@@ -98,13 +98,14 @@ public class CommonEditor {
         private JSpinner hitReceivedEffectAPMinTarget;
         private JSpinner hitReceivedEffectAPMaxTarget;
 
-        public HitRecievedEffectPane(String title, Supplier<ELEMENT> sourceNewSupplier, Editor editor, String applyToHint, String applyToTargetHint) {
-            super(title, sourceNewSupplier, editor, applyToHint, applyToTargetHint);
+        public HitReceivedEffectPane(String title, Editor editor, String applyToHint, String applyToTargetHint) {
+            super(title, editor, applyToHint, applyToTargetHint);
         }
 
-        void createHitReceivedEffectPaneContent(FieldUpdateListener listener, boolean writable, EFFECT e, MODEL sourceConditionsModelInput, MODEL targetConditionsModelInput) {
+        @Override
+        public void createPaneContent(FieldUpdateListener listener, boolean writable, EFFECT e) {
             effect = e;
-            createHitEffectPaneContent(listener, writable, e, sourceConditionsModelInput, targetConditionsModelInput);
+            super.createPaneContent(listener, writable, e);
         }
 
         @Override
@@ -144,32 +145,35 @@ public class CommonEditor {
         }
     }
 
-    public static class HitEffectPane<EFFECT extends Common.HitEffect, LIST_MODEL_SOURCE, ELEMENT extends Common.TimedActorConditionEffect, MODEL extends OrderedListenerListModel<LIST_MODEL_SOURCE, ELEMENT>> extends DeathEffectPane<EFFECT, LIST_MODEL_SOURCE, ELEMENT, MODEL> {
+    public static class HitEffectPane<EFFECT extends Common.HitEffect>
+
+            extends DeathEffectPane<EFFECT> {
         /// this should just be a convenience field, to access it, without casting. DO NOT SET WITHOUT ALSO SETTING THE FIELD IN THE SUPER-CLASS!
         public EFFECT effect;
 
         protected final String applyToTargetHint;
-        private JList hitTargetConditionsList;
-        private final ConditionEffectEditorPane<LIST_MODEL_SOURCE, ELEMENT, MODEL> hitTargetConditionPane;
+        private JList<Common.TimedActorConditionEffect> hitTargetConditionsList;
+        private final ConditionEffectEditorPane<Common.HitEffect, TargetTimedConditionsListModel> hitTargetConditionPane;
 
         /*
          * create a new HitEffectPane with the selections (probably passed in from last time)
          */
-        public HitEffectPane(String title, Supplier<ELEMENT> sourceNewSupplier, Editor editor, String applyToHint, String applyToTargetHint) {
-            super(title, sourceNewSupplier, editor, applyToHint);
+        public HitEffectPane(String title, Editor editor, String applyToHint, String applyToTargetHint) {
+            super(title, editor, applyToHint);
             hitTargetConditionPane = new ConditionEffectEditorPane<>(editor);
 
-            if (applyToTargetHint == null || applyToTargetHint == "") {
+            if (applyToTargetHint == null || applyToTargetHint.isEmpty()) {
                 this.applyToTargetHint = "";
             } else {
                 this.applyToTargetHint = String.format(" (%s)", applyToTargetHint);
             }
         }
 
-        void createHitEffectPaneContent(FieldUpdateListener listener, boolean writable, EFFECT e, MODEL sourceConditionsModelInput, MODEL targetConditionsListModel) {
+        @Override
+        public void createPaneContent(FieldUpdateListener listener, boolean writable, EFFECT e) {
             effect = e;
-            hitTargetConditionPane.conditionsModel = targetConditionsListModel;
-            createDeathEffectPaneContent(listener, writable, e, sourceConditionsModelInput);
+            hitTargetConditionPane.conditionsModel = new TargetTimedConditionsListModel(e);
+            super.createPaneContent(listener, writable, e);
         }
 
         @Override
@@ -178,8 +182,8 @@ public class CommonEditor {
 
             String titleTarget = String.format("Actor Conditions applied to the target%s: ", applyToTargetHint);
             CommonEditor.TimedConditionsCellRenderer cellRendererTarget = new CommonEditor.TimedConditionsCellRenderer();
-            BasicLambdaWithArg<ELEMENT> selectedSetTarget = (value) -> hitTargetConditionPane.selectedCondition = value;
-            BasicLambdaWithReturn<ELEMENT> selectedGetTarget = () -> hitTargetConditionPane.selectedCondition;
+            BasicLambdaWithArg<Common.TimedActorConditionEffect> selectedSetTarget = (value) -> hitTargetConditionPane.selectedCondition = value;
+            BasicLambdaWithReturn<Common.TimedActorConditionEffect> selectedGetTarget = () -> hitTargetConditionPane.selectedCondition;
             BasicLambda selectedResetTarget = () -> hitTargetConditionPane.selectedCondition = null;
             BasicLambdaWithArg<JPanel> updatePaneTarget = (editorPane) -> hitTargetConditionPane.updateEffectTimedConditionEditorPane(
                     editorPane, hitTargetConditionPane.selectedCondition, listener);
@@ -212,8 +216,8 @@ public class CommonEditor {
         }
     }
 
-    public static class DeathEffectPane<EFFECT extends Common.DeathEffect, LIST_MODEL_SOURCE, ELEMENT extends Common.TimedActorConditionEffect, MODEL extends OrderedListenerListModel<LIST_MODEL_SOURCE, ELEMENT>> {
-        protected final Supplier<ELEMENT> conditionSupplier;
+    public static class DeathEffectPane<EFFECT extends Common.DeathEffect> {
+        protected final Supplier<Common.TimedActorConditionEffect> conditionSupplier;
         protected final String title;
         protected final String applyToHint;
 
@@ -224,28 +228,27 @@ public class CommonEditor {
         private JSpinner effectHPMax;
         private JSpinner effectAPMin;
         private JSpinner effectAPMax;
-        private JList<ELEMENT> sourceConditionsList;
+        private JList<Common.TimedActorConditionEffect> sourceConditionsList;
 
-        private final ConditionEffectEditorPane<LIST_MODEL_SOURCE, ELEMENT, MODEL> sourceConditionPane;
+        private final ConditionEffectEditorPane<Common.DeathEffect, SourceTimedConditionsListModel> sourceConditionPane;
 
 
         /*
          * create a new DeatchEffectPane with the selections (probably passed in from last time)
          */
-        public DeathEffectPane(String title, Supplier<ELEMENT> conditionSupplier, Editor editor, String applyToHint) {
+        public DeathEffectPane(String title, Editor editor, String applyToHint) {
             this.title = title;
-            this.conditionSupplier = conditionSupplier;
+            this.conditionSupplier = Common.TimedActorConditionEffect::new;
             this.sourceConditionPane = new ConditionEffectEditorPane<>(editor);
-            if (applyToHint == null || applyToHint == "") {
+            if (applyToHint == null || applyToHint.isEmpty()) {
                 this.applyToHint = "";
             } else {
                 this.applyToHint = String.format(" (%s)", applyToHint);
             }
         }
-
-        void createDeathEffectPaneContent(FieldUpdateListener listener, boolean writable, EFFECT e, MODEL sourceConditionsModel) {
+        public void createPaneContent(FieldUpdateListener listener, boolean writable, EFFECT e) {
             effect = e;
-            sourceConditionPane.conditionsModel = sourceConditionsModel;
+            sourceConditionPane.conditionsModel = new SourceTimedConditionsListModel(e);
 
             effectPane = new CollapsiblePanel(title);
             effectPane.setLayout(new JideBoxLayout(effectPane, JideBoxLayout.PAGE_AXIS));
@@ -269,8 +272,8 @@ public class CommonEditor {
         protected void addLists(FieldUpdateListener listener, boolean writable) {
             String titleSource = String.format("Actor Conditions applied to the source%s: ", applyToHint);
             TimedConditionsCellRenderer cellRendererSource = new TimedConditionsCellRenderer();
-            BasicLambdaWithArg<ELEMENT> selectedSetSource = (value) -> sourceConditionPane.selectedCondition = value;
-            BasicLambdaWithReturn<ELEMENT> selectedGetSource = () -> sourceConditionPane.selectedCondition;
+            BasicLambdaWithArg<Common.TimedActorConditionEffect> selectedSetSource = (value) -> sourceConditionPane.selectedCondition = value;
+            BasicLambdaWithReturn<Common.TimedActorConditionEffect> selectedGetSource = () -> sourceConditionPane.selectedCondition;
             BasicLambda selectedResetSource = () -> sourceConditionPane.selectedCondition = null;
             BasicLambdaWithArg<JPanel> updatePaneSource = (editorPane) -> sourceConditionPane.updateEffectTimedConditionEditorPane(
                     editorPane, sourceConditionPane.selectedCondition, listener);
@@ -309,9 +312,9 @@ public class CommonEditor {
         }
     }
 
-    static class ConditionEffectEditorPane<LIST_MODEL_SOURCE, ELEMENT extends Common.TimedActorConditionEffect, MODEL extends OrderedListenerListModel<LIST_MODEL_SOURCE, ELEMENT>> {
+    static class ConditionEffectEditorPane<LIST_MODEL_SOURCE, MODEL extends OrderedListenerListModel<LIST_MODEL_SOURCE, Common.TimedActorConditionEffect> > {
         private final Editor editor;
-        ELEMENT selectedCondition;
+        Common.TimedActorConditionEffect selectedCondition;
 
         MODEL conditionsModel;
         Editor.MyComboBox conditionBox;
@@ -328,7 +331,7 @@ public class CommonEditor {
             this.editor = editor;
         }
 
-        public void updateEffectTimedConditionWidgets(ELEMENT condition) {
+        public void updateEffectTimedConditionWidgets(Common.TimedActorConditionEffect condition) {
             boolean writable = editor.target.writable;
 
             boolean immunity = condition.isImmunity();
@@ -352,7 +355,7 @@ public class CommonEditor {
             conditionForever.setEnabled(!clear && writable);
         }
 
-        public void updateEffectTimedConditionEditorPane(JPanel pane, ELEMENT condition, final FieldUpdateListener listener) {
+        public void updateEffectTimedConditionEditorPane(JPanel pane, Common.TimedActorConditionEffect condition, final FieldUpdateListener listener) {
             pane.removeAll();
             if (conditionBox != null) {
                 editor.removeElementListener(conditionBox);
@@ -495,7 +498,7 @@ public class CommonEditor {
         }
 
         private void setDurationToDefaultIfNone() {
-            if (selectedCondition.duration == null || selectedCondition.duration == ActorCondition.DURATION_NONE) {
+            if (selectedCondition.duration == null || selectedCondition.duration.equals(ActorCondition.DURATION_NONE)) {
                 selectedCondition.duration = 1;
             }
         }

src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/DialogueEditor.java

@@ -610,6 +610,17 @@ public class DialogueEditor extends JSONElementEditor {
                     requirementObjId = addTextField(pane, "Time type HHMMSS:", requirement.required_obj_id, writable, listener);
                     requirementValue = addIntegerField(pane, "Exact time value: ", requirement.required_value, true, writable, listener);
                     break;
+                case skillIncrease:
+                    skillId = null;
+                    try {
+                        skillId = requirement.required_obj_id == null ? null : Requirement.SkillID.valueOf(requirement.required_obj_id);
+                    } catch (IllegalArgumentException e) {
+                    }
+                    requirementObj = null;
+                    requirementSkill = addEnumValueBox(pane, "Skill ID:", Requirement.SkillID.values(), skillId, writable, listener);
+                    requirementObjId = null;//addTextField(pane, "Skill ID:", requirement.required_obj_id, writable, listener);
+                    requirementValue = addIntegerField(pane, "Level up: ", requirement.required_value, false, writable, listener);
+                    break;
             }
             requirementNegated = addBooleanBasedCheckBox(pane, "Negate this requirement.", requirement.negated, writable, listener);
         }
@@ -843,7 +854,7 @@ public class DialogueEditor extends JSONElementEditor {
             if (req.required_obj.getIcon() != null) {
                 label.setIcon(new ImageIcon(req.required_obj.getIcon()));
             }
-        } else if (req.type == Requirement.RequirementType.skillLevel) {
+        } else if (req.type == Requirement.RequirementType.skillLevel || req.type == Requirement.RequirementType.skillIncrease) {
             label.setIcon(new ImageIcon(DefaultIcons.getSkillIcon()));
         } else if (req.type == Requirement.RequirementType.spentGold) {
             label.setIcon(new ImageIcon(DefaultIcons.getGoldIcon()));
@@ -1008,7 +1019,7 @@ public class DialogueEditor extends JSONElementEditor {
                     selectedRequirement.required_obj.removeBacklink(dialogue);
                     selectedRequirement.required_obj = null;
                 }
-                if (selectedRequirement.type == Requirement.RequirementType.skillLevel) {
+                if (selectedRequirement.type == Requirement.RequirementType.skillLevel || selectedRequirement.type == Requirement.RequirementType.skillIncrease) {
                     selectedRequirement.required_obj_id = value == null ? null : value.toString();
                 }
                 requirementsListModel.itemChanged(selectedRequirement);

src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/ItemEditor.java

@@ -76,9 +76,11 @@ public class ItemEditor extends JSONElementEditor {
     private JRadioButton equipConditionImmunity;
     private JSpinner equipConditionMagnitude;
 
-    private CommonEditor.HitEffectPane hitEffectPane = new CommonEditor.HitEffectPane("Effect on every hit: ", TimedActorConditionEffect::new, this, null, null);
-    private CommonEditor.DeathEffectPane killEffectPane = new CommonEditor.DeathEffectPane(killLabel, TimedActorConditionEffect::new, this, null);
-    private CommonEditor.HitRecievedEffectPane hitReceivedEffectPane = new CommonEditor.HitRecievedEffectPane("Effect on every hit received: ", TimedActorConditionEffect::new, this, null, null);
+    private final CommonEditor.HitEffectPane<HitEffect> hitEffectPane = new CommonEditor.HitEffectPane<>("Effect on every hit: ", this, null, "npc");
+    private final CommonEditor.DeathEffectPane<DeathEffect> killEffectPane = new CommonEditor.DeathEffectPane<>(killLabel, this, null);
+    private final CommonEditor.HitReceivedEffectPane<HitReceivedEffect> hitReceivedEffectPane = new CommonEditor.HitReceivedEffectPane<>("Effect on every hit received: ", this, "player", "npc");
+    private final CommonEditor.HitEffectPane<HitEffect> missEffectPane = new CommonEditor.HitEffectPane<>("Effect on every miss: ", this, "player", "npc");
+    private final CommonEditor.HitReceivedEffectPane<HitReceivedEffect> missReceivedEffectPane = new CommonEditor.HitReceivedEffectPane<>("Effect on every miss received: ", this, "player", "npc");
 
     public ItemEditor(Item item) {
         super(item, item.getDesc(), item.getIcon());
@@ -86,7 +88,6 @@ public class ItemEditor extends JSONElementEditor {
         addEditorTab(json_view_id, getJSONView());
     }
 
-    @SuppressWarnings({"unchecked", "rawtypes"})
     @Override
     public void insertFormViewDataField(JPanel pane) {
 
@@ -111,11 +112,7 @@ public class ItemEditor extends JSONElementEditor {
 
         equipEffectPane = new CollapsiblePanel("Effect when equipped: ");
         equipEffectPane.setLayout(new JideBoxLayout(equipEffectPane, JideBoxLayout.PAGE_AXIS));
-        if (item.equip_effect == null) {
-            equipEffect = new Item.EquipEffect();
-        } else {
-            equipEffect = item.equip_effect;
-        }
+        equipEffect = Objects.requireNonNullElseGet(item.equip_effect, Item.EquipEffect::new);
         equipDmgMin = addIntegerField(equipEffectPane, "Attack Damage min: ", equipEffect.damage_boost_min, true, item.writable, listener);
         equipDmgMax = addIntegerField(equipEffectPane, "Attack Damage max: ", equipEffect.damage_boost_max, true, item.writable, listener);
         equipSetDM = addIntegerField(equipEffectPane, "Damage modifier %: ", equipEffect.damage_modifier, 100, false, item.writable, listener);
@@ -164,33 +161,38 @@ public class ItemEditor extends JSONElementEditor {
         }
 
         HitEffect hitEffect = Objects.requireNonNullElseGet(item.hit_effect, HitEffect::new);
-        hitEffectPane.createHitEffectPaneContent(listener, item.writable, hitEffect,
-                                                 new CommonEditor.SourceTimedConditionsListModel(hitEffect),
-                                                 new CommonEditor.TargetTimedConditionsListModel(hitEffect));
+        hitEffectPane.createPaneContent(listener, item.writable, hitEffect);
         pane.add(hitEffectPane.effectPane, JideBoxLayout.FIX);
 
         DeathEffect killEffect = Objects.requireNonNullElseGet(item.kill_effect, DeathEffect::new);
-        killEffectPane.createDeathEffectPaneContent(listener, item.writable, killEffect,
-                                                    new CommonEditor.SourceTimedConditionsListModel(killEffect));
+        killEffectPane.createPaneContent(listener, item.writable, killEffect);
         pane.add(killEffectPane.effectPane, JideBoxLayout.FIX);
 
-        HitReceivedEffect hitReceivedEffect = Objects.requireNonNullElseGet(item.hit_received_effect,
-                                                                            HitReceivedEffect::new);
-        hitReceivedEffectPane.createHitReceivedEffectPaneContent(listener, item.writable, hitReceivedEffect,
-                                                                 new CommonEditor.SourceTimedConditionsListModel(
-                                                                         hitReceivedEffect),
-                                                                 new CommonEditor.TargetTimedConditionsListModel(
-                                                                         hitReceivedEffect));
-        pane.add(killEffectPane.effectPane, JideBoxLayout.FIX);
+        HitReceivedEffect hitReceivedEffect = Objects.requireNonNullElseGet(item.hit_received_effect, HitReceivedEffect::new);
+        hitReceivedEffectPane.createPaneContent(listener, item.writable, hitReceivedEffect);
+        pane.add(hitReceivedEffectPane.effectPane, JideBoxLayout.FIX);
 
+        HitEffect missEffect = Objects.requireNonNullElseGet(item.miss_effect, HitEffect::new);
+        missEffectPane.createPaneContent(listener, item.writable, missEffect);
+        pane.add(missEffectPane.effectPane, JideBoxLayout.FIX);
+
+        HitReceivedEffect missReceivedEffect = Objects.requireNonNullElseGet(item.miss_received_effect, HitReceivedEffect::new);
+        missReceivedEffectPane.createPaneContent(listener, item.writable, missReceivedEffect);
+        pane.add(missReceivedEffectPane.effectPane, JideBoxLayout.FIX);
 
         if (item.category == null || item.category.action_type == null || item.category.action_type == ItemCategory.ActionType.none) {
             equipEffectPane.setVisible(false);
             hitEffectPane.effectPane.setVisible(false);
+            hitReceivedEffectPane.effectPane.setVisible(false);
+            missEffectPane.effectPane.setVisible(false);
+            missReceivedEffectPane.effectPane.setVisible(false);
             killEffectPane.effectPane.setVisible(false);
         } else if (item.category.action_type == ItemCategory.ActionType.use) {
             equipEffectPane.setVisible(false);
             hitEffectPane.effectPane.setVisible(false);
+            hitReceivedEffectPane.effectPane.setVisible(false);
+            missEffectPane.effectPane.setVisible(false);
+            missReceivedEffectPane.effectPane.setVisible(false);
             killEffectPane.effectPane.setVisible(true);
             killEffectPane.effectPane.setTitle(useLabel);
             killEffectPane.effectPane.revalidate();
@@ -198,6 +200,9 @@ public class ItemEditor extends JSONElementEditor {
         } else if (item.category.action_type == ItemCategory.ActionType.equip) {
             equipEffectPane.setVisible(true);
             hitEffectPane.effectPane.setVisible(true);
+            hitReceivedEffectPane.effectPane.setVisible(true);
+            missEffectPane.effectPane.setVisible(true);
+            missReceivedEffectPane.effectPane.setVisible(true);
             killEffectPane.effectPane.setVisible(true);
             killEffectPane.effectPane.setTitle(killLabel);
             killEffectPane.effectPane.revalidate();
@@ -294,8 +299,8 @@ public class ItemEditor extends JSONElementEditor {
         @Override
         public void valueChanged(JComponent source, Object value) {
             Item item = (Item) target;
-            boolean updatePrice, updateEquip, updateHit, updateKill, updateHitReceived;
-            updatePrice = updateEquip = updateHit = updateKill = updateHitReceived = false;
+            boolean updatePrice, updateEquip, updateHit, updateMiss, updateKill, updateHitReceived, updateMissReceived;
+            updatePrice = updateEquip = updateHit = updateMiss = updateKill = updateHitReceived = updateMissReceived = false;
             if (source == idField) {
                 //Events caused by cancel an ID edition. Dismiss.
                 if (skipNext) {
@@ -362,10 +367,14 @@ public class ItemEditor extends JSONElementEditor {
                     item.equip_effect = null;
                     hitEffectPane.effectPane.setVisible(false);
                     item.hit_effect = null;
+                    missEffectPane.effectPane.setVisible(false);
+                    item.miss_effect = null;
                     killEffectPane.effectPane.setVisible(false);
                     item.kill_effect = null;
                     hitReceivedEffectPane.effectPane.setVisible(false);
                     item.hit_received_effect = null;
+                    missReceivedEffectPane.effectPane.setVisible(false);
+                    item.miss_received_effect = null;
                     ItemEditor.this.revalidate();
                     ItemEditor.this.repaint();
                 } else if (item.category.action_type == ItemCategory.ActionType.use) {
@@ -373,10 +382,14 @@ public class ItemEditor extends JSONElementEditor {
                     item.equip_effect = null;
                     hitEffectPane.effectPane.setVisible(false);
                     item.hit_effect = null;
+                    missEffectPane.effectPane.setVisible(false);
+                    item.miss_effect = null;
                     killEffectPane.effectPane.setVisible(true);
                     updateKill = true;
                     hitReceivedEffectPane.effectPane.setVisible(false);
                     item.hit_received_effect = null;
+                    missReceivedEffectPane.effectPane.setVisible(false);
+                    item.miss_received_effect = null;
                     updateHitReceived = true;
                     updateEquip = true;
                     killEffectPane.effectPane.setTitle(useLabel);
@@ -385,9 +398,11 @@ public class ItemEditor extends JSONElementEditor {
                 } else if (item.category.action_type == ItemCategory.ActionType.equip) {
                     equipEffectPane.setVisible(true);
                     hitEffectPane.effectPane.setVisible(true);
+                    missEffectPane.effectPane.setVisible(true);
                     killEffectPane.effectPane.setVisible(true);
                     updateKill = true;
                     hitReceivedEffectPane.effectPane.setVisible(true);
+                    missReceivedEffectPane.effectPane.setVisible(true);
                     updateHitReceived = true;
                     updateEquip = true;
                     killEffectPane.effectPane.setTitle(killLabel);
@@ -469,12 +484,18 @@ public class ItemEditor extends JSONElementEditor {
             } else if (hitEffectPane.valueChanged(source, value, item)) {
                 updatePrice = true;
                 updateHit = true;
+            } else if (missEffectPane.valueChanged(source, value, item)) {
+                updatePrice = true;
+                updateMiss = true;
             } else if (killEffectPane.valueChanged(source, value, item)) {
                 updatePrice = true;
                 updateKill = true;
             } else if (hitReceivedEffectPane.valueChanged(source, value, item)) {
                 updatePrice = true;
                 updateHitReceived = true;
+            } else if (missReceivedEffectPane.valueChanged(source, value, item)) {
+                updatePrice = true;
+                updateMissReceived = true;
             }
 
             if (updateEquip) {
@@ -491,6 +512,13 @@ public class ItemEditor extends JSONElementEditor {
                     item.hit_effect = hitEffectPane.effect;
                 }
             }
+            if (updateMiss) {
+                if (missEffectPane.effect.isNull()) {
+                    item.miss_effect = null;
+                } else {
+                    item.miss_effect = missEffectPane.effect;
+                }
+            }
             if (updateKill) {
                 if (killEffectPane.effect.isNull()) {
                     item.kill_effect = null;
@@ -505,6 +533,13 @@ public class ItemEditor extends JSONElementEditor {
                     item.hit_received_effect = hitReceivedEffectPane.effect;
                 }
             }
+            if (updateMissReceived) {
+                if (missReceivedEffectPane.effect.isNull()) {
+                    item.miss_received_effect = null;
+                } else {
+                    item.miss_received_effect = missReceivedEffectPane.effect;
+                }
+            }
             if (updatePrice && !manualPriceBox.isSelected()) {
                 baseCostField.setValue(item.computePrice());
             }

src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/JSONElementEditor.java

@@ -164,7 +164,7 @@ public abstract class JSONElementEditor extends Editor {
                     ATContentStudio.frame.closeEditor(node);
                     node.childrenRemoved(new ArrayList<ProjectTreeNode>());
                     if (node.getParent() instanceof GameDataCategory<?>) {
-                        ((GameDataCategory<?>) node.getParent()).remove(node);
+                        ((GameDataCategory<?>) node.getParent()).removeGeneric(node);
                         node.save();
                         GameDataElement newOne = proj.getGameDataElement(node.getClass(), node.id);
                         if (node instanceof Quest) {

src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/NPCEditor.java

@@ -37,6 +37,7 @@ public class NPCEditor extends JSONElementEditor {
     private JTextField nameField;
     private JTextField spawnGroupField;
     private JTextField factionField;
+    private JSpinner horizontalFlipChanceField;
     private JSpinner experienceField;
     private MyComboBox dialogueBox;
     private MyComboBox droplistBox;
@@ -59,10 +60,9 @@ public class NPCEditor extends JSONElementEditor {
     private JSpinner blockChance;
     private JSpinner dmgRes;
 
-    private CommonEditor.HitEffectPane hitEffectPane = new CommonEditor.HitEffectPane("Effect on every hit: ", TimedActorConditionEffect::new, this, null, null);
-    private CommonEditor.HitRecievedEffectPane hitReceivedEffectPane = new CommonEditor.HitRecievedEffectPane("Effect on every hit received: ", TimedActorConditionEffect::new, this, "NPC",
-                                                                                                              "Attacker");
-    private CommonEditor.DeathEffectPane deathEffectPane = new CommonEditor.DeathEffectPane("Effect when killed: ", TimedActorConditionEffect::new, this, "Killer");
+    private final CommonEditor.HitEffectPane<HitEffect> hitEffectPane = new CommonEditor.HitEffectPane<>("Effect on every hit: ", this, null, "player");
+    private final CommonEditor.HitReceivedEffectPane<HitReceivedEffect> hitReceivedEffectPane = new CommonEditor.HitReceivedEffectPane<>("Effect on every hit received: ", this, "npc", "player");
+    private final CommonEditor.DeathEffectPane<DeathEffect> deathEffectPane = new CommonEditor.DeathEffectPane<>("Effect when killed: ", this, null);
 
     private JPanel dialogueGraphPane;
     private DialogueGraphView dialogueGraphView;
@@ -117,7 +117,6 @@ public class NPCEditor extends JSONElementEditor {
         }
     }
 
-    @SuppressWarnings({"rawtypes", "unchecked"})
     @Override
     public void insertFormViewDataField(JPanel pane) {
         final NPC npc = (NPC) target;
@@ -130,6 +129,7 @@ public class NPCEditor extends JSONElementEditor {
         nameField = addTranslatableTextField(pane, "Display name: ", npc.name, npc.writable, listener);
         spawnGroupField = addTextField(pane, "Spawn group ID: ", npc.spawngroup_id, npc.writable, listener);
         factionField = addTextField(pane, "Faction ID: ", npc.faction_id, npc.writable, listener);
+        horizontalFlipChanceField = addIntegerField(pane, "Horizontal flip chance: ", npc.horizontalFlipChance, false, npc.writable, listener);
         experienceField = addIntegerField(pane, "Experience reward: ", npc.getMonsterExperience(), false, false, listener);
         dialogueBox = addDialogueBox(pane, npc.getProject(), "Initial phrase: ", npc.dialogue, npc.writable, listener);
         droplistBox = addDroplistBox(pane, npc.getProject(), "Droplist / Shop inventory: ", npc.droplist, npc.writable, listener);
@@ -151,23 +151,15 @@ public class NPCEditor extends JSONElementEditor {
         dmgRes = addIntegerField(combatTraitPane, "Damage resistance: ", npc.damage_resistance, false, npc.writable, listener);
 
         HitEffect hitEffect = Objects.requireNonNullElseGet(npc.hit_effect, HitEffect::new);
-        hitEffectPane.createHitEffectPaneContent(listener, npc.writable, hitEffect,
-                                                 new CommonEditor.SourceTimedConditionsListModel(hitEffect),
-                                                 new CommonEditor.TargetTimedConditionsListModel(hitEffect));
+        hitEffectPane.createPaneContent(listener, npc.writable, hitEffect);
         combatTraitPane.add(hitEffectPane.effectPane, JideBoxLayout.FIX);
 
-        HitReceivedEffect hitReceivedEffect = Objects.requireNonNullElseGet(npc.hit_received_effect,
-                                                                            HitReceivedEffect::new);
-        hitReceivedEffectPane.createHitReceivedEffectPaneContent(listener, npc.writable, hitReceivedEffect,
-                                                                 new CommonEditor.SourceTimedConditionsListModel(
-                                                                         hitReceivedEffect),
-                                                                 new CommonEditor.TargetTimedConditionsListModel(
-                                                                         hitReceivedEffect));
+        HitReceivedEffect hitReceivedEffect = Objects.requireNonNullElseGet(npc.hit_received_effect, HitReceivedEffect::new);
+        hitReceivedEffectPane.createPaneContent(listener, npc.writable, hitReceivedEffect);
         combatTraitPane.add(hitReceivedEffectPane.effectPane, JideBoxLayout.FIX);
 
         DeathEffect deathEffect = Objects.requireNonNullElseGet(npc.death_effect, DeathEffect::new);
-        deathEffectPane.createDeathEffectPaneContent(listener, npc.writable, deathEffect,
-                                                     new CommonEditor.SourceTimedConditionsListModel(deathEffect));
+        deathEffectPane.createPaneContent(listener, npc.writable, deathEffect);
         combatTraitPane.add(deathEffectPane.effectPane, JideBoxLayout.FIX);
 
         pane.add(combatTraitPane, JideBoxLayout.FIX);
@@ -215,6 +207,8 @@ public class NPCEditor extends JSONElementEditor {
                 npc.spawngroup_id = (String) value;
             } else if (source == factionField) {
                 npc.faction_id = (String) value;
+            } else if (source == horizontalFlipChanceField) {
+                npc.horizontalFlipChance = (Integer) value;
             } else if (source == dialogueBox) {
                 if (npc.dialogue != null) {
                     npc.dialogue.removeBacklink(npc);

src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java

@@ -674,6 +674,16 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
                     requirementObjId = addTextField(pane, "Time type HHMMSS:", requirement.required_obj_id, writable, listener);
                     requirementValue = addIntegerField(pane, "Exact time value: ", requirement.required_value, true, writable, listener);
                     break;
+                case skillIncrease:
+                    skillId = null;
+                    try {
+                        skillId = requirement.required_obj_id == null ? null : Requirement.SkillID.valueOf(requirement.required_obj_id);
+                    } catch (IllegalArgumentException e) {
+                    }
+                    requirementObj = addEnumValueBox(pane, "Skill ID:", Requirement.SkillID.values(), skillId, writable, listener);
+                    requirementObjId = null;//addTextField(pane, "Skill ID:", requirement.required_obj_id, writable, listener);
+                    requirementValue = addIntegerField(pane, "Level: ", requirement.required_value, false, writable, listener);
+                    break;
             }
         }
         requirementNegated = addBooleanBasedCheckBox(pane, "Negate this requirement.", requirement.negated, writable, listener);
@@ -1921,7 +1931,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
             } else if (source == requirementObj) {
                 if (selectedMapObject instanceof KeyArea) {
                     KeyArea area = (KeyArea) selectedMapObject;
-                    if (area.requirement.type == Requirement.RequirementType.skillLevel) {
+                    if (area.requirement.type == Requirement.RequirementType.skillLevel || area.requirement.type == Requirement.RequirementType.skillIncrease) {
                         area.requirement.required_obj_id = value == null ? null : value.toString();
                     } else {
                         area.requirement.required_obj = (GameDataElement) value;
@@ -1938,7 +1948,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
                     }
                 } else if (selectedMapObject instanceof ReplaceArea) {
                     ReplaceArea area = (ReplaceArea) selectedMapObject;
-                    if (area.requirement.type == Requirement.RequirementType.skillLevel) {
+                    if (area.requirement.type == Requirement.RequirementType.skillLevel || area.requirement.type == Requirement.RequirementType.skillIncrease) {
                         area.requirement.required_obj_id = value == null ? null : value.toString();
                     } else {
                         area.requirement.required_obj = (GameDataElement) value;

src/com/gpl/rpg/atcontentstudio/ui/saves/SavedGameEditor.java

@@ -1,30 +0,0 @@
-package com.gpl.rpg.atcontentstudio.ui.saves;
-
-import com.gpl.rpg.atcontentstudio.ATContentStudio;
-import com.gpl.rpg.atcontentstudio.model.saves.SavedGame;
-import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
-import com.gpl.rpg.atcontentstudio.ui.Editor;
-
-import javax.swing.*;
-import java.awt.*;
-
-public class SavedGameEditor extends Editor {
-
-    private static final long serialVersionUID = 6055910379650778737L;
-
-    public SavedGameEditor(SavedGame save) {
-        this.name = save.loadedSave.displayInfo;
-        this.icon = new ImageIcon(DefaultIcons.getHeroIcon());
-        this.target = save;
-        setLayout(new BorderLayout());
-        add(new JScrollPane(new com.gpl.rpg.andorstrainer.ui.SavedGameEditor(save.loadedSave, ATContentStudio.frame)), BorderLayout.CENTER);
-
-    }
-
-    @Override
-    public void targetUpdated() {
-        // TODO Auto-generated method stub
-
-    }
-
-}

src/com/gpl/rpg/atcontentstudio/ui/sprites/SpritesheetEditor.java

@@ -53,9 +53,14 @@ public class SpritesheetEditor extends Editor {
 
     public SpritesheetEditor(Spritesheet sheet) {
         super();
-        this.icon = new ImageIcon(sheet.getIcon(0));
         this.name = sheet.id;
         this.target = sheet;
+        Image icon = sheet.getIcon(0);
+        if (icon == null) {
+            Notification.addError("Unable to open spritesheet " + sheet.id + " because the image is missing. This might be because its an UI spritesheet, which is not supported in ATCS");
+            return;
+        }
+        this.icon = new ImageIcon(icon);
 
         JPanel pane = new JPanel();
 

src/com/gpl/rpg/atcontentstudio/utils/FileUtils.java

@@ -1,219 +1,309 @@
-package com.gpl.rpg.atcontentstudio.utils;
-
-import java.io.*;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-public class FileUtils {
-
-    public static void deleteDir(File dir) {
-        if (dir.exists()) {
-            for (File f : dir.listFiles()) {
-                if (f.isDirectory()) {
-                    deleteDir(f);
-                } else {
-                    f.delete();
-                }
-            }
-            dir.delete();
-        }
-    }
-
-    public static void copyFile(File sourceLocation, File targetLocation) {
-        try {
-            InputStream in = new FileInputStream(sourceLocation);
-            OutputStream out = new FileOutputStream(targetLocation);
-
-            // Copy the bits from instream to outstream
-            byte[] buf = new byte[1024];
-            int len;
-            try {
-                while ((len = in.read(buf)) > 0) {
-                    out.write(buf, 0, len);
-                }
-            } catch (IOException e) {
-                // TODO Auto-generated catch block
-            } finally {
-                try {
-                    in.close();
-                } catch (IOException e) {
-                    // TODO Auto-generated catch block
-                }
-                try {
-                    out.close();
-                } catch (IOException e) {
-                    // TODO Auto-generated catch block
-                }
-            }
-        } catch (FileNotFoundException e1) {
-            // TODO Auto-generated catch block
-        }
-    }
-
-    private static final int BUFFER = 2048;
-
-    public static void writeToZip(File folder, File target) {
-        try {
-            FileOutputStream dest = new FileOutputStream(target);
-            ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(dest));
-            zipDir(folder, "", out);
-            out.flush();
-            out.close();
-        } catch (Exception e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-
-    }
-
-    /**
-     * cp sourceFolder/* targetFolder/
-     *
-     * @param sourceFolder
-     * @param targetFolder
-     */
-    public static void copyOver(File sourceFolder, File targetFolder) {
-        if (!sourceFolder.isDirectory() || !targetFolder.isDirectory()) return;
-        for (File f : sourceFolder.listFiles()) {
-            if (Files.isSymbolicLink(f.toPath())) {
-                //Skip symlinks
-                continue;
-            } else if (f.isDirectory()) {
-                File dest = new File(targetFolder, f.getName());
-                if (!dest.exists()) {
-                    dest.mkdir();
-                }
-                copyOver(f, dest);
-            } else {
-                copyFile(f, new File(targetFolder, f.getName()));
-            }
-        }
-    }
-
-    private static void zipDir(File dir, String prefix, ZipOutputStream zos) {
-        if (prefix != "") {
-            prefix = prefix + File.separator;
-        }
-        for (File f : dir.listFiles()) {
-            if (f.isDirectory()) {
-                zipDir(f, prefix + f.getName(), zos);
-            } else {
-                FileInputStream fis;
-                try {
-                    fis = new FileInputStream(f);
-                    BufferedInputStream origin = new BufferedInputStream(fis, BUFFER);
-                    ZipEntry entry = new ZipEntry(prefix + f.getName());
-                    try {
-                        zos.putNextEntry(entry);
-                        int count;
-                        byte data[] = new byte[BUFFER];
-                        while ((count = origin.read(data, 0, BUFFER)) != -1) {
-                            zos.write(data, 0, count);
-                            zos.flush();
-                        }
-                    } catch (IOException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    } finally {
-                        try {
-                            origin.close();
-                        } catch (IOException e) {
-                            // TODO Auto-generated catch block
-                            e.printStackTrace();
-                        }
-                    }
-                } catch (FileNotFoundException e) {
-                    // TODO Auto-generated catch block
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    public static boolean makeSymlink(File targetFile, File linkFile) {
-        Path target = Paths.get(targetFile.getAbsolutePath());
-        Path link = Paths.get(linkFile.getAbsolutePath());
-        if (!Files.exists(link)) {
-            try {
-                Files.createSymbolicLink(link, target);
-            } catch (Exception e) {
-                System.err.println("Failed to create symbolic link to target \"" + targetFile.getAbsolutePath() + "\" as \"" + linkFile.getAbsolutePath() + "\" the java.nio way:");
-                e.printStackTrace();
-                switch (DesktopIntegration.detectedOS) {
-                    case Windows:
-                        System.err.println("Trying the Windows way with mklink");
-                        try {
-                            Runtime.getRuntime().exec(
-                                    "cmd.exe /C mklink " + (targetFile.isDirectory() ? "/J " : "") + "\"" + linkFile.getAbsolutePath() + "\" \"" + targetFile.getAbsolutePath() + "\"");
-                        } catch (IOException e1) {
-                            e1.printStackTrace();
-                        }
-                        if (!linkFile.exists()) {
-                            System.err.println("Attempting UAC elevation through VBS script.");
-                            runWithUac("cmd.exe /C mklink " + (targetFile.isDirectory() ? "/J " : "") + "\"" + linkFile.getAbsolutePath() + "\" \"" + targetFile.getAbsolutePath() + "\"", 3, linkFile);
-                        }
-                        break;
-                    case MacOS:
-                    case NIX:
-                    case Other:
-                        System.err.println("Trying the unix way with ln -s");
-                        try {
-                            Runtime.getRuntime().exec("ln -s " + targetFile.getAbsolutePath() + " " + linkFile.getAbsolutePath());
-                        } catch (IOException e1) {
-                            e1.printStackTrace();
-                        }
-                        break;
-                    default:
-                        System.out.println("Unrecognized OS. Please contact ATCS dev.");
-                        break;
-
-                }
-            }
-        }
-        if (!Files.exists(link)) {
-            System.err.println("Failed to create link \"" + linkFile.getAbsolutePath() + "\" targetting \"" + targetFile.getAbsolutePath() + "\"");
-            System.err.println("You can try running ATCS with administrative privileges once, or create the symbolic link manually.");
-        }
-        return true;
-    }
-
-    public static File backupFile(File f) {
-        try {
-            Path returned = Files.copy(Paths.get(f.getAbsolutePath()), Paths.get(f.getAbsolutePath() + ".bak"), StandardCopyOption.REPLACE_EXISTING);
-            return returned.toFile();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    static final String uacBatName = "ATCS_elevateWithUac.bat";
-
-    public static void runWithUac(String command, int tries, File checkExists) {
-        File tmpFolder = new File(System.getProperty("java.io.tmpdir"));
-        File batFile = new File(tmpFolder, uacBatName);
-        batFile.deleteOnExit();
-        FileWriter writer;
-        try {
-            writer = new FileWriter(batFile, false);
-            writer.write(
-                    "@echo Set objShell = CreateObject(\"Shell.Application\") > %temp%\\sudo.tmp.vbs\r\n"
-                            + "@echo args = Right(\"%*\", (Len(\"%*\") - Len(\"%1\"))) >> %temp%\\sudo.tmp.vbs\r\n"
-                            + "@echo objShell.ShellExecute \"%1\", args, \"\", \"runas\" >> %temp%\\sudo.tmp.vbs\r\n"
-                            + "@cscript %temp%\\sudo.tmp.vbs\r\n"
-                            + "del /f %temp%\\sudo.tmp.vbs\r\n");
-            writer.close();
-            while (!checkExists.exists() && tries-- > 0) {
-                Runtime.getRuntime().exec(new String[]{"cmd.exe", "/C", batFile.getAbsolutePath() + " " + command});
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-    }
-
-}
+package com.gpl.rpg.atcontentstudio.utils;
+
+import com.gpl.rpg.atcontentstudio.Notification;
+import com.gpl.rpg.atcontentstudio.io.JsonPrettyWriter;
+import com.gpl.rpg.atcontentstudio.io.JsonSerializable;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.List;
+import java.util.Map;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+public class FileUtils {
+    public static String toJsonString(JsonSerializable jsonSerializable) {
+        return toJsonString(jsonSerializable.toMap());
+    }
+    public static String toJsonString(Map json) {
+        StringWriter writer = new JsonPrettyWriter();
+        try {
+            JSONObject.writeJSONString(json, writer);
+        } catch (IOException e) {
+            //Impossible with a StringWriter
+        }
+        return writer.toString();
+    }
+    public static String toJsonString(List json) {
+        StringWriter writer = new JsonPrettyWriter();
+        try {
+            JSONArray.writeJSONString(json, writer);
+        } catch (IOException e) {
+            //Impossible with a StringWriter
+        }
+        return writer.toString();
+    }
+
+    public static Object fromJsonString(String json) {
+        Object o;
+        try {
+            JSONParser parser = new JSONParser();
+            o = parser.parse(json);
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+        return o;
+    }
+
+    public static Map mapFromJsonFile(File file){
+        String json = readFileToString(file);
+        if (json == null) {
+            return null;
+        }
+        Map map = (Map)FileUtils.fromJsonString(json);
+        return map;
+    }
+
+    public static boolean writeStringToFile(String toWrite, File file, String type) {
+        return writeStringToFile(toWrite, file, type, true);
+    }
+    public static boolean writeStringToFile(String toWrite, File file, String type, boolean notifyOnSuccess) {
+        try {
+            FileWriter w = new FileWriter(file);
+            w.write(toWrite);
+            w.close();
+            if(type != null) {
+                Notification.addSuccess(type + " saved.");
+            }
+            return true;
+        } catch (IOException e) {
+            if(type != null) {
+                Notification.addError("Error while saving " + type + " : " + e.getMessage());
+            }
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public static String readFileToString(File settingsFile) {
+        String json;
+        try{
+            FileReader file = new FileReader(settingsFile);
+            BufferedReader reader = new BufferedReader(file);
+            StringBuilder builder = new StringBuilder();
+            int c;
+            while ((c = reader.read()) != -1) {
+                builder.append((char) c);
+            }
+            json = builder.toString();
+        }catch (IOException e){
+            json = null;
+            e.printStackTrace();
+        }
+        return json;
+    }
+
+    public static void deleteDir(File dir) {
+        if (dir.exists()) {
+            for (File f : dir.listFiles()) {
+                if (f.isDirectory()) {
+                    deleteDir(f);
+                } else {
+                    f.delete();
+                }
+            }
+            dir.delete();
+        }
+    }
+
+    public static void copyFile(File sourceLocation, File targetLocation) {
+        try {
+            InputStream in = new FileInputStream(sourceLocation);
+            OutputStream out = new FileOutputStream(targetLocation);
+
+            // Copy the bits from instream to outstream
+            byte[] buf = new byte[1024];
+            int len;
+            try {
+                while ((len = in.read(buf)) > 0) {
+                    out.write(buf, 0, len);
+                }
+            } catch (IOException e) {
+                // TODO Auto-generated catch block
+            } finally {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    // TODO Auto-generated catch block
+                }
+                try {
+                    out.close();
+                } catch (IOException e) {
+                    // TODO Auto-generated catch block
+                }
+            }
+        } catch (FileNotFoundException e1) {
+            // TODO Auto-generated catch block
+        }
+    }
+
+    private static final int BUFFER = 2048;
+
+    public static void writeToZip(File folder, File target) {
+        try {
+            FileOutputStream dest = new FileOutputStream(target);
+            ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(dest));
+            zipDir(folder, "", out);
+            out.flush();
+            out.close();
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+
+    }
+
+    /**
+     * cp sourceFolder/* targetFolder/
+     *
+     * @param sourceFolder
+     * @param targetFolder
+     */
+    public static void copyOver(File sourceFolder, File targetFolder) {
+        if (!sourceFolder.isDirectory() || !targetFolder.isDirectory()) return;
+        for (File f : sourceFolder.listFiles()) {
+            if (Files.isSymbolicLink(f.toPath())) {
+                //Skip symlinks
+                continue;
+            } else if (f.isDirectory()) {
+                File dest = new File(targetFolder, f.getName());
+                if (!dest.exists()) {
+                    dest.mkdir();
+                }
+                copyOver(f, dest);
+            } else {
+                copyFile(f, new File(targetFolder, f.getName()));
+            }
+        }
+    }
+
+    private static void zipDir(File dir, String prefix, ZipOutputStream zos) {
+        if (prefix != "") {
+            prefix = prefix + File.separator;
+        }
+        for (File f : dir.listFiles()) {
+            if (f.isDirectory()) {
+                zipDir(f, prefix + f.getName(), zos);
+            } else {
+                FileInputStream fis;
+                try {
+                    fis = new FileInputStream(f);
+                    BufferedInputStream origin = new BufferedInputStream(fis, BUFFER);
+                    ZipEntry entry = new ZipEntry(prefix + f.getName());
+                    try {
+                        zos.putNextEntry(entry);
+                        int count;
+                        byte data[] = new byte[BUFFER];
+                        while ((count = origin.read(data, 0, BUFFER)) != -1) {
+                            zos.write(data, 0, count);
+                            zos.flush();
+                        }
+                    } catch (IOException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    } finally {
+                        try {
+                            origin.close();
+                        } catch (IOException e) {
+                            // TODO Auto-generated catch block
+                            e.printStackTrace();
+                        }
+                    }
+                } catch (FileNotFoundException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    public static boolean makeSymlink(File targetFile, File linkFile) {
+        Path target = Paths.get(targetFile.getAbsolutePath());
+        Path link = Paths.get(linkFile.getAbsolutePath());
+        if (!Files.exists(link)) {
+            try {
+                Files.createSymbolicLink(link, target);
+            } catch (Exception e) {
+                System.err.println("Failed to create symbolic link to target \"" + targetFile.getAbsolutePath() + "\" as \"" + linkFile.getAbsolutePath() + "\" the java.nio way:");
+                e.printStackTrace();
+                switch (DesktopIntegration.detectedOS) {
+                    case Windows:
+                        System.err.println("Trying the Windows way with mklink");
+                        try {
+                            Runtime.getRuntime().exec(
+                                    "cmd.exe /C mklink " + (targetFile.isDirectory() ? "/J " : "") + "\"" + linkFile.getAbsolutePath() + "\" \"" + targetFile.getAbsolutePath() + "\"");
+                        } catch (IOException e1) {
+                            e1.printStackTrace();
+                        }
+                        if (!linkFile.exists()) {
+                            System.err.println("Attempting UAC elevation through VBS script.");
+                            runWithUac("cmd.exe /C mklink " + (targetFile.isDirectory() ? "/J " : "") + "\"" + linkFile.getAbsolutePath() + "\" \"" + targetFile.getAbsolutePath() + "\"", 3, linkFile);
+                        }
+                        break;
+                    case MacOS:
+                    case NIX:
+                    case Other:
+                        System.err.println("Trying the unix way with ln -s");
+                        try {
+                            Runtime.getRuntime().exec("ln -s " + targetFile.getAbsolutePath() + " " + linkFile.getAbsolutePath());
+                        } catch (IOException e1) {
+                            e1.printStackTrace();
+                        }
+                        break;
+                    default:
+                        System.out.println("Unrecognized OS. Please contact ATCS dev.");
+                        break;
+
+                }
+            }
+        }
+        if (!Files.exists(link)) {
+            System.err.println("Failed to create link \"" + linkFile.getAbsolutePath() + "\" targetting \"" + targetFile.getAbsolutePath() + "\"");
+            System.err.println("You can try running ATCS with administrative privileges once, or create the symbolic link manually.");
+        }
+        return true;
+    }
+
+    public static File backupFile(File f) {
+        try {
+            Path returned = Files.copy(Paths.get(f.getAbsolutePath()), Paths.get(f.getAbsolutePath() + ".bak"), StandardCopyOption.REPLACE_EXISTING);
+            return returned.toFile();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    static final String uacBatName = "ATCS_elevateWithUac.bat";
+
+    public static void runWithUac(String command, int tries, File checkExists) {
+        File tmpFolder = new File(System.getProperty("java.io.tmpdir"));
+        File batFile = new File(tmpFolder, uacBatName);
+        batFile.deleteOnExit();
+        FileWriter writer;
+        try {
+            writer = new FileWriter(batFile, false);
+            writer.write(
+                    "@echo Set objShell = CreateObject(\"Shell.Application\") > %temp%\\sudo.tmp.vbs\r\n"
+                            + "@echo args = Right(\"%*\", (Len(\"%*\") - Len(\"%1\"))) >> %temp%\\sudo.tmp.vbs\r\n"
+                            + "@echo objShell.ShellExecute \"%1\", args, \"\", \"runas\" >> %temp%\\sudo.tmp.vbs\r\n"
+                            + "@cscript %temp%\\sudo.tmp.vbs\r\n"
+                            + "del /f %temp%\\sudo.tmp.vbs\r\n");
+            writer.close();
+            while (!checkExists.exists() && tries-- > 0) {
+                Runtime.getRuntime().exec(new String[]{"cmd.exe", "/C", batFile.getAbsolutePath() + " " + command});
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+}