From ac86dfb0a5c63edfa5ef2148e156bf4a967e1ab9 Mon Sep 17 00:00:00 2001
From: "unrealdinnerbone@gmail.com" <unrealdinnerbone@gmail.com>
Date: Sat, 10 Jun 2023 14:01:29 -0500
Subject: [PATCH] Fix Publishing

---
 Common/build.gradle         | 4 ++--
 build.gradle                | 2 +-
 gradle/scripts/maven.gradle | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Common/build.gradle b/Common/build.gradle
index 0f45a1e..df0f504 100644
--- a/Common/build.gradle
+++ b/Common/build.gradle
@@ -4,12 +4,12 @@ plugins {
     id 'maven-publish'
 }
 
+archivesBaseName = "${project.property("mod_name")}-${project.name}"
+
 apply {
     from file("../gradle/scripts/maven.gradle")
 }
 
-archivesBaseName = "${project.property("mod_name")}-${project.name}"
-
 minecraft {
     version(minecraft_version)
 }
diff --git a/build.gradle b/build.gradle
index 303b35b..04ccc78 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ subprojects {
     ext.ENV = env
     ext.SNAPSHOT = isSnapshot
 
-    version = "${parent.mod_version}${!isSnapshot ? "-build.${ENV.GITHUB_RUN_NUMBER ?: 9999}": ""}+mc${parent.minecraft_version}${isSnapshot ? '-SNAPSHOT' : ''}"
+    version = "${parent.mod_version}+mc${parent.minecraft_version}${isSnapshot ? '-SNAPSHOT' : ''}"
     group = parent.maven_group
 
     jar {
diff --git a/gradle/scripts/maven.gradle b/gradle/scripts/maven.gradle
index a6505a8..4787a34 100644
--- a/gradle/scripts/maven.gradle
+++ b/gradle/scripts/maven.gradle
@@ -2,7 +2,7 @@ publishing {
     publications {
         mavenJava(MavenPublication) {
             groupId project.group
-            artifactId project.archivesBaseName + "-" + project.name
+            artifactId project.archivesBaseName
             version project.version
             from components.java
         }