Merge pull request #188 from gottsch/1.12.2-develop

1.12.2 develop

Author: gottsch

build.gradle

@@ -1,35 +1,23 @@
 buildscript {
     repositories {
-        jcenter()
-        maven { url = "http://files.minecraftforge.net/maven" }
+   		maven { url = "http://files.minecraftforge.net/maven" }
+        jcenter()       
         mavenCentral()
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
-        classpath 'org.ajoberstar:grgit:1.7.2'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:3.+'
     }
 }
-
 plugins {
-//	id 'io.franzbecker.gradle-lombok' version '3.1.0'
 	 //  must use gradle v3.0+ for this version of shadow (2.0.1).  Update gradle-wrapper.properties
-	id "com.github.johnrengelman.shadow" version "2.0.1"
+	id "com.github.johnrengelman.shadow" version "4.0.4"
 }
 
-apply plugin: 'net.minecraftforge.gradle.forge'
+apply plugin: 'net.minecraftforge.gradle'
 //Only edit below this line, the above code adds and enables the nessasary things for Forge to be setup.
+apply plugin: 'eclipse'
+apply plugin: 'maven-publish'
 
-ext {
-    // Open the Git repository in the parent directory.
-//    git = org.ajoberstar.grgit.Grgit.open(file('../'))
-
-    // Get commit id of HEAD.
-//    revision = git.head().id
-    // Alternative is using abbreviatedId of head() method.
-    // revision = git.head().abbreviatedId
-}
-
-//version = "mc${mc_version}-v${mod_version}-${git.head().abbreviatedId}"
 version = "mc${mc_version}-f${forge_version}-${mod_version_type}${mod_version}"
 group = "${package_group}" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "${mod_name}"
@@ -40,54 +28,68 @@ compileJava {
 }
 
 minecraft {
-    version = "${mc_version}-${forge_version}"
-    runDir = "run"
+    // The mappings can be changed at any time, and must be in the following format.
+    // snapshot_YYYYMMDD   Snapshot are built nightly.
+    // stable_#            Stables are built at the discretion of the MCP team.
+    // Use non-default mappings at your own risk. they may not always work.
+    // Simply re-run your setup task after changing the mappings to update your workspace.
+    mappings channel: 'snapshot', version: '20171003-1.12'
+    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
+    
+    // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
+
+    // Default run configurations.
+    // These can be tweaked, removed, or duplicated as needed.
+    runs {
+        client {
+            workingDirectory project.file('run')
+
+            // Recommended logging data for a userdev environment
+            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+
+            // Recommended logging level for the console
+            property 'forge.logging.console.level', 'debug'
+        }
 
-    if (project.hasProperty('mappings_version'))
-        mappings = project.mappings_version
-}
+        server {
+            // Recommended logging data for a userdev environment
+            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
 
-//Optional: change the project structure
-sourceSets.main{
-    java{
-		srcDirs 'src' //, 'test' //set the source folder as the /src subfolder
-	}
-    resources{
-		srcDirs 'src/resources' //set the resources folder as the /resources subfolder
-	}
+            // Recommended logging level for the console
+            property 'forge.logging.console.level', 'debug'
+        }
+    }
 }
 
-def gottschcore_path="../gottsch-minecraft-GottschCore/GottschCore${mc_version}/build/libs/GottschCore-mc${mc_version}-f${forge_version}-v${gottschcore_version}.jar"
-
+def gottschcore_path="../gottsch-minecraft-GottschCore/GottschCore${mc_version}/build/libs/GottschCore-mc${mc_version}-f${gottschcore_forge_version}-v${gottschcore_version}.jar"
+println gottschcore_path
 dependencies {
-compile files('../ModCommonLibs/libs/commons-cli-1.4.jar')
+	minecraft 'net.minecraftforge:forge:1.12.2-14.23.5.2854'
+	compile files('../ModCommonLibs/libs/commons-cli-1.4.jar')
 	//compile files(gottschcore_path)	
 	shadow files(gottschcore_path)	
-	compileOnly "vazkii.patchouli:Patchouli:${patchouli_version}"
 }
 
