work on converting gradle

skiprocks999 · Jan 20, 2024 · 49421e0 · 49421e0
1 parent 3f7d786
commit 49421e0
Show file tree

Hide file tree

Showing 5 changed files with 217 additions and 144 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,9 +1,9 @@
 plugins {
+    id 'java-library'
 	id 'eclipse'
 	id 'maven-publish'
-	id 'net.minecraftforge.gradle' version "${forge_gradle_version}"
+	id 'net.neoforged.gradle.userdev' version "${forge_gradle_version}"
 	id 'org.spongepowered.mixin' version "${mixin_gradle_version}"
-	id 'org.parchmentmc.librarian.forgegradle' version "${parchent_librarian_version}.+"
     id 'com.matthewprenger.cursegradle' version "${cursegradle_version}"
 }
 
@@ -19,20 +19,51 @@ plugins {
 libsDirName = "../output"
 distsDirName = "../output"
 
-group = electrodynamics_group
-version = "${minecraft_version}-" + electrodynamics_version
+group = mod_id
+version = "${minecraft_version}-" + mod_version
 
 base {
 
-	archivesName = electrodynamics_name
+	archivesName = mod_name
 
 }
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
+println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 
 
-println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
+
+minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
+
+runs {
+
+    configureEach {
+
+        workingDirectory project.file('run')
+
+        systemProperty 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+
+        systemProperty 'forge.logging.console.level', 'debug'
+
+        systemProperty 'mixin.debug.export', 'true'
+
+        modSource project.sourceSets.main
+
+    }
+
+    data {
+
+        programArguments.addAll '--mod', project.group, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
+
+    }
+
+}
+
+sourceSets.main.resources { srcDir 'src/generated/resources' }
+
+/*
+
 minecraft {
     mappings channel: 'parchment', version: "${parchment_version}-${minecraft_version}"
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
@@ -96,22 +127,24 @@ minecraft {
         }
     }
 }
+
+*/
 mixin {
     add sourceSets.main, "electrodynamics.refmap.json"
 }
 
-sourceSets.main.resources { srcDir 'src/generated/resources' }
+
 
 dependencies {
-	minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-    compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")
-    compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}")
-    runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}")
+	implementation "net.neoforged:neoforge:${forge_version}"
+    compileOnly "mezz.jei:jei-${minecraft_version}-common-api:${jei_version}"
+    compileOnly "mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}"
+    runtimeOnly "mezz.jei:jei-${minecraft_version}-forge:${jei_version}"
     annotationProcessor "org.spongepowered:mixin:${mixin_annotationprocessor_version}:processor"
 }
 
 repositories {
-	mavenCentral()
+	mavenLocal()
 	maven {
 	    // location of the maven that hosts JEI files since January 2023
 	    name = "Jared's maven"
@@ -125,6 +158,28 @@ repositories {
 
 }
 
+tasks.withType(ProcessResources).configureEach {
+    var replaceProperties = [
+            minecraft_version : minecraft_version, 
+            minecraft_version_range : minecraft_version_range,
+            neo_version : forge_version, 
+            neo_version_range : forge_version_range,
+            loader_version_range : loader_version_range,
+            mod_id : mod_id, 
+            mod_name : mod_name, 
+            mod_license : mod_license, 
+            mod_version : version,
+            mod_authors : mod_authors, 
+            mod_description: mod_desc,
+    ]
+    inputs.properties replaceProperties
+
+    filesMatching(['META-INF/mods.toml']) {
+        expand replaceProperties + [project: project]
+    }
+}
+
+/*
 tasks.named('jar', Jar).configure {
 	
 	manifest {
@@ -140,10 +195,9 @@ tasks.named('jar', Jar).configure {
         ])
     }
 
-	finalizedBy 'reobfJar'
-
 }
 
+*/
 tasks.register('sourcesJar', Jar).configure {
 	dependsOn classes
 	from sourceSets.main.allSource
@@ -155,10 +209,6 @@ tasks.register('deobfJar', Jar).configure {
 	archiveClassifier = 'deobf'
 }
 
-tasks.named('publish').configure {
-	dependsOn 'reobfJar'
-}
-
 /*
 task sourcesJar(type: Jar, dependsOn: classes) {
 	from sourceSets.main.allSource
@@ -169,10 +219,12 @@ task deobfJar(type: Jar) {
 	classifier = 'deobf'
 }
 */
+
 artifacts {
 	archives sourcesJar
 	archives deobfJar
 }
+
 publishing {
     publications {
         mavenJava(MavenPublication) {
@@ -197,7 +249,7 @@ curseforge {
     addGameVersion "${minecraft_version}"
 
     mainArtifact(jar) {
-      displayName=project.name+" ${electrodynamics_version}"
+      displayName=project.name+" ${mod_version}"
     }
   }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -4,22 +4,33 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 # Electrodynamics parameters
-electrodynamics_version=0.9.0-3
-electrodynamics_group=electrodynamics
-electrodynamics_name=Electrodynamics
+mod_version=0.9.0-3
+mod_id=electrodynamics
+mod_name=Electrodynamics
 
-# Version parameters
-minecraft_version=1.20.1
-forge_version=47.1.44
-forge_gradle_version=[6.0,6.2)
+# Other parameters
+mod_license=All Rights Reserved
+mod_authors=aurilisdev, skip999
+mod_credits=Thanks to all contributors. French translation by Roi Pasteque.
+mod_desc='A mod based around realistic electricity.'
+issue_tracker_url=https://github.com/aurilisdev/Electrodynamics/issues
+homepage_url=https://github.com/aurilisdev/Electrodynamics
+logo_file=electrodynamics.png
 
+# Version parameters
+minecraft_version=1.20.4
+minecraft_version_range=[1.20.4,1.21)
+forge_version=20.4.117-beta
+forge_version_range=[20.4,)
+forge_gradle_version=7.0.80
+loader_version_range=[2,)
 
 # Dependency parameters 
-jei_version=15.2.0.26
+jei_version=17.0.0.30
 mixin_annotationprocessor_version=0.8.5
 cursegradle_version=1.4.0
 mixin_gradle_version=0.7-SNAPSHOT
 
 # Parchment parameters
-parchment_version=2023.08.13
-parchent_librarian_version=1
+neogradle.subsystems.parchment.minecraftVersion=1.20.3
+neogradle.subsystems.parchment.mappingsVersion=2023.12.31