Skip to content

Commit 439b6fa

Browse files
committed
Fix package visibility errors
1. Fix package visibility errors and renamed the package of test classes. 2. renamed LiteralArgumentBuilder(String) and LiteralArgumentBuilder(String, Function) to newLiteralArgBuilder(String) and newLiteralArgBuilder(String, Function) 3. bump version to v1.1 Signed-off-by: nitu2003 <nitu2003@126.com>
1 parent f398d55 commit 439b6fa

File tree

3 files changed

+20
-16
lines changed

3 files changed

+20
-16
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
}
77

88
group = "cn.taskeren.brigadierx"
9-
version = "1.0-SNAPSHOT"
9+
version = "1.1-SNAPSHOT"
1010

1111
repositories {
1212
maven("http://maven.aliyun.com/nexus/content/groups/public/")

src/main/kotlin/cn/taskeren/brigadierx/BrigadierX.kt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ import com.mojang.brigadier.context.CommandContext
1313
/**
1414
* LiteralArgumentBuilder 构造方法语法糖
1515
*/
16-
internal fun <S> LiteralArgumentBuilder(name: String) = LiteralArgumentBuilder.literal<S>(name)
16+
fun <S> newLiteralArgBuilder(name: String): LiteralArgumentBuilder<S> = LiteralArgumentBuilder.literal<S>(name)
1717

1818
/**
1919
* LiteralArgumentBuilder 构造方法语法糖
2020
*/
21-
internal fun <S> LiteralArgumentBuilder(name: String, func: LiteralArgumentBuilder<S>.() -> Unit) = LiteralArgumentBuilder.literal<S>(name).apply { func.invoke(this) }
21+
fun <S> newLiteralArgBuilder(name: String, func: LiteralArgumentBuilder<S>.() -> Unit): LiteralArgumentBuilder<S> = LiteralArgumentBuilder.literal<S>(name).apply { func.invoke(this) }
2222

2323
/**
2424
* 注册指令
@@ -27,8 +27,8 @@ internal fun <S> LiteralArgumentBuilder(name: String, func: LiteralArgumentBuild
2727
* @param func 传入根命令,进行命令注册
2828
* @return Dispatcher
2929
*/
30-
internal fun <S> CommandDispatcher<S>.register(name: String, func: LiteralArgumentBuilder<S>.() -> Unit): CommandDispatcher<S> {
31-
val rootCommand = LiteralArgumentBuilder<S>(name)
30+
fun <S> CommandDispatcher<S>.register(name: String, func: LiteralArgumentBuilder<S>.() -> Unit): CommandDispatcher<S> {
31+
val rootCommand = newLiteralArgBuilder<S>(name)
3232
func.invoke(rootCommand)
3333
this.register(rootCommand)
3434
return this
@@ -40,26 +40,26 @@ internal fun <S> CommandDispatcher<S>.register(name: String, func: LiteralArgume
4040
*
4141
* ================================== */
4242

43-
internal fun <S> LiteralArgumentBuilder<S>.literal(name: String): LiteralArgumentBuilder<S> {
44-
val subcommand = LiteralArgumentBuilder<S>(name)
43+
fun <S> LiteralArgumentBuilder<S>.literal(name: String): LiteralArgumentBuilder<S> {
44+
val subcommand = newLiteralArgBuilder<S>(name)
4545
this.then(subcommand)
4646
return subcommand
4747
}
4848

49-
internal fun <S> LiteralArgumentBuilder<S>.literal(name: String, func: LiteralArgumentBuilder<S>.() -> Unit): LiteralArgumentBuilder<S> {
49+
fun <S> LiteralArgumentBuilder<S>.literal(name: String, func: LiteralArgumentBuilder<S>.() -> Unit): LiteralArgumentBuilder<S> {
5050
val subcommand = LiteralArgumentBuilder.literal<S>(name)
5151
func.invoke(subcommand)
5252
this.then(subcommand)
5353
return subcommand
5454
}
5555

56-
internal fun <S, T> RequiredArgumentBuilder<S, T>.literal(name: String): LiteralArgumentBuilder<S> {
56+
fun <S, T> RequiredArgumentBuilder<S, T>.literal(name: String): LiteralArgumentBuilder<S> {
5757
val subcommand = LiteralArgumentBuilder.literal<S>(name)
5858
this.then(subcommand)
5959
return subcommand
6060
}
6161

62-
internal fun <S, T> RequiredArgumentBuilder<S, T>.literal(name: String, func: LiteralArgumentBuilder<S>.() -> Unit): LiteralArgumentBuilder<S> {
62+
fun <S, T> RequiredArgumentBuilder<S, T>.literal(name: String, func: LiteralArgumentBuilder<S>.() -> Unit): LiteralArgumentBuilder<S> {
6363
val subcommand = LiteralArgumentBuilder.literal<S>(name)
6464
func.invoke(subcommand)
6565
this.then(subcommand)
@@ -72,26 +72,26 @@ internal fun <S, T> RequiredArgumentBuilder<S, T>.literal(name: String, func: Li
7272
*
7373
* ================================== */
7474

75-
internal fun <S, T> LiteralArgumentBuilder<S>.argument(name: String, type: ArgumentType<T>): RequiredArgumentBuilder<S, T> {
75+
fun <S, T> LiteralArgumentBuilder<S>.argument(name: String, type: ArgumentType<T>): RequiredArgumentBuilder<S, T> {
7676
val rab = RequiredArgumentBuilder.argument<S, T>(name, type)
7777
this.then(rab)
7878
return rab
7979
}
8080

81-
internal fun <S, T> LiteralArgumentBuilder<S>.argument(name: String, type: ArgumentType<T>, func: RequiredArgumentBuilder<S, T>.() -> Unit): RequiredArgumentBuilder<S, T> {
81+
fun <S, T> LiteralArgumentBuilder<S>.argument(name: String, type: ArgumentType<T>, func: RequiredArgumentBuilder<S, T>.() -> Unit): RequiredArgumentBuilder<S, T> {
8282
val rab = RequiredArgumentBuilder.argument<S, T>(name, type)
8383
func.invoke(rab)
8484
this.then(rab)
8585
return rab
8686
}
8787

88-
internal fun <S, T1, T2> RequiredArgumentBuilder<S, T1>.argument(name: String, type: ArgumentType<T2>): RequiredArgumentBuilder<S, T2> {
88+
fun <S, T1, T2> RequiredArgumentBuilder<S, T1>.argument(name: String, type: ArgumentType<T2>): RequiredArgumentBuilder<S, T2> {
8989
val rab = RequiredArgumentBuilder.argument<S, T2>(name, type)
9090
this.then(rab)
9191
return rab
9292
}
9393

94-
internal fun <S, T1, T2> RequiredArgumentBuilder<S, T1>.argument(name: String, type: ArgumentType<T2>, func: RequiredArgumentBuilder<S, T2>.() -> Unit): RequiredArgumentBuilder<S, T2> {
94+
fun <S, T1, T2> RequiredArgumentBuilder<S, T1>.argument(name: String, type: ArgumentType<T2>, func: RequiredArgumentBuilder<S, T2>.() -> Unit): RequiredArgumentBuilder<S, T2> {
9595
val rab = RequiredArgumentBuilder.argument<S, T2>(name, type)
9696
func.invoke(rab)
9797
this.then(rab)
@@ -105,7 +105,7 @@ internal fun <S, T1, T2> RequiredArgumentBuilder<S, T1>.argument(name: String, t
105105
*
106106
* ================================== */
107107

108-
internal fun <S, T: ArgumentBuilder<S, T>> ArgumentBuilder<S, T>.executex(func: (CommandContext<S>) -> Any) {
108+
fun <S, T: ArgumentBuilder<S, T>> ArgumentBuilder<S, T>.executex(func: (CommandContext<S>) -> Any) {
109109
this.executes {
110110
func.invoke(it)
111111
Command.SINGLE_SUCCESS

src/test/kotlin/cn/taskeren/brigadierx/ArgumentBuilderSample.kt renamed to src/test/kotlin/cn/taskeren/sample/brigadier/ArgumentBuilderSample.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
package cn.taskeren.brigadierx
1+
package cn.taskeren.sample.brigadier
22

3+
import cn.taskeren.brigadierx.argument
4+
import cn.taskeren.brigadierx.executex
5+
import cn.taskeren.brigadierx.literal
6+
import cn.taskeren.brigadierx.register
37
import com.mojang.brigadier.CommandDispatcher
48
import com.mojang.brigadier.arguments.IntegerArgumentType
59
import com.mojang.brigadier.arguments.StringArgumentType

0 commit comments

Comments
 (0)