From bda1d440fb23553aaa14a7172df0b683d5017f43 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Sat, 16 Oct 2021 17:56:18 +0800
Subject: [PATCH] 21w41a

Signed-off-by: shedaniel <daniel@shedaniel.me>
---
 build.gradle                                  |  4 +--
 common/build.gradle                           | 12 +++++++--
 fabric/build.gradle                           | 27 +++++++++++--------
 .../lightoverlay/fabric/LOModMenuEntry.java   |  4 +--
 gradle.properties                             | 14 +++++-----
 settings.gradle                               |  2 +-
 6 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2ab6ad7..1733998 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id "architectury-plugin" version "3.3-SNAPSHOT"
-    id "dev.architectury.loom" version "0.7.4-SNAPSHOT" apply false
+    id "architectury-plugin" version "3.4-SNAPSHOT"
+    id "dev.architectury.loom" version "0.10.0-SNAPSHOT" apply false
 }
 
 architectury {
diff --git a/common/build.gradle b/common/build.gradle
index f0b4f2a..9ff509e 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -9,5 +9,13 @@ dependencies {
 }
 
 architectury {
-    common()
-}
\ No newline at end of file
+    common(false)
+}
+
+configurations {
+    dev
+}
+
+artifacts {
+    dev(jar)
+}
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 72e531b..390e370 100755
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -11,6 +11,14 @@ architectury {
     fabric()
 }
 
+configurations {
+    common
+    shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
+    compileClasspath.extendsFrom common
+    runtimeClasspath.extendsFrom common
+    developmentFabric.extendsFrom common
+}
+
 processResources {
     filesMatching("fabric.mod.json") {
         expand "version": project.version
@@ -18,10 +26,6 @@ processResources {
     inputs.property "version", project.version
 }
 
-configurations {
-    shadowCommon
-}
-
 dependencies {
     minecraft "com.mojang:minecraft:${rootProject.architectury.minecraft}"
     mappings minecraft.officialMojangMappings()
@@ -36,10 +40,7 @@ dependencies {
     }
     modImplementation("dev.architectury:architectury-fabric:${rootProject.architectury_version}")
 
-    implementation(project(path: ":common")) {
-        transitive = false
-    }
-    developmentFabric(project(path: ":common")) {
+    common(project(path: ":common", configuration: "dev")) {
         transitive = false
     }
     shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) {
@@ -49,11 +50,15 @@ dependencies {
 
 shadowJar {
     configurations = [project.configurations.shadowCommon]
-    classifier "shadow"
+    classifier "dev-shadow"
 }
 
 remapJar {
     dependsOn(shadowJar)
     input.set(shadowJar.archivePath)
-    archiveClassifier = "fabric"
-}
\ No newline at end of file
+    classifier null
+}
+
+jar {
+    classifier "dev"
+}
diff --git a/fabric/src/main/java/me/shedaniel/lightoverlay/fabric/LOModMenuEntry.java b/fabric/src/main/java/me/shedaniel/lightoverlay/fabric/LOModMenuEntry.java
index 2a40df1..34b1f4d 100644
--- a/fabric/src/main/java/me/shedaniel/lightoverlay/fabric/LOModMenuEntry.java
+++ b/fabric/src/main/java/me/shedaniel/lightoverlay/fabric/LOModMenuEntry.java
@@ -1,7 +1,7 @@
 package me.shedaniel.lightoverlay.fabric;
 
-import io.github.prospector.modmenu.api.ConfigScreenFactory;
-import io.github.prospector.modmenu.api.ModMenuApi;
+import com.terraformersmc.modmenu.api.ConfigScreenFactory;
+import com.terraformersmc.modmenu.api.ModMenuApi;
 import me.shedaniel.lightoverlay.common.ClothScreen;
 
 public class LOModMenuEntry implements ModMenuApi {
diff --git a/gradle.properties b/gradle.properties
index 7f75f4a..639bcdf 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,16 +1,16 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-mod_version=6.0.1
-minecraft_version=1.17.1
+mod_version=6.0.2
+minecraft_version=21w41a
 
-architectury_version=2.3.24
+architectury_version=3.0.33
 
 # fabric
-fabric_loader_version=0.11.6
-fabric_api_version=0.37.2+1.17
-cloth_config_version=5.0.38
-modmenu_version=2.0.2
+fabric_loader_version=0.11.7
+fabric_api_version=0.40.9+1.18
+cloth_config_version=6.0.39
+modmenu_version=3.0.0
 
 # forge
 forge_version=37.0.13
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index a232ac9..323a92b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -11,5 +11,5 @@ rootProject.name = "light-overlay"
 
 include("common")
 include("fabric")
-include("forge")
+//include("forge")
 
-- 
2.44.0