From 7e4ea562786c667d986f89d8e481c152c6cfc378 Mon Sep 17 00:00:00 2001
From: Danielle Voznyy <dan.voznyy@gmail.com>
Date: Sat, 16 Mar 2024 15:20:13 -0400
Subject: [PATCH] deps: Update to stable geary, idofront chore: Use idofront
 logging api chore: Update publish action

---
 .github/workflows/publish.yml                             | 8 ++++----
 gradle.properties                                         | 2 +-
 gradle/libs.versions.toml                                 | 2 +-
 settings.gradle.kts                                       | 2 ++
 .../kotlin/com/mineinabyss/looty/config/LootyModule.kt    | 2 ++
 .../mineinabyss/looty/features/recipes/ItemRecipeQuery.kt | 4 ++--
 .../looty/features/recipes/PotionMixRecipeSystem.kt       | 2 +-
 7 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index a54bbf9..ff94973 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -12,14 +12,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
-      - uses: MineInAbyss/publish-action@master
+      - uses: MineInAbyss/publish-action@develop
         with:
           maven-metadata-url: https://repo.mineinabyss.com/releases/com/mineinabyss/looty/maven-metadata.xml
           maven-snapshot-metadata-url: https://repo.mineinabyss.com/snapshots/com/mineinabyss/looty/maven-metadata.xml
-#          pages-path: build/dokka/htmlMultiModule/
-#          dokka: dokkaHtmlMultiModule
           maven-username: ${{ secrets.MAVEN_PUBLISH_USERNAME }}
           maven-password: ${{ secrets.MAVEN_PUBLISH_PASSWORD }}
           release-files: |
diff --git a/gradle.properties b/gradle.properties
index 14af0d9..8f69643 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 group=com.mineinabyss
 version=0.13
-idofrontVersion=0.22.3
+idofrontVersion=0.23.0
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 47eb2ca..7a8be85 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-gearyPaper = "0.29.12-dev.3"
+gearyPaper = "0.30.0"
 
 [libraries]
 geary-papermc = { module = "com.mineinabyss:geary-papermc", version.ref = "gearyPaper" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2e7ad31..95b9bed 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -4,6 +4,7 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
         maven("https://repo.mineinabyss.com/releases")
+        maven("https://repo.mineinabyss.com/snapshots")
         maven("https://repo.papermc.io/repository/maven-public/")
         mavenLocal()
     }
@@ -14,6 +15,7 @@ dependencyResolutionManagement {
 
     repositories {
         maven("https://repo.mineinabyss.com/releases")
+        maven("https://repo.mineinabyss.com/snapshots")
         mavenLocal()
     }
 
diff --git a/src/main/kotlin/com/mineinabyss/looty/config/LootyModule.kt b/src/main/kotlin/com/mineinabyss/looty/config/LootyModule.kt
index da05d57..ba7ab94 100644
--- a/src/main/kotlin/com/mineinabyss/looty/config/LootyModule.kt
+++ b/src/main/kotlin/com/mineinabyss/looty/config/LootyModule.kt
@@ -2,6 +2,7 @@ package com.mineinabyss.looty.config
 
 import com.mineinabyss.idofront.config.config
 import com.mineinabyss.idofront.di.DI
+import com.mineinabyss.idofront.messaging.observeLogger
 import com.mineinabyss.looty.LootyPlugin
 
 val looty by DI.observe<LootyModule>()
@@ -11,4 +12,5 @@ class LootyModule(
 ) {
     val configController = config<LootyConfig>("config", plugin.dataFolder.toPath(), LootyConfig())
     val config: LootyConfig by configController
+    val logger by plugin.observeLogger()
 }
diff --git a/src/main/kotlin/com/mineinabyss/looty/features/recipes/ItemRecipeQuery.kt b/src/main/kotlin/com/mineinabyss/looty/features/recipes/ItemRecipeQuery.kt
index 414e1c4..15c75fb 100644
--- a/src/main/kotlin/com/mineinabyss/looty/features/recipes/ItemRecipeQuery.kt
+++ b/src/main/kotlin/com/mineinabyss/looty/features/recipes/ItemRecipeQuery.kt
@@ -25,7 +25,7 @@ fun CachedQueryRunner<ItemRecipeQuery>.registerRecipes(): Set<NamespacedKey> {
             .getOrNull()
 
         if (result == null) {
-            looty.plugin.logger.warning("Recipe ${prefabKey.key} is missing result item")
+            looty.logger.w("Recipe ${prefabKey.key} is missing result item")
             return@forEach
         }
 
@@ -42,7 +42,7 @@ fun CachedQueryRunner<ItemRecipeQuery>.registerRecipes(): Set<NamespacedKey> {
                 Bukkit.getRecipe(key) ?: recipe.toRecipe(key, result, recipes.group).register()
                 if (recipes.discoverRecipes) discoveredRecipes += key
             }.onFailure {
-                looty.plugin.logger.warning("Failed to register recipe ${prefabKey.key} #$i, ${it.message}")
+                looty.logger.w("Failed to register recipe ${prefabKey.key} #$i, ${it.message}")
             }
         }
     }
diff --git a/src/main/kotlin/com/mineinabyss/looty/features/recipes/PotionMixRecipeSystem.kt b/src/main/kotlin/com/mineinabyss/looty/features/recipes/PotionMixRecipeSystem.kt
index eeafacf..229bf7f 100644
--- a/src/main/kotlin/com/mineinabyss/looty/features/recipes/PotionMixRecipeSystem.kt
+++ b/src/main/kotlin/com/mineinabyss/looty/features/recipes/PotionMixRecipeSystem.kt
@@ -28,5 +28,5 @@ fun GearyModule.createPotionMixRecipeSystem() = listener(
             looty.plugin.server.potionBrewer.removePotionMix(key)
             looty.plugin.server.potionBrewer.addPotionMix(potionmix.toPotionMix(key, result))
         }
-    } else looty.plugin.logger.warning("PotionMix $prefabKey is missing result item")
+    } else looty.logger.w("PotionMix $prefabKey is missing result item")
 }