delete obsolete Linux folder

Package improvements

.classpath

@@ -1,16 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="res"/>
-	<classpathentry kind="src" path="hacked-libtiled"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/jide-oss.jar"/>
-	<classpathentry kind="lib" path="lib/json_simple-1.1.jar"/>
-	<classpathentry kind="lib" path="lib/junit-4.10.jar"/>
-	<classpathentry kind="lib" path="lib/prefuse.jar"/>
-	<classpathentry kind="lib" path="lib/rsyntaxtextarea.jar"/>
-	<classpathentry kind="lib" path="lib/ui.jar"/>
-	<classpathentry kind="lib" path="lib/bsh-2.0b4.jar"/>
-	<classpathentry kind="lib" path="lib/AndorsTrainer_v0.1.2.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="res"/>
+	<classpathentry kind="src" path="hacked-libtiled"/>
+	<classpathentry kind="src" path="siphash-zackehh/src/main/java"/>
+	<classpathentry kind="src" path="minify"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/jide-oss.jar"/>
+	<classpathentry kind="lib" path="lib/json_simple-1.1.jar"/>
+	<classpathentry kind="lib" path="lib/junit-4.10.jar"/>
+	<classpathentry kind="lib" path="lib/prefuse.jar"/>
+	<classpathentry kind="lib" path="lib/rsyntaxtextarea.jar"/>
+	<classpathentry kind="lib" path="lib/ui.jar"/>
+	<classpathentry kind="lib" path="lib/bsh-2.0b4.jar"/>
+	<classpathentry kind="lib" path="lib/jsoup-1.10.2.jar" sourcepath="lib/jsoup-1.10.2-sources.jar"/>
+	<classpathentry kind="lib" path="lib/AndorsTrainer_v0.1.5.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

.github/workflows/release.yml

@@ -0,0 +1,56 @@
+name: Release Build
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+    - 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: 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: Install NSIS
+      uses: joncloud/makensis-action@v4
+      with:
+        script-file: packaging/Windows/ATCS_Installer.nsi
+        arguments: /DVERSION="${{ env.VERSION }}"
+
+    - 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

.gitignore

@@ -1,3 +1,13 @@
 /ATCS_v*.jar
 /Project
 /bin
+/packaging/tmp/
+/out
+packaging/common/lib
+packaging/common/ATCS.jar
+packaging/ATCS_*.zip
+ATCS_v*.tar.gz
+ATCS.jar
+/packaging/common/ATCS.env.bat
+/packaging/common/ATCS.env
+/packaging/common/ATCS_v*.zip

.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/artifacts/ATContentStudio_jar.xml

@@ -0,0 +1,18 @@
+<component name="ArtifactManager">
+  <artifact name="ATContentStudio:jar">
+    <output-path>$PROJECT_DIR$/out/artifacts/ATContentStudio_jar</output-path>
+    <root id="root">
+      <element id="archive" name="ATContentStudio.jar">
+        <element id="module-output" name="ATContentStudio" />
+        <element id="extracted-dir" path="$PROJECT_DIR$/lib/bsh-2.0b4.jar" path-in-jar="/" />
+        <element id="extracted-dir" path="$PROJECT_DIR$/lib/rsyntaxtextarea.jar" path-in-jar="/" />
+        <element id="extracted-dir" path="$PROJECT_DIR$/lib/prefuse.jar" path-in-jar="/" />
+        <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>
+  </artifact>
+</component>

.idea/misc.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" default="true" />
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/ATContentStudio.iml" filepath="$PROJECT_DIR$/ATContentStudio.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

ATCS_JAR.jardesc

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<jardesc>
+    <jar path="ATContentStudio/ATCS_v0.6.20.jar"/>
+    <options buildIfNeeded="true" compress="true" descriptionLocation="/ATContentStudio/ATCS_JAR.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
+    <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
+    <selectedProjects/>
+    <manifest generateManifest="true" manifestLocation="" manifestVersion="1.0" reuseManifest="false" saveManifest="false" usesManifest="true">
+        <sealing sealJar="false">
+            <packagesToSeal/>
+            <packagesToUnSeal/>
+        </sealing>
+    </manifest>
+    <selectedElements exportClassFiles="true" exportJavaFiles="true" exportOutputFolder="false">
+        <javaElement handleIdentifier="=ATContentStudio/hacked-libtiled"/>
+        <javaElement handleIdentifier="=ATContentStudio/siphash-zackehh\/src\/main\/java"/>
+        <javaElement handleIdentifier="=ATContentStudio/src"/>
+        <javaElement handleIdentifier="=ATContentStudio/res"/>
+    </selectedElements>
+</jardesc>

ATContentStudio.iml

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="EclipseModuleManager">
+    <libelement value="jar://$MODULE_DIR$/lib/jide-oss.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/lib/json_simple-1.1.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/lib/junit-4.10.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/lib/prefuse.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/lib/rsyntaxtextarea.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/lib/ui.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/lib/bsh-2.0b4.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/lib/jsoup-1.10.2.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/lib/AndorsTrainer_v0.1.5.jar!/" />
+    <src_description expected_position="0">
+      <src_folder value="file://$MODULE_DIR$/src" expected_position="0" />
+      <src_folder value="file://$MODULE_DIR$/res" expected_position="1" />
+      <src_folder value="file://$MODULE_DIR$/hacked-libtiled" expected_position="2" />
+      <src_folder value="file://$MODULE_DIR$/siphash-zackehh/src/main/java" expected_position="3" />
+      <src_folder value="file://$MODULE_DIR$/minify" expected_position="4" />
+    </src_description>
+  </component>
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/bin" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/hacked-libtiled" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/minify" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/res" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/siphash-zackehh/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="module-library">
+      <library name="jide-oss.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/jide-oss.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="json_simple-1.1.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/json_simple-1.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="junit-4.10.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/junit-4.10.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="prefuse.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/prefuse.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="rsyntaxtextarea.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/rsyntaxtextarea.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="ui.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/ui.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="bsh-2.0b4.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/bsh-2.0b4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="jsoup-1.10.2.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/jsoup-1.10.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/lib/jsoup-1.10.2-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="AndorsTrainer_v0.1.5.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/AndorsTrainer_v0.1.5.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+  </component>
+</module>

createProject.bat

