From c2f00ce3e19caf08bb277376ca7940281e22cfe3 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Wed, 2 Mar 2022 13:48:51 +0800
Subject: [PATCH] Add Forge 1.18.2 Support

---
 common/build.gradle | 2 +-
 forge/build.gradle  | 6 +++++-
 gradle.properties   | 4 ++--
 settings.gradle     | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/common/build.gradle b/common/build.gradle
index 49240f6..d03072d 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -9,7 +9,7 @@ dependencies {
 }
 
 architectury {
-    common(false)
+    common()
 }
 
 transformProductionFabric {
diff --git a/forge/build.gradle b/forge/build.gradle
index f60510c..c7edf90 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -50,8 +50,12 @@ shadowJar {
     classifier "shadow"
 }
 
+prepareRemapJar {
+    dependsOn(shadowJar)
+}
+
 remapJar {
     dependsOn(shadowJar)
     input.set(shadowJar.archivePath)
     archiveClassifier = "forge"
-}
\ No newline at end of file
+}
diff --git a/gradle.properties b/gradle.properties
index 16c0289..47d0a24 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.daemon=false
 mod_version=6.0.5
 minecraft_version=1.18.2
 
-architectury_version=4.0.25
+architectury_version=4.0.29
 
 # fabric
 fabric_loader_version=0.13.3
@@ -13,4 +13,4 @@ cloth_config_version=6.2.57
 modmenu_version=3.0.0
 
 # forge
-forge_version=38.0.15
\ No newline at end of file
+forge_version=40.0.1
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 323a92b..a232ac9 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