User: kyle wood
Date: 29 Jan 23 07:25
Revision: 3645531914a65bb0da1df8a6b0504fc3331e29d4
Summary:
Merge branch '2022.3' into 2023.1


TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=8277&personal=false

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision 4e860a8ec2abd02230c5a2fb57eb824910e1ecad)
+++ build.gradle.kts	(revision 3645531914a65bb0da1df8a6b0504fc3331e29d4)
@@ -3,7 +3,7 @@
  *
  * https://minecraftdev.org
  *
- * Copyright (c) 2022 minecraft-dev
+ * Copyright (c) 2023 minecraft-dev
  *
  * MIT License
  */
@@ -16,7 +16,7 @@
 import org.jlleitschuh.gradle.ktlint.tasks.BaseKtLintCheckTask
 
 plugins {
-    kotlin("jvm") version "1.7.20"
+    kotlin("jvm") version "1.8.0"
     java
     mcdev
     groovy
@@ -349,7 +349,6 @@
 tasks.runIde {
     maxHeapSize = "4G"
 
-    jvmArgs("--add-exports=java.base/jdk.internal.vm=ALL-UNNAMED")
     System.getProperty("debug")?.let {
         systemProperty("idea.ProcessCanceledException", "disabled")
         systemProperty("idea.debug.mode", "true")
Index: gradle.properties
===================================================================
--- gradle.properties	(revision 4e860a8ec2abd02230c5a2fb57eb824910e1ecad)
+++ gradle.properties	(revision 3645531914a65bb0da1df8a6b0504fc3331e29d4)
@@ -3,7 +3,7 @@
 #
 # https://minecraftdev.org
 #
-# Copyright (c) 2022 minecraft-dev
+# Copyright (c) 2023 minecraft-dev
 #
 # MIT License
 #
@@ -14,10 +14,10 @@
 ideaVersion = 231-EAP-SNAPSHOT
 ideaVersionName = 2023.1
 
-coreVersion = 1.5.21
+coreVersion = 1.5.22
 downloadIdeaSources = true
 
 pluginTomlVersion = 231.4840.388
 
 # Silences a build-time warning because we are bundling our own kotlin library
-kotlin.stdlib.default.dependency = true
+kotlin.stdlib.default.dependency = false
Index: src/main/kotlin/facet/MinecraftFacetDetector.kt
===================================================================
--- src/main/kotlin/facet/MinecraftFacetDetector.kt	(revision 4e860a8ec2abd02230c5a2fb57eb824910e1ecad)
+++ src/main/kotlin/facet/MinecraftFacetDetector.kt	(revision 3645531914a65bb0da1df8a6b0504fc3331e29d4)
@@ -3,7 +3,7 @@
  *
  * https://minecraftdev.org
  *
- * Copyright (c) 2022 minecraft-dev
+ * Copyright (c) 2023 minecraft-dev
  *
  * MIT License
  */
Index: src/main/kotlin/platform/forge/inspections/simpleimpl/AddEmptyConstructorInspectionGadgetsFix.kt
===================================================================
--- src/main/kotlin/platform/forge/inspections/simpleimpl/AddEmptyConstructorInspectionGadgetsFix.kt	(revision 4e860a8ec2abd02230c5a2fb57eb824910e1ecad)
+++ src/main/kotlin/platform/forge/inspections/simpleimpl/AddEmptyConstructorInspectionGadgetsFix.kt	(revision 3645531914a65bb0da1df8a6b0504fc3331e29d4)
@@ -3,7 +3,7 @@
  *
  * https://minecraftdev.org
  *
- * Copyright (c) 2022 minecraft-dev
+ * Copyright (c) 2023 minecraft-dev
  *
  * MIT License
  */
Index: src/main/kotlin/platform/mcp/actions/GotoAtEntryAction.kt
===================================================================
--- src/main/kotlin/platform/mcp/actions/GotoAtEntryAction.kt	(revision 4e860a8ec2abd02230c5a2fb57eb824910e1ecad)
+++ src/main/kotlin/platform/mcp/actions/GotoAtEntryAction.kt	(revision 3645531914a65bb0da1df8a6b0504fc3331e29d4)
@@ -3,7 +3,7 @@
  *
  * https://minecraftdev.org
  *
- * Copyright (c) 2022 minecraft-dev
+ * Copyright (c) 2023 minecraft-dev
  *
  * MIT License
  */
Index: src/main/kotlin/platform/mcp/actions/SrgActionBase.kt
===================================================================
--- src/main/kotlin/platform/mcp/actions/SrgActionBase.kt	(revision 4e860a8ec2abd02230c5a2fb57eb824910e1ecad)
+++ src/main/kotlin/platform/mcp/actions/SrgActionBase.kt	(revision 3645531914a65bb0da1df8a6b0504fc3331e29d4)
@@ -3,7 +3,7 @@
  *
  * https://minecraftdev.org
  *
- * Copyright (c) 2022 minecraft-dev
+ * Copyright (c) 2023 minecraft-dev
  *
  * MIT License
  */
Index: src/main/kotlin/platform/mixin/handlers/injectionPoint/LoadInjectionPoint.kt
===================================================================
--- src/main/kotlin/platform/mixin/handlers/injectionPoint/LoadInjectionPoint.kt	(revision 4e860a8ec2abd02230c5a2fb57eb824910e1ecad)
+++ src/main/kotlin/platform/mixin/handlers/injectionPoint/LoadInjectionPoint.kt	(revision 3645531914a65bb0da1df8a6b0504fc3331e29d4)
@@ -3,7 +3,7 @@
  *
  * https://minecraftdev.org
  *
- * Copyright (c) 2022 minecraft-dev
+ * Copyright (c) 2023 minecraft-dev
  *
  * MIT License
  */
Index: src/main/kotlin/platform/mixin/util/LocalVariables.kt
===================================================================
--- src/main/kotlin/platform/mixin/util/LocalVariables.kt	(revision 4e860a8ec2abd02230c5a2fb57eb824910e1ecad)
+++ src/main/kotlin/platform/mixin/util/LocalVariables.kt	(revision 3645531914a65bb0da1df8a6b0504fc3331e29d4)
@@ -3,7 +3,7 @@
  *
  * https://minecraftdev.org
  *
- * Copyright (c) 2022 minecraft-dev
+ * Copyright (c) 2023 minecraft-dev
  *
  * MIT License
  */
Index: src/main/kotlin/util/utils.kt
===================================================================
--- src/main/kotlin/util/utils.kt	(revision 4e860a8ec2abd02230c5a2fb57eb824910e1ecad)
+++ src/main/kotlin/util/utils.kt	(revision 3645531914a65bb0da1df8a6b0504fc3331e29d4)
@@ -3,7 +3,7 @@
  *
  * https://minecraftdev.org
  *
- * Copyright (c) 2022 minecraft-dev
+ * Copyright (c) 2023 minecraft-dev
  *
  * MIT License
  */
@@ -18,6 +18,7 @@
 import com.intellij.openapi.application.ModalityState
 import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.command.WriteCommandAction
+import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.module.ModuleManager
 import com.intellij.openapi.progress.ProcessCanceledException
@@ -32,6 +33,7 @@
 import com.intellij.pom.java.LanguageLevel
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.PsiFile
+import java.lang.invoke.MethodHandles
 import java.util.Locale
 import kotlin.math.min
 import kotlin.reflect.KClass
@@ -348,3 +350,8 @@
     }
 
 fun String.decapitalize(): String = replaceFirstChar { it.lowercase(Locale.ENGLISH) }
+
+// Bit of a hack, but this allows us to get the class object for top level declarations without having to
+// put the whole class name in as a string (easier to refactor, etc.)
+@Suppress("NOTHING_TO_INLINE") // In order for this to work this function must be `inline`
+inline fun loggerForTopLevel() = Logger.getInstance(MethodHandles.lookup().lookupClass())