diff --git a/BlockMap-cli/src/main/java/de/piegames/blockmap/standalone/VersionProvider.java b/BlockMap-cli/src/main/java/de/piegames/blockmap/standalone/VersionProvider.java index cfac6b0f..98b49164 100644 --- a/BlockMap-cli/src/main/java/de/piegames/blockmap/standalone/VersionProvider.java +++ b/BlockMap-cli/src/main/java/de/piegames/blockmap/standalone/VersionProvider.java @@ -8,7 +8,7 @@ public class VersionProvider implements IVersionProvider { public String[] getVersion() throws Exception { /* This part of the code gets generated automatically through `gradle generateSources`. Do not modify! */ // $REPLACE_START - return new String[] { "1.5.1" }; + return new String[] { "1.6.0" }; // $REPLACE_END } } diff --git a/README.md b/README.md index 293d4d69..d487fd01 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# BlockMap - A Minecraft 1.13/1.14 world viewer +# BlockMap – A Minecraft 1.13-1.15 world viewer [![Build Status](https://saibotk.de/buildstatus.php)]() @@ -14,11 +14,10 @@ - An interactive GUI viewer made with JavaFX - Pins on the map show additional information like players and villages - Different color maps and shaders that highlight exactly what you are looking for (including an underground caves and an ocean ground view) -- A gui library to include maps into your own JavaFX applications (but not released yet) - A command line interface to render your worlds from scripts - The core rendering code as library to use in your own projects (releasing soon™) - Gamma corrected rendering -- Works with both 1.13 and 1.14 worlds +- Works with both 1.13+ worlds (currently: 1.15) ## Gallery @@ -41,7 +40,7 @@ Download the latest version from the [Release page](https://github.com/piegamesd The GUI version should just run by (double)clicking it. Otherwise run it through: - java -jar BlockMap-gui-1.5.0.jar + java -jar BlockMap-gui-1.6.0.jar to start. @@ -59,9 +58,9 @@ to start. If you want to use BlockMap through the command line without, # For general usage help - java -jar BlockMap-cli-1.5.0.jar help + java -jar BlockMap-cli-1.6.0.jar help # For help about rendering worlds to a folder - java -jar BlockMap-cli-1.5.0.jar help render + java -jar BlockMap-cli-1.6.0.jar help render will get you started. On Linux even with colors! @@ -88,15 +87,28 @@ If this fails, try `./gradlew run2`\*. If you want to create a release jar and r \* There is a bug in JavaFX that currently prevents the `run` task to work, so as a workaround use `./gradlew run2` for now. -## Release it: +## Update and Release BlockMap: ```sh ./gradlew regenerate +./gradlew generateScreenshots # Optional ./gradlew release ``` -This will create two executable fat (=containing all needed dependencies) jars in `./BlockMap-{gui,cli}/build/libs/fat/`. -## Update to newer BlockMap version +- Bump the version in `build.gradle` +- Update `README.md` + - Bump the version information in file paths + - Bump the Minecraft version (if applicable) + - Check the feature list and read through it +- Update the `changelog.md` +- Regenerate all resources + - If something in the UI changed, regenerate the screenshots +- Generate the release binaries (need to be called on each target platform) + - This will create two executable fat (=containing all needed dependencies) jars in `./BlockMap-{gui,cli}/build/libs/fat/`. +- Release on GitHub +- Update all packaged versions (currently only AUR) + +## Update to newer Minecraft version - Update and start Minecraft. Create a new debug world. Copy it to `BlockMap/BlockMap-internal/src/test/resources`. - Copy the current block color instructions in `BlockMap/BlockMap-internal/src/main/resources/` to match the new Minecraft version. @@ -115,6 +127,7 @@ This will create two executable fat (=containing all needed dependencies) jars i - Regenerate the screenshots - Optimize the BlockMapWorld in Minecraft - `./gradlew clear && ./gradlew regenerate && ./gradlew generateScreenshots` +- Release it 🎉 ## Troubleshooting diff --git a/build.gradle b/build.gradle index 3f2ecaf0..3f7e46f1 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ buildscript { apply plugin: "com.github.ben-manes.versions" allprojects { - version = '1.5.1' + version = '1.6.0' repositories { jcenter() diff --git a/changelog.md b/changelog.md index e9077a03..7d614cc6 100644 --- a/changelog.md +++ b/changelog.md @@ -1,8 +1,14 @@ # Changelog -## Version 1.6.1 +## Version 1.6.0 ### Changes +- Added proper caves view +- Renamed old cave view into X-ray view - Performance optimizations +- Update for Minecraft 1.15 +- Changed image filtering in HTML view (#32, thanks @rasmusolle) +- Fixed compiling under Java 13 +- Internal changes and documentation ## Version 1.5.1 ### Changes diff --git a/update.md b/update.md deleted file mode 100644 index 906ea8eb..00000000 --- a/update.md +++ /dev/null @@ -1,9 +0,0 @@ -# Update to a new Minecraft version - -1. Download the new json file (see `Downloader#downloadMinecraft` for link) and update it according to the documentation -2. Generate the block states `gradle generateBlockStates`and copy them into the enum (`BlockState.java`) -3. Update `block-color-instructions.json` to contain all the new blocks, remove all removed blocks -4. Compile all block data -5. Run all tests -6. To make sure everything works, run `gradle beforeCommit` -7. Commit