Skip to content
This repository has been archived by the owner on May 27, 2024. It is now read-only.

Commit

Permalink
deps: Update to stable geary, idofront
Browse files Browse the repository at this point in the history
chore: Use idofront logging api
chore: Update publish action
  • Loading branch information
0ffz committed Mar 16, 2024
1 parent ce92b34 commit 7e4ea56
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
group=com.mineinabyss
version=0.13
idofrontVersion=0.22.3
idofrontVersion=0.23.0
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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" }
2 changes: 2 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand All @@ -14,6 +15,7 @@ dependencyResolutionManagement {

repositories {
maven("https://repo.mineinabyss.com/releases")
maven("https://repo.mineinabyss.com/snapshots")
mavenLocal()
}

Expand Down
2 changes: 2 additions & 0 deletions src/main/kotlin/com/mineinabyss/looty/config/LootyModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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>()
Expand All @@ -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()
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -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}")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

0 comments on commit 7e4ea56

Please sign in to comment.