Skip to content

Commit 6c1fdb3

Browse files
committed
Merge pull request #1 from toolbox4minecraft/refactoring
Refactoring
2 parents 6c0cd33 + 65a7859 commit 6c1fdb3

File tree

430 files changed

+18121
-9839
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

430 files changed

+18121
-9839
lines changed

.classpath

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,37 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="src"/>
4-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
5-
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
6-
<classpathentry kind="lib" path="lib/JGoogleAnalytics_0.4.jar"/>
7-
<classpathentry kind="lib" path="lib/JNBT_1.3.jar"/>
8-
<classpathentry kind="lib" path="lib/gson-2.2.4.jar"/>
9-
<classpathentry kind="lib" path="lib/miglayout-4.0-swing.jar"/>
10-
<classpathentry kind="lib" path="lib/args4j-2.0.21.jar"/>
11-
<classpathentry kind="lib" path="lib/js.jar"/>
12-
<classpathentry kind="lib" path="lib/kryonet-2.21-all.jar"/>
13-
<classpathentry kind="output" path="bin"/>
3+
<classpathentry kind="src" path="src/devtools/java"/>
4+
<classpathentry kind="src" output="target/classes" path="src/main/java">
5+
<attributes>
6+
<attribute name="optional" value="true"/>
7+
<attribute name="maven.pomderived" value="true"/>
8+
</attributes>
9+
</classpathentry>
10+
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
11+
<attributes>
12+
<attribute name="maven.pomderived" value="true"/>
13+
</attributes>
14+
</classpathentry>
15+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
16+
<attributes>
17+
<attribute name="optional" value="true"/>
18+
<attribute name="maven.pomderived" value="true"/>
19+
</attributes>
20+
</classpathentry>
21+
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
22+
<attributes>
23+
<attribute name="maven.pomderived" value="true"/>
24+
</attributes>
25+
</classpathentry>
26+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
27+
<attributes>
28+
<attribute name="maven.pomderived" value="true"/>
29+
</attributes>
30+
</classpathentry>
31+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
32+
<attributes>
33+
<attribute name="maven.pomderived" value="true"/>
34+
</attributes>
35+
</classpathentry>
36+
<classpathentry kind="output" path="target/classes"/>
1437
</classpath>

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,7 @@
1313
/logs
1414
/nbproject
1515
/build
16+
17+
history.txt
18+
target/
19+
/dependency-reduced-pom.xml

.project

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>AMIDST</name>
3+
<name>amidst</name>
44
<comment></comment>
55
<projects>
66
</projects>
@@ -10,8 +10,14 @@
1010
<arguments>
1111
</arguments>
1212
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
1318
</buildSpec>
1419
<natures>
20+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
1521
<nature>org.eclipse.jdt.core.javanature</nature>
1622
</natures>
1723
</projectDescription>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
eclipse.preferences.version=1
2+
encoding//src/main/java=UTF-8
3+
encoding//src/main/resources=UTF-8
4+
encoding//src/test/java=UTF-8
5+
encoding//src/test/resources=UTF-8

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
3+
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
4+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
45
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
5-
org.eclipse.jdt.core.compiler.compliance=1.6
6+
org.eclipse.jdt.core.compiler.compliance=1.8
67
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
78
org.eclipse.jdt.core.compiler.debug.localVariable=generate
89
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
910
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
1011
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
11-
org.eclipse.jdt.core.compiler.source=1.6
12+
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
13+
org.eclipse.jdt.core.compiler.source=1.8

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
activeProfiles=
2+
eclipse.preferences.version=1
3+
resolveWorkspaceProjects=true
4+
version=1

