diff --git a/BlueMapCore/build.gradle b/BlueMapCore/build.gradle index 99330aa7..39422d73 100644 --- a/BlueMapCore/build.gradle +++ b/BlueMapCore/build.gradle @@ -39,6 +39,7 @@ task zipWebroot(type: Zip) { // removes tmp build directory, build project with webpack, zip contents for the shaded jar task buildWebroot { + dependsOn 'npmInstall' dependsOn 'cleanWebroot' dependsOn 'webpackWebroot' dependsOn 'zipWebroot' diff --git a/BlueMapCore/package.json b/BlueMapCore/package.json index 89fb5510..512f0515 100644 --- a/BlueMapCore/package.json +++ b/BlueMapCore/package.json @@ -1,9 +1,7 @@ { "name": "bluemap", - "version": "1.0.0", "description": "BlueMap is a tool that generates 3d-maps of your Minecraft worlds and displays them in your browser.", "private": true, - "main": "bluemap.js", "repository": { "type": "git", "url": "git+https://github.com/BlueMap-Minecraft/BlueMap.git" @@ -24,6 +22,7 @@ "devDependencies": { "css-loader": "^3.4.2", "fibers": "^4.0.2", + "file-loader": "^5.0.2", "html-webpack-plugin": "^3.2.0", "mini-css-extract-plugin": "^0.9.0", "node-sass": "^4.13.0", diff --git a/BlueMapSponge/build.gradle b/BlueMapSponge/build.gradle index a1dbf64d..4d913ff0 100644 --- a/BlueMapSponge/build.gradle +++ b/BlueMapSponge/build.gradle @@ -1,5 +1,5 @@ dependencies { - shadow "org.spongepowered:spongeapi:7.1.0-SNAPSHOT" + compile "org.spongepowered:spongeapi:7.1.0-SNAPSHOT" compile group: 'org.bstats', name: 'bstats-sponge-lite', version: '1.5' compile project(':BlueMapCore') } diff --git a/README.md b/README.md index 5bc9a4d8..26d95b46 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![title-banner](https://bluecolored.de/paste/bluemap-title.jpg) -BlueMap is a tool that generates 3d-maps of your Minecraft worlds and displays them in your browser. Take a look at [this demo](https://bluecolored.de/bluemap). It is really easy to set up - almost plug-and-play - if you use the integrated web-server (optional). +BlueMap is a tool that generates 3d-maps of your Minecraft worlds and displays them in your browser. Take a look at [this demo](https://bluecolored.de/bluemap). It is really easy to set up - almost plug-and-play - if you use the integrated web-server (optional). The Sponge-Plugin automatically updates your map as soon as something changes in your world, as well as rendering newly generated terrain and managing the render-tasks. @@ -15,21 +15,21 @@ Easy: `git clone https://github.com/BlueMap-Minecraft/BlueMap.git` ### Build -In order to build BlueMap you simply need to run the `./gradlew shadowJar` command. +In order to build BlueMap you simply need to run the `./gradlew build` command. You can find the compiled JAR file in `./build/libs` ### Issues / Suggestions You found a bug, have another issue or a suggestion? Please create an issue [here](https://github.com/BlueMap-Minecraft/BlueMap/issues)! ### Contributing -You are welcome to contribute! +You are welcome to contribute! Just create a pull request with your changes :) ## Using the CLI BlueMap can be used on the command-line, to render your Minecraft-Worlds *(Currently supported versions: 1.12 - 1.14)*. Use `java -jar bluemap.jar` and BlueMap will generate a default config in the current working directory. You then can configure your maps and even the webserver as you wish. Then, re-run the command and BlueMap will render all the configured maps for you and start the webserver if you turned it on in the config. -To only run the webserver, just don't define any maps in the config. +To only run the webserver, just don't define any maps in the config. You can use `-c ` on the command-line to define a different configuration-file. @@ -39,7 +39,7 @@ BlueMap is mostly plug-and-play. Just install it like every other Sponge-Plugin **Before BlueMap can render anything,** it needs one more thing: resources! To render all the block-models, BlueMap makes use of the default minecraft-resources. Since they are property of mojang i can not include them in the plugin. Fortunately BlueMap can download them from mojangs servers for you, but you need to explicitly agree to this in the config! Simply change the `accept-download: false` setting to `accept-download: true`, and run the `/bluemap reload` command. -After downloading the resources, BlueMap will start updating the configured worlds. To render the whole world for a start, you can use this command `/bluemap render [world]`. +After downloading the resources, BlueMap will start updating the configured worlds. To render the whole world for a start, you can use this command `/bluemap render [world]`. Then, head over to `http://:8100/` and you should see your map! *(If there is only black, you might have to wait a little until BlueMap has rendered enough of the map. You can also try to zoom in: the hires-models are saved first)* diff --git a/build.gradle b/build.gradle index 704cb407..ed79985b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ plugins { id 'java' - id 'com.github.johnrengelman.shadow' version '5.1.0' + id 'com.github.johnrengelman.shadow' version '1.2.4' } allprojects { repositories { mavenCentral() - maven { + maven { url 'https://jitpack.io' } maven { @@ -21,7 +21,7 @@ allprojects { compileJava.options.compilerArgs.add '-parameters' compileTestJava.options.compilerArgs.add '-parameters' - + apply plugin: 'java' apply plugin: 'com.github.johnrengelman.shadow' } @@ -31,14 +31,14 @@ dependencies { //compile project(':BlueMapSponge') } -shadowJar { +assemble.dependsOn shadowJar { baseName = 'BlueMap' version = null classifier = null } -jar { +jar { manifest { attributes 'Main-Class' : "de.bluecolored.bluemap.cli.BlueMapCLI" } -} \ No newline at end of file +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5028f28f..7dc503f1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists