Merge pull request #6 from Team-RTG/1.10.2-dev

Merged dev into master (0.1.0-UNSTABLE-ALPHA-1)

build.gradle

@@ -14,7 +14,7 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 
 sourceCompatibility = targetCompatibility = 1.8
 
-def parseprops(File cfg) {
+static def parseprops(File cfg) {
     cfg.withReader {
         def prop = new Properties()
         prop.load(it)
@@ -23,29 +23,30 @@ def parseprops(File cfg) {
 }
 
 ext.ref = parseprops(file('build.properties'))
-ext.ref.mod_deps = parseprops(file('mod_deps.properties'))
 
 group = ref.package_base + '.' + ref.mod_id
-archivesBaseName = ref.mod_abbr
-version = ref.mc_version + '-' + ref.mod_version
+archivesBaseName = (ref.mod_name as String) + '-' + (ref.mc_version as String)
+version = ref.mod_version
+
+dependencies {
+    provided fileTree(dir: 'libs', include: '*.jar')
+}
 
 minecraft {
-    version = (ref.mcf_postfix!='') ? ref.mcf_version + '-' + ref.mcf_postfix : ref.mcf_version
+    version = (ref.mcf_suffix!='') ? ref.mcf_version + '-' + ref.mcf_suffix : ref.mcf_version
+    mappings = ref.mcp_mappings
     runDir = ref.run_dir
-    mappings = ref.mappings
-    replace '@MOD_NAME@', ref.mod_name
-    replace '@MOD_ID@', ref.mod_id
-    replace '@MOD_VERSION@', version
-    replace '@MCF_VERSION@', ref.mcf_version
-    if (ref.mod_deps!="") replace '@MOD_DEPS@', ";" + ref.mod_deps.depstring
-    else replace '@MOD_DEPS@', ''
+    makeObfSourceJar = false
+    replace '= "appalachia";', '= "' + (ref.mod_id as String) + '";'
+    replace '= "Appalachia";', '= "' + (ref.mod_name as String) + '";'
+    replace '@MOD_VERSION@', project.version
+    replace '0.0-MCF+MINVER', ref.mcf_minver
+    replace '9001.0-MCF+MAXVER', ref.mcf_maxver
+    replace '0.0-RTG+MINVER', ref.rtg_minver
+    replace '9001.0-RTG+MINVER', ref.rtg_maxver
     replaceIn 'ModInfo.java'
 }
 
-dependencies {
-    provided fileTree(dir: 'libs', include: '*.jar')
-}
-
 processResources {
     from(sourceSets.main.resources.srcDirs) {
         include 'mcmod.info'
@@ -69,8 +70,18 @@ sourceJar {classifier = 'src'}
 // For a debugging session used 'gradle -DEBUG [runClient|runServer]'
 allprojects {
     tasks.withType(JavaExec) {
-        jvmArgs '-Xms2G', '-Xmx4G'
+// disabled to possibly alleviate testing issues on cumputers with low memory
+//      jvmArgs '-Xms2G', '-Xmx4G'
         if (System.getProperty("EBUG")!=null)
             jvmArgs '-agentlib:jdwp=transport=dt_socket,address=localhost:5005,server=y,suspend=y'
     }
 }
+
+// use -Dwarn|-Dwarnall CLI arguement for verbose compiler warnings
+// -Dwarn covers the 3 most common warnings only
+tasks.withType(JavaCompile) {
+    if (System.getProperty("warn") != null)
+        options.compilerArgs << "-Xlint:unchecked" << "-Xlint:rawtypes" << "-Xlint:deprecation"
+    if (System.getProperty("warnall") != null)
+        options.compilerArgs << "-Xlint:all"
+}

build.properties

@@ -1,19 +1,22 @@
 # 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_id=appalachia
-mod_abbr=Appalachia
 mod_name=Appalachia
-mod_desc=Minecraft mod that adds biomes inspired by the Appalachia region of the United States of America.
-mod_version=0.0.1
+mod_desc=Minecraft mod that adds biomes inspired by the Appalachian region of North America.
+mod_version=0.1.0-UNSTABLE-ALPHA-1
 mc_version=1.10.2
-mod_url=https://github.com/whichonespink44/Appalachia
-mod_author="WhichOnesPink"
+mod_url=https://github.com/Team-RTG/Appalachia
+mod_author="Team RTG"
 mod_creds=
 mod_logo=assets/appalachia/logo.png
-mcf_version=12.18.1.2011
-# mcf_postfix is the branch postfix (without '-') on the Forge version when it's not the default branch in the Forge repo
-# This should be same as mc_version, eg Non-default: 1.9.4-12.17.0.1974-1.9.4, Default: 1.9.4-12.17.0.1976
-mcf_postfix=
-mappings=snapshot_nodoc_20160724
+rtg_minver=4.1.1.3
+rtg_maxver=
+mcf_version=12.18.1.2094
+mcf_minver=12.18.1.2011
+mcf_maxver=
+# mcf_suffix is the branch suffix (without '-') on the Forge version when it's not the default branch in the Forge repo
+# This may be the same as mc_version, eg Non-default: 1.9.4-12.17.0.1974-1.9.4, Default: 1.9.4-12.17.0.1976
+mcf_suffix=
+mcp_mappings=snapshot_nodoc_20160830
 run_dir=run
 package_base=org.teamrtg

etc/assets/wood/blockstates/fence_autumn_charcoal.json

@@ -0,0 +1,17 @@
+{
+    "multipart": [
+        {   "apply": { "model": "appalachia:fence_autumn_charcoal_post" }},
+        {   "when": { "north": "true" },
+            "apply": { "model": "appalachia:fence_autumn_charcoal_side", "uvlock": true }
+        },
+        {   "when": { "east": "true" },
+            "apply": { "model": "appalachia:fence_autumn_charcoal_side", "y": 90, "uvlock": true }
+        },
+        {   "when": { "south": "true" },
+            "apply": { "model": "appalachia:fence_autumn_charcoal_side", "y": 180, "uvlock": true }
+        },
+        {   "when": { "west": "true" },
+            "apply": { "model": "appalachia:fence_autumn_charcoal_side", "y": 270, "uvlock": true }
+        }
+    ]
+}

etc/assets/wood/blockstates/fence_gate_autumn_charcoal.json

@@ -0,0 +1,20 @@
+{
+    "variants": {
+        "facing=south,in_wall=false,open=false": { "model": "appalachia:fence_gate_autumn_charcoal_closed" },
+        "facing=west,in_wall=false,open=false":  { "model": "appalachia:fence_gate_autumn_charcoal_closed", "y": 90, "uvlock": true },
+        "facing=north,in_wall=false,open=false": { "model": "appalachia:fence_gate_autumn_charcoal_closed", "y": 180, "uvlock": true },
+        "facing=east,in_wall=false,open=false":  { "model": "appalachia:fence_gate_autumn_charcoal_closed", "y": 270, "uvlock": true },
+        "facing=south,in_wall=false,open=true": { "model": "appalachia:fence_gate_autumn_charcoal_open" },
+        "facing=west,in_wall=false,open=true":  { "model": "appalachia:fence_gate_autumn_charcoal_open", "y": 90, "uvlock": true },
+        "facing=north,in_wall=false,open=true": { "model": "appalachia:fence_gate_autumn_charcoal_open", "y": 180, "uvlock": true },
+        "facing=east,in_wall=false,open=true":  { "model": "appalachia:fence_gate_autumn_charcoal_open", "y": 270, "uvlock": true },
+        "facing=south,in_wall=true,open=false": { "model": "appalachia:fence_gate_autumn_charcoal_wall_closed" },
+        "facing=west,in_wall=true,open=false":  { "model": "appalachia:fence_gate_autumn_charcoal_wall_closed", "y": 90, "uvlock": true },
+        "facing=north,in_wall=true,open=false": { "model": "appalachia:fence_gate_autumn_charcoal_wall_closed", "y": 180, "uvlock": true },
+        "facing=east,in_wall=true,open=false":  { "model": "appalachia:fence_gate_autumn_charcoal_wall_closed", "y": 270, "uvlock": true },
+        "facing=south,in_wall=true,open=true": { "model": "appalachia:fence_gate_autumn_charcoal_wall_open" },
+        "facing=west,in_wall=true,open=true":  { "model": "appalachia:fence_gate_autumn_charcoal_wall_open", "y": 90, "uvlock": true },
+        "facing=north,in_wall=true,open=true": { "model": "appalachia:fence_gate_autumn_charcoal_wall_open", "y": 180, "uvlock": true },
+        "facing=east,in_wall=true,open=true":  { "model": "appalachia:fence_gate_autumn_charcoal_wall_open", "y": 270, "uvlock": true }
+    }
+}

etc/assets/wood/blockstates/log_autumn_charcoal.json

@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "axis=y":  { "model": "appalachia:log_autumn_charcoal" },
+        "axis=z":   { "model": "appalachia:log_autumn_charcoal_side" },
+        "axis=x":   { "model": "appalachia:log_autumn_charcoal_side", "y": 90 },
+        "axis=none": { "model": "appalachia:log_autumn_charcoal" }
+    }
+}

etc/assets/wood/blockstates/planks_autumn_charcoal.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "appalachia:planks_autumn_charcoal" }
+    }
+}

