refactor: remove WorldEdit compatibility

MineInAbyss · Sep 9, 2024 · 29c0c0b · 29c0c0b
1 parent af436ad
commit 29c0c0b
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 141 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -81,11 +81,6 @@ paper {
             load = PaperPluginDescription.RelativeLoadOrder.BEFORE
             joinClasspath = true
         }
-        register("FastAsyncWorldEdit") {
-            required = false
-            load = PaperPluginDescription.RelativeLoadOrder.BEFORE
-            joinClasspath = true
-        }
         register("ModelEngine") {
             required = false
             load = PaperPluginDescription.RelativeLoadOrder.BEFORE

diff --git a/src/main/kotlin/com/mineinabyss/blocky/BlockyConfig.kt b/src/main/kotlin/com/mineinabyss/blocky/BlockyConfig.kt
@@ -53,10 +53,7 @@ data class BlockyConfig(
     @Serializable data class BlockyDoorConfig(val isEnabled: Boolean = false)
     @Serializable data class BlockyTrapDoorConfig(val isEnabled: Boolean = false)
     @Serializable data class BlockyGrateConfig(val isEnabled: Boolean = false)
-    @Serializable data class BlockyFurnitureConfig(
-        val hitboxOutlines: HitboxOutline = HitboxOutline(),
-        val worldEdit: Boolean = false
-    ) {
+    @Serializable data class BlockyFurnitureConfig(val hitboxOutlines: HitboxOutline = HitboxOutline()) {
         @Transient val showOutlines = hitboxOutlines.type != FurnitureOutlineType.NONE
 
         @Serializable

diff --git a/src/main/kotlin/com/mineinabyss/blocky/BlockyPlugin.kt b/src/main/kotlin/com/mineinabyss/blocky/BlockyPlugin.kt
@@ -2,8 +2,6 @@ package com.mineinabyss.blocky
 
 import com.jeff_media.customblockdata.CustomBlockData
 import com.mineinabyss.blocky.assets_generation.ResourcepackGeneration
-import com.mineinabyss.blocky.compatibility.worldedit.WorldEditListener
-import com.mineinabyss.blocky.compatibility.worldedit.WorldEditSupport
 import com.mineinabyss.blocky.listeners.*
 import com.mineinabyss.blocky.systems.*
 import com.mineinabyss.blocky.systems.actions.createFurnitureItemSetter
@@ -13,20 +11,14 @@ import com.mineinabyss.blocky.systems.actions.furnitureHitboxSetter
 import com.mineinabyss.geary.addons.GearyPhase
 import com.mineinabyss.geary.autoscan.autoscan
 import com.mineinabyss.geary.modules.geary
-import com.mineinabyss.geary.prefabs.PrefabKey
 import com.mineinabyss.geary.systems.builders.cache
 import com.mineinabyss.idofront.config.config
 import com.mineinabyss.idofront.di.DI
 import com.mineinabyss.idofront.messaging.observeLogger
-import com.mineinabyss.idofront.plugin.Plugins
 import com.mineinabyss.idofront.plugin.listeners
-import com.sk89q.worldedit.WorldEdit
 import io.papermc.paper.configuration.GlobalConfiguration
-import org.bukkit.block.data.BlockData
 import org.bukkit.plugin.java.JavaPlugin
 
-var prefabMap = mapOf<BlockData, PrefabKey>()
-
 class BlockyPlugin : JavaPlugin() {
 
     override fun onLoad() {
@@ -40,11 +32,6 @@ class BlockyPlugin : JavaPlugin() {
     override fun onEnable() {
         createBlockyContext()
 
-        if (Plugins.isEnabled("WorldEdit")) {
-            WorldEdit.getInstance().blockFactory.register(WorldEditSupport.BlockyInputParser())
-            listeners(WorldEditListener())
-        }
-
         BlockyBrigadierCommands.registerCommands()
         geary.pipeline.runOnOrAfter(GearyPhase.INIT_SYSTEMS) {
             geary.createFurnitureOutlineSystem()

diff --git a/src/main/kotlin/com/mineinabyss/blocky/compatibility/worldedit/WorldEditListener.kt b/src/main/kotlin/com/mineinabyss/blocky/compatibility/worldedit/WorldEditListener.kt
diff --git a/src/main/kotlin/com/mineinabyss/blocky/compatibility/worldedit/WorldEditSupport.kt b/src/main/kotlin/com/mineinabyss/blocky/compatibility/worldedit/WorldEditSupport.kt