Merge branch 'refs/heads/2023.2' into 2023.3

RedNesto · RedNesto · commit 578256891424 · 2024-02-26T19:31:21.000+01:00
# Conflicts:
#	src/main/kotlin/facet/MinecraftFacetDetector.kt
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -34,7 +34,7 @@ plugins {
     mcdev
     groovy
     idea
-    id("org.jetbrains.intellij") version "1.17.0"
+    id("org.jetbrains.intellij") version "1.17.2"
     id("org.cadixdev.licenser")
     id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
 }
diff --git a/gradle.properties b/gradle.properties
@@ -24,7 +24,7 @@ kotlin.code.style=official
 ideaVersion = 2023.3
 ideaVersionName = 2023.3
 
-coreVersion = 1.7.2
+coreVersion = 1.7.3
 downloadIdeaSources = true
 
 pluginTomlVersion = 233.11799.172
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew.bat b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/src/main/kotlin/platform/forge/gradle/ForgeRunConfigDataService.kt b/src/main/kotlin/platform/forge/gradle/ForgeRunConfigDataService.kt
@@ -176,6 +176,10 @@ class ForgeRunConfigDataService : AbstractProjectDataService<ProjectData, Projec
             }
         }
 
+        if (project.isDisposed) {
+            return
+        }
+
         project.guessProjectDir()?.let { dir ->
             LocalFileSystem.getInstance().refreshFiles(listOf(dir), true, true, null)
         }
diff --git a/src/main/kotlin/platform/forge/util/ForgeConstants.kt b/src/main/kotlin/platform/forge/util/ForgeConstants.kt
@@ -51,6 +51,6 @@ object ForgeConstants {
     // From https://github.com/MinecraftForge/MinecraftForge/blob/38a5400a8c878fe39cd389e6d4f68619d2738b88/src/fmllauncher/java/net/minecraftforge/fml/loading/moddiscovery/ModInfo.java#L45
     val MOD_ID_REGEX = "^[a-z][a-z0-9_-]{1,63}$".toRegex()
 
-    val DISPLAY_TEST_MANIFEST_VERSION = SemanticVersion.release(41, 0, 15)
+    val DISPLAY_TEST_MANIFEST_VERSION = SemanticVersion.release(40, 2, 14)
     val CLIENT_ONLY_MANIFEST_VERSION = SemanticVersion.release(49, 0, 6)
 }
diff --git a/src/main/kotlin/platform/mixin/handlers/injectionPoint/NewInsnInjectionPoint.kt b/src/main/kotlin/platform/mixin/handlers/injectionPoint/NewInsnInjectionPoint.kt
@@ -223,7 +223,7 @@ class NewInsnSelectorParser : MixinSelectorParser {
         return if (strippedValue.startsWith('(')) {
             NewInsnDescriptorSelector(strippedValue)
         } else {
-            NewInsnTypeSelector(strippedValue)
+            NewInsnTypeSelector(strippedValue.removeSurrounding("L", ";"))
         }
     }
 }
