Restore mods folder support

Remove launch wrappers
Modernize gradle and move to github actions

Author: LexManos

.github/workflows/publish.yml

@@ -0,0 +1,28 @@
+name: Publish
+
+on:
+  push:
+    branches: [ "master" ]
+    paths-ignore:
+      - '.github/workflows/**'
+      - 'README.md'
+      - 'settings.gradle'
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    uses: MinecraftForge/SharedActions/.github/workflows/gradle.yml@v0
+    with:
+      java: 17
+      gradle_tasks: "publish"
+      artifact_name: "legacyjavafixer"
+    secrets:
+      DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+      PROMOTE_ARTIFACT_WEBHOOK: ${{ secrets.PROMOTE_ARTIFACT_WEBHOOK }}
+      PROMOTE_ARTIFACT_USERNAME: ${{ secrets.PROMOTE_ARTIFACT_USERNAME }}
+      PROMOTE_ARTIFACT_PASSWORD: ${{ secrets.PROMOTE_ARTIFACT_PASSWORD }}
+      MAVEN_USER: ${{ secrets.MAVEN_USER }}
+      MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+      GRADLE_CACHE_KEY: ${{ secrets.GRADLE_CACHE_KEY }}

.gitignore

@@ -20,3 +20,6 @@
 # Include git important files
 !.gitmodules
 !.gitignore
+
+# Include github workflow
+!.github/

Jenkinsfile

@@ -0,0 +1,2 @@
+Copyright (c) LexManos
+SPDX-License-Identifier: MIT

LICENSE-header.txt

@@ -1,4 +1,39 @@
 LegacyJavaFixer
 ===============
+This fixes a concurrent modification exception that is caused by the 
+default implementation of Collections.sort being changed in https://bugs.openjdk.org/browse/JDK-8032636. 
+This is not required on modern Forge versions, so verify before using.
+
+Here is an example of the error fixed by this.
+```ascii
+[INFO] [ForgeModLoader] Calling tweak class cpw.mods.fml.common.launcher.FMLInjectionAndSortingTweaker
+[SEVERE] [ForgeModLoader] Unable to launch
+java.util.ConcurrentModificationException
+	at java.util.ArrayList$Itr.checkForComodification(ArrayList.java:911)
+	at java.util.ArrayList$Itr.remove(ArrayList.java:875)
+	at net.minecraft.launchwrapper.Launch.launch(Launch.java:114)
+	at net.minecraft.launchwrapper.Launch.main(Launch.java:27)
+	at net.minecraftforge.launcher.Main$Launcher.run(Main.java:282)
+	at net.minecraftforge.launcher.Main$Launcher.access$000(Main.java:268)
+	at net.minecraftforge.launcher.Main.main(Main.java:57)
+```
+
+To use this in production, just place the jar in your mods folder. It will be loaded as a CoreMod.
+
+For dev time, it can be used by adding `net.minecraftforge.legacyjavafixer.LoadingPlugin` to the `fml.coreMods.load` environement variable.
+
+FG7 example:
+```groovy
+minecraft {
+    runs {
+        configureEach {
+            systemProperty 'fml.coreMods.load', 'net.minecraftforge.legacyjavafixer.LoadingPlugin'
+        }
+    }
+}
+
+dependencies {
+    implementation 'net.minecraftforge:legacyjavafixer:2.0.1'
+}
+```
 
-Coremod to fix older FML/Forge versions for the broken Java 8_20 build. 

README.md

@@ -1,68 +1,90 @@
-buildscript {
-    repositories {
-        mavenLocal()
-        jcenter()
-        maven { url "https://maven.minecraftforge.net/" }
-    }
-    dependencies {
-        classpath 'net.minecraftforge.gradleutils:GradleUtils:1.0.+'
-    }
-}
-
 plugins {
-    id 'java'
-    id 'eclipse'
+    id 'java-library'
     id 'maven-publish'
+    alias libs.plugins.licenser
+    alias libs.plugins.gitversion
+    alias libs.plugins.gradleutils
+    alias libs.plugins.forgegradle
 }
 
-apply plugin: 'net.minecraftforge.gradleutils'
-
-java.toolchain.languageVersion = JavaLanguageVersion.of(7)
-
-version = gradleutils.tagOffsetVersion
+gradleutils.displayName = 'Legacy Java Fixer'
+description = 'A tweaker that fixes legacy Forge versions for the sorting change in java 8u20'
+version = gitversion.tagOffset
 group = 'net.minecraftforge'
