1 Commits
Author SHA1 Message Date
Renovate-Bot Bot 0b4abffdea Update dependency gradle to v9.8.0 2026-09-25 10:10:14 +00:00
13 changed files with 15 additions and 359 deletions

No files matched your search

+3 -16
View File
@@ -2,12 +2,10 @@ import xyz.jpenilla.resourcefactory.bukkit.BukkitPluginYaml
plugins { plugins {
kotlin("jvm") version libs.versions.kotlin.get() kotlin("jvm") version libs.versions.kotlin.get()
kotlin("plugin.serialization") version libs.versions.kotlin.get()
alias(libs.plugins.paperweight.userdev) alias(libs.plugins.paperweight.userdev)
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 {
@@ -17,22 +15,16 @@ repositories {
dependencies { dependencies {
paperweight.paperDevBundle(libs.versions.paper.api.get()) paperweight.paperDevBundle(libs.versions.paper.api.get())
implementation(libs.kotlin.stdlib) implementation(libs.kotlin.stdlib)
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 {
main = "fr.nextstation.unmei.Unmei" main = "fr.nextstation.unmei.Unmei"
apiVersion = "26.3" apiVersion = "26.1.2"
load = BukkitPluginYaml.PluginLoadOrder.STARTUP load = BukkitPluginYaml.PluginLoadOrder.STARTUP
authors.addAll("Azur84", "gamer_noir") authors.addAll("Azur84","gamer_noir")
} }
kotlin { kotlin {
@@ -40,11 +32,6 @@ kotlin {
} }
tasks { tasks {
shadowJar {
duplicatesStrategy = DuplicatesStrategy.INCLUDE
minimize()
}
build { build {
dependsOn(shadowJar) dependsOn(shadowJar)
} }
@@ -54,7 +41,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())
} }
} }
} }
+8 -16
View File
@@ -1,27 +1,19 @@
[versions] [versions]
kotlin = "2.4.21" kotlin = "2.4.10"
paper-api = "26.3.build.+" paper-api = "26.1.2.build.+"
minecraft = "26.3" minecraft = "26.1.2"
paperweight-userdev = "2.0.0-beta.24" paperweight-userdev = "2.0.0-beta.21"
shadow = "9.6.1" shadow = "9.5.1"
run-task = "3.1.0" run-task = "3.0.2"
resource-factory = "1.4.0" resource-factory = "1.3.1"
better-model = "3.5.0" better-model = "3.2.0"
msgpack = "0.6.1"
cloud-core = "2.1.0"
cloud-paper = "2.0.0-beta.10"
[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"}
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.0-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
@@ -1,18 +1,12 @@
package fr.nextstation.unmei package fr.nextstation.unmei
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 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)
override fun onEnable() { override fun onEnable() {
server.pluginManager.registerEvents(PlayerEvents(this), this) server.pluginManager.registerEvents(PlayerEvents(), this)
server.pluginManager.registerEvents(PacketInjector, this)
} }
override fun onDisable() { override fun onDisable() {
@@ -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,19 +0,0 @@
package fr.nextstation.unmei.blocks
import fr.nextstation.unmei.persistentdata.MsgPackPersistentDataType
import kotlinx.serialization.Serializable
import org.bukkit.NamespacedKey
import org.bukkit.block.Block
@Serializable
data class ChunksData (
val blocks: HashMap<Triple<Int, Int, Int>, String>,
) {
fun getKey(block: Block): NamespacedKey? {
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())
}
}
@@ -1,33 +0,0 @@
package fr.nextstation.unmei.blocks
import org.bukkit.Chunk
import org.bukkit.NamespacedKey
import org.bukkit.plugin.java.JavaPlugin
class ChunksDataManager(val plugin: JavaPlugin) {
companion object {
val CUSTOM_BLOCK_DATA = NamespacedKey("unmei", "custom_block")
}
val cache = mutableMapOf<Long, ChunksData>()
fun getBlocksData(chunk: Chunk): ChunksData {
val map = cache.computeIfAbsent(chunk.chunkKey) {
try {
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
chunk.persistentDataContainer.set(CUSTOM_BLOCK_DATA, ChunksData.persistentDataType, data)
}
}
@@ -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,17 @@
package fr.nextstation.unmei.events 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.EventHandler
import org.bukkit.event.Listener import org.bukkit.event.Listener
import org.bukkit.event.block.Action import org.bukkit.event.block.Action
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 : 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
fun blockBreak(event: BlockDamageEvent) {
val player = event.player
val blockState = event.block.state
if (blockState is CommandBlock) {
val customBlock = blockState.persistentDataContainer.get(CustomBlock.CUSTOM_BLOCK_DATA, PersistentDataType.STRING)
}
}
} }
@@ -1,66 +0,0 @@
package fr.nextstation.unmei.network
import io.netty.channel.Channel
import net.minecraft.network.protocol.game.ClientboundUpdateAttributesPacket
import net.minecraft.world.entity.ai.attributes.AttributeInstance
import org.bukkit.Bukkit
import org.bukkit.NamespacedKey
import org.bukkit.attribute.Attribute
import org.bukkit.craftbukkit.entity.CraftPlayer
import org.bukkit.entity.Player
import org.bukkit.event.EventHandler
import org.bukkit.event.Listener
import org.bukkit.event.player.PlayerJoinEvent
import org.bukkit.event.player.PlayerQuitEvent
import java.util.UUID
object PacketInjector: Listener {
private var disabled: Boolean = false
private val channels = mutableMapOf<UUID, Channel>()
private val injectors = mutableMapOf<Channel, PipelineInjector>()
fun getChannel(player: Player): Channel {
return channels.getOrPut(player.uniqueId) {
(player as CraftPlayer).handle.connection.connection.channel
}
}
@EventHandler
fun joinInject(event: PlayerJoinEvent) {
if (disabled) return
val player = event.player as CraftPlayer
val channel = getChannel(player)
if (!injectors.contains(channel)) {
inject(player, channel)
}
}
@EventHandler
fun quit(event: PlayerQuitEvent) {
channels.remove(event.player.uniqueId)
}
fun disable() {
if (!disabled) {
disabled = true
for (player in Bukkit.getServer().onlinePlayers) {
uninject(getChannel(player))
}
}
}
fun inject(player: Player, channel: Channel) {
val injector = PipelineInjector(player)
channel.pipeline().addBefore("packet_handler", "unmei_packet", injector)
injectors[channel] = injector
}
fun uninject(channel: Channel) {
channel.eventLoop().execute {
channel.pipeline().remove(injectors[channel])
}
}
}
@@ -1,45 +0,0 @@
package fr.nextstation.unmei.network
import io.netty.channel.ChannelDuplexHandler
import io.netty.channel.ChannelHandlerContext
import io.netty.channel.ChannelPromise
import net.minecraft.network.protocol.game.ClientboundBlockChangedAckPacket
import net.minecraft.network.protocol.game.ClientboundUpdateAttributesPacket
import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket
import org.bukkit.NamespacedKey
import org.bukkit.attribute.Attribute
import org.bukkit.attribute.AttributeModifier
import org.bukkit.entity.Player
class PipelineInjector(val player: Player): ChannelDuplexHandler() {
val attributeModifier = AttributeModifier(NamespacedKey("unmei","no_break"), -1.0, AttributeModifier.Operation.MULTIPLY_SCALAR_1)
// val clientSet = mutableSetOf<String>()
// val serverSet = mutableSetOf<String>()
override fun channelRead(ctx: ChannelHandlerContext, msg: Any) {
// val name = msg.javaClass.name
// if (serverSet.add(name)) {
// println(name)
// }
// if (msg is ServerboundPlayerActionPacket) {
// if (msg.action == ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK) {
// println("hi")
// }
// if (msg.action == ServerboundPlayerActionPacket.Action.STOP_DESTROY_BLOCK || msg.action == ServerboundPlayerActionPacket.Action.ABORT_DESTROY_BLOCK) {
// println("bye")
// }
// }
super.channelRead(ctx, msg)
}
override fun write(ctx: ChannelHandlerContext, msg: Any, promise: ChannelPromise) {
// val name = msg.javaClass.name
// if (clientSet.add(name)) {
// println(name)
// }
super.write(ctx, msg, promise)
}
}
@@ -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
}
}