Upgrade to ForgeGradle 5.0

Upgrade to Gradle 7.5.
Update BUILDING.md.
Fix IntelliJ run configuration resources.

Author: bziemons

BUILDING.md

@@ -9,19 +9,17 @@ But we have some required steps that you need to follow to make things work.
 
 1. Having [git](http://git-scm.com/) and git-lfs installed
 2. Having an IDE (we do use [IntelliJ IDEA](https://www.jetbrains.com/idea/))
-3. Having [Lombok](http://projectlombok.org/) installed with your IDE (in
-IntelliJ IDEA there is a plugin for Lombok which requires annotation processing
-to be enabled)
-4. Having Java JDK 8, newer versions are not supported.
-5. [Discord](https://discord.gg/6vPP3A8) wouldn't be bad if you want to communicate with other
+3. Having Java Development Kit 8; newer versions are not supported by this
+   Minecraft or Minecraft Forge version.
+4. Matrix/Discord wouldn't be bad if you want to communicate with other
    contributors and us.
 
 
 ## Matrix
 
-[Dev Channel](https://matrix.to/#/#logisticspipes+dev:rs485.network)
+[Logistics Pipes Space](https://matrix.to/#/#logisticspipes+space:rs485.network)
 
-[LP Community](https://matrix.to/#/+logisticspipes:rs485.network)
+- [Dev Channel](https://matrix.to/#/#logisticspipes+dev:rs485.network)
 
 The channels are all linked to Discord and some even to IRC.
 
@@ -54,27 +52,37 @@ $ git lfs checkout
 
 ### Gradle
 
-After cloning, you can build LP with `./gradlew build` and find the output in
-`build/libs`. If the task fails there may be something wrong with maven
-repositories or [a Java update broke ForgeGradle 2](https://github.com/MinecraftForge/ForgeGradle/issues/652)
+Make sure you are running Gradle with Java 8: You can check the default
+java version with `java -version` and control the version Gradle uses with
+the `JAVA_HOME` environment variable. LP can be built with `./gradlew build`
+and the output found in the directory `build/libs`.
+If the task fails there may be something wrong with maven repositories or
+[a Java update broke ForgeGradle 2](https://github.com/MinecraftForge/ForgeGradle/issues/652)
 or something may be wrong with your setup. You may definitely ask for help on
 the mentioned communication channels above, but please be sure to state your
 issue as good as possible and be nice to others.
 
 ### IDEA Quirks
 
-If you opened the project in IDEA before running the `./gradlew build` command the run
-configurations will not be visible, simple fix is to reload the project.
-
-If the run configurations are not present still, run `genIntellijRuns` task using IDEA's
-Gradle integration, then the configurations will appear.
+For IDEA to use the correct Java SDK, you might have to select the correct
+JDK (Java JDK 8, OpenJDK build preferred) in `File > Project Structure` in the
+project part of the project settings under SDK.
 
 ### Running Minecraft from your dev environment
 
 After you successfully built LP you can probably run Minecraft directly from
-your IDE. There may be a ton of missing texture errors and missing language
-files though and this problem even happens when using a new clean mod template,
-but don't be sad! The solution is to copy your `build/resources/main/*` into
+your IDE after running the correct ForgeGradle generate run configuration task.
+Please look at ForgeGradle documentation for more information.
+
+If you are not using IntelliJ IDEA, there may be a ton of missing texture
+errors and missing language files. The cause is newer ForgeGradle versions.
+Our ForgeGradle version and our build script contain fixes for IntelliJ IDEA
+only; sorry if you are not using IDEA. The solution is to remove
+`build/classes/*/*` and `build/resources/*` from the run configuration
+classpath and add the custom `build/run_classes` path to the classpath.
+We are open for any contributions for a better solution or wider support.
+
+The workaround is to copy your `build/resources/main/*` into 
 `build/classes/java/main` before launching the game, or you may link those two
  together (Linux or WSL):
 

build.gradle

@@ -6,13 +6,13 @@ buildscript {
         }
     }
     dependencies {
-        classpath group: 'network.rs485', name: 'ForgeGradle', version: forgegradle_version
+        classpath group: 'network.rs485.forge', name: 'ForgeGradle', version: forgegradle_version
     }
 }
 
 plugins {
-    id 'maven'
     id 'java'
+    id 'maven-publish'
     id 'org.jetbrains.kotlin.jvm' version "$kotlin_version"
     id 'org.jetbrains.kotlin.plugin.serialization' version "$kotlin_version"
     id 'org.jetbrains.kotlin.plugin.lombok' version "$kotlin_version"
@@ -21,16 +21,17 @@ plugins {
     id 'com.matthewprenger.cursegradle' version "$cursegradle_version"
     id 'com.github.johnrengelman.shadow' version "$shadow_version"
 }
-apply plugin: 'net.minecraftforge.gradle'
+apply plugin: 'network.rs485.forge'
 
 archivesBaseName = "logisticspipes"
 group = "network.rs485"
 version = "0.10.4"
 ext.vendor = "unknown"
 ext.target = "Forge $forge_version"
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+java.toolchain.languageVersion = JavaLanguageVersion.of(8)
+
+println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
 
 def ENV = System.getenv()
 
@@ -110,6 +111,18 @@ kotlinLombok {
     lombokConfigurationFile file("lombok.config")
 }
 
+project.afterEvaluate {
+    tasks.register('copyRunClasses', Copy.class) {
+        dependsOn ['classes']
+        from sourceSets.main.output.classesDirs, sourceSets.main.output.resourcesDir, sourceSets.api.output.classesDirs
+        into "${project.buildDir}/run_classes/"
+
+        includeEmptyDirs false
+    }
+
+    tasks['prepareRuns'].dependsOn('copyRunClasses')
+}
+
 minecraft {
     mappings channel: 'snapshot', version: "$mappings_version"
     accessTransformer = file("$rootDir/resources/META-INF/lp_at.cfg")
@@ -127,7 +140,22 @@ minecraft {
             // load LP core mod from classpath
             property 'fml.coreMods.load', 'logisticspipes.asm.LogisticsPipesCoreLoader'
 
-            jvmArg '-ea'
+            jvmArgs '-ea'
+            environment 'MC_VERSION', mcversion
+
+            lazyToken 'classpathExclude', {
+                def paths = [
+                        sourceSets.main.output.classesDirs.asPath,
+                        sourceSets.api.output.classesDirs.asPath,
+                        sourceSets.main.output.resourcesDir.path,
+                        sourceSets.api.output.resourcesDir.path,
+                ]
+                String.join(File.pathSeparator, paths)
+            }
+            lazyToken 'classpathInclude', {
+                def paths = ["${project.buildDir}/run_classes/"]
+                String.join(File.pathSeparator, paths)
+            }
 
             mods {
                 logisticspipes {
@@ -148,7 +176,22 @@ minecraft {
             // load LP core mod from classpath
             property 'fml.coreMods.load', 'logisticspipes.asm.LogisticsPipesCoreLoader'
 
-            jvmArg '-ea'
+            jvmArgs '-ea'
+            environment 'MC_VERSION', mcversion
+
+            lazyToken 'classpathExclude', {
+                def paths = [
+                        sourceSets.main.output.classesDirs.asPath,
+                        sourceSets.api.output.classesDirs.asPath,
+                        sourceSets.main.output.resourcesDir.path,
+                        sourceSets.api.output.resourcesDir.path,
+                ]
+                String.join(File.pathSeparator, paths)
+            }
+            lazyToken 'classpathInclude', {
+                def paths = ["${project.buildDir}/run_classes/"]
+                String.join(File.pathSeparator, paths)
+            }
 
             mods {
                 logisticspipes {
@@ -162,6 +205,7 @@ minecraft {
             // mimic the runServer task
             environment 'mainClass', 'net.minecraft.launchwrapper.Launch'
             environment 'MCP_TO_SRG', "$buildDir/createSrgToMcp/output.srg"
+            environment 'MC_VERSION', mcversion
             main 'net.minecraftforge.legacydev.MainServer'
             args '--tweakClass', 'net.minecraftforge.fml.common.launcher.FMLServerTweaker'
             arg 'nogui' // without GUI
@@ -186,6 +230,7 @@ minecraft {
 jar {
     from sourceSets.api.output
     finalizedBy 'shadowJar'
+    duplicatesStrategy = DuplicatesStrategy.WARN
 
     manifest = project.manifest {
         from sharedManifest
@@ -241,26 +286,19 @@ processResources {
     // this will ensure that this task is redone when the versions change.
     inputs.property "version", project.version
 
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+
     // replace stuff in mcmod.info, nothing else
     from(sourceSets.main.resources.srcDirs) {
         include 'mcmod.info'
 
         // replace version and mcversion
-        expand 'version': project.version
-    }
-
-    // copy everything else, thats not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
+        expand 'version': project.version, 'mcversion': mcversion
     }
 }
 
 repositories {
     mavenCentral()
-    maven {
-        name = 'JitPack.io'
-        url = 'https://jitpack.io'
-    }
     maven {
         url = "https://maven.removeco.de/"
     }
@@ -312,10 +350,17 @@ import java.nio.file.Files
 final nonMinecraftConfigurations = configurations.findAll { conf -> conf != configurations.minecraft }
 if (!nonMinecraftConfigurations.empty) {
     final fgextension = project.getExtensions().findByName("minecraft")
-    final mcrepo = new MinecraftUserRepo(project, 'net.minecraftforge', 'forge', "$forge_version", fgextension.getAccessTransformers(), fgextension.getMappings())
+    final mcrepo = new MinecraftUserRepo(
+        /* project = */ project,
+        /* group = */ 'net.minecraftforge',
+        /* name = */ 'forge',
+        /* version = */ "$forge_version",
+        /* ats = */ fgextension.getAccessTransformers().getFrom().toList(),
+        /* mapping = */ fgextension.getMappings().get(),
+    )
     nonMinecraftConfigurations.each {
         it.resolutionStrategy.dependencySubstitution {
-            substitute module('net.minecraftforge:forge') with module(mcrepo.getDependencyString())
+            substitute module('net.minecraftforge:forge') using module(mcrepo.getDependencyString())
         }
     }
 }
@@ -339,6 +384,7 @@ task deobfJar(type: Jar) {
     from sourceSets.main.output
     from sourceSets.api.output
     archiveClassifier.set('deobf')
+    duplicatesStrategy = DuplicatesStrategy.WARN
 
     manifest = project.manifest {
         from sharedManifest
@@ -349,6 +395,7 @@ task apiJar(type: Jar, dependsOn: apiClasses) {
     from sourceSets.api.output
     from sourceSets.api.allSource
     archiveClassifier.set('api')
+    duplicatesStrategy = DuplicatesStrategy.WARN
 }
 
 curseforge {
@@ -464,7 +511,8 @@ gradle.taskGraph.whenReady { TaskExecutionGraph taskGraph ->
     }
 }
 
-class DownloadTask extends DefaultTask {
+abstract class DownloadTask extends DefaultTask {
+    @Input
     String url
 
     @OutputFile
@@ -507,12 +555,8 @@ task language(dependsOn: [languageMain, languageBook], type: Copy) {
     processResources.dependsOn language
 }
 
-install.repositories.mavenInstaller.pom.whenConfigured { pom ->
-    pom.dependencies.clear()
-}
-
 tasks.named('wrapper') {
-    gradleVersion = '6.8.3'
+    gradleVersion = '7.5'
     distributionType = Wrapper.DistributionType.ALL
 }
 
@@ -545,3 +589,20 @@ task integrationTests(dependsOn: ['prepareRunServerTest'], type: Exec) {
         }
     }
 }
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            artifact jar
+        }
+    }
+    repositories {
+        maven {
+            url "file://${project.projectDir}/mcmodsrepo"
+        }
+    }
+}
+
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
+}

common/logisticspipes/asm/LogisticsPipesCoreLoader.java

@@ -8,6 +8,7 @@
 
 import lombok.Getter;
 
+@IFMLLoadingPlugin.MCVersion("1.12.2")
 //@IFMLLoadingPlugin.SortingIndex(1001) TODO: For next MC update. Changing this now, will change ASM check sums as well.
 public class LogisticsPipesCoreLoader implements IFMLLoadingPlugin {
 

gradle.properties

@@ -8,8 +8,9 @@ kcoroutines_version = 1.6.4
 kserialization_version = 1.4.0
 kaml_version = 0.47.0
 shadow_version = 6.1.0
+mcversion = 1.12.2
 forge_version = 1.12.2-14.23.5.2860
 mappings_version = 20171120-1.12
-forgegradle_version = 4.1.17
+forgegradle_version = 5.1.60
 cursegradle_version = 1.4.0
 lombok_plugin_version = 5.3.3.3

gradle/wrapper/gradle-wrapper.jar

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e996d452d2645e70c01c11143ca2d3742734a28da2bf61f25c82bdc288c9e637
-size 59203
+oid sha256:575098db54a998ff1c6770b352c3b16766c09848bee7555dab09afc34e8cf590
+size 59821

gradle/wrapper/gradle-wrapper.properties

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