Merge pull request #1 from DebuggyTeam/back_to_fabric

Back to fabric

Author: falkreon

build.gradle

@@ -1,56 +1,48 @@
 plugins {
 	id "maven-publish"
-	id "org.quiltmc.loom" version "1.+"
+	id "fabric-loom" version "1.4-SNAPSHOT"
+	id "signing"
 }
 
 
 base.archivesName = project.archives_base_name
-version = "${project.version}+${project.minecraft}"
+version = "${project.version}+${project.minecraft_version}"
 group = project.maven_group
 
 repositories {
 }
 
 dependencies {
-	minecraft "com.mojang:minecraft:${project.minecraft}"
-	mappings "org.quiltmc:quilt-mappings:${project.minecraft}+build.${project.mappings}:intermediary-v2"
-
-	modImplementation "org.quiltmc:quilt-loader:${project.loader}"
-	
-	modImplementation "org.quiltmc.quilted-fabric-api:quilted-fabric-api:${project.qfapi}"
+	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}"
 }
 
 processResources {
 	inputs.property 'version', version
 
-	filesMatching('quilt.mod.json') {
+	filesMatching('fabric.mod.json') {
 		expand "version": version
 	}
 }
 
 tasks.withType(JavaCompile).configureEach {
-	it.options.encoding = 'UTF-8'
-	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
+	it.options.encoding = "UTF-8"
 	it.options.release = 17
 }
 
 java {
 	// Still required by IDEs such as Eclipse and Visual Studio Code
 	sourceCompatibility = JavaVersion.VERSION_17
 	targetCompatibility = JavaVersion.VERSION_17
-
-	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task if it is present.
-	// If you remove this line, sources will not be generated.
+	
 	withSourcesJar()
-
-	// If this mod is going to be a library, then it should also generate Javadocs in order to aid with development.
-	// Uncomment this line to generate them.
-	// withJavadocJar()
 }
 
 // If you plan to use a different file for the license, don't forget to change the file name here!
 jar {
-	from('LICENSE') {
+	from("LICENSE") {
 		rename { "${it}_${archivesBaseName}" }
 	}
 }
@@ -61,12 +53,14 @@ publishing {
 			from components.java
 		}
 	}
-
-	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+	
 	repositories {
-		// Add repositories to publish to here.
-		// Notice: This block does NOT have the same function as the block in the top level.
-		// The repositories here will be used for publishing your artifact, not for
-		// retrieving dependencies.
+	}
+}
+
+signing {
+	if (project.hasProperty("signing.keyId")) {
+		sign configurations.archives;
+		sign publishing.publications.mavenJava
 	}
 }

gradle.properties

@@ -3,12 +3,12 @@ org.gradle.jvmargs = -Xmx1G
 org.gradle.parallel = true
 
 # Mod Properties
-version = 1.0.1
+version = 1.1.0
 maven_group = gay.debuggy
 archives_base_name = StaticData
 
 # Dependencies
-minecraft = 1.20
-mappings = 4
-loader = 0.19.0-beta.18
-qfapi = 7.0.1+0.83.0-1.20
+minecraft_version=1.20.4
+yarn_mappings=1.20.4+build.3
+loader_version=0.15.3
+fabric_version=0.92.0+1.20.4

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/gay/debuggy/staticdata/StaticDataMod.java

@@ -1,12 +1,11 @@
 package gay.debuggy.staticdata;
 
