Sync template

legobmw99 · Aug 26, 2024 · 20c72dc · 20c72dc
1 parent 4ed20ff
commit 20c72dc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 31 deletions.
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,6 @@ forgix {
     mergedJarName = "betterthanmending-${version}.jar"
     outputDir = "merged/build/libs"
     // removeDuplicate "com.legobmw99.BetterThanMending.core"
-
     fabric {
         jarLocation = "build/libs/BetterThanMending-fabric-${version}.jar"
     }
@@ -19,5 +18,4 @@ forgix {
     forge {
         jarLocation = "build/libs/BetterThanMending-forge-${version}.jar"
     }
-
 }
diff --git a/forge/build.gradle b/forge/build.gradle
@@ -10,11 +10,10 @@ base {
 minecraft {
     mappings channel: 'official', version: minecraft_version
 
-    // Tell FG to not automtically create the reobf tasks, as we now use Official mappings at runtime, If you don't use them at dev time then you'll have to fix your reobf yourself.
-    reobf = false
-
     copyIdeResources = true //Calls processResources when in dev
 
+    reobf = false // Forge 1.20.6+ uses official mappings at runtime, so we shouldn't reobf from official to SRG
+
     runs {
         client {
             workingDirectory file('../runs/client')

diff --git a/settings.gradle b/settings.gradle
@@ -6,47 +6,34 @@ pluginManagement {
             forRepository {
                 maven {
                     name = 'Fabric'
-                    url = uri("https://maven.fabricmc.net")
+                    url = uri('https://maven.fabricmc.net')
                 }
             }
             filter {
-                includeGroup("net.fabricmc")
-                includeGroup("fabric-loom")
+                includeGroup('net.fabricmc')
+                includeGroup('fabric-loom')
             }
         }
         exclusiveContent {
             forRepository {
                 maven {
-                    name = 'Forge'
-                    url = uri("https://maven.minecraftforge.net")
-                }
-            }
-            filter {
-                includeGroupAndSubgroups("net.minecraftforge")
-            }
-        }
-        exclusiveContent {
-            forRepository {
-                maven {
-                    name = 'NeoForge'
-                    url = uri("https://maven.neoforged.net/releases")
+                    name = 'Sponge'
+                    url = uri('https://repo.spongepowered.org/repository/maven-public')
                 }
             }
             filter {
-                includeGroupAndSubgroups("net.neoforged")
-                includeGroup("codechicken")
+                includeGroupAndSubgroups("org.spongepowered")
             }
         }
         exclusiveContent {
             forRepository {
                 maven {
-                    name = 'Sponge Snapshots'
-                    url = uri("https://repo.spongepowered.org/repository/maven-public")
+                    name = 'Forge'
+                    url = uri('https://maven.minecraftforge.net')
                 }
             }
             filter {
-                includeGroupAndSubgroups("org.spongepowered")
-//                includeGroup("net.minecraftforge")
+                includeGroupAndSubgroups('net.minecraftforge')
             }
         }
     }
@@ -58,7 +45,7 @@ plugins {
 
 // This should match the folder name of the project, or else IDEA may complain (see https://youtrack.jetbrains.com/issue/IDEA-317606)
 rootProject.name = 'BetterThanMending'
-include("common")
-include("fabric")
-include("forge")
-include("neoforge")
+include('common')
+include('fabric')
+include('neoforge')
+include('forge')