Fix mixin - maybe?

Author: OreCruncher

.gitignore

@@ -40,3 +40,5 @@
 /*.launch
 /forge-1.11.2-13.20.0.2206-changelog.txt
 /secrets.properties
+/mcmodsrepo
+/out/

build.gradle

@@ -1,156 +1,197 @@
-// Credit for getting Mixins to work:
-// https://github.com/Darkhax-Minecraft/Nautilus/blob/master/build.gradle
-
 buildscript {
     repositories {
-        jcenter()
         maven {
-        	name = "Forge"
-        	url 'http://files.minecraftforge.net/maven'
+            url "http://files.minecraftforge.net/maven"
         }
-    	maven {
-		    url 'http://repo.spongepowered.org/maven'
-	    }
         maven {
-        	url 'https://plugins.gradle.org/m2/'
+            url "https://repo.spongepowered.org/repository/maven-public/"
         }
+        gradlePluginPortal()
+        //jcenter()
+        mavenCentral()
     }
     dependencies {
-		classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
-		classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT'
-        classpath 'gradle.plugin.com.matthewprenger:CurseGradle:1.4.0'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:3.+'
+        classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
     }
 }
 
-apply plugin: 'net.minecraftforge.gradle.forge'
+apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'org.spongepowered.mixin'
-apply plugin: 'com.matthewprenger.cursegradle'
-apply plugin: 'maven-publish' 
+apply plugin: 'maven-publish'
+
+//apply from: 'configuration.gradle'
 
-apply from: 'configuration.gradle'
+version = mod_version
+group = mod_group
+archivesBaseName = mod_id
 
 if (file('secrets.properties').exists()) {
-	println "Loading parameters from secrets.properties"
-	ext.secrets = new Properties()
-	file('secrets.properties').withReader {ext.secrets.load(it)}
+    println "Loading parameters from secrets.properties"
+    ext.secrets = new Properties()
+    file('secrets.properties').withReader {ext.secrets.load(it)}
 }
 
 repositories {
-    maven { url "http://chickenbones.net/maven/" }
-    maven { url "http://dvs1.progwml6.com/files/maven" }
-    maven { url "http://maven.tterrag.com" }
-    maven { url "https://repo.elytradev.com/" }
-    maven { url 'http://repo.spongepowered.org/maven' }
-    maven { url 'https://maven.mcmoddev.com' }
-    maven { url "https://maven.blamejared.com/" }
-    maven {
-        name = "CurseForge"
-        url = "https://minecraft.curseforge.com/api/maven/"
-    }
+    maven { url = "https://dvs1.progwml6.com/files/maven" }
+    maven { url = "https://maven.tterrag.com" }
+    maven { url = "https://repo.elytradev.com/" }
+    maven { url = 'https://repo.spongepowered.org/maven' }
+    maven { url = 'https://maven.mcmoddev.com' }
+    maven { url = "https://maven.blamejared.com/" }
+    maven { url = "https://maven.covers1624.net/" }
+    maven { url = "https://cursemaven.com" }
 }
 
-sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
 
 minecraft {
-	if (project.ext.has('secrets')) {
-		if (project.ext.secrets.uuid != null)
-    		clientRunArgs.AddAll(["--uuid ${project.ext.secrets.uuid}"])
-    	if (project.ext.secrets.username != null)
-    		clientRunArgs.AddAll(["--username ${project.ext.secrets.username}"])
-    	if (project.ext.secrets.password != null)
-    		clientRunArgs.AddAll(["--password ${project.ext.secrets.password}"])
-    	if (project.ext.secrets.jvmArgs != null) {
-    		clientJvmArgs.AddAll(project.ext.secrets.jvmArgs)
-    		serverJvmArgs.AddAll(project.ext.secrets.jvmArgs)
-    	}
+    // 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'
+    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')
+            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+            property 'forge.logging.console.level', 'debug'
+            property 'fml.coreMods.load', mod_core_plugin.replace('${mod_group}', mod_group).replace('${mod_id}', mod_id)
+
+            if (project.ext.has('secrets')) {
+                if (secrets.uuid != null)
+                    args '--uuid', "${secrets.uuid}"
+                if (secrets.username != null)
+                    args '--username', "${secrets.username}"
+                if (secrets.password != null)
+                    args '--password', "${secrets.password}"
+            }
+        }
+
+        server {
+            property 'fml.coreMods.load', mod_core_plugin.replace('${mod_group}', mod_group).replace('${mod_id}', mod_id)
+            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+            property 'forge.logging.console.level', 'debug'
+        }
     }
+}
 
-    runDir = "run"
-    replace '@VERSION@', project.ext.modVersion
-    replace '@FINGERPRINT@', project.ext.fingerprint
-    replace '@UPDATEURL@', project.ext.updateurl
-    mappings = project.ext.snapshot
+configurations {
+    embed
+    compile.extendsFrom(embed)
 }
 
-sourceSets {
-    main {
-        ext.refMap = "mixins.dsurround.refmap.json"
-    }
+mixin {
+    add sourceSets.main, "mixins.dsurround.refmap.json"
 }
 
 dependencies {
-	compile "craftstudio-api:CraftStudioAPI-universal-1.0.1.95:mc1.12:alpha"
-    compile "com.animania:animania-${project.mcVersion}-base:${project.animaniaBaseVersion}"
-    compile "com.animania:animania-${project.mcVersion}-farm:${project.animaniaFarmVersion}"
-    compile "com.animania:animania-${project.mcVersion}-extra:${project.animaniaExtraVersion}"
-	compile "serene-seasons:SereneSeasons-${project.mcVersion}:${project.ssVersion}:universal"
-	compile "codechicken-lib-1-8:CodeChickenLib-1.12.2:3.2.3.358:universal"
-	compile "forge-multipart-cbe:ForgeMultipart-1.12.2:2.6.2.83:universal"
-	compile "ctm:CTM:MC1.12.2:${project.ctmVersion}"
-	compile "cosmetic-armor-reworked:CosmeticArmorReworked:1.12.2:v3"
-	compile "littletiles:LittleTiles_v1.5.0:pre169_mc1.12.2"
-	compile "iron-chests:ironchest:1.12.2:7.0.72.847"
-    compile "biomes-o-plenty:BiomesOPlenty-1.12.2:7.0.1.2441:universal"
-    compile "org.spongepowered:mixin:0.8.2"
-    compile 'mcjty.theoneprobe:TheOneProbe-1.12:1.12-1.4.28-17'
-
-	//compile "creativecore:CreativeCore_v1.9.35_mc1.12.2"
-
-    deobfCompile "mezz.jei:jei_${project.mcVersion}:${project.jeiVersion}:api"
-    runtime "mezz.jei:jei_${project.mcVersion}:${project.jeiVersion}"
-    deobfCompile "team.chisel:Chisel:MC${project.mcVersion}-${project.chiselVersion}"
+    // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
+    // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
+    // The userdev artifact is a special name and will get all sorts of transformations applied to it.
+    minecraft 'net.minecraftforge:forge:1.12.2-14.23.5.2855'
+
+    compile "curse.maven:CraftStudioAPI-268704:2661859"
+    compile "com.animania:animania-${minecraft_version}-base:2.0.3.28"
+    compile "com.animania:animania-${minecraft_version}-farm:1.0.2.28"
+    compile "com.animania:animania-${minecraft_version}-extra:1.0.2.28"
+    compileOnly "curse.maven:CosmeticArmorReworked-237307:2660068"
+    compileOnly "curse.maven:IronChest-228756:2747935"
+    compileOnly "curse.maven:TheOneProbe-245211:2667280"
+    compileOnly "mezz.jei:jei_${minecraft_version}:4.16.1.301"
 
     if (fileTree(dir: 'libs').filter { it.name.startsWith('OreLib') }.getFiles().size() == 0)
-        compile "orelib:OreLib:1.12.2:3.6.0.1"
+        compile "curse.maven:OreLib-307806:2820815"
+
+    compileOnly "team.chisel:Chisel:MC${minecraft_version}-1.0.2.45"
+    compileOnly "curse.maven:BiomesOPlenty-220318:2715506"
+    compileOnly "curse.maven:CreativeCore-257814:3467576"
+    compileOnly "curse.maven:LittleTiles-257818:3483878"
+    compileOnly "curse.maven:SereneSeasons-291874:2799213"
+    compileOnly "curse.maven:CTM-267602:2915363"
+
+    embed("org.spongepowered:mixin:0.8") {
+        exclude module: "asm-commons"
+        exclude module: "asm-tree"
+        exclude module: "launchwrapper"
+        exclude module: "guava"
+        exclude module: "log4j-core"
+        exclude module: "gson"
+        exclude module: "commons-io"
+    }
 }
 
-processResources
-{
-    // this will ensure that this task is redone when the versions change.
+processResources {
     inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
+    inputs.property "mcversion", 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
+
+        expand 'mod_id': mod_id, 'mod_name': mod_name, 'version': project.version,
+                'mcversion': minecraft_version, 'mod_description': mod_description,
+                'mod_author': mod_author, 'update_url': update_url
     }
-        
-    // copy everything else that's not the mcmod.info
+
     from(sourceSets.main.resources.srcDirs) {
         exclude 'mcmod.info'
     }
 }
 
+// Example for how to get properties into the manifest for reading by the runtime..
 jar {
+    from {
+        configurations.embed.collect { it.isDirectory() ? it : zipTree(it) }
+    } {
+        exclude "LICENSE.txt", "META-INF/MANIFSET.MF", "META-INF/maven/**", "META-INF/*.RSA", "META-INF/*.SF"
+    }
+
     // Add CREDITS.md
     into('/') {
         from('CREDITS.md')
     }
-    
-    manifest.attributes(
-        "FMLCorePluginContainsFMLMod": "true",
-        "ForceLoadAsMod": "true",
-	    "TweakClass": "org.spongepowered.asm.launch.MixinTweaker",
-        "MixinConfigs": "mixins.dsurround.json",
-        "FMLCorePlugin": "org.orecruncher.dsurround.mixins.TransformLoader"
-    )
-}
 
-// https://gist.github.com/matthewprenger/9b2da059b89433a01c1c
-task signJar(type: SignJar) {
-    onlyIf { // Skip the task if our secret data isn't available
-        project.hasProperty('keyStore')
+    manifest {
+        attributes([
+                "FMLCorePlugin": mod_core_plugin.replace('${mod_group}', mod_group).replace('${mod_id}', mod_id),
+                "FMLCorePluginContainsFMLMod": "false",
+                "ForceLoadAsMod": "true",
+                "TweakClass": "org.spongepowered.asm.launch.MixinTweaker",
+                "MixinConfigs": mod_mixin_configs.replace('${mod_id}', mod_id),
+                "Specification-Title": "${mod_id}",
+                "Specification-Vendor": "OreCruncher",
+                "Specification-Version": "1", // We are version 1 of ourselves
+                "Implementation-Title": project.name,
+                "Implementation-Version": "${minecraft_version}-${mod_version}",
+                "Implementation-Vendor" :"OreCruncher",
+                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+        ])
     }
-
-    keyStore = project.keyStore // This needs to be a path to the keystore file
-    alias = project.keyStoreAlias
-    storePass = project.keyStorePass
-    keyPass = project.keyStoreKeyPass
-    inputFile = jar.archivePath
-    outputFile = jar.archivePath
 }
 
-build.dependsOn signJar
+// Example configuration to allow publishing using the maven-publish task
+// This is the preferred method to reobfuscate your jar file
+jar.finalizedBy('reobfJar')
+// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
+//publish.dependsOn('reobfJar')
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            artifact jar
+        }
+    }
+    repositories {
+        maven {
+            url "file:///${project.projectDir}/mcmodsrepo"
+        }
+    }
+}

configuration.gradle

@@ -1,22 +1,23 @@
 //  Basics defined up here to make life easier
 //  Tweak the defs, not the others!
 def mcVersion    = "1.12.2"
-def modVersion   = "3.6.2.1"
-def modDesignator= ""
+def modVersion   = "3.6.3.0"
+def modDesignator= "BETA"
 //def forgeVersion = "14.23.5.2779"
-def forgeVersion = "14.23.5.2847"
-def snapshot     = "stable_39"
+def forgeVersion = "14.23.5.2855"
+def snapshot     = "20171003-1.12"
 
-project.ext.jeiVersion    	        = "4.16.1.302"
+project.ext.jeiVersion    	        = "4.16.1.301"
 project.ext.chiselVersion 	        = "1.0.2.45"
 project.ext.ctmVersion    	        = "1.0.2.31"
 project.ext.ssVersion     	        = "1.2.18"
-project.ext.animaniaBaseVersion	    = "2.0.0.24"
-project.ext.animaniaFarmVersion	    = "1.0.0.24"
-project.ext.animaniaExtraVersion	= "1.0.0.24"
+project.ext.animaniaBaseVersion	    = "2.0.3.28"
+project.ext.animaniaFarmVersion	    = "1.0.2.28"
+project.ext.animaniaExtraVersion	= "1.0.2.28"
 project.ext.mbVersion               = "1.0.4"
 
 // General Mod version stuff
+project.ext.modId = "dsurround"
 project.ext.mcVersion    = mcVersion
 project.ext.modVersion   = modVersion
 project.ext.modDesignator= modDesignator
@@ -27,14 +28,14 @@ project.ext.fingerprint  = "7a2128d395ad96ceb9d9030fbd41d035b435753a"
 project.ext.updateurl    = "https://raw.githubusercontent.com/OreCruncher/DynamicSurroundings/master/version.json"
 
 // JAR tagging
-project.minecraft.version = "${mcVersion}-${forgeVersion}"
+//project.minecraft.version = "${mcVersion}-${forgeVersion}"
 
 // Build Stuff
 project.ext.snapshot = snapshot
 
 // Output to the log for posterity
 println "******************************************"
-println "JAR tag     : " + project.minecraft.version + project.ext.modDesignator
+//println "JAR tag     : " + project.minecraft.version + project.ext.modDesignator
 println "Archive     : " + project.archivesBaseName
 println "Mod Version : " + project.ext.modVersion
 println "Forge       : " + forgeVersion + " (" + project.ext.snapshot + ")"

gradle.properties

@@ -1,3 +1,19 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
+org.gradle.daemon=false
+
+# Project specific stuff
+mod_id=dsurround
+mod_name=Dynamic Surroundings
+mod_group=org.orecruncher.dsurround
+mod_version=3.6.3.0BETA
+mod_author=OreCruncher
+mod_description=Adds a variety of sound and visual effects to improve your Minecraft experience
+minecraft_version=1.12.2
+forge_version=14.23.5.2855
+mappings_channel=snapshot
+mappings_version=20171003-1.12
+mod_core_plugin=${mod_group}.mixins.TransformLoader
+mod_mixin_configs=mixins.${mod_id}.json
+update_url=https://raw.githubusercontent.com/OreCruncher/DynamicSurroundings/master/version.json

libs/CreativeCore_v1.9.69_mc1.12.2.jar

@@ -36,6 +36,7 @@
 import net.minecraft.world.biome.Biome;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+
 import sereneseasons.api.season.BiomeHooks;
 import sereneseasons.api.season.Season;
 import sereneseasons.api.season.SeasonHelper;
@@ -136,4 +137,4 @@ public static boolean isWorldWhitelisted(@Nonnull final World world) {
 		return SeasonsConfig.isDimensionWhitelisted(world.provider.getDimension());
 	}
 
-}
+}