Version 1.1

Version 1.1 Version 1.1 Version 1.1 Version 1.1
poqdavid · Sep 5, 2021 · fae55d9 · fae55d9
1 parent 8bc64ad
commit fae55d9
Show file tree

Hide file tree

Showing 14 changed files with 1,004 additions and 161 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,31 @@
 buildscript {
     repositories {
-        jcenter()
-        maven { url = "http://files.minecraftforge.net/maven" }
+        mavenCentral()
+        maven {
+            name = "forge"
+			url = "https://files.minecraftforge.net/maven"
+		}
+        maven {
+            name = "oss-sonatype-public"
+            url = "https://oss.sonatype.org/content/repositories/public/"
+        }
+        maven {
+            name = "Sponge"
+            url = "https://repo.spongepowered.org/maven"
+        }
+        maven {
+            name = "Gradle-Plugins"
+            url = "https://plugins.gradle.org/m2/"
+        }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:3.+'
-        classpath "com.github.jengelman.gradle.plugins:shadow:5.2.0"
-        classpath "gradle.plugin.org.spongepowered:spongegradle:0.9.0"
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '4.+', changing: true
+
+        //classpath group: 'com.github.jengelman.gradle.plugins', name: 'shadow', version: '2.0.2'
+        classpath group: 'com.github.jengelman.gradle.plugins', name: 'shadow', version: '6.+' //Gradle 6
+
+        classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
+        classpath "org.spongepowered:SpongeGradle:0.11.5"
         classpath "gradle.plugin.net.minecrell:licenser:0.4.1"
     }
 }
@@ -18,28 +37,41 @@ plugins {
     id "signing"
 }
 
-apply plugin: 'net.minecraftforge.gradle'
-applyPlugin('com.github.johnrengelman.shadow', '5.2.0')
-applyPlugin('org.spongepowered.plugin', '0.9.0')
-applyPlugin('net.minecrell.licenser', '0.4.1')
+applyPlugin('net.minecraftforge.gradle')
+applyPlugin('com.github.johnrengelman.shadow')
+applyPlugin('net.minecrell.licenser')
+applyPlugin('org.spongepowered.mixin')
+applyPlugin('org.spongepowered.gradle.plugin')
 
-sponge.plugin.id = "${getProjectProperty('m_id')}"
-group = "${getProjectProperty('m_group')}"
-version = "${getProjectProperty('minecraft_version')}-${getProjectProperty('m_major')}.${getProjectProperty('m_minor')}-${getProjectProperty('m_api')}-${getProjectProperty('m_suffix')}"
+group = "${getProjectProperty('m_group')}" as Object
+version = "${getProjectProperty('minecraft_version')}-${getProjectProperty('m_major')}.${getProjectProperty('m_minor')}-${getProjectProperty('m_api')}-${getProjectProperty('m_suffix')}" as Object
 description = "${getProjectProperty('m_description')}"
 
 if (System.getenv().BUILD_NUMBER != null) {
     version += "+${System.getenv().BUILD_NUMBER}"
 }
 
