AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-18 11:54:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

brigadier: target selector: self (@s) + tests

Browse Source
This commit is contained in:
Bixilon 2023-05-07 09:45:20 +02:00
parent cbf5d2a053
commit ceebf63c3c
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/integration-test/kotlin/de/bixilon/minosoft/commands/TPCommandIT.kt Normal file
View File

@ -0,0 +1,61 @@
/*
* Minosoft
* Copyright (C) 2020-2023 Moritz Zwerger
*
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
*
* This software is not affiliated with Mojang AB, the original developer of Minecraft.
*/
package de.bixilon.minosoft.commands
import de.bixilon.kutil.cast.CastUtil.unsafeCast
import de.bixilon.minosoft.commands.nodes.ArgumentNode
import de.bixilon.minosoft.commands.nodes.LiteralNode
import de.bixilon.minosoft.commands.nodes.RootNode
import de.bixilon.minosoft.commands.parser.minecraft.coordinate.Coordinate
import de.bixilon.minosoft.commands.parser.minecraft.coordinate.CoordinateRelatives
import de.bixilon.minosoft.commands.parser.minecraft.coordinate.vec3.Vec3Coordinate
import de.bixilon.minosoft.commands.parser.minecraft.coordinate.vec3.Vec3Parser
import de.bixilon.minosoft.commands.parser.minecraft.target.TargetParser
import de.bixilon.minosoft.commands.parser.minecraft.target.TargetSelectors
import de.bixilon.minosoft.commands.parser.minecraft.target.targets.selector.SelectorEntityTarget
import de.bixilon.minosoft.commands.stack.CommandStack
import org.testng.Assert.assertEquals
import org.testng.Assert.assertTrue
import org.testng.annotations.Test
@Test(groups = ["command"])
class TPCommandIT {
private fun createNode(executor: (CommandStack) -> Unit): RootNode {
return RootNode().addChild(LiteralNode("tp").addChild(
ArgumentNode("target", TargetParser()).addChild(
ArgumentNode("destination", Vec3Parser, executor = executor)
)
)).unsafeCast()
}
fun relative() {
var executed = false
val node = createNode { executed = true }
node.execute("tp @s ~ ~10 ~")
assertTrue(executed)
}
fun relativeStack() {
val node = createNode {
assertEquals(it["tp"], "tp")
assertEquals(it["target"], SelectorEntityTarget(TargetSelectors.SELF, emptyMap()))
assertEquals(it["destination"], Vec3Coordinate(Coordinate(CoordinateRelatives.TILDE, 0.0f), Coordinate(CoordinateRelatives.TILDE, +10.0f), Coordinate(CoordinateRelatives.TILDE, 0.0f)))
}
node.execute("tp @s ~ ~10 ~")
}
}

3
src/main/java/de/bixilon/minosoft/commands/parser/minecraft/target/TargetSelectors.kt
View File

@ -1,6 +1,6 @@
/*
* Minosoft
* Copyright (C) 2020-2022 Moritz Zwerger
* Copyright (C) 2020-2023 Moritz Zwerger
*
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
*
@ -27,6 +27,7 @@ enum class TargetSelectors(
RANDOM('r', Sorting.RANDOM),
ALL_PLAYERS('a', Sorting.ARBITRARY),
ALL_ENTITIES('e', Sorting.ARBITRARY),
SELF('s', Sorting.NEAREST),
;