etc/assets/wood/blockstates/slab_autumn_charcoal.json

@@ -0,0 +1,6 @@
+{
+    "variants": {
+        "half=bottom": { "model": "appalachia:slab_autumn_charcoal" },
+        "half=top": { "model": "appalachia:slab_autumn_charcoal_upper" }
+    }
+}

etc/assets/wood/blockstates/stairs_autumn_charcoal.json

@@ -0,0 +1,44 @@
+{
+    "variants": {
+        "facing=east,half=bottom,shape=straight":  { "model": "appalachia:stairs_autumn_charcoal" },
+        "facing=west,half=bottom,shape=straight":  { "model": "appalachia:stairs_autumn_charcoal", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=straight": { "model": "appalachia:stairs_autumn_charcoal", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=straight": { "model": "appalachia:stairs_autumn_charcoal", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=outer_right":  { "model": "appalachia:stairs_autumn_charcoal_outer" },
+        "facing=west,half=bottom,shape=outer_right":  { "model": "appalachia:stairs_autumn_charcoal_outer", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=outer_right": { "model": "appalachia:stairs_autumn_charcoal_outer", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=outer_right": { "model": "appalachia:stairs_autumn_charcoal_outer", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=outer_left":  { "model": "appalachia:stairs_autumn_charcoal_outer", "y": 270, "uvlock": true },
+        "facing=west,half=bottom,shape=outer_left":  { "model": "appalachia:stairs_autumn_charcoal_outer", "y": 90, "uvlock": true },
+        "facing=south,half=bottom,shape=outer_left": { "model": "appalachia:stairs_autumn_charcoal_outer" },
+        "facing=north,half=bottom,shape=outer_left": { "model": "appalachia:stairs_autumn_charcoal_outer", "y": 180, "uvlock": true },
+        "facing=east,half=bottom,shape=inner_right":  { "model": "appalachia:stairs_autumn_charcoal_inner" },
+        "facing=west,half=bottom,shape=inner_right":  { "model": "appalachia:stairs_autumn_charcoal_inner", "y": 180, "uvlock": true },
+        "facing=south,half=bottom,shape=inner_right": { "model": "appalachia:stairs_autumn_charcoal_inner", "y": 90, "uvlock": true },
+        "facing=north,half=bottom,shape=inner_right": { "model": "appalachia:stairs_autumn_charcoal_inner", "y": 270, "uvlock": true },
+        "facing=east,half=bottom,shape=inner_left":  { "model": "appalachia:stairs_autumn_charcoal_inner", "y": 270, "uvlock": true },
+        "facing=west,half=bottom,shape=inner_left":  { "model": "appalachia:stairs_autumn_charcoal_inner", "y": 90, "uvlock": true },
+        "facing=south,half=bottom,shape=inner_left": { "model": "appalachia:stairs_autumn_charcoal_inner" },
+        "facing=north,half=bottom,shape=inner_left": { "model": "appalachia:stairs_autumn_charcoal_inner", "y": 180, "uvlock": true },
+        "facing=east,half=top,shape=straight":  { "model": "appalachia:stairs_autumn_charcoal", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=straight":  { "model": "appalachia:stairs_autumn_charcoal", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=straight": { "model": "appalachia:stairs_autumn_charcoal", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=straight": { "model": "appalachia:stairs_autumn_charcoal", "x": 180, "y": 270, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "appalachia:stairs_autumn_charcoal_outer", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "appalachia:stairs_autumn_charcoal_outer", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "appalachia:stairs_autumn_charcoal_outer", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "appalachia:stairs_autumn_charcoal_outer", "x": 180, "y": 270, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "appalachia:stairs_autumn_charcoal_outer", "x": 180, "y": 90, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "appalachia:stairs_autumn_charcoal_outer", "x": 180, "y": 270, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "appalachia:stairs_autumn_charcoal_outer", "x": 180, "y": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "appalachia:stairs_autumn_charcoal_outer", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "appalachia:stairs_autumn_charcoal_inner", "x": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "appalachia:stairs_autumn_charcoal_inner", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "appalachia:stairs_autumn_charcoal_inner", "x": 180, "y": 90, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "appalachia:stairs_autumn_charcoal_inner", "x": 180, "y": 270, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "appalachia:stairs_autumn_charcoal_inner", "x": 180, "y": 90, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "appalachia:stairs_autumn_charcoal_inner", "x": 180, "y": 270, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "appalachia:stairs_autumn_charcoal_inner", "x": 180, "y": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_left": { "model": "appalachia:stairs_autumn_charcoal_inner", "x": 180, "uvlock": true }
+    }
+}

etc/assets/wood/models/block/fence_autumn_charcoal.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/fence_inventory",
+    "textures": {
+        "texture": "appalachia:blocks/planks_autumn_charcoal"
+    }
+}

etc/assets/wood/models/block/fence_autumn_charcoal_inventory.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/fence_inventory",
+    "textures": {
+        "texture": "appalachia:blocks/planks_autumn_charcoal"
+    }
+}

etc/assets/wood/models/block/fence_autumn_charcoal_post.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/fence_post",
+    "textures": {
+        "texture": "appalachia:blocks/planks_autumn_charcoal"
+    }
+}

etc/assets/wood/models/block/fence_autumn_charcoal_side.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/fence_side",
+    "textures": {
+        "texture": "appalachia:blocks/planks_autumn_charcoal"
+    }
+}

etc/assets/wood/models/block/fence_gate_autumn_charcoal_closed.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/fence_gate_closed",
+    "textures": {
+        "texture": "appalachia:blocks/planks_autumn_charcoal"
+    }
+}

etc/assets/wood/models/block/fence_gate_autumn_charcoal_open.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/fence_gate_open",
+    "textures": {
+        "texture": "appalachia:blocks/planks_autumn_charcoal"
+    }
+}

