Update to Nova 0.14

.github/workflows/ci.yml

@@ -12,22 +12,30 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set Up JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 17
           distribution: adopt
 
-      - name: Run BuildTools
-        run: . .github/scripts/buildtools.sh
-
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
+        with:
+          cache-disabled: true
 
       - name: Build Spigot-Mapped
-        run: ./gradlew clean addonJar "-DoutDir=artifacts/"
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: |
+            addonJar
+            -PoutDir=artifacts
+            -PxenondevsNms
+            --scan
+        env:
+          ORG_GRADLE_PROJECT_xenondevsNmsUsername: ${{ secrets.XENONDEVS_NMS_USERNAME }}
+          ORG_GRADLE_PROJECT_xenondevsNmsPassword: ${{ secrets.XENONDEVS_NMS_PASSWORD }}
 
       - name: Upload Artifacts
         id: upload
@@ -36,10 +44,10 @@ jobs:
           name: Artifacts
           path: ./artifacts/*.jar
 
-      - name: Publish Artifacts
+      - name: Attach Artifacts to Release
         if: github.event_name == 'release'
         uses: skx/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          args: ./artifacts/*.jar
+          args: ./artifacts/*.jar

build.gradle.kts

@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 group = "xyz.xenondevs"
-version = "1.1"
+version = "1.2-RC.1"
 
 val mojangMapped = project.hasProperty("mojang-mapped")
 
@@ -13,9 +13,19 @@ plugins {
 }
 
 repositories {
+    mavenLocal()
     mavenCentral()
     maven("https://repo.xenondevs.xyz/releases")
-    mavenLocal { content { includeGroup("org.spigotmc") } }
+
+    // include xenondevs-nms repository if requested
+    if (project.hasProperty("xenondevsNms")) {
+        maven("https://repo.papermc.io/repository/maven-public/") // authlib, brigadier, etc.
+        maven {
+            name = "xenondevsNms"
+            url = uri("https://repo.xenondevs.xyz/nms/")
+            credentials(PasswordCredentials::class)
+        }
+    }
 }
 
 dependencies {
@@ -30,7 +40,6 @@ addon {
     main.set("xyz.xenondevs.vanillahammers.VanillaHammers")
 
     authors.add("StudioCode")
-    // TODO: spigot resource id
 }
 
 spigotRemap {

settings.gradle.kts

@@ -3,8 +3,8 @@ rootProject.name = "vanilla_hammers"
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
-            version("nova", "0.13")
-            version("spigot", "1.19.4-R0.1-SNAPSHOT")
+            version("nova", "0.14-alpha.1")
+            version("spigot", "1.20-R0.1-SNAPSHOT")
             version("kotlin", "1.8.20")
 
             plugin("kotlin", "org.jetbrains.kotlin.jvm").versionRef("kotlin")
@@ -19,8 +19,21 @@ dependencyResolutionManagement {
 
 pluginManagement {
     repositories {
+        mavenLocal()
         mavenCentral()
+        gradlePluginPortal()
         maven("https://repo.xenondevs.xyz/releases")
-        mavenLocal { content { includeGroup("org.spigotmc") } }
+        maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") // for nova-gradle-plugin
+    }
+}
+
+plugins {
+    id("com.gradle.enterprise") version "3.13"
+}
+
+gradleEnterprise {
+    buildScan {
+        termsOfServiceUrl = "https://gradle.com/terms-of-service"
+        termsOfServiceAgree = "yes"
     }
 }

src/main/kotlin/xyz/xenondevs/vanillahammers/VanillaHammers.kt

@@ -1,8 +1,13 @@
 package xyz.xenondevs.vanillahammers
 
 import xyz.xenondevs.nova.addon.Addon
+import xyz.xenondevs.nova.update.ProjectDistributor
 import xyz.xenondevs.vanillahammers.advancement.Advancements
 import xyz.xenondevs.vanillahammers.registry.Items
 import xyz.xenondevs.vanillahammers.registry.ToolTiers
 
-object VanillaHammers : Addon()
+object VanillaHammers : Addon() {
+
+    override val projectDistributors = listOf(ProjectDistributor.hangar("xenondevs/Vanilla-Hammers"))
+
+}

src/main/resources/recipes/minecraft/smithing/netherite_hammer.json → src/main/resources/recipes/minecraft/smithing_transform/netherite_hammer.json

@@ -1,4 +1,5 @@
 {
+  "template": "minecraft:netherite_upgrade_smithing_template",
   "base": "vanilla_hammers:diamond_hammer",
   "addition": "minecraft:netherite_ingot",
   "result": "vanilla_hammers:netherite_hammer"