Go back to using ForgeGradle, use FancyGradle

OpenCubicChunks · Dec 26, 2023 · 7822bbd · 7822bbd
1 parent ea9a774
commit 7822bbd
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 2 deletions.
diff --git a/CubicChunksAPI/build.gradle.kts b/CubicChunksAPI/build.gradle.kts
@@ -7,7 +7,8 @@ plugins {
     `maven-publish`
     signing
     idea
-    id("net.neoforged.gradle").version("[6.0.18,6.2)")
+    id("net.minecraftforge.gradle").version("6.0.18")
+    id("wtf.gofancy.fancygradle").version("1.1.3-0")
     id("io.github.opencubicchunks.gradle.mcGitVersion")
     id("com.github.hierynomus.license").version("0.16.1")
 }
@@ -43,6 +44,16 @@ dependencies {
     minecraft(group = "net.minecraftforge", name = "forge", version = "1.12.2-14.23.5.2860")
 }
 
+fancyGradle {
+    patches {
+        resources
+        coremods
+        codeChickenLib
+        asm
+        mergetool
+    }
+}
+
 minecraft {
     mappings("stable", "39-1.12")
 }

diff --git a/CubicChunksAPI/settings.gradle.kts b/CubicChunksAPI/settings.gradle.kts
@@ -8,6 +8,10 @@ pluginManagement {
         maven {
             setUrl("https://repo.spongepowered.org/repository/maven-public/")
         }
+        maven {
+            name = "Garden of Fancy"
+            setUrl("https://maven.gofancy.wtf/releases")
+        }
     }
 }
 plugins {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -13,7 +13,8 @@ plugins {
     `maven-publish`
     signing
     idea
-    id("net.neoforged.gradle").version("[6.0.18,6.2)")
+    id("net.minecraftforge.gradle").version("6.0.18")
+    id("wtf.gofancy.fancygradle").version("1.1.3-0")
     id("org.spongepowered.mixin").version("0.7-SNAPSHOT")
     id("com.github.johnrengelman.shadow").version("7.1.2")
     id("com.github.hierynomus.license").version("0.16.1")
@@ -40,6 +41,16 @@ mcGitVersion {
 
 java.toolchain.languageVersion.set(JavaLanguageVersion.of(8))
 
+fancyGradle {
+    patches {
+        resources
+        coremods
+        codeChickenLib
+        asm
+        mergetool
+    }
+}
+
 minecraft {
     mappings("stable", "39-1.12")
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -8,6 +8,10 @@ pluginManagement {
         maven {
             setUrl("https://repo.spongepowered.org/repository/maven-public/")
         }
+        maven {
+            name = "Garden of Fancy"
+            setUrl("https://maven.gofancy.wtf/releases")
+        }
     }
     resolutionStrategy {
         eachPlugin {