diff options
Diffstat (limited to 'src/main/kotlin/commands')
| -rw-r--r-- | src/main/kotlin/commands/BrigadierPatchbay.kt | 17 | ||||
| -rw-r--r-- | src/main/kotlin/commands/Commands.kt | 22 |
2 files changed, 30 insertions, 9 deletions
diff --git a/src/main/kotlin/commands/BrigadierPatchbay.kt b/src/main/kotlin/commands/BrigadierPatchbay.kt index a6c9f6a..424224b 100644 --- a/src/main/kotlin/commands/BrigadierPatchbay.kt +++ b/src/main/kotlin/commands/BrigadierPatchbay.kt @@ -8,6 +8,7 @@ package moe.nea.ultranotifier.commands //$$import moe.nea.ultranotifier.event.RegistrationFinishedEvent //$$import moe.nea.ultranotifier.event.UltraNotifierEvents //$$import moe.nea.ultranotifier.event.UltraSubscribe +//$$import moe.nea.ultranotifier.event.SubscriptionTarget //$$import moe.nea.ultranotifier.mixin.AccessorCommandHandler //$$import net.minecraft.command.CommandBase //$$import net.minecraft.command.CommandHandler @@ -30,9 +31,15 @@ package moe.nea.ultranotifier.commands //$$ val dispatcher: CommandDispatcher<UltraCommandSource>, //$$ val node: CommandNode<UltraCommandSource> //$$) : CommandBase() { -//$$ override fun checkPermission(server: MinecraftServer, sender: ICommandSender): Boolean { +//#if MC >= 1.12 +//$$ override fun checkPermission(server: MinecraftServer, sender: ICommandSender): Boolean { //$$ return true //$$ } +//#else +//$$ override fun canCommandSenderUseCommand(sender: ICommandSender): Boolean { +//$$ return true +//$$ } +//#endif //$$ //$$ override fun getName(): String { //$$ return node.name @@ -43,7 +50,13 @@ package moe.nea.ultranotifier.commands //$$ } //$$ //$$ private fun getCommandLineText(args: Array<out String>) = "${node.name} ${args.joinToString(" ")}".trim() +//$$ +//$$ +//#if MC < 1.12 +//$$ override fun processCommand(sender: ICommandSender, args: Array<out String>) { +//#else //$$ override fun execute(server: MinecraftServer, sender: ICommandSender, args: Array<out String>) { +//#endif //$$ val source = BridgedCommandSource(sender) //$$ val results = dispatcher.parse(getCommandLineText(args), source) //$$ kotlin.runCatching { @@ -55,7 +68,7 @@ package moe.nea.ultranotifier.commands //$$ } //$$} //$$ -//$$object BrigadierPatchbay { +//$$object BrigadierPatchbay : SubscriptionTarget { //$$ //$$ @UltraSubscribe //$$ fun onAfterRegistration(event: RegistrationFinishedEvent) { diff --git a/src/main/kotlin/commands/Commands.kt b/src/main/kotlin/commands/Commands.kt index 95e8685..de6ded3 100644 --- a/src/main/kotlin/commands/Commands.kt +++ b/src/main/kotlin/commands/Commands.kt @@ -16,24 +16,25 @@ interface CustomSource { typealias UltraCommandSource = //#if FORGE //$$ CustomSource -//#else +//#elseif MC > 1.18 net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource - +//#else +//$$ net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource //#endif fun translatableText(key: String, vararg args: String) = -//#if MC > 11400 +//#if MC > 1.17 Text.translatable(key, *args) //#else -//$$ net.minecraft.util.ChatComponentTranslation(key, *args) +//$$ net.minecraft.text.TranslatableText(key, *args) //#endif fun literalText(string: String): Text = -//#if MC > 11400 +//#if MC > 1.17 Text.literal(string) //#else -//$$ net.minecraft.util.ChatComponentText(string) +//$$ net.minecraft.text.LiteralText(string) //#endif object Commands : SubscriptionTarget { @@ -46,10 +47,17 @@ object Commands : SubscriptionTarget { }) } +//#if MC <= 1.18 && FABRIC +//$$ @UltraSubscribe +//$$ fun registerEverythingOnce(event: moe.nea.ultranotifier.event.RegistrationFinishedEvent) { +//$$ CommandRegistrationEvent(net.fabricmc.fabric.api.client.command.v1.ClientCommandManager.DISPATCHER).post() +//$$ } +//#endif + override fun init() { //#if FORGE //$$ UltraNotifierEvents.register(BrigadierPatchbay) -//#else +//#elseif MC > 1.18 net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback.EVENT.register { dispatcher, registryAccess -> UltraNotifierEvents.post(CommandRegistrationEvent(dispatcher)) } |