Merge branch '2022.2' into 2022.3

Author: RedNesto

build.gradle.kts

@@ -29,12 +29,12 @@ import org.jlleitschuh.gradle.ktlint.tasks.BaseKtLintCheckTask
 import org.jlleitschuh.gradle.ktlint.tasks.KtLintFormatTask
 
 plugins {
-    kotlin("jvm") version "1.8.0"
+    kotlin("jvm") version "1.9.0"
     java
     mcdev
     groovy
     idea
-    id("org.jetbrains.intellij") version "1.14.1"
+    id("org.jetbrains.intellij") version "1.15.0"
     id("org.cadixdev.licenser")
     id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
 }
@@ -278,7 +278,7 @@ license {
 
     exclude("com/demonwav/mcdev/platform/mixin/invalidInjectorMethodSignature/*.java")
 
-    tasks {
+    this.tasks {
         register("gradle") {
             files.from(
                 fileTree(project.projectDir) {

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -133,26 +130,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,6 +197,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

gradlew

@@ -66,8 +66,12 @@ fun FixedAssetsNewProjectWizardStep.addLicense(project: Project) {
     addTemplates(project, "LICENSE" to "${license.id}.txt")
 }
 
-fun splitPackage(text: String): Pair<String, String> {
+fun splitPackage(text: String): Pair<String?, String> {
     val index = text.lastIndexOf('.')
+    if (index == -1) {
+        return null to text
+    }
+
     val className = text.substring(index + 1)
     val packageName = text.substring(0, index)
     return packageName to className

src/main/kotlin/creator/creator-utils.kt

@@ -51,7 +51,7 @@ import java.nio.file.Path
 abstract class FixedAssetsNewProjectWizardStep(parent: NewProjectWizardStep) : AbstractNewProjectWizardStep(parent) {
     lateinit var outputDirectory: String
     private val assets = arrayListOf<FixedGeneratorAsset>()
-    val templateProperties = hashMapOf<String, Any>()
+    val templateProperties = hashMapOf<String, Any?>()
     private val filesToOpen = hashSetOf<String>()
 
     fun addAssets(vararg assets: Any) = addAssets(assets.toList())
@@ -66,9 +66,9 @@ abstract class FixedAssetsNewProjectWizardStep(parent: NewProjectWizardStep) : A
         }
     }
 
-    fun addTemplateProperties(vararg properties: Pair<String, Any>) = addTemplateProperties(properties.toMap())
+    fun addTemplateProperties(vararg properties: Pair<String, Any?>) = addTemplateProperties(properties.toMap())
 
-    fun addTemplateProperties(properties: Map<String, Any>) = templateProperties.putAll(properties)
+    fun addTemplateProperties(properties: Map<String, Any?>) = templateProperties.putAll(properties)
 
     fun addFilesToOpen(vararg relativeCanonicalPaths: String) = addFilesToOpen(relativeCanonicalPaths.toList())
 

src/main/kotlin/creator/step/FixedAssetsNewProjectWizardStep.kt

@@ -53,7 +53,8 @@ class ForgeProjectFilesStep(parent: NewProjectWizardStep) : AbstractLongRunningA
     override fun setupAssets(project: Project) {
         val mcVersion = data.getUserData(ForgeVersionChainStep.MC_VERSION_KEY) ?: return
         val forgeVersion = data.getUserData(ForgeVersionChainStep.FORGE_VERSION_KEY) ?: return
-        val (mainPackageName, mainClassName) = splitPackage(data.getUserData(MainClassStep.KEY) ?: return)
+        val mainClass = data.getUserData(MainClassStep.KEY) ?: return
+        val (mainPackageName, mainClassName) = splitPackage(mainClass)
         val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
         val modName = data.getUserData(AbstractModNameStep.KEY) ?: return
         val license = data.getUserData(LicenseStep.KEY) ?: return
@@ -108,12 +109,12 @@ class ForgeProjectFilesStep(parent: NewProjectWizardStep) : AbstractLongRunningA
             mcVersion >= MinecraftVersions.MC1_19 -> MinecraftTemplates.FG3_1_19_MAIN_CLASS_TEMPLATE
             mcVersion >= MinecraftVersions.MC1_18 -> MinecraftTemplates.FG3_1_18_MAIN_CLASS_TEMPLATE
             mcVersion >= MinecraftVersions.MC1_17 -> MinecraftTemplates.FG3_1_17_MAIN_CLASS_TEMPLATE
-            else -> MinecraftTemplates.FG3_MAIN_CLASS_TEMPLATE
+            else -> MinecraftTemplates.FG3_1_16_MAIN_CLASS_TEMPLATE
         }
 
         assets.addTemplates(
             project,
-            "src/main/java/${mainPackageName.replace('.', '/')}/$mainClassName.java" to mainClassTemplate,
+            "src/main/java/${mainClass.replace('.', '/')}.java" to mainClassTemplate,
             "src/main/resources/pack.mcmeta" to MinecraftTemplates.PACK_MCMETA_TEMPLATE,
             "src/main/resources/META-INF/mods.toml" to MinecraftTemplates.MODS_TOML_TEMPLATE,
         )
@@ -124,10 +125,12 @@ class ForgeProjectFilesStep(parent: NewProjectWizardStep) : AbstractLongRunningA
         }
 
         if (configTemplate != null) {
-            assets.addTemplates(
-                project,
-                "src/main/java/${mainPackageName.replace('.', '/')}/Config.java" to configTemplate,
-            )
+            val configPath = if (mainPackageName != null) {
+                "src/main/java/${mainPackageName.replace('.', '/')}/Config.java"
+            } else {
+                "src/main/java/Config.java"
+            }
+            assets.addTemplates(project, configPath to configTemplate)
         }
 
         assets.addLicense(project)

src/main/kotlin/platform/forge/creator/asset-steps.kt

@@ -40,7 +40,6 @@ import com.demonwav.mcdev.creator.step.LicenseStep
 import com.demonwav.mcdev.creator.step.NewProjectWizardChainStep.Companion.nextStep
 import com.demonwav.mcdev.creator.step.UseMixinsStep
 import com.demonwav.mcdev.util.MinecraftTemplates
-import com.demonwav.mcdev.util.MinecraftVersions
 import com.demonwav.mcdev.util.SemanticVersion
 import com.intellij.ide.wizard.NewProjectWizardStep
 import com.intellij.openapi.application.WriteAction
@@ -95,9 +94,6 @@ class ForgeGradleFilesStep(parent: NewProjectWizardStep) : AbstractLongRunningAs
         assets.addTemplateProperties(
             "MOD_NAME" to modName,
             "MC_VERSION" to mcVersion,
-            "MCP_CHANNEL" to "official",
-            "MCP_VERSION" to mcVersion,
-            "MCP_MC_VERSION" to mcVersion,
             "MC_NEXT_VERSION" to mcNextVersion,
             "FORGE_VERSION" to forgeVersion,
             "FORGE_SPEC_VERSION" to forgeVersion.parts[0].versionString,
@@ -122,13 +118,6 @@ class ForgeGradleFilesStep(parent: NewProjectWizardStep) : AbstractLongRunningAs
             assets.addTemplateProperties("GAME_TEST_FRAMEWORK" to "true")
         }
 
-        if (mcVersion <= MinecraftVersions.MC1_16_5) {
-            assets.addTemplateProperties(
-                "MCP_CHANNEL" to "snapshot",
-                "MCP_VERSION" to "20210309",
-            )
-        }
-
         assets.addTemplates(
             project,
             "build.gradle" to MinecraftTemplates.FG3_BUILD_GRADLE_TEMPLATE,

src/main/kotlin/platform/forge/creator/gradle-steps.kt

@@ -29,6 +29,7 @@ import com.intellij.openapi.application.runWriteActionAndWait
 import com.intellij.openapi.externalSystem.task.TaskCallback
 import com.intellij.openapi.roots.LibraryOrderEntry
 import com.intellij.openapi.roots.OrderRootType
+import com.intellij.openapi.roots.impl.libraries.LibraryEx
 import com.intellij.openapi.util.ActionCallback
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiJavaFile
@@ -103,6 +104,10 @@ class FabricLoomDecompileSourceProvider : AttachSourcesProvider {
                 val library = libraryEntry.library
                 if (library != null) {
                     runWriteActionAndWait {
+                        if (library is LibraryEx && library.isDisposed) {
+                            return@runWriteActionAndWait
+                        }
+
                         val model = library.modifiableModel
                         model.addRoot("jar://$sourcePath!/", OrderRootType.SOURCES)
                         model.commit()

src/main/kotlin/platform/mcp/fabricloom/FabricLoomDecompileSourceProvider.kt

@@ -24,6 +24,7 @@ import com.demonwav.mcdev.platform.mixin.reference.MixinSelector
 import com.demonwav.mcdev.util.constantValue
 import com.demonwav.mcdev.util.createLiteralExpression
 import com.demonwav.mcdev.util.descriptor
+import com.demonwav.mcdev.util.ifNotBlank
 import com.intellij.codeInsight.lookup.LookupElementBuilder
 import com.intellij.openapi.project.Project
 import com.intellij.psi.JavaPsiFacade
@@ -60,7 +61,7 @@ class ConstantInjectionPoint : InjectionPoint<PsiElement>() {
         val longValue = args["longValue"]?.toLongOrNull()
         val doubleValue = args["doubleValue"]?.toDoubleOrNull()
         val stringValue = args["stringValue"]
-        val classValue = args["classValue"]?.let { Type.getObjectType(it.replace('.', '/')) }
+        val classValue = args["classValue"]?.ifNotBlank { Type.getObjectType(it.replace('.', '/')) }
         val count =
             nullValue.toInt() +
                 (intValue != null).toInt() +