From b47336b04da2fd131992f80b556e1436116e35ca Mon Sep 17 00:00:00 2001 From: axolotlmaid <124442837+axolotlmaid@users.noreply.github.com> Date: Tue, 21 May 2024 19:22:21 +0100 Subject: [PATCH] Remove Architectury API --- common/build.gradle | 4 ++-- fabric/build.gradle | 2 +- fabric/src/main/resources/fabric.mod.json | 3 +-- forge/build.gradle | 2 +- forge/src/main/resources/META-INF/mods.toml | 9 +-------- 5 files changed, 6 insertions(+), 14 deletions(-) diff --git a/common/build.gradle b/common/build.gradle index 90db22e..32d337e 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -25,9 +25,9 @@ dependencies { // Do NOT use other classes from fabric loader modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" // Remove the next line if you don't want to depend on the API - modApi "dev.architectury:architectury:${rootProject.architectury_version}" + // modApi "dev.architectury:architectury:${rootProject.architectury_version}" - // sodium + // Sodium modImplementation "maven.modrinth:sodium:mc1.20.4-0.5.8" } diff --git a/fabric/build.gradle b/fabric/build.gradle index 5ca331b..77a03d1 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -23,7 +23,7 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}" // Remove the next line if you don't want to depend on the API - modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}" + // modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}" common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false } diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 378cea3..dff0d90 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -26,7 +26,6 @@ ], "depends": { "fabric": "*", - "minecraft": ">=1.20.4", - "architectury": ">=11.0.10" + "minecraft": ">=1.20.4" } } \ No newline at end of file diff --git a/forge/build.gradle b/forge/build.gradle index 0adc78e..3993a4d 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -36,7 +36,7 @@ configurations { dependencies { forge "net.minecraftforge:forge:${rootProject.forge_version}" // Remove the next line if you don't want to depend on the API - modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}" + // modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}" common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false } diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index dd45c3c..3f3cf9c 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -25,11 +25,4 @@ modId = "minecraft" mandatory = true versionRange = "[1.20.4,)" ordering = "NONE" -side = "BOTH" - -[[dependencies.optionsprofiles]] -modId = "architectury" -mandatory = true -versionRange = "[11.0.10,)" -ordering = "AFTER" -side = "BOTH" +side = "BOTH" \ No newline at end of file