Architectury port, EMI compat

2025-12-15 19:25:09 +01:00 · 2024-09-06 21:44:34 +02:00
parent b6266b8e48
commit f68048d955
41 changed files with 611 additions and 234 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -1,131 +1,73 @@
+import groovy.json.JsonSlurper
+import groovy.json.JsonOutput
+
 plugins {
-	id 'fabric-loom' version '1.6-SNAPSHOT'
-	id 'maven-publish'
-	id "me.shedaniel.unified-publishing" version "0.1.+"
+	id "architectury-plugin" version "3.4-SNAPSHOT"
+	id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
+	id "me.shedaniel.unified-publishing" version "0.1.+" apply false
+	id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
 }

-sourceCompatibility = JavaVersion.VERSION_21
-targetCompatibility = JavaVersion.VERSION_21
+architectury {
+	minecraft = rootProject.minecraft_version
+}

-archivesBaseName = project.archives_base_name
-version = project.mod_version
-group = project.maven_group
-
-repositories {
-	maven {
-		name = 'Ladysnake Mods'
-		url = 'https://maven.ladysnake.org/releases'
-		content {
-			includeGroup 'org.ladysnake'
-			includeGroupByRegex 'dev\\.onyxstudios.*'
+subprojects {
+	apply plugin: "dev.architectury.loom"
+	repositories {
+		maven {
+			url = "https://api.modrinth.com/maven"
 		}
 	}
-	maven {
-		url = 'https://maven.terraformersmc.com/releases'
-		content {
-			includeGroup 'com.terraformersmc'
-		}
-	}
-	maven {
-		url = "https://api.modrinth.com/maven"
-	}
-	flatDir {
-		dirs("localMaven")
-	}
-}

-dependencies {
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-	//modImplementation "org.ladysnake:satin:${satin_version}"
-	//include "org.ladysnake:satin:${satin_version}"
-
-	implementation 'com.google.code.findbugs:jsr305:3.0.2'
-	modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
-	include "maven.modrinth:midnightlib:${project.midnightlib_version}"
-}
-
-processResources {
-	inputs.property "version", project.version
-
-	filesMatching("fabric.mod.json") {
-		expand "version": project.version
-	}
-}
-
-tasks.withType(JavaCompile).configureEach {
-	// Minecraft 1.20.5 upwards uses Java 21.
-	it.options.release = 21
-}
-
-java {
-	withSourcesJar()
-}
-
-jar {
-	from "LICENSE"
-}
-
-// configure the maven publication
-publishing {
-	publications {
-		mavenJava(MavenPublication) {
-			from components.java
+	dependencies {
+		minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
+		// The following line declares the yarn mappings you may select this one as well.
+		mappings loom.layered {
+			it.mappings("net.fabricmc:yarn:$rootProject.yarn_mappings:v2")
+			it.mappings("dev.architectury:yarn-mappings-patch-neoforge:$rootProject.yarn_mappings_patch_neoforge_version")
 		}
 	}
 }

-ext {
-	releaseChangelog = {
-		def changes = new StringBuilder()
-		changes << "## Blur+ v$project.version for $project.minecraft_version\n[View the changelog](https://www.github.com/Motschen/Blur/commits/)"
-		def proc = "git log --max-count=1 --pretty=format:%s".execute()
-		proc.in.eachLine { line ->
-			def processedLine = line.toString()
-			if (!processedLine.contains("New translations") && !processedLine.contains("Merge") && !processedLine.contains("branch")) {
-				changes << "\n- ${processedLine.capitalize()}"
+allprojects {
+	apply plugin: "java"
+	apply plugin: "architectury-plugin"
+	apply plugin: "maven-publish"
+
+	archivesBaseName = rootProject.archives_base_name
+	version = rootProject.mod_version
+	group = rootProject.maven_group
+
+	tasks.withType(JavaCompile) {
+		options.encoding = "UTF-8"
+		options.release = 21
+	}
+	ext {
+		releaseChangelog = {
+			def changes = new StringBuilder()
+			changes << "## Blur+ v$project.version for $project.minecraft_version\n[View the changelog](https://www.github.com/Motschen/Blur/commits/)"
+			def proc = "git log --max-count=1 --pretty=format:%s".execute()
+			proc.in.eachLine { line ->
+				def processedLine = line.toString()
+				if (!processedLine.contains("New translations") && !processedLine.contains("Merge") && !processedLine.contains("branch")) {
+					changes << "\n- ${processedLine.capitalize()}"
+				}
 			}
+			proc.waitFor()
+			return changes.toString()
 		}
-		proc.waitFor()
-		return changes.toString()
 	}
-}
-
-unifiedPublishing {
-	project {
-		displayName = "Blur+ $project.version - Fabric $project.minecraft_version"
-		releaseType = "$project.release_type"
-		changelog = releaseChangelog()
-		gameVersions = []
-		gameLoaders = ["fabric","quilt"]
-		mainPublication remapJar
-		relations {
-			includes {
-				curseforge = "midnightlib"
-				modrinth = "midnightlib"
-			}
-		}
-
-		var CURSEFORGE_TOKEN = project.findProperty("CURSEFORGE_TOKEN") ?: System.getenv("CURSEFORGE_TOKEN")
-		if (CURSEFORGE_TOKEN != null) {
-			curseforge {
-				token = CURSEFORGE_TOKEN
-				id = rootProject.curseforge_id
-				gameVersions.addAll "Java 21", project.minecraft_version
-			}
-		}
-
-		var MODRINTH_TOKEN = project.findProperty("MODRINTH_TOKEN") ?: System.getenv("MODRINTH_TOKEN")
-		if (MODRINTH_TOKEN != null) {
-			modrinth {
-				token = MODRINTH_TOKEN
-				id = rootProject.modrinth_id
-				version = "$project.version"
-				gameVersions.addAll project.minecraft_version
+	processResources {
+		// Minify json resources
+		doLast {
+			fileTree(dir: outputs.files.asPath, include: "**/*.json").each {
+				File file -> file.text = JsonOutput.toJson(new JsonSlurper().parse(file))
 			}
 		}
 	}
-}
+
+	java {
+		withSourcesJar()
+	}
+}