Refactoring

.classpath

@@ -1,14 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="lib" path="lib/JGoogleAnalytics_0.4.jar"/>
-	<classpathentry kind="lib" path="lib/JNBT_1.3.jar"/>
-	<classpathentry kind="lib" path="lib/gson-2.2.4.jar"/>
-	<classpathentry kind="lib" path="lib/miglayout-4.0-swing.jar"/>
-	<classpathentry kind="lib" path="lib/args4j-2.0.21.jar"/>
-	<classpathentry kind="lib" path="lib/js.jar"/>
-	<classpathentry kind="lib" path="lib/kryonet-2.21-all.jar"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src/devtools/java"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.gitignore

@@ -13,3 +13,7 @@
 /logs
 /nbproject
 /build
+
+history.txt
+target/
+/dependency-reduced-pom.xml

.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>AMIDST</name>
+	<name>amidst</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>

.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8

.settings/org.eclipse.jdt.core.prefs

@@ -1,11 +1,13 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.8

.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

.travis.yml

@@ -0,0 +1,29 @@
+language: java
+jdk:
+- oraclejdk8
+addons:
+  apt:
+    packages:
+    - libc6:i386 # these two packages are needed by the launch4j maven plugin to work
+    - libstdc++6:i386
+before_install:
+- mvn clean # this actually installs a dependency
+before_deploy:
+- bash travis-ci/scripts/create-mac-icon.sh
+- bash travis-ci/scripts/create-windows-icon.sh
+- mvn package -DskipTests=true -f travis-ci/wrapper-for-mac/pom.xml
+- mvn package -DskipTests=true -f travis-ci/wrapper-for-windows/pom.xml
+- bash travis-ci/scripts/zip-and-move-wrapper-for-mac.sh
+- export filename=$(bash travis-ci/scripts/get-amidst-filename.sh)
+deploy:
+  provider: releases
+  api-key:
+    secure: QMXa1QpW+mlTLlxCbKOAWIRUi2cR+Y2vMQDlwiV8BoUyZchvTBR+stDYuEdxd2fK8/aSRUWEgfUhKMJ4cIZEOOwz/UA/1RQmzumbFLexwTwDXfkTfCcDQFLtzywVoep2P3s1lpheo4f1G3z2sZTCxO5yRnpd/sBtWnaq3j5uifYZB+mv84eH+EsrQL7f+0KjycOPrAdiJ8xh/2twUtGMhaStrnhcH+RCi6qm6D5Dv4mwYM4wRxG3H9i2NceGa6lHIE4bU+kKY9lc3V6EzmTnnShwEcrf+4/ZfCe4A9aU3jzFhKCHKpJ4PlqLEtMeQ08ijaMrF4LaBqwRZ5il5nqKkFdfKOtx7EHqjxrQ1dT7JUXU/3lTfEX/DLbhPa3z5Tl9LgCu9flCS+ltQoPvx7MR1leaQeHNoFCfzWJQ8ytW2CEhnOqx3nr4AIW8q5akJxQB7USfHV5F8kw2T6QmzuniQRZex+15j9SLedaDXZCvno6C0+j59sABpiF9lRVww8jW6BxqklxDcjEtkMxyHiBCG0EgGlKJvVSyGGzDsjb8FweC1KQKBHuG+5UYNE1rJesj6rwfIIrbInjJRTPndb4GpuzzbqbTGxwHd2zqzkQhnxSjCoKIzyhpBzfyCJaqTv/DfimSc95sXH1w1d6zfcO01MkopXYUSlHvr/Rjxh8vE8U=
+  file:
+  - "target/${filename}.jar"
+  - "target/${filename}.zip"
+  - "target/${filename}.exe"
+  skip_cleanup: true
+  on:
+    repo: stefandollase/amidst
+    tags: true

README.md

@@ -1,11 +1,98 @@
-AMIDST
+Amidst
 ======
 
