Skip to content

allow multiple targets #5

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.

Sign up for GitHub

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

Open
thatgurkangurk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

allow multiple targets #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/kotlin/me/gurkz/smitecommand/SmiteCommandMod.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import net.minecraft.server.command.CommandManager.RegistrationEnvironment
import net.minecraft.server.command.ServerCommandSource
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import java.util.*
import java.util.function.Consumer
import kotlin.collections.ArrayList
import kotlin.jvm.optionals.getOrNull

object SmiteCommandMod : ModInitializer {
@Volatile
Expand All @@ -32,7 +32,7 @@ object SmiteCommandMod : ModInitializer {
private var CONFIG: SmiteCommandConfig = register(
SmiteCommandConfig::class.java, "GurkansSmite.json"
) { newConfig: SmiteCommandConfig -> CONFIG = newConfig }
private val VERSION: Optional<String>? = FabricLoader.getInstance().getModContainer(MOD_ID).map { container -> container.metadata.version.toString() }
private val VERSION: String? = FabricLoader.getInstance().getModContainer(MOD_ID).map { container -> container.metadata.version.toString() }.getOrNull()

fun adventure(): MinecraftServerAudiences {
val ret = this.adventure
Expand All @@ -49,7 +49,7 @@ object SmiteCommandMod : ModInitializer {

addCommand(
CommandManager.literal("smite").requires(Permissions.require("smitecommand.smite", 4)).then(
CommandManager.argument("target", EntityArgumentType.player())
CommandManager.argument("targets", EntityArgumentType.players())
.executes { ctx: CommandContext<ServerCommandSource> ->
smite(ctx, CONFIG.messageConfig)
})
Expand Down
33 changes: 20 additions & 13 deletions src/main/kotlin/me/gurkz/smitecommand/command/SmiteCommand.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,37 @@ import net.minecraft.server.command.ServerCommandSource

@Throws(CommandSyntaxException::class)
fun smite(ctx: CommandContext<ServerCommandSource>, messageConfig: Map<MessageConfigKeys, String?>): Int {
val target = EntityArgumentType.getPlayer(ctx, "target")

val world = target.serverWorld
val lightningEntity = LightningEntity(EntityType.LIGHTNING_BOLT, world)

lightningEntity.setPosition(target.pos)

world.spawnEntity(lightningEntity)
val targets = EntityArgumentType.getPlayers(ctx, "targets")

val miniMessage = MiniMessage.miniMessage()

val senderMessage = messageConfig[MessageConfigKeys.SenderMessage]
val targetMessage = messageConfig[MessageConfigKeys.TargetMessage]

val usernames = if (targets.size == 1) {
targets.first().name.string
} else {
targets.joinToString(", ") { it.name.string }
}

if (senderMessage != null) {
ctx.source.sendMessage(miniMessage.deserialize(senderMessage, Placeholder.unparsed("target-name",
target.name.string
usernames
)))
}

if (targetMessage !== null) {
target.sendMessage(miniMessage.deserialize(targetMessage))
}
for (target in targets) {
println("target")
val world = target.serverWorld
val lightningEntity = LightningEntity(EntityType.LIGHTNING_BOLT, world)

lightningEntity.setPosition(target.pos)

world.spawnEntity(lightningEntity)

if (targetMessage !== null) {
target.sendMessage(miniMessage.deserialize(targetMessage))
}
}

return 1
}