Merge branch 'master-1.11.2' of https://github.com/MinecraftModDevelopmentMods/OreSpawn into master-1.11.2

Author: dshadowwolf

.travis.yml

@@ -1,12 +1,13 @@
 language: java
+sudo: false
 cache:
   directories:
     - $HOME/.gradle
 notifications:
   email: false
 jdk:
   - oraclejdk8
-install: ./gradlew setupCIWorkspace -S
-script: ./gradlew build -S
 before_install:
   - chmod a+x gradlew
+install: ./gradlew setupCIWorkspace -S
+script: ./gradlew clean build -S

CHANGELOG.txt

@@ -1 +1,18 @@
-Updated for latest Forge RB
+#Version 3.1.0:
+Minor Version number bumped because of major internal changes
+New Annotation-based plugin system
+New API for new plugin system
+Update JSON config format to version 1.1 to allow for new feature
+Implement BiomeDictionary support
+Implement Whitelisting and Blacklisting support for Biomes
+Ensure that resources stored in JAR's can be copied out to the config directory for loading and parsing
+Add the ability to specify parameters for the default feature generator to the addore command
+
+#Version 3.0.0:
+Ported to 1.11.2
+Complete rewrite of internals for better stability
+Change of JSON config format (See Wiki for details!)
+Added ability to specify different types of ore generation
+Added ability to specify what block gets replaced
+Able to Import both OreSpawn 1 and OreSpawn 2 format config files
+Added an operator (permission level 4) command to force-dump current configuration

build.gradle

@@ -1,35 +1,44 @@
+def corePlugin = ''
+
 buildscript {
     repositories {
         jcenter()
         maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
+            name = 'forge'
+            url = 'http://files.minecraftforge.net/maven'
+        }
+        maven {
+            name = 'gradle'
+            url 'https://plugins.gradle.org/m2/'
         }
         maven {
-            name = "sonatype"
-            url = "https://oss.sonatype.org/content/groups/public"
+            name = 'sonatype'
+            url = 'https://oss.sonatype.org/content/groups/public'
         }
     }
     dependencies {
-        classpath "net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT"
-        classpath "com.matthewprenger:CurseGradle:1.0-SNAPSHOT"
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
+        classpath 'gradle.plugin.com.matthewprenger:CurseGradle:1.0.9'
+        classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.5'
     }
 }
 
-apply plugin: "net.minecraftforge.gradle.forge"
-apply plugin: "com.matthewprenger.cursegradle"
-apply plugin: "maven-publish"
+apply plugin: 'net.minecraftforge.gradle.forge'
+apply plugin: 'com.matthewprenger.cursegradle'
+apply plugin: 'maven-publish'
+apply plugin: 'org.sonarqube'
 
 javadoc {
     failOnError = false
 }
 
+description = 'OreSpawn'
 def mod_file = getModFile()
-def mc_version = "1.10.2"
+def mc_version = "1.11.2"
 def short_version = getVersion("VERSION", mod_file)
 version = mc_version + "-" + short_version
 if (System.getenv().BUILD_NUMBER) {
-    version += "." + System.getenv().BUILD_NUMBER
+    version += '.' + System.getenv().BUILD_NUMBER
 }
 group = "com.mcmoddev"
 archivesBaseName = "OreSpawn"
@@ -39,7 +48,7 @@ class Secrets {
     def data = null
 
     def getProperty(String key) {
-        return data ? data[key] : ""
+        return data ? data[key] : ''
     }
 }
 
@@ -49,7 +58,7 @@ def secretFile
 if (System.getenv().SECRET_FILE) {
     secretFile = file System.getenv().SECRET_FILE
 } else {
-    secretFile = file "secret.json"
+    secretFile = file 'secret.json'
 }
 
 project.ext.secret = new Secrets()