etc/assets/wood/models/block/fence_gate_autumn_charcoal_wall_closed.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/wall_gate_closed",
+    "textures": {
+        "texture": "appalachia:blocks/planks_autumn_charcoal"
+    }
+}

etc/assets/wood/models/block/fence_gate_autumn_charcoal_wall_open.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/wall_gate_open",
+    "textures": {
+        "texture": "appalachia:blocks/planks_autumn_charcoal"
+    }
+}

etc/assets/wood/models/block/log_autumn_charcoal.json

@@ -0,0 +1,7 @@
+{
+    "parent": "block/cube_column",
+    "textures": {
+        "end": "appalachia:blocks/log_autumn_charcoal_top",
+        "side": "appalachia:blocks/log_autumn_charcoal"
+    }
+}

etc/assets/wood/models/block/log_autumn_charcoal_side.json

@@ -0,0 +1,7 @@
+{
+    "parent": "block/column_side",
+    "textures": {
+        "end": "appalachia:blocks/log_autumn_charcoal_top",
+        "side": "appalachia:blocks/log_autumn_charcoal"
+    }
+}

etc/assets/wood/models/block/planks_autumn_charcoal.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "appalachia:blocks/planks_autumn_charcoal"
+    }
+}

etc/assets/wood/models/block/slab_autumn_charcoal.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/half_slab",
+    "textures": {
+        "bottom": "appalachia:blocks/planks_autumn_charcoal",
+        "top": "appalachia:blocks/planks_autumn_charcoal",
+        "side": "appalachia:blocks/planks_autumn_charcoal"
+    }
+}

