update to latest CNPC and FML, some build changes

Author: GlassSpirit

build.gradle

@@ -14,14 +14,16 @@ buildscript {
         }
     }
     dependencies {
-        classpath "net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT"
-        classpath "org.spongepowered:mixingradle:0.6-SNAPSHOT"
-        classpath "gradle.plugin.org.spongepowered:spongegradle:0.8.1"
+        classpath "net.minecraftforge.gradle:ForgeGradle:3.+"
+        classpath "org.spongepowered:mixingradle:0.7-SNAPSHOT"
     }
 }
 
-apply plugin: "net.minecraftforge.gradle.forge"
-apply plugin: "org.spongepowered.plugin"
+plugins {
+    id 'org.spongepowered.plugin' version '0.9.0'
+}
+
+apply plugin: "net.minecraftforge.gradle"
 apply plugin: "org.spongepowered.mixin"
 
 version = modVersion
@@ -31,36 +33,51 @@ archivesBaseName = modBaseName
 sourceCompatibility = targetCompatibility = 1.8
 compileJava.options.encoding = compileTestJava.options.encoding = "UTF-8"
 
+minecraft {
+    mappings channel: "stable", version: "39-1.12"
+}
+
 sponge {
     plugin {
         meta {
             id = "cnpc-ntrpg"
+            version = modVersion
         }
     }
 }
 
-minecraft {
-    version = project.forgeVersion
-    mappings = project.mcpVersion
-    runDir = "run"
-}
-
 repositories {
     mavenCentral()
     maven { url = "https://jitpack.io" }
     maven { url = "https://repo.aikar.co/content/groups/aikar/" }
 }
 
 dependencies {
+    minecraft "net.minecraftforge:forge:" + project.forgeVersion
     implementation("org.spongepowered:spongeforge:" + project.spongeForgeVersion + ":dev") {
         exclude module: "testmods"
     }
     implementation "com.github.Sponge-RPG-dev.NT-RPG:Sponge-7:30.5.2020SpongeSpigot"
+    implementation fileTree("$projectDir/libs")
 }
 
-configurations.all {
+/*configurations.all {
     resolutionStrategy.cacheDynamicVersionsFor 10, "minutes"
     resolutionStrategy.cacheChangingModulesFor 10, "minutes"
+}*/
+
+// Comment out for non-mixin build
+jar {
+    manifest {
+        attributes(
+                "TweakClass": "org.spongepowered.asm.launch.MixinTweaker",
+                "TweakOrder": 0,
+                "MixinConfigs": "mixins.cnpcntrpg.json",
+                "FMLCorePluginContainsFMLMod": "true",
+                "ForceLoadAsMod": "true",
+                "FMLAT": "cnpcs_at.cfg"
+        )
+    }
 }
 
 sourceSets {
@@ -69,16 +86,4 @@ sourceSets {
     }
 }
 
-processResources {
-    inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
-
-    from(sourceSets.main.resources.srcDirs) {
-        include "mcmod.info"
-        expand "version": project.version, "mcversion": project.minecraft.version
-    }
-
-    from(sourceSets.main.resources.srcDirs) {
-        exclude "mcmod.info"
-    }
-}
+jar.finalizedBy("reobfJar")

gradle.properties

@@ -1,6 +1,7 @@
+org.gradle.jvmargs=-Xmx3G
+org.gradle.daemon=false
 modGroup=ru.glassspirit
-modVersion=1.6
+modVersion=1.7
 modBaseName=CNPC-NTRPG
-forgeVersion=1.12.2-14.23.5.2847
+forgeVersion=1.12.2-14.23.5.2854
 spongeForgeVersion=1.12.2-2838-7.3.0
-mcpVersion=stable_39

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip

src/main/java/ru/glassspirit/cnpcntrpg/sponge/CnpcRpgSponge.java

@@ -22,7 +22,6 @@
         id = "cnpc-ntrpg",
         name = "NT-RPG CustomNPCs Bridge",
         description = "Plugin that connects NT-RPG plugin and CustomNPCs mod and adds some useful stuff",
-        version = "1.6",
         authors = {"GlassSpirit"},
         dependencies = {
                 @Dependency(id = "nt-rpg"),