Compare commits
1
Commits
master
..
6752ae0787
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6752ae0787 |
No files matched your search
+3
-16
@@ -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())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,27 +1,19 @@
|
|||||||
[versions]
|
[versions]
|
||||||
kotlin = "2.4.21"
|
kotlin = "2.3.21"
|
||||||
|
|
||||||
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.4.3"
|
||||||
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.0.2"
|
||||||
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
@@ -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.5.0-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|||||||
@@ -1,15 +0,0 @@
|
|||||||
{
|
|
||||||
"providers": [
|
|
||||||
{
|
|
||||||
"type": "bitmap",
|
|
||||||
"chars" : ["\uE108"],
|
|
||||||
"file": "unmei:gui/test.png",
|
|
||||||
"ascent": 13,
|
|
||||||
"height": 256
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "space",
|
|
||||||
"advances" : { "\uE000": -8, "\uE001": -169 }
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
{
|
|
||||||
"model": {
|
|
||||||
"type": "minecraft:model",
|
|
||||||
"model": "unmei:item/axe",
|
|
||||||
"tints": [
|
|
||||||
{
|
|
||||||
"type": "minecraft:constant",
|
|
||||||
"value": [1,1,1]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "minecraft:custom_model_data",
|
|
||||||
"default": 16777215
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
{
|
|
||||||
"oversized_in_gui": true,
|
|
||||||
"model": {
|
|
||||||
"type": "minecraft:condition",
|
|
||||||
"property": "minecraft:carried",
|
|
||||||
"on_true": {
|
|
||||||
"type": "minecraft:empty"
|
|
||||||
},
|
|
||||||
"on_false": {
|
|
||||||
"type": "minecraft:model",
|
|
||||||
"model":"unmei:item/gui/left_arrow"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
{
|
|
||||||
"oversized_in_gui": true,
|
|
||||||
"model": {
|
|
||||||
"type": "minecraft:condition",
|
|
||||||
"property": "minecraft:carried",
|
|
||||||
"on_true": {
|
|
||||||
"type": "minecraft:empty"
|
|
||||||
},
|
|
||||||
"on_false": {
|
|
||||||
"type": "minecraft:model",
|
|
||||||
"model":"unmei:item/gui/right_arrow"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
{
|
|
||||||
"parent": "minecraft:item/handheld",
|
|
||||||
"textures": {
|
|
||||||
"layer0": "unmei:item/stick",
|
|
||||||
"layer1": "unmei:item/axe_1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
{
|
|
||||||
"format_version": "1.21.11",
|
|
||||||
"texture_size": [18, 18],
|
|
||||||
"textures": {
|
|
||||||
"particle": "#0"
|
|
||||||
},
|
|
||||||
"elements": [
|
|
||||||
{
|
|
||||||
"from": [-1, 0, -1],
|
|
||||||
"to": [17, 0, 17],
|
|
||||||
"faces": {
|
|
||||||
"up": {"uv": [0, 0, 16, 16], "texture": "#0"}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"gui_light": "front",
|
|
||||||
"display": {
|
|
||||||
"gui": {
|
|
||||||
"rotation": [90, 0, 0],
|
|
||||||
"translation": [0, 0.01, 0]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
{
|
|
||||||
"parent": "unmei:item/gui/button",
|
|
||||||
"textures": {
|
|
||||||
"0": "unmei:item/gui/left_arrow"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
{
|
|
||||||
"parent": "unmei:item/gui/button",
|
|
||||||
"textures": {
|
|
||||||
"0": "unmei:item/gui/right_arrow"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
{"meta":{"format_version":"5.0","model_format":"image","box_uv":false},"name":"test","visible_box":[1,1,0],"variable_placeholders":"","multi_file_ruleset":"","variable_placeholder_buttons":[],"unhandled_root_fields":{},"resolution":{"width":16,"height":16},"elements":[],"groups":[],"outliner":[],"textures":[{"name":"test.png","relative_path":"test.png","folder":"","namespace":"","id":"0","group":"","scope":0,"width":256,"height":256,"uv_width":256,"uv_height":256,"particle":false,"use_as_default":false,"layers_enabled":true,"sync_to_project":"","file_format":"png","render_mode":"default","render_sides":"auto","wrap_mode":"limited","pbr_channel":"color","fps":7,"frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"617be5db-becc-0b37-a34d-912ef03812b7","layers":[{"name":"layer-copy","offset":[0,0],"scale":[1,1],"opacity":100,"visible":true,"blend_mode":"default","width":256,"height":256,"data_url":"data:image/png;base64,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 truncated
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 3.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 232 B |
Binary file not shown.
|
Before Width: | Height: | Size: 196 B |
Binary file not shown.
|
Before Width: | Height: | Size: 203 B |
Binary file not shown.
|
Before Width: | Height: | Size: 204 B |
Binary file not shown.
|
Before Width: | Height: | Size: 167 B |
@@ -1,7 +0,0 @@
|
|||||||
{
|
|
||||||
"pack": {
|
|
||||||
"description": "Random",
|
|
||||||
"min_format": 88,
|
|
||||||
"max_format": 88
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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,20 @@
|
|||||||
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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in new issue
Block a user