User: joe
Date: 16 Jan 24 23:31
Revision: 4327920a8308a73df8295b95029b705167a76a3b
Summary:
Merge branch '2023.1' into 2023.2

# Conflicts:
#	gradle.properties


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=8998&personal=false

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision 117fc789e0951f3501ac0b87924ae44242670ad2)
+++ build.gradle.kts	(revision 4327920a8308a73df8295b95029b705167a76a3b)
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
Index: gradle.properties
===================================================================
--- gradle.properties	(revision 117fc789e0951f3501ac0b87924ae44242670ad2)
+++ gradle.properties	(revision 4327920a8308a73df8295b95029b705167a76a3b)
@@ -3,7 +3,7 @@
 #
 # https://mcdev.io/
 #
-# Copyright (C) 2023 minecraft-dev
+# Copyright (C) 2024 minecraft-dev
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published
Index: src/main/kotlin/creator/buildsystem/maven-steps.kt
===================================================================
--- src/main/kotlin/creator/buildsystem/maven-steps.kt	(revision 117fc789e0951f3501ac0b87924ae44242670ad2)
+++ src/main/kotlin/creator/buildsystem/maven-steps.kt	(revision 4327920a8308a73df8295b95029b705167a76a3b)
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
Index: src/main/kotlin/insight/ColorLineMarkerProvider.kt
===================================================================
--- src/main/kotlin/insight/ColorLineMarkerProvider.kt	(revision 117fc789e0951f3501ac0b87924ae44242670ad2)
+++ src/main/kotlin/insight/ColorLineMarkerProvider.kt	(revision 4327920a8308a73df8295b95029b705167a76a3b)
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
@@ -85,7 +85,7 @@
 
                 val editor = PsiEditorUtil.findEditor(psiElement) ?: return@handler
 
-                val picker = ColorPicker(map, editor.component)
+                val picker = ColorPicker(map, element.project, editor.component)
                 val newColor = picker.showDialog()
                 if (newColor != null && map[newColor] != color) {
                     workElement.setColor(newColor)
Index: src/main/kotlin/platform/mixin/action/FindMixinsAction.kt
===================================================================
--- src/main/kotlin/platform/mixin/action/FindMixinsAction.kt	(revision 117fc789e0951f3501ac0b87924ae44242670ad2)
+++ src/main/kotlin/platform/mixin/action/FindMixinsAction.kt	(revision 4327920a8308a73df8295b95029b705167a76a3b)
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
Index: src/main/kotlin/platform/mixin/insight/MixinLineMarkerProvider.kt
===================================================================
--- src/main/kotlin/platform/mixin/insight/MixinLineMarkerProvider.kt	(revision 117fc789e0951f3501ac0b87924ae44242670ad2)
+++ src/main/kotlin/platform/mixin/insight/MixinLineMarkerProvider.kt	(revision 4327920a8308a73df8295b95029b705167a76a3b)
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
Index: src/main/kotlin/platform/mixin/insight/MixinTargetLineMarkerProvider.kt
===================================================================
--- src/main/kotlin/platform/mixin/insight/MixinTargetLineMarkerProvider.kt	(revision 117fc789e0951f3501ac0b87924ae44242670ad2)
+++ src/main/kotlin/platform/mixin/insight/MixinTargetLineMarkerProvider.kt	(revision 4327920a8308a73df8295b95029b705167a76a3b)
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
Index: src/main/kotlin/platform/sponge/inspection/SpongePluginClassInspection.kt
===================================================================
--- src/main/kotlin/platform/sponge/inspection/SpongePluginClassInspection.kt	(revision 117fc789e0951f3501ac0b87924ae44242670ad2)
+++ src/main/kotlin/platform/sponge/inspection/SpongePluginClassInspection.kt	(revision 4327920a8308a73df8295b95029b705167a76a3b)
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
Index: src/main/kotlin/translations/identification/TranslationExternalAnnotationsArtifactsResolver.kt
===================================================================
--- src/main/kotlin/translations/identification/TranslationExternalAnnotationsArtifactsResolver.kt	(revision 117fc789e0951f3501ac0b87924ae44242670ad2)
+++ src/main/kotlin/translations/identification/TranslationExternalAnnotationsArtifactsResolver.kt	(revision 4327920a8308a73df8295b95029b705167a76a3b)
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
Index: src/main/kotlin/util/class-utils.kt
===================================================================
--- src/main/kotlin/util/class-utils.kt	(revision 117fc789e0951f3501ac0b87924ae44242670ad2)
+++ src/main/kotlin/util/class-utils.kt	(revision 4327920a8308a73df8295b95029b705167a76a3b)
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published
Index: src/main/resources/META-INF/plugin.xml
===================================================================
--- src/main/resources/META-INF/plugin.xml	(revision 117fc789e0951f3501ac0b87924ae44242670ad2)
+++ src/main/resources/META-INF/plugin.xml	(revision 4327920a8308a73df8295b95029b705167a76a3b)
@@ -3,7 +3,7 @@
 
     https://mcdev.io/
 
-    Copyright (C) 2023 minecraft-dev
+    Copyright (C) 2024 minecraft-dev
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published
@@ -233,6 +233,7 @@
         <additionalTextAttributes scheme="Default" file="colorSchemes/NbttDefault.xml"/>
         <additionalTextAttributes scheme="Darcula" file="colorSchemes/NbttDarcula.xml"/>
         <codeInsight.parameterNameHints language="NBTT" implementationClass="com.demonwav.mcdev.nbt.lang.format.NbttParameterNameHints" />
+        <lang.fileViewProviderFactory language="NBTT" implementationClass="com.demonwav.mcdev.nbt.lang.NbttFileViewProviderFactory"/>
 
         <!-- Minecraft localization files -->
         <fileType name="MCLang" language="MCLang" implementationClass="com.demonwav.mcdev.translations.lang.LangFileType" fieldName="INSTANCE" extensions="lang"/>
@@ -512,6 +513,13 @@
                          level="WARNING"
                          hasStaticDescription="true"
                          implementationClass="com.demonwav.mcdev.translations.inspections.SuperfluousFormatInspection"/>
+        <localInspection displayName="Wrong translation argument types"
+                         groupName="Minecraft"
+                         language="JAVA"
+                         enabledByDefault="true"
+                         level="WARNING"
+                         hasStaticDescription="true"
+                         implementationClass="com.demonwav.mcdev.translations.inspections.WrongTypeInTranslationArgsInspection"/>
         <localInspection displayName="Entity class does not match this entity class"
                          groupName="Minecraft"
                          language="JAVA"
@@ -872,6 +880,14 @@
                          level="WARNING"
                          hasStaticDescription="true"
                          implementationClass="com.demonwav.mcdev.platform.mixin.inspection.injector.ModifyVariableArgsOnlyInspection"/>
+        <localInspection displayName="@Inject before a superconstructor call is cancellable"
+                         shortName="InjectCancellableBeforeSuperConstructorCall"
+                         groupName="Mixin"
+                         language="JAVA"
+                         enabledByDefault="true"
+                         level="ERROR"
+                         hasStaticDescription="true"
+                         implementationClass="com.demonwav.mcdev.platform.mixin.inspection.injector.CancellableBeforeSuperCallInspection"/>
         <!--endregion-->
 
         <!--region Overwrite Inspections -->