From 73d38aae547803aaa9f0f71783e75cb82c16aa6d Mon Sep 17 00:00:00 2001 From: IThundxr Date: Thu, 27 Jun 2024 09:38:02 -0400 Subject: [PATCH 1/4] depend on fabric-api instead of fabric for better solver messages --- build.gradle | 4 ++-- gradle.properties | 2 +- src/main/resources/fabric.mod.json | 2 +- src/main/resources/template.fabric.mod.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index d58eeb32..f722052d 100644 --- a/build.gradle +++ b/build.gradle @@ -108,7 +108,7 @@ allprojects { // common dependencies // each module can also specify additional ones - modImplementation("net.fabricmc.fabric-api:fabric-api:$fabric_version") + modImplementation("net.fabricmc.fabric-api:fabric-api:$fabric_api_version") implementation("javax.annotation:javax.annotation-api:1.3.2") implementation("com.google.code.findbugs:jsr305:3.0.2") @@ -134,7 +134,7 @@ allprojects { Map properties = [ version: version, loader_version: loader_version, - fabric_version: fabric_version, + fabric_api_version: fabric_api_version, minecraft_dependency: minecraft_dependency, java_version: sourceCompatibility, diff --git a/gradle.properties b/gradle.properties index cf6ef533..61303590 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ mod_version = 2.3.5 minecraft_version = 1.20.1 minecraft_dependency = =1.20.1 loader_version = 0.15.7 -fabric_version = 0.91.0+1.20.1 +fabric_api_version = 0.91.0+1.20.1 # Mixin Extra's # https://github.com/LlamaLad7/MixinExtras diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index c99f9d4a..e1decfa5 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -15,7 +15,7 @@ "environment": "*", "depends": { "fabricloader": ">=${loader_version}", - "fabric": ">=${fabric_version}", + "fabric-api": ">=${fabric_api_version}", "minecraft": "${minecraft_dependency}", "java": ">=${java_version}" }, diff --git a/src/main/resources/template.fabric.mod.json b/src/main/resources/template.fabric.mod.json index 9c353313..efbd2ec7 100644 --- a/src/main/resources/template.fabric.mod.json +++ b/src/main/resources/template.fabric.mod.json @@ -15,7 +15,7 @@ "environment": "*", "depends": { "fabricloader": ">=${loader_version}", - "fabric": ">=${fabric_version}", + "fabric-api": ">=${fabric_api_version}", "minecraft": "${minecraft_dependency}", "java": ">=${java_version}" }, From 4799ded697c4cb44efffa6c91a4743e60037b26f Mon Sep 17 00:00:00 2001 From: IThundxr Date: Tue, 9 Jul 2024 09:20:17 -0400 Subject: [PATCH 2/4] chore: make all modules not JiJ mixinextras --- build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f722052d..ee7b26a1 100644 --- a/build.gradle +++ b/build.gradle @@ -26,6 +26,9 @@ String versionNumber = providers.provider { }.get() dependencies { + if (mixin_extras_version != "none") + include("io.github.llamalad7:mixinextras-fabric:${mixin_extras_version}") + subprojects.forEach { api(include(project(path: ":$it.name", configuration: "namedElements"))) } @@ -114,7 +117,7 @@ allprojects { implementation("com.google.code.findbugs:jsr305:3.0.2") if (mixin_extras_version != "none") - include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${mixin_extras_version}"))) + implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${mixin_extras_version}")) } loom { From 27705d12f907bb2863ead761fdf4336a9d1dfd41 Mon Sep 17 00:00:00 2001 From: IThundxr Date: Tue, 9 Jul 2024 11:36:34 -0400 Subject: [PATCH 3/4] fix: snapshot workflow not checking out the repository --- .github/workflows/snapshot.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index fa21fe8a..8474874e 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -9,6 +9,9 @@ jobs: MAVEN_USER: ${{ secrets.MAVEN_USER }} MAVEN_PASS: ${{ secrets.MAVEN_PASS }} steps: + - name: Checkout Repository + uses: actions/checkout@v4 + - name: Setup Java run: echo "JAVA_HOME=$JAVA_HOME_17_X64" >> "$GITHUB_ENV" From 3052b45fef245915d22b298df3919bfe7853a171 Mon Sep 17 00:00:00 2001 From: IThundxr Date: Tue, 9 Jul 2024 15:28:01 -0400 Subject: [PATCH 4/4] Revert "chore: make all modules not JiJ mixinextras" This reverts commit 4799ded697c4cb44efffa6c91a4743e60037b26f. --- build.gradle | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index ee7b26a1..f722052d 100644 --- a/build.gradle +++ b/build.gradle @@ -26,9 +26,6 @@ String versionNumber = providers.provider { }.get() dependencies { - if (mixin_extras_version != "none") - include("io.github.llamalad7:mixinextras-fabric:${mixin_extras_version}") - subprojects.forEach { api(include(project(path: ":$it.name", configuration: "namedElements"))) } @@ -117,7 +114,7 @@ allprojects { implementation("com.google.code.findbugs:jsr305:3.0.2") if (mixin_extras_version != "none") - implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${mixin_extras_version}")) + include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${mixin_extras_version}"))) } loom {