etc/assets/wood/models/block/slab_autumn_charcoal_upper.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/upper_slab",
+    "textures": {
+        "bottom": "appalachia:blocks/planks_autumn_charcoal",
+        "top": "appalachia:blocks/planks_autumn_charcoal",
+        "side": "appalachia:blocks/planks_autumn_charcoal"
+    }
+}

etc/assets/wood/models/block/stairs_autumn_charcoal.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/stairs",
+    "textures": {
+        "bottom": "appalachia:blocks/planks_autumn_charcoal",
+        "top": "appalachia:blocks/planks_autumn_charcoal",
+        "side": "appalachia:blocks/planks_autumn_charcoal"
+    }
+}

etc/assets/wood/models/block/stairs_autumn_charcoal_inner.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/inner_stairs",
+    "textures": {
+        "bottom": "appalachia:blocks/planks_autumn_charcoal",
+        "top": "appalachia:blocks/planks_autumn_charcoal",
+        "side": "appalachia:blocks/planks_autumn_charcoal"
+    }
+}

etc/assets/wood/models/block/stairs_autumn_charcoal_outer.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/outer_stairs",
+    "textures": {
+        "bottom": "appalachia:blocks/planks_autumn_charcoal",
+        "top": "appalachia:blocks/planks_autumn_charcoal",
+        "side": "appalachia:blocks/planks_autumn_charcoal"
+    }
+}

etc/assets/wood/models/item/fence_autumn_charcoal.json

@@ -0,0 +1,3 @@
+{
+    "parent": "appalachia:block/fence_autumn_charcoal_inventory"
+}

etc/assets/wood/models/item/fence_gate_autumn_charcoal.json

@@ -0,0 +1,3 @@
+{
+    "parent": "appalachia:block/fence_gate_autumn_charcoal_closed"
+}

etc/assets/wood/models/item/log_autumn_charcoal.json

@@ -0,0 +1,3 @@
+{
+    "parent": "appalachia:block/log_autumn_charcoal"
+}

etc/assets/wood/models/item/planks_autumn_charcoal.json

@@ -0,0 +1,3 @@
+{
+    "parent": "appalachia:block/planks_autumn_charcoal"
+}

etc/assets/wood/models/item/slab_autumn_charcoal.json

@@ -0,0 +1,3 @@
+{
+    "parent": "appalachia:block/slab_autumn_charcoal"
+}

etc/assets/wood/models/item/stairs_autumn_charcoal.json

@@ -0,0 +1,3 @@
+{
+    "parent": "appalachia:block/stairs_autumn_charcoal"
+}