fix #333 - disable forge build (#334)

pcal43 · Jun 29, 2024 · 7cfb5e5 · 7cfb5e5
1 parent 7aa9e74
commit 7cfb5e5
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ clean:
 jar:
 	./gradlew remapJar
 	ls -1 fabric/build/libs
-	ls -1 forge/build/libs
+#	ls -1 forge/build/libs
 
 test:
 	./gradlew test
@@ -38,15 +38,15 @@ deps:
 
 .PHONY: inst
 inst:
-	rm -f ~/minecraft/instances/1.20.1-forge-dev/.minecraft/mods/fastback*
+#	rm -f ~/minecraft/instances/1.20.1-forge-dev/.minecraft/mods/fastback*
 	rm -f ~/minecraft/instances/1.20.1-fabric-dev/.minecraft/mods/fasback*
 	cp fabric/build/libs/fastback*-fabric.jar ~/minecraft/instances/1.20.1-fabric-dev/.minecraft/mods/
-	cp forge/build/libs/fastback*-forge.jar ~/minecraft/instances/1.20.1-forge-dev/.minecraft/mods/
+#	cp forge/build/libs/fastback*-forge.jar ~/minecraft/instances/1.20.1-forge-dev/.minecraft/mods/
 
 .PHONY: tvf
 tvf:
-	jar -tvf forge/build/libs/fastback*-forge.jar
+#	jar -tvf forge/build/libs/fastback*-forge.jar
 
 .PHONY: tvfs
 tvfs:
-	jar -tvf forge/build/libs/fastback*-shadow.jar
+#	jar -tvf forge/build/libs/fastback*-shadow.jar
diff --git a/common/build.gradle b/common/build.gradle
@@ -1,7 +1,9 @@
 
 architectury {
     common("fabric")
-    common("forge")
+    // NOTE: Forge is no longer supported and the build has been disabled
+    // See: https://github.com/pcal43/fastback/issues/333
+    //common("forge")
 }
 
 dependencies {

diff --git a/etc/release.sh b/etc/release.sh
@@ -50,7 +50,10 @@ fi
 #
 
 FABRIC_LIBS_DIR='fabric/build/libs'
-FORGE_LIBS_DIR='forge/build/libs'
+
+# NOTE: Forge is no longer supported and the build has been disabled
+# See: https://github.com/pcal43/fastback/issues/333
+# FORGE_LIBS_DIR='forge/build/libs'
 
 CURRENT_VERSION=$(sed -rn 's/^mod_version.*=[ ]*([^\n]+)$/\1/p' gradle.properties)
 echo "Current version is '$CURRENT_VERSION'"
@@ -66,7 +69,10 @@ rm gradle.properties
 mv gradle.properties.temp gradle.properties
 
 rm -rf "${FABRIC_LIBS_DIR}"
-rm -rf "${FORGE_LIBS_DIR}"
+
+# NOTE: Forge is no longer supported and the build has been disabled
+# See: https://github.com/pcal43/fastback/issues/333
+# rm -rf "${FORGE_LIBS_DIR}"
 
 ./gradlew remapJar
 
@@ -78,7 +84,7 @@ git push
 # Do github release
 #
 set -x
-gh release create --generate-notes --title "${RELEASE_VERSION}" --notes "release ${RELEASE_VERSION}" ${RELEASE_VERSION}  "${FABRIC_LIBS_DIR}"/* "${FORGE_LIBS_DIR}"/*
+gh release create --generate-notes --title "${RELEASE_VERSION}" --notes "release ${RELEASE_VERSION}" ${RELEASE_VERSION}  "${FABRIC_LIBS_DIR}"/*   # "${FORGE_LIBS_DIR}"/*
 set +x
 
 

diff --git a/gradle.properties b/gradle.properties
@@ -22,7 +22,9 @@ fabric_version=0.99.0+1.20.6
 # Forge
 #
 # https://files.minecraftforge.net/net/minecraftforge/forge/
-forge_version                 = 1.20.6-50.0.31
+forge_version                 = 1.20.6-50.1.9
+# NOTE: Forge is no longer supported and the build has been disabled
+# See: https://github.com/pcal43/fastback/issues/333
 
 #
 # common dependencies

diff --git a/settings.gradle b/settings.gradle
@@ -5,26 +5,31 @@ pluginManagement {
             name = "Fabric"
             url = "https://maven.fabricmc.net/"
         }
-        maven {
-            name = "Forge"
-            url = "https://maven.minecraftforge.net/"
-        }
         maven {
             name = "Architectury"
             url = "https://maven.architectury.dev/"
         }
         //mavenCentral()
         gradlePluginPortal()
+        // NOTE: Forge is no longer supported and the build has been disabled
+        // See: https://github.com/pcal43/fastback/issues/333
+        // maven {
+        //    name = 'NeoForged'
+        //    url = 'https://maven.neoforged.net/releases'
+        //}
+        // architectury-loom still demands this for some reason
         maven {
-            name = 'NeoForged'
-            url = 'https://maven.neoforged.net/releases'
+            name = "Forge"
+            url = "https://maven.minecraftforge.net/"
         }
-
     }
 }
 
 rootProject.name = "fastback"
 
 include(":common")
 include(":fabric")
-include(":forge")
+
+// NOTE: Forge is no longer supported and the build has been disabled
+// See: https://github.com/pcal43/fastback/issues/333
+// include(":forge")