From d4a80435345cc91ea3ae6f557ffe6229d7d56eae Mon Sep 17 00:00:00 2001
From: Jozufozu <jozsefaug@gmail.com>
Date: Thu, 2 Dec 2021 14:03:14 -0800
Subject: [PATCH] Fix weird intellij issues with mixin's annotation processor

 - Update forge/mixin version
---
 build.gradle      | 7 ++++++-
 gradle.properties | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5ae2aba04..992b17818 100644
--- a/build.gradle
+++ b/build.gradle
@@ -103,7 +103,12 @@ dependencies {
 
     //implementation 'org.joml:joml:1.10.1'
 
-    annotationProcessor 'org.spongepowered:mixin:0.8.4:processor'
+    // https://discord.com/channels/313125603924639766/725850371834118214/910619168821354497
+    // Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings
+    // This allows 'Settings > Build, Execution, and Deployment > Build Tools > Gradle > Build and run using' set to IntelliJ to work correctly
+    if (System.getProperty('idea.sync.active') != 'true') {
+        annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor"
+    }
 }
 
 // Example for how to get properties into the manifest for reading by the runtime..
diff --git a/gradle.properties b/gradle.properties
index 89a19eba4..58c6330b9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,11 +5,12 @@ org.gradle.daemon = false
 mod_version = 0.3.0
 mc_update_version = 1.17
 minecraft_version = 1.17.1
-forge_version = 37.0.117
+forge_version = 37.1.0
 
 # build dependency versions
 forgegradle_version = 5.1.+
 mixingradle_version = 0.7-SNAPSHOT
+mixin_version = 0.8.5
 librarian_version = 1.+
 cursegradle_version = 1.4.0
 parchment_version = 2021.10.31