-archivesBaseName = 'legacyjavafixer'
+println "Version: $version"
+
+java {
+    toolchain.languageVersion = JavaLanguageVersion.of(8)
+}
 
 repositories {
+    minecraft.mavenizer(it)
     mavenCentral()
-    maven {
-        url = 'https://maven.minecraftforge.net/'
-        metadataSources {
-            gradleMetadata()
-            mavenPom()
-            artifact()
+    maven gradleutils.forgeMaven
+    maven { url = 'https://libraries.minecraft.net/' }
+}
+
+minecraft {
+    runs {
+        configureEach {
+            systemProperty 'fml.coreMods.load', 'net.minecraftforge.legacyjavafixer.LoadingPlugin'
+        }
+        register('client') {
+            workingDir = file('runs/main/client/')
+            systemProperty 'fml.ignoreInvalidMinecraftCertificates', 'true'
         }
     }
-    maven { url = 'https://libraries.minecraft.net/' }
 }
 
 dependencies {
-    implementation 'net.minecraft:launchwrapper:1.11'
-    implementation 'com.google.guava:guava:16.0'
-    implementation 'net.minecraftforge:forge:1.7.10-10.13.1.1225:universal'
+    // We just need the classes to compile against, but include the full thing so we can test run configs
+    implementation minecraft.dependency(libs.forge)
 }
 
+license {
+    header rootProject.file('LICENSE-header.txt')
+    newLine false
+}
+
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = 'UTF-8'
+}
+
+
+tasks.named('jar', Jar) {
+    manifest {
+        attributes(
+            'TweakClass': 'net.minecraftforge.legacyjavafixer.Tweaker',
+            'TweakOrder': -2147483648
+        )
+    }
+}
 
 publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            groupId project.group
-            artifactId project.archivesBaseName
-            version project.version
-            artifact jar
+    publications.register('mavenJava', MavenPublication) {
+        // This causes it to skip any transitive dependencies in the pom
+        artifact tasks.named('jar')
+        
+        gradleutils.promote(it)
+
+        pom { pom ->
+            name = gradleutils.displayName
+            description = project.description
+
+            gradleutils.pom.addRemoteDetails(pom)
+
+            licenses {
+                license gradleutils.pom.licenses.MIT
+            }
+
+            developers {
+                developer gradleutils.pom.developers.LexManos
+            }
         }
     }
+
     repositories {
-        maven {
-            if (project.hasProperty('forgeMavenPassword')) {
-                credentials {
-                    username project.properties.forgeMavenUser
-                    password project.properties.forgeMavenPassword
-                }
-                url 'https://files.minecraftforge.net/maven/manage/upload'
-            } else {
-                url 'file://' + rootProject.file('repo').getAbsolutePath()
-            }
-        }
+        maven gradleutils.publishingForgeMaven
     }
 }
+

build.gradle

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,17 @@
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
+}
+
+rootProject.name = 'legacyjavafixer'
+
+//formatter:off
+dependencyResolutionManagement.versionCatalogs.register('libs') {
+    plugin 'licenser',    'net.minecraftforge.licenser'    version '1.2.0'
+    plugin 'gradleutils', 'net.minecraftforge.gradleutils' version '3.3.21'
+    plugin 'gitversion',  'net.minecraftforge.gitversion'  version '3.1.6'
+    plugin 'forgegradle', 'net.minecraftforge.gradle'      version '7.0.40'
+    
+    library 'launchwrapper', 'net.minecraft',      'launchwrapper' version '1.11'
+    library 'forge',         'net.minecraftforge', 'forge'         version '1.6.4-9.11.1.964'
+}
+//formatter:on

settings.gradle

@@ -1,4 +1,8 @@
-package net.minecraftforge.legacyjavafixer.sort;
+/*
+ * Copyright (c) LexManos
+ * SPDX-License-Identifier: MIT
+ */
+package net.minecraftforge.legacyjavafixer;
 
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
 import net.minecraft.launchwrapper.Launch;
@@ -9,17 +13,14 @@
 /**
  * Used as a dummy plugin to add our cascading tweaker.
  * This allows us to provide this tweaker via the '-Dfml.coreMods.load' system property.
- * <p>
- * Created by covers1624 on 1/6/21.
  */
-@IFMLLoadingPlugin.SortingIndex (-2147483648)
-public class LegacyJavaSortDummyLoadingPlugin implements IFMLLoadingPlugin {
-
-    public LegacyJavaSortDummyLoadingPlugin() {
+@IFMLLoadingPlugin.SortingIndex(-2147483648)
+public class LoadingPlugin implements IFMLLoadingPlugin {
+    public LoadingPlugin() {
         @SuppressWarnings ("unchecked")
         List<String> tweakClasses = (List<String>) Launch.blackboard.get("TweakClasses");
         // Add our tweaker to LaunchWrapper, this is done the same as FMLTweaker
-        tweakClasses.add("net.minecraftforge.legacyjavafixer.sort.LegacyJavaSortTweaker");
+        tweakClasses.add("net.minecraftforge.legacyjavafixer.Tweaker");
     }
 
     //@formatter:off
@@ -28,6 +29,6 @@ public LegacyJavaSortDummyLoadingPlugin() {
     @Override public String getModContainerClass() { return null; }
     @Override public String getSetupClass() { return null; }
     @Override public void injectData(Map<String, Object> map) { }
-    @Override public String getAccessTransformerClass() { return null; }
+    public String getAccessTransformerClass() { return null; } // Added in 1.7.10
     //@formatter:on
 }