Cf publish works

RealYusufIsmail-Mc-Mods · Oct 25, 2023 · 1f7330d · 1f7330d
1 parent a46345a
commit 1f7330d
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 19 deletions.
diff --git a/forge/CHANGELOG.md b/forge/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.20.1-1.0.7.beta2] - 2023-10-24
+
+### Added support for new forge. Changelog for both versions will now be split. Currently both versions are the same.
+
 ## [1.20.1-1.0.7.beta1] - 2023-10-23
 
 ### Added Thor hammer. This is a work in progress and will be updated in the future.

diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
@@ -7,9 +7,10 @@ plugins {
 }
 
 project.version = properties["modVersion"] as String
-base.archivesName.set("armourandtoolsmod")
+base.archivesName.set("armourandtoolsmod-forge")
 val mcVersion = properties["mcVersion"] as String
 var projectId = properties["projectId"] as String
+val modId = properties["modId"] as String
 
 println(
     """
@@ -39,7 +40,7 @@ configure<UserDevExtension> {
             // Recommended logging level for the console
             property("forge.logging.console.level", "debug")
 
-            mods { create(base.archivesName.get()) { source(sourceSets["main"]) } }
+            mods { create(modId) { source(sourceSets["main"]) } }
         }
 
         create("server") {
@@ -56,7 +57,7 @@ configure<UserDevExtension> {
             // Recommended logging level for the console
             property("forge.logging.console.level", "debug")
 
-            mods { create(base.archivesName.get()) { source(sourceSets["main"]) } }
+            mods { create(modId) { source(sourceSets["main"]) } }
         }
 
         create("gameTestServer") {
@@ -93,14 +94,14 @@ configure<UserDevExtension> {
             // where to look for existing resources.
             args(
                 "--mod",
-                base.archivesName.get(),
+                modId,
                 "--all",
                 "--output",
                 file("src/generated/resources/"),
                 "--existing",
                 file("src/main/resources/"))
 
-            mods { create(base.archivesName.get()) { source(sourceSets["main"]) } }
+            mods { create(modId) { source(sourceSets["main"]) } }
 
             // 'runData' is renamed to 'runDataGenerator' to make it more clear what it does.
             taskName = "runDataGenerator"
@@ -135,7 +136,6 @@ dependencies {
     annotationProcessor("org.projectlombok:lombok:" + properties["lombokVersion"])
 }
 
-
 tasks.create("cfPublish", net.darkhax.curseforgegradle.TaskPublishCurseForge::class) {
     group = "CurseForge"
     dependsOn("build")
@@ -147,7 +147,7 @@ tasks.create("cfPublish", net.darkhax.curseforgegradle.TaskPublishCurseForge::cl
         else ""
     apiToken = token
 
-    val jar = file("build/libs/${base.archivesName.get() + "-forge"}-${project.version}.jar")
+    val jar = file("build/libs/${base.archivesName.get()}-${project.version}.jar")
 
     // The main file to upload
     val mainFile = upload(projectId, jar)
@@ -157,6 +157,6 @@ tasks.create("cfPublish", net.darkhax.curseforgegradle.TaskPublishCurseForge::cl
     mainFile.addEmbedded("kotlin-for-forge")
     mainFile.addEmbedded("realyusufismail-core")
     mainFile.addJavaVersion("Java 17")
-    mainFile.addModLoader("forge", "NeoForge") // Remove after 1.20.1
+    mainFile.addModLoader("forge")
     mainFile.addGameVersion(mcVersion)
 }
diff --git a/forge/gradle.properties b/forge/gradle.properties
@@ -2,9 +2,10 @@ kotlin.code.style=official
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-modVersion = 1.20.1-1.0.7.beta1
+modVersion = 1.20.1-1.0.7.beta2
 mcVersion = 1.20.1
 projectId = 480779
+modId = armourandtoolsmod
 
 forgeVersion = 1.20.1-47.2.0
 kotlinForForgeVersion = 4.4.0

diff --git a/neoforge/CHANGELOG.md b/neoforge/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.20.1-1.0.7.beta2] - 2023-10-24
+
+### Added support for new forge. Changelog for both versions will now be split.
+
 ## [1.20.1-1.0.7.beta1] - 2023-10-23
 
 ### Added Thor hammer. This is a work in progress and will be updated in the future.

diff --git a/neoforge/build.gradle.kts b/neoforge/build.gradle.kts
@@ -7,9 +7,10 @@ plugins {
 }
 
 project.version = properties["modVersion"] as String
-base.archivesName.set("armourandtoolsmod")
+base.archivesName.set("armourandtoolsmod-neoforge")
 val mcVersion = properties["mcVersion"] as String
 var projectId = properties["projectId"] as String
+val modId = properties["modId"] as String
 
 println(
     """
@@ -39,7 +40,7 @@ configure<UserDevExtension> {
             // Recommended logging level for the console
             property("forge.logging.console.level", "debug")
 
-            mods { create(base.archivesName.get()) { source(sourceSets["main"]) } }
+            mods { create(modId) { source(sourceSets["main"]) } }
         }
 
         create("server") {
@@ -56,7 +57,7 @@ configure<UserDevExtension> {
             // Recommended logging level for the console
             property("forge.logging.console.level", "debug")
 
-            mods { create(base.archivesName.get()) { source(sourceSets["main"]) } }
+            mods { create(modId) { source(sourceSets["main"]) } }
         }
 
         create("gameTestServer") {
@@ -73,7 +74,7 @@ configure<UserDevExtension> {
             // Recommended logging level for the console
             property("forge.logging.console.level", "debug")
 
-            mods { create(base.archivesName.get()) { source(sourceSets["main"]) } }
+            mods { create(modId) { source(sourceSets["main"]) } }
         }
 
         create("data") {
@@ -93,14 +94,14 @@ configure<UserDevExtension> {
             // where to look for existing resources.
             args(
                 "--mod",
-                base.archivesName.get(),
+                modId,
                 "--all",
                 "--output",
                 file("src/generated/resources/"),
                 "--existing",
                 file("src/main/resources/"))
 
-            mods { create(base.archivesName.get()) { source(sourceSets["main"]) } }
+            mods { create(modId) { source(sourceSets["main"]) } }
 
             // 'runData' is renamed to 'runDataGenerator' to make it more clear what it does.
             taskName = "runDataGenerator"
@@ -135,7 +136,6 @@ dependencies {
     annotationProcessor("org.projectlombok:lombok:" + properties["lombokVersion"])
 }
 
-
 tasks.create("cfPublish", net.darkhax.curseforgegradle.TaskPublishCurseForge::class) {
     group = "CurseForge"
     dependsOn("build")
@@ -147,7 +147,7 @@ tasks.create("cfPublish", net.darkhax.curseforgegradle.TaskPublishCurseForge::cl
         else ""
     apiToken = token
 
-    val jar = file("build/libs/${base.archivesName.get() + "-neoforge"}-${project.version}.jar")
+    val jar = file("build/libs/${base.archivesName.get()}-${project.version}.jar")
 
     // The main file to upload
     val mainFile = upload(projectId, jar)
@@ -157,6 +157,6 @@ tasks.create("cfPublish", net.darkhax.curseforgegradle.TaskPublishCurseForge::cl
     mainFile.addEmbedded("kotlin-for-forge")
     mainFile.addEmbedded("realyusufismail-core")
     mainFile.addJavaVersion("Java 17")
-    mainFile.addModLoader("forge", "NeoForge") // Remove after 1.20.1
+    mainFile.addModLoader("NeoForge")
     mainFile.addGameVersion(mcVersion)
 }
diff --git a/neoforge/gradle.properties b/neoforge/gradle.properties
@@ -2,9 +2,10 @@ kotlin.code.style=official
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-modVersion = 1.20.1-1.0.7.beta1
+modVersion = 1.20.1-1.0.7.beta2
 mcVersion = 1.20.1
 projectId = 480779
+modId = armourandtoolsmod
 
 neoForgeVersion = 47.1.76
 kotlinForForgeVersion = 4.4.0