From 2ca76d8156bf5d6c7e475d83a2670b203e82091e Mon Sep 17 00:00:00 2001 From: Will FP Date: Sat, 6 Jan 2024 09:13:55 +0000 Subject: [PATCH] Merge conflicts --- .../kotlin/com/willfp/libreforge/slot/ItemHolderFinder.kt | 1 - core/src/main/kotlin/com/willfp/libreforge/slot/SlotType.kt | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/main/kotlin/com/willfp/libreforge/slot/ItemHolderFinder.kt b/core/src/main/kotlin/com/willfp/libreforge/slot/ItemHolderFinder.kt index 53b29217..a39aecf8 100644 --- a/core/src/main/kotlin/com/willfp/libreforge/slot/ItemHolderFinder.kt +++ b/core/src/main/kotlin/com/willfp/libreforge/slot/ItemHolderFinder.kt @@ -4,7 +4,6 @@ import com.willfp.libreforge.Dispatcher import com.willfp.libreforge.Holder import com.willfp.libreforge.HolderProvider import com.willfp.libreforge.ItemProvidedHolder -import com.willfp.libreforge.ProvidedHolder import com.willfp.libreforge.TypedHolderProvider import com.willfp.libreforge.TypedProvidedHolder import com.willfp.libreforge.get diff --git a/core/src/main/kotlin/com/willfp/libreforge/slot/SlotType.kt b/core/src/main/kotlin/com/willfp/libreforge/slot/SlotType.kt index 08ddbaaa..c8ceec63 100644 --- a/core/src/main/kotlin/com/willfp/libreforge/slot/SlotType.kt +++ b/core/src/main/kotlin/com/willfp/libreforge/slot/SlotType.kt @@ -18,6 +18,11 @@ abstract class SlotType( */ abstract fun getItems(entity: LivingEntity): List + /** + * Exists for backwards compatibility. + */ + fun getItems(player: Player) = getItems(player as LivingEntity) + /** * Get the slots that this slot type uses. */