@@ -0,0 +1,127 @@
+@echo off
+echo.
+echo ***
+echo *** createProject v1.0 (2024-08-24)
+echo ***
+echo *** This script will help to setup an ATCS project
+echo *** and connect it to a repo on Github
+echo ***
+echo.
+rem  Save this script anywhere on your PC  (e.g. C:\AT\createProject.bat)
+rem  Then open a command shell:  CMD
+rem  and call the script in the shell.
+
+if "%1"=="" goto :noParamError
+
+echo You have entered:
+echo.
+echo ATCS-project: %1  
+echo in Directory: %2
+echo Github user:  %3
+echo.
+pause
+if "%3"=="" goto :help
+if not "%4"=="" goto :help
+
+if not exist %2 md %2
+
+rem --- Create ATCS project (if not already done)
+:atcs
+if not exist %2\%1\created\drawable\char_hero.png (
+    echo.
+    echo Do the following steps:
+    echo.
+    echo 1.  Start ATCS
+    echo 2.  Create your ATCS workspace in  %2
+    echo 3.  Add the new project  %1
+    echo 4.  Exit ATCS
+    echo.
+    pause
+    goto :atcs
+) else (
+    echo ATCS Project exists
+)
+
+rem --- Create git repository
+rem     This is the really important part :)
+rem -- go into project dir (even if we do not need to create the git repo)
+echo cd %2\%1
+cd %2\%1
+
+if not exist %2\%1\readme.md (
+    echo creating readme
+
+    echo # %1 > readme.md
+) else (
+    echo readme already exists
+)
+
+if not exist %2\%1\.gitignore (
+    echo creating gitignore
+
+    echo .workspace > .gitignore
+    echo .project >> .gitignore
+    echo altered/drawable >> .gitignore
+    echo altered/drawable/* >> .gitignore
+    echo created/drawable >> .gitignore
+    echo created/drawable/* >> .gitignore
+    echo tmp/res/values/loadresources.xml >> .gitignore
+) else (
+    echo gitignore already existed
+)
+
+:git
+if not exist %2\%1\.git (
+    echo Initializing git
+    git init -b main || (
+        echo "failed to init git. Please make sure it is installed"
+        pause
+        goto :git
+    )
+    :git_commit
+    git add readme.md
+    git add .gitignore
+    git commit -m "Init project" || (
+        echo "failed to create the initial commit."
+        pause
+        goto :git_commit
+    )
+    echo Done initializing git
+) else (
+    echo git was already initialized
+)
+
+echo.
+echo Now create your repo %1 on https://github.com/%3  (if not already done)
+echo.
+pause
+echo pushing to git repo https://github.com/%3/%1.git
+git remote add origin https://github.com/%3/%1.git
+git push -u origin main
+
+echo.
+echo At last you have to find the repo in your git client:
+echo - In Smartgit: Menu option: Repository / Search for repository
+echo.
+goto :end
+
+:noParamError
+echo.
+echo You have given no parameter. 
+echo Maybe you have just double clicked it? That won't work.
+echo I have opened a CMD shell for you. Enter the command in that shell.
+start cmd
+echo Please switch to the CMD shell
+
+:help
+echo.
+echo Enter the command with 3 parameters:
+echo %0  project  path  git-user
+echo.
+echo Example:  %0  feygard_1  c:\AT\ATCS  NutAndor
+echo.
+
+:end
+echo.
+echo *** End ***
+pause

hacked-libtiled/tiled/core/Map.java

@@ -29,7 +29,9 @@
 package tiled.core;
 
 import java.awt.Rectangle;
-import java.util.*;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.Vector;
 
 /**
  * The Map class is the focal point of the <code>tiled.core</code> package.
@@ -109,11 +111,14 @@ public class Map implements Iterable<MapLayer>
 
     public MapLayer addLayer(MapLayer layer) {
         layer.setMap(this);
-        layers.add(layer);
         if (layer instanceof TileLayer) {
         	tileLayers.add((TileLayer) layer);
+        	layers.add(layer);
         } else if (layer instanceof ObjectGroup) {
+        	layers.insertElementAt(layer, objectGroups.size());
         	objectGroups.add((ObjectGroup) layer);
+        } else {
+        	layers.add(layer);
         }
         return layer;
     }

hacked-libtiled/tiled/core/MapObject.java

@@ -28,10 +28,12 @@
 
 package tiled.core;
 
-import java.awt.*;
-import java.util.Properties;
+import java.awt.Image;
+import java.awt.Rectangle;
 import java.io.File;
 import java.io.IOException;
+import java.util.Properties;
+
 import javax.imageio.ImageIO;
 
 /**

hacked-libtiled/tiled/core/ObjectGroup.java

@@ -33,8 +33,8 @@ import java.awt.Shape;
 import java.awt.geom.Area;
 import java.awt.geom.Ellipse2D;
 import java.awt.geom.Rectangle2D;
-import java.util.LinkedList;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 
 /**

hacked-libtiled/tiled/core/Tile.java

@@ -28,7 +28,7 @@
 
 package tiled.core;
 
-import java.awt.*;
+import java.awt.image.BufferedImage;
 import java.util.Properties;
 
 /**
@@ -36,7 +36,7 @@ import java.util.Properties;
  */
 public class Tile
 {
-    private Image image;
+    private BufferedImage image;
     private int id = -1;
     private Properties properties;
     private TileSet tileset;
@@ -76,7 +76,7 @@ public class Tile
      *
      * @param i the new image of the tile
      */
-    public void setImage(Image i) {
+    public void setImage(BufferedImage i) {
         image = i;
     }
 
@@ -133,7 +133,7 @@ public class Tile
      *
      * @return Image
      */
-    public Image getImage() {
+    public BufferedImage getImage() {
     	if (tileset != null && tileset.sheet != null) return tileset.sheet.getImage(getId());
         return image;
     }

hacked-libtiled/tiled/core/TileSet.java

@@ -98,27 +98,42 @@ public class TileSet implements Iterable<Tile>
         
         File f = new File(imgFilename);
 
-        Image image = ImageIO.read(f.getCanonicalFile());
+        BufferedImage image = ImageIO.read(f.getCanonicalFile());
         if (image == null) {
-            throw new IOException("Failed to load " + tilebmpFile);
+            throw new IOException("Failed to load " + imgFilename);
         }
 
-        Toolkit tk = Toolkit.getDefaultToolkit();
+        tilebmpFile = f;
+        tileDimensions = new Rectangle(cutter.getTileDimensions());
+        
+//        Toolkit tk = Toolkit.getDefaultToolkit();
+//
+//        if (transparentColor != null) {
+//            int rgb = transparentColor.getRGB();
+//            image = tk.createImage(
+//                    new FilteredImageSource(image.getSource(),
+//                            new TransparentImageFilter(rgb)));
+//        }
+//
+//        BufferedImage buffered = new BufferedImage(
+//                image.getWidth(null),
+//                image.getHeight(null),
+//                BufferedImage.TYPE_INT_ARGB);
+//        buffered.getGraphics().drawImage(image, 0, 0, null);
 
-        if (transparentColor != null) {
-            int rgb = transparentColor.getRGB();
-            image = tk.createImage(
-                    new FilteredImageSource(image.getSource(),
-                            new TransparentImageFilter(rgb)));
-        }
+        importTileBitmap(image, cutter);
+    }
+    
+    public void weakImportTileBitmap(String imgFilename, TileCutter cutter)
+            throws IOException
+    {
+        setTilesetImageFilename(imgFilename);
+        
+        File f = new File(imgFilename);
 
-        BufferedImage buffered = new BufferedImage(
-                image.getWidth(null),
-                image.getHeight(null),
-                BufferedImage.TYPE_INT_ARGB);
-        buffered.getGraphics().drawImage(image, 0, 0, null);
+        tilebmpFile = f;
+        tileDimensions = new Rectangle(cutter.getTileDimensions());
 
-        importTileBitmap(buffered, cutter);
     }
     
     public void loadFromProject(String name, TMXMap tmxMap, int tileWidth, int tileHeight) {
@@ -161,7 +176,7 @@ public class TileSet implements Iterable<Tile>
             tilesPerRow = basicTileCutter.getTilesPerRow();
         }
 
-        Image tileImage = cutter.getNextTile();
+        BufferedImage tileImage = cutter.getNextTile();
         while (tileImage != null) {
             Tile tile = new Tile();
             tile.setImage(tileImage);
@@ -220,7 +235,7 @@ public class TileSet implements Iterable<Tile>
         tileDimensions = new Rectangle(tileCutter.getTileDimensions());
 
         int id = 0;
-        Image tileImage = tileCutter.getNextTile();
+        BufferedImage tileImage = tileCutter.getNextTile();
         while (tileImage != null) {
             Tile tile = getTile(id);
             tile.setImage(tileImage);

hacked-libtiled/tiled/io/TMXMapReader.java

@@ -31,13 +31,13 @@ package tiled.io;
 import java.awt.Color;
 import java.awt.Image;
 import java.awt.Rectangle;
+import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
-import java.io.StringReader;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -223,9 +223,9 @@ public class TMXMapReader
         return o;
     }
 
-    private Image unmarshalImage(Node t, String baseDir) throws IOException
+    private BufferedImage unmarshalImage(Node t, String baseDir) throws IOException
     {
-        Image img = null;
+    	BufferedImage img = null;
 
         String source = getAttributeValue(t, "source");
 
@@ -253,7 +253,7 @@ public class TMXMapReader
                         // size, somehow makes drawing of the tiles a lot
                         // faster on various systems (seen on Linux, Windows
                         // and MacOS X).
-                        img = img.getScaledInstance(
+                        img = (BufferedImage) img.getScaledInstance(
                                 img.getWidth(null), img.getHeight(null),
                                 Image.SCALE_FAST);
                     }
@@ -534,7 +534,7 @@ public class TMXMapReader
             Node child = children.item(i);
             if ("image".equalsIgnoreCase(child.getNodeName())) {
                 int id = getAttribute(child, "id", -1);
-                Image img = unmarshalImage(child, baseDir);
+                BufferedImage img = unmarshalImage(child, baseDir);
                 tile.setImage(img);
             } else if ("animation".equalsIgnoreCase(child.getNodeName())) {
                 // TODO: fill this in once TMXMapWriter is complete
@@ -913,7 +913,8 @@ public class TMXMapReader
     private class MapEntityResolver implements EntityResolver
     {
         public InputSource resolveEntity(String publicId, String systemId) {
-            if (systemId.equals("http://mapeditor.org/dtd/1.0/map.dtd")) {
+            if (systemId.equals("http://mapeditor.org/dtd/1.0/map.dtd") ||
+            	systemId.equals("https://mapeditor.org/dtd/1.0/map.dtd")) {
                 return new InputSource(TMXMapReader.class.getResourceAsStream(
                         "resources/map.dtd"));
             }

hacked-libtiled/tiled/io/TMXMapWriter.java

@@ -30,14 +30,35 @@ package tiled.io;
 
 import java.awt.Color;
 import java.awt.Rectangle;
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
 import java.nio.charset.Charset;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.Vector;
 import java.util.zip.DeflaterOutputStream;
 import java.util.zip.GZIPOutputStream;
 
-import tiled.core.*;
+import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
+import com.gpl.rpg.atcontentstudio.model.maps.TMXMapSet;
+
+import tiled.core.AnimatedTile;
 import tiled.core.Map;
+import tiled.core.MapLayer;
+import tiled.core.MapObject;
+import tiled.core.ObjectGroup;
+import tiled.core.Sprite;
+import tiled.core.Tile;
+import tiled.core.TileLayer;
+import tiled.core.TileSet;
 import tiled.io.xml.XMLWriter;
 import tiled.util.Base64;
 
@@ -132,7 +153,7 @@ public class TMXMapWriter
     }
 
     private void writeMap(Map map, XMLWriter w, String wp) throws IOException {
-        w.writeDocType("map", null, "http://mapeditor.org/dtd/1.0/map.dtd");
+        w.writeDocType("map", null, "https://mapeditor.org/dtd/1.0/map.dtd");
         w.startElement("map");
 
         w.writeAttribute("version", "1.0");
@@ -163,7 +184,12 @@ public class TMXMapWriter
             firstgid += tileset.getMaxTileId() + 1;
         }
 
-        for (MapLayer layer : map) {
+        for (MapLayer layer : map.getTileLayers()) {
+            writeMapLayer(layer, w, wp);
+        }
+
+        for (MapLayer layer : map.getObjectGroup()) {
+        	if (map.getTileLayers().contains(layer)) continue;
             writeMapLayer(layer, w, wp);
         }
         firstGidPerTileset = null;
@@ -215,7 +241,15 @@ public class TMXMapWriter
         } else {
             w.startElement("tileset");
             w.writeAttribute("firstgid", getFirstGidForTileset(set));
-            w.writeAttribute("source", getRelativePath(wp, source));
+			if (set.sheet != null && set.sheet.parent.getDataType() == Type.source) {
+				String fileName = set.getName();
+				if (fileName.length() > 3 && !(fileName.substring(fileName.length() - 4).equalsIgnoreCase(".png"))) {
+					fileName += ".png";
+				}				
+				w.writeAttribute("source", (TMXMapSet.DEFAULT_REL_PATH_TO_DRAWABLE + fileName).replace("\\", "/"));
+			} else {
+				w.writeAttribute("source", getRelativePath(wp, source));
+			}
             if (set.getBaseDir() != null) {
                 w.writeAttribute("basedir", set.getBaseDir());
             }
@@ -256,7 +290,15 @@ public class TMXMapWriter
 
         if (tileBitmapFile != null) {
             w.startElement("image");
-            w.writeAttribute("source", getRelativePath(wp, tileBitmapFile));
+			if (set.sheet != null && set.sheet.parent.getDataType() == Type.source) {
+				String fileName = set.getName();
+				if (fileName.length() > 3 && !(fileName.substring(fileName.length() - 4).equalsIgnoreCase(".png"))) {
+					fileName += ".png";
+				}		
+				w.writeAttribute("source", (TMXMapSet.DEFAULT_REL_PATH_TO_DRAWABLE + fileName).replace("\\", "/"));
+			} else {
+				w.writeAttribute("source", getRelativePath(wp, tileBitmapFile));
+			}            
             if (set.sheetDimensions != null) {
             	w.writeAttribute("width", set.sheetDimensions.width);
             	w.writeAttribute("height", set.sheetDimensions.height);

hacked-libtiled/tiled/io/xml/XMLWriter.java

@@ -28,9 +28,8 @@
 
 package tiled.io.xml;
 
-import java.lang.String;
-import java.io.Writer;
 import java.io.IOException;
+import java.io.Writer;
 import java.util.Stack;
 
 /**

hacked-libtiled/tiled/util/BasicTileCutter.java

@@ -29,7 +29,6 @@
 package tiled.util;
 
 import java.awt.Dimension;
-import java.awt.Image;
 import java.awt.image.BufferedImage;
 
 /**
@@ -64,7 +63,7 @@ public class BasicTileCutter implements TileCutter
         this.image = image;
     }
 
-    public Image getNextTile() {
+    public BufferedImage getNextTile() {
         if (nextY + tileHeight + tileMargin <= image.getHeight()) {
             BufferedImage tile =
                 image.getSubimage(nextX, nextY, tileWidth, tileHeight);

hacked-libtiled/tiled/util/ImageHelper.java

@@ -33,6 +33,7 @@ import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+
 import javax.imageio.ImageIO;
 
 /**

hacked-libtiled/tiled/util/TileCutter.java

@@ -29,7 +29,6 @@
 package tiled.util;
 
 import java.awt.Dimension;
-import java.awt.Image;
 import java.awt.image.BufferedImage;
 
 /**
@@ -48,7 +47,7 @@ public interface TileCutter
      * @return the next tile image, or <code>null</code> when no more tile
      *         images are available
      */
-    public Image getNextTile();
+    public BufferedImage getNextTile();
 
     /**
      * Resets the tile cutter so that the next call to <code>getNextTile</code>

hacked-libtiled/tiled/view/MapRenderer.java

@@ -27,9 +27,10 @@
 
 package tiled.view;
 
-import tiled.core.TileLayer;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
 
-import java.awt.*;
+import tiled.core.TileLayer;
 
 /**
  * An interface defining methods to render a map.

hacked-libtiled/tiled/view/OrthogonalRenderer.java

@@ -27,12 +27,15 @@
 
 package tiled.view;
 
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.image.BufferedImage;
+
 import tiled.core.Map;
 import tiled.core.Tile;
 import tiled.core.TileLayer;
 
-import java.awt.*;
-
 /**
  * The orthogonal map renderer. This is the most basic map renderer, dealing
  * with maps that use rectangular tiles.
@@ -74,10 +77,12 @@ public class OrthogonalRenderer implements MapRenderer
                 final Tile tile = layer.getTileAt(x, y);
                 if (tile == null)
                     continue;
-                final Image image = tile.getImage();
+                final BufferedImage image = tile.getImage();
                 if (image == null)
                     continue;
 
+                
+                
                 g.drawImage(
                         image,
                         x * tileWidth,

minify/com/whoischarles/util/json/Minify.java

@@ -0,0 +1,405 @@
+/**
+ * ----------------------
+ * Minify.java 2015-10-04
+ * ----------------------
+ *
+ * Copyright (c) 2015 Charles Bihis (www.whoischarles.com)
+ *
+ * This work is an adaptation of JSMin.java published by John Reilly which is a translation from C to Java of jsmin.c
+ * published by Douglas Crockford.  Permission is hereby granted to use this Java version under the same conditions as
+ * the original jsmin.c on which all of these derivatives are based.
+ *
+ *
+ *
+ * ---------------------
+ * JSMin.java 2006-02-13
+ * ---------------------
+ *
+ * Copyright (c) 2006 John Reilly (www.inconspicuous.org)
+ *
+ * This work is a translation from C to Java of jsmin.c published by Douglas Crockford.  Permission is hereby granted to
+ * use the Java version under the same conditions as the jsmin.c on which it is based.
+ *
+ *
+ *
+ * ------------------
+ * jsmin.c 2003-04-21
+ * ------------------
+ *
+ * Copyright (c) 2002 Douglas Crockford (www.crockford.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * The Software shall be used for Good, not Evil.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.whoischarles.util.json;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PushbackInputStream;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * Minify.java is written by Charles Bihis (www.whoischarles.com) and is adapted from JSMin.java written by John Reilly
+ * (www.inconspicuous.org) which is itself a translation of jsmin.c written by Douglas Crockford (www.crockford.com).
+ *
+ * @see <a href="http://www.unl.edu/ucomm/templatedependents/JSMin.java">http://www.unl.edu/ucomm/templatedependents/JSMin.java</a>
+ * @see <a href="http://www.crockford.com/javascript/jsmin.c">http://www.crockford.com/javascript/jsmin.c</a>
+ */
+public class Minify {
+
+  private static final int EOF = -1;
+
+  private PushbackInputStream in;
+  private OutputStream out;
+  private int currChar;
+  private int nextChar;
+  private int line;
+  private int column;
+
+  public static enum Action {
+    OUTPUT_CURR, DELETE_CURR, DELETE_NEXT
+  }
+
+  public Minify() {
+    this.in = null;
+    this.out = null;
+  }
+
+  /**
+   * Minifies the input JSON string.
+   *
+   * Takes the input JSON string and deletes the characters which are insignificant to JavaScipt.  Comments will be
+   * removed, tabs will be replaced with spaces, carriage returns will be replaced with line feeds, and most spaces
+   * and line feeds will be removed.  The result will be returned.
+   *
+   * @param json The JSON string for which to minify
+   * @return A minified, yet functionally identical, version of the input JSON string
+   */
+  public String minify(String json) {
+    InputStream in = new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8));
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+    try {
+      minify(in, out);
+    } catch (Exception e) {
+      e.printStackTrace();
+      return null;
+    }
+
+    return out.toString().trim();
+  }
+
+  /**
+   * Takes an input stream to a JSON string and outputs minified JSON to the output stream.
+   *
+   * Takes the input JSON via the input stream and deletes the characters which are insignificant to JavaScript.
+   * Comments will be  removed, tabs will be replaced with spaaces, carriage returns will be replaced with line feeds,
+   * and most spaces and line feeds will be removed.  The result is streamed to the output stream.
+   *
+   * @param in The <code>InputStream</code> from which to get the un-minified JSON
+   * @param out The <code>OutputStream</code> where the resulting minified JSON will be streamed to
+   * @throws IOException
+   * @throws UnterminatedRegExpLiteralException
+   * @throws UnterminatedCommentException
+   * @throws UnterminatedStringLiteralException
+   */
+  public void minify(InputStream in, OutputStream out) throws IOException, UnterminatedRegExpLiteralException,
+                                                              UnterminatedCommentException,
+                                                              UnterminatedStringLiteralException {
+
+    // Initialize
+    this.in = new PushbackInputStream(in);
+    this.out = out;
+    this.line = 0;
+    this.column = 0;
+//    currChar = '\n';
+//    action(Action.DELETE_NEXT);
+    currChar = get();
+    nextChar = peek();
+    
+    // Process input
+    while (currChar != EOF) {
+      switch (currChar) {
+
+        case ' ':
+          if (isAlphanum(nextChar)) {
+            action(Action.OUTPUT_CURR);
+          } else {
+            action(Action.DELETE_CURR);
+          }
+          break;
+
+        case '\n':
+          switch (nextChar) {
+            case '{':
+            case '[':
+            case '(':
+            case '+':
+            case '-':
+              action(Action.OUTPUT_CURR);
+              break;
+            case ' ':
+              action(Action.DELETE_NEXT);
+              break;
+            default:
+              if (isAlphanum(nextChar)) {
+                action(Action.OUTPUT_CURR);
+              } else {
+                action(Action.DELETE_CURR);
+              }
+          }
+          break;
+
+        default:
+          switch (nextChar) {
+            case ' ':
+              if (isAlphanum(currChar)) {
+                action(Action.OUTPUT_CURR);
+                break;
+              }
+              action(Action.DELETE_NEXT);
+              break;
+            case '\n':
+              switch (currChar) {
+                case '}':
+                case ']':
+                case ')':
+                case '+':
+                case '-':
+                case '"':
+                case '\'':
+                  action(Action.OUTPUT_CURR);
+                  break;
+                default:
+                  if (isAlphanum(currChar)) {
+                    action(Action.OUTPUT_CURR);
+                  } else {
+                    action(Action.DELETE_NEXT);
+                  }
+              }
+              break;
+            default:
+              action(Action.OUTPUT_CURR);
+              break;
+          }
+      }
+    }
+    out.flush();
+  }
+
+  /**
+   * Process the current character with an appropriate action.
+   *
+   * The action that occurs is determined by the current character.  The options are:
+   *
+   *    1. Output currChar: output currChar, copy nextChar to currChar, get the next character and save it to nextChar
+   *    2. Delete currChar: copy nextChar to currChar, get the next character and save it to nextChar
+   *    3. Delete nextChar: get the next character and save it to nextChar
+   *
+   * This method essentially treats a string as a single character.  Also recognizes regular expressions if they are
+   * preceded by '(', ',', or '='.
+   *
+   * @param action The action to perform
+   * @throws IOException
+   * @throws UnterminatedRegExpLiteralException
+   * @throws UnterminatedCommentException
+   * @throws UnterminatedStringLiteralException
+   */
+  private void action(Action action) throws IOException, UnterminatedRegExpLiteralException, UnterminatedCommentException,
+                                         UnterminatedStringLiteralException {
+
+    // Process action
+    switch (action) {
+
+      case OUTPUT_CURR:
+        out.write(currChar);
+
+      case DELETE_CURR:
+        currChar = nextChar;
+
+        if (currChar == '\'' || currChar == '"') {
+          for ( ; ; ) {
+            out.write(currChar);
+            currChar = get();
+            if (currChar == nextChar) {
+              break;
+            }
+            if (currChar <= '\n') {
+              throw new UnterminatedStringLiteralException(line,
+                                                           column);
+            }
+            if (currChar == '\\') {
+              out.write(currChar);
+              currChar = get();
+            }
+          }
+        }
+
+      case DELETE_NEXT:
+        nextChar = next();
+        if (nextChar == '/'
+            && (currChar == '(' || currChar == ',' || currChar == '=' || currChar == ':')) {
+          out.write(currChar);
+          out.write(nextChar);
+          for ( ; ; ) {
+            currChar = get();
+            if (currChar == '/') {
+              break;
+            } else if (currChar == '\\') {
+              out.write(currChar);
+              currChar = get();
+            } else if (currChar <= '\n') {
+              throw new UnterminatedRegExpLiteralException(line,
+                                                           column);
+            }
+            out.write(currChar);
+          }
+          nextChar = next();
+        }
+    }
+  }
+
+  /**
+   * Determines whether a given character is a letter, digit, underscore, dollar sign, or non-ASCII character.
+   *
+   * @param c The character to compare
+   * @return True if the character is a letter, digit, underscore, dollar sign, or non-ASCII character.  False otherwise.
+   */
+  private boolean isAlphanum(int c) {
+    return ((c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z')
+            || c == '_' || c == '$' || c == '\\' || c > 126);
+  }
+
+  /**
+   * Returns the next character from the input stream.
+   *
+   * Will pop the next character from the input stack.  If the character is a control character, translate it to a space
+   * or line feed.
+   *
+   * @return The next character from the input stream
+   * @throws IOException
+   */
+  private int get() throws IOException {
+    int c = in.read();
+
+    if (c == '\n') {
+      line++;
+      column = 0;
+    } else {
+      column++;
+    }
+
+    if (c >= ' ' || c == '\n' || c == EOF) {
+      return c;
+    }
+
+    if (c == '\r') {
+      column = 0;
+      return '\n';
+    }
+
+    return ' ';
+  }
+
+  /**
+   * Returns the next character from the input stream without popping it from the stack.
+   *
+   * @return The next character from the input stream
+   * @throws IOException
+   */
+  private int peek() throws IOException {
+    int lookaheadChar = in.read();
+    in.unread(lookaheadChar);
+    return lookaheadChar;
+  }
+
+  /**
+   * Get the next character from the input stream, excluding comments.
+   *
+   * Will read from the input stream via the <code>get()</code> method.  Will exclude characters that are part of
+   * comments.  <code>peek()</code> is used to se if a '/' is followed by a '/' or a '*' for the purpose of identifying
+   * comments.
+   *
+   * @return The next character from the input stream, excluding characters from comments
+   * @throws IOException
+   * @throws UnterminatedCommentException
+   */
+  private int next() throws IOException, UnterminatedCommentException {
+    int c = get();
+
+    if (c == '/') {
+      switch (peek()) {
+
+        case '/':
+          for ( ; ; ) {
+            c = get();
+            if (c <= '\n') {
+              return c;
+            }
+          }
+
+        case '*':
+          get();
+          for ( ; ; ) {
+            switch (get()) {
+              case '*':
+                if (peek() == '/') {
+                  get();
+                  return ' ';
+                }
+                break;
+              case EOF:
+                throw new UnterminatedCommentException(line, column);
+            }
+          }
+
+        default:
+          return c;
+      }
+
+    }
+    return c;
+  }
+
+  /**
+   * Exception to be thrown when an unterminated comment appears in the input.
+   */
+  public static class UnterminatedCommentException extends Exception {
+    public UnterminatedCommentException(int line, int column) {
+      super("Unterminated comment at line " + line + " and column " + column);
+    }
+  }
+
+  /**
+   * Exception to be thrown when an unterminated string literal appears in the input.
+   */
+  public static class UnterminatedStringLiteralException extends Exception {
+    public UnterminatedStringLiteralException(int line, int column) {
+      super("Unterminated string literal at line " + line + " and column " + column);
+    }
+  }
+
+  /**
+   * Exception to be thrown when an unterminated regular expression literal appears in the input.
+   */
+  public static class UnterminatedRegExpLiteralException extends Exception {
+    public UnterminatedRegExpLiteralException(int line, int column) {
+      super("Unterminated regular expression at line " + line + " and column " + column);
+    }
+  }
+}

packaging/Linux/.gitignore

@@ -1,2 +0,0 @@
-/ATCS_v*.zip
-/ATCS_v*.zip.rename

packaging/Linux/ATCS/ATCS.cmd

@@ -1 +0,0 @@
-start "" "javaw.exe" -Xmx512M -cp "lib\ATCS_v0.4.4.jar;lib\jide-oss.jar;lib\ui.jar;lib\junit-4.10.jar;lib\json_simple-1.1.jar;lib\rsyntaxtextarea.jar;lib\prefuse.jar;lib\AndorsTrainer_v0.1.2.jar;lib\bsh-2.0b4.jar" com.gpl.rpg.atcontentstudio.ATContentStudio

packaging/Linux/ATCS/ATCS.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-java -Xmx512M -cp lib/AndorsTrainer_v0.1.2.jar:lib/ATCS_v0.4.4.jar:lib/prefuse.jar:lib/json_simple-1.1.jar:lib/jide-oss.jar:lib/ui.jar:lib/junit-4.10.jar:lib/rsyntaxtextarea.jar:lib/bsh-2.0b4.jar com.gpl.rpg.atcontentstudio.ATContentStudio

packaging/Linux/ATCS/lib/.gitignore

@@ -1 +0,0 @@
-/*.jar

packaging/Manifest.txt

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Main-Class: com.gpl.rpg.atcontentstudio.ATContentStudio

packaging/Windows/ATCS.cmd

@@ -1 +1,20 @@
-start "" "javaw.exe" -Xmx512M -cp "lib\jide-oss.jar;lib\ui.jar;lib\junit-4.10.jar;lib\json_simple-1.1.jar;lib\rsyntaxtextarea.jar;lib\prefuse.jar;lib\ATCS_v0.4.3.jar;lib\AndorsTrainer_v0.1.2.jar;lib\bsh-2.0b4.jar" com.gpl.rpg.atcontentstudio.ATContentStudio
+@echo off
+
+set "ATCS_DIR=%~dp0"
+set "MAX_MEM=512M"
+set "CP=%ATCS_DIR%lib\*"
+set "JAVA=javaw.exe"
+set "JAVA_OPTS=-DFONT_SCALE=1.0 -Dswing.aatext=true"
+set "ENV_FILE=%ATCS_DIR%ATCS.env.bat"
+set "MAIN_CLASS=com.gpl.rpg.atcontentstudio.ATContentStudio"
+
+if exist "%ENV_FILE%" (
+  call "%ENV_FILE%"
+) else (
+  echo REM set "MAX_MEM=%MAX_MEM%">"%ENV_FILE%"
+  echo REM set "JAVA=%JAVA%">>"%ENV_FILE%"
+  echo REM set "JAVA_OPTS=%JAVA_OPTS%">>"%ENV_FILE%"
+  echo.>>"%ENV_FILE%"
+)
+
+start "" "%JAVA%" %JAVA_OPTS% -Xmx%MAX_MEM% -cp "%CP%" %MAIN_CLASS%

packaging/Windows/ATCS_Installer.nsi

@@ -1,10 +1,12 @@
 !include MUI2.nsh
 
-!define VERSION "0.4.4"
+; Version will be passed as /DVERSION=vx.x.x
+!define TRAINER_VERSION "0.1.5"
 !define JAVA_BIN "java"
+!define ATCS_SOURCE_DIR "..\..\"
 
-Name "Andor's Trail Content Studio v${VERSION}"
-OutFile "ATCS_v${VERSION}_Setup.exe"
+Name "Andor's Trail Content Studio ${VERSION}"
+OutFile "..\ATCS_${VERSION}_Setup.exe"
 InstallDir "$PROGRAMFILES\ATCS\"
 
 ;SetCompressor /SOLID /FINAL lzma
@@ -12,10 +14,10 @@ InstallDir "$PROGRAMFILES\ATCS\"
 Var StartMenuFolder
 
 !define MUI_WELCOMEPAGE_TITLE "Welcome to Andor's Trail Content Studio installer"
-!define MUI_WELCOMEPAGE_TEXT "This will install Andor's Trail Content Studio v${VERSION} installer"
-!define MUI_FINISHPAGE_TEXT "Andor's Trail Content Studio v${VERSION} install completed !"
+!define MUI_WELCOMEPAGE_TEXT "This will install Andor's Trail Content Studio ${VERSION}"
+!define MUI_FINISHPAGE_TEXT "Andor's Trail Content Studio ${VERSION} - Install completed !"
 !define MUI_STARTMENUPAGE_DEFAULTFOLDER "Andor's Trail Content Studio"
-!define MUI_PAGE_HEADER_TEXT "Installing Andor's Trail Content Studio v${VERSION}"
+!define MUI_PAGE_HEADER_TEXT "Installing Andor's Trail Content Studio ${VERSION}"
 
 
 ;Start Menu Folder Page Configuration
@@ -45,105 +47,120 @@ Var StartMenuFolder
 !insertmacro MUI_UNPAGE_CONFIRM
 !insertmacro MUI_UNPAGE_INSTFILES
 
-
 !insertmacro MUI_LANGUAGE "English"
 
+
+;------------------------------------------------------------------------------------
 Section install
 
-
+  ;--- Create in ...\packaging\common\   ATCS.cmd  ATCT.ico  ATCS.jar
   SetOutPath $INSTDIR
   file "ATCS.ico"
-  
+  file "${ATCS_SOURCE_DIR}\packaging\common\ATCS.jar"
+
   Call GetJRE
   Pop $R0
+;  file "${ATCS_SOURCE_DIR}\packaging\common\ATCS.cmd"
+;  !insertmacro _ReplaceInFile "ATCS.cmd" "java.exe" "$R0"  (It was too much work this way)
   FileOpen $9 "ATCS.cmd" w
-  FileWrite $9 'start "" "$R0" -Xmx512M -cp "lib\AndorsTrainer_v0.1.1.jar;lib\jide-oss.jar;lib\ui.jar;lib\junit-4.10.jar;lib\json_simple-1.1.jar;lib\rsyntaxtextarea.jar;lib\prefuse.jar;lib\bsh-2.0b4.jar;lib\ATCS_v${VERSION}.jar" com.gpl.rpg.atcontentstudio.ATContentStudio'
+  FileWrite $9 '@echo off$\r$\n'
+  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 'set "JAVA=$R0"$\r$\n'
+  FileWrite $9 'set "JAVA_OPTS="$\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 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'
   FileClose $9
-  
-  SetOutPath "$INSTDIR\lib\"
-  file "jide-oss.jar"
-  file "ui.jar"
-  file "AndorsTrainer_v0.1.2.jar"
-  file "junit-4.10.jar"
-  file "json_simple-1.1.jar"
-  file "ATCS_v${VERSION}.jar"
-  file "rsyntaxtextarea.jar"
-  file "prefuse.jar"
-  file "bsh-2.0b4.jar"
 
-  SetOutPath $INSTDIR
-  
   WriteUninstaller "$INSTDIR\Uninstall.exe"
-  
-  
+
+
   !insertmacro MUI_STARTMENU_WRITE_BEGIN "ATCS"
-    
-    ;Create shortcuts
+
+    ;--- Create shortcuts
     CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
     CreateShortcut "$SMPROGRAMS\$StartMenuFolder\Andor's Trail Content Studio.lnk" "$INSTDIR\ATCS.cmd" "" "$INSTDIR\ATCS.ico"
     CreateShortcut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
-  
+
   !insertmacro MUI_STARTMENU_WRITE_END
-  
+
 SectionEnd
 
+
+;------------------------------------------------------------------------------------
 Section uninstall
-  
+
   Delete "$INSTDIR\lib\jide-oss.jar"
   Delete "$INSTDIR\lib\ui.jar"
   Delete "$INSTDIR\lib\junit-4.10.jar"
   Delete "$INSTDIR\lib\json_simple-1.1.jar"
-  Delete "$INSTDIR\lib\AndorsTrainer_v0.1.2.jar"
-  Delete "$INSTDIR\lib\ATCS_v${VERSION}.jar"
+  Delete "$INSTDIR\lib\AndorsTrainer_v${TRAINER_VERSION}.jar"
   Delete "$INSTDIR\lib\rsyntaxtextarea.jar"
   Delete "$INSTDIR\lib\prefuse.jar"
+  Delete "$INSTDIR\lib\bsh-2.0b4.jar"
+  Delete "$INSTDIR\lib\jsoup-1.10.2.jar"
   RMDir "$INSTDIR\lib\"
+
   Delete "$INSTDIR\ATCS.ico"
   Delete "$INSTDIR\ATCS.cmd"
-  
+  Delete "$INSTDIR\ATCS.env.bat"
+  Delete "$INSTDIR\ATCS.jar"
   Delete "$INSTDIR\Uninstall.exe"
-
   RMDir "$INSTDIR"
-  
+
   !insertmacro MUI_STARTMENU_GETFOLDER "ATCS" $StartMenuFolder
-    
+
   Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk"
   Delete "$SMPROGRAMS\$StartMenuFolder\Andor's Trail Content Studio.lnk"
   RMDir "$SMPROGRAMS\$StartMenuFolder"
-  
+
 SectionEnd
 
 
+;------------------------------------------------------------------------------------
 Function GetJRE
 ;
-;  Find JRE (javaw.exe)
+;  Find JRE (java.exe)
 ;  DISABLED 1 - in .\jre directory (JRE Installed with application)
 ;  2 - in JAVA_HOME environment variable
 ;  3 - in the registry
-;  4 - assume javaw.exe in current dir or PATH
- 
+;  4 - assume java.exe in current dir or PATH
+
   Push $R0
   Push $R1
- 
+
   ;ClearErrors
-  ;StrCpy $R0 "$EXEDIR\jre\bin\javaw.exe"
+  ;StrCpy $R0 "$EXEDIR\jre\bin\java.exe"
   ;IfFileExists $R0 JreFound
   ;StrCpy $R0 ""
- 
+
   ClearErrors
   ReadEnvStr $R0 "JAVA_HOME"
   StrCpy $R0 "$R0\bin\${JAVA_BIN}.exe"
   IfErrors 0 JreFound
- 
+
   ClearErrors
   ReadRegStr $R1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" "CurrentVersion"
   ReadRegStr $R0 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$R1" "JavaHome"
   StrCpy $R0 "$R0\bin\${JAVA_BIN}.exe"
- 
+
   IfErrors 0 JreFound
   StrCpy $R0 "${JAVA_BIN}.exe"
- 
+
  JreFound:
   Pop $R1
   Exch $R0
-FunctionEnd
+FunctionEnd

packaging/common/ATCS.cmd

@@ -0,0 +1,18 @@
+@echo off
+
+set "ATCS_DIR=%~dp0"
+set "MAX_MEM=1024M"
+set "JAVA=java.exe"
+set "JAVA_OPTS=-DFONT_SCALE=1.0 -Dswing.aatext=true"
+set "ENV_FILE=%ATCS_DIR%ATCS.env.bat"
+
+if exist "%ENV_FILE%" (
+  call "%ENV_FILE%"
+) else (
+  echo REM set "MAX_MEM=%MAX_MEM%">"%ENV_FILE%"
+  echo REM set "JAVA=%JAVA%">>"%ENV_FILE%"
+  echo REM set "JAVA_OPTS=%JAVA_OPTS%">>"%ENV_FILE%"
+  echo.>>"%ENV_FILE%"
+)
+
+start "" "%JAVA%" %JAVA_OPTS% -Xmx%MAX_MEM% -jar "%ATCS_DIR%\ATCS.jar"

packaging/common/ATCS.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+ATCS_DIR="$(dirname "$(readlink -f "$0" || greadlink -f "$0" || stat -f "$0")")"
+echo "ATCS_DIR: '${ATCS_DIR}'"
+
+MAX_MEM="512M"
+JAVA="java"
+JAVA_OPTS='-DFONT_SCALE=1.0 -Dswing.aatext=true'
+
+ENV_FILE="${ATCS_DIR}/ATCS.env"
+
+if [ -f "${ENV_FILE}" ]; then
+	source "${ENV_FILE}"
+else
+  {
+    echo "#MAX_MEM=\"${MAX_MEM}\""
+    echo "#JAVA=\"${JAVA}\""
+    echo "#JAVA_OPTS=\"${JAVA_OPTS}\""
+    echo ""
+  }>"${ENV_FILE}"
+fi
+
+export ENV_FILE
+exit 1
+# shellcheck disable=SC2086
+# (spellchecker is disabled for this line, because we want it to be split into multiple arguments)
+$JAVA ${JAVA_OPTS} -Xmx${MAX_MEM} -jar "${ATCS_DIR}/ATCS.jar"

packaging/package-windows.sh

@@ -0,0 +1 @@
+sh ./package.sh -windows

packaging/package.sh

@@ -0,0 +1,126 @@
+#!/bin/bash
+
+# Script to build ATCS.jar, replicating IntelliJ artifact definition
+# Linux and Windows compatible
+
+# --- Platform Detection ---
+if [ "$1" = "-windows" ]; then
+    echo "Got '-windows' flag. Running Windows version"
+    PLATFORM="WINDOWS"
+else
+    echo "No '-windows' flag. Running Linux version"
+    PLATFORM="LINUX"
+fi
+
+# --- Configuration ---
+PACKAGING_DIR=$(dirname "$(readlink -f "$0" || greadlink -f "$0" || stat -f "$0")")
+ATCS_SOURCE_DIR=$(dirname "${PACKAGING_DIR}")
+TEMP_DIR="${PACKAGING_DIR}/tmp"
+JAR_LOCATION="${PACKAGING_DIR}/ATCS.jar" # Output JAR location as per script
+MANIFEST_LOCATION="${PACKAGING_DIR}/Manifest.txt"
+VERSION_FILE="${ATCS_SOURCE_DIR}/res/ATCS_latest"
+SOURCE_BASE_DIR="${ATCS_SOURCE_DIR}/src" # Base directory for standard source code
+LIB_BASE_DIR="${ATCS_SOURCE_DIR}/lib"     # Base directory for libraries
+
+# --- **ADDITIONAL SOURCE CODE FOLDERS** ---
+EXTRA_SOURCE_DIRS=(
+  "hacked-libtiled"
+  "minify"
+  "siphash-zackehh/src/main/java"
+)
+
+# --- Libraries to include ---
+LIBRARIES=(
+  "AndorsTrainer_v0.1.5.jar"
+  "bsh-2.0b4.jar"
+  "jide-oss.jar"
+  "json_simple-1.1.jar"
+  "jsoup-1.10.2.jar"
+  "junit-4.10.jar"
+  "prefuse.jar"
+  "rsyntaxtextarea.jar"
+  "ui.jar"
+)
+
+# --- Get version ---
+echo "Getting version"
+VERSION=$(tr -d '[:space:]' < "${VERSION_FILE}")
+echo "Got version ${VERSION}"
+
+# --- Prepare temporary directory ---
+echo "Removing tmp folder"
+rm -rf "${TEMP_DIR}"
+echo "Recreating tmp folder"
+mkdir -p "${TEMP_DIR}"
+
+# --- **EXTRACT lib files directly to TEMP_DIR** ---
+echo 'Extracting lib files to TEMP_DIR'
+for LIB in "${LIBRARIES[@]}"; do
+    echo "Extracting library: ${LIB}"
+    unzip -qo "${LIB_BASE_DIR}/${LIB}" -d "${TEMP_DIR}" # Extract JAR contents to TEMP_DIR root
+done
+
+# --- Set ClassPath ---
+echo "Getting source files"
+# Find all java files in source directories
+SOURCE_FILES=$(find "${SOURCE_BASE_DIR}" "${EXTRA_SOURCE_DIRS[@]/#/${ATCS_SOURCE_DIR}/}" -name "*.java" -print)
+#echo "SourceFiles: ${SOURCE_FILES}"
+echo ""
+
+# --- Build Java classes ---
+echo 'Building java classes'
+
+# shellcheck disable=SC2086
+# (we need word splitting here to pass multiple files)
+javac -cp "${TEMP_DIR}" -d "${TEMP_DIR}" ${SOURCE_FILES}
+if [ $? -ne 0 ]; then
+    echo "Compilation failed. Please check errors above."
+    exit 1
+fi
+echo "Compilation successful"
+
+# --- Copy res stuff to temp folder ---
+echo "Copying some stuff to temp folder"
+cp -r "${ATCS_SOURCE_DIR}"/res/* "${TEMP_DIR}/"
+mkdir -p "${TEMP_DIR}/com/gpl/rpg/atcontentstudio/img"
+mkdir -p "${TEMP_DIR}/tiled/io/resources/"
+cp -r "${ATCS_SOURCE_DIR}"/src/com/gpl/rpg/atcontentstudio/img/* "${TEMP_DIR}/com/gpl/rpg/atcontentstudio/img/" # some icons
+cp -r "${ATCS_SOURCE_DIR}"/hacked-libtiled/tiled/io/resources/* "${TEMP_DIR}/tiled/io/resources/" # dtd file for tmx maps
+cp "${VERSION_FILE}" "${TEMP_DIR}/" # Copy version file
+
+# --- Create JAR file ---
+echo ""
+echo "Creating jar at location: ${JAR_LOCATION}"
+
+cd "${TEMP_DIR}" || exit # Change to temp dir for JAR command
+
+# JAR command WITHOUT lib directory
+jar cfm "${JAR_LOCATION}" "${MANIFEST_LOCATION}"  -C . .
+if [ $? -ne 0 ]; then
+    echo "JAR creation failed."
+    exit 1
+fi
+
+cd "${PACKAGING_DIR}" || exit # Go back to packaging dir
+
+echo ''
+echo "Done creating jar at ${JAR_LOCATION}"
+cp -f "${JAR_LOCATION}" "${PACKAGING_DIR}/common/ATCS.jar" # Copy JAR to versioned name
+
+# --- Create archive ---
+cd "${PACKAGING_DIR}" || exit
+echo "Creating archive"
+if [ "$PLATFORM" = "WINDOWS" ]; then
+    # Use PowerShell's Compress-Archive which is available by default on Windows
+    powershell.exe -Command "Compress-Archive -Path './common/*' -DestinationPath './ATCS_${VERSION}.zip' -Force"
+else
+    # Use zip command on Linux
+    zip -r "ATCS_${VERSION}.zip" common/* # archive the 'common' folder which now contains the JAR and libs
+fi
+if [ $? -ne 0 ]; then
+    echo "Archive creation failed."
+    exit 1
+fi
+echo "Created archive at ${PACKAGING_DIR}/ATCS_${VERSION}.zip"
+
+echo "Script finished."

res/ATCS_latest

@@ -0,0 +1 @@
+v0.6.21

res/LICENSE.jsoup.txt

@@ -0,0 +1,21 @@
+The MIT License
+
+© 2009-2017, Jonathan Hedley <jonathan@hedley.net>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

res/LICENSE.minify.txt

@@ -0,0 +1,43 @@
+
+----------------------
+Minify.java 2015-10-04
+----------------------
+
+Copyright (c) 2015 Charles Bihis (www.whoischarles.com)
+
+This work is an adaptation of JSMin.java published by John Reilly which is a translation from C to Java of jsmin.c
+published by Douglas Crockford.  Permission is hereby granted to use this Java version under the same conditions as
+the original jsmin.c on which all of these derivatives are based.
+
+
+---------------------
+JSMin.java 2006-02-13
+---------------------
+
+Copyright (c) 2006 John Reilly (www.inconspicuous.org)
+
+This work is a translation from C to Java of jsmin.c published by Douglas Crockford.  Permission is hereby granted to
+use the Java version under the same conditions as the jsmin.c on which it is based.
+
+
+
+------------------
+jsmin.c 2003-04-21
+------------------
+
+Copyright (c) 2002 Douglas Crockford (www.crockford.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

res/LICENSE.siphash-zackehh.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Isaac Whitfield
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

res/spritesheets.properties

@@ -1,62 +1,94 @@
 atcs.spritesheet.actorconditions_1.category=actorcondition
 atcs.spritesheet.actorconditions_2.category=actorcondition
+atcs.spritesheet.actorconditions_japozero.category=actorcondition
+atcs.spritesheet.actorconditions_newb.category=actorcondition
+atcs.spritesheet.actorconditions_omi1.category=actorcondition
+atcs.spritesheet.actorconditions_omi2.category=actorcondition
+
+atcs.spritesheet.effect_blood3.animate=true
+atcs.spritesheet.effect_blood4.animate=true
+atcs.spritesheet.effect_bluetentacle.animate=true
+atcs.spritesheet.effect_heal2.animate=true
+atcs.spritesheet.effect_miss1.animate=true
+atcs.spritesheet.effect_poison1.animate=true
+atcs.spritesheet.effect_tometik1.animate=true
+atcs.spritesheet.effect_tometik2.animate=true
+
 atcs.spritesheet.items_armours.category=item
 atcs.spritesheet.items_armours_2.category=item
 atcs.spritesheet.items_armours_3.category=item
-atcs.spritesheet.items_weapons.category=item
-atcs.spritesheet.items_weapons_2.category=item
-atcs.spritesheet.items_weapons_3.category=item
-atcs.spritesheet.items_jewelry.category=item
-atcs.spritesheet.items_rings_1.category=item
-atcs.spritesheet.items_necklaces_1.category=item
-atcs.spritesheet.items_consumables.category=item
 atcs.spritesheet.items_books.category=item
+atcs.spritesheet.items_consumables.category=item
+atcs.spritesheet.items_consumables_omi1.category=item
+atcs.spritesheet.items_feygard1.category=item
+atcs.spritesheet.items_g03_package_omi1.category=item
+atcs.spritesheet.items_japozero.category=item
+atcs.spritesheet.items_jewelry.category=item
 atcs.spritesheet.items_misc.category=item
 atcs.spritesheet.items_misc_2.category=item
 atcs.spritesheet.items_misc_3.category=item
 atcs.spritesheet.items_misc_4.category=item
 atcs.spritesheet.items_misc_5.category=item
 atcs.spritesheet.items_misc_6.category=item
+atcs.spritesheet.items_necklaces_1.category=item
+atcs.spritesheet.items_newb.category=item
+atcs.spritesheet.items_omgeeky.category=item
+atcs.spritesheet.items_omi2.category=item
+atcs.spritesheet.items_phoenix01.category=item
 atcs.spritesheet.items_reterski_1.category=item
+atcs.spritesheet.items_rijackson_1.category=item
+atcs.spritesheet.items_rings_1.category=item
 atcs.spritesheet.items_tometik1.category=item
 atcs.spritesheet.items_tometik2.category=item
 atcs.spritesheet.items_tometik3.category=item
+atcs.spritesheet.items_weapons.category=item
+atcs.spritesheet.items_weapons_2.category=item
+atcs.spritesheet.items_weapons_3.category=item
+
 atcs.spritesheet.monsters_armor1.category=monster
+atcs.spritesheet.monsters_arulirs.category=monster
+
+atcs.spritesheet.monsters_cats.category=monster
 atcs.spritesheet.monsters_dogs.category=monster
 atcs.spritesheet.monsters_eye1.category=monster
 atcs.spritesheet.monsters_eye2.category=monster
 atcs.spritesheet.monsters_eye3.category=monster
 atcs.spritesheet.monsters_eye4.category=monster
+atcs.spritesheet.monsters_fatboy73.category=monster
 atcs.spritesheet.monsters_ghost1.category=monster
-atcs.spritesheet.monsters_hydra1.category=monster
-atcs.spritesheet.monsters_hydra1.sizex=64
-atcs.spritesheet.monsters_hydra1.sizey=64
+
+atcs.spritesheet.monsters_gisons.category=monster
+atcs.spritesheet.monsters_guynmart.category=monster
+
 atcs.spritesheet.monsters_insects.category=monster
+atcs.spritesheet.monsters_johny.category=monster
+atcs.spritesheet.monsters_karvis1.category=monster
+atcs.spritesheet.monsters_karvis2.category=monster
+atcs.spritesheet.monsters_ld1.category=monster
+atcs.spritesheet.monsters_ld2.category=monster
 atcs.spritesheet.monsters_liches.category=monster
 atcs.spritesheet.monsters_mage.category=monster
 atcs.spritesheet.monsters_mage2.category=monster
+atcs.spritesheet.monsters_maksiu1.category=monster
 atcs.spritesheet.monsters_man1.category=monster
 atcs.spritesheet.monsters_men.category=monster
 atcs.spritesheet.monsters_men2.category=monster
 atcs.spritesheet.monsters_misc.category=monster
+atcs.spritesheet.monsters_newb_1.category=monster
+atcs.spritesheet.monsters_omi1.category=monster
+atcs.spritesheet.monsters_omi1_b.category=monster
+atcs.spritesheet.monsters_omi2.category=monster
+atcs.spritesheet.monsters_phoenix01.category=monster
 atcs.spritesheet.monsters_rats.category=monster
-atcs.spritesheet.monsters_rogue1.category=monster
-atcs.spritesheet.monsters_skeleton1.category=monster
-atcs.spritesheet.monsters_skeleton2.category=monster
-atcs.spritesheet.monsters_snakes.category=monster
-atcs.spritesheet.monsters_warrior1.category=monster
-atcs.spritesheet.monsters_wraiths.category=monster
-atcs.spritesheet.monsters_zombie1.category=monster
-atcs.spritesheet.monsters_zombie2.category=monster
-atcs.spritesheet.monsters_karvis1.category=monster
-atcs.spritesheet.monsters_karvis2.category=monster
+atcs.spritesheet.monsters_redshrike1.category=monster
 atcs.spritesheet.monsters_rltiles1.category=monster
 atcs.spritesheet.monsters_rltiles2.category=monster
 atcs.spritesheet.monsters_rltiles3.category=monster
 atcs.spritesheet.monsters_rltiles4.category=monster
-atcs.spritesheet.monsters_redshrike1.category=monster
-atcs.spritesheet.monsters_ld1.category=monster
-atcs.spritesheet.monsters_ld2.category=monster
+atcs.spritesheet.monsters_rogue1.category=monster
+atcs.spritesheet.monsters_skeleton1.category=monster
+atcs.spritesheet.monsters_skeleton2.category=monster
+atcs.spritesheet.monsters_snakes.category=monster
 atcs.spritesheet.monsters_tometik1.category=monster
 atcs.spritesheet.monsters_tometik2.category=monster
 atcs.spritesheet.monsters_tometik3.category=monster
@@ -67,19 +99,36 @@ atcs.spritesheet.monsters_tometik7.category=monster
 atcs.spritesheet.monsters_tometik8.category=monster
 atcs.spritesheet.monsters_tometik9.category=monster
 atcs.spritesheet.monsters_tometik10.category=monster
+atcs.spritesheet.monsters_warrior1.category=monster
+atcs.spritesheet.monsters_unknown.category=monster
+atcs.spritesheet.monsters_wraiths.category=monster
+atcs.spritesheet.monsters_zombie1.category=monster
+atcs.spritesheet.monsters_zombie2.category=monster
+
+atcs.spritesheet.monsters_bosses_2x2.category=monster
+atcs.spritesheet.monsters_bosses_2x2.sizex=64
+atcs.spritesheet.monsters_bosses_2x2.sizey=64
+atcs.spritesheet.monsters_cyclops.category=monster
+atcs.spritesheet.monsters_cyclops.sizex=64
+atcs.spritesheet.monsters_cyclops.sizey=96
 atcs.spritesheet.monsters_demon1.category=monster
 atcs.spritesheet.monsters_demon1.sizex=64
 atcs.spritesheet.monsters_demon1.sizey=64
 atcs.spritesheet.monsters_demon2.category=monster
 atcs.spritesheet.monsters_demon2.sizex=64
 atcs.spritesheet.monsters_demon2.sizey=64
-atcs.spritesheet.monsters_cyclops.category=monster
-atcs.spritesheet.monsters_cyclops.sizex=64
-atcs.spritesheet.monsters_cyclops.sizey=96
-atcs.spritesheet.effect_blood3.animate=true
-atcs.spritesheet.effect_blood4.animate=true
-atcs.spritesheet.effect_bluetentacle.animate=true
-atcs.spritesheet.effect_heal2.animate=true
-atcs.spritesheet.effect_poison1.animate=true
-atcs.spritesheet.effect_tometik1.animate=true
-atcs.spritesheet.effect_tometik2.animate=true
+atcs.spritesheet.monsters_giantbasilisk.category=monster
+atcs.spritesheet.monsters_giantbasilisk.sizex=64
+atcs.spritesheet.monsters_giantbasilisk.sizey=64
+atcs.spritesheet.monsters_hydra1.category=monster
+atcs.spritesheet.monsters_hydra1.sizex=64
+atcs.spritesheet.monsters_hydra1.sizey=64
+atcs.spritesheet.monsters_newb_2.category=monster
+atcs.spritesheet.monsters_newb_2.sizex=64
+atcs.spritesheet.monsters_newb_2.sizey=32
+atcs.spritesheet.monsters_newb_3.category=monster
+atcs.spritesheet.monsters_newb_3.sizex=64
+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

siphash-zackehh/.gitignore

@@ -0,0 +1,19 @@
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# IntelliJ
+.idea
+*.iml
+
+# build
+target

siphash-zackehh/.travis.yml

@@ -0,0 +1,3 @@
+language: java
+script:
+  - mvn clean test jacoco:report coveralls:report

siphash-zackehh/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Isaac Whitfield
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

siphash-zackehh/README.md

@@ -0,0 +1,77 @@
+# SipHash
+
+[![Build Status](https://travis-ci.org/zackehh/siphash-java.svg?branch=master)](https://travis-ci.org/zackehh/siphash-java) [![Coverage Status](https://coveralls.io/repos/zackehh/siphash-java/badge.svg?branch=master&service=github)](https://coveralls.io/github/zackehh/siphash-java?branch=master)
+
+A Java implementation of the SipHash cryptographic hash family. Supports any variation, although defaults to the widely used SipHash-2-4. Can be used with either full input, or used as a streaming digest.
+
+This library was heavily influenced by [veorq's C implementation](https://github.com/veorq/siphash) and [Forward C&C's reference implementation](http://www.forward.com.au/pfod/SipHashJavaLibrary/) - I just decided it was time a Java implementation of SipHash made it onto Maven :).
+
+## Setup
+
+`siphash` is available on Maven central, via Sonatype OSS:
+
+```
+<dependency>
+    <groupId>com.zackehh</groupId>
+    <artifactId>siphash</artifactId>
+    <version>1.0.0</version>
+</dependency>
+```
+
+## Usage
+
+There are two ways of using SipHash (see below). Both return a `SipHashResult` which can be used to retrieve the result in various forms. All constructors can take arguments to specify the compression rounds. For further usage, please visit the [documentation](http://www.javadoc.io/doc/com.zackehh/siphash).
+
+#### Full Input Hash
+
+The first is to simple create a `SipHash` instance and use it to repeatedly hash using the same key.
+
+The internal state is immutable, so you can hash many inputs without having to recreate a new `SipHash` instance (unless you want a new key).
+
+```java
+SipHash hasher = new SipHash("0123456789ABCDEF".getBytes());
+
+SipHashResult result = hasher.hash("my-input".getBytes());
+
+System.out.println(result.get());                             // 182795880124085484 <-- this can overflow
+System.out.println(result.getHex());                          //  "2896be26d3374ec"
+System.out.println(result.getHex(true));                      // "02896be26d3374ec"
+System.out.println(result.getHex(SipHashCase.UPPER));         //  "2896BE26D3374EC"
+System.out.println(result.getHex(true, SipHashCase.UPPER));   // "02896BE26D3374EC"
+```
+
+#### Streaming Hash
+
+The second is to use the library as a streaming hash, meaning you can apply chunks of bytes to the hash as they become available.
+
+Using this method you must create a new digest every time you want to hash a different input as the internal state is mutable.
+
+```java
+SipHashDigest digest = new SipHashDigest("0123456789ABCDEF".getBytes());
+
+digest.update("chu".getBytes());
+digest.update("nked".getBytes());
+digest.update(" string".getBytes());
+
+SipHashResult result = digest.finish();
+
+System.out.println(result.get());                             // 3502906798476177428 <-- this can overflow
+System.out.println(result.getHex());                          //  "309cd32c8c793014"
+System.out.println(result.getHex(true));                      //  "309cd32c8c793014"
+System.out.println(result.getHex(SipHashCase.UPPER));         //  "309CD32C8C793014"
+System.out.println(result.getHex(true, SipHashCase.UPPER));   //  "309CD32C8C793014"
+```
+
+## Contributing
+
+If you wish to contribute (awesome!), please file an issue first! All PRs should pass `mvn clean verify` and maintain 100% test coverage.
+
+## Testing
+
+Tests are run using `mvn`. I aim to maintain 100% coverage where possible (both line and branch).
+
+Tests can be run as follows:
+
+```bash
+$ mvn clean verify
+```

siphash-zackehh/pom.xml

@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.zackehh</groupId>
+    <artifactId>siphash</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>SipHash</name>
+    <description>
+        A SipHash implementation in Java.
+    </description>
+    <url>https://github.com/zackehh/siphash-java</url>
+
+    <properties>
+        <jacoco.version>0.7.5.201505241946</jacoco.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <developers>
+        <developer>
+            <id>iwhitfield</id>
+            <name>Isaac Whitfield</name>
+            <email>iw@zackehh.com</email>
+            <organization>Appcelerator, Inc.</organization>
+            <organizationUrl>http://www.appcelerator.com</organizationUrl>
+        </developer>
+    </developers>
+
+    <scm>
+        <connection>scm:git:git@github.com:zackehh/siphash-java.git</connection>
+        <developerConnection>scm:git:git@github.com:zackehh/siphash-java.git</developerConnection>
+        <url>git@github.com:zackehh/siphash-java.git</url>
+    </scm>
+
+    <licenses>
+        <license>
+            <name>MIT License</name>
+            <url>http://www.opensource.org/licenses/mit-license.php</url>
+        </license>
+    </licenses>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+        <repository>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
+    </distributionManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>6.8.7</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <version>2.2.1</version>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <goals>
+                                    <goal>jar-no-fork</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>2.9.1</version>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.5</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.sonatype.plugins</groupId>
+                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <version>1.6.3</version>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <serverId>ossrh</serverId>
+                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                            <autoReleaseAfterClose>false</autoReleaseAfterClose>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.3</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>${jacoco.version}</version>
+                <executions>
+                    <execution>
+                        <id>prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.eluder.coveralls</groupId>
+                <artifactId>coveralls-maven-plugin</artifactId>
+                <version>4.1.0</version>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

siphash-zackehh/src/main/java/com/zackehh/siphash/SipHash.java

@@ -0,0 +1,111 @@
+package com.zackehh.siphash;
+
+import static com.zackehh.siphash.SipHashConstants.DEFAULT_C;
+import static com.zackehh.siphash.SipHashConstants.DEFAULT_D;
+import static com.zackehh.siphash.SipHashConstants.INITIAL_V0;
+import static com.zackehh.siphash.SipHashConstants.INITIAL_V1;
+import static com.zackehh.siphash.SipHashConstants.INITIAL_V2;
+import static com.zackehh.siphash.SipHashConstants.INITIAL_V3;
+
+/**
+ * Main entry point for SipHash, providing a basic hash
+ * interface. Assuming you have your full String to hash,
+ * you can simply provide it to ${@link SipHash#hash(byte[])}.
+ *
+ * This class can be initialized and stored in case the
+ * developer wishes to use the same key over and over again.
+ *
+ * This avoids the overhead of having to create the initial
+ * key over and over again.
+ *
+ * <pre>
+ * {@code
+ * List<String> inputs = Arrays.asList("input1", "input2", "input3");
+ * SipHash hasher = new SipHash("this key is mine".getBytes());
+ * for (int i = 0; i < inputs.size(); i++) {
+ *     hasher.hash(inputs.get(i));
+ * }
+ * }
+ * </pre>
+ */
+public class SipHash {
+
+    /**
+     * The values of SipHash-c-d, to determine which of the SipHash
+     * family we're using for this hash.
+     */
+    private final int c, d;
+
+    /**
+     * Initial seeded value of v0.
+     */
+    private final long v0;
+
+    /**
+     * Initial seeded value of v1.
+     */
+    private final long v1;
+
+    /**
+     * Initial seeded value of v2.
+     */
+    private final long v2;
+
+    /**
+     * Initial seeded value of v3.
+     */
+    private final long v3;
+
+    /**
+     * Accepts a 16 byte key input, and uses it to initialize
+     * the state of the hash. This uses the default values of
+     * c/d, meaning that we default to SipHash-2-4.
+     *
+     * @param key a 16 byte key input
+     */
+    public SipHash(byte[] key){
+        this(key, DEFAULT_C, DEFAULT_D);
+    }
+
+    /**
+     * Accepts a 16 byte key input, and uses it to initialize
+     * the state of the hash. This constructor allows for
+     * providing the c/d values, allowing the developer to
+     * select any of the SipHash family to use for hashing.
+     *
+     * @param key a 16 byte key input
+     * @param c the number of compression rounds
+     * @param d the number of finalization rounds
+     */
+    public SipHash(byte[] key, int c, int d){
+        this.c = c;
+        this.d = d;
+
+        SipHashKey hashKey = new SipHashKey(key);
+
+        this.v0 = (INITIAL_V0 ^ hashKey.k0);
+        this.v1 = (INITIAL_V1 ^ hashKey.k1);
+        this.v2 = (INITIAL_V2 ^ hashKey.k0);
+        this.v3 = (INITIAL_V3 ^ hashKey.k1);
+    }
+
+    /**
+     * The basic hash implementation provided in the library.
+     * Assuming you have your full input, you can provide it and
+     * it will be hashed based on the values which were provided
+     * to the constructor of this class.
+     *
+     * @param data the bytes to hash
+     * @return a ${@link SipHashResult} instance
+     */
+    public SipHashResult hash(byte[] data) {
+        SipHashDigest digest = new SipHashDigest(v0, v1, v2, v3, c, d);
+
+        for (byte aData : data) {
+            digest.update(aData);
+        }
+
+        return digest.finish();
+    }
+
+}

siphash-zackehh/src/main/java/com/zackehh/siphash/SipHashCase.java

@@ -0,0 +1,8 @@
+package com.zackehh.siphash;
+
+/**
+ * A basic enum to determine the case of a String.
+ *
+ * A String can either be UPPER or LOWER case.
+ */
+public enum SipHashCase { UPPER, LOWER }

siphash-zackehh/src/main/java/com/zackehh/siphash/SipHashConstants.java

@@ -0,0 +1,63 @@
+package com.zackehh.siphash;
+
+/**
+ * Class containing several constants for use alongside
+ * hashing. Fields such as initial states and defaults,
+ * as they will not change throughout hashing.
+ */
+class SipHashConstants {
+
+    /**
+     * This constructor is private, nobody should be
+     * accessing it!
+     *
+     * @throws IllegalAccessException
+     */
+    private SipHashConstants() throws IllegalAccessException {
+        throw new IllegalAccessException();
+    }
+
+    /**
+     * Initial magic number for v0.
+     */
+    static final long INITIAL_V0 = 0x736f6d6570736575L;
+
+    /**
+     * Initial magic number for v1.
+     */
+    static final long INITIAL_V1 = 0x646f72616e646f6dL;
+
+    /**
+     * Initial magic number for v2.
+     */
+    static final long INITIAL_V2 = 0x6c7967656e657261L;
+
+    /**
+     * Initial magic number for v3.
+     */
+    static final long INITIAL_V3 = 0x7465646279746573L;
+
+    /**
+     * The default number of rounds of compression during per block.
+     * This defaults to 2 as the default implementation is SipHash-2-4.
+     */
+    static final int DEFAULT_C = 2;
+
+    /**
+     * The default number of rounds of compression during finalization.
+     * This defaults to 4 as the default implementation is SipHash-2-4.
+     */
+    static final int DEFAULT_D = 4;
+
+    /**
+     * Whether or not we should pad any hashes by default.
+     */
+    static final boolean DEFAULT_PADDING = false;
+
+    /**
+     * The default String casing for any output Hex Strings. We default
+     * to lower case as it's the least expensive path.
+     */
+    static final SipHashCase DEFAULT_CASE = SipHashCase.LOWER;
+
+}

siphash-zackehh/src/main/java/com/zackehh/siphash/SipHashDigest.java

@@ -0,0 +1,225 @@
+package com.zackehh.siphash;
+
+import static com.zackehh.siphash.SipHashConstants.DEFAULT_C;
+import static com.zackehh.siphash.SipHashConstants.DEFAULT_D;
+
+/**
+ * A streaming implementation of SipHash, to be used when
+ * you don't have all input available at the same time. Chunks
+ * of bytes can be applied as they're received, and will be hashed
+ * accordingly.
+ *
+ * As with ${@link SipHash}, the compression and finalization rounds
+ * can be customized.
+ */
+public class SipHashDigest {
+
+    /**
+     * The values of SipHash-c-d, to determine which of the SipHash
+     * family we're using for this hash.
+     */
+    private final int c, d;
+
+    /**
+     * Initial seeded value of v0.
+     */
+    private long v0;
+
+    /**
+     * Initial seeded value of v1.
+     */
+    private long v1;
+
+    /**
+     * Initial seeded value of v2.
+     */
+    private long v2;
+
+    /**
+     * Initial seeded value of v3.
+     */
+    private long v3;
+
+    /**
+     * A counter to keep track of the length of the input.
+     */
+    private byte input_len = 0;
+
+    /**
+     * A counter to keep track of the current position inside
+     * of a chunk of bytes. Seeing as bytes are applied in chunks
+     * of 8, this is necessary.
+     */
+    private int m_idx = 0;
+
+    /**
+     * The `m` value from the SipHash algorithm. Every 8 bytes, this
+     * value will be applied to the current state of the hash.
+     */
+    private long m;
+
+    /**
+     * Accepts a 16 byte key input, and uses it to initialize
+     * the state of the hash. This uses the default values of
+     * c/d, meaning that we default to SipHash-2-4.
+     *
+     * @param key a 16 byte key input
+     */
+    public SipHashDigest(byte[] key) {
+        this(key, DEFAULT_C, DEFAULT_D);
+    }
+
+    /**
+     * Accepts a 16 byte key input, and uses it to initialize
+     * the state of the hash. This constructor allows for
+     * providing the c/d values, allowing the developer to
+     * select any of the SipHash family to use for hashing.
+     *
+     * @param key a 16 byte key input
+     * @param c the number of compression rounds
+     * @param d the number of finalization rounds
+     */
+    public SipHashDigest(byte[] key, int c, int d) {
+        this.c = c;
+        this.d = d;
+
+        SipHashKey hashKey = new SipHashKey(key);
+
+        this.v0 = SipHashConstants.INITIAL_V0 ^ hashKey.k0;
+        this.v1 = SipHashConstants.INITIAL_V1 ^ hashKey.k1;
+        this.v2 = SipHashConstants.INITIAL_V2 ^ hashKey.k0;
+        this.v3 = SipHashConstants.INITIAL_V3 ^ hashKey.k1;
+    }
+
+    /**
+     * This constructor is used by the ${@link SipHash} implementation,
+     * and takes an initial (seeded) value of v0/v1/v2/v3. This is used
+     * when the key has been pre-calculated. This constructor also
+     * receives the values of `c` and `d` to use in this hash.
+     *
+     * @param v0 an initial seeded v0
+     * @param v1 an initial seeded v1
+     * @param v2 an initial seeded v2
+     * @param v3 an initial seeded v3
+     * @param c the number of compression rounds
+     * @param d the number of finalization rounds
+     */
+    SipHashDigest(long v0, long v1, long v2, long v3, int c, int d) {
+        this.c = c;
+        this.d = d;
+
+        this.v0 = v0;
+        this.v1 = v1;
+        this.v2 = v2;
+        this.v3 = v3;
+    }
+
+    /**
+     * Updates the current state of the hash with a single byte. This
+     * is the streaming implementation which shifts as required to ensure
+     * we can take an arbitrary number of bytes at any given time. We only
+     * apply the block once the index (`m_idx`) has reached 8. The number
+     * of compression rounds is determined by the `c` value passed in by
+     * the developer.
+     *
+     * This method returns this instance, as a way of allowing the developer
+     * to chain.
+     *
+     * @return a ${@link SipHashDigest} instance
+     */
+    public SipHashDigest update(byte b) {
+        input_len++;
+        m |= (((long) b & 0xff) << (m_idx * 8));
+        m_idx++;
+        if (m_idx >= 8) {
+            v3 ^= m;
+            for (int i = 0; i < c; i++) {
+                round();
+            }
+            v0 ^= m;
+            m_idx = 0;
+            m = 0;
+        }
+        return this;
+    }
+
+    /**
+     * A convenience method to allow passing a chunk of bytes at once, rather
+     * than a byte at a time.
+     *
+     * @return a ${@link SipHashDigest} instance
+     */
+    public SipHashDigest update(byte[] bytes) {
+        for (byte b : bytes) {
+            update(b);
+        }
+        return this;
+    }
+
+    /**
+     * Finalizes the hash by padding 0s until the next multiple of
+     * 8 (as we operate in 8 byte chunks). The last byte added to
+     * the hash is the length of the input, which we keep inside the
+     * `input_len` counter. The number of rounds is based on the value
+     * of `d` as specified by the developer.
+     *
+     * This method returns a ${@link SipHashResult}, as no further updates
+     * should occur (i.e. the lack of chaining here shows we're done).
+     *
+     * @return a ${@link SipHashResult} instance
+     */
+    public SipHashResult finish() {
+        byte msgLenMod256 = input_len;
+
+        while (m_idx < 7) {
+            update((byte) 0);
+        }
+        update(msgLenMod256);
+
+        v2 ^= 0xff;
+        for (int i = 0; i < d; i++) {
+            round();
+        }
+
+        return new SipHashResult(v0 ^ v1 ^ v2 ^ v3);
+    }
+
+    /**
+     * Performs the equivalent of SipRound on the provided state.
+     * This method affects the state of this digest, in that it
+     * mutates the v states directly.
+     */
+    private void round() {
+        v0 += v1;
+        v2 += v3;
+        v1 = rotateLeft(v1, 13);
+        v3 = rotateLeft(v3, 16);
+
+        v1 ^= v0;
+        v3 ^= v2;
+        v0 = rotateLeft(v0, 32);
+
+        v2 += v1;
+        v0 += v3;
+        v1 = rotateLeft(v1, 17);
+        v3 = rotateLeft(v3, 21);
+
+        v1 ^= v2;
+        v3 ^= v0;
+        v2 = rotateLeft(v2, 32);
+    }
+
+    /**
+     * Rotates an input number `val` left by `shift` number of bits. Bits which are
+     * pushed off to the left are rotated back onto the right, making this a left
+     * rotation (a circular shift).
+     *
+     * @param val the value to be shifted
+     * @param shift how far left to shift
+     * @return a long value once shifted
+     */
+    private long rotateLeft(long val, int shift) {
+        return (val << shift) | val >>> (64 - shift);
+    }
+
+}

siphash-zackehh/src/main/java/com/zackehh/siphash/SipHashKey.java

@@ -0,0 +1,53 @@
+package com.zackehh.siphash;
+
+/**
+ * A container class to store both k0 and k1. These
+ * values are created from a 16 byte key passed into
+ * the constructor. This isn't ideal as it's another
+ * alloc, but it'll do for now.
+ */
+class SipHashKey {
+
+    /**
+     * The value of k0.
+     */
+    final long k0;
+
+    /**
+     * The value of k1.
+     */
+    final long k1;
+
+    /**
+     * Accepts a 16 byte input key and converts the
+     * first and last 8 byte chunks to little-endian.
+     * These values become k0 and k1.
+     *
+     * @param key the 16 byte key input
+     */
+    public SipHashKey(byte[] key) {
+        if (key.length != 16) {
+            throw new IllegalArgumentException("Key must be exactly 16 bytes!");
+        }
+        this.k0 = bytesToLong(key, 0);
+        this.k1 = bytesToLong(key, 8);
+    }
+
+    /**
+     * Converts a chunk of 8 bytes to a number in little-endian
+     * format. Accepts an offset to determine where the chunk
+     * begins in the byte array.
+     *
+     * @param b our byte array
+     * @param offset the index to start at
+     * @return a little-endian long representation
+     */
+    private static long bytesToLong(byte[] b, int offset) {
+        long m = 0;
+        for (int i = 0; i < 8; i++) {
+            m |= ((((long) b[i + offset]) & 0xff) << (8 * i));
+        }
+        return m;
+    }
+
+}

siphash-zackehh/src/main/java/com/zackehh/siphash/SipHashResult.java

@@ -0,0 +1,121 @@
+package com.zackehh.siphash;
+
+import static com.zackehh.siphash.SipHashConstants.DEFAULT_CASE;
+import static com.zackehh.siphash.SipHashConstants.DEFAULT_PADDING;
+
+/**
+ * A container class of the result of a hash. This class exists
+ * to allow the developer to retrieve the result in any format
+ * they like. Currently available formats are `long` and ${@link java.lang.String}.
+ * When retrieving as a String, the developer can specify the case
+ * they want it in, and whether or not we should pad the left side
+ * to 16 characters with 0s.
+ */
+public class SipHashResult {
+
+    /**
+     * The internal hash result.
+     */
+    private final long result;
+
+    /**
+     * A package-private constructor, as only
+     * SipHash should be creating results.
+     *
+     * @param result the result of a hash
+     */
+    SipHashResult(long result){
+        this.result = result;
+    }
+
+    /**
+     * Simply returns the hash result as a long.
+     *
+     * @return the hash value as a long
+     */
+    public long get(){
+        return result;
+    }
+
+    /**
+     * Returns the result as a Hex String, using
+     * the default padding and casing values.
+     *
+     * @return the hash value as a Hex String
+     */
+    public String getHex(){
+        return getHex(DEFAULT_PADDING, DEFAULT_CASE);
+    }
+
+    /**
+     * Returns the result as a Hex String, using
+     * a custom padding value and default casing value.
+     *
+     * @param padding whether or not to pad the string
+     * @return the hash value as a Hex String
+     */
+    public String getHex(boolean padding){
+        return getHex(padding, DEFAULT_CASE);
+    }
+
+    /**
+     * Returns the result as a Hex String, using
+     * a default padding value and custom casing value.
+     *
+     * @param s_case the case to convert the output to
+     * @return the hash value as a Hex String
+     */
+    public String getHex(SipHashCase s_case){
+        return getHex(DEFAULT_PADDING, s_case);
+    }
+
+    /**
+     * Returns the result as a Hex String, taking in
+     * various arguments to customize the output further,
+     * such as casing and padding.
+     *
+     * @param padding whether or not to pad the string
+     * @param s_case the case to convert the output to
+     * @return a Hex String in the custom format
+     */
+    public String getHex(boolean padding, SipHashCase s_case){
+        String str = Long.toHexString(get());
+        if (padding) {
+            str = leftPad(str, 16, "0");
+        }
+        if (s_case == SipHashCase.UPPER) {
+            str = str.toUpperCase();
+        }
+        return str;
+    }
+    
+    /**
+     * Modified for https://github.com/Zukero/ATCS
+     * Replaces the StringUtils.leftPad from apache commons, to remove dependency.
+     * 
+     * @param str the string to pad
+     * @param len the total desired length
+     * @param pad the padding string
+     * @return str prefixed with enough repetitions of the pad to have a total length matching len
+     */
+    public String leftPad(String str, int len, String pad) {
+    	StringBuilder sb = new StringBuilder(len);
+    	
+    	int padlen = len - str.length();
+    	int partialPadLen = padlen % pad.length();
+    	int padCount = padlen / pad.length();
+    	
+    	while (padCount >= 0) {
+    		sb.append(pad);
+    		padCount--;
+    	}
+    	
+    	if (partialPadLen > 0) {
+    		sb.append(pad.substring(0, partialPadLen));
+    	}
+    	
+    	sb.append(str);
+    	
+    	return sb.toString();
+    }
+}

siphash-zackehh/src/test/java/com/zackehh/siphash/SipHashCaseTest.java

@@ -0,0 +1,27 @@
+package com.zackehh.siphash;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class SipHashCaseTest {
+
+    @Test
+    public void ensureAllValues() throws Exception {
+        SipHashCase[] cases = SipHashCase.values();
+
+        Assert.assertEquals(cases[0], SipHashCase.UPPER);
+        Assert.assertEquals(cases[1], SipHashCase.LOWER);
+    }
+
+    @Test
+    public void ensureValueOf() throws Exception {
+        Assert.assertEquals(SipHashCase.valueOf("UPPER"), SipHashCase.UPPER);
+        Assert.assertEquals(SipHashCase.valueOf("LOWER"), SipHashCase.LOWER);
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class)
+    public void invalidCaseValueOf() throws Exception {
+        SipHashCase.valueOf("invalid");
+    }
+
+}

siphash-zackehh/src/test/java/com/zackehh/siphash/SipHashConstantsTest.java

@@ -0,0 +1,32 @@
+package com.zackehh.siphash;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Modifier;
+
+public class SipHashConstantsTest {
+
+    @Test
+    public void ensureAllConstants() throws Exception {
+        Assert.assertEquals(SipHashConstants.INITIAL_V0, 0x736f6d6570736575L);
+        Assert.assertEquals(SipHashConstants.INITIAL_V1, 0x646f72616e646f6dL);
+        Assert.assertEquals(SipHashConstants.INITIAL_V2, 0x6c7967656e657261L);
+        Assert.assertEquals(SipHashConstants.INITIAL_V3, 0x7465646279746573L);
+        Assert.assertEquals(SipHashConstants.DEFAULT_C, 2);
+        Assert.assertEquals(SipHashConstants.DEFAULT_D, 4);
+        Assert.assertEquals(SipHashConstants.DEFAULT_CASE, SipHashCase.LOWER);
+        Assert.assertEquals(SipHashConstants.DEFAULT_PADDING, false);
+    }
+
+    @Test(expectedExceptions = InvocationTargetException.class)
+    public void ensureCannotInstance() throws Exception {
+        Constructor<SipHashConstants> ctor = SipHashConstants.class.getDeclaredConstructor();
+        ctor.setAccessible(true);
+        Assert.assertTrue(Modifier.isPrivate(ctor.getModifiers()));
+        ctor.newInstance();
+    }
+
+}

siphash-zackehh/src/test/java/com/zackehh/siphash/SipHashDigestTest.java

@@ -0,0 +1,148 @@
+package com.zackehh.siphash;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class SipHashDigestTest {
+
+    @Test
+    public void initializeDigestWithKey() throws Exception {
+        SipHashDigest sipHash = new SipHashDigest("0123456789ABCDEF".getBytes());
+
+        long v0 = SipHashTestUtils.getPrivateField(sipHash, "v0", Long.class);
+        long v1 = SipHashTestUtils.getPrivateField(sipHash, "v1", Long.class);
+        long v2 = SipHashTestUtils.getPrivateField(sipHash, "v2", Long.class);
+        long v3 = SipHashTestUtils.getPrivateField(sipHash, "v3", Long.class);
+
+        Assert.assertEquals(v0, 4925064773550298181L);
+        Assert.assertEquals(v1, 2461839666708829781L);
+        Assert.assertEquals(v2, 6579568090023412561L);
+        Assert.assertEquals(v3, 3611922228250500171L);
+
+        int c = SipHashTestUtils.getPrivateField(sipHash, "c", Integer.class);
+        int d = SipHashTestUtils.getPrivateField(sipHash, "d", Integer.class);
+
+        Assert.assertEquals(c, SipHashConstants.DEFAULT_C);
+        Assert.assertEquals(d, SipHashConstants.DEFAULT_D);
+    }
+
+    @Test
+    public void initializeDigestWithKeyAndCD() throws Exception {
+        SipHashDigest sipHash = new SipHashDigest("0123456789ABCDEF".getBytes(), 4, 8);
+
+        long v0 = SipHashTestUtils.getPrivateField(sipHash, "v0", Long.class);
+        long v1 = SipHashTestUtils.getPrivateField(sipHash, "v1", Long.class);
+        long v2 = SipHashTestUtils.getPrivateField(sipHash, "v2", Long.class);
+        long v3 = SipHashTestUtils.getPrivateField(sipHash, "v3", Long.class);
+
+        Assert.assertEquals(v0, 4925064773550298181L);
+        Assert.assertEquals(v1, 2461839666708829781L);
+        Assert.assertEquals(v2, 6579568090023412561L);
+        Assert.assertEquals(v3, 3611922228250500171L);
+
+        int c = SipHashTestUtils.getPrivateField(sipHash, "c", Integer.class);
+        int d = SipHashTestUtils.getPrivateField(sipHash, "d", Integer.class);
+
+        Assert.assertEquals(c, 4);
+        Assert.assertEquals(d, 8);
+    }
+
+    @Test
+    public void initializeDigestWithKeyThenHash() throws Exception {
+        SipHashDigest sipHash = new SipHashDigest("0123456789ABCDEF".getBytes());
+
+        long v0 = SipHashTestUtils.getPrivateField(sipHash, "v0", Long.class);
+        long v1 = SipHashTestUtils.getPrivateField(sipHash, "v1", Long.class);
+        long v2 = SipHashTestUtils.getPrivateField(sipHash, "v2", Long.class);
+        long v3 = SipHashTestUtils.getPrivateField(sipHash, "v3", Long.class);
+
+        Assert.assertEquals(v0, 4925064773550298181L);
+        Assert.assertEquals(v1, 2461839666708829781L);
+        Assert.assertEquals(v2, 6579568090023412561L);
+        Assert.assertEquals(v3, 3611922228250500171L);
+
+        int c = SipHashTestUtils.getPrivateField(sipHash, "c", Integer.class);
+        int d = SipHashTestUtils.getPrivateField(sipHash, "d", Integer.class);
+
+        Assert.assertEquals(c, SipHashConstants.DEFAULT_C);
+        Assert.assertEquals(d, SipHashConstants.DEFAULT_D);
+
+        for(byte b : "zymotechnics".getBytes()){
+            sipHash.update(b);
+        }
+
+        SipHashResult hashResult = sipHash.finish();
+
+        Assert.assertEquals(hashResult.get(), 699588702094987020L);
+        Assert.assertEquals(hashResult.getHex(), "9b57037cd3f8f0c");
+        Assert.assertEquals(hashResult.getHex(true), "09b57037cd3f8f0c");
+        Assert.assertEquals(hashResult.getHex(SipHashCase.UPPER), "9B57037CD3F8F0C");
+        Assert.assertEquals(hashResult.getHex(true, SipHashCase.UPPER), "09B57037CD3F8F0C");
+    }
+
+    @Test
+    public void initializeStateWithKeyAndCDThenHash() throws Exception {
+        SipHashDigest sipHash = new SipHashDigest("0123456789ABCDEF".getBytes(), 4, 8);
+
+        long v0 = SipHashTestUtils.getPrivateField(sipHash, "v0", Long.class);
+        long v1 = SipHashTestUtils.getPrivateField(sipHash, "v1", Long.class);
+        long v2 = SipHashTestUtils.getPrivateField(sipHash, "v2", Long.class);
+        long v3 = SipHashTestUtils.getPrivateField(sipHash, "v3", Long.class);
+
+        Assert.assertEquals(v0, 4925064773550298181L);
+        Assert.assertEquals(v1, 2461839666708829781L);
+        Assert.assertEquals(v2, 6579568090023412561L);
+        Assert.assertEquals(v3, 3611922228250500171L);
+
+        int c = SipHashTestUtils.getPrivateField(sipHash, "c", Integer.class);
+        int d = SipHashTestUtils.getPrivateField(sipHash, "d", Integer.class);
+
+        Assert.assertEquals(c, 4);
+        Assert.assertEquals(d, 8);
+
+        for(byte b : "zymotechnics".getBytes()){
+            sipHash.update(b);
+        }
+
+        SipHashResult hashResult = sipHash.finish();
+
+        Assert.assertEquals(hashResult.get(), -3891084581787974112L); // overflow
+        Assert.assertEquals(hashResult.getHex(), "ca0017304f874620");
+        Assert.assertEquals(hashResult.getHex(true), "ca0017304f874620");
+        Assert.assertEquals(hashResult.getHex(SipHashCase.UPPER), "CA0017304F874620");
+        Assert.assertEquals(hashResult.getHex(true, SipHashCase.UPPER), "CA0017304F874620");
+    }
+
+    @Test
+    public void updateWithAByteArrayChunk() throws Exception {
+        SipHashDigest sipHash = new SipHashDigest("0123456789ABCDEF".getBytes());
+
+        long v0 = SipHashTestUtils.getPrivateField(sipHash, "v0", Long.class);
+        long v1 = SipHashTestUtils.getPrivateField(sipHash, "v1", Long.class);
+        long v2 = SipHashTestUtils.getPrivateField(sipHash, "v2", Long.class);
+        long v3 = SipHashTestUtils.getPrivateField(sipHash, "v3", Long.class);
+
+        Assert.assertEquals(v0, 4925064773550298181L);
+        Assert.assertEquals(v1, 2461839666708829781L);
+        Assert.assertEquals(v2, 6579568090023412561L);
+        Assert.assertEquals(v3, 3611922228250500171L);
+
+        int c = SipHashTestUtils.getPrivateField(sipHash, "c", Integer.class);
+        int d = SipHashTestUtils.getPrivateField(sipHash, "d", Integer.class);
+
+        Assert.assertEquals(c, SipHashConstants.DEFAULT_C);
+        Assert.assertEquals(d, SipHashConstants.DEFAULT_D);
+
+        sipHash.update("zymo".getBytes());
+        sipHash.update("techni".getBytes());
+        sipHash.update("cs".getBytes());
+
+        SipHashResult hashResult = sipHash.finish();
+
+        Assert.assertEquals(hashResult.get(), 699588702094987020L);
+        Assert.assertEquals(hashResult.getHex(), "9b57037cd3f8f0c");
+        Assert.assertEquals(hashResult.getHex(true), "09b57037cd3f8f0c");
+        Assert.assertEquals(hashResult.getHex(SipHashCase.UPPER), "9B57037CD3F8F0C");
+        Assert.assertEquals(hashResult.getHex(true, SipHashCase.UPPER), "09B57037CD3F8F0C");
+    }
+}

siphash-zackehh/src/test/java/com/zackehh/siphash/SipHashKeyTest.java

@@ -0,0 +1,27 @@
+package com.zackehh.siphash;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class SipHashKeyTest {
+
+    @Test
+    public void initializeWithKey() throws Exception {
+        SipHashKey key = new SipHashKey("0123456789ABCDEF".getBytes());
+
+        long k0 = SipHashTestUtils.getPrivateField(key, "k0", Long.class);
+        long k1 = SipHashTestUtils.getPrivateField(key, "k1", Long.class);
+
+        Assert.assertEquals(k0, 3978425819141910832L);
+        Assert.assertEquals(k1, 5063528411713059128L);
+    }
+
+    @Test(
+        expectedExceptions = IllegalArgumentException.class,
+        expectedExceptionsMessageRegExp = "Key must be exactly 16 bytes!"
+    )
+    public void initializeWithKeyTooLong() throws Exception {
+        new SipHashKey("0123456789ABCDEFG".getBytes()); // 17 bytes
+    }
+
+}

siphash-zackehh/src/test/java/com/zackehh/siphash/SipHashTest.java

@@ -0,0 +1,107 @@
+package com.zackehh.siphash;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class SipHashTest {
+
+    @Test
+    public void initializeStateWithKey() throws Exception {
+        SipHash sipHash = new SipHash("0123456789ABCDEF".getBytes());
+
+        long v0 = SipHashTestUtils.getPrivateField(sipHash, "v0", Long.class);
+        long v1 = SipHashTestUtils.getPrivateField(sipHash, "v1", Long.class);
+        long v2 = SipHashTestUtils.getPrivateField(sipHash, "v2", Long.class);
+        long v3 = SipHashTestUtils.getPrivateField(sipHash, "v3", Long.class);
+
+        Assert.assertEquals(v0, 4925064773550298181L);
+        Assert.assertEquals(v1, 2461839666708829781L);
+        Assert.assertEquals(v2, 6579568090023412561L);
+        Assert.assertEquals(v3, 3611922228250500171L);
+
+        int c = SipHashTestUtils.getPrivateField(sipHash, "c", Integer.class);
+        int d = SipHashTestUtils.getPrivateField(sipHash, "d", Integer.class);
+
+        Assert.assertEquals(c, SipHashConstants.DEFAULT_C);
+        Assert.assertEquals(d, SipHashConstants.DEFAULT_D);
+    }
+
+    @Test
+    public void initializeStateWithKeyAndCD() throws Exception {
+        SipHash sipHash = new SipHash("0123456789ABCDEF".getBytes(), 4, 8);
+
+        long v0 = SipHashTestUtils.getPrivateField(sipHash, "v0", Long.class);
+        long v1 = SipHashTestUtils.getPrivateField(sipHash, "v1", Long.class);
+        long v2 = SipHashTestUtils.getPrivateField(sipHash, "v2", Long.class);
+        long v3 = SipHashTestUtils.getPrivateField(sipHash, "v3", Long.class);
+
+        Assert.assertEquals(v0, 4925064773550298181L);
+        Assert.assertEquals(v1, 2461839666708829781L);
+        Assert.assertEquals(v2, 6579568090023412561L);
+        Assert.assertEquals(v3, 3611922228250500171L);
+
+        int c = SipHashTestUtils.getPrivateField(sipHash, "c", Integer.class);
+        int d = SipHashTestUtils.getPrivateField(sipHash, "d", Integer.class);
+
+        Assert.assertEquals(c, 4);
+        Assert.assertEquals(d, 8);
+    }
+
+    @Test
+    public void initializeStateWithKeyThenHash() throws Exception {
+        SipHash sipHash = new SipHash("0123456789ABCDEF".getBytes());
+
+        long v0 = SipHashTestUtils.getPrivateField(sipHash, "v0", Long.class);
+        long v1 = SipHashTestUtils.getPrivateField(sipHash, "v1", Long.class);
+        long v2 = SipHashTestUtils.getPrivateField(sipHash, "v2", Long.class);
+        long v3 = SipHashTestUtils.getPrivateField(sipHash, "v3", Long.class);
+
+        Assert.assertEquals(v0, 4925064773550298181L);
+        Assert.assertEquals(v1, 2461839666708829781L);
+        Assert.assertEquals(v2, 6579568090023412561L);
+        Assert.assertEquals(v3, 3611922228250500171L);
+
+        int c = SipHashTestUtils.getPrivateField(sipHash, "c", Integer.class);
+        int d = SipHashTestUtils.getPrivateField(sipHash, "d", Integer.class);
+
+        Assert.assertEquals(c, SipHashConstants.DEFAULT_C);
+        Assert.assertEquals(d, SipHashConstants.DEFAULT_D);
+
+        SipHashResult hashResult = sipHash.hash("zymotechnics".getBytes());
+
+        Assert.assertEquals(hashResult.get(), 699588702094987020L);
+        Assert.assertEquals(hashResult.getHex(), "9b57037cd3f8f0c");
+        Assert.assertEquals(hashResult.getHex(true), "09b57037cd3f8f0c");
+        Assert.assertEquals(hashResult.getHex(SipHashCase.UPPER), "9B57037CD3F8F0C");
+        Assert.assertEquals(hashResult.getHex(true, SipHashCase.UPPER), "09B57037CD3F8F0C");
+    }
+
+    @Test
+    public void initializeStateWithKeyAndCDThenHash() throws Exception {
+        SipHash sipHash = new SipHash("0123456789ABCDEF".getBytes(), 4, 8);
+
+        long v0 = SipHashTestUtils.getPrivateField(sipHash, "v0", Long.class);
+        long v1 = SipHashTestUtils.getPrivateField(sipHash, "v1", Long.class);
+        long v2 = SipHashTestUtils.getPrivateField(sipHash, "v2", Long.class);
+        long v3 = SipHashTestUtils.getPrivateField(sipHash, "v3", Long.class);
+
+        Assert.assertEquals(v0, 4925064773550298181L);
+        Assert.assertEquals(v1, 2461839666708829781L);
+        Assert.assertEquals(v2, 6579568090023412561L);
+        Assert.assertEquals(v3, 3611922228250500171L);
+
+        int c = SipHashTestUtils.getPrivateField(sipHash, "c", Integer.class);
+        int d = SipHashTestUtils.getPrivateField(sipHash, "d", Integer.class);
+
+        Assert.assertEquals(c, 4);
+        Assert.assertEquals(d, 8);
+
+        SipHashResult hashResult = sipHash.hash("zymotechnics".getBytes());
+
+        Assert.assertEquals(hashResult.get(), -3891084581787974112L); // overflow
+        Assert.assertEquals(hashResult.getHex(), "ca0017304f874620");
+        Assert.assertEquals(hashResult.getHex(true), "ca0017304f874620");
+        Assert.assertEquals(hashResult.getHex(SipHashCase.UPPER), "CA0017304F874620");
+        Assert.assertEquals(hashResult.getHex(true, SipHashCase.UPPER), "CA0017304F874620");
+    }
+}

siphash-zackehh/src/test/java/com/zackehh/siphash/SipHashTestUtils.java

@@ -0,0 +1,13 @@
+package com.zackehh.siphash;
+
+import java.lang.reflect.Field;
+
+public class SipHashTestUtils {
+
+    static <T> T getPrivateField(Object obj, String name, Class<T> clazz) throws Exception {
+        Field f = obj.getClass().getDeclaredField(name);
+        f.setAccessible(true);
+        return clazz.cast(f.get(obj));
+    }
+
+}

src/META-INF/MANIFEST.MF

@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Main-Class: com.gpl.rpg.atcontentstudio.ATContentStudio
+Class-Path: jide-oss.jar jsoup-1.10.2.jar ui.jar junit-4.10.jar AndorsTr
+ ainer_v0.1.5.jar prefuse.jar rsyntaxtextarea.jar bsh-2.0b4.jar json_sim
+ ple-1.1.jar
+

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

@@ -1,85 +1,238 @@
-package com.gpl.rpg.atcontentstudio;
-
-import java.awt.Dimension;
-import java.awt.Toolkit;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.io.File;
-
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-
-import com.gpl.rpg.atcontentstudio.model.Workspace;
-import com.gpl.rpg.atcontentstudio.ui.StudioFrame;
-import com.gpl.rpg.atcontentstudio.ui.WorkerDialog;
-import com.gpl.rpg.atcontentstudio.ui.WorkspaceSelector;
-
-
-public class ATContentStudio {
-
-	public static final String APP_NAME = "Andor's Trail Content Studio";
-	public static final String APP_VERSION = "v0.4.4";
-
-	public static boolean STARTED = false;
-	public static StudioFrame frame = null;
-	
-	/**
-	 * @param args
-	 */
-	public static void main(String[] args) {
-		
-		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();
-		}
-
-		
-		final WorkspaceSelector wsSelect = new WorkspaceSelector();
-		wsSelect.pack();
-		Dimension sdim = Toolkit.getDefaultToolkit().getScreenSize();
-		Dimension wdim = wsSelect.getSize();
-		wsSelect.setLocation((sdim.width - wdim.width)/2, (sdim.height - wdim.height)/2);
-		wsSelect.setVisible(true);
-		
-		wsSelect.addWindowListener(new WindowAdapter() {
-			@Override
-			public synchronized void windowClosed(WindowEvent e) {
-				if (wsSelect.selected != null && !STARTED) {
-					ATContentStudio.STARTED = true;
-					final File workspaceRoot = new File(wsSelect.selected);
-					WorkerDialog.showTaskMessage("Loading your workspace...", null, new Runnable(){
-						public void run() {
-							Workspace.setActive(workspaceRoot);
-							frame = new StudioFrame(APP_NAME+" "+APP_VERSION);
-							frame.setVisible(true);
-							frame.setDefaultCloseOperation(StudioFrame.EXIT_ON_CLOSE);
-						};
-					});
-					for (File f : ConfigCache.getKnownWorkspaces()) {
-						if (workspaceRoot.equals(f)) {
-							if (!workspaceRoot.equals(ConfigCache.getLatestWorkspace())) {
-								ConfigCache.setLatestWorkspace(f);
-							}
-							return;
-						}
-					}
-					ConfigCache.addWorkspace(workspaceRoot);
-					ConfigCache.setLatestWorkspace(workspaceRoot);
-
-				}
-			}
-		});
-	}
-	
-}
+package com.gpl.rpg.atcontentstudio;
+
+import java.awt.Color;
+import java.awt.Desktop;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Toolkit;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.swing.JEditorPane;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.UIDefaults;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.event.HyperlinkEvent;
+import javax.swing.event.HyperlinkListener;
+import javax.swing.plaf.FontUIResource;
+
+import prefuse.data.expression.parser.ExpressionParser;
+
+import com.gpl.rpg.atcontentstudio.model.Workspace;
+import com.gpl.rpg.atcontentstudio.ui.StudioFrame;
+import com.gpl.rpg.atcontentstudio.ui.WorkerDialog;
+import com.gpl.rpg.atcontentstudio.ui.WorkspaceSelector;
+
+public class ATContentStudio {
+
+	public static final String APP_NAME = "Andor's Trail Content Studio";
+public static final String APP_VERSION = readVersionFromFile();
+	public static final String CHECK_UPDATE_URL = "https://andorstrail.com/static/ATCS_latest";
+	public static final String DOWNLOAD_URL = "https://andorstrail.com/viewtopic.php?f=6&t=4806";
+
+	public static final String FONT_SCALE_ENV_VAR_NAME = "FONT_SCALE";
+
+	public static boolean STARTED = false;
+	public static float SCALING = 1.0f;
+	public static StudioFrame frame = null;
+
+	// Need to keep a strong reference to it, to avoid garbage collection that'll
+	// reset these loggers.
+	public static final List<Logger> configuredLoggers = new LinkedList<Logger>();
+
+	/**
+	 * @param args
+	 */
+	public static void main(String[] args) {
+		String fontScaling = System.getProperty(FONT_SCALE_ENV_VAR_NAME);
+		Float fontScale = null;
+		if (fontScaling != null) {
+			try {
+				fontScale = Float.parseFloat(fontScaling);
+				SCALING = fontScale;
+			} catch (NumberFormatException e) {
+				System.err.println("Failed to parse font scaling parameter. Using default.");
+				e.printStackTrace();
+			}
+		}
+
+		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();
+
+		// Need to keep a strong reference to it, to avoid garbage collection that'll
+		// reset this setting.
+		Logger l = Logger.getLogger(ExpressionParser.class.getName());
+		l.setLevel(Level.OFF);
+		configuredLoggers.add(l);
+
+		final WorkspaceSelector wsSelect = new WorkspaceSelector();
+		wsSelect.pack();
+		Dimension sdim = Toolkit.getDefaultToolkit().getScreenSize();
+		Dimension wdim = wsSelect.getSize();
+		wsSelect.setLocation((sdim.width - wdim.width) / 2, (sdim.height - wdim.height) / 2);
+		wsSelect.setVisible(true);
+
+		wsSelect.addWindowListener(new WindowAdapter() {
+			@Override
+			public synchronized void windowClosed(WindowEvent e) {
+				if (wsSelect.selected != null && !STARTED) {
+					ATContentStudio.STARTED = true;
+					final File workspaceRoot = new File(wsSelect.selected);
+					WorkerDialog.showTaskMessage("Loading your workspace...", null, new Runnable() {
+						public void run() {
+							Workspace.setActive(workspaceRoot);
+							if (Workspace.activeWorkspace.settings.useInternet.getCurrentValue()
+									&& Workspace.activeWorkspace.settings.checkUpdates.getCurrentValue()) {
+								new Thread() {
+									public void run() {
+										checkUpdate();
+									}
+								}.start();
+							}
+							frame = new StudioFrame(APP_NAME + " " + APP_VERSION);
+							frame.setVisible(true);
+							frame.setDefaultCloseOperation(StudioFrame.DO_NOTHING_ON_CLOSE);
+						};
+					});
+					for (File f : ConfigCache.getKnownWorkspaces()) {
+						if (workspaceRoot.equals(f)) {
+							if (!workspaceRoot.equals(ConfigCache.getLatestWorkspace())) {
+								ConfigCache.setLatestWorkspace(f);
+							}
+							return;
+						}
+					}
+					ConfigCache.addWorkspace(workspaceRoot);
+					ConfigCache.setLatestWorkspace(workspaceRoot);
+
+				}
+			}
+		});
+	}
+
+	private static void checkUpdate() {
+		BufferedReader in = null;
+		try {
+			URL url = new URL(CHECK_UPDATE_URL);
+			in = new BufferedReader(new InputStreamReader(url.openStream()));
+
+			String inputLine, lastLine = null;
+			while ((inputLine = in.readLine()) != null) {
+				lastLine = inputLine;
+			}
+			if (lastLine != null && !lastLine.equals(APP_VERSION)) {
+
+				// for copying style
+				JLabel label = new JLabel();
+				Font font = label.getFont();
+				Color color = label.getBackground();
+
+				// create some css from the label's font
+				StringBuffer style = new StringBuffer("font-family:" + font.getFamily() + ";");
+				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>");
+
+				ep.setEditable(false);
+				ep.setBorder(null);
+
+				ep.addHyperlinkListener(new HyperlinkListener() {
+
+					@Override
+					public void hyperlinkUpdate(HyperlinkEvent e) {
+						try {
+							if (e.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) {
+								Desktop.getDesktop().browse(e.getURL().toURI());
+							}
+						} catch (IOException e1) {
+							e1.printStackTrace();
+						} catch (URISyntaxException e1) {
+							e1.printStackTrace();
+						}
+					}
+				});
+
+				JOptionPane.showMessageDialog(null, ep, "Update available", JOptionPane.INFORMATION_MESSAGE);
+			}
+		} catch (MalformedURLException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		} finally {
+			try {
+				if (in != null)
+					in.close();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+	}
+
+	public static void scaleUIFont() {
+		if (SCALING != 1.0f) {
+			System.out.println("Scaling fonts to " + SCALING);
+			UIDefaults defaults = UIManager.getLookAndFeelDefaults();
+			Map<Object, Object> newDefaults = new HashMap<Object, Object>();
+			for (Enumeration<Object> e = defaults.keys(); e.hasMoreElements();) {
+				Object key = e.nextElement();
+				Object value = defaults.get(key);
+				if (value instanceof Font) {
+					Font font = (Font) value;
+					int newSize = (int) (font.getSize() * SCALING);
+					if (value instanceof FontUIResource) {
+						newDefaults.put(key, new FontUIResource(font.getName(), font.getStyle(), newSize));
+					} else {
+						newDefaults.put(key, new Font(font.getName(), font.getStyle(), newSize));
+					}
+				}
+			}
+			for (Object key : newDefaults.keySet()) {
+				defaults.put(key, newDefaults.get(key));
+			}
+		}
+	}
+	private static String readVersionFromFile() {
+		try (BufferedReader reader = new BufferedReader(new InputStreamReader(
+                Objects.requireNonNull(ATContentStudio.class.getResourceAsStream("/ATCS_latest"))))) {
+			return reader.readLine();
+		} catch (IOException e) {
+			e.printStackTrace();
+			return "unknown";
+		}
+	}
+}

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

@@ -2,11 +2,12 @@ package com.gpl.rpg.atcontentstudio;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 public class Notification {
 
 	public static List<Notification> notifs = new ArrayList<Notification>();
-	private static List<NotificationListener> listeners = new ArrayList<NotificationListener>();
+	private static List<NotificationListener> listeners = new CopyOnWriteArrayList<NotificationListener>();
 	public static boolean showS = true, showI = true, showW = true, showE = true;
 	
 	static {

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

@@ -116,4 +116,9 @@ public class ClosedProject implements ProjectTreeNode {
 		return true;
 	}
 	
+	@Override
+	public boolean needsSaving() {
+		return false;
+	}
+	
 }

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

@@ -4,13 +4,15 @@ import java.awt.Image;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Enumeration;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.swing.tree.TreeNode;
 
+import com.gpl.rpg.atcontentstudio.model.bookmarks.BookmarkEntry;
+
 public abstract class GameDataElement implements ProjectTreeNode, Serializable {
 
 	private static final long serialVersionUID = 2028934451226743389L;
@@ -31,8 +33,10 @@ public abstract class GameDataElement implements ProjectTreeNode, Serializable {
 	
 	public boolean writable = false;
 	
+	public BookmarkEntry bookmark = null;
+	
 	//List of objects whose transition to "linked" state made them point to this instance.
-	private Map<GameDataElement, Integer> backlinks = new HashMap<GameDataElement, Integer>();
+	private Map<GameDataElement, Integer> backlinks = new ConcurrentHashMap<GameDataElement, Integer>();
 
 	public String id = null;
 	
@@ -99,7 +103,7 @@ public abstract class GameDataElement implements ProjectTreeNode, Serializable {
 	
 	@Override
 	public Project getProject() {
-		return parent.getProject();
+		return parent == null ? null : parent.getProject();
 	}
 	
 	
@@ -176,6 +180,10 @@ public abstract class GameDataElement implements ProjectTreeNode, Serializable {
 		return false;
 	}
 	
+	public boolean needsSaving() {
+		return this.state == State.modified || this.state == State.created;
+	}
+	
 	public abstract String getProjectFilename();
 	
 	public abstract void save();

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

@@ -9,7 +9,6 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.LinkedHashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -31,6 +30,7 @@ import com.gpl.rpg.atcontentstudio.model.maps.Worldmap;
 import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment;
 import com.gpl.rpg.atcontentstudio.model.sprites.SpriteSheetSet;
 import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet;
+import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeDataSet;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 
 public class GameSource implements ProjectTreeNode, Serializable {
@@ -44,6 +44,7 @@ public class GameSource implements ProjectTreeNode, Serializable {
 	public transient TMXMapSet gameMaps;
 	public transient SpriteSheetSet gameSprites;
 	public transient Worldmap worldmap;
+	public transient WriterModeDataSet writerModeDataSet;
 	private transient SavedSlotCollection v;
 	
 	public static enum Type {
@@ -86,6 +87,9 @@ public class GameSource implements ProjectTreeNode, Serializable {
 				readResourceList();
 			}
 		}
+		if (type == Type.created) {
+			this.writerModeDataSet = new WriterModeDataSet(this);
+		}
 		this.gameData = new GameDataSet(this);
 		this.gameMaps = new TMXMapSet(this);
 		this.gameSprites = new SpriteSheetSet(this);
@@ -95,6 +99,9 @@ public class GameSource implements ProjectTreeNode, Serializable {
 		v.add(gameMaps);
 		v.add(gameSprites);
 		v.add(worldmap);
+		if (type == Type.created) {
+			v.add(writerModeDataSet);
+		}
 	}
 	
 	public void readResourceList() {
@@ -127,7 +134,7 @@ public class GameSource implements ProjectTreeNode, Serializable {
 	            		for (int i = 0; i < arraysList.getLength(); i++) {
 	            			Element arrayNode = (Element) arraysList.item(i);
 	            			String name = arrayNode.getAttribute("name");
-	            			List<String> arrayContents = new LinkedList<String>();
+	            			List<String> arrayContents = new ArrayList<String>();
 	            			NodeList arrayItems = arrayNode.getElementsByTagName("item");
 	            			if (arrayItems != null) {
 	            				for (int j = 0; j < arrayItems.getLength(); j++) {
@@ -206,11 +213,11 @@ public class GameSource implements ProjectTreeNode, Serializable {
 	@Override
 	public String getDesc() {
 		switch(type) {
-		case altered: return "Altered data";
-		case created: return "Created data";
-		case referenced: return "Referenced data";
-		case source: return "AT Source"; //The fact that it is from "source" is already mentionned by its parent.
-		default: return "Game data";
+		case altered: return (needsSaving() ? "*" : "")+"Altered data";
+		case created: return (needsSaving() ? "*" : "")+"Created data";
+		case referenced: return (needsSaving() ? "*" : "")+"Referenced data";
+		case source: return (needsSaving() ? "*" : "")+"AT Source"; //The fact that it is from "source" is already mentionned by its parent.
+		default: return (needsSaving() ? "*" : "")+"Game data";
 		}
 	}
 	
@@ -276,4 +283,12 @@ public class GameSource implements ProjectTreeNode, Serializable {
 	public WorldmapSegment getWorldmapSegment(String id) {
 		return worldmap.getWorldmapSegment(id);
 	}
+	
+	@Override
+	public boolean needsSaving() {
+		for (ProjectTreeNode node : v.getNonEmptyIterable()) {
+			if (node.needsSaving()) return true;
+		}
+		return false;
+	}
 }

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

@@ -1,33 +1,58 @@
 package com.gpl.rpg.atcontentstudio.model;
 
 import java.awt.Image;
+import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Serializable;
+import java.io.StringReader;
 import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
-import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.Set;
 
 import javax.swing.tree.TreeNode;
+import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
 
 import org.json.simple.JSONArray;
+import org.w3c.dom.Comment;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
 
 import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.Notification;
 import com.gpl.rpg.atcontentstudio.io.JsonPrettyWriter;
 import com.gpl.rpg.atcontentstudio.io.SettingsSave;
 import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
+import com.gpl.rpg.atcontentstudio.model.bookmarks.BookmarksRoot;
 import com.gpl.rpg.atcontentstudio.model.gamedata.ActorCondition;
 import com.gpl.rpg.atcontentstudio.model.gamedata.Dialogue;
 import com.gpl.rpg.atcontentstudio.model.gamedata.Droplist;
@@ -38,12 +63,14 @@ import com.gpl.rpg.atcontentstudio.model.gamedata.ItemCategory;
 import com.gpl.rpg.atcontentstudio.model.gamedata.JSONElement;
 import com.gpl.rpg.atcontentstudio.model.gamedata.NPC;
 import com.gpl.rpg.atcontentstudio.model.gamedata.Quest;
+import com.gpl.rpg.atcontentstudio.model.gamedata.QuestStage;
 import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
 import com.gpl.rpg.atcontentstudio.model.maps.TMXMapSet;
 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.sprites.Spritesheet;
+import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeData;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 import com.gpl.rpg.atcontentstudio.ui.WorkerDialog;
 import com.gpl.rpg.atcontentstudio.utils.FileUtils;
@@ -51,7 +78,9 @@ import com.gpl.rpg.atcontentstudio.utils.FileUtils;
 public class Project implements ProjectTreeNode, Serializable {
 
 	private static final long serialVersionUID = 4807454973303366758L;
+	private static final String drawablePath = TMXMapSet.DEFAULT_REL_PATH_TO_DRAWABLE.replace("\\", "/");
 
+	
 	//Every instance field that is not transient will be saved in this file.
 	public static final String SETTINGS_FILE = ".project";
 	
@@ -65,6 +94,8 @@ public class Project implements ProjectTreeNode, Serializable {
 	public GameSource referencedContent; //Pointers to base content
 	public transient GameSource alteredContent; //Copied from base content (does not overwrite yet)
 	public transient GameSource createdContent; //Stand-alone.
+	public transient BookmarksRoot bookmarks;
+	
 	
 	public SavedGamesSet saves; //For simulations.
 	
@@ -113,6 +144,7 @@ public class Project implements ProjectTreeNode, Serializable {
 
 		alteredContent = new GameSource(this, GameSource.Type.altered);
 		createdContent = new GameSource(this, GameSource.Type.created);
+		bookmarks = new BookmarksRoot(this);
 		
 		saves = new SavedGamesSet(this);
 
@@ -121,6 +153,7 @@ public class Project implements ProjectTreeNode, Serializable {
 //		v.add(referencedContent);
 		v.add(baseContent);
 		v.add(saves);
+		v.add(bookmarks);
 
 		linkAll();
 		
@@ -189,7 +222,7 @@ public class Project implements ProjectTreeNode, Serializable {
 	}
 	@Override
 	public String getDesc() {
-		return name;
+		return (needsSaving() ? "*" : "")+name;
 	}
 
 
@@ -219,14 +252,14 @@ public class Project implements ProjectTreeNode, Serializable {
 	public void refreshTransients(Workspace w) {
 		this.parent = w;
 
-		if (knownSpritesheetsProperties == null) {
-			try {
-				knownSpritesheetsProperties = new Properties();
-				knownSpritesheetsProperties.load(Project.class.getResourceAsStream("/spritesheets.properties"));
-			} catch (IOException e) {
-				Notification.addWarn("Unable to load default spritesheets properties.");
-				e.printStackTrace();
-			}
+		projectElementListeners = new HashMap<Class<? extends GameDataElement>, List<ProjectElementListener>>();
+
+		try {
+			knownSpritesheetsProperties = new Properties();
+			knownSpritesheetsProperties.load(Project.class.getResourceAsStream("/spritesheets.properties"));
+		} catch (IOException e) {
+			Notification.addWarn("Unable to load default spritesheets properties.");
+			e.printStackTrace();
 		}
 		
 		if (sourceSetToUse == null) {
@@ -240,6 +273,7 @@ public class Project implements ProjectTreeNode, Serializable {
 //		referencedContent.refreshTransients(this);
 		alteredContent = new GameSource(this, GameSource.Type.altered);
 		createdContent = new GameSource(this, GameSource.Type.created);
+		bookmarks = new BookmarksRoot(this);
 		
 		saves.refreshTransients();
 
@@ -249,11 +283,11 @@ public class Project implements ProjectTreeNode, Serializable {
 //		v.add(referencedContent);
 		v.add(baseContent);
 		v.add(saves);
+		v.add(bookmarks);
 		
 
 		linkAll();
 		
-		projectElementListeners = new HashMap<Class<? extends GameDataElement>, List<ProjectElementListener>>();
 	}
 	
 	public void linkAll() {
@@ -265,7 +299,7 @@ public class Project implements ProjectTreeNode, Serializable {
 			}
 		}
 		for (ProjectTreeNode node : baseContent.gameMaps.tmxMaps) {
-			((TMXMap)node).parse();
+			((TMXMap)node).link();
 		}
 		for (ProjectTreeNode node : alteredContent.gameData.v.getNonEmptyIterable()) {
 			if (node instanceof GameDataCategory<?>) {
@@ -275,7 +309,7 @@ public class Project implements ProjectTreeNode, Serializable {
 			}
 		}
 		for (ProjectTreeNode node : alteredContent.gameMaps.tmxMaps) {
-			((TMXMap)node).parse();
+			((TMXMap)node).link();
 		}
 		for (ProjectTreeNode node : createdContent.gameData.v.getNonEmptyIterable()) {
 			if (node instanceof GameDataCategory<?>) {
@@ -285,9 +319,6 @@ public class Project implements ProjectTreeNode, Serializable {
 			}
 		}
 		for (ProjectTreeNode node : createdContent.gameMaps.tmxMaps) {
-			((TMXMap)node).parse();
-		}
-		for (ProjectTreeNode node : baseContent.gameMaps.tmxMaps) {
 			((TMXMap)node).link();
 		}
 		
@@ -665,6 +696,26 @@ public class Project implements ProjectTreeNode, Serializable {
 		return sheet;
 	}
 	
+	public int getSpritesheetCount() {
+		return createdContent.gameSprites.spritesheets.size() + baseContent.gameSprites.spritesheets.size();
+	}
+
+	public Spritesheet getSpritesheet(int index) {
+		if (index < createdContent.gameSprites.spritesheets.size()) {
+			return createdContent.gameSprites.spritesheets.get(index);
+		} else if (index < getSpritesheetCount()){
+			return getSpritesheet(baseContent.gameSprites.spritesheets.get(index - createdContent.gameSprites.spritesheets.size()).id);
+		}
+		return null;
+	}
+	
+	public int getSpritesheetIndex(Spritesheet spritesheet) {
+		if (spritesheet.getDataType() == GameSource.Type.created) {
+			return createdContent.gameSprites.spritesheets.indexOf(spritesheet);
+		} else {
+			return createdContent.gameSprites.spritesheets.size() + baseContent.gameSprites.spritesheets.indexOf(baseContent.gameSprites.getSpritesheet(spritesheet.id));
+		}
+	}
 	
 	public TMXMap getMap(String id) {
 		TMXMap map = createdContent.gameMaps.getMap(id);
@@ -694,6 +745,20 @@ public class Project implements ProjectTreeNode, Serializable {
 		}
 	}
 	
+	public int getWriterSketchCount() {
+		return createdContent.writerModeDataSet.getChildCount();
+	}
+	
+	public WriterModeData getWriterSketch(String id) {
+		return createdContent.writerModeDataSet.getWriterSketch(id);
+	}
+	
+	public WriterModeData getWriterSketch(int index) {
+		if (index < createdContent.writerModeDataSet.getChildCount()) {
+			return createdContent.writerModeDataSet.get(index);
+		} 
+		return null;
+	}
 
 	@Override
 	public Project getProject() {
@@ -727,6 +792,15 @@ public class Project implements ProjectTreeNode, Serializable {
 		} else {
 			if (type == GameSource.Type.source) {
 				JSONElement clone = (JSONElement) node.clone();
+				if (node instanceof Quest) {
+					for (QuestStage oldStage : ((Quest) node).stages) {
+						QuestStage newStage = ((Quest) clone).getStage(oldStage.progress);
+						for (GameDataElement backlink : oldStage.getBacklinks()) {
+							backlink.elementChanged(oldStage, newStage);
+						}
+						oldStage.getBacklinks().clear();
+					}
+				}
 				for (GameDataElement backlink : node.getBacklinks()) {
 					backlink.elementChanged(node, clone);
 				}
@@ -786,7 +860,7 @@ public class Project implements ProjectTreeNode, Serializable {
 	
 	/**
 	 * 
-	 * @param node. Before calling this method, make sure that no other node with the same class exist in either created or altered.
+	 * @param node. Before calling this method, make sure that no other node with the same class and id exist in either created or altered.
 	 */
 	public void createElement(JSONElement node) {
 		node.writable = true;
@@ -808,6 +882,62 @@ public class Project implements ProjectTreeNode, Serializable {
 		fireElementAdded(node, getNodeIndex(node));
 	}
 	
+	/**
+	 * 
+	 * @param node. Before calling this method, make sure that no other node with the same class and id exist in either created or altered.
+	 */
+	public void createElements(List<? extends JSONElement> nodes) {
+		for (JSONElement node : nodes) {
+			//Already added.
+			if (node.getProject() != null) continue;
+			node.writable = true;
+			if (getGameDataElement(node.getClass(), node.id) != null) {
+				GameDataElement existingNode = getGameDataElement(node.getClass(), node.id);
+				for (GameDataElement backlink : existingNode.getBacklinks()) {
+					backlink.elementChanged(existingNode, node);
+				}
+				existingNode.getBacklinks().clear();
+				node.writable = true;
+				alteredContent.gameData.addElement(node);
+			} else {
+				createdContent.gameData.addElement(node);
+			}
+		}
+		for (JSONElement node : nodes) {
+			node.link();
+			node.state =  GameDataElement.State.created;
+			fireElementAdded(node, getNodeIndex(node));
+		}
+	}
+	
+	/**
+	 * 
+	 * @param node. Before calling this method, make sure that no other map with the same id exist in either created or altered.
+	 */
+	public void createElement(TMXMap node) {
+		node.writable = true;
+		if (getMap(node.id) != null) {
+			GameDataElement existingNode = getMap(node.id);
+			for (GameDataElement backlink : existingNode.getBacklinks()) {
+				backlink.elementChanged(existingNode, node);
+			}
+			existingNode.getBacklinks().clear();
+			node.writable = true;
+			node.tmxFile = new File(alteredContent.baseFolder, node.tmxFile.getName());
+			node.parent = alteredContent.gameMaps;
+			alteredContent.gameMaps.addMap(node);
+			node.link();
+			node.state = GameDataElement.State.created;
+		} else {
+			node.tmxFile = new File(createdContent.baseFolder, node.tmxFile.getName());
+			node.parent = createdContent.gameMaps;
+			createdContent.gameMaps.addMap(node);
+			node.link();
+			node.state =  GameDataElement.State.created;
+		}
+		fireElementAdded(node, getNodeIndex(node));
+	}
+	
 
 	public void moveToCreated(JSONElement target) {
 		target.childrenRemoved(new ArrayList<ProjectTreeNode>());
@@ -844,6 +974,19 @@ public class Project implements ProjectTreeNode, Serializable {
 		fireElementAdded(node, getNodeIndex(node));
 	}
 
+
+
+	public void createWriterSketch(WriterModeData node) {
+		node.writable = true;
+		createdContent.writerModeDataSet.add(node);
+		node.link();
+		fireElementAdded(node, getNodeIndex(node));
+	}
+	
+	public void bookmark(GameDataElement gde) {
+		bookmarks.addBookmark(gde);
+	}
+	
 	
 	@Override
 	public GameDataSet getDataSet() {
@@ -936,85 +1079,171 @@ public class Project implements ProjectTreeNode, Serializable {
 		}
 	}
 	
-	public void generateExportPackage(final File target) {
+	public void exportProjectAsZipPackage(final File target) {
 		WorkerDialog.showTaskMessage("Exporting project "+name+"...", ATContentStudio.frame, true, new Runnable() {
 			@Override
 			public void run() {
 				Notification.addInfo("Exporting project \""+name+"\" as "+target.getAbsolutePath());
-				File tmpDir = new File(baseFolder, "tmp");
-				FileUtils.deleteDir(tmpDir);
-				tmpDir.mkdir();
-				File tmpJsonDataDir = new File(tmpDir, GameDataSet.DEFAULT_REL_PATH_IN_SOURCE);
-				tmpJsonDataDir.mkdirs();
-
-				for (File createdJsonFile : createdContent.gameData.baseFolder.listFiles()) {
-					FileUtils.copyFile(createdJsonFile, new File(tmpJsonDataDir, createdJsonFile.getName()));
-				}
-				writeAltered(alteredContent.gameData.actorConditions, baseContent.gameData.actorConditions, ActorCondition.class, tmpJsonDataDir);
-				writeAltered(alteredContent.gameData.dialogues, baseContent.gameData.dialogues, Dialogue.class, tmpJsonDataDir);
-				writeAltered(alteredContent.gameData.droplists, baseContent.gameData.droplists, Droplist.class, tmpJsonDataDir);
-				writeAltered(alteredContent.gameData.itemCategories, baseContent.gameData.itemCategories, ItemCategory.class, tmpJsonDataDir);
-				writeAltered(alteredContent.gameData.items, baseContent.gameData.items, Item.class, tmpJsonDataDir);
-				writeAltered(alteredContent.gameData.npcs, baseContent.gameData.npcs, NPC.class, tmpJsonDataDir);
-				writeAltered(alteredContent.gameData.quests, baseContent.gameData.quests, Quest.class, tmpJsonDataDir);
-
-				File tmpMapDir = new File(tmpDir, TMXMapSet.DEFAULT_REL_PATH_IN_SOURCE);
-				tmpMapDir.mkdirs();
-				for (File createdMapFile : createdContent.gameMaps.mapFolder.listFiles()) {
-					FileUtils.copyFile(createdMapFile, new File(tmpMapDir, createdMapFile.getName()));
-				}
-				for (File alteredMapFile : alteredContent.gameMaps.mapFolder.listFiles()) {
-					FileUtils.copyFile(alteredMapFile, new File(tmpMapDir, alteredMapFile.getName()));
-				}
 				
-				
-				if (!createdContent.worldmap.isEmpty() || !alteredContent.worldmap.isEmpty()) {
-					try {
-						Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-						doc.setXmlVersion("1.0");
-						Element root = doc.createElement("worldmap");
-						doc.appendChild(root);
-
-						for (int i = 0; i < getWorldmapSegmentCount(); i++) {
-							root.appendChild(getWorldmapSegment(i).toXmlElement(doc));
-						}
-
-						Worldmap.saveDocToFile(doc, new File(tmpMapDir, "worldmap.xml"));
-					} catch (ParserConfigurationException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+				File tmpDir;
+				try {
+					tmpDir = exportProjectToTmpDir();
+					FileUtils.writeToZip(tmpDir, target);
+					FileUtils.deleteDir(tmpDir);					
+				} catch (IOException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
 				}
 
-				FileUtils.writeToZip(tmpDir, target);
-				FileUtils.deleteDir(tmpDir);
 				Notification.addSuccess("Project \""+name+"\" exported as "+target.getAbsolutePath());
 			}
+
+			
 		});
 	}
 	
-	@SuppressWarnings("rawtypes")
-	public void writeAltered(GameDataCategory<? extends JSONElement> altered, GameDataCategory<? extends JSONElement> source, Class<? extends JSONElement> gdeClass, File targetFolder) {
-		Set<String> alteredFileNames = new HashSet<String>();
-		Map<String, List<Map>> toWrite = new HashMap<String, List<Map>>();
-		for (JSONElement gde : altered) {
-			alteredFileNames.add(gde.jsonFile.getName());
+	public void exportProjectOverGameSource(final File target) {
+		WorkerDialog.showTaskMessage("Exporting project "+name+"...", ATContentStudio.frame, true, new Runnable() {
+			@Override
+			public void run() {
+				Notification.addInfo("Exporting project \""+name+"\" into "+target.getAbsolutePath());
+				
+				File tmpDir;
+				try {					
+					tmpDir = exportProjectToTmpDir();
+					FileUtils.copyOver(tmpDir, target);
+					FileUtils.deleteDir(tmpDir);					
+				} catch (IOException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+
+				Notification.addSuccess("Project \""+name+"\" exported into "+target.getAbsolutePath());
+			}
+
+			
+		});
+	}
+	
+	public File exportProjectToTmpDir() throws IOException {
+		File tmpDir = new File(baseFolder, "tmp");
+		FileUtils.deleteDir(tmpDir);
+		tmpDir.mkdir();
+		File tmpJsonDataDir = new File(tmpDir, GameDataSet.DEFAULT_REL_PATH_IN_SOURCE);
+		tmpJsonDataDir.mkdirs();
+
+//		for (File createdJsonFile : createdContent.gameData.baseFolder.listFiles()) {
+//			FileUtils.copyFile(createdJsonFile, new File(tmpJsonDataDir, createdJsonFile.getName()));
+//		}
+		Map<Class<? extends GameDataElement>, List<String>> writtenFilesPerDataType = new LinkedHashMap<Class<? extends GameDataElement>, List<String>>();
+		List<String> writtenFiles;
+		writtenFiles = writeDataDeltaForDataType(createdContent.gameData.actorConditions, alteredContent.gameData.actorConditions, baseContent.gameData.actorConditions, ActorCondition.class, tmpJsonDataDir);
+		writtenFilesPerDataType.put(ActorCondition.class, writtenFiles);
+		writtenFiles = writeDataDeltaForDataType(createdContent.gameData.dialogues, alteredContent.gameData.dialogues, baseContent.gameData.dialogues, Dialogue.class, tmpJsonDataDir);
+		writtenFilesPerDataType.put(Dialogue.class, writtenFiles);
+		writtenFiles = writeDataDeltaForDataType(createdContent.gameData.droplists, alteredContent.gameData.droplists, baseContent.gameData.droplists, Droplist.class, tmpJsonDataDir);
+		writtenFilesPerDataType.put(Droplist.class, writtenFiles);
+		writtenFiles = writeDataDeltaForDataType(createdContent.gameData.itemCategories, alteredContent.gameData.itemCategories, baseContent.gameData.itemCategories, ItemCategory.class, tmpJsonDataDir);
+		writtenFilesPerDataType.put(ItemCategory.class, writtenFiles);
+		writtenFiles = writeDataDeltaForDataType(createdContent.gameData.items, alteredContent.gameData.items, baseContent.gameData.items, Item.class, tmpJsonDataDir);
+		writtenFilesPerDataType.put(Item.class, writtenFiles);
+		writtenFiles = writeDataDeltaForDataType(createdContent.gameData.npcs, alteredContent.gameData.npcs, baseContent.gameData.npcs, NPC.class, tmpJsonDataDir);
+		writtenFilesPerDataType.put(NPC.class, writtenFiles);
+		writtenFiles = writeDataDeltaForDataType(createdContent.gameData.quests, alteredContent.gameData.quests, baseContent.gameData.quests, Quest.class, tmpJsonDataDir);
+		writtenFilesPerDataType.put(Quest.class, writtenFiles);
+
+		File tmpMapDir = new File(tmpDir, TMXMapSet.DEFAULT_REL_PATH_IN_SOURCE);
+		tmpMapDir.mkdirs();
+		writtenFiles = new LinkedList<String>();
+		for (File createdMapFile : createdContent.gameMaps.mapFolder.listFiles()) {
+			if (createdMapFile.getName().equalsIgnoreCase("worldmap.xml")) continue;
+			copyTmxConverted(createdMapFile.toPath(), Paths.get(tmpMapDir.getAbsolutePath(), createdMapFile.getName()));
+			writtenFiles.add(createdMapFile.getName());
 		}
-		for (String fName : alteredFileNames) {
+		for (File alteredMapFile : alteredContent.gameMaps.mapFolder.listFiles()) {
+			if (alteredMapFile.getName().equalsIgnoreCase("worldmap.xml")) continue;
+			copyTmxConverted(alteredMapFile.toPath(), Paths.get(tmpMapDir.getAbsolutePath(), alteredMapFile.getName()));
+			writtenFiles.add(alteredMapFile.getName());
+		}
+		writtenFilesPerDataType.put(TMXMap.class, writtenFiles);
+		
+		if (sourceSetToUse == ResourceSet.gameData) {
+			writeResourceListXml(writtenFilesPerDataType, GameSource.DEFAULT_REL_PATH_FOR_GAME_RESOURCE, baseContent.baseFolder, tmpDir);
+		} else if (sourceSetToUse == ResourceSet.debugData) {
+			writeResourceListXml(writtenFilesPerDataType, GameSource.DEFAULT_REL_PATH_FOR_DEBUG_RESOURCE, baseContent.baseFolder, tmpDir);
+		}
+		
+		
+		if (!createdContent.worldmap.isEmpty() || !alteredContent.worldmap.isEmpty()) {
+			try {
+				Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+				doc.setXmlVersion("1.0");
+				Element root = doc.createElement("worldmap");
+				doc.appendChild(root);
+
+				for (int i = 0; i < getWorldmapSegmentCount(); i++) {
+					root.appendChild(getWorldmapSegment(i).toXmlElement(doc));
+				}
+
+				Worldmap.saveDocToFile(doc, new File(tmpMapDir, "worldmap.xml"));
+			} catch (ParserConfigurationException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		
+		return tmpDir;
+	}
+	
+	private void copyTmxConverted(Path from, Path to) throws IOException {
+		String xml = new String(Files.readAllBytes(from), StandardCharsets.UTF_8);
+		xml = xml.replace("../../altered/spritesheets/", drawablePath);
+		xml = xml.replace("../../created/spritesheets/", drawablePath);
+		xml = xml.replace("../spritesheets/", drawablePath);
+		xml = xml.replace("../spritesheets/", drawablePath);
+		Files.write(to, xml.getBytes(StandardCharsets.UTF_8));
+	}
+
+
+	@SuppressWarnings("rawtypes")
+	public List<String> writeDataDeltaForDataType(GameDataCategory<? extends JSONElement> created, GameDataCategory<? extends JSONElement> altered, GameDataCategory<? extends JSONElement> source, Class<? extends JSONElement> gdeClass, File targetFolder) {
+		List<String> filenamesToWrite = new LinkedList<String>();
+		Map<String, List<Map>> dataToWritePerFilename = new LinkedHashMap<String, List<Map>>();
+		for (JSONElement gde : altered) {
+			if (!filenamesToWrite.contains(gde.jsonFile.getName())) {
+				filenamesToWrite.add(gde.jsonFile.getName());
+			}
+		}
+		for (JSONElement gde : created) {
+			if (!filenamesToWrite.contains(gde.jsonFile.getName())) {
+				filenamesToWrite.add(gde.jsonFile.getName());
+			}
+		}
+		for (String fName : filenamesToWrite) {
 			for (JSONElement gde : source) {
 				if (gde.jsonFile.getName().equals(fName)) {
-					if (toWrite.get(fName) == null) {
-						toWrite.put(fName, new ArrayList<Map>());
+					if (dataToWritePerFilename.get(fName) == null) {
+						dataToWritePerFilename.put(fName, new ArrayList<Map>());
 					}
-					toWrite.get(fName).add(getGameDataElement(gdeClass, gde.id).toJson());
+					//Automatically fetches altered element over source element.
+					dataToWritePerFilename.get(fName).add(getGameDataElement(gdeClass, gde.id).toJson());
+				}
+			}
+			for (JSONElement gde : created) {
+				if (gde.jsonFile.getName().equals(fName)) {
+					if (dataToWritePerFilename.get(fName) == null) {
+						dataToWritePerFilename.put(fName, new ArrayList<Map>());
+					}
+					//Add the created elements.
+					dataToWritePerFilename.get(fName).add(getGameDataElement(gdeClass, gde.id).toJson());
 				}
 			}
 		}
-		for (String fName : toWrite.keySet()) {
+		for (String fName : dataToWritePerFilename.keySet()) {
 			File jsonFile = new File(targetFolder, fName);
 			StringWriter writer = new JsonPrettyWriter();
 			try {
-				JSONArray.writeJSONString(toWrite.get(fName), writer);
+				JSONArray.writeJSONString(dataToWritePerFilename.get(fName), writer);
 			} catch (IOException e) {
 				//Impossible with a StringWriter
 			}
@@ -1029,8 +1258,146 @@ public class Project implements ProjectTreeNode, Serializable {
 				e.printStackTrace();
 			}
 		}
+		return filenamesToWrite;
 	}
 
+	
+	private void writeResourceListXml(Map<Class<? extends GameDataElement>, List<String>> writtenFilesPerDataType, String xmlFileRelPath, File baseFolder, File tmpDir) {
+		File xmlFile =  new File(baseFolder, xmlFileRelPath);
+		File outputFile = new File(tmpDir, xmlFileRelPath);
+
+		Map<String, Class<? extends GameDataElement>> classNamesByArrayNames = new HashMap<String, Class<? extends GameDataElement>>();
+		classNamesByArrayNames.put("loadresource_itemcategories", ItemCategory.class);
+		classNamesByArrayNames.put("loadresource_actorconditions", ActorCondition.class);
+		classNamesByArrayNames.put("loadresource_items", Item.class);
+		classNamesByArrayNames.put("loadresource_droplists", Droplist.class);
+		classNamesByArrayNames.put("loadresource_quests", Quest.class);
+		classNamesByArrayNames.put("loadresource_conversationlists", Dialogue.class);
+		classNamesByArrayNames.put("loadresource_monsters", NPC.class);
+		classNamesByArrayNames.put("loadresource_maps", TMXMap.class);
+		
+		String jsonResPrefix = "@raw/";
+		String tmxResPrefix = "@xml/";
+		String jsonFileSuffix = ".json";
+		String tmxFileSuffix = ".tmx";
+		
+		if (!xmlFile.exists()) return;
+		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+		Document doc;
+		try {
+			factory.setIgnoringElementContentWhitespace(true);
+			factory.setExpandEntityReferences(false);
+			DocumentBuilder builder = factory.newDocumentBuilder();
+			
+			InputSource insrc = new InputSource(new FileInputStream(xmlFile));
+			insrc.setEncoding("UTF-8");
+			doc = builder.parse(insrc);
+
+			Element arrayNode;
+			String name, resPrefix, fileSuffix, resName, resToFile, fileToRes;
+			Class<? extends GameDataElement> clazz;
+			List<String> writtenFiles;
+
+			Element root = (Element) doc.getElementsByTagName("resources").item(0);
+			if (root != null) {
+				NodeList arraysList = root.getElementsByTagName("array");
+				if (arraysList != null) {
+					for (int i = 0; i < arraysList.getLength(); i++) {
+						arrayNode = (Element) arraysList.item(i);
+						name = arrayNode.getAttribute("name");
+						clazz = classNamesByArrayNames.get(name);
+						if (clazz == null) continue;
+						writtenFiles = writtenFilesPerDataType.get(clazz);
+						if (writtenFiles == null) continue;
+						if (clazz == TMXMap.class) {
+							resPrefix = tmxResPrefix;
+							fileSuffix = tmxFileSuffix;
+						} else {
+							resPrefix = jsonResPrefix;
+							fileSuffix = jsonFileSuffix;
+						}
+						NodeList arrayItems = arrayNode.getElementsByTagName("item");
+						if (arrayItems != null) {
+							for (int j = 0; j < arrayItems.getLength(); j++) {
+								resName = ((Element)arrayItems.item(j)).getTextContent();
+								if (resName == null) continue;
+								resToFile = resName.replaceFirst("\\A"+resPrefix, "")+fileSuffix;
+								writtenFiles.remove(resToFile);
+							}
+						}
+						if (!writtenFiles.isEmpty()) {
+							Comment com = doc.createComment("Added by ATCS "+ATContentStudio.APP_VERSION+" for project "+getProject().name);
+							arrayNode.appendChild(com);
+							Collections.sort(writtenFiles);
+							for (String missingRes : writtenFiles) {
+								Element item = doc.createElement("item");
+								fileToRes = resPrefix+missingRes.replaceFirst(fileSuffix+"\\z", "");
+								item.setTextContent(fileToRes);
+								arrayNode.appendChild(item);
+							}
+						}
+					}
+				}
+			}
+			
+			Transformer transformer = TransformerFactory.newInstance().newTransformer();
+			if (!outputFile.getParentFile().exists()) {
+				outputFile.getParentFile().mkdirs();
+			}
+			StringWriter temp = new StringWriter();
+			Result output = new StreamResult(temp);
+			Source input = new DOMSource(doc);
+			transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+			transformer.setOutputProperty(OutputKeys.METHOD, "xml");
+			transformer.transform(input, output);
+			
+			String tempString = temp.toString();
+			doc = builder.parse(new ByteArrayInputStream(tempString.getBytes("UTF-8")));
+			input = new DOMSource(doc);
+			transformer = TransformerFactory.newInstance().newTransformer(new StreamSource(new StringReader(
+					"<?xml version=\"1.0\"?>\r\n" + 
+					"<xsl:stylesheet version=\"1.0\"\r\n" + 
+					"                xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\">\r\n" + 
+					"  <xsl:strip-space elements=\"*\" />\r\n" + 
+					"  <xsl:output method=\"xml\" indent=\"yes\" />\r\n" + 
+					"\r\n" + 
+					"  <xsl:template match=\"node() | @*\" name=\"identity\">\r\n" + 
+					"    <xsl:copy>\r\n" + 
+					"      <xsl:apply-templates select=\"node() | @*\" />\r\n" + 
+					"    </xsl:copy>\r\n" + 
+					"  </xsl:template>\r\n" + 
+					"\r\n" + 
+					"  <xsl:template match=\"array\">\r\n" + 
+					"    <xsl:call-template name=\"identity\"/>\r\n" + 
+					"    <xsl:text>&#xA;&#xA;&#x20;&#x20;&#x20;&#x20;</xsl:text>\r\n" + 
+					"  </xsl:template>\r\n" + 
+					"</xsl:stylesheet>")));
+			output = new StreamResult(new FileOutputStream(outputFile));
+			transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+			transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
+			transformer.transform(input, output);
+			
+			
+		} catch (SAXException e) {
+			e.printStackTrace();
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+		} catch (ParserConfigurationException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		} catch (TransformerException e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public boolean needsSaving() {
+		for (ProjectTreeNode node : v.getNonEmptyIterable()) {
+			if (node.needsSaving()) return true;
+		}
+		return false;
+	}
 
 	
 

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

@@ -53,5 +53,7 @@ public interface ProjectTreeNode extends TreeNode {
 	public GameSource.Type getDataType();
 	
 	public boolean isEmpty();
+	
+	public boolean needsSaving();
 
 }

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

@@ -4,6 +4,7 @@ import java.awt.Image;
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -21,50 +22,54 @@ import com.gpl.rpg.atcontentstudio.Notification;
 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.WorkerDialog;
 import com.gpl.rpg.atcontentstudio.ui.ProjectsTree.ProjectsTreeModel;
+import com.gpl.rpg.atcontentstudio.ui.WorkerDialog;
 
 public class Workspace implements ProjectTreeNode, Serializable {
-	
+
 	private static final long serialVersionUID = 7938633033601384956L;
 
 	public static final String WS_SETTINGS_FILE = ".workspace";
-	
+
 	public static Workspace activeWorkspace;
-	
+
 	public Preferences preferences = new Preferences();
 	public File baseFolder;
 	public File settingsFile;
+	public transient WorkspaceSettings settings;
 	public transient List<ProjectTreeNode> projects = new ArrayList<ProjectTreeNode>();
 	public Set<String> projectsName = new HashSet<String>();
 	public Map<String, Boolean> projectsOpenByName = new HashMap<String, Boolean>();
 	public Set<File> knownMapSourcesFolders = new HashSet<File>();
-	
+
 	public transient ProjectsTreeModel projectsTreeModel = null;
-	
+
 	public Workspace(File workspaceRoot) {
 		baseFolder = workspaceRoot;
 		if (!workspaceRoot.exists()) {
 			try {
 				workspaceRoot.mkdir();
 			} catch (SecurityException e) {
-				Notification.addError("Error creating workspace directory: "+e.getMessage());
+				Notification.addError("Error creating workspace directory: "
+						+ e.getMessage());
 				e.printStackTrace();
 			}
 		}
+		settings = new WorkspaceSettings(this);
 		settingsFile = new File(workspaceRoot, WS_SETTINGS_FILE);
 		if (!settingsFile.exists()) {
 			try {
 				settingsFile.createNewFile();
 			} catch (IOException e) {
-				Notification.addError("Error creating workspace datafile: "+e.getMessage());
+				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();
 	}
-	
 
 	public static void setActive(File workspaceRoot) {
 		Workspace w = null;
@@ -81,12 +86,13 @@ public class Workspace implements ProjectTreeNode, Serializable {
 		}
 		activeWorkspace = w;
 	}
-	
+
 	public static void saveActive() {
 		activeWorkspace.save();
 	}
-	
+
 	public void save() {
+		settings.save();
 		SettingsSave.saveInstance(this, settingsFile, "Workspace");
 	}
 
@@ -94,82 +100,111 @@ public class Workspace implements ProjectTreeNode, Serializable {
 	public Enumeration<ProjectTreeNode> children() {
 		return Collections.enumeration(projects);
 	}
+
 	@Override
 	public boolean getAllowsChildren() {
 		return true;
 	}
+
 	@Override
 	public TreeNode getChildAt(int arg0) {
 		return projects.get(arg0);
 	}
+
 	@Override
 	public int getChildCount() {
 		return projects.size();
 	}
+
 	@Override
 	public int getIndex(TreeNode arg0) {
 		return projects.indexOf(arg0);
 	}
+
 	@Override
 	public TreeNode getParent() {
 		return null;
 	}
+
 	@Override
 	public boolean isLeaf() {
 		return false;
 	}
+
 	@Override
 	public void childrenAdded(List<ProjectTreeNode> path) {
 		path.add(0, this);
-		if (projectsTreeModel != null) projectsTreeModel.insertNode(new TreePath(path.toArray()));
+		if (projectsTreeModel != null)
+			projectsTreeModel.insertNode(new TreePath(path.toArray()));
 	}
+
 	@Override
 	public void childrenChanged(List<ProjectTreeNode> path) {
 		path.add(0, this);
-		if (projectsTreeModel != null) projectsTreeModel.changeNode(new TreePath(path.toArray()));
+		ProjectTreeNode last = path.get(path.size() - 1);
+		if (projectsTreeModel != null) {
+			while (path.size() > 1) {
+				projectsTreeModel.changeNode(new TreePath(path.toArray()));
+				path.remove(path.size()-1);
+			}
+			
+		}
+		ATContentStudio.frame.editorChanged(last);
 	}
+
 	@Override
 	public void childrenRemoved(List<ProjectTreeNode> path) {
 		path.add(0, this);
-		if (projectsTreeModel != null) projectsTreeModel.removeNode(new TreePath(path.toArray()));
+		if (projectsTreeModel != null)
+			projectsTreeModel.removeNode(new TreePath(path.toArray()));
 	}
+
 	@Override
 	public void notifyCreated() {
 		childrenAdded(new ArrayList<ProjectTreeNode>());
 		for (ProjectTreeNode node : projects) {
-			if (node != null) node.notifyCreated();
+			if (node != null)
+				node.notifyCreated();
 		}
 	}
+
 	@Override
 	public String getDesc() {
-		return "Workspace: "+baseFolder.getAbsolutePath();
+		return "Workspace: " + baseFolder.getAbsolutePath();
 	}
 
-
-	public static void createProject(final String projectName, final File gameSourceFolder, final Project.ResourceSet sourceSet) {
-		WorkerDialog.showTaskMessage("Creating project "+projectName+"...", ATContentStudio.frame, new Runnable() {
-			@Override
-			public void run() {
-				if (activeWorkspace.projectsName.contains(projectName)) {
-					Notification.addError("A project named "+projectName+" already exists in this workspace.");
-					return;
-				}
-				Project p = new Project(activeWorkspace, projectName, gameSourceFolder, sourceSet);
-				activeWorkspace.projects.add(p);
-				activeWorkspace.projectsName.add(projectName);
-				activeWorkspace.projectsOpenByName.put(projectName, p.open);
-				activeWorkspace.knownMapSourcesFolders.add(gameSourceFolder);
-				p.notifyCreated();
-				Notification.addSuccess("Project "+projectName+" successfully created");
-				saveActive();
-			}
-		});
+	public static void createProject(final String projectName,
+			final File gameSourceFolder, final Project.ResourceSet sourceSet) {
+		WorkerDialog.showTaskMessage("Creating project " + projectName + "...",
+				ATContentStudio.frame, new Runnable() {
+					@Override
+					public void run() {
+						if (activeWorkspace.projectsName.contains(projectName)) {
+							Notification.addError("A project named "
+									+ projectName
+									+ " already exists in this workspace.");
+							return;
+						}
+						Project p = new Project(activeWorkspace, projectName,
+								gameSourceFolder, sourceSet);
+						activeWorkspace.projects.add(p);
+						activeWorkspace.projectsName.add(projectName);
+						activeWorkspace.projectsOpenByName.put(projectName,
+								p.open);
+						activeWorkspace.knownMapSourcesFolders
+								.add(gameSourceFolder);
+						p.notifyCreated();
+						Notification.addSuccess("Project " + projectName
+								+ " successfully created");
+						saveActive();
+					}
+				});
 	}
-	
+
 	public static void closeProject(Project p) {
 		int index = activeWorkspace.projects.indexOf(p);
 		if (index < 0) {
-			Notification.addError("Cannot close unknown project "+p.name);
+			Notification.addError("Cannot close unknown project " + p.name);
 			return;
 		}
 		p.close();
@@ -179,28 +214,33 @@ public class Workspace implements ProjectTreeNode, Serializable {
 		cp.notifyCreated();
 		saveActive();
 	}
-	
+
 	public static void openProject(final ClosedProject cp) {
-		WorkerDialog.showTaskMessage("Opening project "+cp.name+"...", ATContentStudio.frame, new Runnable() {
-			@Override
-			public void run() {
-				int index = activeWorkspace.projects.indexOf(cp);
-				if (index < 0) {
-					Notification.addError("Cannot open unknown project "+cp.name);
-					return;
-				}
-				cp.childrenRemoved(new ArrayList<ProjectTreeNode>());
-				Project p = Project.fromFolder(activeWorkspace, new File(activeWorkspace.baseFolder, cp.name));
-				p.open();
-				activeWorkspace.projects.set(index, p);
-				activeWorkspace.projectsOpenByName.put(p.name, true);
-				p.notifyCreated();
-				saveActive();
-			}
-		});
+		WorkerDialog.showTaskMessage("Opening project " + cp.name + "...",
+				ATContentStudio.frame, new Runnable() {
+					@Override
+					public void run() {
+						int index = activeWorkspace.projects.indexOf(cp);
+						if (index < 0) {
+							Notification
+									.addError("Cannot open unknown project "
+											+ cp.name);
+							return;
+						}
+						cp.childrenRemoved(new ArrayList<ProjectTreeNode>());
+						Project p = Project.fromFolder(activeWorkspace,
+								new File(activeWorkspace.baseFolder, cp.name));
+						p.open();
+						activeWorkspace.projects.set(index, p);
+						activeWorkspace.projectsOpenByName.put(p.name, true);
+						p.notifyCreated();
+						saveActive();
+					}
+				});
 	}
-	
+
 	public void refreshTransients() {
+		this.settings = new WorkspaceSettings(this);
 		this.projects = new ArrayList<ProjectTreeNode>();
 		Set<String> projectsFailed = new HashSet<String>();
 		for (String projectName : projectsName) {
@@ -211,11 +251,16 @@ public class Workspace implements ProjectTreeNode, Serializable {
 					if (p != null) {
 						projects.add(p);
 					} else {
-						Notification.addError("Failed to open project "+projectName+". Removing it from workspace (not from filesystem though).");
+						Notification
+								.addError("Failed to open project "
+										+ projectName
+										+ ". Removing it from workspace (not from filesystem though).");
 						projectsFailed.add(projectName);
 					}
 				} else {
-					Notification.addError("Unable to find project "+projectName+"'s root folder. Removing it from workspace");
+					Notification.addError("Unable to find project "
+							+ projectName
+							+ "'s root folder. Removing it from workspace");
 					projectsFailed.add(projectName);
 				}
 			} else {
@@ -228,21 +273,31 @@ public class Workspace implements ProjectTreeNode, Serializable {
 		}
 		notifyCreated();
 	}
-	
+
 	@Override
 	public Project getProject() {
 		return null;
 	}
-	
-	@Override
-	public Image getIcon() {return null;}
-	@Override
-	public Image getClosedIcon() {return null;}
-	@Override
-	public Image getLeafIcon() {return null;}
-	@Override
-	public Image getOpenIcon() {return null;}
 
+	@Override
+	public Image getIcon() {
+		return null;
+	}
+
+	@Override
+	public Image getClosedIcon() {
+		return null;
+	}
+
+	@Override
+	public Image getLeafIcon() {
+		return null;
+	}
+
+	@Override
+	public Image getOpenIcon() {
+		return null;
+	}
 
 	public static void deleteProject(ClosedProject cp) {
 		cp.childrenRemoved(new ArrayList<ProjectTreeNode>());
@@ -250,37 +305,43 @@ public class Workspace implements ProjectTreeNode, Serializable {
 		activeWorkspace.projectsOpenByName.remove(cp.name);
 		activeWorkspace.projectsName.remove(cp.name);
 		if (delete(new File(activeWorkspace.baseFolder, cp.name))) {
-			Notification.addSuccess("Closed project "+cp.name+" successfully deleted.");
+			Notification.addSuccess("Closed project " + cp.name
+					+ " successfully deleted.");
 		} else {
-			Notification.addError("Error while deleting closed project "+cp.name+". Files may remain in the workspace.");
+			Notification.addError("Error while deleting closed project "
+					+ cp.name + ". Files may remain in the workspace.");
 		}
 		cp = null;
 		saveActive();
 	}
-	
+
 	public static void deleteProject(Project p) {
 		p.childrenRemoved(new ArrayList<ProjectTreeNode>());
 		activeWorkspace.projects.remove(p);
 		activeWorkspace.projectsOpenByName.remove(p.name);
 		activeWorkspace.projectsName.remove(p.name);
 		if (delete(p.baseFolder)) {
-			Notification.addSuccess("Project "+p.name+" successfully deleted.");
+			Notification.addSuccess("Project " + p.name
+					+ " successfully deleted.");
 		} else {
-			Notification.addError("Error while deleting project "+p.name+". Files may remain in the workspace.");
+			Notification.addError("Error while deleting project " + p.name
+					+ ". Files may remain in the workspace.");
 		}
 		p = null;
 		saveActive();
 	}
-	
+
 	private static boolean delete(File f) {
 		boolean b = true;
-		if (f.isDirectory()) {
+		if (Files.isSymbolicLink(f.toPath())) {
+			b &= f.delete();
+		} else if (f.isDirectory()) {
 			for (File c : f.listFiles())
 				b &= delete(c);
 		}
-		return b&= f.delete();
+		return b &= f.delete();
 	}
-	
+
 	@Override
 	public GameDataSet getDataSet() {
 		return null;
@@ -290,11 +351,19 @@ public class Workspace implements ProjectTreeNode, Serializable {
 	public Type getDataType() {
 		return null;
 	}
-	
+
 	@Override
 	public boolean isEmpty() {
 		return projects.isEmpty();
 	}
+	
 
+	@Override
+	public boolean needsSaving() {
+		for (ProjectTreeNode node : projects) {
+			if (node.needsSaving()) return true;
+		}
+		return false;
+	}
 
 }

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

@@ -0,0 +1,220 @@
+package com.gpl.rpg.atcontentstudio.model;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+
+import com.gpl.rpg.atcontentstudio.Notification;
+import com.gpl.rpg.atcontentstudio.io.JsonPrettyWriter;
+
+public class WorkspaceSettings {
+	
+	public static final String VERSION_KEY = "ATCS_Version";
+	public static final String FILENAME = "workspace_settings.json";
+	
+	public static final int SETTINGS_VERSION = 1;
+
+	public Workspace parent;
+	public File file;
+	
+	public static Boolean DEFAULT_USE_SYS_MAP_EDITOR = true;
+	public Setting<Boolean> useSystemDefaultMapEditor = new PrimitiveSetting<Boolean>("useSystemDefaultMapEditor", DEFAULT_USE_SYS_MAP_EDITOR);
+	public static String DEFAULT_MAP_EDITOR_COMMAND = "tiled";
+	public Setting<String> mapEditorCommand = new PrimitiveSetting<String>("mapEditorCommand", DEFAULT_MAP_EDITOR_COMMAND);
+	
+	public static Boolean DEFAULT_USE_SYS_IMG_VIEWER = true;
+	public Setting<Boolean> useSystemDefaultImageViewer = new PrimitiveSetting<Boolean>("useSystemDefaultImageViewer", DEFAULT_USE_SYS_IMG_VIEWER);
+	public static Boolean DEFAULT_USE_SYS_IMG_EDITOR = false;
+	public Setting<Boolean> useSystemDefaultImageEditor = new PrimitiveSetting<Boolean>("useSystemDefaultImageEditor", DEFAULT_USE_SYS_IMG_EDITOR);
+	public static String DEFAULT_IMG_EDITOR_COMMAND = "gimp";
+	public Setting<String> imageEditorCommand = new PrimitiveSetting<String>("imageEditorCommand", DEFAULT_IMG_EDITOR_COMMAND);
+
+	public static String[] LANGUAGE_LIST = new String[]{null, "de", "ru", "pl", "fr", "it", "es", "nl", "uk", "ca", "sv", "pt", "pt_BR", "zh_Hant", "zh_Hans", "ja", "cs", "tr", "ko", "hu", "sl", "bg", "id", "fi", "th", "gl", "ms" ,"pa", "az", "nb"};
+	public Setting<String> translatorLanguage = new NullDefaultPrimitiveSetting<String>("translatorLanguage");
+	public static Boolean DEFAULT_ALLOW_INTERNET = true;
+	public Setting<Boolean> useInternet = new PrimitiveSetting<Boolean>("useInternet", DEFAULT_ALLOW_INTERNET);
+	public static Boolean DEFAULT_CHECK_UPDATE = true;
+	public Setting<Boolean> checkUpdates = new PrimitiveSetting<Boolean>("checkUpdates", DEFAULT_CHECK_UPDATE);
+	
+
+	public List<Setting<? extends Object>> settings = new ArrayList<Setting<? extends Object>>();
+	
+	public WorkspaceSettings(Workspace parent) {
+		this.parent = parent;
+		settings.add(useSystemDefaultMapEditor);
+		settings.add(mapEditorCommand);
+		settings.add(useSystemDefaultImageViewer);
+		settings.add(useSystemDefaultImageEditor);
+		settings.add(imageEditorCommand);
+		settings.add(translatorLanguage);
+		settings.add(useInternet);
+		settings.add(checkUpdates);
+		file = new File(parent.baseFolder, FILENAME);
+		if (file.exists()) {
+			load(file);
+		}
+	}
+	
+	public void load(File f) {
+		JSONParser parser = new JSONParser();
+		FileReader reader = null;
+		try {
+			reader = new FileReader(f);
+			@SuppressWarnings("rawtypes")
+			Map jsonSettings = (Map) parser.parse(reader);
+			Integer version = ((Number) jsonSettings.get(VERSION_KEY)).intValue();
+			if (version != null) {
+				if (version >= 1) {
+					loadv1(jsonSettings);
+				}
+			}
+			
+		} catch (Exception e) {
+			Notification.addError("Error while parsing workspace settings: "+e.getMessage());
+			e.printStackTrace();
+		} finally {
+			if (reader != null)
+				try {
+					reader.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+		}
+	}
+	
+	@SuppressWarnings("rawtypes")
+	private void loadv1(Map jsonSettings) {
+		for (Setting s : settings) {
+			s.readFromJson(jsonSettings);
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	public void save() {
+		@SuppressWarnings("rawtypes")
+		Map json = new LinkedHashMap();
+		for (Setting<? extends Object> s : settings) {
+			s.saveToJson(json);
+		}
+		
+		if (json.isEmpty()) {
+			//Everything is default.
+			file.delete();
+			return;
+		}
+
+		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();
+		}
+	}
+	
+	public void resetDefault() {
+		for (Setting<? extends Object> s : settings) {
+			s.resetDefault();
+		}
+	}
+	
+	public abstract class Setting<X extends Object> {
+
+		public String id;
+		public X value, defaultValue;
+		
+		public void setCurrentValue(X value) {
+			this.value = value;
+		}
+		
+		public X getCurrentValue() {
+			return value;
+		}
+		
+		public X getDefaultValue() {
+			return defaultValue;
+		}
+		
+		public void resetDefault() {
+			value = defaultValue;
+		}
+		
+		public abstract void readFromJson(@SuppressWarnings("rawtypes") Map json);
+		
+		@SuppressWarnings({ "rawtypes", "unchecked" })
+		public void saveToJson(Map json) {
+			if (!defaultValue.equals(value)) json.put(id, value);
+		}
+	}
+	
+	public class PrimitiveSetting<X extends Object> extends Setting<X> {
+		
+		
+		public PrimitiveSetting(String id, X defaultValue) {
+			this.id = id;
+			this.value = this.defaultValue = defaultValue;
+		}
+		
+		@SuppressWarnings({ "rawtypes", "unchecked" })
+		public void readFromJson(Map json) {
+			if (json.get(id) != null) value = (X)json.get(id);
+		}
+		
+		
+	}
+	
+	public class NullDefaultPrimitiveSetting<X extends Object> extends PrimitiveSetting<X> {
+		
+		public NullDefaultPrimitiveSetting(String id) {
+			super(id, null);
+		}
+		
+		@SuppressWarnings({ "unchecked", "rawtypes" })
+		@Override
+		public void saveToJson(Map json) {
+			if (value != null) json.put(id,  value);
+		}
+	}
+	
+	public class ListSetting<X extends Object> extends Setting<List<X>> {
+
+		public ListSetting(String id, List<X> defaultValue) {
+			this.id = id;
+			this.value = this.defaultValue = defaultValue;
+		}
+		
+		@SuppressWarnings({ "rawtypes", "unchecked" })
+		@Override
+		public void readFromJson(Map json) {
+			value = new ArrayList<X>();
+			if (json.get(id) != null) {
+				for (Object o : ((List)json.get(id))) {
+					value.add((X)o);
+				}
+			}
+		}
+		
+	}
+	
+	
+
+}

src/com/gpl/rpg/atcontentstudio/model/bookmarks/BookmarkEntry.java

@@ -0,0 +1,155 @@
+package com.gpl.rpg.atcontentstudio.model.bookmarks;
+
+import java.awt.Image;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+
+import javax.swing.tree.TreeNode;
+
+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.gamedata.GameDataSet;
+import com.gpl.rpg.atcontentstudio.model.gamedata.Quest;
+import com.gpl.rpg.atcontentstudio.model.gamedata.QuestStage;
+
+public class BookmarkEntry implements BookmarkNode {
+
+	public GameDataElement bookmarkedElement;
+	public BookmarkFolder parent;
+	
+	public BookmarkEntry(BookmarkFolder parent, GameDataElement target) {
+		this.parent = parent;
+		this.bookmarkedElement = target;
+		target.bookmark = this;
+		parent.contents.add(this);
+	}
+	
+	@Override
+	public Enumeration<ProjectTreeNode> children() {
+		return null;
+	}
+
+	@Override
+	public boolean getAllowsChildren() {
+		return false;
+	}
+
+	@Override
+	public TreeNode getChildAt(int childIndex) {
+		return null;
+	}
+
+	@Override
+	public int getChildCount() {
+		return 0;
+	}
+
+	@Override
+	public int getIndex(TreeNode node) {
+		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() {
+		if (bookmarkedElement instanceof QuestStage) {
+			String text = ((GameDataElement)bookmarkedElement).getDesc();
+			if (text.length() > 60) {
+				text = text.substring(0, 57)+"...";
+			}
+			return ((GameDataElement)bookmarkedElement).getDataType().toString()+"/"+((Quest)((QuestStage)bookmarkedElement).parent).id+"#"+((QuestStage)bookmarkedElement).progress+":"+text;
+		} else {
+			return ((GameDataElement)bookmarkedElement).getDataType().toString()+"/"+((GameDataElement)bookmarkedElement).getDesc();
+		}
+	}
+
+	@Override
+	public Project getProject() {
+		return parent.getProject();
+	}
+
+	@Override
+	public GameDataSet getDataSet() {
+		return null;
+	}
+
+	@Override
+	public Image getIcon() {
+		return bookmarkedElement.getIcon();
+	}
+
+	@Override
+	public Image getOpenIcon() {
+		return null;
+	}
+
+	@Override
+	public Image getClosedIcon() {
+		return null;
+	}
+
+	@Override
+	public Image getLeafIcon() {
+		return getIcon();
+	}
+
+	@Override
+	public Type getDataType() {
+		return null;
+	}
+
+	@Override
+	public boolean isEmpty() {
+		return true;
+	}
+
+	@Override
+	public boolean needsSaving() {
+		return false;
+	}
+	
+	public void delete() {
+		bookmarkedElement.bookmark = null;
+		parent.delete(this);
+	}
+	
+	@Override
+	public void save() {
+		parent.save();
+	}
+
+}

src/com/gpl/rpg/atcontentstudio/model/bookmarks/BookmarkFolder.java

@@ -0,0 +1,168 @@
+package com.gpl.rpg.atcontentstudio.model.bookmarks;
+
+import java.awt.Image;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.swing.tree.TreeNode;
+
+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;
+
+public class BookmarkFolder implements BookmarkNode {
+
+	List<BookmarkNode> contents = new LinkedList<BookmarkNode>();
+	BookmarkNode parent;
+	String name;
+	Image closedIcon, openIcon;
+
+	public BookmarkFolder(BookmarkNode parent, String name) {
+		this(parent, name, DefaultIcons.getStdClosedIcon(), DefaultIcons.getStdOpenIcon());
+	}
+	
+	public BookmarkFolder(BookmarkNode parent, String name, Image closedIcon, Image openIcon) {
+		this.parent = parent;
+		this.name = name;
+		this.closedIcon = closedIcon;
+		this.openIcon = openIcon;
+	}
+	
+	@Override
+	public Enumeration<? extends ProjectTreeNode> children() {
+		return Collections.enumeration(contents);
+	}
+
+	@Override
+	public boolean getAllowsChildren() {
+		return true;
+	}
+
+	@Override
+	public TreeNode getChildAt(int childIndex) {
+		return contents.get(childIndex);
+	}
+
+	@Override
+	public int getChildCount() {
+		return contents.size();
+	}
+
+	@Override
+	public int getIndex(TreeNode node) {
+		return contents.indexOf(node);
+	}
+
+	@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>());
+	}
+
+	@Override
+	public String getDesc() {
+		return name;
+	}
+
+	@Override
+	public Project getProject() {
+		return parent.getProject();
+	}
+
+	@Override
+	public GameDataSet getDataSet() {
+		return null;
+	}
+
+	@Override
+	public Image getIcon() {
+		return getClosedIcon();
+	}
+
+	@Override
+	public Image getOpenIcon() {
+		return openIcon;
+	}
+
+	@Override
+	public Image getClosedIcon() {
+		return closedIcon;
+	}
+
+	@Override
+	public Image getLeafIcon() {
+		return getClosedIcon();
+	}
+
+	@Override
+	public Type getDataType() {
+		return null;
+	}
+
+	@Override
+	public boolean isEmpty() {
+		return contents.isEmpty();
+	}
+
+	@Override
+	public boolean needsSaving() {
+		return false;
+	}
+
+	public void delete(BookmarkEntry bookmarkEntry) {
+		if (contents.contains(bookmarkEntry)) {
+			bookmarkEntry.childrenRemoved(new ArrayList<ProjectTreeNode>());
+			contents.remove(bookmarkEntry);
+			save();
+		}
+	}
+	
+	public void delete(BookmarkFolder bookmarkFolder) {
+		// TODO Auto-generated method stub
+		
+	}
+	
+	public void save() {
+		parent.save();
+	}
+	
+	public void delete() {
+		
+	}
+
+}

src/com/gpl/rpg/atcontentstudio/model/bookmarks/BookmarkNode.java

@@ -0,0 +1,10 @@
+package com.gpl.rpg.atcontentstudio.model.bookmarks;
+
+import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
+
+public interface BookmarkNode extends ProjectTreeNode{
+
+	public void save();
+	public void delete();
+	
+}