From cca131775bcd5a8c1a2f36bedcc64599efb50a58 Mon Sep 17 00:00:00 2001 From: Stefan Dollase Date: Wed, 30 Dec 2015 19:52:04 +0100 Subject: [PATCH] replaced occurrences of "AMIDST" by "Amidst", when used as a title, or "amidst", when used as an identifier --- .project | 2 +- .travis.yml | 2 +- README.md | 16 ++++++++-------- docs/{HOW-TO-BUILD.md => BUILDING.md} | 10 +++++----- src/main/java/amidst/gui/crash/CrashWindow.java | 4 ++-- .../java/amidst/gui/license/LicenseWindow.java | 2 +- src/main/java/amidst/gui/main/Actions.java | 2 +- .../minecraftinterface/MinecraftInterface.java | 2 +- src/main/resources/amidst/metadata.properties | 2 +- .../scripts/zip-and-move-wrapper-for-mac.sh | 2 +- travis-ci/wrapper-for-mac/pom.xml | 4 ++-- 11 files changed, 24 insertions(+), 24 deletions(-) rename docs/{HOW-TO-BUILD.md => BUILDING.md} (80%) diff --git a/.project b/.project index 75f497fd..c60d78bf 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - AMIDST + amidst diff --git a/.travis.yml b/.travis.yml index 1660a085..fb3f72c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,5 +25,5 @@ deploy: - "target/${filename}.exe" skip_cleanup: true on: - repo: stefandollase/AMIDST + repo: stefandollase/amidst tags: true diff --git a/README.md b/README.md index af64284a..395d8f59 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ -AMIDST +Amidst ====== -[![Build Status](https://travis-ci.org/stefandollase/AMIDST.svg)](https://travis-ci.org/stefandollase/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? +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/HOW-TO-BUILD.md) is a description how you can build amidst by yourself. +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 is Amidst? --------------- What it **can** do for you: @@ -50,7 +50,7 @@ More features include: 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). +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? ------------------------ @@ -94,5 +94,5 @@ Amidst is not owned by or related to mojang in any way. License and warranty -------------------- -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. \ No newline at end of file +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. diff --git a/docs/HOW-TO-BUILD.md b/docs/BUILDING.md similarity index 80% rename from docs/HOW-TO-BUILD.md rename to docs/BUILDING.md index b62f865d..5bcbc730 100644 --- a/docs/HOW-TO-BUILD.md +++ b/docs/BUILDING.md @@ -6,7 +6,7 @@ Amidst uses maven for its build process. Here are the steps to build from source * `mvn clean` * `mvn install` -This will place the jar file under `target/AMIDST-.jar`. +This will place the jar file under `target/amidst-.jar`. To build the wrapper for mac, follow these steps: @@ -16,7 +16,7 @@ To build the wrapper for mac, follow these steps: * `mvn package -DskipTests=true -f travis-ci/wrapper-for-mac/pom.xml` * `bash travis-ci/scripts/zip-and-move-wrapper-for-mac.sh` -This will place the zip file under `target/AMIDST-.zip`. +This will place the zip file under `target/amidst-.zip`. To build the wrapper for windows, follow these steps: @@ -25,10 +25,10 @@ To build the wrapper for windows, follow these steps: * `bash travis-ci/scripts/create-windows-icon.sh` * `mvn package -DskipTests=true -f travis-ci/wrapper-for-windows/pom.xml` -This will place the exe file under `target/AMIDST-.exe`. +This will place the exe file under `target/amidst-.exe`. -You will need imagemagick installed to create the icons. Of course, you can also create the icon files by yourself and place them as `target/icon.icns` (mac) or `target/icon.ico` (windows) to the expected location. The `zip-and-move-wrapper-for-mac.sh` bash script simply creates a zip file from the directory located at `travis-ci/wrapper-for-mac/target/AMIDST-/`. You can also do this by yourself. +You will need imagemagick installed to create the icons. Of course, you can also create the icon files by yourself and place them as `target/icon.icns` (mac) or `target/icon.ico` (windows) to the expected location. The `zip-and-move-wrapper-for-mac.sh` bash script simply creates a zip file from the directory located at `travis-ci/wrapper-for-mac/target/amidst-/`. You can also do this by yourself. All of these steps are also executed by travis-ci to create a new release. However the regular travis-ci build will not create the wrappers for mac and windows. -The command `mvn clean` will actually install a dependency that is not available from a public maven repository to the local maven repository, so it is necessary to execute. \ No newline at end of file +The command `mvn clean` will actually install a dependency that is not available from a public maven repository to the local maven repository, so it is necessary to execute. diff --git a/src/main/java/amidst/gui/crash/CrashWindow.java b/src/main/java/amidst/gui/crash/CrashWindow.java index 224daacf..4ec09afe 100644 --- a/src/main/java/amidst/gui/crash/CrashWindow.java +++ b/src/main/java/amidst/gui/crash/CrashWindow.java @@ -21,9 +21,9 @@ public class CrashWindow { public CrashWindow(String message, String logMessages, final Runnable executeOnClose) { - frame = new JFrame("AMIDST encountered an unexpected error."); + frame = new JFrame("Amidst encountered an unexpected error."); frame.getContentPane().setLayout(new MigLayout()); - frame.add(new JLabel("AMIDST has crashed with the following message:"), + frame.add(new JLabel("Amidst has crashed with the following message:"), "growx, pushx, wrap"); frame.add(new JLabel(message), "growx, pushx, wrap"); frame.add(createLogMessagesScrollPane(logMessages), "grow, push"); diff --git a/src/main/java/amidst/gui/license/LicenseWindow.java b/src/main/java/amidst/gui/license/LicenseWindow.java index 816d11b4..33a999c6 100644 --- a/src/main/java/amidst/gui/license/LicenseWindow.java +++ b/src/main/java/amidst/gui/license/LicenseWindow.java @@ -36,7 +36,7 @@ public class LicenseWindow { private License[] createLicenses() { List result = Arrays.asList( - createLicense("AMIDST", "amidst.txt"), + createLicense("Amidst", "amidst.txt"), createLicense("Args4j", "args4j.txt"), createLicense("Gson", "gson.txt"), createLicense("JNBT", "jnbt.txt"), diff --git a/src/main/java/amidst/gui/main/Actions.java b/src/main/java/amidst/gui/main/Actions.java index 7724ed6d..28514229 100644 --- a/src/main/java/amidst/gui/main/Actions.java +++ b/src/main/java/amidst/gui/main/Actions.java @@ -244,7 +244,7 @@ public class Actions { @CalledOnlyBy(AmidstThread.EDT) public void about() { mainWindow.displayMessage("About", - "Advanced Minecraft Interfacing and Data/Structure Tracking (AMIDST)\n" + "Advanced Minecraft Interfacing and Data/Structure Tracking (Amidst)\n" + "By Skidoodle (amidst.project@gmail.com)"); } diff --git a/src/main/java/amidst/mojangapi/minecraftinterface/MinecraftInterface.java b/src/main/java/amidst/mojangapi/minecraftinterface/MinecraftInterface.java index 10f83f1d..b0f03abf 100644 --- a/src/main/java/amidst/mojangapi/minecraftinterface/MinecraftInterface.java +++ b/src/main/java/amidst/mojangapi/minecraftinterface/MinecraftInterface.java @@ -26,7 +26,7 @@ public interface MinecraftInterface { * paramaters must all correspond to a quarter of the Minecraft * block coordinates/sizes you wish to obtain the biome data for. * - * AMIDST displays the quarter-resolution biome map, however full + * Amidst displays the quarter-resolution biome map, however full * resolution is required to determine the position and nature of * structures, as the noisy interpolation can change which biome * a structure is located in (if the structure is located on a diff --git a/src/main/resources/amidst/metadata.properties b/src/main/resources/amidst/metadata.properties index a839f804..370cf2b9 100644 --- a/src/main/resources/amidst/metadata.properties +++ b/src/main/resources/amidst/metadata.properties @@ -1,5 +1,5 @@ project.build.sourceEncoding=UTF-8 -amidst.build.filename=AMIDST-v4.0-alpha3 +amidst.build.filename=amidst-v4.0-alpha3 amidst.build.jdk.version=1.8 amidst.version.major=4 diff --git a/travis-ci/scripts/zip-and-move-wrapper-for-mac.sh b/travis-ci/scripts/zip-and-move-wrapper-for-mac.sh index 5528c2f3..6b63c039 100644 --- a/travis-ci/scripts/zip-and-move-wrapper-for-mac.sh +++ b/travis-ci/scripts/zip-and-move-wrapper-for-mac.sh @@ -2,5 +2,5 @@ filename="`source travis-ci/scripts/get-amidst-filename.sh`" cd "travis-ci/wrapper-for-mac/target/${filename}/" -zip -r "${filename}.zip" "AMIDST.app/" +zip -r "${filename}.zip" "Amidst.app/" mv "${filename}.zip" "../../../../target/" diff --git a/travis-ci/wrapper-for-mac/pom.xml b/travis-ci/wrapper-for-mac/pom.xml index e346f8b2..4830e6ca 100644 --- a/travis-ci/wrapper-for-mac/pom.xml +++ b/travis-ci/wrapper-for-mac/pom.xml @@ -39,7 +39,7 @@ amidst.Amidst ../../target/icon.icns ${amidst.build.jdk.version}+ - AMIDST + Amidst @@ -67,4 +67,4 @@ provided - \ No newline at end of file +