From 723cab0be4771f5a9265c090969ca31ae47e83de Mon Sep 17 00:00:00 2001 From: Danielle Voznyy Date: Sun, 21 Jan 2024 20:00:45 -0500 Subject: [PATCH] Fix woopsie in versions.toml --- gradle/myLibs.versions.toml | 2 +- .../looty/features/recipes/RecipeCraftingSystem.kt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gradle/myLibs.versions.toml b/gradle/myLibs.versions.toml index a3b121a..3f003fb 100644 --- a/gradle/myLibs.versions.toml +++ b/gradle/myLibs.versions.toml @@ -1,5 +1,5 @@ [versions] -gearyPaper = 0.29.0 +gearyPaper = "0.29.0" [libraries] geary-papermc = { module = "com.mineinabyss:geary-papermc", version.ref = "gearyPaper" } diff --git a/src/main/kotlin/com/mineinabyss/looty/features/recipes/RecipeCraftingSystem.kt b/src/main/kotlin/com/mineinabyss/looty/features/recipes/RecipeCraftingSystem.kt index ecd8932..52ea293 100644 --- a/src/main/kotlin/com/mineinabyss/looty/features/recipes/RecipeCraftingSystem.kt +++ b/src/main/kotlin/com/mineinabyss/looty/features/recipes/RecipeCraftingSystem.kt @@ -8,6 +8,7 @@ import com.mineinabyss.idofront.items.editItemMeta import com.mineinabyss.idofront.messaging.broadcast import com.mineinabyss.idofront.messaging.broadcastVal import com.mineinabyss.idofront.nms.nbt.fastPDC +import com.mineinabyss.idofront.serialization.BaseSerializableItemStack import com.mineinabyss.idofront.serialization.SerializableItemStack import com.mineinabyss.idofront.serialization.toSerializable import org.bukkit.Bukkit @@ -62,13 +63,13 @@ class RecipeCraftingSystem : Listener { val inputGearyEntity = equipment.fastPDC?.decodePrefabs()?.firstOrNull() ?: return val smithingTransformRecipes = Bukkit.recipeIterator().asSequence().filter { (it as? SmithingTransformRecipe)?.result?.fastPDC?.hasComponentsEncoded == true }.filterIsInstance() val customRecipeResult = smithingTransformRecipes.filter { it.template.test(template) && it.addition.test(mineral) && it.base.itemStack.itemMeta?.persistentDataContainer?.decodePrefabs()?.firstOrNull() == inputGearyEntity }.firstOrNull()?.result - var recipeResultItem = (customRecipeResult ?: ItemStack.empty()).let { result?.toSerializable()?.toItemStack(it, EnumSet.of(SerializableItemStack.Properties.DISPLAY_NAME)) } + var recipeResultItem = (customRecipeResult ?: ItemStack.empty()).let { result?.toSerializable()?.toItemStack(it, EnumSet.of(BaseSerializableItemStack.Properties.DISPLAY_NAME)) } recipeResultItem = recipeResultItem?.editItemMeta { displayName( equipment.fastPDC?.decode()?.let { properties -> persistentDataContainer.encode(properties) - if (SerializableItemStack.Properties.DISPLAY_NAME in properties.ignore && result?.itemMeta?.hasDisplayName() == true) + if (BaseSerializableItemStack.Properties.DISPLAY_NAME in properties.ignore && result?.itemMeta?.hasDisplayName() == true) result?.itemMeta?.displayName()?.compact() else displayName()?.compact() } ?: displayName()?.compact()