diff --git a/src/main/kotlin/platform/velocity/creator/asset-steps.kt b/src/main/kotlin/platform/velocity/creator/asset-steps.kt
@@ -103,12 +103,12 @@ class VelocityModifyMainClassStep(
         val authors = data.getUserData(AuthorsStep.KEY) ?: emptyList()
         val dependencies = data.getUserData(DependStep.KEY) ?: emptyList()
 
-        NonProjectFileWritingAccessProvider.disableChecksDuring {
-            project.runWriteTaskInSmartMode {
+        project.runWriteTaskInSmartMode {
+            NonProjectFileWritingAccessProvider.disableChecksDuring {
                 val mainClassVirtualFile = VfsUtil.findFile(Path.of(mainClassFile), true)
-                    ?: return@runWriteTaskInSmartMode
+                    ?: return@disableChecksDuring
                 val mainClassPsi = PsiManager.getInstance(project).findFile(mainClassVirtualFile) as? PsiJavaFile
-                    ?: return@runWriteTaskInSmartMode
+                    ?: return@disableChecksDuring
 
                 val psiClass = mainClassPsi.classes[0]
                 val annotation = buildString {
diff --git a/src/main/kotlin/platform/velocity/creator/ui-steps.kt b/src/main/kotlin/platform/velocity/creator/ui-steps.kt
@@ -95,6 +95,7 @@ class VelocityVersionStep(
     private fun applyJdkVersion() {
         SemanticVersion.tryParse(version)?.let { version ->
             val preferredJdk = when {
+                version >= SemanticVersion.release(3, 3) -> JavaSdkVersion.JDK_17
                 version >= SemanticVersion.release(3) -> JavaSdkVersion.JDK_11
                 else -> JavaSdkVersion.JDK_1_8
             }
diff --git a/src/main/kotlin/toml/platform/forge/ModsTomlSchema.kt b/src/main/kotlin/toml/platform/forge/ModsTomlSchema.kt
@@ -48,6 +48,8 @@ license="All rights reserved"
 showAsResourcePack=false
 # A URL to refer people to when problems occur with this mod.
 issueTrackerURL="http://my.issue.tracker/"
+# If your mod is purely client-side and has no multiplayer functionality (be it dedicated servers or Open to LAN), set this to true, and Forge will set the correct displayTest for you and skip loading your mod on dedicated servers.
+clientSideOnly=false
 # A list of mods - how many allowed here is determined by the individual mod loader
 [[mods]]
 # The modid of the mod.
@@ -74,7 +76,7 @@ authors="Love, Cheese and small house plants"
 # IGNORE_ALL_VERSION means that your mod will not cause a red X if it's present on the client or the server. This is a special case and should only be used if your mod has no server component.
 # NONE means that no display test is set on your mod. You need to do this yourself, see IExtensionPoint.DisplayTest for more information. You can define any scheme you wish with this value.
 # IMPORTANT NOTE: this is NOT an instruction as to which environments (CLIENT or DEDICATED SERVER) your mod loads on. Your mod should load (and maybe do nothing!) whereever it finds itself.
-displayTest="MATCH_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional)
+displayTest="MATCH_VERSION" # if nothing is specified, MATCH_VERSION is the default when clientSideOnly=false, otherwise IGNORE_ALL_VERSION when clientSideOnly=true (#optional)
 
 # The description text for the mod (multi line!)
 description='''
diff --git a/src/main/kotlin/toml/platform/forge/completion/ModsTomlCompletionContributor.kt b/src/main/kotlin/toml/platform/forge/completion/ModsTomlCompletionContributor.kt
@@ -58,6 +58,7 @@ class ModsTomlCompletionContributor : CompletionContributor() {
         extendBooleanValues("showAsResourcePack")
         extendBooleanValues("logoBlur")
         extendBooleanValues("mandatory")
+        extendBooleanValues("clientSideOnly")
     }
 
     private fun extendKnownValues(key: String, values: Set<String>) =
diff --git a/src/main/kotlin/toml/platform/forge/inspections/ModsTomlValidationInspection.kt b/src/main/kotlin/toml/platform/forge/inspections/ModsTomlValidationInspection.kt
@@ -112,6 +112,15 @@ class ModsTomlValidationInspection : LocalInspectionTool() {
                         holder.registerProblem(value, TextRange(1, endOffset), "Order $order does not exist")
                     }
                 }
+                "clientSideOnly" -> {
+                    val forgeVersion = runCatching {
+                        keyValue.findMcpModule()?.getSettings()?.platformVersion?.let(SemanticVersion::parse)
+                    }.getOrNull()
+                    val minVersion = ForgeConstants.CLIENT_ONLY_MANIFEST_VERSION
+                    if (forgeVersion != null && forgeVersion < minVersion) {
+                        holder.registerProblem(keyValue.key, "ClientSideOnly is only available since $minVersion")
+                    }
+                }
             }
         }
 
diff --git a/src/test/kotlin/platform/forge/ModsTomlCompletionTest.kt b/src/test/kotlin/platform/forge/ModsTomlCompletionTest.kt
@@ -53,6 +53,7 @@ class ModsTomlCompletionTest : BasePlatformTestCase() {
             "license",
             "showAsResourcePack",
             "issueTrackerURL",
+            "clientSideOnly",
         )
     }
 

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ plugins {`
`34`	`34`	`mcdev`
`35`	`35`	`groovy`
`36`	`36`	`idea`
`37`		`- id("org.jetbrains.intellij") version "1.17.0"`
	`37`	`+ id("org.jetbrains.intellij") version "1.17.2"`
`38`	`38`	`id("org.cadixdev.licenser")`
`39`	`39`	`id("org.jlleitschuh.gradle.ktlint") version "10.3.0"`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,10 @@ class ForgeRunConfigDataService : AbstractProjectDataService<ProjectData, Projec`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`
	`179`	`+ if (project.isDisposed) {`
	`180`	`+ return`
	`181`	`+ }`
	`182`	`+`
`179`	`183`	`project.guessProjectDir()?.let { dir ->`
`180`	`184`	`LocalFileSystem.getInstance().refreshFiles(listOf(dir), true, true, null)`
`181`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,6 @@ object ForgeConstants {`
`51`	`51`	`// From https://github.com/MinecraftForge/MinecraftForge/blob/38a5400a8c878fe39cd389e6d4f68619d2738b88/src/fmllauncher/java/net/minecraftforge/fml/loading/moddiscovery/ModInfo.java#L45`
`52`	`52`	`val MOD_ID_REGEX = "^[a-z][a-z0-9_-]{1,63}$".toRegex()`
`53`	`53`
`54`		`- val DISPLAY_TEST_MANIFEST_VERSION = SemanticVersion.release(41, 0, 15)`
	`54`	`+ val DISPLAY_TEST_MANIFEST_VERSION = SemanticVersion.release(40, 2, 14)`
`55`	`55`	`val CLIENT_ONLY_MANIFEST_VERSION = SemanticVersion.release(49, 0, 6)`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ class NewInsnSelectorParser : MixinSelectorParser {`
`223`	`223`	`return if (strippedValue.startsWith('(')) {`
`224`	`224`	`NewInsnDescriptorSelector(strippedValue)`
`225`	`225`	`} else {`
`226`		`- NewInsnTypeSelector(strippedValue)`
	`226`	`+ NewInsnTypeSelector(strippedValue.removeSurrounding("L", ";"))`
`227`	`227`	`}`
`228`	`228`	`}`
`229`	`229`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,7 @@ class VelocityVersionStep(`
`95`	`95`	`private fun applyJdkVersion() {`
`96`	`96`	`SemanticVersion.tryParse(version)?.let { version ->`
`97`	`97`	`val preferredJdk = when {`
	`98`	`+ version >= SemanticVersion.release(3, 3) -> JavaSdkVersion.JDK_17`
`98`	`99`	`version >= SemanticVersion.release(3) -> JavaSdkVersion.JDK_11`
`99`	`100`	`else -> JavaSdkVersion.JDK_1_8`
`100`	`101`	`}`