From 644bb6bb4a8012c75900c643d9863fe92c799e1d Mon Sep 17 00:00:00 2001 From: Madis Otenurm Date: Fri, 8 Dec 2023 12:43:58 +0100 Subject: Depend on Fabric API (#449) * Make it depend on FAPI * Forge dep--- build.gradle | 10 ++-------- gradle.properties | 2 +- src/main/resources/fabric.mod.json | 7 ++----- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 8bb13c3..7dfc0eb 100644 --- a/build.gradle +++ b/build.gradle @@ -78,12 +78,6 @@ dependencies { modApi("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") { exclude(group: "net.fabricmc.fabric-api") } - - include(fabricApi.module("fabric-api-base", project.fabric_version)) - modImplementation include(fabricApi.module("fabric-networking-api-v1", project.fabric_version)) - modImplementation include(fabricApi.module("fabric-screen-api-v1", project.fabric_version)) - modImplementation include(fabricApi.module("fabric-rendering-v1", project.fabric_version)) - modImplementation include(fabricApi.module("fabric-resource-loader-v0", project.fabric_version)) } sourceSets.remove(sourceSets.test) @@ -158,7 +152,7 @@ curseforge { addGameVersion 'Java 17' relations { - embeddedLibrary 'fabric-api' + requiredDependency 'fabric-api' optionalDependency 'modmenu' optionalDependency 'cloth-config' } @@ -190,7 +184,7 @@ modrinth { dependencies { // The scope can be `required`, `optional`, or `incompatible` - embedded.project "fabric-api" + required.project "fabric-api" optional.project "modmenu" optional.project "cloth-config" } diff --git a/gradle.properties b/gradle.properties index c0aac06..9d3b78b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,7 +28,7 @@ cloth_config_version=12.0.111 # Dependencies in mods.toml dep_forge=[37,) -dep_minecraft=[1.19.4,) +dep_minecraft=[1.20.3,) # Publishing curse_id=634062 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 2ae972e..56eb452 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -39,11 +39,8 @@ "depends": { "fabricloader": ">=0.14.6", - "fabric-networking-api-v1": "*", - "fabric-screen-api-v1": "*", - "fabric-rendering-v1": "*", - "fabric-resource-loader-v0": "*", - "minecraft": [ ">=1.20" ], + "fabric-api": "*", + "minecraft": [ ">=1.20.3" ], "java": ">=17" }, "suggests": {}, -- cgit v1.2.3