Merge pull request #115 from FTBTeam/dev

Dev

build.gradle

@@ -1,159 +1,159 @@
 plugins {
-	id "architectury-plugin" version "3.4-SNAPSHOT"
-	id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
-	id "me.modmuss50.mod-publish-plugin" version "0.5.1"
+    id "architectury-plugin" version "3.4-SNAPSHOT"
+    id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
+    id "me.modmuss50.mod-publish-plugin" version "0.5.1"
 }
 
 architectury {
-	minecraft = rootProject.minecraft_version
+    minecraft = rootProject.minecraft_version
 }
 
 subprojects {
-	apply plugin: "dev.architectury.loom"
+    apply plugin: "dev.architectury.loom"
 
-	loom {
-		silentMojangMappingsLicense()
-	}
+    loom {
+        silentMojangMappingsLicense()
+    }
 
-	dependencies {
-		minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-		mappings loom.officialMojangMappings()
-	}
+    dependencies {
+        minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
+        mappings loom.officialMojangMappings()
+    }
 }
 
 allprojects {
-	apply plugin: "java"
-	apply plugin: "architectury-plugin"
-	apply plugin: "maven-publish"
-	apply from: "https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/git-md-changelog.gradle"
-
-	version = project.mod_version
-	group = project.maven_group
-	archivesBaseName = project.archives_base_name
-
-	// needs to be done AFTER version is set
-	apply from: "https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/publishing.gradle"
-
-	sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = 21
-
-	compileJava {
-		options.encoding = "UTF-8"
-	}
-
-	repositories {
-		mavenCentral()
-		mavenLocal()
-
-		maven {
-			url "https://maven.architectury.dev/"
-		}
-
-		maven {
-			url "https://www.cursemaven.com"
-			content {
-				includeGroup "curse.maven"
-			}
-		}
-
-		maven {
-			url "https://maven.saps.dev/minecraft"
-			content {
-				includeGroup "dev.latvian.mods"
-				includeGroup "dev.ftb.mods"
-			}
-		}
-
-		maven {
-			name "ModMaven (JEI)"
-			url "https://modmaven.dev/"
-			content {
-				includeGroup "mezz.jei"
-			}
-		}
-
-		maven {
-			// Emi
-			name = "TerraformersMC"
-			url = "https://maven.terraformersmc.com/"
-		}
-	}
-
-	dependencies {
-		testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0-M1'
-	}
-
-	java {
-		withSourcesJar()
-	}
-
-	publishing {
-		repositories {
-			if (ftbPublishing.ftbToken) {
-				maven {
-					url ftbPublishing.ftbURL
-					credentials {
-						username = ftbPublishing.ftbUser
-						password = ftbPublishing.ftbToken
-					}
-				}
-			}
-
-			if (ftbPublishing.sapsToken) {
-				maven {
-					url ftbPublishing.sapsURL
-					credentials {
-						username = ftbPublishing.sapsUser
-						password = ftbPublishing.sapsToken
-					}
-				}
-			}
-		}
-	}
+    apply plugin: "java"
+    apply plugin: "architectury-plugin"
+    apply plugin: "maven-publish"
+    apply from: "https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/git-md-changelog.gradle"
+
+    version = project.mod_version
+    group = project.maven_group
+    archivesBaseName = project.archives_base_name
+
+    // needs to be done AFTER version is set
+    apply from: "https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/publishing.gradle"
+
+    sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = 21
+
+    compileJava {
+        options.encoding = "UTF-8"
+    }
+
+    repositories {
+        mavenCentral()
+        mavenLocal()
+
+        maven {
+            url "https://maven.architectury.dev/"
+        }
+
+        maven {
+            url "https://www.cursemaven.com"
+            content {
+                includeGroup "curse.maven"
+            }
+        }
+
+        maven {
+            url "https://maven.saps.dev/minecraft"
+            content {
+                includeGroup "dev.latvian.mods"
+                includeGroup "dev.ftb.mods"
+            }
+        }
+
+        maven {
+            name "ModMaven (JEI)"
+            url "https://modmaven.dev/"
+            content {
+                includeGroup "mezz.jei"
+            }
+        }
+
+        maven {
+            // Emi
+            name = "TerraformersMC"
+            url = "https://maven.terraformersmc.com/"
+        }
+    }
+
+    dependencies {
+        testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0-M1'
+    }
+
+    java {
+        withSourcesJar()
+    }
+
+    publishing {
+        repositories {
+            if (ftbPublishing.ftbToken) {
+                maven {
+                    url ftbPublishing.ftbURL
+                    credentials {
+                        username = ftbPublishing.ftbUser
+                        password = ftbPublishing.ftbToken
+                    }
+                }
+            }
+
+            if (ftbPublishing.sapsToken) {
+                maven {
+                    url ftbPublishing.sapsURL
+                    credentials {
+                        username = ftbPublishing.sapsUser
+                        password = ftbPublishing.sapsToken
+                    }
+                }
+            }
+        }
+    }
 }
 
 publishMods {
-	dryRun = providers.environmentVariable("CURSEFORGE_KEY").getOrNull() == null
-	changelog = providers.environmentVariable("CHANGELOG").getOrElse("No changelog provided")
-	version = mod_version
-
-	// TODO: Migrate to something else
-	def tag = providers.environmentVariable("TAG").getOrElse("release")
-	type = tag.endsWith("-beta") ? BETA : (tag.endsWith("-alpha") ? ALPHA : STABLE)
-
-	def createOptions = (String projectName) -> {
-		publishOptions {
-			file = project.provider { project(":$projectName").tasks.remapJar }.flatMap { it.archiveFile }
-			displayName = "[${projectName.toUpperCase()}][${minecraft_version}] ${readable_name} ${mod_version}"
-			modLoaders.add(projectName.toLowerCase())
-		}
-	}
-
-	def fabricOptions = createOptions("fabric")
-	def neoForgeOptions = createOptions("neoforge")
+    dryRun = providers.environmentVariable("CURSEFORGE_KEY").getOrNull() == null
+    changelog = providers.environmentVariable("CHANGELOG").getOrElse("No changelog provided")
+    version = mod_version
+
+    // TODO: Migrate to something else
+    def tag = providers.environmentVariable("TAG").getOrElse("release")
+    type = tag.endsWith("-beta") ? BETA : (tag.endsWith("-alpha") ? ALPHA : STABLE)
+
+    def createOptions = (String projectName) -> {
+        publishOptions {
+            file = project.provider { project(":$projectName").tasks.remapJar }.flatMap { it.archiveFile }
+            displayName = "[${projectName.toUpperCase()}][${minecraft_version}] ${readable_name} ${mod_version}"
+            modLoaders.add(projectName.toLowerCase())
+        }
+    }
+
+    def fabricOptions = createOptions("fabric")
+    def neoForgeOptions = createOptions("neoforge")
 //	def forgeOptions = createOptions("forge")
 
-	def curseForgeOptions = curseforgeOptions {
-		accessToken = providers.environmentVariable("CURSEFORGE_KEY")
-		minecraftVersions.add("${minecraft_version}")
-		javaVersions.add(JavaVersion.VERSION_21)
-	}
-
-	curseforge("curseforgeFabric") {
-		from(curseForgeOptions, fabricOptions)
-		projectId = curseforge_id_fabric
-		requires('architectury-api')
-		requires('fabric-api')
-		optional('jei')
-		optional('roughly-enough-items')
-	}
-
-	curseforge("curseforgeNeoForge") {
-		from(curseForgeOptions, neoForgeOptions)
-		projectId = curseforge_id_forge
-		requires("architectury-api")
-		optional('jei')
-		optional('roughly-enough-items')
-	}
+    def curseForgeOptions = curseforgeOptions {
+        accessToken = providers.environmentVariable("CURSEFORGE_KEY")
+        minecraftVersions.add("${minecraft_version}")
+        javaVersions.add(JavaVersion.VERSION_21)
+    }
+
+    curseforge("curseforgeFabric") {
+        from(curseForgeOptions, fabricOptions)
+        projectId = curseforge_id_fabric
+        requires('architectury-api')
+        requires('fabric-api')
+        optional('jei')
+        optional('roughly-enough-items')
+    }
+
+    curseforge("curseforgeNeoForge") {
+        from(curseForgeOptions, neoForgeOptions)
+        projectId = curseforge_id_forge
+        requires("architectury-api")
+        optional('jei')
+        optional('roughly-enough-items')
+    }
 
 //	curseforge("curseforgeForge") {
 //		from(curseForgeOptions, forgeOptions)

common/build.gradle

@@ -1,47 +1,47 @@
 dependencies {
-	modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
 
-	modApi "dev.architectury:architectury:${rootProject.architectury_version}"
+    modApi "dev.architectury:architectury:${rootProject.architectury_version}"
 
-	modCompileOnly("me.shedaniel:RoughlyEnoughItems-api:${rootProject.rei_version}") {
-		exclude group: "dev.architectury"
-	}
+    modCompileOnly("me.shedaniel:RoughlyEnoughItems-api:${rootProject.rei_version}") {
+        exclude group: "dev.architectury"
+    }
 
-	modCompileOnly("me.shedaniel:RoughlyEnoughItems-default-plugin:${rootProject.rei_version}") {
-		exclude group: "dev.architectury"
-	}
+    modCompileOnly("me.shedaniel:RoughlyEnoughItems-default-plugin:${rootProject.rei_version}") {
+        exclude group: "dev.architectury"
+    }
 
- 	modCompileOnly("mezz.jei:jei-1.21-common-api:${jei_version}")
+    modCompileOnly("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")
 
-	modCompileOnly "dev.emi:emi-xplat-intermediary:${emi_version}+1.21:api"
+    modCompileOnly "dev.emi:emi-xplat-intermediary:${emi_version}+1.21:api"
 }
 
 test {
-	useJUnitPlatform()
+    useJUnitPlatform()
 }
 
 architectury {
-	common(/*"forge",*/ "fabric", "neoforge")
+    common(/*"forge",*/ "fabric", "neoforge")
 }
 
 loom {
-	accessWidenerPath = file("src/main/resources/ftblibrary.accesswidener")
+    accessWidenerPath = file("src/main/resources/ftblibrary.accesswidener")
 }
 
 configurations {
-	dev
+    dev
 }
 
 artifacts {
-	dev(jar)
+    dev(jar)
 }
 
 publishing {
-	publications {
-		mavenCommon(MavenPublication) {
-			artifactId = "${rootProject.archives_base_name}"
-			version ftbPublishing.mavenVersion
-			from components.java
-		}
-	}
+    publications {
+        mavenCommon(MavenPublication) {
+            artifactId = "${rootProject.archives_base_name}"
+            version ftbPublishing.mavenVersion
+            from components.java
+        }
+    }
 }