New publishing system

CrypticVerse · Mar 16, 2024 · 0ab4174 · 0ab4174
1 parent 158cfae
commit 0ab4174
Show file tree

Hide file tree

Showing 14 changed files with 86 additions and 53 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,3 +25,4 @@
           env:
             MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
             CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -21,8 +21,9 @@
           uses: gradle/actions/setup-gradle@v3
 
         - name: Build and Publish
-          run: ./gradlew clean build modrinth curseforge --stacktrace
+          run: ./gradlew build publishMods --stacktrace
           env:
             MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
             CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
             MAVEN_URL: ${{ secrets.MAVEN_URL }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,4 @@
-This version brings bug fixes
+This version brings changes
 
 #### Forge and Fabric
-##### The bug fix update lol
-- Color is now fixed in Maple Forest
-- Particles of maple signs now render correctly (Fix #12)
-- Oak Signs drop themselves, not maple signs (Fix #12)
-- Fixed hardness of maple leaves
-- Bump minor version to x.x.5.0
+- New publishing system
diff --git a/build.gradle b/build.gradle
@@ -1,10 +1,8 @@
-import net.darkhax.curseforgegradle.TaskPublishCurseForge
 plugins {
     id 'fabric-loom' version '1.5.+'
     id 'maven-publish'
-    id 'com.modrinth.minotaur' version '2.+'
-    id 'net.darkhax.curseforgegradle' version '1.1.18'
     id 'com.diffplug.spotless' version '6.25.0'
+    id 'me.modmuss50.mod-publish-plugin' version '0.5.1'
     id 'signing'
 }
 
@@ -51,38 +49,30 @@ spotless {
     }
 
 }
-modrinth {
-    token = System.getenv("MODRINTH_TOKEN")
-    projectId = "Qs2o8KiI"
-    versionNumber = "fabric-${mod_version}"
-    versionName = "Better Biomes Fabric ${mod_name}"
-    versionType = "beta"
-    uploadFile = remapJar
-    gameVersions = ["1.20.4"]
-    loaders = ["fabric", "quilt"]
-    changelog = project.file("CHANGELOG.md").text
-    dependencies {
-        required.project "fabric-api"
-        required.project "terrablender"
-        required.project "notebook-api"
-        optional.project "rei"
+publishMods {
+    file = remapJar.archiveFile
+    changelog = rootProject.file("CHANGELOG.md").text
+    type = BETA
+    displayName = "Better Biomes Fabric ${mod_name}"
+    modLoaders.add("fabric")
+    modLoaders.add("quilt")
+
+    modrinth {
+        accessToken = System.getenv("MODRINTH_TOKEN")
+        projectId = "Qs2o8KiI"
+        minecraftVersions.add(minecraft_version)
+    }
+    curseforge {
+        accessToken = System.getenv("CURSEFORGE_TOKEN")
+        projectId = "938715"
+        minecraftVersions.add(minecraft_version)
+    }
+    github {
+        accessToken = System.getenv("GITHUB_TOKEN")
+        repository = "CrypticVerse/BetterBiomes"
+        commitish = "2.x-1.20.4"
+        tagName = "fabric-${mod_name}"
     }
-}
-task curseforge(type: TaskPublishCurseForge) {
-    apiToken = System.getenv("CURSEFORGE_TOKEN")
-
-    def mainFile = upload(938715, remapJar)
-    mainFile.releaseType = 'beta'
-    mainFile.displayName = "Better Biomes Fabric ${mod_name}"
-    mainFile.addGameVersion("1.20.4")
-    mainFile.addModLoader("Quilt")
-    mainFile.addJavaVersion("Java 17")
-    mainFile.changelog = project.file("CHANGELOG.md").text
-    mainFile.changelogType = 'markdown'
-    mainFile.addRequirement("fabric-api")
-    mainFile.addRequirement("terrablender-fabric")
-    mainFile.addRequirement("notebook-api")
-    mainFile.addOptional("roughly-enough-items")
 }
 loom {
     accessWidenerPath = file("src/main/resources/betterbiomes.accesswidener")

diff --git a/gradle.properties b/gradle.properties
@@ -13,7 +13,7 @@ terraform_wood_api_version=9.0.0
 notebook_version=1.1.10+1.20.4
 
 # Mod Properties
-mod_version=2.1.5.0-1.20.4
-mod_name=2.1.5.0
+mod_version=2.1.5.1-1.20.4
+mod_name=2.1.5.1
 maven_group=net.crypticverse.betterbiomes
 archives_base_name=betterbiomes-fabric
diff --git a/src/main/resources/assets/betterbiomes/lang/en_AU.json b/src/main/resources/assets/betterbiomes/lang/en_AU.json
@@ -33,5 +33,10 @@
   "item.betterbiomes.maple_pancake_stack": "Maple Pancake Stack",
   "item.betterbiomes.chocolate_pancake": "Chocolate Pancake",
   "item.betterbiomes.chocolate_pancake_stack": "Chocolate Pancake Stack",
-  "itemgroup.betterbiomes": "Better Biomes Group"
+  "itemgroup.betterbiomes": "Better Biomes Group",
+  "_comment": "For forge things",
+  "block.betterbiomes.maple_sign": "Maple Sign",
+  "creativetab.biome_group": "Better Biomes Group",
+  "entity.betterbiomes.mod_chest_boat": "Chest Boat",
+  "biome.betterbiomes.maple_forest": "Maple Forest"
 }
diff --git a/src/main/resources/assets/betterbiomes/lang/en_GB.json b/src/main/resources/assets/betterbiomes/lang/en_GB.json
@@ -33,5 +33,10 @@
   "item.betterbiomes.maple_pancake_stack": "Maple Pancake Stack",
   "item.betterbiomes.chocolate_pancake": "Chocolate Pancake",
   "item.betterbiomes.chocolate_pancake_stack": "Chocolate Pancake Stack",
-  "itemgroup.betterbiomes": "Better Biomes Group"
+  "itemgroup.betterbiomes": "Better Biomes Group",
+  "_comment": "For forge things",
+  "block.betterbiomes.maple_sign": "Maple Sign",
+  "creativetab.biome_group": "Better Biomes Group",
+  "entity.betterbiomes.mod_chest_boat": "Chest Boat",
+  "biome.betterbiomes.maple_forest": "Maple Forest"
 }
diff --git a/src/main/resources/assets/betterbiomes/lang/en_PT.json b/src/main/resources/assets/betterbiomes/lang/en_PT.json
@@ -33,5 +33,10 @@
   "item.betterbiomes.maple_pancake_stack": "Maple Pancake Stack",
   "item.betterbiomes.chocolate_pancake": "Chocolate Pancake",
   "item.betterbiomes.chocolate_pancake_stack": "Chocolate Pancake Stack",
-  "itemgroup.betterbiomes": "Better Biomes Group"
+  "itemgroup.betterbiomes": "Better Biomes Group",
+  "_comment": "For forge things",
+  "block.betterbiomes.maple_sign": "Maple Sign",
+  "creativetab.biome_group": "Better Biomes Group",
+  "entity.betterbiomes.mod_chest_boat": "Chest Boat",
+  "biome.betterbiomes.maple_forest": "Maple Forest"
 }
diff --git a/src/main/resources/assets/betterbiomes/lang/en_UD.json b/src/main/resources/assets/betterbiomes/lang/en_UD.json
@@ -33,5 +33,10 @@
   "item.betterbiomes.maple_pancake_stack": "Maple Pancake Stack",
   "item.betterbiomes.chocolate_pancake": "Chocolate Pancake",
   "item.betterbiomes.chocolate_pancake_stack": "Chocolate Pancake Stack",
-  "itemgroup.betterbiomes": "Better Biomes Group"
+  "itemgroup.betterbiomes": "Better Biomes Group",
+  "_comment": "For forge things",
+  "block.betterbiomes.maple_sign": "Maple Sign",
+  "creativetab.biome_group": "Better Biomes Group",
+  "entity.betterbiomes.mod_chest_boat": "Chest Boat",
+  "biome.betterbiomes.maple_forest": "Maple Forest"
 }
diff --git a/src/main/resources/assets/betterbiomes/lang/en_us.json b/src/main/resources/assets/betterbiomes/lang/en_us.json
@@ -35,5 +35,11 @@
   "item.betterbiomes.maple_pancake_stack": "Maple Pancake Stack",
   "item.betterbiomes.chocolate_pancake": "Chocolate Pancake",
   "item.betterbiomes.chocolate_pancake_stack": "Chocolate Pancake Stack",
-  "itemgroup.betterbiomes": "Better Biomes Group"
+  "itemgroup.betterbiomes": "Better Biomes Group",
+
+  "_comment": "For forge things",
+  "block.betterbiomes.maple_sign": "Maple Sign",
+  "creativetab.biome_group": "Better Biomes Group",
+  "entity.betterbiomes.mod_chest_boat": "Chest Boat",
+  "biome.betterbiomes.maple_forest": "Maple Forest"
 }
