Switch to being a NeoGradle project.

shartte · Jul 15, 2023 · 42c7f52 · 42c7f52
1 parent b772efc
commit 42c7f52
Show file tree

Hide file tree

Showing 296 changed files with 1,433 additions and 1,439 deletions.
diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml
@@ -22,7 +22,7 @@
     </repository>
     <repository>
       <id>teamcity-server</id>
-      <url>https://teamcity.MinecraftForge.net/app/dsl-plugins-repository</url>
+      <url>https://teamcity.neoforged.net/app/dsl-plugins-repository</url>
       <snapshots>
         <enabled>true</enabled>
       </snapshots>

diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts
@@ -34,9 +34,9 @@ project {
 
     params {
         text("git_main_branch", "FG_5.0", label = "Git Main Branch", description = "The git main or default branch to use in VCS operations.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("github_repository_name", "ForgeGradle", label = "The github repository name. Used to connect to it in VCS Roots.", description = "This is the repository slug on github. So for example `ForgeGradle` or `MinecraftForge`. It is interpolated into the global VCS Roots.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("env.PUBLISHED_JAVA_ARTIFACT_ID", "ForgeGradle", label = "Published artifact id", description = "The maven coordinate artifact id that has been published by this build. Can not be empty.", allowEmpty = false)
-        text("env.PUBLISHED_JAVA_GROUP", "net.minecraftforge.gradle", label = "Published group", description = "The maven coordinate group that has been published by this build. Can not be empty.", allowEmpty = false)
+        text("github_repository_name", "NeoGradle", label = "The github repository name. Used to connect to it in VCS Roots.", description = "This is the repository slug on github. So for example `ForgeGradle` or `MinecraftForge`. It is interpolated into the global VCS Roots.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
+        text("env.PUBLISHED_JAVA_ARTIFACT_ID", "NeoGradle", label = "Published artifact id", description = "The maven coordinate artifact id that has been published by this build. Can not be empty.", allowEmpty = false)
+        text("env.PUBLISHED_JAVA_GROUP", "net.neoforged.gradle", label = "Published group", description = "The maven coordinate group that has been published by this build. Can not be empty.", allowEmpty = false)
         text("git_branch_spec", """
                 +:refs/heads/(FG_*)
             """.trimIndent(), label = "The branch specification of the repository", description = "By default all main branches are build by the configuration. Modify this value to adapt the branches build.", display = ParameterDisplay.HIDDEN, allowEmpty = true)
@@ -47,8 +47,8 @@ project {
     features {
         githubIssues {
             id = "ForgeGradle__IssueTracker"
-            displayName = "MinecraftForge/ForgeGradle"
-            repositoryURL = "https://github.com/MinecraftForge/ForgeGradle"
+            displayName = "NeoForged/NeoGradle"
+            repositoryURL = "https://github.com/NeoForge/NeoGradle"
         }
     }
 }

diff --git a/Jenkinsfile b/Jenkinsfile
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'eclipse'
     id 'maven-publish'
     id 'org.cadixdev.licenser' version '0.6.1'
-    id 'net.minecraftforge.gradleutils' version '[2.0.10,)'
+    id 'net.neoforged.gradleutils' version '[2.0.16,)'
 }
 
 //HARDCODED VERSION FOR NOW!
@@ -35,15 +35,15 @@ changelog {
 ///Configure them in such a way that we can run test and have all the plugins applied.
 subprojects.forEach { subProject ->
     //All base plugins.
-    subProject.apply plugin: 'net.minecraftforge.gradleutils'
+    subProject.apply plugin: 'net.neoforged.gradleutils'
     subProject.apply plugin: 'java-library'
     subProject.apply plugin: 'maven-publish'
     subProject.apply plugin: 'eclipse'
     subProject.apply plugin: 'idea'
 
     //General project metadata. Everything has the same version and group.
     subProject.version = subProject.rootProject.version
-    subProject.group = 'net.minecraftforge.gradle'
+    subProject.group = 'net.neoforged.gradle'
     subProject.archivesBaseName = "fg-${subProject.name.toLowerCase()}"
 
     //Setup the java toolchain
@@ -58,8 +58,8 @@ subprojects.forEach { subProject ->
     //Wire up our custom repositories.
     subProject.repositories.mavenLocal()
     subProject.repositories.maven { MavenArtifactRepository repository ->
-        repository.name 'MinecraftForge'
-        repository.url = 'https://maven.minecraftforge.net/'
+        repository.name 'NeoForged'
+        repository.url = 'https://maven.neoforged.net/'
     }
     subProject.repositories.gradlePluginPortal()
 
@@ -150,7 +150,7 @@ subprojects.forEach { subProject ->
                     pluginClassName = evalSubProject.file('src/main/java/').toPath().relativize(pluginFile.toPath()).toString().replace('/', '.').replace('\\', '.').replace(".java", "")
                 }
 
-                def pluginId = 'net.minecraftforge.gradle.' + evalSubProject.name.toLowerCase()
+                def pluginId = 'net.neoforged.gradle.' + evalSubProject.name.toLowerCase()
                 try {
                     var propertyValue = evalSubProject.property('pluginId')
                     if (propertyValue != null) {
@@ -202,6 +202,7 @@ subprojects.forEach { subProject ->
                 }
             }
 
+
             return
         }
 

diff --git a/common/src/main/java/net/minecraftforge/gradle/common/tasks/IdePostSyncExecutionTask.java b/common/src/main/java/net/minecraftforge/gradle/common/tasks/IdePostSyncExecutionTask.java
diff --git a/...raftforge/gradle/common/CommonPlugin.java → ...neoforged/gradle/common/CommonPlugin.java b/...raftforge/gradle/common/CommonPlugin.java → ...neoforged/gradle/common/CommonPlugin.java
@@ -1,8 +1,7 @@
-package net.minecraftforge.gradle.common;
+package net.neoforged.gradle.common;
 
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
-import org.gradle.api.initialization.Settings;
 
 public class CommonPlugin implements Plugin<Object> {
     @Override

diff --git a/...ge/gradle/common/CommonProjectPlugin.java → ...ed/gradle/common/CommonProjectPlugin.java b/...ge/gradle/common/CommonProjectPlugin.java → ...ed/gradle/common/CommonProjectPlugin.java
@@ -1,44 +1,44 @@
-package net.minecraftforge.gradle.common;
-
-import net.minecraftforge.gradle.common.extensions.ExtensionManager;
-import net.minecraftforge.gradle.common.extensions.ForcedDependencyDeobfuscationExtension;
-import net.minecraftforge.gradle.common.extensions.IdeManagementExtension;
-import net.minecraftforge.gradle.common.extensions.ProjectEvaluationExtension;
-import net.minecraftforge.gradle.common.extensions.dependency.creation.ProjectBasedDependencyCreator;
-import net.minecraftforge.gradle.common.deobfuscation.DependencyDeobfuscator;
-import net.minecraftforge.gradle.common.extensions.AccessTransformersExtension;
-import net.minecraftforge.gradle.common.extensions.ArtifactDownloaderExtension;
-import net.minecraftforge.gradle.common.extensions.MappingsExtension;
-import net.minecraftforge.gradle.common.extensions.MinecraftArtifactCacheExtension;
-import net.minecraftforge.gradle.common.extensions.MinecraftExtension;
-import net.minecraftforge.gradle.common.extensions.ProjectHolderExtension;
-import net.minecraftforge.gradle.common.extensions.dependency.replacement.DependencyReplacementsExtension;
-import net.minecraftforge.gradle.common.extensions.obfuscation.ObfuscationExtension;
-import net.minecraftforge.gradle.common.extensions.repository.IvyDummyRepositoryExtension;
-import net.minecraftforge.gradle.common.runs.run.RunsImpl;
-import net.minecraftforge.gradle.common.runs.type.TypesImpl;
-import net.minecraftforge.gradle.common.runtime.definition.CommonRuntimeDefinition;
-import net.minecraftforge.gradle.common.runtime.extensions.CommonRuntimeExtension;
-import net.minecraftforge.gradle.common.runtime.naming.OfficialNamingChannelConfigurator;
-import net.minecraftforge.gradle.common.tasks.DisplayMappingsLicenseTask;
-import net.minecraftforge.gradle.common.util.TaskDependencyUtils;
-import net.minecraftforge.gradle.common.util.exceptions.MultipleDefinitionsFoundException;
-import net.minecraftforge.gradle.common.util.constants.RunsConstants;
-import net.minecraftforge.gradle.dsl.common.runs.type.Types;
-import net.minecraftforge.gradle.dsl.common.util.NamingConstants;
-import net.minecraftforge.gradle.dsl.common.extensions.AccessTransformers;
-import net.minecraftforge.gradle.dsl.common.extensions.ArtifactDownloader;
-import net.minecraftforge.gradle.dsl.common.extensions.Mappings;
-import net.minecraftforge.gradle.dsl.common.extensions.Minecraft;
-import net.minecraftforge.gradle.dsl.common.extensions.MinecraftArtifactCache;
-import net.minecraftforge.gradle.dsl.common.extensions.ProjectHolder;
-import net.minecraftforge.gradle.dsl.common.extensions.dependency.replacement.DependencyReplacement;
-import net.minecraftforge.gradle.dsl.common.extensions.obfuscation.Obfuscation;
-import net.minecraftforge.gradle.dsl.common.extensions.repository.Repository;
-import net.minecraftforge.gradle.dsl.common.runs.run.Runs;
-import net.minecraftforge.gradle.common.runs.run.RunImpl;
-import net.minecraftforge.gradle.util.GradleInternalUtils;
-import net.minecraftforge.gradle.util.UrlConstants;
+package net.neoforged.gradle.common;
+
+import net.neoforged.gradle.common.extensions.ExtensionManager;
+import net.neoforged.gradle.common.extensions.ForcedDependencyDeobfuscationExtension;
+import net.neoforged.gradle.common.extensions.IdeManagementExtension;
+import net.neoforged.gradle.common.extensions.ProjectEvaluationExtension;
+import net.neoforged.gradle.common.extensions.dependency.creation.ProjectBasedDependencyCreator;
+import net.neoforged.gradle.common.deobfuscation.DependencyDeobfuscator;
+import net.neoforged.gradle.common.extensions.AccessTransformersExtension;
+import net.neoforged.gradle.common.extensions.ArtifactDownloaderExtension;
+import net.neoforged.gradle.common.extensions.MappingsExtension;
+import net.neoforged.gradle.common.extensions.MinecraftArtifactCacheExtension;
+import net.neoforged.gradle.common.extensions.MinecraftExtension;
+import net.neoforged.gradle.common.extensions.ProjectHolderExtension;
+import net.neoforged.gradle.common.extensions.dependency.replacement.DependencyReplacementsExtension;
+import net.neoforged.gradle.common.extensions.obfuscation.ObfuscationExtension;
+import net.neoforged.gradle.common.extensions.repository.IvyDummyRepositoryExtension;
+import net.neoforged.gradle.common.runs.run.RunsImpl;
+import net.neoforged.gradle.common.runs.type.TypesImpl;
+import net.neoforged.gradle.common.runtime.definition.CommonRuntimeDefinition;
+import net.neoforged.gradle.common.runtime.extensions.CommonRuntimeExtension;
+import net.neoforged.gradle.common.runtime.naming.OfficialNamingChannelConfigurator;
+import net.neoforged.gradle.common.tasks.DisplayMappingsLicenseTask;
+import net.neoforged.gradle.common.util.TaskDependencyUtils;
+import net.neoforged.gradle.common.util.exceptions.MultipleDefinitionsFoundException;
+import net.neoforged.gradle.common.util.constants.RunsConstants;
+import net.neoforged.gradle.dsl.common.runs.type.Types;
+import net.neoforged.gradle.dsl.common.util.NamingConstants;
+import net.neoforged.gradle.dsl.common.extensions.AccessTransformers;
+import net.neoforged.gradle.dsl.common.extensions.ArtifactDownloader;
+import net.neoforged.gradle.dsl.common.extensions.Mappings;
+import net.neoforged.gradle.dsl.common.extensions.Minecraft;
+import net.neoforged.gradle.dsl.common.extensions.MinecraftArtifactCache;
+import net.neoforged.gradle.dsl.common.extensions.ProjectHolder;
+import net.neoforged.gradle.dsl.common.extensions.dependency.replacement.DependencyReplacement;
+import net.neoforged.gradle.dsl.common.extensions.obfuscation.Obfuscation;
+import net.neoforged.gradle.dsl.common.extensions.repository.Repository;
+import net.neoforged.gradle.dsl.common.runs.run.Runs;
+import net.neoforged.gradle.common.runs.run.RunImpl;
+import net.neoforged.gradle.util.GradleInternalUtils;
+import net.neoforged.gradle.util.UrlConstants;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.repositories.MavenArtifactRepository;

diff --git a/...ation/DeobfuscatingTaskConfiguration.java → ...ation/DeobfuscatingTaskConfiguration.java b/...ation/DeobfuscatingTaskConfiguration.java → ...ation/DeobfuscatingTaskConfiguration.java
@@ -1,12 +1,11 @@
-package net.minecraftforge.gradle.common.deobfuscation;
+package net.neoforged.gradle.common.deobfuscation;
 
-import net.minecraftforge.gradle.dsl.common.extensions.dependency.replacement.DependencyReplacementResult;
+import net.neoforged.gradle.dsl.common.extensions.dependency.replacement.DependencyReplacementResult;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.ResolvedDependency;
 
 import java.io.File;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 
 public class DeobfuscatingTaskConfiguration {

diff --git a/...deobfuscation/DependencyDeobfuscator.java → ...deobfuscation/DependencyDeobfuscator.java b/...deobfuscation/DependencyDeobfuscator.java → ...deobfuscation/DependencyDeobfuscator.java
@@ -1,30 +1,30 @@
-package net.minecraftforge.gradle.common.deobfuscation;
+package net.neoforged.gradle.common.deobfuscation;
 
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import net.minecraftforge.gradle.common.extensions.DeobfuscationExtension;
-import net.minecraftforge.gradle.common.extensions.ForcedDependencyDeobfuscationExtension;
-import net.minecraftforge.gradle.common.runtime.extensions.CommonRuntimeExtension;
-import net.minecraftforge.gradle.common.runtime.tasks.CollectDependencyLibraries;
-import net.minecraftforge.gradle.common.runtime.tasks.Execute;
-import net.minecraftforge.gradle.common.tasks.ArtifactFromOutput;
-import net.minecraftforge.gradle.common.util.ConfigurationUtils;
-import net.minecraftforge.gradle.dsl.common.extensions.Mappings;
-import net.minecraftforge.gradle.dsl.common.extensions.MinecraftArtifactCache;
-import net.minecraftforge.gradle.dsl.common.extensions.dependency.replacement.Context;
-import net.minecraftforge.gradle.dsl.common.extensions.dependency.replacement.DependencyReplacement;
-import net.minecraftforge.gradle.dsl.common.extensions.dependency.replacement.DependencyReplacementResult;
-import net.minecraftforge.gradle.dsl.common.extensions.dependency.replacement.DependencyReplacer;
-import net.minecraftforge.gradle.dsl.common.runtime.definition.Definition;
-import net.minecraftforge.gradle.dsl.common.runtime.naming.TaskBuildingContext;
-import net.minecraftforge.gradle.dsl.common.runtime.tasks.Runtime;
-import net.minecraftforge.gradle.dsl.common.tasks.WithOutput;
-import net.minecraftforge.gradle.dsl.common.util.CommonRuntimeUtils;
-import net.minecraftforge.gradle.dsl.common.util.Constants;
-import net.minecraftforge.gradle.dsl.common.util.GameArtifact;
-import net.minecraftforge.gradle.dsl.common.util.ModuleReference;
-import net.minecraftforge.gradle.util.DecompileUtils;
-import net.minecraftforge.gradle.util.ResolvedDependencyUtils;
+import net.neoforged.gradle.common.extensions.DeobfuscationExtension;
+import net.neoforged.gradle.common.extensions.ForcedDependencyDeobfuscationExtension;
+import net.neoforged.gradle.common.runtime.extensions.CommonRuntimeExtension;
+import net.neoforged.gradle.common.runtime.tasks.CollectDependencyLibraries;
+import net.neoforged.gradle.common.runtime.tasks.Execute;
+import net.neoforged.gradle.common.tasks.ArtifactFromOutput;
+import net.neoforged.gradle.common.util.ConfigurationUtils;
+import net.neoforged.gradle.dsl.common.extensions.Mappings;
+import net.neoforged.gradle.dsl.common.extensions.MinecraftArtifactCache;
+import net.neoforged.gradle.dsl.common.extensions.dependency.replacement.Context;
+import net.neoforged.gradle.dsl.common.extensions.dependency.replacement.DependencyReplacement;
+import net.neoforged.gradle.dsl.common.extensions.dependency.replacement.DependencyReplacementResult;
+import net.neoforged.gradle.dsl.common.extensions.dependency.replacement.DependencyReplacer;
+import net.neoforged.gradle.dsl.common.runtime.definition.Definition;
+import net.neoforged.gradle.dsl.common.runtime.naming.TaskBuildingContext;
+import net.neoforged.gradle.dsl.common.runtime.tasks.Runtime;
+import net.neoforged.gradle.dsl.common.tasks.WithOutput;
+import net.neoforged.gradle.dsl.common.util.CommonRuntimeUtils;
+import net.neoforged.gradle.dsl.common.util.Constants;
+import net.neoforged.gradle.dsl.common.util.GameArtifact;
+import net.neoforged.gradle.dsl.common.util.ModuleReference;
+import net.neoforged.gradle.util.DecompileUtils;
+import net.neoforged.gradle.util.ResolvedDependencyUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;

diff --git a/...tensions/AccessTransformersExtension.java → ...tensions/AccessTransformersExtension.java b/...tensions/AccessTransformersExtension.java → ...tensions/AccessTransformersExtension.java
@@ -1,7 +1,7 @@
-package net.minecraftforge.gradle.common.extensions;
+package net.neoforged.gradle.common.extensions;
 
-import net.minecraftforge.gradle.common.extensions.base.BaseFilesWithEntriesExtension;
-import net.minecraftforge.gradle.dsl.common.extensions.AccessTransformers;
+import net.neoforged.gradle.common.extensions.base.BaseFilesWithEntriesExtension;
+import net.neoforged.gradle.dsl.common.extensions.AccessTransformers;
 import org.gradle.api.Project;
 
 import javax.inject.Inject;

diff --git a/...tensions/ArtifactDownloaderExtension.java → ...tensions/ArtifactDownloaderExtension.java b/...tensions/ArtifactDownloaderExtension.java → ...tensions/ArtifactDownloaderExtension.java
@@ -1,9 +1,9 @@
-package net.minecraftforge.gradle.common.extensions;
+package net.neoforged.gradle.common.extensions;
 
 import groovyjarjarantlr4.v4.runtime.misc.NotNull;
 import net.minecraftforge.gdi.ConfigurableDSLElement;
-import net.minecraftforge.gradle.common.util.ConfigurationUtils;
-import net.minecraftforge.gradle.dsl.common.extensions.ArtifactDownloader;
+import net.neoforged.gradle.common.util.ConfigurationUtils;
+import net.neoforged.gradle.dsl.common.extensions.ArtifactDownloader;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.ResolvedConfiguration;