From 439b6fa60750c6a0acc0b7ef9dff99e027348487 Mon Sep 17 00:00:00 2001
From: nitu2003 <nitu2003@126.com>
Date: Sat, 3 Apr 2021 17:16:15 +0800
Subject: [PATCH] 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>
---
 build.gradle.kts                              |  2 +-
 .../cn/taskeren/brigadierx/BrigadierX.kt      | 28 +++++++++----------
 .../brigadier}/ArgumentBuilderSample.kt       |  6 +++-
 3 files changed, 20 insertions(+), 16 deletions(-)
 rename src/test/kotlin/cn/taskeren/{brigadierx => sample/brigadier}/ArgumentBuilderSample.kt (91%)

diff --git a/build.gradle.kts b/build.gradle.kts
index ced853e..c6b45fb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "cn.taskeren.brigadierx"
-version = "1.0-SNAPSHOT"
+version = "1.1-SNAPSHOT"
 
 repositories {
     maven("http://maven.aliyun.com/nexus/content/groups/public/")
diff --git a/src/main/kotlin/cn/taskeren/brigadierx/BrigadierX.kt b/src/main/kotlin/cn/taskeren/brigadierx/BrigadierX.kt
index f4c0f92..113d7e8 100644
--- a/src/main/kotlin/cn/taskeren/brigadierx/BrigadierX.kt
+++ b/src/main/kotlin/cn/taskeren/brigadierx/BrigadierX.kt
@@ -13,12 +13,12 @@ import com.mojang.brigadier.context.CommandContext
 /**
  * LiteralArgumentBuilder 构造方法语法糖
  */
-internal fun <S> LiteralArgumentBuilder(name: String) = LiteralArgumentBuilder.literal<S>(name)
+fun <S> newLiteralArgBuilder(name: String): LiteralArgumentBuilder<S> = LiteralArgumentBuilder.literal<S>(name)
 
 /**
  * LiteralArgumentBuilder 构造方法语法糖
  */
-internal fun <S> LiteralArgumentBuilder(name: String, func: LiteralArgumentBuilder<S>.() -> Unit) = LiteralArgumentBuilder.literal<S>(name).apply { func.invoke(this) }
+fun <S> newLiteralArgBuilder(name: String, func: LiteralArgumentBuilder<S>.() -> Unit): LiteralArgumentBuilder<S> = LiteralArgumentBuilder.literal<S>(name).apply { func.invoke(this) }
 
 /**
  * 注册指令
@@ -27,8 +27,8 @@ internal fun <S> LiteralArgumentBuilder(name: String, func: LiteralArgumentBuild
  * @param func 传入根命令，进行命令注册
  * @return Dispatcher
  */
-internal fun <S> CommandDispatcher<S>.register(name: String, func: LiteralArgumentBuilder<S>.() -> Unit): CommandDispatcher<S> {
-    val rootCommand = LiteralArgumentBuilder<S>(name)
+fun <S> CommandDispatcher<S>.register(name: String, func: LiteralArgumentBuilder<S>.() -> Unit): CommandDispatcher<S> {
+    val rootCommand = newLiteralArgBuilder<S>(name)
     func.invoke(rootCommand)
     this.register(rootCommand)
     return this
@@ -40,26 +40,26 @@ internal fun <S> CommandDispatcher<S>.register(name: String, func: LiteralArgume
  *
  * ================================== */
 
-internal fun <S> LiteralArgumentBuilder<S>.literal(name: String): LiteralArgumentBuilder<S> {
-    val subcommand = LiteralArgumentBuilder<S>(name)
+fun <S> LiteralArgumentBuilder<S>.literal(name: String): LiteralArgumentBuilder<S> {
+    val subcommand = newLiteralArgBuilder<S>(name)
     this.then(subcommand)
     return subcommand
 }
 
-internal fun <S> LiteralArgumentBuilder<S>.literal(name: String, func: LiteralArgumentBuilder<S>.() -> Unit): LiteralArgumentBuilder<S> {
+fun <S> LiteralArgumentBuilder<S>.literal(name: String, func: LiteralArgumentBuilder<S>.() -> Unit): LiteralArgumentBuilder<S> {
     val subcommand = LiteralArgumentBuilder.literal<S>(name)
     func.invoke(subcommand)
     this.then(subcommand)
     return subcommand
 }
 
-internal fun <S, T> RequiredArgumentBuilder<S, T>.literal(name: String): LiteralArgumentBuilder<S> {
+fun <S, T> RequiredArgumentBuilder<S, T>.literal(name: String): LiteralArgumentBuilder<S> {
     val subcommand = LiteralArgumentBuilder.literal<S>(name)
     this.then(subcommand)
     return subcommand
 }
 
-internal fun <S, T> RequiredArgumentBuilder<S, T>.literal(name: String, func: LiteralArgumentBuilder<S>.() -> Unit): LiteralArgumentBuilder<S> {
+fun <S, T> RequiredArgumentBuilder<S, T>.literal(name: String, func: LiteralArgumentBuilder<S>.() -> Unit): LiteralArgumentBuilder<S> {
     val subcommand = LiteralArgumentBuilder.literal<S>(name)
     func.invoke(subcommand)
     this.then(subcommand)
@@ -72,26 +72,26 @@ internal fun <S, T> RequiredArgumentBuilder<S, T>.literal(name: String, func: Li
  *
  * ================================== */
 
-internal fun <S, T> LiteralArgumentBuilder<S>.argument(name: String, type: ArgumentType<T>): RequiredArgumentBuilder<S, T> {
+fun <S, T> LiteralArgumentBuilder<S>.argument(name: String, type: ArgumentType<T>): RequiredArgumentBuilder<S, T> {
     val rab = RequiredArgumentBuilder.argument<S, T>(name, type)
     this.then(rab)
     return rab
 }
 
-internal fun <S, T> LiteralArgumentBuilder<S>.argument(name: String, type: ArgumentType<T>, func: RequiredArgumentBuilder<S, T>.() -> Unit): RequiredArgumentBuilder<S, T> {
+fun <S, T> LiteralArgumentBuilder<S>.argument(name: String, type: ArgumentType<T>, func: RequiredArgumentBuilder<S, T>.() -> Unit): RequiredArgumentBuilder<S, T> {
     val rab = RequiredArgumentBuilder.argument<S, T>(name, type)
     func.invoke(rab)
     this.then(rab)
     return rab
 }
 
-internal fun <S, T1, T2> RequiredArgumentBuilder<S, T1>.argument(name: String, type: ArgumentType<T2>): RequiredArgumentBuilder<S, T2> {
+fun <S, T1, T2> RequiredArgumentBuilder<S, T1>.argument(name: String, type: ArgumentType<T2>): RequiredArgumentBuilder<S, T2> {
     val rab = RequiredArgumentBuilder.argument<S, T2>(name, type)
     this.then(rab)
     return rab
 }
 
-internal fun <S, T1, T2> RequiredArgumentBuilder<S, T1>.argument(name: String, type: ArgumentType<T2>, func: RequiredArgumentBuilder<S, T2>.() -> Unit): RequiredArgumentBuilder<S, T2> {
+fun <S, T1, T2> RequiredArgumentBuilder<S, T1>.argument(name: String, type: ArgumentType<T2>, func: RequiredArgumentBuilder<S, T2>.() -> Unit): RequiredArgumentBuilder<S, T2> {
     val rab = RequiredArgumentBuilder.argument<S, T2>(name, type)
     func.invoke(rab)
     this.then(rab)
@@ -105,7 +105,7 @@ internal fun <S, T1, T2> RequiredArgumentBuilder<S, T1>.argument(name: String, t
  *
  * ================================== */
 
-internal fun <S, T: ArgumentBuilder<S, T>> ArgumentBuilder<S, T>.executex(func: (CommandContext<S>) -> Any) {
+fun <S, T: ArgumentBuilder<S, T>> ArgumentBuilder<S, T>.executex(func: (CommandContext<S>) -> Any) {
     this.executes {
         func.invoke(it)
         Command.SINGLE_SUCCESS
diff --git a/src/test/kotlin/cn/taskeren/brigadierx/ArgumentBuilderSample.kt b/src/test/kotlin/cn/taskeren/sample/brigadier/ArgumentBuilderSample.kt
similarity index 91%
rename from src/test/kotlin/cn/taskeren/brigadierx/ArgumentBuilderSample.kt
rename to src/test/kotlin/cn/taskeren/sample/brigadier/ArgumentBuilderSample.kt
index fa8fad1..15974de 100644
--- a/src/test/kotlin/cn/taskeren/brigadierx/ArgumentBuilderSample.kt
+++ b/src/test/kotlin/cn/taskeren/sample/brigadier/ArgumentBuilderSample.kt
@@ -1,5 +1,9 @@
-package cn.taskeren.brigadierx
+package cn.taskeren.sample.brigadier
 
+import cn.taskeren.brigadierx.argument
+import cn.taskeren.brigadierx.executex
+import cn.taskeren.brigadierx.literal
+import cn.taskeren.brigadierx.register
 import com.mojang.brigadier.CommandDispatcher
 import com.mojang.brigadier.arguments.IntegerArgumentType
 import com.mojang.brigadier.arguments.StringArgumentType