diff --git a/src/main/resources/assets/betterbiomes/lang/es_ES.json b/src/main/resources/assets/betterbiomes/lang/es_ES.json
@@ -33,5 +33,10 @@
   "item.betterbiomes.maple_pancake_stack": "Pila de panqueques de arce",
   "item.betterbiomes.chocolate_pancake": "Tortitas de chocolate",
   "item.betterbiomes.chocolate_pancake_stack": "Pila de panqueques de chocolate",
-  "itemgroup.betterbiomes": "Mejor Grupo de Biomas"
+  "itemgroup.betterbiomes": "Mejor Grupo de Biomas",
+  "_comment": "For forge things",
+  "block.betterbiomes.maple_sign": "Maple Sign",
+  "creativetab.biome_group": "Better Biomes Group",
+  "entity.betterbiomes.mod_chest_boat": "Chest Boat",
+  "biome.betterbiomes.maple_forest": "Maple Forest"
 }
diff --git a/src/main/resources/assets/betterbiomes/lang/es_mx.json b/src/main/resources/assets/betterbiomes/lang/es_mx.json
@@ -33,5 +33,10 @@
   "item.betterbiomes.maple_pancake_stack": "Pila de panqueques de arce",
   "item.betterbiomes.chocolate_pancake": "Tortitas de chocolate",
   "item.betterbiomes.chocolate_pancake_stack": "Pila de panqueques de chocolate",
