Merge pull request #721 from Team-RTG/dev

Merge dev into master. (v0.8.0)

.gitignore

@@ -1,27 +1,32 @@
-/.gradle
-/.settings
-/build
-/eclipse
-/.classpath
-/.project
-/CREDITS-fml.txt
-/forge-1.7.10-10.13.4.1448-1.7.10-changelog.txt
-/LICENSE-fml.txt
-/MinecraftForge-Credits.txt
-/MinecraftForge-License.txt
-/README-fml.txt
-/bin
-/README.txt
+# eclipse
+*.launch
+.settings
+.metadata
+.classpath
+.project
+bin
+eclipse
+
+# idea
+*.ipr
+*.iws
+*.iml
+.idea
+out
+
+# gradle
+build
+.gradle
+run
+
+# other (srsly, do you need this stuff here? Add it to your IDE's ignore list! :)
 gradlew-setupDecompWorkspace.bat
 gradlew-clean.bat
 gradlew-eclipse.bat
 gradlew-build.bat
-libs/BiomesOPlenty-1.7.10-2.1.0.1462-deobf.jar
-libs/CodeChickenCore-1.7.10-1.0.7.46-dev.jar
-libs/NotEnoughItems-1.7.10-1.0.5.111-dev.jar
-libs/extrabiomesxl_1.7.10-3.16.3-dev.jar
-libs/BiomesOPlenty-1.7.10-2.1.0.1465-deobf.jar
-libs/extrabiomesxl_1.7.10-3.16.3-deobf.jar
-
-forge-1.7.10-10.13.4.1558-1.7.10-changelog.txt
-gradlew-jar.bat
+libs/*.jar
+gradlew-jar.bat
+gradlew-cleanCache.bat
+gradlew-setupDecompWorkspace-refresh-deps.bat
+gradlew-idea.bat
+/gradlew-runClient.bat

.travis.yml

@@ -2,18 +2,8 @@ addons:
 # language
 language: java
 
-# version numbers
-jdk:
-    - oraclejdk8
-
-# Use JDK 8u45. The above line just causes the use of a minor version of Java 8.
-addons:
-  apt:
-    packages:
-      - oracle-java8-installer
-
-install: "./gradlew setupCIWorkspace"
-script: "./gradlew jar"
+install: "./gradlew setupDevWorkspace"
+script: "./gradlew build"
 before_cache:
 - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
 cache:

README.md

@@ -1,9 +1,49 @@
 ![](http://i.imgur.com/fntMwQe.png)
 
-![](http://i.imgur.com/FcLR7Mq.gif)
 
-![](http://i.imgur.com/YUyTPsc.png)
+# Screenshots
+![](http://i.imgur.com/Aem87JR.gif)
 
-Realistic Terrain Generation (RTG) is a mod that adds a new world type which generates realistic terrain. It doesn't add new blocks. It doesn't add new mobs. It doesn't even add new biomes. It simply generates more realistic-looking terrain for existing Overworld biomes (including those added by other mods).
+# Overview
+
+Realistic Terrain Generation (RTG) is a mod that adds a new world type which generates realistic terrain. It doesn't add new blocks. It doesn't add new mobs. It doesn't even add new biomes. It simply **generates more realistic-looking terrain for existing Overworld biomes** (including those added by other mods).
+
+## Wiki
+Check out the **[Wiki](https://github.com/Team-RTG/Realistic-Terrain-Generation/wiki)** for an **[FAQ](https://github.com/Team-RTG/Realistic-Terrain-Generation/wiki/FAQ)** and info on:
+* [Biome Support](https://github.com/Team-RTG/Realistic-Terrain-Generation/wiki/Biome-Support)
+* [Mod Compatibility](https://github.com/Team-RTG/Realistic-Terrain-Generation/wiki/Mod-Compatibility)
+* [Known Issues](https://github.com/Team-RTG/Realistic-Terrain-Generation/wiki/Known-Issues)
+* [Installation](https://github.com/Team-RTG/Realistic-Terrain-Generation/wiki/Installation)
+* [Configuration](https://github.com/Team-RTG/Realistic-Terrain-Generation/wiki/Configuration)
+
+
+## Discord
+
+### Chat with us over at our [Discord server](https://discordapp.com/channels/168326116761665536/168326116761665536).
+
+
+## Development
+
+Want to contribute? Great!
+
+Contact us on our [Discord server](https://discordapp.com/channels/168326116761665536/168326116761665536).
+
+* We currently have 5 mods under our belt, but RTG is the main focus, and the 1.7.10 version specifically is what we are currently need to be concentrating on and then forward-porting features to 1.8.9/1.9 (although we've strayed several times to work on the 1.9 version because it's new and exciting!)
+
+* Check out the 'dev' branch for the newest changes. The master branch always gets 'frozen' immediately after we release a new version so that people can always build the most recent release from source if they want. Also, we use the 'etc' folder to store example configs, which reflect the latest release.
+
+
+### Minecraft Forum Thread
+----
+[For more information, please visit the official RTG thread on the Minecraft Forum](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/2524489-realistic-terrain-generation-rtg-realistic-biomes)
+
+### Credits
+----
+This mod is a re-branded fork of the revolutionary [Realistic World Gen](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1281910-teds-world-gen-mods-realistic-world-gen-alpha-1-3) mod by ted80. It was created as a new project because it was expected to deviate from ted80's original vision for RWG, and the author of this mod didn't want to interfere with that vision.
+
+RTG is brought to you by [Team RTG](https://github.com/Team-RTG) and contains a number of [contributions](https://github.com/Team-RTG/Realistic-Terrain-Generation/graphs/contributors) from various members of the Minecraft modding community. It also uses KdotJPG's [OpenSimplex Noise](https://gist.github.com/KdotJPG/b1270127455a94ac5d19) to generate its terrain.
+
+### License
+
+**GNU General Public License (version 3)**
 
-For more information, please visit the official RTG thread on the Minecraft Forum: http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/2524489-realistic-terrain-generation-rtg-realistic-biomes

build.gradle

@@ -1,72 +1,58 @@
-evaluationDependsOn(':version')
-
 buildscript {
     repositories {
         mavenCentral()
-        maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
-        }
-        maven {
-            name = "sonatype"
-            url = "https://oss.sonatype.org/content/repositories/snapshots/"
-        }
-    }
-    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+        maven {url = "http://files.minecraftforge.net/maven"}
+        maven {url = "https://oss.sonatype.org/content/repositories/snapshots/"}
     }
+    dependencies {classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'}
 }
-
-apply plugin: 'java'
 apply plugin: 'forge'
-
-
-version = (System.getenv("TRAVIS") ? "DEV-" + System.getenv('TRAVIS_BUILD_NUMBER') : '0.7.0')
-group = "org.teamrtg.rtg" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = "RTG-" + project.mcversion
-
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
-minecraft {
-    version = "1.7.10-10.13.4.1558-1.7.10"
-    runDir = "eclipse"
-
-    replace '@VERSION@', project.version
-}
-
-dependencies {
-    // you may put jars on which you depend on in ./libs
-    // or you may define them like so..
-    //compile "some.group:artifact:version:classifier"
-    //compile "some.group:artifact:version"
-
-    // real examples
-    //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
-    //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
+ext.ref = parseprops(file('build.properties'))
 
-    // for more info...
-    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
-    // http://www.gradle.org/docs/current/userguide/dependency_management.html
+group = ref.package_base + '.' + ref.mod_id
+archivesBaseName = ref.mod_id
+version = (System.getenv("TRAVIS") ? "1.7.10-DEV-" + System.getenv('TRAVIS_BUILD_NUMBER') : ref.mc_version + '-' + ref.mod_version)
+def versionName = (System.getenv("TRAVIS") ? "1.7.10-" + ref.mod_version + "-DEV-" +  System.getenv('TRAVIS_BUILD_NUMBER') : version)
 
+minecraft {
+    version = ref.mcf_version + '-1.7.10'
+    runDir = ref.run_dir
+    replace '@MOD_NAME@', ref.mod_name
+    replace '@MOD_ID@', ref.mod_id
+    replace '@MOD_VERSION@', versionName
+    replace '@MCF_VERSION@', ref.mcf_version
+    if (ref.mod_deps != "") replace '@MOD_DEPS@', ";" + ref.mod_deps
+    else replace '@MOD_DEPS@', ''
+    replaceIn 'ModInfo.java'
 }
 
-processResources
-{
-    // this will ensure that this task is redone when the versions change.
-    inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
+dependencies {}
 
-    // replace stuff in mcmod.info, nothing else
+processResources {
     from(sourceSets.main.resources.srcDirs) {
         include 'mcmod.info'
-
-        // replace version and mcversion
-        expand 'version':project.version, 'mcversion':project.minecraft.version
-    }
-
-    // copy everything else, thats not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
+		expand ([
+			'modid':ref.mod_id,
+			'name':ref.mod_name,
+			'description':ref.mod_desc,
+			'version':ref.mod_version,
+			'mcversion':ref.mc_version,
+			'url':ref.mod_url,
+			'authorList':ref.mod_author,
+			'credits':ref.mod_creds,
+			'logoFile':ref.mod_logo,
+		])
+	}
+	from(sourceSets.main.resources.srcDirs) {exclude 'mcmod.info'}
+}
+
+def parseprops(File cfg) {
+    cfg.withReader {
+        def prop = new Properties()
+        prop.load(it)
+        return (new ConfigSlurper().parse(prop))
     }
 }

build.properties

@@ -0,0 +1,32 @@
+# TODO: should maybe find a way to update mod_version automatically in the future (perhaps from git), but not neccessary.
+# mod_author has to be in ""'s (and comma-separated, ie: "","",""), because array[]
+# mod_deps should be 'after:<mod identifier>' (unquoted, semicolon-separated, \escaped for newline, see example below)
+mod_id=RTG
+mod_name=Realistic Terrain Generation
+mod_desc=Adds a new world type which generates realistic terrain for Overworld biomes.
+mod_version=0.8.0
+mc_version=1.7.10
+mod_url=https://github.com/Team-RTG/Realistic-Terrain-Generation
+mod_author="WhichOnesPink"
+mod_creds=Forked from RWG by ted80. OpenSimplex Noise by KdotJPG.
+mod_logo=assets/rtg/logo.png
+mcf_version=10.13.4.1558
+run_dir=run
+package_base=org.teamrtg
+mod_deps=after:abyssalcraft@[1.9.1.2,);\
+          after:arsmagica2@[1.4.0.008,);\
+          after:ATG@[0.10.0,);\
+          after:BiomesOPlenty@[2.1.0,);\
+          after:BuildCraft|Core@[7.1.7,);\
+          after:enhancedbiomes@2.5 for MC 1.7.10;\
+          after:enviromine@[1.3.119,);\
+          after:ExtrabiomesXL@[3.16.2,);\
+          after:ForgottenNature@[1.6.11,);\
+          after:Growthcraft|Bamboo@[1.7.10-2.5.0,);\
+          after:Highlands@[2.2.3,);\
+          after:lom@[1.7.10-3.2.0,);\
+          after:Railcraft@[9.7.0.0,);\
+          after:RidiculousWorld@[0.1,);\
+          after:Thaumcraft@[4.2.3.4,);\
+          after:TofuCraft@2.1.6-MC1.7.10;\
+          after:vampirism@[0.7.8.5,)