@@ -60,37 +69,65 @@ if (secretFile.exists()) {
 }
 
 minecraft {
-    version = "1.10.2-12.18.3.2185"
+    version = "1.11.2-13.20.0.2228"
     runDir = "run"
-    mappings = "stable_29"
+    mappings = "stable_32"
 //    coreMod = ""
     makeObfSourceJar = false
 }
 
 repositories {
-    maven {
-        name "DVS1 Maven FS"
-        url "http://dvs1.progwml6.com/files/maven"
+    maven { // Mantle, TCon, JEI
+        name 'DVS1 Maven FS'
+        url 'http://dvs1.progwml6.com/files/maven'
     }
-    maven {
-        name "Chickenbones Repo"
-        url "http://chickenbones.net/maven/"
+    maven { // CCL, CCC, NEI
+        name 'Chickenbones Repo'
+        url 'http://chickenbones.net/maven/'
     }
-    maven {
-        name "tterrag"
-        url "http://maven.tterrag.com/"
+    maven { // The One Probe
+        name 'tterrag'
+        url 'http://maven.tterrag.com/'
     }
     maven {
-        name "MMD"
-        url "https://maven.mcmoddev.com/"
+        name 'MMD'
+        url 'https://maven.mcmoddev.com/'
     }
-    maven {
-        name "amadornes"
-        url "http://maven.amadornes.com/"
+    maven { // MCMultipart
+        name 'amadornes'
+        url 'http://maven.amadornes.com/'
     }
-    maven {
-        name "epoxide"
-        url "http://maven.epoxide.xyz"
+    maven { // Tesla
+        name 'epoxide'
+        url 'http://maven.epoxide.org'
+    }
+    maven { // CraftTweaker, ZenScript
+        name 'jared maven'
+        url 'http://blamejared.com/maven'
+    }
+    maven { // IC2
+        name 'industrialcraft'
+        url 'http://maven.ic2.player.to'
+    }
+    maven { // WAILA/HWYLA
+    	name 'tehnut'
+    	url 'http://tehnut.info/maven'
+    }
+    maven { // CoFH
+    	name 'Covers Maven'
+    	url 'http://maven.covers1624.net'
+    }
+	maven {
+        name = 'CurseForge'
+        url = 'https://minecraft.curseforge.com/api/maven/'
+    }
+	maven {
+        name 'opencomputers'
+        url 'http://maven.cil.li/'
+    }
+    maven { // Mekanism, TAIGA
+        name 'jitpack'
+        url 'https://jitpack.io'
     }
 }
 
@@ -99,53 +136,59 @@ dependencies {
 }
 
 processResources {
-    inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
+    inputs.property 'version', project.version
+    inputs.property 'mcversion', project.minecraft.version
 
     from (sourceSets.main.resources.srcDirs) {
-        include "mcmod.info"
-        expand "version": short_version
+        include 'mcmod.info'
+        expand 'version': short_version, 'mcversion': project.minecraft.version
     }
 
     from (sourceSets.main.resources.srcDirs) {
-        exclude "mcmod.info"
+        exclude 'mcmod.info'
     }
 }
 
 jar {
     manifest {
-//        attributes("FMLCorePluginContainsFMLMod": "true", "FMLCorePlugin": "")
+//      attributes 'FMLCorePluginContainsFMLMod': 'true'
+//      attributes 'FMLCorePlugin': corePlugin
+//      attributes 'FMLAT' : ''
     }
 }
 
 task apiJar(type: Jar, dependsOn: classes) {
-    classifier = "api"
+    classifier = 'api'
     from sourceSets.main.allSource
-    exclude("mmd/orespawn/impl/**")
-    exclude("mmd/orespawn/json/**")
-    exclude("mmd/orespawn/world/**")
-    exclude("mmd/orespawn/*.java")
+    exclude('com/mcmoddev/orespawn/impl/**')
+    exclude('com/mcmoddev/orespawn/impl/features/**')
+    exclude('com/mcmoddev/orespawn/json/**')
+    exclude('com/mcmoddev/orespawn/world/**')
+    exclude('com/mcmoddev/orespawn/commands/**')
+    exclude('com/mcmoddev/orespawn/data/**')
+    exclude('com/mcmoddev/orespawn/*.java')
 }
 
 task devJar(type: Jar) {
-    classifier = "dev"
+    classifier = 'dev'
     from sourceSets.main.output
 }
 
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
-    from sourceSets.main.allSource
+task deobfJar(type: Jar) {
+    classifier = 'deobf'
+    from sourceSets.main.output
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = "javadoc"
-    from javadoc.destinationDir
+    classifier = 'javadoc'
+    from javadoc.getDestinationDir()
 }
 
 artifacts {
     archives apiJar
     archives devJar
-    archives sourcesJar
+    archives deobfJar
+    archives sourceJar
     archives javadocJar
 }
 
@@ -156,17 +199,20 @@ publishing {
             artifactId project.archivesBaseName
             version project.version
             from components.java
-            artifact sourcesJar {
-                classifier "sources"
+            artifact sourceJar {
+                classifier 'sources'
             }
             artifact apiJar {
-                classifier "api"
+                classifier 'api'
             }
             artifact devJar {
-                classifier "dev"
+                classifier 'dev'
+            }
+            artifact deobfJar {
+                classifier 'deobf'
             }
             artifact javadocJar {
-                classifier "javadoc"
+                classifier 'javadoc'
             }
         }
     }
@@ -187,65 +233,63 @@ curseforge {
         id = "245586"
         changelog = file("CHANGELOG.txt")
         releaseType = "alpha"
-        addGameVersion("1.10.2")
+        addGameVersion("1.11")
         def projName = "OreSpawn"
         def displayVersion = getVersion("VERSION", mod_file)
         if (System.getenv().BUILD_NUMBER) {
-            displayVersion += "." + System.getenv().BUILD_NUMBER
+            displayVersion += '.' + System.getenv().BUILD_NUMBER
         }
         mainArtifact(jar) {
-            displayName = "$projName $displayVersion"
-//            relations {
-//            }
+            displayName = "$project.description $displayVersion"
+//          relations {
+//          }
         }
         addArtifact(apiJar) {
-            displayName = "$projName $displayVersion API"
+            displayName = "$project.description $displayVersion API"
         }
-        addArtifact(sourcesJar) {
-            displayName = "$projName $displayVersion Sources"
+        addArtifact(sourceJar) {
+            displayName = "$project.description $displayVersion Sources"
         }
-        addArtifact(devJar) {
-            displayName = "$projName $displayVersion Development"
+        addArtifact(deobfJar) {
+            displayName = "$project.description $displayVersion Development"
         }
         addArtifact(javadocJar) {
-            displayName = "$projName $displayVersion Javadoc"
+            displayName = "$project.description $displayVersion Javadoc"
         }
     }
 }
 
-String getModFile() {
-    String path = "";
-    FileTree tree = fileTree(dir: "src/main/java")
-    tree.include "**/*.java"
-    tree.visit { element ->
-        if (element.file.isFile()) {
-            element.file.eachLine { String s ->
-                s = s.trim();
-                if (s.startsWith("@Mod")) {
-                    path = "src/main/java/$element.relativePath"
-                }
-            }
-        }
+sonarqube {
+    properties {
+        property 'sonar.host.url', secret.sonarHost
+        property 'sonar.organization', secret.sonarOrganization
+        property 'sonar.login', secret.sonarToken
+        property 'sonar.projectName', project.archivesBaseName
+        property 'sonar.projectKey', "$project.group:$project.archivesBaseName"
     }
-    return path;
+}
+
+String getModFile() {
+    String path = 'src/main/java/com/mcmoddev/orespawn/data/Constants.java'
+    return path
 }
 
 String getVersion(String type, String mod_file) {
-    String major = "0";
-    String revision = "0";
-    String patch = "0";
-    String prefix = "public static final String $type = \"";
+    String major = '0'
+    String revision = '0'
+    String patch = '0'
+    String prefix = "public static final String $type = \""
     File file = file(mod_file)
     file.eachLine { String s ->
-        s = s.trim();
+        s = s.trim()
         if (s.startsWith(prefix)) {
-            s = s.substring(prefix.length(), s.length() - 2);
-            String[] pts = s.split("\\.");
+            s = s.substring(prefix.length(), s.length() - 2)
+            String[] pts = s.split("\\.")
 
-            major = pts[0];
-            revision = pts[1];
-            patch = pts[2];
+            major = pts[0]
+            revision = pts[1]
+            patch = pts[2]
         }
     }
-    return "$major.$revision.$patch";
+    return "$major.$revision.$patch"
 }