-  "itemgroup.betterbiomes": "Mejor Grupo de Biomas"
+  "itemgroup.betterbiomes": "Mejor Grupo de Biomas",
+  "_comment": "For forge things",
+  "block.betterbiomes.maple_sign": "Maple Sign",
+  "creativetab.biome_group": "Better Biomes Group",
+  "entity.betterbiomes.mod_chest_boat": "Chest Boat",
+  "biome.betterbiomes.maple_forest": "Maple Forest"
 }
diff --git a/src/main/resources/assets/betterbiomes/lang/ru_ru.json b/src/main/resources/assets/betterbiomes/lang/ru_ru.json
@@ -33,5 +33,10 @@
   "item.betterbiomes.maple_pancake_stack": "Стопка кленовых блинов",
   "item.betterbiomes.chocolate_pancake": "Шоколадный блин",
   "item.betterbiomes.chocolate_pancake_stack": "Стопка шоколадных блинов",
-  "itemgroup.betterbiomes": "Группа лучших биомов"
+  "itemgroup.betterbiomes": "Группа лучших биомов",
+  "_comment": "For forge things",
+  "block.betterbiomes.maple_sign": "Maple Sign",
+  "creativetab.biome_group": "Better Biomes Group",
+  "entity.betterbiomes.mod_chest_boat": "Chest Boat",
+  "biome.betterbiomes.maple_forest": "Maple Forest"
 }
diff --git a/src/main/resources/assets/betterbiomes/lang/sr_SP.json b/src/main/resources/assets/betterbiomes/lang/sr_SP.json
@@ -33,5 +33,10 @@
   "item.betterbiomes.maple_pancake_stack": "Maple Pancake Stack",
   "item.betterbiomes.chocolate_pancake": "Chocolate Pancake",
   "item.betterbiomes.chocolate_pancake_stack": "Chocolate Pancake Stack",
-  "itemgroup.betterbiomes": "Better Biomes Group"
+  "itemgroup.betterbiomes": "Better Biomes Group",
+  "_comment": "For forge things",
+  "block.betterbiomes.maple_sign": "Maple Sign",
+  "creativetab.biome_group": "Better Biomes Group",
+  "entity.betterbiomes.mod_chest_boat": "Chest Boat",
+  "biome.betterbiomes.maple_forest": "Maple Forest"
 }