From d78ac7dde50bcc212d72c8e2a458deccdc7deeb8 Mon Sep 17 00:00:00 2001
From: acrylic-style <me@acrylicstyle.xyz>
Date: Sun, 1 Sep 2024 20:43:07 +0900
Subject: [PATCH] fix: merge errors

---
 build.gradle.kts                                             | 2 +-
 .../java/com/github/mori01231/lifecore/block/CustomBlock.kt  | 5 +++--
 .../mori01231/lifecore/listener/CustomBlockListener.kt       | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 90bc762..d933b1d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -84,7 +84,7 @@ dependencies {
     paperweight.paperDevBundle("1.20.2-R0.1-SNAPSHOT")
 }
 
-paperweight.reobfArtifactConfiguration.set(ReobfArtifactConfiguration.REOBF_PRODUCTION)
+paperweight.reobfArtifactConfiguration.set(io.papermc.paperweight.userdev.ReobfArtifactConfiguration.REOBF_PRODUCTION)
 
 publishing {
     repositories {
diff --git a/src/main/java/com/github/mori01231/lifecore/block/CustomBlock.kt b/src/main/java/com/github/mori01231/lifecore/block/CustomBlock.kt
index 149a010..a03fbba 100644
--- a/src/main/java/com/github/mori01231/lifecore/block/CustomBlock.kt
+++ b/src/main/java/com/github/mori01231/lifecore/block/CustomBlock.kt
@@ -5,13 +5,14 @@ import com.github.mori01231.lifecore.util.AxisX
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
+import net.kyori.adventure.text.Component
+import net.minecraft.nbt.CompoundTag
 import org.bukkit.Material
-import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack
+import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack
 import org.bukkit.event.Listener
 import org.bukkit.event.block.BlockPlaceEvent
 import org.bukkit.event.player.PlayerInteractEvent
 import org.bukkit.inventory.ItemStack
-import kotlin.text.contains
 
 abstract class CustomBlock(
     val material: Material,
diff --git a/src/main/java/com/github/mori01231/lifecore/listener/CustomBlockListener.kt b/src/main/java/com/github/mori01231/lifecore/listener/CustomBlockListener.kt
index b504722..a814729 100644
--- a/src/main/java/com/github/mori01231/lifecore/listener/CustomBlockListener.kt
+++ b/src/main/java/com/github/mori01231/lifecore/listener/CustomBlockListener.kt
@@ -1,11 +1,12 @@
 package com.github.mori01231.lifecore.listener
 
 import com.github.mori01231.lifecore.LifeCore
+import net.kyori.adventure.text.Component
 import org.bukkit.GameMode
 import org.bukkit.Location
 import org.bukkit.Material
 import org.bukkit.Sound
-import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack
+import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack
 import org.bukkit.entity.Arrow
 import org.bukkit.entity.Player
 import org.bukkit.event.EventHandler