Revert "feat: 1.20.4"

This reverts commit a410144.

.github/workflows/build.yml

@@ -20,8 +20,9 @@ jobs:
           path: |
             ~/.gradle/caches
             ~/.gradle/loom-cache
+            ~/.gradle/machete-build
             ~/.gradle/wrapper
-          key: gradle-${{ hashFiles('**/gradle-wrapper.properties') }}-${{ hashFiles('./gradle.properties') }}
+          key: gradle-${{ hashFiles('**/gradle-wrapper.properties') }}
           restore-keys: gradle
 
       - name: Validate Gradle Wrapper
@@ -33,7 +34,7 @@ jobs:
           java-version: 17
 
       - name: Build
-        run: ./gradlew clean forge:build neoforge:build fabric:build quilt:build
+        run: ./gradlew clean forge:build fabric:build quilt:build
 
       - name: Capture Fabric Build Artifacts
         uses: actions/upload-artifact@v2
@@ -52,9 +53,3 @@ jobs:
         with:
           name: Forge Artifacts
           path: forge/build/libs/
-
-      - name: Capture NeoForge Build Artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: NeoForge Artifacts
-          path: neoforge/build/libs/

build.gradle

@@ -9,8 +9,8 @@ if (System.getenv("GITHUB_TOKEN") != null) {
         token(System.getenv("GITHUB_TOKEN"))
         owner("JamCoreModding")
         repo("quicker-connect-button")
-        tagName("${project.version}")
-        releaseName("V${project.version}")
+        tagName("${project.version}+${project.minecraft_version}")
+        releaseName("V${project.version} [${minecraft_version}]")
         body(project.rootProject.file("CHANGELOG.md").text)
         draft(false)
 

fabric/build.gradle

@@ -9,7 +9,7 @@ architectury {
 }
 
 base {
-    archivesName = "quickerconnectbutton-fabric"
+    archivesName = "quickerconnectbutton-fabric-${minecraft_version}"
 }
 
 configurations {

fabric/src/main/resources/fabric.mod.json

@@ -24,9 +24,10 @@
         "quickerconnectbutton.mixins.json"
     ],
     "depends": {
+        "fabricloader": ">=0.14",
         "fabric": "*",
-        "minecraft": ">=1.20.4",
-        "architectury": ">=11.0.9",
-        "jamlib": ">=1.0.3+1.20.4"
+        "minecraft": ">=1.20",
+        "java": ">=17",
+        "architectury": ">=9.1.12"
     }
 }

forge/build.gradle

@@ -9,7 +9,7 @@ architectury {
 }
 
 base {
-    archivesName = "quickerconnectbutton-forge"
+    archivesName = "quickerconnectbutton-forge-${minecraft_version}"
 }
 
 loom {

forge/src/main/resources/META-INF/mods.toml

@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[49,)"
+loaderVersion = "[47,)"
 license = "MIT"
 issueTrackerURL="https://github.com/JamCoreModding/quicker-connect-button/issues"
 
@@ -17,27 +17,20 @@ Adds a connect button to the main menu for quickly connecting to servers
 [[dependencies.quickerconnectbutton]]
 modId = "forge"
 mandatory = true
-versionRange = "[49,)"
+versionRange = "[47,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.quickerconnectbutton]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.20.4,)"
+versionRange = "[1.20,1.21)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.quickerconnectbutton]]
 modId = "architectury"
 mandatory = true
-versionRange = "[11.0.9,)"
-ordering = "AFTER"
-side = "BOTH"
-
-[[dependencies.quickerconnectbutton]]
-modId = "jamlib"
-mandatory = true
-versionRange = "[1.0.3+1.20.4,)"
+versionRange = "[9.1.12,)"
 ordering = "AFTER"
 side = "BOTH"

gradle.properties

@@ -1,8 +1,8 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 org.gradle.parallel=true
-version=2.0.1+1.20.4
-minecraft_version=1.20.4
+version=2.0.1
+minecraft_version=1.20.2
 branch=main
 group=io.github.jamalam360
 mod_name=Quicker Connect Button

libs.versions.toml

@@ -1,26 +1,26 @@
 [versions]
 # https://modrinth.com/mod/architectury-api/versions
-architectury = "11.0.9"
+architectury = "10.0.17"
 
 # https://files.minecraftforge.net/net/minecraftforge/forge/
-forge = "1.20.4-49.0.12"
+forge = "1.20.2-48.0.33"
 
-# https://projects.neoforged.net/neoforged/neoforge
-neoforge = "20.4.69-beta"
+# https://neoforged.net/
+neoforge = "20.2.86"
 
 # https://fabricmc.net/develop
-fabric-loader = "0.15.3"
-fabric-api = "0.92.0+1.20.4"
+fabric-loader = "0.14.24"
+fabric-api = "0.90.4+1.20.2"
 
 # https://lambdaurora.dev/tools/import_quilt.html
 quilt-loader = "0.21.1"
 quilted-fabric-api = "7.4.0+0.90.0-1.20.1"
 
 # https://maven.jamalam.tech/#/releases
-jamlib = "1.0.3+1.20.4"
+jamlib = "1.0.3+1.20.2"
 
 # https://modrinth.com/mod/modmenu/versions
-modmenu = "9.0.0"
+modmenu = "8.0.0"
 
 [libraries]
 architectury-common = { module = "dev.architectury:architectury", version.ref = "architectury" }

neoforge/build.gradle

@@ -9,7 +9,7 @@ architectury {
 }
 
 base {
-    archivesName = "quickerconnectbutton-neoforge"
+    archivesName = "quickerconnectbutton-neoforge-${minecraft_version}"
 }
 
 configurations {

neoforge/src/main/resources/META-INF/mods.toml

@@ -16,29 +16,22 @@ Adds a connect button to the main menu for quickly connecting to servers
 
 [[dependencies.quickerconnectbutton]]
 modId = "neoforge"
-type = "required"
-versionRange = "[20.4,)"
+mandatory = true
+versionRange = "[20.2,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.quickerconnectbutton]]
 modId = "minecraft"
-type = "required"
-versionRange = "[1.20.4,)"
+mandatory = true
+versionRange = "[1.20.2,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.quickerconnectbutton]]
 modId = "architectury"
-type = "required"
-versionRange = "[11.0.9,)"
-ordering = "AFTER"
-side = "BOTH"
-
-[[dependencies.quickerconnectbutton]]
-modId = "jamlib"
-type = "required"
-versionRange = "[1.0.3+1.20.4,)"
+mandatory = true
+versionRange = "[10.0.17,)"
 ordering = "AFTER"
 side = "BOTH"
 

quilt/build.gradle

@@ -9,7 +9,7 @@ architectury {
 }
 
 base {
-    archivesName = "quickerconnectbutton-quilt"
+    archivesName = "quickerconnectbutton-quilt-${minecraft_version}"
 }
 
 configurations {

quilt/src/main/resources/quilt.mod.json

@@ -23,21 +23,21 @@
       "init": ["io.github.jamalam360.quickerconnectbutton.quilt.QuickerConnectButtonQuilt"]
     },
     "depends": [
+      {
+        "id": "quilt_loader",
+        "version": "*"
+      },
       {
         "id": "quilt_base",
         "version": "*"
       },
       {
         "id": "minecraft",
-        "version": ">=1.20.4"
+        "version": ">=1.20.1"
       },
       {
         "id": "architectury",
-        "version": ">=11.0.9"
-      },
-      {
-        "id": "jamlib",
-        "version": ">=1.0.3+1.20.4"
+        "version": ">=9.1.12"
       }
     ]
   },