Merge branch 'master' into texture-panning

DelvEdit/build.gradle

@@ -1,10 +1,10 @@
 apply plugin: "java"
 
-sourceCompatibility = 1.6
+sourceCompatibility = 1.8
 sourceSets.main.java.srcDirs = [ "src/" ]
 
 project.ext.mainClassName = "com.interrupt.dungeoneer.EditorStarter"
-project.ext.assetsDir = new File("../Dungeoneer/assets");
+project.ext.assetsDir = new File("../Dungeoneer/assets")
 
 task run(dependsOn: classes, type: JavaExec) {
     main = project.mainClassName
@@ -14,33 +14,25 @@ task run(dependsOn: classes, type: JavaExec) {
     ignoreExitValue = true
 }
 
+task debug(dependsOn: classes, type: JavaExec) {
+    main = project.mainClassName
+    classpath = sourceSets.main.runtimeClasspath
+    standardInput = System.in
+    workingDir = project.assetsDir
+    ignoreExitValue = true
+    debug = true
+}
+
 task dist(type: Jar) {
-    from files(sourceSets.main.output.classesDir)
-    from files(sourceSets.main.output.resourcesDir)
-    from {configurations.compile.collect {zipTree(it)}}
-    from files(project.assetsDir);
-
     manifest {
         attributes 'Main-Class': project.mainClassName
     }
-}
-
-dist.dependsOn classes
-
-eclipse {
-    project {
-        name = appName + "-editor"
-        linkedResource name: 'assets', type: '2', location: 'PARENT-1-PROJECT_LOC/Dungeoneer/assets'
+    dependsOn configurations.runtimeClasspath
+    from {
+        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
     }
+    from files(project.assetsDir)
+    with jar
 }
 
-task afterEclipseImport(description: "Post processing after project generation", group: "IDE") {
-  doLast {
-    def classpath = new XmlParser().parse(file(".classpath"))
-    new Node(classpath, "classpathentry", [ kind: 'src', path: 'assets' ]);
-    def writer = new FileWriter(file(".classpath"))
-    def printer = new XmlNodePrinter(new PrintWriter(writer))
-    printer.setPreserveWhitespace(true)
-    printer.print(classpath)
-  }
-}
+dist.dependsOn classes

DelvEdit/src/com/interrupt/dungeoneer/EditorStarter.java

@@ -9,7 +9,7 @@
 public class EditorStarter {
 	public static void main(String[] args) {
         System.setProperty("com.apple.mrj.application.apple.menu.about.name", "DelvEdit");
-        new Editor();
+        Editor.init();
 
         // Start the null steam API
         SteamApi.api = new NullSteamApi();