From 8bfbacb7ba25d52baf868339c4f40e9ee733d100 Mon Sep 17 00:00:00 2001 From: Boy0000 Date: Sat, 21 Oct 2023 12:42:04 +0200 Subject: [PATCH] 1.20.2 (#16) --- .../geary/papermc/GearyProductionPaperConfigModule.kt | 5 +---- .../geary/papermc/tracking/items/cache/PlayerItemCache.kt | 2 +- gradle.properties | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/geary-papermc-core/src/main/kotlin/com/mineinabyss/geary/papermc/GearyProductionPaperConfigModule.kt b/geary-papermc-core/src/main/kotlin/com/mineinabyss/geary/papermc/GearyProductionPaperConfigModule.kt index 727e8b6..7c0174f 100644 --- a/geary-papermc-core/src/main/kotlin/com/mineinabyss/geary/papermc/GearyProductionPaperConfigModule.kt +++ b/geary-papermc-core/src/main/kotlin/com/mineinabyss/geary/papermc/GearyProductionPaperConfigModule.kt @@ -6,10 +6,7 @@ import org.bukkit.plugin.java.JavaPlugin class GearyProductionPaperConfigModule( override val plugin: JavaPlugin, ) : GearyPaperConfigModule { - override val configHolder = config("config") { - plugin.fromPluginPath() - mergeUpdates = true - } + override val configHolder = config("config", plugin.dataFolder.toPath(), GearyPaperConfig(), mergeUpdates = true) override val config: GearyPaperConfig by configHolder } diff --git a/geary-papermc-tracking/src/main/kotlin/com/mineinabyss/geary/papermc/tracking/items/cache/PlayerItemCache.kt b/geary-papermc-tracking/src/main/kotlin/com/mineinabyss/geary/papermc/tracking/items/cache/PlayerItemCache.kt index cff30d3..933f519 100644 --- a/geary-papermc-tracking/src/main/kotlin/com/mineinabyss/geary/papermc/tracking/items/cache/PlayerItemCache.kt +++ b/geary-papermc-tracking/src/main/kotlin/com/mineinabyss/geary/papermc/tracking/items/cache/PlayerItemCache.kt @@ -7,7 +7,7 @@ import com.mineinabyss.geary.papermc.datastore.encodeComponentsTo import com.mineinabyss.geary.papermc.tracking.items.cache.ItemInfo.EntityEncoded import com.mineinabyss.geary.prefabs.PrefabKey import com.mineinabyss.geary.prefabs.helpers.prefabs -import com.soywiz.kds.iterators.fastForEachWithIndex +import korlibs.datastructure.iterators.fastForEachWithIndex import org.bukkit.inventory.ItemStack abstract class PlayerItemCache( diff --git a/gradle.properties b/gradle.properties index dd19d6e..49d9fa9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ kotlin.code.style=official group=com.mineinabyss -version=0.25 -idofrontVersion=0.18.26 +version=0.26 +idofrontVersion=0.19.14 gearyVersion=0.23-SNAPSHOT diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ed4fda0..f15f2ee 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ 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 networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists