User: joe
Date: 24 Sep 23 10:09
Revision: bc1227cde804e6f1958198dd692c17887b06ee98
Summary:
Merge branch '2023.1' into 2023.2


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

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision 31a2af33e1a099b96c260a55bfec8c9da06e55bb)
+++ build.gradle.kts	(revision bc1227cde804e6f1958198dd692c17887b06ee98)
@@ -23,6 +23,7 @@
 import org.gradle.internal.jvm.Jvm
 import org.jetbrains.gradle.ext.settings
 import org.jetbrains.gradle.ext.taskTriggers
+import org.jetbrains.intellij.tasks.PrepareSandboxTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jlleitschuh.gradle.ktlint.tasks.BaseKtLintCheckTask
 import org.jlleitschuh.gradle.ktlint.tasks.KtLintFormatTask
@@ -71,6 +72,12 @@
     archiveClassifier.set("gradle-tooling-extension")
 }
 
+val externalAnnotationsJar = tasks.register<Jar>("externalAnnotationsJar") {
+    from("externalAnnotations")
+    destinationDirectory.set(layout.buildDirectory.dir("externalAnnotations"))
+    archiveFileName.set("externalAnnotations.jar")
+}
+
 repositories {
     maven("https://repo.denwav.dev/repository/maven-public/")
     maven("https://maven.fabricmc.net/") {
@@ -302,8 +309,11 @@
         register("grammars") {
             files.from(project.fileTree("src/main/grammars"))
         }
+        register("externalAnnotations") {
+            files.from(project.fileTree("externalAnnotations"))
-    }
-}
+        }
+    }
+}
 
 ktlint {
     disabledRules.add("filename")
@@ -360,6 +370,12 @@
     delete(layout.projectDirectory.dir(".sandbox"))
 }
 