-import org.quiltmc.loader.api.ModContainer;
-import org.quiltmc.qsl.base.api.entrypoint.ModInitializer;
+import net.fabricmc.api.ModInitializer;
 
 public class StaticDataMod implements ModInitializer {
 
 	@Override
-	public void onInitialize(ModContainer mod) {
+	public void onInitialize() {
 		// we don't really need to do anything here for a library mod, this is just here to satisfy assumptions about mods.
 	}
 

src/main/java/gay/debuggy/staticdata/api/StaticData.java

@@ -7,10 +7,9 @@
 import java.util.List;
 import java.util.Set;
 
-import org.quiltmc.loader.api.ModContainer;
-import org.quiltmc.loader.api.QuiltLoader;
-
 import gay.debuggy.staticdata.impl.StaticDataImpl;
+import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.api.ModContainer;
 import net.minecraft.util.Identifier;
 
 /**
@@ -51,7 +50,7 @@ public class StaticData {
 	 * @return The staticdata folder path
 	 */
 	public static Path getStaticDataDir() {
-		return QuiltLoader.getGameDir().resolve("staticdata");
+		return FabricLoader.getInstance().getGameDir().resolve("staticdata");
 	}
 
 	/**
@@ -64,15 +63,17 @@ public static List<StaticDataItem> getExactData(Identifier resourceId) {
 		synchronized(GLOBAL_MUTEX) {
 			List<StaticDataItem> result = new ArrayList<>();
 
-			for(ModContainer container : QuiltLoader.getAllMods()) {
-				if (FORBIDDEN_CONTAINERS.contains(container.metadata().id())) continue;
+			for(ModContainer container : FabricLoader.getInstance().getAllMods()) {
+				if (FORBIDDEN_CONTAINERS.contains(container.getMetadata().getId())) continue;
 
-				StaticDataImpl.addExactData(
-						container.metadata().id(),
+				for(Path p : container.getRootPaths()) {
+					StaticDataImpl.addExactData(
+						container.getMetadata().getId(),
 						resourceId,
-						container.rootPath().resolve("staticdata"),
+						p.resolve("staticdata"),
 						result
-						);
+					);
+				}
 			}
 
 			Path saticDataDir = getStaticDataDir();
@@ -111,16 +112,18 @@ public static List<StaticDataItem> getDataInDirectory(Identifier resourceId, boo
 		synchronized(GLOBAL_MUTEX) {
 			List<StaticDataItem> result = new ArrayList<>();
 
-			for(ModContainer container : QuiltLoader.getAllMods()) {
-				if (FORBIDDEN_CONTAINERS.contains(container.metadata().id())) continue;
+			for(ModContainer container : FabricLoader.getInstance().getAllMods()) {
+				if (FORBIDDEN_CONTAINERS.contains(container.getMetadata().getId())) continue;
 
-				StaticDataImpl.addDirectoryData(
-						container.metadata().id(),
-						resourceId,
-						container.rootPath().resolve("staticdata"),
-						recursive,
-						result
-						);
+				for(Path p : container.getRootPaths()) {
+					StaticDataImpl.addDirectoryData(
+							container.getMetadata().getId(),
+							resourceId,
+							p.resolve("staticdata"),
+							recursive,
+							result
+							);
+				}
 			}
 
 			Path saticDataDir = getStaticDataDir();

src/main/resources/fabric.mod.json

@@ -0,0 +1,35 @@
+{
+	"schemaVersion": 1,
+	"id": "staticdata",
+	"version": "${version}",
+	"name": "StaticData",
+	"description": "Effortless mod integration through early access to shared data.",
+	"authors": [
+		"Falkreon"
+	],
+	"contact": {
+		"homepage": "https://github.com/DebuggyTeam/StaticData",
+		"issues": "https://github.com/DebuggyTeam/StaticData/issues",
+		"sources": "https://github.com/DebuggyTeam/StaticData"
+	},
+	"license": "MIT",
+	"icon": "assets/staticdata/icon.png",
+	"environment": "*",
+	"entrypoints": {
+		"main": [
+			"gay.debuggy.staticdata.StaticDataMod"
+		]
+	},
+	"mixins": [],
+	"depends": {
+		"fabricloader": ">=0.15.0",
+		"minecraft": "~1.20.4",
+		"java": ">=17",
+		"fabric-api": "*"
+	},
+	"custom": {
+		"modmenu": {
+			"badges": [ "library" ]
+		}
+	}
+}