1.20.2

MineInAbyss · Oct 21, 2023 · 8fc816b · 8fc816b
1 parent 4be42d7
commit 8fc816b
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 27 deletions.
diff --git a/.github/workflows/gradle-ci.yml → .github/workflows/build.yml b/.github/workflows/gradle-ci.yml → .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 → .github/workflows/publish.yml b/.github/workflows/publish-packages.yml → .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
@@ -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
@@ -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
@@ -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
@@ -9,6 +9,6 @@ val looty by DI.observe<LootyModule>()
 class LootyModule(
     val plugin: LootyPlugin
 ) {
-    val configController = config<LootyConfig>("config") { plugin.fromPluginPath(loadDefault = true) }
+    val configController = config<LootyConfig>("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
@@ -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
@@ -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