Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
565b5f46d1 |
No files matched your search
+1
-3
@@ -2,7 +2,6 @@ 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)
|
||||||
@@ -16,14 +15,13 @@ 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)
|
||||||
}
|
}
|
||||||
|
|
||||||
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")
|
||||||
|
|||||||
@@ -1,21 +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.4.0"
|
||||||
|
|
||||||
better-model = "3.5.0"
|
better-model = "3.2.0"
|
||||||
msgpack = "0.6.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"}
|
|
||||||
|
|
||||||
[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
@@ -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.2-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|||||||
@@ -1,16 +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.plugin.java.JavaPlugin
|
import org.bukkit.plugin.java.JavaPlugin
|
||||||
|
|
||||||
class Unmei : JavaPlugin() {
|
class Unmei : JavaPlugin() {
|
||||||
val customBlockChunkManager = ChunksDataManager(this)
|
|
||||||
|
|
||||||
override fun onEnable() {
|
override fun onEnable() {
|
||||||
server.pluginManager.registerEvents(PlayerEvents, this)
|
server.pluginManager.registerEvents(PlayerEvents(), this)
|
||||||
server.pluginManager.registerEvents(PacketInjector, this)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDisable() {
|
override fun onDisable() {
|
||||||
|
|||||||
@@ -1,15 +0,0 @@
|
|||||||
package fr.nextstation.unmei.blocks
|
|
||||||
|
|
||||||
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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
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) {
|
|
||||||
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) {
|
|
||||||
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
|
|
||||||
} 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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,30 +1,17 @@
|
|||||||
package fr.nextstation.unmei.events
|
package fr.nextstation.unmei.events
|
||||||
|
|
||||||
import fr.nextstation.unmei.Unmei
|
|
||||||
import org.bukkit.Material
|
|
||||||
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.BlockDamageEvent
|
import org.bukkit.event.block.Action
|
||||||
import org.bukkit.event.player.PlayerInteractEvent
|
import org.bukkit.event.player.PlayerInteractEvent
|
||||||
|
|
||||||
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) {
|
||||||
// event.player.teleport(event.player.location.add(0.0,10.0,0.0));
|
event.player.teleport(event.player.location.add(0.0,10.0,0.0));
|
||||||
//
|
|
||||||
// }
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@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()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in new issue
Block a user