+tasks.withType<PrepareSandboxTask> {
+    from(externalAnnotationsJar) {
+        into("Minecraft Development/lib/resources")
+    }
+}
+
 tasks.runIde {
     maxHeapSize = "4G"
 
Index: src/main/resources/META-INF/plugin.xml
===================================================================
--- src/main/resources/META-INF/plugin.xml	(revision 31a2af33e1a099b96c260a55bfec8c9da06e55bb)
+++ src/main/resources/META-INF/plugin.xml	(revision bc1227cde804e6f1958198dd692c17887b06ee98)
@@ -80,6 +80,7 @@
         <extensionPoint name="injectionPoint" beanClass="com.demonwav.mcdev.platform.mixin.handlers.injectionPoint.InjectionPointInfo" dynamic="true">
             <with attribute="implementation" implements="com.demonwav.mcdev.platform.mixin.handlers.injectionPoint.InjectionPoint"/>
         </extensionPoint>
+        <extensionPoint name="injectionPointAnnotation" beanClass="com.demonwav.mcdev.platform.mixin.handlers.injectionPoint.InjectionPointAnnotation" />
     </extensionPoints>
 
     <extensions defaultExtensionNs="com.demonwav.minecraft-dev">
@@ -135,6 +136,11 @@
         <mixinAnnotationHandler annotation="org.spongepowered.asm.mixin.injection.ModifyConstant" implementation="com.demonwav.mcdev.platform.mixin.handlers.ModifyConstantHandler" />
         <mixinAnnotationHandler annotation="org.spongepowered.asm.mixin.injection.ModifyVariable" implementation="com.demonwav.mcdev.platform.mixin.handlers.ModifyVariableHandler" />
         <mixinAnnotationHandler annotation="org.spongepowered.asm.mixin.injection.Redirect" implementation="com.demonwav.mcdev.platform.mixin.handlers.RedirectInjectorHandler" />
+        <mixinAnnotationHandler annotation="com.llamalad7.mixinextras.injector.ModifyExpressionValue" implementation="com.demonwav.mcdev.platform.mixin.handlers.mixinextras.ModifyExpressionValueHandler" />
+        <mixinAnnotationHandler annotation="com.llamalad7.mixinextras.injector.ModifyReceiver" implementation="com.demonwav.mcdev.platform.mixin.handlers.mixinextras.ModifyReceiverHandler" />
+        <mixinAnnotationHandler annotation="com.llamalad7.mixinextras.injector.ModifyReturnValue" implementation="com.demonwav.mcdev.platform.mixin.handlers.mixinextras.ModifyReturnValueHandler" />
+        <mixinAnnotationHandler annotation="com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation" implementation="com.demonwav.mcdev.platform.mixin.handlers.mixinextras.WrapOperationHandler" />
+        <mixinAnnotationHandler annotation="com.llamalad7.mixinextras.injector.WrapWithCondition" implementation="com.demonwav.mcdev.platform.mixin.handlers.mixinextras.WrapWithConditionHandler" />
 
         <injectionPoint atCode="INVOKE" implementation="com.demonwav.mcdev.platform.mixin.handlers.injectionPoint.MethodInjectionPoint" />
         <injectionPoint atCode="INVOKE_ASSIGN" implementation="com.demonwav.mcdev.platform.mixin.handlers.injectionPoint.MethodInjectionPoint" />
@@ -147,6 +153,8 @@
         <injectionPoint atCode="LOAD" implementation="com.demonwav.mcdev.platform.mixin.handlers.injectionPoint.LoadInjectionPoint" />
         <injectionPoint atCode="STORE" implementation="com.demonwav.mcdev.platform.mixin.handlers.injectionPoint.StoreInjectionPoint" />
         <injectionPoint atCode="CONSTANT" implementation="com.demonwav.mcdev.platform.mixin.handlers.injectionPoint.ConstantInjectionPoint" />
+
+        <injectionPointAnnotation annotation="org.spongepowered.asm.mixin.injection.Constant" atCode="CONSTANT" />
     </extensions>
 
     <extensions defaultExtensionNs="com.intellij">
@@ -264,6 +272,8 @@
                                order="before javaSkipAutopopupInStrings"/>
         <fileBasedIndex implementation="com.demonwav.mcdev.translations.index.TranslationIndex"/>
         <fileBasedIndex implementation="com.demonwav.mcdev.translations.index.TranslationInverseIndex"/>
+        <java.externalAnnotation.locationProvider implementation="com.demonwav.mcdev.translations.identification.TranslationAnnotationsLocationProvider"/>
+        <externalAnnotationsArtifactsResolver implementation="com.demonwav.mcdev.translations.identification.TranslationExternalAnnotationsArtifactsResolver" order="first"/>
 
         <applicationService serviceImplementation="com.demonwav.mcdev.MinecraftSettings"/>
 
@@ -485,14 +495,14 @@
                          groupName="Minecraft"
                          language="JAVA"
                          enabledByDefault="true"
-                         level="ERROR"
+                         level="WARNING"
                          hasStaticDescription="true"
                          implementationClass="com.demonwav.mcdev.translations.inspections.NoTranslationInspection"/>
         <localInspection displayName="Missing format arguments"
                          groupName="Minecraft"
                          language="JAVA"
                          enabledByDefault="true"
-                         level="ERROR"
+                         level="WARNING"
                          hasStaticDescription="true"
                          implementationClass="com.demonwav.mcdev.translations.inspections.MissingFormatInspection"/>
         <localInspection displayName="Superfluous format arguments"
@@ -672,6 +682,7 @@
         <!--endregion-->
 
         <!--region MIXIN INSPECTIONS-->
+        <!--region Generic -->
         <localInspection displayName="Mixin is not written in Java"
                          shortName="NonJavaMixin"
                          groupName="Mixin"
@@ -744,8 +755,9 @@
                          level="ERROR"
                          hasStaticDescription="true"
                          implementationClass="com.demonwav.mcdev.platform.mixin.inspection.MixinClassReferenceInspection"/>
+        <!--endregion-->
 
-        <!-- Annotation handlers -->
+        <!--region Annotation handlers -->
         <localInspection displayName="Unresolved mixin annotation target"
                          shortName="MixinAnnotationTarget"
                          groupName="Mixin"
@@ -754,8 +766,9 @@
                          level="ERROR"
                          hasStaticDescription="true"
                          implementationClass="com.demonwav.mcdev.platform.mixin.inspection.MixinAnnotationTargetInspection"/>
+        <!--endregion-->
 
-        <!-- Added Members Inspections -->
+        <!--region Added Members Inspections -->
         <localInspection displayName="Missing @Unique annotation"
                          shortName="MissingUnique"
                          groupName="Mixin"
@@ -772,8 +785,9 @@
                          level="WARNING"
                          hasStaticDescription="true"
                          implementationClass="com.demonwav.mcdev.platform.mixin.inspection.addedMembers.AddedMembersNameFormatInspection"/>
+        <!--endregion-->
 
-        <!-- Implements Inspections -->
+        <!--region Implements Inspections -->
         <localInspection displayName="Soft-implemented method does not override a method in the target interfaces"
                          shortName="SoftImplementOverrides"
                          groupName="Mixin"
@@ -822,8 +836,9 @@
                          level="ERROR"
                          hasStaticDescription="true"
                          implementationClass="com.demonwav.mcdev.platform.mixin.inspection.implements.DuplicateInterfacePrefixInspection"/>
+        <!--endregion-->
 
-        <!-- Injector Inspections -->
+        <!--region Injector Inspections -->
         <localInspection displayName="Implicit constructor invoker"
                          shortName="ImplicitConstructorInvoker"
                          groupName="Mixin"
@@ -864,8 +879,9 @@
                          level="WARNING"
                          hasStaticDescription="true"
                          implementationClass="com.demonwav.mcdev.platform.mixin.inspection.injector.ModifyVariableArgsOnlyInspection"/>
+        <!--endregion-->
 
-        <!-- Overwrite Inspections -->
+        <!--region Overwrite Inspections -->
         <localInspection displayName="Invalid @Overwrite method modifiers"
                          shortName="OverwriteModifiers"
                          groupName="Mixin"
@@ -882,8 +898,9 @@
                          level="WEAK WARNING"
                          hasStaticDescription="true"
                          implementationClass="com.demonwav.mcdev.platform.mixin.inspection.overwrite.OverwriteAuthorInspection"/>
+        <!--endregion-->
 
-        <!-- Reference Inspections -->
+        <!--region Reference Inspections -->
         <localInspection displayName="Invalid Mixin member reference"
                          shortName="InvalidMemberReference"
                          groupName="Mixin"
@@ -924,8 +941,9 @@
                          level="WEAK WARNING"
                          hasStaticDescription="true"
                          implementationClass="com.demonwav.mcdev.platform.mixin.inspection.reference.UnnecessaryQualifiedMemberReferenceInspection"/>
+        <!--endregion-->
 
-        <!-- Shadow Inspections -->
+        <!--region Shadow Inspections -->
         <localInspection displayName="Invalid @Shadow modifiers"
                          shortName="ShadowModifiers"
                          groupName="Mixin"
@@ -958,8 +976,20 @@
                          level="ERROR"
                          hasStaticDescription="true"
                          implementationClass="com.demonwav.mcdev.platform.mixin.inspection.shadow.ShadowFinalInspection"/>
+        <!--endregion-->
 
-        <!-- Configuration -->
+        <!--region Mixin Extras -->
+        <localInspection displayName="Wrong @WrapOperation Operation parameters"
+                         shortName="MixinExtrasOperationParameters"
+                         groupName="Mixin"
+                         language="JAVA"
+                         enabledByDefault="true"
+                         level="ERROR"
+                         hasStaticDescription="true"
+                         implementationClass="com.demonwav.mcdev.platform.mixin.inspection.mixinextras.WrongOperationParametersInspection"/>
+        <!--endregion-->
+
+        <!--region Configuration -->
         <localInspection displayName="Unresolved config reference"
                          shortName="UnresolvedConfigReference"
                          groupName="Mixin"
@@ -993,6 +1023,7 @@
                          hasStaticDescription="true"
                          implementationClass="com.demonwav.mcdev.platform.mixin.config.inspection.MixinPluginInspection"/>
         <!--endregion-->
+        <!--endregion-->
 
         <!--region BUNGEECORD INSPECTIONS-->
         <localInspection displayName="BungeeCord @EventHandler in class not implementing Listener"