Pin FG version range.

Author: LexManos

build.gradle

@@ -2,17 +2,17 @@ plugins {
     id 'java-gradle-plugin'
     id 'eclipse'
     id 'maven-publish'
-    id 'org.cadixdev.licenser' version '0.6.1'
-    id 'net.minecraftforge.gradleutils' version '[2.0.10,)'
+    id 'net.minecraftforge.licenser' version '1.0.1'
+    id 'net.minecraftforge.gradleutils' version '[2.3,2.4)'
     id 'com.github.ben-manes.versions' version '0.46.0'
 }
 
 version = gradleutils.getTagOffsetBranchVersion('FG_6.0')
 logger.lifecycle('Version: ' + version + ' Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 
 changelog {
-    fromTag '6.0'
-    disableAutomaticPublicationRegistration()
+    from '6.0'
+    publishAll = false
 }
 sourceSets {
     common
@@ -52,7 +52,7 @@ tasks.named('sourcesJar', Jar).configure {
 
 repositories {
     mavenLocal()
-    maven { url = 'https://maven.minecraftforge.net/' }
+    maven gradleutils.forgeMaven
 }
 
 license {
@@ -94,21 +94,6 @@ dependencies {
     userdevImplementation 'net.minecraftforge:JarJarSelector:0.3.19'
 }
 
-//Gradle doesn't add it's own source when doing the API. So lets hack it in!
-import org.gradle.plugins.ide.eclipse.model.*
-import org.gradle.plugins.ide.eclipse.model.internal.*
-project.extensions.eclipse.classpath.file.whenMerged { Classpath cp ->
-    def gradleSrc = gradle.gradleHomeDir.absolutePath.replace(File.separator, '/') + '/src/'
-    cp.entries.each { entry ->
-        if ((entry in AbstractLibrary) && entry.library.file.name.startsWith('gradle-')) {
-            def type = (entry.library.file.name =~ "^gradle(-(.*))?-(${gradle.gradleVersion})")[0][2]
-            if (type == 'api') type = 'core-api' //Gradle name is different for cores
-            if (type == '') type = 'core'
-            entry.sourcePath = new FileReferenceFactory().fromPath(gradleSrc + type)
-        }
-    }
-}
-
 gradlePlugin {
     plugins {
         mcp {

settings.gradle

@@ -5,4 +5,8 @@ pluginManagement {
     }
 }
 
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
+}
+
 rootProject.name = 'ForgeGradle'

src/common/java/net/minecraftforge/gradle/common/config/UserdevConfigV2.java

@@ -24,6 +24,7 @@ public class UserdevConfigV2 extends UserdevConfigV1 {
     public static UserdevConfigV2 get(InputStream stream) {
         return Utils.fromJson(stream, UserdevConfigV2.class);
     }
+
     public static UserdevConfigV2 get(byte[] data) {
         return get(new ByteArrayInputStream(data));
     }

src/common/java/net/minecraftforge/gradle/common/util/MavenArtifactDownloader.java

@@ -113,7 +113,7 @@ private static File _download(Project project, String artifact, boolean changing
                     project.getLogger().info("Waiting for download of {} on other thread", artifact);
                     while (!activeDownload.isDone()) {
                         // Release the monitor of ACTIVE_DOWNLOADS while waiting on the download;
-                        // when a new download finishes, we'll get notified and we can check whether the download is complete again. 
+                        // when a new download finishes, we'll get notified and we can check whether the download is complete again.
                         ACTIVE_DOWNLOADS.wait();
                     }
                     return activeDownload.get();