+[![Build Status](https://travis-ci.org/stefandollase/amidst.svg)](https://travis-ci.org/stefandollase/amidst)
+
 Advanced Minecraft Interface and Data/Structure Tracking
 
+Where can I get Amidst?
+-----------------------
+
+You can download Amidst [here](https://github.com/skiphs/amidst/releases/latest). If you find any bugs, please [report](https://github.com/skiphs/amidst/issues/new) them so we can fix them. If you want to request a feature, you can to this [here](https://github.com/skiphs/amidst/issues/new). If you want to help develop Amidst, please get in contact [here](https://github.com/skiphs/amidst/issues/new). Lastly, [here](https://github.com/stefandollase/amidst/blob/refactoring/docs/BUILDING.md) is a description how you can build Amidst by yourself.
+
+What is Amidst?
+---------------
+
+What it **can** do for you:
+
+* generate an overview of a Minecraft world from a given seed and a given Minecraft version
+* display biome information
+* display slime chunks
+* display structures
+  * default world spawn
+  * strongholds
+  * desert temples
+  * jungle temples
+  * witch huts
+  * villages
+  * ocean monuments
+  * nether fortresses
+
+When the world is loaded from a Minecraft world file, Amidst **can** also:
+
+* display singleplayer and multiplayer player locations
+* load player skins
+* move players to another location, including the y-coordinate
+
+What it **cannot** do for you:
+
+* display changes to the world, that are made after the world generator was finished, this includes
+  * changes made by world editors like MCEdit
+  * changes made while loading the world in Minecraft
+* find individual blocks or mobs in the world like e.g.
+  * diamond ore
+  * cows
+
+More features include:
+
+* saving an image of the map
+
+Which Minecraft versions are supported?
+---------------------------------------
+
+We support Minecraft versions from 1.0 up to the latest snapshot. If you find an issue with a specific Minecraft version, [please report it](https://github.com/skiphs/amidst/issues/new).
+
+How can I move a player?
+------------------------
+
+You can move players in a world that was loaded from a Minecraft world file like so:
+
+* scroll to and right-click on the new player location, this opens a popup menu
+* select the player you want to move
+* enter the new y-coordinate
+* save player locations
+
+**WARNING: This will change the contents of the save folder, so there is a chance that the world gets corrupted. We try to minimize the risk by creating a backup of the changed file, before it is changed. If the backup fails, we will not write the changes. You can find the backup files in a sub folder of the world, named 'amidst_backup'. Especially, make sure to not have the world loaded in minecraft during this process.**
+
+When I load a world file I am asked what whether I want to load the Singleplayer of Multiplayer players. What does it mean?
+---------------------------------------------------------------------------------------------------------------------------
+
+Minecraft worlds have three different locations to store player information:
+
+* the `level.dat` file contains the singleplayer player
+* the `players` directory contains all multiplayer players by name, this was used before Minecraft 1.7.6
+* the `playerdata` directory contains all multiplayers players by uuid, this is used since Minecraft 1.7.6
+
+If the `players` and the `playerdata` directory exist, we will simply ignore the `players` directory, since it contains outdated information. However, other situations cannot be decided automatically. If the world was only used by a server, there will be no player information in the `level.dat`, so we will just load the multiplayer players. However, if the map was ever loaded as a singleplayer world, the `level.dat` file will create singleplayer information. Also, the `playerdata` directory will contain information about all the players that used the world as singleplayer world. Of course we could just display the singleplayer player and the multiplayer players, however this might lead to an issue when you want to move the singleplayer player. When the world is loaded as singleplayer world, Minecraft will simply ignore and overwrite the information in the multiplayer directory, that belongs to the player that opened the world. Thus, if you move your player instead of the singleplayer player, this will have no effect.
+
+**tl;dr** If you use the world just as a singleplayer world, simply choose Singleplayer.
+
+What is the internet used for?
+-------------------
+
+* Amidst v3.7 was the last version that used google analytics, so we do no longer track you
+* Amidst will check for updates on every start
+* Amidst will use web services provided by mojang, e.g. to
+  * display information about minecraft versions
+  * display information about players like the name or the skin
+
+General information
+-------------------
+
+Amidst is not owned by or related to mojang in any way.
+
 License and warranty
 --------------------
 
-AMIDST comes with ABSOLUTELY NO WARRANTY. It is free software, and you are
-welcome to redistribute it under certain conditions. See LICENSE.txt for more
-details on both of these points.
+Amidst comes with ABSOLUTELY NO WARRANTY. It is free and open source software, license under the
+[GPL v3](https://github.com/skiphs/amidst/blob/master/LICENSE.txt), and you are welcome to redistribute it under certain conditions.