Merge remote-tracking branch 'origin/1.20.1' into 1.20.1

Fabricators-of-Create · Jul 26, 2024 · 77fac04 · 77fac04
2 parents 5e32232 + 3052b45
commit 77fac04
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git 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"
 

diff --git 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<String, ?> 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
@@ -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
@@ -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
@@ -15,7 +15,7 @@
   "environment": "*",
   "depends": {
     "fabricloader": ">=${loader_version}",
-    "fabric": ">=${fabric_version}",
+    "fabric-api": ">=${fabric_api_version}",
     "minecraft": "${minecraft_dependency}",
     "java": ">=${java_version}"
   },