-compileJava {
-    sourceCompatibility = targetCompatibility = "1.8"
-    options.encoding = 'UTF-8'
-    options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
+minecraft {
+    mappings channel: getProjectProperty('mappings_channel'), version: getProjectProperty('mappings_version')
+}
+
+mixin {
+    defaultObfuscationEnv "notch"
+}
+
+sourceSets {
+    main {
+        ext.refMap = "mixins.${project.name.toLowerCase()}.refmap.json"
+    }
+}
+
+mixin {
+    add sourceSets.main, "mixins.${project.name.toLowerCase()}.refmap.json"
 }
 
 repositories {
-    jcenter()
+    mavenLocal()
+    mavenCentral()
     maven {
         name = "Gradle-Plugins"
         url = "https://plugins.gradle.org/m2"
@@ -71,42 +103,55 @@ repositories {
 }
 
 configurations {
-    compile.extendsFrom shadow
-}
-
-minecraft {
-    mappings channel: getProjectProperty('mappings_channel'), version: getProjectProperty('mappings_version')
+    provided
+    compile.extendsFrom provided
+    compileJava.options.encoding = "UTF-8"
+    jar.archiveName = "${project.name}-${project.version}.jar"
 }
 
 dependencies {
     minecraft "net.minecraftforge:forge:${getProjectProperty('forgeVersion')}"
+    implementation("org.spongepowered:spongeapi:${getProjectProperty('spongeapi')}")
+    compile 'org.spongepowered:mixin:0.8.3-SNAPSHOT'
+    compile 'org.spongepowered:mixin:0.8.3-SNAPSHOT:processor'
 
-    compile("org.spongepowered:spongeapi:${getProjectProperty('spongeapi')}")
+    implementation 'org.spongepowered:mixin:0.8.1-SNAPSHOT'
+    implementation("javax.validation:validation-api:2.0.1.Final")
+    compile group: 'commons-io', name: 'commons-io', version: '2.6'
+    implementation group: 'org.bstats', name: 'bstats-sponge', version: '2.2.1'
+    shadow group: 'org.bstats', name: 'bstats-sponge', version: '2.2.1'
 
     annotationProcessor("org.spongepowered:spongeapi:${getProjectProperty('spongeapi')}")
+    annotationProcessor("org.spongepowered:mixin:0.8.3-SNAPSHOT:processor")
+}
 
-    compile("javax.validation:validation-api:${getProjectProperty('validation')}")
-    compile group: 'commons-io', name: 'commons-io', version: '2.6'
-    compile group: 'org.bstats', name: 'bstats-sponge', version: '2.2.1'
-    shadow group: 'org.bstats', name: 'bstats-sponge', version: '2.2.1'
+license {
+    header = file('HEADER.txt')
+    newLine = true
+    ext {
+        name = getProjectProperty('m_name')
+        organization = getProjectProperty('m_organization')
+        url = getProjectProperty('m_url')
+    }
+    include '**/*.java'
+    include '**/*.groovy'
 }
 
-jar {
-    manifest {
-        attributes([
-                "Specification-Title": "NyxCore",
-                "Specification-Vendor": "POQDavid",
-                "Specification-Version": "1",
-                "Implementation-Title": project.name,
-                "Implementation-Version": "${version}",
-                "Implementation-Vendor" :"POQDavid",
-                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
-        ])
+idea {
+    module {
+        inheritOutputDirs = true
     }
 }
 
-artifacts {
-    archives shadowJar
+compileJava {
+    sourceCompatibility = targetCompatibility = "1.8"
+    options.encoding = 'UTF-8'
+    //options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
+    options.compilerArgs += [
+            '-Xlint:-processing',
+            '-Xlint:-deprecation',
+    ]
+    options.deprecation = true
 }
 
 processResources {
@@ -130,62 +175,53 @@ processResources {
     from 'LICENSE.txt'
 }
 
-license {
-    header = file('HEADER.txt')
-    newLine = true
-    ext {
-        name = getProjectProperty('m_name')
-        organization = getProjectProperty('m_organization')
-        url = getProjectProperty('m_url')
+shadowJar {
+    configurations = [project.configurations.shadow]
+    exclude 'dummyThing'
+    relocate "org.bstats", "${getProjectProperty('m_group')}.${getProjectProperty('m_id')}.shaded.bstats"
+    classifier('')
+    archiveName("${project.name}-${project.version}.jar")
+}
+
+reobf {
+    shadowJar {
+        classpath = sourceSets.main.compileClasspath
     }
-    include '**/*.java'
-    include '**/*.groovy'
 }
 
-signing {
-    required { Project.hasProperty("signing.keyId") }
-    sign configurations.archives, configurations.shadow
+artifacts {
+    archives shadowJar
 }
 
-idea {
-    module {
-        inheritOutputDirs = true
-    }
+signing {
+    required { hasProperty("signing.keyId") }
+    sign configurations.archives, configurations.shadow
 }
 
 task copyJar(type: Copy) {
-    from "build/libs/" + getProjectProperty('m_name') + "-" + version + ".jar"
+    from jar.archiveFile
     into 'C:/Minecraft/Servers/Sponge/mods'
-    project.logger.log(LogLevel.WARN, 'Copied file: ' + getProjectProperty('m_name') + "-" + version + ".jar")
-}
-
-shadowJar {
-    configurations = [project.configurations.shadow]
-    relocate "org.bstats", "io.github.poqdavid.nyx.nyxcore.shaded.bstats"
-    classifier = null // Remove "-all" suffix from output file name
+    project.logger.log(LogLevel.WARN, "Copied file: ${jar.archiveFile}")
 }
 
 String getProjectProperty(String propertyName) {
     String temp = "null"
     if (hasProperty(propertyName)) {
-        temp = this.properties[propertyName]
-        project.logger.log(LogLevel.WARN, "Found property: " + propertyName + " value: " + temp)
+        temp = this.properties.get(propertyName)
+        project.logger.log(LogLevel.WARN, "Found property: ${propertyName} value: ${temp}")
     } else {
-        project.logger.log(LogLevel.ERROR, "Property (" + propertyName + ") not found!")
+        project.logger.log(LogLevel.ERROR, "Property (${propertyName}) not found!")
     }
     return temp
 }
 
-void applyPlugin(String PluginId, String PluginVersion) {
-
-    final hasPlugin = project.getPlugins().hasPlugin(PluginId)
-    if (hasPlugin) {
-        final Plugin plugin = project.getPlugins().getPlugin(PluginId)
-        project.logger.log(LogLevel.WARN, 'Plugin ' + PluginId + ' already applied - version ' + PluginVersion)
+void applyPlugin(String PluginId) {
+    if (project.getPlugins().hasPlugin(PluginId)) {
+        project.logger.log(LogLevel.WARN, "Plugin ${PluginId} already applied")
     } else {
         apply plugin: PluginId
     }
 }
 
-build.dependsOn shadowJar
-build.dependsOn copyJar
+tasks.jar.finalizedBy('reobfJar')
+tasks.build.finalizedBy('copyJar')
diff --git a/gradle.properties b/gradle.properties
@@ -18,7 +18,7 @@ m_description=Core plugin for all of my Nyx plugins.
 
 ## Version
 m_major=1
-m_minor=0
+m_minor=1
 m_api=S7.3.0
 m_suffix=STABLE
 
@@ -29,8 +29,6 @@ spongeapi=7.3.0
 
 minecraft_version=1.12.2
 forge_rundir=run/forge
-forgeVersion=1.12.2-14.23.5.2855
+forgeVersion=1.12.2-14.23.5.2854
 mappings_channel=snapshot
-mappings_version=20171003-1.12
-
-validation=1.1.0.Final
+mappings_version=20180814-1.12
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists