Author SHA1 Message Date
Renovate-Bot Bot 0d54cbc4ff Update dependency gradle to v9.8.2 2026-10-28 11:15:57 +00:00
11 changed files with 22 additions and 181 deletions

No files matched your search

+2 -13
View File
@@ -7,7 +7,6 @@ plugins {
alias(libs.plugins.shadow) alias(libs.plugins.shadow)
alias(libs.plugins.run.paper) alias(libs.plugins.run.paper)
alias(libs.plugins.resource.factory.bukkit) alias(libs.plugins.resource.factory.bukkit)
kotlin("kapt") version libs.versions.kotlin.get()
} }
repositories { repositories {
@@ -20,11 +19,6 @@ dependencies {
implementation(libs.msgpack) implementation(libs.msgpack)
compileOnly(libs.better.model) compileOnly(libs.better.model)
implementation(libs.cloud.paper)
implementation(libs.cloud.mc.extras)
implementation(libs.cloud.kotlin.annotations)
kapt(libs.cloud.annotations)
} }
bukkitPluginYaml { bukkitPluginYaml {
@@ -32,7 +26,7 @@ bukkitPluginYaml {
apiVersion = "26.3" apiVersion = "26.3"
load = BukkitPluginYaml.PluginLoadOrder.STARTUP load = BukkitPluginYaml.PluginLoadOrder.STARTUP
authors.addAll("Azur84", "gamer_noir") authors.addAll("Azur84","gamer_noir")
} }
kotlin { kotlin {
@@ -40,11 +34,6 @@ kotlin {
} }
tasks { tasks {
shadowJar {
duplicatesStrategy = DuplicatesStrategy.INCLUDE
minimize()
}
build { build {
dependsOn(shadowJar) dependsOn(shadowJar)
} }
@@ -54,7 +43,7 @@ tasks {
jvmArgs("-Xms2G", "-Xmx2G", "-Dcom.mojang.eula.agree=true") jvmArgs("-Xms2G", "-Xmx2G", "-Dcom.mojang.eula.agree=true")
downloadPlugins { downloadPlugins {
hangar("BetterModel", libs.versions.better.model.get()) hangar("BetterModel",libs.versions.better.model.get())
} }
} }
} }
-6
View File
@@ -11,17 +11,11 @@ resource-factory = "1.4.0"
better-model = "3.5.0" better-model = "3.5.0"
msgpack = "0.6.1" msgpack = "0.6.1"
cloud-core = "2.1.0"
cloud-paper = "2.0.1"
[libraries] [libraries]
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" } kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
better-model = { module = "io.github.toxicity188:bettermodel-api", version.ref = "better-model" } better-model = { module = "io.github.toxicity188:bettermodel-api", version.ref = "better-model" }
msgpack = { module = "com.ensarsarajcic.kotlinx:serialization-msgpack", version.ref = "msgpack"} 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] [plugins]
paperweight-userdev = { id = "io.papermc.paperweight.userdev", version.ref = "paperweight-userdev" } paperweight-userdev = { id = "io.papermc.paperweight.userdev", version.ref = "paperweight-userdev" }
+1 -1
View File
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.2-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
@@ -3,15 +3,13 @@ package fr.nextstation.unmei
import fr.nextstation.unmei.blocks.ChunksDataManager import fr.nextstation.unmei.blocks.ChunksDataManager
import fr.nextstation.unmei.events.PlayerEvents import fr.nextstation.unmei.events.PlayerEvents
import fr.nextstation.unmei.network.PacketInjector import fr.nextstation.unmei.network.PacketInjector
import org.bukkit.command.CommandSender
import org.bukkit.plugin.java.JavaPlugin import org.bukkit.plugin.java.JavaPlugin
import org.incendo.cloud.paper.PaperCommandManager
class Unmei : JavaPlugin() { class Unmei : JavaPlugin() {
val customBlockChunkManager = ChunksDataManager(this) val customBlockChunkManager = ChunksDataManager(this)
override fun onEnable() { override fun onEnable() {
server.pluginManager.registerEvents(PlayerEvents(this), this) server.pluginManager.registerEvents(PlayerEvents, this)
server.pluginManager.registerEvents(PacketInjector, this) server.pluginManager.registerEvents(PacketInjector, this)
} }
@@ -1,55 +0,0 @@
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<Source>()
.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()
}
}
@@ -1,6 +1,5 @@
package fr.nextstation.unmei.blocks package fr.nextstation.unmei.blocks
import fr.nextstation.unmei.persistentdata.MsgPackPersistentDataType
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import org.bukkit.NamespacedKey import org.bukkit.NamespacedKey
import org.bukkit.block.Block import org.bukkit.block.Block
@@ -13,7 +12,4 @@ data class ChunksData (
val string = blocks[Triple(block.x,block.y,block.z)] ?: return null val string = blocks[Triple(block.x,block.y,block.z)] ?: return null
return NamespacedKey.fromString(string) return NamespacedKey.fromString(string)
} }
companion object {
val persistentDataType = MsgPackPersistentDataType(ChunksData::class.java, this.serializer())
}
} }
@@ -1,7 +1,9 @@
package fr.nextstation.unmei.blocks package fr.nextstation.unmei.blocks
import com.ensarsarajcic.kotlinx.serialization.msgpack.MsgPack
import org.bukkit.Chunk import org.bukkit.Chunk
import org.bukkit.NamespacedKey import org.bukkit.NamespacedKey
import org.bukkit.persistence.PersistentDataType
import org.bukkit.plugin.java.JavaPlugin import org.bukkit.plugin.java.JavaPlugin
class ChunksDataManager(val plugin: JavaPlugin) { class ChunksDataManager(val plugin: JavaPlugin) {
@@ -13,21 +15,24 @@ class ChunksDataManager(val plugin: JavaPlugin) {
fun getBlocksData(chunk: Chunk): ChunksData { fun getBlocksData(chunk: Chunk): ChunksData {
val map = cache.computeIfAbsent(chunk.chunkKey) { val map = cache.computeIfAbsent(chunk.chunkKey) {
val buffer = chunk.persistentDataContainer.get(CUSTOM_BLOCK_DATA, PersistentDataType.BYTE_ARRAY)
?: return@computeIfAbsent ChunksData(HashMap())
try { try {
val buffer = chunk.persistentDataContainer.get(CUSTOM_BLOCK_DATA, ChunksData.persistentDataType) val data = MsgPack.decodeFromByteArray(ChunksData.serializer(), buffer)
return@computeIfAbsent buffer ?: ChunksData(HashMap()) return@computeIfAbsent data
} catch (error: Error) { } catch (error: Error) {
plugin.logger.warning("Failed to Decode chunk ${chunk.chunkKey}: ${error.message}") plugin.logger.warning("Failed to Decode chunk ${chunk.chunkKey}: ${error.message}")
return@computeIfAbsent ChunksData(HashMap()) return@computeIfAbsent ChunksData(HashMap())
} }
} }
return map return map
} }
fun saveBlocksData(chunk: Chunk) { fun saveBlocksData(chunk: Chunk) {
val data = cache[chunk.chunkKey]?: return val data = cache[chunk.chunkKey]?: return
chunk.persistentDataContainer.set(CUSTOM_BLOCK_DATA, ChunksData.persistentDataType, data) val buffer = MsgPack.encodeToByteArray(ChunksData.serializer(), data)
chunk.persistentDataContainer.set(CUSTOM_BLOCK_DATA, PersistentDataType.BYTE_ARRAY, buffer)
} }
} }
@@ -1,16 +0,0 @@
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")
}
}
@@ -1,29 +0,0 @@
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 <block> [quantity]")
fun customBlockGet(
sender: Source,
@Argument block: NamespacedKey,
@Argument(suggestions = "custom-block-suggestions") quantity: Int = 1
) {
}
@Suggestions("custom-block-suggestions")
fun customBlockSuggestions(
context: CommandContext<Source>,
input: String
): Stream<String> {
return Stream.of("test")
}
}
@@ -1,45 +1,30 @@
package fr.nextstation.unmei.events package fr.nextstation.unmei.events
import fr.nextstation.unmei.Unmei import fr.nextstation.unmei.Unmei
import fr.nextstation.unmei.blocks.CustomBlock
import org.bukkit.Material import org.bukkit.Material
import org.bukkit.NamespacedKey
import org.bukkit.block.CommandBlock
import org.bukkit.event.EventHandler import org.bukkit.event.EventHandler
import org.bukkit.event.Listener import org.bukkit.event.Listener
import org.bukkit.event.block.Action
import org.bukkit.event.block.BlockDamageEvent import org.bukkit.event.block.BlockDamageEvent
import org.bukkit.event.player.PlayerInteractEvent import org.bukkit.event.player.PlayerInteractEvent
import org.bukkit.event.world.WorldSaveEvent
import org.bukkit.persistence.PersistentDataType
class PlayerEvents(val plugin: Unmei) : Listener { class PlayerEvents(val plugin: Unmei) : Listener {
@EventHandler @EventHandler
fun rightClick (event : PlayerInteractEvent){ fun rightClick (event : PlayerInteractEvent){
if (event.action == Action.RIGHT_CLICK_BLOCK) { // if (event.action == Action.RIGHT_CLICK_BLOCK) {
val item = event.item // event.player.teleport(event.player.location.add(0.0,10.0,0.0));
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 @EventHandler
fun blockBreak(event: BlockDamageEvent) { fun blockBreak(event: BlockDamageEvent) {
val player = event.player val player = event.player
val blockState = event.block.state if (event.block.blockData.material == Material.COMMAND_BLOCK) {
val data = plugin.customBlockChunkManager.getBlocksData(event.block.chunk)
if (blockState is CommandBlock) { if (data.getKey(event.block) != null) {
val customBlock = blockState.persistentDataContainer.get(CustomBlock.CUSTOM_BLOCK_DATA, PersistentDataType.STRING) TODO()
}
} }
} }
} }
@@ -1,26 +0,0 @@
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<T: Any>(val clazz: Class<T>, val serializer: KSerializer<T>): PersistentDataType<ByteArray, T> {
override fun getComplexType(): Class<T> {
return clazz
}
override fun getPrimitiveType(): Class<ByteArray> {
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
}
}