change back to FG

Author: Goldenfield192

build.gradle

@@ -1,20 +1,23 @@
 buildscript {
     repositories {
-        maven { url "https://maven.neoforged.net/releases" }
+        maven { url = "https://maven.minecraftforge.net/" }
         maven { url "https://plugins.gradle.org/m2/" }
+        maven { url = 'https://repo.spongepowered.org/maven' }
         mavenCentral()
     }
-	dependencies {
-        classpath 'net.neoforged.moddev.legacyforge:net.neoforged.moddev.legacyforge.gradle.plugin:2.0.140'
+    dependencies {
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.69', changing: true
         classpath "gradle.plugin.com.github.johnrengelman:shadow:7.1.0"
+        classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
     }
 }
 
-apply plugin: 'net.neoforged.moddev.legacyforge'
+apply plugin: 'net.minecraftforge.gradle'
 //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 apply plugin: 'com.github.johnrengelman.shadow'
+apply plugin: 'org.spongepowered.mixin'
 
 configurations {
     shade
@@ -43,37 +46,80 @@ version = "1.17.1-forge-" + umcVersion
 group = "cam72cam.universalmodcore" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "UniversalModCore"
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+java.toolchain.languageVersion = JavaLanguageVersion.of(16)
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
+minecraft {
+    // The mappings can be changed at any time, and must be in the following format.
+    // snapshot_YYYYMMDD   Snapshot are built nightly.
+    // stable_#            Stables are built at the discretion of the MCP team.
+    // Use non-default mappings at your own risk. they may not always work.
+    // Simply re-run your setup task after changing the mappings to update your workspace.
+    mappings channel: 'official', version: '1.17.1'
+    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
+
+    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
+
+    // Default run configurations.
+    // These can be tweaked, removed, or duplicated as needed.
+    runs {
+        client {
+            //Enable mixin-ed dependency in deobfuscated environment
+            property("mixin.env.remapRefMap", "true")
+            property("mixin.env.refMapRemappingFile", "${projectDir}/build/createSrgToMcp/output.srg")
 
-legacyForge {
-    version = "1.17.1-37.1.1"
+            workingDirectory project.file('run')
 
-    accessTransformers.from "src/main/resources/META-INF/accesstransformer.cfg"
+            // Recommended logging data for a userdev environment
+            property 'forge.logging.markers', 'REGISTRIES'
 
-    // Validate AT files and raise errors when they have invalid targets
-    // This option is false by default, but turning it on is recommended
-    validateAccessTransformers = true
+            // Recommended logging level for the console
+            property 'forge.logging.console.level', 'debug'
 
-    runs {
-        client {
-            client()
+            mods {
+                universalmodcore {
+                    source sourceSets.main
+                }
+            }
         }
+
         server {
-            server()
+            //Enable mixin-ed dependency in deobfuscated environment
+            property("mixin.env.remapRefMap", "true")
+            property("mixin.env.refMapRemappingFile", "${projectDir}/build/createSrgToMcp/output.srg")
+
+            workingDirectory project.file('run')
+
+            // Recommended logging data for a userdev environment
+            property 'forge.logging.markers', 'REGISTRIES'
+
+            // Recommended logging level for the console
+            property 'forge.logging.console.level', 'debug'
+
+            mods {
+                universalmodcore {
+                    source sourceSets.main
+                }
+            }
         }
+
         data {
-            data()
-        }
-    }
+            workingDirectory project.file('run')
+
+            // Recommended logging data for a userdev environment
+            property 'forge.logging.markers', 'REGISTRIES'
+
+            // Recommended logging level for the console
+            property 'forge.logging.console.level', 'debug'
 
-    mods {
-        universalmodcore {
-            sourceSet sourceSets.main
+            args '--mod', 'universalmodcore', '--all', '--output', file('src/generated/resources/')
+
+            mods {
+                universalmodcore {
+                    source sourceSets.main
+                }
+            }
         }
     }
-
-    addModdingDependenciesTo(sourceSets.test)
 }
 
 repositories {
@@ -87,11 +133,12 @@ repositories {
 }
 
 dependencies {
+    minecraft 'net.minecraftforge:forge:1.17.1-37.1.1'
     // you may put jars on which you depend on in ./libs
     // or you may define them like so..
     //compile "some.group:artifact:version:classifier"
     //compile "some.group:artifact:version"
-      
+
     // real examples
     //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
     //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
@@ -107,36 +154,39 @@ dependencies {
     // for more info...
     // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
     // http://www.gradle.org/docs/current/userguide/dependency_management.html
-    annotationProcessor('org.spongepowered:mixin:0.8.5:processor')
-    additionalRuntimeClasspath(annotationProcessor(shade('io.github.llamalad7:mixinextras-common:0.5.0')))
+    annotationProcessor('org.spongepowered:mixin:0.8.3:processor')
+    minecraftLibrary(annotationProcessor(shade('io.github.llamalad7:mixinextras-common:0.5.0')))
 
-    testImplementation ('junit:junit:4.13')
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.7.2'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    //testImplementation ('junit:junit:4.13')
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.2'
 
-    additionalRuntimeClasspath(shade group: 'javax.vecmath', name: 'vecmath', version: '1.5.2')
-    additionalRuntimeClasspath(shade group: 'at.yawk.lz4', name: 'lz4-java', version: '1.10.2')
+    minecraftLibrary(shade group: 'javax.vecmath', name: 'vecmath', version: '1.5.2')
+    minecraftLibrary(shade group: 'at.yawk.lz4', name: 'lz4-java', version: '1.10.2')
 }
 
 mixin {
     add sourceSets.main, 'mixins.universalmodcore.refmap.json'
 
     config 'mixins.feat.universalmodcore.json'
     config 'mixins.fix.universalmodcore.json'
+
+    //Dev environment setup
+    debug.verbose = true
+    debug.export = true
+    dumpTargetOnFailure = true
 }
 
 jar {
     archiveClassifier = 'slim'
     manifest {
         attributes([
-            "Specification-Title": "universalmodcore",
-            "Specification-Vendor": "",
-            "Specification-Version": "1", // We are version 1 of ourselves
-            "Implementation-Title": project.name,
-            "Implementation-Version": umcVersion,
-            "Implementation-Vendor" :"",
-            "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
-            "MixinConfigs": "mixins.feat.universalmodcore.json,mixins.fix.universalmodcore.json"
+                "Specification-Title": "universalmodcore",
+                "Specification-Vendor": "",
+                "Specification-Version": "1", // We are version 1 of ourselves
+                "Implementation-Title": project.name,
+                "Implementation-Version": umcVersion,
+                "Implementation-Vendor" :"",
+                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
         ])
     }
 }
@@ -158,14 +208,12 @@ shadowJar {
 
 assemble.dependsOn shadowJar
 
-obfuscation {
-    // Reobfuscate the shadowJar task, using the classpath of the main sourceset for properly remapping inherited members
-    // This will place the original shadow jar in build/devlibs while putting this reobfuscated version in build/libs
-    reobfuscate(tasks.named('shadowJar'), sourceSets.main)
+reobf {
+    shadowJar {}
 }
 
 test {
-    useJUnitPlatform()
+    useJUnit()
     maxHeapSize = '1G'
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip