Prepare gradle for remapping

VazkiiMods · Dec 1, 2021 · 50c04fd · 50c04fd
1 parent 8edf357
commit 50c04fd
Show file tree

Hide file tree

Showing 5 changed files with 219 additions and 174 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
     repositories {
-        maven { url = 'https://files.minecraftforge.net/maven' }
+        maven { url = 'https://maven.minecraftforge.net' }
         maven { url = 'https://repo.spongepowered.org/maven' }
         jcenter()
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1+', changing: true
         classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT'
     }
 }
@@ -18,7 +18,7 @@ plugins {
 apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'org.spongepowered.mixin'
 apply plugin: 'eclipse'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 
 apply plugin: 'pmd'
 
@@ -31,7 +31,8 @@ archivesBaseName = config.mod_name
 
 compileJava.options.compilerArgs << "-Xlint:all,-classfile,-processing,-deprecation" << "-Werror"
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 
 if (System.getenv('BUILD_NUMBER') != null) {
     version += "." + System.getenv('BUILD_NUMBER')
@@ -56,12 +57,6 @@ minecraft {
             workingDirectory project.file('run')
             arg "-mixin.config=quark.mixins.json"
 
-            // 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'
-
             mods {
                 examplemod {
                     source sourceSets.main
@@ -73,12 +68,6 @@ minecraft {
             workingDirectory project.file('run')
             arg "-mixin.config=quark.mixins.json"
 
-            // 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'
-
             mods {
                 examplemod {
                     source sourceSets.main
@@ -96,29 +85,24 @@ repositories {
     maven {
         // for AutoRegLib
         name "blamejared"
-        url "http://maven.blamejared.com/"
+        url "https://maven.blamejared.com/"
     }
-    maven {
+    /*maven {
         // for JEI
         name "progwml6"
         url "http://dvs1.progwml6.com/files/maven"
-    }
-    maven {
-        // for Mappings
-        name "gigaherz"
-        url "http://dogforce-games.com/maven/"
-    }
+    }*/
 }
 
 
 dependencies {
     minecraft "net.minecraftforge:forge:${config.mc_version}-${config.forge_version}"
 
-    compile fg.deobf("vazkii.autoreglib:AutoRegLib:${config.arl_version}")
-
-    compileOnly fg.deobf("mezz.jei:${config.jei_version}:api")
-    runtimeOnly fg.deobf("mezz.jei:${config.jei_version}")
+    compileOnly fg.deobf("vazkii.autoreglib:AutoRegLib:${config.arl_version}")
+    runtimeOnly fg.deobf("vazkii.autoreglib:AutoRegLib:${config.arl_version}")
 
+    //compileOnly fg.deobf("mezz.jei:${config.jei_version}:api")
+    //runtimeOnly fg.deobf("mezz.jei:${config.jei_version}")
 }
 
 spotless {
@@ -229,12 +213,13 @@ jar {
 //    archives deobfJar
 //}
 
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            repository(url: "file://" + (System.getenv("local_maven") != null ? System.getenv("local_maven") : System.getenv("bamboo_local_maven")))
-        }
-    }
-}
+// TODO Jared you figure this one out
+//uploadArchives {
+//    repositories {
+//        mavenDeployer {
+//            repository(url: "file://" + (System.getenv("local_maven") != null ? System.getenv("local_maven") : System.getenv("bamboo_local_maven")))
+//        }
+//    }
+//}
 
 defaultTasks 'clean', 'build', 'sortArtifacts', 'incrementBuildNumber'
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,6 +1,5 @@
-#Thu Aug 15 08:53:26 EDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip