From 8fc816b1ab0958503084fc32c72f16165db05fa5 Mon Sep 17 00:00:00 2001 From: Boy Date: Sat, 21 Oct 2023 14:19:18 +0200 Subject: [PATCH] 1.20.2 --- .../workflows/{gradle-ci.yml => build.yml} | 2 +- .../{publish-packages.yml => publish.yml} | 22 +++---------------- gradle.properties | 4 ++-- gradle/myLibs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../mineinabyss/looty/config/LootyModule.kt | 2 +- .../looty/features/recipes/ItemRecipes.kt | 2 +- .../features/wearables/WearableItemSystem.kt | 2 +- 8 files changed, 11 insertions(+), 27 deletions(-) rename .github/workflows/{gradle-ci.yml => build.yml} (93%) rename .github/workflows/{publish-packages.yml => publish.yml} (52%) diff --git a/.github/workflows/gradle-ci.yml b/.github/workflows/build.yml similarity index 93% rename from .github/workflows/gradle-ci.yml rename to .github/workflows/build.yml index 5cf235f..c206874 100644 --- a/.github/workflows/gradle-ci.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Java CI with Gradle +name: Build on: pull_request: diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish.yml similarity index 52% rename from .github/workflows/publish-packages.yml rename to .github/workflows/publish.yml index 413b174..3922ff0 100644 --- a/.github/workflows/publish-packages.yml +++ b/.github/workflows/publish.yml @@ -1,4 +1,4 @@ -name: Publish Packages +name: Publish on: push: @@ -11,31 +11,15 @@ on: jobs: build: runs-on: ubuntu-latest - steps: - uses: actions/checkout@v3 - uses: MineInAbyss/publish-action@master with: maven-metadata-url: https://repo.mineinabyss.com/releases/com/mineinabyss/looty/maven-metadata.xml - # pages-path: build/dokka/htmlMultiModule/ - # dokka: dokkaHtmlMultiModule + pages-path: build/dokka/htmlMultiModule/ + dokka: dokkaHtmlMultiModule maven-username: ${{ secrets.MAVEN_PUBLISH_USERNAME }} maven-password: ${{ secrets.MAVEN_PUBLISH_PASSWORD }} release-files: | ${{ github.workspace }}/publish/*.jar - - # deploy: - # permissions: - # pages: write - # id-token: write - # environment: - # name: github-pages - # url: ${{ steps.deployment.outputs.page_url }} - # if: ${{ github.ref == 'refs/heads/master' }} - # runs-on: ubuntu-latest - # needs: build - # steps: - # - name: Deploy to GitHub Pages - # id: deployment - # uses: actions/deploy-pages@v1 diff --git a/gradle.properties b/gradle.properties index 6942c80..1fcbce0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ group=com.mineinabyss -version=0.11 -idofrontVersion=0.18.26 +version=0.12 +idofrontVersion=0.19.14 diff --git a/gradle/myLibs.versions.toml b/gradle/myLibs.versions.toml index aae56ae..1f91156 100644 --- a/gradle/myLibs.versions.toml +++ b/gradle/myLibs.versions.toml @@ -1,5 +1,5 @@ [versions] -gearyPaper = "0.25-SNAPSHOT" +gearyPaper = "0.26.0" [libraries] geary-papermc = { module = "com.mineinabyss:geary-papermc", version.ref = "gearyPaper" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fae0804..e411586 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/kotlin/com/mineinabyss/looty/config/LootyModule.kt b/src/main/kotlin/com/mineinabyss/looty/config/LootyModule.kt index 7a77a96..da05d57 100644 --- a/src/main/kotlin/com/mineinabyss/looty/config/LootyModule.kt +++ b/src/main/kotlin/com/mineinabyss/looty/config/LootyModule.kt @@ -9,6 +9,6 @@ val looty by DI.observe() class LootyModule( val plugin: LootyPlugin ) { - val configController = config("config") { plugin.fromPluginPath(loadDefault = true) } + val configController = config("config", plugin.dataFolder.toPath(), LootyConfig()) val config: LootyConfig by configController } diff --git a/src/main/kotlin/com/mineinabyss/looty/features/recipes/ItemRecipes.kt b/src/main/kotlin/com/mineinabyss/looty/features/recipes/ItemRecipes.kt index 1464a08..a1bace5 100644 --- a/src/main/kotlin/com/mineinabyss/looty/features/recipes/ItemRecipes.kt +++ b/src/main/kotlin/com/mineinabyss/looty/features/recipes/ItemRecipes.kt @@ -15,7 +15,7 @@ interface ItemRecipes { } override fun ItemRecipes.install() { - geary.pipeline.intercept(GearyPhase.ENABLE) { + geary.pipeline.runOnOrAfter(GearyPhase.ENABLE) { val autoDiscoveredRecipes = query.registerRecipes() gearyPaper.plugin.listeners( diff --git a/src/main/kotlin/com/mineinabyss/looty/features/wearables/WearableItemSystem.kt b/src/main/kotlin/com/mineinabyss/looty/features/wearables/WearableItemSystem.kt index 3bf529a..ef58eeb 100644 --- a/src/main/kotlin/com/mineinabyss/looty/features/wearables/WearableItemSystem.kt +++ b/src/main/kotlin/com/mineinabyss/looty/features/wearables/WearableItemSystem.kt @@ -3,7 +3,7 @@ package com.mineinabyss.looty.features.wearables import com.mineinabyss.geary.helpers.with import com.mineinabyss.geary.papermc.tracking.items.inventory.toGeary import com.mineinabyss.idofront.entities.rightClicked -import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftInventoryCrafting +import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftInventoryCrafting import org.bukkit.entity.ArmorStand import org.bukkit.entity.EntityType import org.bukkit.entity.Player