-
Notifications
You must be signed in to change notification settings - Fork 0
Feat/more bridges #210
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Feat/more bridges #210
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
51983e2
feat(nms): implement AdventureNBT conversion and entity bridge for NM…
twisti-dev d85621b
refactor: improve code formatting and structure in SurfInvocationHand…
twisti-dev aa0e6f0
feat: add ByteBuddy dependency and relocate Adventure NBT package
twisti-dev cdb7ae6
feat: add proxies for VanillaArgumentProvider and VanillaArgumentProv…
twisti-dev 7d15043
feat(nms): implement SurfBukkitNmsCommandArgumentTypesBridge for NMS …
twisti-dev 31a7c36
feat: add AdventureCompoundBinaryTagArgument for NBT command argument…
twisti-dev 29b6dc8
feat: add SummonCommandTest for entity summoning with NBT support
twisti-dev 236cbe7
feat(nms): simplify compound tag argument handling in SurfBukkitNmsCo…
twisti-dev 2d19afe
feat: add java toolchain support and update Gradle version
twisti-dev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
buildSrc/src/main/kotlin/java-toolchain-convention.gradle.kts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,18 @@ | ||||||
| import gradle.kotlin.dsl.accessors._bcd9a993373509de50154c5485fe667f.java | ||||||
| import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension | ||||||
|
|
||||||
| val javaVersion: String by project | ||||||
|
|
||||||
| plugins { | ||||||
| java | ||||||
| } | ||||||
|
|
||||||
| extensions.findByType<KotlinJvmProjectExtension>()?.apply { | ||||||
| jvmToolchain(javaVersion.toInt()) | ||||||
| } | ||||||
|
|
||||||
| java { | ||||||
| toolchain { | ||||||
| languageVersion.set(JavaLanguageVersion.of(javaVersion)) | ||||||
|
||||||
| languageVersion.set(JavaLanguageVersion.of(javaVersion)) | |
| languageVersion.set(JavaLanguageVersion.of(javaVersion.toInt())) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 54 additions & 0 deletions
54
...otlin/dev/slne/surf/surfapi/bukkit/api/command/args/AdventureCompoundBinaryTagArgument.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| package dev.slne.surf.surfapi.bukkit.api.command.args | ||
|
|
||
| import com.mojang.brigadier.context.CommandContext | ||
| import dev.jorel.commandapi.CommandAPICommand | ||
| import dev.jorel.commandapi.CommandTree | ||
| import dev.jorel.commandapi.arguments.Argument | ||
| import dev.jorel.commandapi.arguments.CommandAPIArgumentType | ||
| import dev.jorel.commandapi.arguments.SafeOverrideableArgument | ||
| import dev.jorel.commandapi.executors.CommandArguments | ||
| import dev.slne.surf.surfapi.bukkit.api.nms.NmsUseWithCaution | ||
| import dev.slne.surf.surfapi.bukkit.api.nms.bridges.commandArgumentTypes | ||
| import net.kyori.adventure.nbt.CompoundBinaryTag | ||
| import net.kyori.adventure.nbt.TagStringIO | ||
|
|
||
| @OptIn(NmsUseWithCaution::class) | ||
| class AdventureCompoundBinaryTagArgument(nodeName: String) : | ||
| SafeOverrideableArgument<CompoundBinaryTag, CompoundBinaryTag>( | ||
| nodeName, commandArgumentTypes.compoundTag(), { TagStringIO.tagStringIO().asString(it) } | ||
| ) { | ||
| override fun getPrimitiveType(): Class<CompoundBinaryTag> { | ||
| return CompoundBinaryTag::class.java | ||
| } | ||
|
|
||
| override fun getArgumentType(): CommandAPIArgumentType { | ||
| return CommandAPIArgumentType.NBT_COMPOUND | ||
| } | ||
|
|
||
| override fun <Source> parseArgument( | ||
| ctx: CommandContext<Source>, | ||
| key: String, | ||
| previousArgs: CommandArguments | ||
| ): CompoundBinaryTag { | ||
| return commandArgumentTypes.getCompoundTag(ctx, key) | ||
| } | ||
| } | ||
|
|
||
| inline fun CommandTree.adventureCompoundBinaryTagArgument( | ||
| nodeName: String, | ||
| optional: Boolean = false, | ||
| block: Argument<*>.() -> Unit = {} | ||
| ): CommandTree = then(AdventureCompoundBinaryTagArgument(nodeName).setOptional(optional).apply(block)) | ||
|
|
||
| inline fun Argument<*>.adventureCompoundBinaryTagArgument( | ||
| nodeName: String, | ||
| optional: Boolean = false, | ||
| block: Argument<*>.() -> Unit = {} | ||
| ): Argument<*> = then(AdventureCompoundBinaryTagArgument(nodeName).setOptional(optional).apply(block)) | ||
|
|
||
|
|
||
| inline fun CommandAPICommand.adventureCompoundBinaryTagArgument( | ||
| nodeName: String, | ||
| optional: Boolean = false, | ||
| block: Argument<*>.() -> Unit = {} | ||
| ): CommandAPICommand = withArguments(AdventureCompoundBinaryTagArgument(nodeName).setOptional(optional).apply(block)) |
21 changes: 21 additions & 0 deletions
21
...n/dev/slne/surf/surfapi/bukkit/api/nms/bridges/SurfBukkitNmsCommandArgumentTypesBridge.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| package dev.slne.surf.surfapi.bukkit.api.nms.bridges | ||
|
|
||
| import com.mojang.brigadier.arguments.ArgumentType | ||
| import com.mojang.brigadier.context.CommandContext | ||
| import dev.slne.surf.surfapi.bukkit.api.nms.NmsUseWithCaution | ||
| import dev.slne.surf.surfapi.core.api.util.requiredService | ||
| import net.kyori.adventure.nbt.CompoundBinaryTag | ||
|
|
||
| @NmsUseWithCaution | ||
| interface SurfBukkitNmsCommandArgumentTypesBridge { | ||
|
|
||
| fun compoundTag(): ArgumentType<*> | ||
| fun getCompoundTag(ctx: CommandContext<*>, key: String): CompoundBinaryTag | ||
|
|
||
| companion object : SurfBukkitNmsCommandArgumentTypesBridge by commandArgumentTypes { | ||
| val instance = commandArgumentTypes | ||
| } | ||
| } | ||
|
|
||
| @NmsUseWithCaution | ||
| val commandArgumentTypes = requiredService<SurfBukkitNmsCommandArgumentTypesBridge>() |
23 changes: 23 additions & 0 deletions
23
...src/main/kotlin/dev/slne/surf/surfapi/bukkit/api/nms/bridges/SurfBukkitNmsEntityBridge.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package dev.slne.surf.surfapi.bukkit.api.nms.bridges | ||
|
|
||
| import dev.jorel.commandapi.exceptions.WrapperCommandSyntaxException | ||
| import dev.slne.surf.surfapi.bukkit.api.nms.NmsUseWithCaution | ||
| import dev.slne.surf.surfapi.core.api.util.requiredService | ||
| import io.papermc.paper.math.FinePosition | ||
| import net.kyori.adventure.nbt.CompoundBinaryTag | ||
| import org.bukkit.World | ||
| import org.bukkit.entity.EntityType | ||
|
|
||
| @NmsUseWithCaution | ||
| interface SurfBukkitNmsEntityBridge { | ||
|
|
||
| @Throws(WrapperCommandSyntaxException::class) | ||
| fun createEntityByNbt(world: World, type: EntityType, pos: FinePosition, tag: CompoundBinaryTag) | ||
|
|
||
| companion object : SurfBukkitNmsEntityBridge by entityBridge { | ||
| val instance = entityBridge | ||
| } | ||
| } | ||
|
|
||
| @NmsUseWithCaution | ||
| val entityBridge = requiredService<SurfBukkitNmsEntityBridge>() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
...rc/main/kotlin/dev/slne/surf/surfapi/bukkit/test/command/subcommands/SummonCommandTest.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,24 @@ | ||||||
| package dev.slne.surf.surfapi.bukkit.test.command.subcommands | ||||||
|
|
||||||
| import dev.jorel.commandapi.CommandAPICommand | ||||||
| import dev.jorel.commandapi.kotlindsl.entityTypeArgument | ||||||
| import dev.jorel.commandapi.kotlindsl.getValue | ||||||
| import dev.jorel.commandapi.kotlindsl.playerExecutor | ||||||
| import dev.slne.surf.surfapi.bukkit.api.command.args.adventureCompoundBinaryTagArgument | ||||||
| import dev.slne.surf.surfapi.bukkit.api.nms.bridges.entityBridge | ||||||
| import net.kyori.adventure.nbt.CompoundBinaryTag | ||||||
| import org.bukkit.entity.EntityType | ||||||
|
|
||||||
| class SummonCommandTest(name: String) : CommandAPICommand(name) { | ||||||
| init { | ||||||
| entityTypeArgument("type") | ||||||
| adventureCompoundBinaryTagArgument("nbt") | ||||||
|
|
||||||
| playerExecutor { sender, args -> | ||||||
| val type: EntityType by args | ||||||
| val nbt: CompoundBinaryTag by args | ||||||
|
|
||||||
| entityBridge.createEntityByNbt(sender.world, type, sender.location, nbt) | ||||||
|
||||||
| entityBridge.createEntityByNbt(sender.world, type, sender.location, nbt) | |
| entityBridge.createEntityByNbt(sender.world, type, sender.location.toFinePosition(), nbt) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The precompiled script plugin imports an internal generated accessor (
gradle.kotlin.dsl.accessors._….java). This class name is Gradle-version-specific and can break the build when the accessor package changes; the plugin should not depend on it. Remove this import and rely on the normaljava { ... }DSL after applying thejavaplugin.