From efb3d4c1e9f9a2c86a008e90e414003813ed510f Mon Sep 17 00:00:00 2001 From: azur84 Date: Fri, 30 Oct 2026 18:44:47 +0100 Subject: [PATCH] Starting writing custom block placement --- build.gradle.kts | 15 ++++- gradle/libs.versions.toml | 6 ++ src/main/kotlin/fr/nextstation/unmei/Unmei.kt | 4 +- .../fr/nextstation/unmei/UnmeiBootstrap.kt | 55 +++++++++++++++++++ .../fr/nextstation/unmei/blocks/ChunksData.kt | 4 ++ .../unmei/blocks/ChunksDataManager.kt | 13 ++--- .../nextstation/unmei/blocks/CustomBlock.kt | 16 ++++++ .../unmei/commands/CustomBlockInfo.kt | 29 ++++++++++ .../nextstation/unmei/events/PlayerEvents.kt | 33 ++++++++--- .../MsgPackPersistentDataType.kt | 26 +++++++++ 10 files changed, 180 insertions(+), 21 deletions(-) create mode 100644 src/main/kotlin/fr/nextstation/unmei/UnmeiBootstrap.kt create mode 100644 src/main/kotlin/fr/nextstation/unmei/blocks/CustomBlock.kt create mode 100644 src/main/kotlin/fr/nextstation/unmei/commands/CustomBlockInfo.kt create mode 100644 src/main/kotlin/fr/nextstation/unmei/persistentdata/MsgPackPersistentDataType.kt diff --git a/build.gradle.kts b/build.gradle.kts index 7045105..850d765 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,6 +7,7 @@ plugins { alias(libs.plugins.shadow) alias(libs.plugins.run.paper) alias(libs.plugins.resource.factory.bukkit) + kotlin("kapt") version libs.versions.kotlin.get() } repositories { @@ -19,6 +20,11 @@ dependencies { implementation(libs.msgpack) compileOnly(libs.better.model) + implementation(libs.cloud.paper) + implementation(libs.cloud.mc.extras) + implementation(libs.cloud.kotlin.annotations) + + kapt(libs.cloud.annotations) } bukkitPluginYaml { @@ -26,7 +32,7 @@ bukkitPluginYaml { apiVersion = "26.3" load = BukkitPluginYaml.PluginLoadOrder.STARTUP - authors.addAll("Azur84","gamer_noir") + authors.addAll("Azur84", "gamer_noir") } kotlin { @@ -34,6 +40,11 @@ kotlin { } tasks { + shadowJar { + duplicatesStrategy = DuplicatesStrategy.INCLUDE + minimize() + } + build { dependsOn(shadowJar) } @@ -43,7 +54,7 @@ tasks { jvmArgs("-Xms2G", "-Xmx2G", "-Dcom.mojang.eula.agree=true") downloadPlugins { - hangar("BetterModel",libs.versions.better.model.get()) + hangar("BetterModel", libs.versions.better.model.get()) } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e3795bc..95bc19a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,11 +11,17 @@ resource-factory = "1.4.0" better-model = "3.5.0" msgpack = "0.6.1" +cloud-core = "2.1.0" +cloud-paper = "2.0.0-beta.10" [libraries] kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" } better-model = { module = "io.github.toxicity188:bettermodel-api", version.ref = "better-model" } msgpack = { module = "com.ensarsarajcic.kotlinx:serialization-msgpack", version.ref = "msgpack"} +cloud-paper = { module = "org.incendo:cloud-paper", version.ref = "cloud-paper"} +cloud-mc-extras = { module = "org.incendo:cloud-minecraft-extras", version.ref = "cloud-paper" } +cloud-annotations = { module = "org.incendo:cloud-annotations", version.ref = "cloud-core" } +cloud-kotlin-annotations = { module = "org.incendo:cloud-kotlin-coroutines-annotations", version.ref = "cloud-core" } [plugins] paperweight-userdev = { id = "io.papermc.paperweight.userdev", version.ref = "paperweight-userdev" } diff --git a/src/main/kotlin/fr/nextstation/unmei/Unmei.kt b/src/main/kotlin/fr/nextstation/unmei/Unmei.kt index 0ea9ba8..466c39c 100644 --- a/src/main/kotlin/fr/nextstation/unmei/Unmei.kt +++ b/src/main/kotlin/fr/nextstation/unmei/Unmei.kt @@ -3,13 +3,15 @@ package fr.nextstation.unmei import fr.nextstation.unmei.blocks.ChunksDataManager import fr.nextstation.unmei.events.PlayerEvents import fr.nextstation.unmei.network.PacketInjector +import org.bukkit.command.CommandSender import org.bukkit.plugin.java.JavaPlugin +import org.incendo.cloud.paper.PaperCommandManager class Unmei : JavaPlugin() { val customBlockChunkManager = ChunksDataManager(this) override fun onEnable() { - server.pluginManager.registerEvents(PlayerEvents, this) + server.pluginManager.registerEvents(PlayerEvents(this), this) server.pluginManager.registerEvents(PacketInjector, this) } diff --git a/src/main/kotlin/fr/nextstation/unmei/UnmeiBootstrap.kt b/src/main/kotlin/fr/nextstation/unmei/UnmeiBootstrap.kt new file mode 100644 index 0000000..f7acb7d --- /dev/null +++ b/src/main/kotlin/fr/nextstation/unmei/UnmeiBootstrap.kt @@ -0,0 +1,55 @@ +package fr.nextstation.unmei + +import io.papermc.paper.plugin.bootstrap.BootstrapContext +import io.papermc.paper.plugin.bootstrap.PluginBootstrap +import net.kyori.adventure.text.Component +import net.kyori.adventure.text.format.NamedTextColor +import org.bukkit.Bukkit +import org.incendo.cloud.annotations.AnnotationParser +import org.incendo.cloud.execution.ExecutionCoordinator +import org.incendo.cloud.minecraft.extras.MinecraftExceptionHandler +import org.incendo.cloud.minecraft.extras.MinecraftHelp +import org.incendo.cloud.minecraft.extras.caption.ComponentCaptionFormatter +import org.incendo.cloud.paper.PaperCommandManager +import org.incendo.cloud.paper.util.sender.PaperSimpleSenderMapper +import org.incendo.cloud.paper.util.sender.Source +import java.util.function.Function + + +class UnmeiBootstrap: PluginBootstrap { + override fun bootstrap(context: BootstrapContext) { + val manager = PaperCommandManager.builder(PaperSimpleSenderMapper.simpleSenderMapper()) + .executionCoordinator(ExecutionCoordinator.simpleCoordinator()) + .buildBootstrapped(context) + + val exceptionHandler = MinecraftExceptionHandler.create(Source::source) + .defaultInvalidSyntaxHandler() + .defaultInvalidSenderHandler() + .defaultNoPermissionHandler() + .defaultArgumentParsingHandler() + .defaultCommandExecutionHandler() + .decorator { component: Component -> + Component.text() + .append(Component.text("[", NamedTextColor.DARK_GRAY)) + .append(Component.text("Unmei", NamedTextColor.DARK_PURPLE)) + .append(Component.text("] ", NamedTextColor.DARK_GRAY)) + .append(component).build() + } + .registerTo(manager) + + val minecraftHelp = MinecraftHelp.builder() + .commandManager(manager) + .audienceProvider(Source::source) + .commandPrefix("/builder help") + .messageProvider(MinecraftHelp.captionMessageProvider( + manager.captionRegistry(), + ComponentCaptionFormatter.miniMessage() + )) + .build() + + manager.captionRegistry().registerProvider(MinecraftHelp.defaultCaptionsProvider()) + + val annotationParser = AnnotationParser(manager, Source::class.java) + annotationParser.parseContainers() + } +} \ No newline at end of file diff --git a/src/main/kotlin/fr/nextstation/unmei/blocks/ChunksData.kt b/src/main/kotlin/fr/nextstation/unmei/blocks/ChunksData.kt index e79b637..1d97778 100644 --- a/src/main/kotlin/fr/nextstation/unmei/blocks/ChunksData.kt +++ b/src/main/kotlin/fr/nextstation/unmei/blocks/ChunksData.kt @@ -1,5 +1,6 @@ package fr.nextstation.unmei.blocks +import fr.nextstation.unmei.persistentdata.MsgPackPersistentDataType import kotlinx.serialization.Serializable import org.bukkit.NamespacedKey import org.bukkit.block.Block @@ -12,4 +13,7 @@ data class ChunksData ( val string = blocks[Triple(block.x,block.y,block.z)] ?: return null return NamespacedKey.fromString(string) } + companion object { + val persistentDataType = MsgPackPersistentDataType(ChunksData::class.java, this.serializer()) + } } \ No newline at end of file diff --git a/src/main/kotlin/fr/nextstation/unmei/blocks/ChunksDataManager.kt b/src/main/kotlin/fr/nextstation/unmei/blocks/ChunksDataManager.kt index 659ef49..229cde1 100644 --- a/src/main/kotlin/fr/nextstation/unmei/blocks/ChunksDataManager.kt +++ b/src/main/kotlin/fr/nextstation/unmei/blocks/ChunksDataManager.kt @@ -1,9 +1,7 @@ package fr.nextstation.unmei.blocks -import com.ensarsarajcic.kotlinx.serialization.msgpack.MsgPack import org.bukkit.Chunk import org.bukkit.NamespacedKey -import org.bukkit.persistence.PersistentDataType import org.bukkit.plugin.java.JavaPlugin class ChunksDataManager(val plugin: JavaPlugin) { @@ -15,24 +13,21 @@ class ChunksDataManager(val plugin: JavaPlugin) { fun getBlocksData(chunk: Chunk): ChunksData { val map = cache.computeIfAbsent(chunk.chunkKey) { - val buffer = chunk.persistentDataContainer.get(CUSTOM_BLOCK_DATA, PersistentDataType.BYTE_ARRAY) - ?: return@computeIfAbsent ChunksData(HashMap()) try { - val data = MsgPack.decodeFromByteArray(ChunksData.serializer(), buffer) - return@computeIfAbsent data + val buffer = chunk.persistentDataContainer.get(CUSTOM_BLOCK_DATA, ChunksData.persistentDataType) + return@computeIfAbsent buffer ?: ChunksData(HashMap()) } catch (error: Error) { plugin.logger.warning("Failed to Decode chunk ${chunk.chunkKey}: ${error.message}") return@computeIfAbsent ChunksData(HashMap()) } } + return map } fun saveBlocksData(chunk: Chunk) { val data = cache[chunk.chunkKey]?: return - val buffer = MsgPack.encodeToByteArray(ChunksData.serializer(), data) - - chunk.persistentDataContainer.set(CUSTOM_BLOCK_DATA, PersistentDataType.BYTE_ARRAY, buffer) + chunk.persistentDataContainer.set(CUSTOM_BLOCK_DATA, ChunksData.persistentDataType, data) } } \ No newline at end of file diff --git a/src/main/kotlin/fr/nextstation/unmei/blocks/CustomBlock.kt b/src/main/kotlin/fr/nextstation/unmei/blocks/CustomBlock.kt new file mode 100644 index 0000000..1bfddb1 --- /dev/null +++ b/src/main/kotlin/fr/nextstation/unmei/blocks/CustomBlock.kt @@ -0,0 +1,16 @@ +package fr.nextstation.unmei.blocks + +import org.bukkit.NamespacedKey + +interface CustomBlock { + val id: NamespacedKey + val baseDurability: Int + + enum class TYPE { + SOLID, + NO_SOLID + } + companion object { + val CUSTOM_BLOCK_DATA = NamespacedKey("unmei", "custom_block") + } +} \ No newline at end of file diff --git a/src/main/kotlin/fr/nextstation/unmei/commands/CustomBlockInfo.kt b/src/main/kotlin/fr/nextstation/unmei/commands/CustomBlockInfo.kt new file mode 100644 index 0000000..4bbfd85 --- /dev/null +++ b/src/main/kotlin/fr/nextstation/unmei/commands/CustomBlockInfo.kt @@ -0,0 +1,29 @@ +package fr.nextstation.unmei.commands + +import org.bukkit.NamespacedKey +import org.incendo.cloud.annotations.Argument +import org.incendo.cloud.annotations.Command +import org.incendo.cloud.annotations.processing.CommandContainer +import org.incendo.cloud.annotations.suggestion.Suggestions +import org.incendo.cloud.context.CommandContext +import org.incendo.cloud.paper.util.sender.Source +import java.util.stream.Stream + +@CommandContainer +class CustomBlockInfo { + @Command("unmei give [quantity]") + fun customBlockGet( + sender: Source, + @Argument block: NamespacedKey, + @Argument(suggestions = "custom-block-suggestions") quantity: Int = 1 + ) { + + } + @Suggestions("custom-block-suggestions") + fun customBlockSuggestions( + context: CommandContext, + input: String + ): Stream { + return Stream.of("test") + } +} \ No newline at end of file diff --git a/src/main/kotlin/fr/nextstation/unmei/events/PlayerEvents.kt b/src/main/kotlin/fr/nextstation/unmei/events/PlayerEvents.kt index f73c5af..9105e21 100644 --- a/src/main/kotlin/fr/nextstation/unmei/events/PlayerEvents.kt +++ b/src/main/kotlin/fr/nextstation/unmei/events/PlayerEvents.kt @@ -1,30 +1,45 @@ package fr.nextstation.unmei.events import fr.nextstation.unmei.Unmei +import fr.nextstation.unmei.blocks.CustomBlock import org.bukkit.Material +import org.bukkit.NamespacedKey +import org.bukkit.block.CommandBlock import org.bukkit.event.EventHandler import org.bukkit.event.Listener +import org.bukkit.event.block.Action import org.bukkit.event.block.BlockDamageEvent import org.bukkit.event.player.PlayerInteractEvent +import org.bukkit.event.world.WorldSaveEvent +import org.bukkit.persistence.PersistentDataType class PlayerEvents(val plugin: Unmei) : Listener { @EventHandler fun rightClick (event : PlayerInteractEvent){ -// if (event.action == Action.RIGHT_CLICK_BLOCK) { -// event.player.teleport(event.player.location.add(0.0,10.0,0.0)); -// -// } + if (event.action == Action.RIGHT_CLICK_BLOCK) { + val item = event.item + if (item != null) { + val customBlock = item.itemMeta.persistentDataContainer.get(CustomBlock.CUSTOM_BLOCK_DATA, PersistentDataType.STRING) + if (customBlock != null) { + val customBlock = NamespacedKey.fromString(customBlock) + if (customBlock != null) { + + } + } + } + } } @EventHandler fun blockBreak(event: BlockDamageEvent) { val player = event.player - if (event.block.blockData.material == Material.COMMAND_BLOCK) { - val data = plugin.customBlockChunkManager.getBlocksData(event.block.chunk) - if (data.getKey(event.block) != null) { - TODO() - } + val blockState = event.block.state + + if (blockState is CommandBlock) { + val customBlock = blockState.persistentDataContainer.get(CustomBlock.CUSTOM_BLOCK_DATA, PersistentDataType.STRING) + + } } } \ No newline at end of file diff --git a/src/main/kotlin/fr/nextstation/unmei/persistentdata/MsgPackPersistentDataType.kt b/src/main/kotlin/fr/nextstation/unmei/persistentdata/MsgPackPersistentDataType.kt new file mode 100644 index 0000000..93eb7d6 --- /dev/null +++ b/src/main/kotlin/fr/nextstation/unmei/persistentdata/MsgPackPersistentDataType.kt @@ -0,0 +1,26 @@ +package fr.nextstation.unmei.persistentdata + +import com.ensarsarajcic.kotlinx.serialization.msgpack.MsgPack +import kotlinx.serialization.KSerializer +import org.bukkit.persistence.PersistentDataAdapterContext +import org.bukkit.persistence.PersistentDataType + +class MsgPackPersistentDataType(val clazz: Class, val serializer: KSerializer): PersistentDataType { + override fun getComplexType(): Class { + return clazz + } + + override fun getPrimitiveType(): Class { + return ByteArray::class.java + } + + override fun fromPrimitive(primitive: ByteArray, context: PersistentDataAdapterContext): T { + val data = MsgPack.decodeFromByteArray(serializer, primitive) + return data + } + + override fun toPrimitive(complex: T, context: PersistentDataAdapterContext): ByteArray { + val buffer = MsgPack.encodeToByteArray(serializer, complex) + return buffer + } +} \ No newline at end of file