Merge branch '2023.1' into 2023.2

Author: DenWav

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.9.0"
+    kotlin("jvm") version "1.9.20"
     java
     mcdev
     groovy
     idea
-    id("org.jetbrains.intellij") version "1.15.0"
+    id("org.jetbrains.intellij") version "1.16.0"
     id("org.cadixdev.licenser")
     id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
 }

gradle.properties

@@ -24,7 +24,7 @@ kotlin.code.style=official
 ideaVersion = 2023.2.2
 ideaVersionName = 2023.2.2
 
-coreVersion = 1.6.10
+coreVersion = 1.6.11
 downloadIdeaSources = true
 
 pluginTomlVersion = 232.8660.88

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,15 +145,15 @@ 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=SC2039,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=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +202,11 @@ 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
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew

@@ -35,7 +35,7 @@ Minecraft Development for IntelliJ
     </tr>
 </table>
 
-Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.6.10-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.6.11-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
 ----------------------
 
 <a href="https://discord.gg/j6UNcfr"><img src="https://i.imgur.com/JXu9C1G.png" height="48px"></img></a>

readme.md

@@ -25,7 +25,6 @@ import com.demonwav.mcdev.update.PluginUtil
 import com.demonwav.mcdev.util.fromJson
 import com.demonwav.mcdev.util.mapFirstNotNull
 import com.demonwav.mcdev.util.withSuppressed
-import com.github.kittinunf.fuel.core.FuelError
 import com.github.kittinunf.fuel.core.FuelManager
 import com.github.kittinunf.fuel.core.requests.suspendable
 import com.github.kittinunf.fuel.coroutines.awaitString
@@ -77,11 +76,11 @@ suspend fun <T : Any> getVersionJson(path: String, type: KClass<T>): T {
 }
 
 suspend fun getText(path: String): String {
-    var thrown: FuelError? = null
+    var thrown: Exception? = null
     return URLS.mapFirstNotNull { url ->
         try {
             doCall(url + path)
-        } catch (e: FuelError) {
+        } catch (e: Exception) {
             PLATFORM_VERSION_LOGGER.warn("Failed to reach URL $url$path")
             thrown = withSuppressed(thrown, e)
             null

src/main/kotlin/creator/PlatformVersion.kt

@@ -114,6 +114,7 @@ class MinecraftFacet(
             }
 
         newlyEnabled.forEach(AbstractModule::init)
+        modules.forEach(AbstractModule::refresh)
 
         ProjectView.getInstance(module.project).refresh()
     }

src/main/kotlin/facet/MinecraftFacet.kt

@@ -79,7 +79,7 @@ private fun <T> findColorFromExpression(
     val facet = MinecraftFacet.getInstance(module) ?: return null
     val resolvedName = expression.resolvedName ?: return null
     for (abstractModuleType in facet.types) {
-        val map = abstractModuleType.classToColorMappings
+        val map = abstractModuleType.classToColorMappings(module)
         for (entry in map.entries) {
             // This is such a hack
             // Okay, type will be the fully-qualified class, but it will exclude the actual enum

src/main/kotlin/insight/ColorUtil.kt

@@ -93,4 +93,5 @@ abstract class AbstractModule(protected val facet: MinecraftFacet) {
 
     open fun init() {}
     open fun dispose() {}
+    open fun refresh() {}
 }