User: kyle wood
Date: 18 Oct 22 00:03
Revision: 7d03fb2cffdd7ec5aec24f2a7722e6e50cc4d219
Summary:
Merge branch '2022.1' into 2022.2


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

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision 5953139ac80cb1d63b6d87279db5c418fa0f72f7)
+++ build.gradle.kts	(revision 7d03fb2cffdd7ec5aec24f2a7722e6e50cc4d219)
@@ -17,7 +17,7 @@
 import org.jlleitschuh.gradle.ktlint.tasks.BaseKtLintCheckTask
 
 plugins {
-    kotlin("jvm") version "1.7.10"
+    kotlin("jvm") version "1.7.20"
     java
     mcdev
     groovy
@@ -85,6 +85,8 @@
     implementation(libs.mappingIo)
     implementation(libs.bundles.asm)
 
+    implementation(libs.bundles.fuel)
+
     jflex(libs.jflex.lib)
     jflexSkeleton(libs.jflex.skeleton) {
         artifact {
Index: gradle/libs.versions.toml
===================================================================
--- gradle/libs.versions.toml	(revision 5953139ac80cb1d63b6d87279db5c418fa0f72f7)
+++ gradle/libs.versions.toml	(revision 7d03fb2cffdd7ec5aec24f2a7722e6e50cc4d219)
@@ -1,8 +1,9 @@
 [versions]
-coroutines = "1.6.3"
+coroutines = "1.6.4"
 junit = "5.9.0"
 junit-platform = "1.9.0"
 asm = "9.3"
+fuel = "2.3.1"
 
 [libraries]
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
@@ -26,6 +27,9 @@
 asm-tree = { module = "org.ow2.asm:asm-tree", version.ref = "asm" }
 asm-analysis = { module = "org.ow2.asm:asm-analysis", version.ref = "asm" }
 
+fuel = { module = "com.github.kittinunf.fuel:fuel", version.ref = "fuel" }
+fuel-coroutines = { module = "com.github.kittinunf.fuel:fuel-coroutines", version.ref = "fuel" }
+
 # Testing
 test-mockJdk = "org.jetbrains.idea:mock-jdk:1.7-4d76c50"
 test-mixin = "org.spongepowered:mixin:0.8.5"
@@ -39,3 +43,4 @@
 [bundles]
 coroutines = ["coroutines-core", "coroutines-jdk8", "coroutines-swing"]
 asm = ["asm", "asm-tree", "asm-analysis"]
+fuel = ["fuel", "fuel-coroutines"]
Index: src/main/resources/META-INF/plugin.xml
===================================================================
--- src/main/resources/META-INF/plugin.xml	(revision 5953139ac80cb1d63b6d87279db5c418fa0f72f7)
+++ src/main/resources/META-INF/plugin.xml	(revision 7d03fb2cffdd7ec5aec24f2a7722e6e50cc4d219)
@@ -308,9 +308,9 @@
         <lang.syntaxHighlighterFactory language="Access Widener" implementationClass="com.demonwav.mcdev.platform.mcp.aw.AwSyntaxHighlighterFactory"/>
         <colorSettingsPage implementation="com.demonwav.mcdev.platform.mcp.aw.AwColorSettingsPage" />
         <lang.commenter language="Access Widener" implementationClass="com.demonwav.mcdev.platform.mcp.aw.AwCommenter" />
-        <typedHandler implementation="com.demonwav.mcdev.platform.mcp.aw.AwTypedHandlerDelegate" />
         <annotator language="Access Widener" implementationClass="com.demonwav.mcdev.platform.mcp.aw.AwAnnotator"/>
         <completion.contributor language="Access Widener" implementationClass="com.demonwav.mcdev.platform.mcp.aw.AwCompletionContributor"/>
+        <codeInsight.unresolvedReferenceQuickFixProvider implementation="com.demonwav.mcdev.platform.mcp.aw.fixes.CopyAwAccessibleEntryFix$Provider"/>
 
         <moduleService serviceImplementation="com.demonwav.mcdev.platform.mcp.McpModuleSettings"/>
 
@@ -578,6 +578,13 @@
                          level="WARNING"
                          hasStaticDescription="true"
                          implementationClass="com.demonwav.mcdev.platform.mcp.inspections.StackEmptyInspection"/>
+        <localInspection displayName="Duplicate access widener"
+                         groupName="MCP"
+                         language="Access Widener"
+                         enabledByDefault="true"
+                         level="WARNING"
+                         hasStaticDescription="true"
+                         implementationClass="com.demonwav.mcdev.platform.mcp.aw.inspections.DuplicateAwEntryInspection"/>
         <!--endregion-->
 
         <!--region MIXIN INSPECTIONS-->
@@ -984,5 +991,10 @@
                 text="Minecraft Class" description="Create skeleton classes used in Minecraft Mods">
             <add-to-group group-id="NewGroup" anchor="before" relative-to-action="NewFile" />
         </action>
+        <action class="com.demonwav.mcdev.platform.mcp.actions.CopyAwAction" id="CopyAWAction"
+                text="AW Entry"
+                description="Copy the reference to clipboard in Access Widener format">
+            <add-to-group relative-to-action="CopyATAction" anchor="after" group-id="Copy.Paste.Special"/>
+        </action>
     </actions>
 </idea-plugin>