Revert to using Forge Maven

Glitchfiend · Nov 10, 2023 · 6f9de43 · 6f9de43
1 parent a3fd3a8
commit 6f9de43
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml
@@ -27,8 +27,8 @@ jobs:
     - name: Publish
       run: ./gradlew publish
       env:
-        GITHUB_USERNAME: ${{ github.actor }}
-        GITHUB_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+        MAVEN_USER: ${{ secrets.MAVEN_USER }}
+        MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
         BUILD_NUMBER: ${{ github.run_number }}
     - name: CurseForge Publish
       run: ./gradlew curseforge -PcurseApiKey=${CURSE_API_KEY}

diff --git a/Common/build.gradle b/Common/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id 'maven-publish'
 }
 
-archivesBaseName = "${mod_id}-common"
+archivesBaseName = "${mod_name}-common"
 
 minecraft {
     accessWideners(project.file("src/main/resources/terrablender.accesswidener"))
@@ -75,11 +75,11 @@ publishing {
     }
     repositories {
         maven {
-            name = "GitHubPackages"
-            url = "https://maven.pkg.github.com/Glitchfiend/TerraBlender"
+            name = "Forge Maven"
+            url = "https://maven.minecraftforge.net/releases/"
             credentials {
-                username = System.getenv("GITHUB_USERNAME")
-                password = System.getenv("GITHUB_PASSWORD")
+                username = System.getenv("MAVEN_USER")
+                password = System.getenv("MAVEN_PASSWORD")
             }
         }
     }

diff --git a/Fabric/build.gradle b/Fabric/build.gradle
@@ -6,7 +6,7 @@ plugins {
     id "com.modrinth.minotaur" version "2.7.+"
 }
 
-archivesBaseName = "${mod_id}-fabric"
+archivesBaseName = "${mod_name}-fabric"
 def mod_build_version = "${mod_version}.${System.getenv().BUILD_NUMBER}"
 
 dependencies {
@@ -154,11 +154,11 @@ publishing {
     }
     repositories {
         maven {
-            name = "GitHubPackages"
-            url = "https://maven.pkg.github.com/Glitchfiend/TerraBlender"
+            name = "Forge Maven"
+            url = "https://maven.minecraftforge.net/releases/"
             credentials {
-                username = System.getenv("GITHUB_USERNAME")
-                password = System.getenv("GITHUB_PASSWORD")
+                username = System.getenv("MAVEN_USER")
+                password = System.getenv("MAVEN_PASSWORD")
             }
         }
     }

diff --git a/Forge/build.gradle b/Forge/build.gradle
@@ -20,7 +20,7 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'maven-publish'
 apply plugin: 'org.spongepowered.mixin'
 
-archivesBaseName = "${mod_id}-forge"
+archivesBaseName = "${mod_name}-forge"
 def mod_build_version = "${mod_version}.${System.getenv().BUILD_NUMBER}"
 
 minecraft {
@@ -183,11 +183,11 @@ publishing {
     }
     repositories {
         maven {
-            name = "GitHubPackages"
-            url = "https://maven.pkg.github.com/Glitchfiend/TerraBlender"
+            name = "Forge Maven"
+            url = "https://maven.minecraftforge.net/releases/"
             credentials {
-                username = System.getenv("GITHUB_USERNAME")
-                password = System.getenv("GITHUB_PASSWORD")
+                username = System.getenv("MAVEN_USER")
+                password = System.getenv("MAVEN_PASSWORD")
             }
         }
     }