.travis.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
language: java
2+
jdk:
3+
- oraclejdk8
4+
addons:
5+
apt:
6+
packages:
7+
- libc6:i386 # these two packages are needed by the launch4j maven plugin to work
8+
- libstdc++6:i386
9+
before_install:
10+
- mvn clean # this actually installs a dependency
11+
before_deploy:
12+
- bash travis-ci/scripts/create-mac-icon.sh
13+
- bash travis-ci/scripts/create-windows-icon.sh
14+
- mvn package -DskipTests=true -f travis-ci/wrapper-for-mac/pom.xml
15+
- mvn package -DskipTests=true -f travis-ci/wrapper-for-windows/pom.xml
16+
- bash travis-ci/scripts/zip-and-move-wrapper-for-mac.sh
17+
- export filename=$(bash travis-ci/scripts/get-amidst-filename.sh)
18+
deploy:
19+
provider: releases
20+
api-key:
21+
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=
22+
file:
23+
- "target/${filename}.jar"
24+
- "target/${filename}.zip"
25+
- "target/${filename}.exe"
26+
skip_cleanup: true
27+
on:
28+
repo: stefandollase/amidst
29+
tags: true

Default-sorted.json

Lines changed: 0 additions & 81 deletions
This file was deleted.

README.md

Lines changed: 91 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,98 @@
1-
AMIDST
1+
Amidst
22
======
33

4+
[![Build Status](https://travis-ci.org/stefandollase/amidst.svg)](https://travis-ci.org/stefandollase/amidst)
5+
46
Advanced Minecraft Interface and Data/Structure Tracking
57

8+
Where can I get Amidst?
9+
-----------------------
10+
11+
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.
12+
13+
What is Amidst?
14+
---------------
15+
16+
What it **can** do for you:
17+
18+
* generate an overview of a Minecraft world from a given seed and a given Minecraft version
19+
* display biome information
20+
* display slime chunks
21+
* display structures
22+
* default world spawn
23+
* strongholds
24+
* desert temples
25+
* jungle temples
26+
* witch huts
27+
* villages
28+
* ocean monuments
29+
* nether fortresses
30+
31+
When the world is loaded from a Minecraft world file, Amidst **can** also:
32+
33+
* display singleplayer and multiplayer player locations
34+
* load player skins
35+
* move players to another location, including the y-coordinate
36+
37+
What it **cannot** do for you:
38+
39+
* display changes to the world, that are made after the world generator was finished, this includes
40+
* changes made by world editors like MCEdit
41+
* changes made while loading the world in Minecraft
42+
* find individual blocks or mobs in the world like e.g.
43+
* diamond ore
44+
* cows
45+
46+
More features include:
47+
48+
* saving an image of the map
49+
50+
Which Minecraft versions are supported?
51+
---------------------------------------
52+
53+
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).
54+
55+
How can I move a player?
56+
------------------------
57+
58+
You can move players in a world that was loaded from a Minecraft world file like so:
59+
60+
* scroll to and right-click on the new player location, this opens a popup menu
61+
* select the player you want to move
62+
* enter the new y-coordinate
63+
* save player locations
64+
65+
**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.**
66+
67+
When I load a world file I am asked what whether I want to load the Singleplayer of Multiplayer players. What does it mean?
68+
---------------------------------------------------------------------------------------------------------------------------
69+
70+
Minecraft worlds have three different locations to store player information:
71+
72+
* the `level.dat` file contains the singleplayer player
73+
* the `players` directory contains all multiplayer players by name, this was used before Minecraft 1.7.6
74+
* the `playerdata` directory contains all multiplayers players by uuid, this is used since Minecraft 1.7.6
75+
76+
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.
77+
78+
**tl;dr** If you use the world just as a singleplayer world, simply choose Singleplayer.
79+
80+
What is the internet used for?
81+
-------------------
82+
83+
* Amidst v3.7 was the last version that used google analytics, so we do no longer track you
84+
* Amidst will check for updates on every start
85+
* Amidst will use web services provided by mojang, e.g. to
86+
* display information about minecraft versions
87+
* display information about players like the name or the skin
88+
89+
General information
90+
-------------------
91+
92+
Amidst is not owned by or related to mojang in any way.
93+
694
License and warranty
795
--------------------
896

9-
AMIDST comes with ABSOLUTELY NO WARRANTY. It is free software, and you are
10-
welcome to redistribute it under certain conditions. See LICENSE.txt for more
11-
details on both of these points.
97+
Amidst comes with ABSOLUTELY NO WARRANTY. It is free and open source software, license under the
98+
[GPL v3](https://github.com/skiphs/amidst/blob/master/LICENSE.txt), and you are welcome to redistribute it under certain conditions.

0 commit comments

Comments
 (0)