-repositories {
-    maven { 
-        name = 'Patchouli'
-        url = "https://maven.blamejared.com" 
+jar {
+    manifest {
+        attributes([
+            "Specification-Title": "${archivesBaseName}",
+            "Specification-Vendor": "Some Guys Software",
+            "Specification-Version": "1", // We are version 1 of ourselves
+            "Implementation-Title": "${archivesBaseName}-${version}",
+            "Implementation-Version": "${version}",
+            "Implementation-Vendor" :"Some Guys Software",
+            "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+        ])
     }
- }
-processResources
-{
-    // this will ensure that this task is redone when the versions change.
-    inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
-
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-                
-        // replace version and mcversion
-        expand 'version':project.version, 'mcversion':project.minecraft.version
-    } 
 }
 
 shadowJar {
+	// with version 4.0.4+ of ShadowJar, the dependencies are required to  instruct what files
+	// are included in the shadow
+	dependencies {
+     	include(dependency(files('../ModCommonLibs/libs/commons-cli-1.4.jar')))
+   }
     // move everything under "io.github" (which in the DelaunayTriangulator lib) to "com.someguyssoftware.dungeons2.triangulation"
     relocate "org.apache.commons.cli", "com.someguyssoftware.treasure2.cli"
 	// Replace the default JAR

gradle.properties

@@ -7,15 +7,17 @@ package_group=someguyssoftware.treasure2
 # user alpha, beta, or v (for version)
 mod_version_type=v
 
-mod_version=1.13.1
+mod_version=1.14.0
 
 #versions
 mc_version=1.12.2
-forge_version=14.23.5.2768
-mappings_version=snapshot_20171003
-gottschcore_version=1.13.1
+#forge_version=14.23.5.2768
+forge_version=14.23.5.2854
+mappings_version=20171003-1.12
+gottschcore_version=1.14.0
+gottschcore_forge_version=14.23.5.2854
 patchouli_version=1.0-20.108
 
 # paths
 dest_folder=E:/Minecraft/mods/1.12.2/
-dest_server_folder=F:/Minecraft Server/mods/
+dest_server_folder=F:/Minecraft Server 1.12.2/mods/

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Mon Sep 14 12:28:28 PDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1 @@
+{"meta":{"format_version":"3.6","creation_time":1606177658,"model_format":"modded_entity","box_uv":true},"name":"CardboardBoxEntity","geometry_name":"","modded_entity_version":"1.12","visible_box":[1,1,0],"layered_textures":true,"resolution":{"width":128,"height":128},"elements":[{"name":"cube","from":[-7,0,-7],"to":[7,14,7],"autouv":0,"color":6,"locked":false,"origin":[-7,0,-7],"faces":{"north":{"uv":[14,14,28,28],"texture":0},"east":{"uv":[0,14,14,28],"texture":0},"south":{"uv":[42,14,56,28],"texture":0},"west":{"uv":[28,14,42,28],"texture":0},"up":{"uv":[28,14,14,0],"texture":0},"down":{"uv":[42,0,28,14],"texture":0}},"uuid":"7cab9805-ecf6-ce70-6b82-3c2b0664b4fa"},{"name":"rightFlap","from":[-7,14,-7],"to":[0,15,7],"autouv":0,"color":1,"locked":false,"origin":[-7,14,0],"uv_offset":[28,29],"faces":{"north":{"uv":[42,43,49,44],"texture":0},"east":{"uv":[28,43,42,44],"texture":0},"south":{"uv":[63,43,70,44],"texture":0},"west":{"uv":[49,43,63,44],"texture":0},"up":{"uv":[49,43,42,29],"texture":0},"down":{"uv":[56,29,49,43],"texture":0}},"uuid":"d3376753-63c4-9bef-f50f-5de951b8f3fa"},{"name":"leftFlap","from":[0,14,-7],"to":[7,15,7],"autouv":0,"color":1,"locked":false,"origin":[8,14,0],"uv_offset":[0,28],"faces":{"north":{"uv":[14,42,21,43],"texture":0},"east":{"uv":[0,42,14,43],"texture":0},"south":{"uv":[35,42,42,43],"texture":0},"west":{"uv":[21,42,35,43],"texture":0},"up":{"uv":[21,42,14,28],"texture":0},"down":{"uv":[28,28,21,42],"texture":0}},"uuid":"cbcd12de-2c41-46d7-0150-c6ea084239fa"},{"name":"southFlap","from":[-7,13.999,0.9989999999999997],"to":[7,14.999,6.999],"autouv":0,"color":2,"locked":false,"origin":[0,14,7],"uv_offset":[42,7],"faces":{"north":{"uv":[48,13,62,14],"texture":0},"east":{"uv":[42,13,48,14],"texture":0},"south":{"uv":[68,13,82,14],"texture":0},"west":{"uv":[62,13,68,14],"texture":0},"up":{"uv":[62,13,48,7],"texture":0},"down":{"uv":[76,7,62,13],"texture":0}},"uuid":"3d03b67a-f700-64fc-0ea2-4786d167e0d4"},{"name":"northFlap","from":[-7,13.999000000000002,-6.999],"to":[7,14.999000000000002,-0.9990000000000006],"autouv":0,"color":2,"locked":false,"origin":[-7,14,-7],"uv_offset":[42,0],"faces":{"north":{"uv":[48,6,62,7],"texture":0},"east":{"uv":[42,6,48,7],"texture":0},"south":{"uv":[68,6,82,7],"texture":0},"west":{"uv":[62,6,68,7],"texture":0},"up":{"uv":[62,6,48,0],"texture":0},"down":{"uv":[76,0,62,6],"texture":0}},"uuid":"073f75b2-c62c-9ebe-41e4-2a500c292863"}],"outliner":["7cab9805-ecf6-ce70-6b82-3c2b0664b4fa","d3376753-63c4-9bef-f50f-5de951b8f3fa","cbcd12de-2c41-46d7-0150-c6ea084239fa","3d03b67a-f700-64fc-0ea2-4786d167e0d4","073f75b2-c62c-9ebe-41e4-2a500c292863"],"textures":[{"path":"/Users/jzmjsr/Documents/Blockbench/cardboard-box.png","name":"cardboard-box.png","folder":"Blockbench","namespace":"","id":"0","particle":false,"visible":true,"mode":"bitmap","saved":true,"uuid":"5b7d5a41-7c1a-f6ed-7fcf-b8af457c0d2b","source":"data:image/png;base64,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"}]}