Skip to content

Commit 662bcdc

Browse files
astorksastorks
committed
Added JorelAli CommandAPI library.
1 parent 2f8b85f commit 662bcdc

File tree

10 files changed

+90
-7
lines changed

10 files changed

+90
-7
lines changed

‎.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ScriptableMC-Engine-Core/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ dependencies {
3030
implementation("org.jetbrains.kotlin:kotlin-reflect")
3131
implementation("commons-io:commons-io:2.6")
3232
implementation("de.tr7zw:item-nbt-api:2.2.0")
33+
implementation("dev.jorel:commandapi-core:3.4")
3334

3435
testImplementation("junit", "junit", "4.12")
3536
}

‎ScriptableMC-Engine-JS/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ dependencies {
3434
implementation("org.jetbrains.kotlin:kotlin-reflect")
3535
implementation("commons-io:commons-io:2.6")
3636
implementation("de.tr7zw:item-nbt-api:2.2.0")
37+
implementation("dev.jorel:commandapi-core:3.4")
3738

3839
testImplementation("junit", "junit", "4.12")
3940
}

‎ScriptableMC-Engine-JS/src/main/kotlin/com/pixlfox/scriptablemc/SMCJavaScriptEngineMain.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ package com.pixlfox.scriptablemc
22

33
import co.aikar.commands.PaperCommandManager
44
import com.pixlfox.scriptablemc.core.JavaScriptPluginEngine
5+
import dev.jorel.commandapi.CommandAPI
6+
import dev.jorel.commandapi.CommandAPICommand
7+
import dev.jorel.commandapi.CommandPermission
58
import org.bukkit.ChatColor
69
import org.bukkit.command.CommandSender
710

‎ScriptableMC-Engine-PY/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ dependencies {
3434
implementation("org.jetbrains.kotlin:kotlin-reflect")
3535
implementation("commons-io:commons-io:2.6")
3636
implementation("de.tr7zw:item-nbt-api:2.2.0")
37+
implementation("dev.jorel:commandapi-core:3.4")
3738

3839
testImplementation("junit", "junit", "4.12")
3940
}

‎ScriptableMC-Tools-TS/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ dependencies {
3737
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
3838
implementation("commons-io:commons-io:2.6")
3939
implementation("de.tr7zw:item-nbt-api:2.2.0")
40+
implementation("dev.jorel:commandapi-core:3.4")
4041

4142
testImplementation("junit", "junit", "4.12")
4243
}

‎ScriptableMC-Tools-TS/src/main/kotlin/com/pixlfox/scriptablemc/TypescriptLibraryExporter.kt‎

Lines changed: 74 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
2828
"java.nio",
2929
"khttp",
3030
"org.apache.commons.io",
31-
"de.tr7zw"
31+
"de.tr7zw",
32+
"dev.jorel.commandapi"
3233
)
3334
private val packageRedirects: MutableMap<String, String> = mutableMapOf(
3435
"de.tr7zw.changeme" to "com.smc"
@@ -187,8 +188,79 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
187188
de.tr7zw.changeme.nbtapi.NBTFile::class.java,
188189
de.tr7zw.changeme.nbtapi.NBTContainer::class.java,
189190

191+
dev.jorel.commandapi.CommandAPI::class.java,
192+
dev.jorel.commandapi.CommandAPICommand::class.java,
193+
dev.jorel.commandapi.CommandPermission::class.java,
194+
195+
dev.jorel.commandapi.arguments.Argument::class.java,
196+
dev.jorel.commandapi.arguments.AdvancementArgument::class.java,
197+
dev.jorel.commandapi.arguments.AxisArgument::class.java,
198+
dev.jorel.commandapi.arguments.BiomeArgument::class.java,
199+
dev.jorel.commandapi.arguments.BlockStateArgument::class.java,
200+
dev.jorel.commandapi.arguments.BooleanArgument::class.java,
201+
dev.jorel.commandapi.arguments.ChatArgument::class.java,
202+
dev.jorel.commandapi.arguments.ChatColorArgument::class.java,
203+
dev.jorel.commandapi.arguments.ChatComponentArgument::class.java,
204+
dev.jorel.commandapi.arguments.CommandAPIArgumentType::class.java,
205+
dev.jorel.commandapi.arguments.CustomArgument::class.java,
206+
dev.jorel.commandapi.arguments.DoubleArgument::class.java,
207+
dev.jorel.commandapi.arguments.EnchantmentArgument::class.java,
208+
dev.jorel.commandapi.arguments.EntitySelectorArgument::class.java,
209+
dev.jorel.commandapi.arguments.EnvironmentArgument::class.java,
210+
dev.jorel.commandapi.arguments.EntityTypeArgument::class.java,
211+
dev.jorel.commandapi.arguments.FloatArgument::class.java,
212+
dev.jorel.commandapi.arguments.FloatRangeArgument::class.java,
213+
dev.jorel.commandapi.arguments.FunctionArgument::class.java,
214+
dev.jorel.commandapi.arguments.GreedyStringArgument::class.java,
215+
dev.jorel.commandapi.arguments.IntegerArgument::class.java,
216+
dev.jorel.commandapi.arguments.IntegerRangeArgument::class.java,
217+
dev.jorel.commandapi.arguments.ItemStackArgument::class.java,
218+
dev.jorel.commandapi.arguments.LiteralArgument::class.java,
219+
dev.jorel.commandapi.arguments.Location2DArgument::class.java,
220+
dev.jorel.commandapi.arguments.LocationArgument::class.java,
221+
dev.jorel.commandapi.arguments.LocationType::class.java,
222+
dev.jorel.commandapi.arguments.LongArgument::class.java,
223+
dev.jorel.commandapi.arguments.LootTableArgument::class.java,
224+
dev.jorel.commandapi.arguments.MathOperationArgument::class.java,
225+
dev.jorel.commandapi.arguments.NBTCompoundArgument::class.java,
226+
dev.jorel.commandapi.arguments.ObjectiveArgument::class.java,
227+
dev.jorel.commandapi.arguments.ObjectiveCriteriaArgument::class.java,
228+
dev.jorel.commandapi.arguments.ParticleArgument::class.java,
229+
dev.jorel.commandapi.arguments.PlayerArgument::class.java,
230+
dev.jorel.commandapi.arguments.PotionEffectArgument::class.java,
231+
dev.jorel.commandapi.arguments.RecipeArgument::class.java,
232+
dev.jorel.commandapi.arguments.RotationArgument::class.java,
233+
dev.jorel.commandapi.arguments.ScoreHolderArgument::class.java,
234+
dev.jorel.commandapi.arguments.ScoreboardSlotArgument::class.java,
235+
dev.jorel.commandapi.arguments.SoundArgument::class.java,
236+
dev.jorel.commandapi.arguments.StringArgument::class.java,
237+
dev.jorel.commandapi.arguments.TeamArgument::class.java,
238+
dev.jorel.commandapi.arguments.TextArgument::class.java,
239+
dev.jorel.commandapi.arguments.TimeArgument::class.java,
240+
190241
java.io.File::class.java
191242
)
243+
244+
// addClass("dev.jorel.commandapi", "CommandAPI")
245+
// addClass("dev.jorel.commandapi", "CommandAPICommand")
246+
// addClass("dev.jorel.commandapi", "CommandPermission")
247+
//
248+
// // dev.jorel.commandapi.arguments.*
249+
// addClasses("dev.jorel.commandapi.arguments", arrayOf(
250+
// "Argument", "AdvancementArgument", "AxisArgument", "BiomeArgument",
251+
// "BlockStateArgument", "BooleanArgument", "ChatArgument", "ChatColorArgument",
252+
// "ChatComponentArgument", "CommandAPIArgumentType", "CustomArgument", "DoubleArgument",
253+
// "EnchantmentArgument", "EntitySelectorArgument", "EnvironmentArgument",
254+
// "EntityTypeArgument", "FloatArgument", "FloatRangeArgument", "FunctionArgument",
255+
// "GreedyStringArgument", "IntegerArgument", "IntegerRangeArgument",
256+
// "ItemStackArgument", "LiteralArgument", "Location2DArgument", "LocationArgument",
257+
// "LocationType", "LongArgument", "LootTableArgument", "MathOperationArgument",
258+
// "NBTCompoundArgument", "ObjectiveArgument", "ObjectiveCriteriaArgument",
259+
// "ParticleArgument", "PlayerArgument", "PotionEffectArgument", "RecipeArgument",
260+
// "RotationArgument", "ScoreHolderArgument", "ScoreboardSlotArgument", "SoundArgument",
261+
// "StringArgument", "TeamArgument", "TextArgument", "TimeArgument"
262+
// ))
263+
192264
return this
193265
}
194266

@@ -289,7 +361,7 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
289361
val genericType = _method.genericReturnType
290362
val className = stripPackageName(returnType.name)
291363
if(className.equals("List", false) || className.equals("Collection", false)) {
292-
if(genericType != null && genericType is ParameterizedType) {
364+
if(genericType is ParameterizedType) {
293365
val actualTypeArg = genericType.actualTypeArguments.firstOrNull()
294366
if(actualTypeArg != null) {
295367
when (actualTypeArg) {

‎ScriptableMC-Tools-TS/type-search-index.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎build.gradle.kts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
java
3-
id("org.jetbrains.kotlin.jvm") version "1.3.61" apply false
3+
id("org.jetbrains.kotlin.jvm") version "1.3.72" apply false
44
id("com.github.johnrengelman.shadow") version "5.2.0" apply false
55
id("org.jetbrains.gradle.plugin.idea-ext") version "0.7" apply false
66
}
@@ -44,6 +44,10 @@ allprojects {
4444
name = "codemc-repo"
4545
url = uri("https://repo.codemc.org/repository/maven-public/")
4646
}
47+
maven {
48+
name = "mccommandapi"
49+
url = uri("https://raw.githubusercontent.com/JorelAli/1.13-Command-API/mvn-repo/1.13CommandAPI/")
50+
}
4751
}
4852
}
4953

‎settings.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ rootProject.name = "ScriptableMC-Engine"
33
include("ScriptableMC-Engine-Core")
44
include("ScriptableMC-Engine-JS")
55
include("ScriptableMC-Engine-JS:Bundled")
6-
include("ScriptableMC-Engine-PY")
7-
include("ScriptableMC-Engine-PY:Bundled")
6+
//include("ScriptableMC-Engine-PY")
7+
//include("ScriptableMC-Engine-PY:Bundled")
88
include("ScriptableMC-Tools-TS")

0 commit comments

Comments
 (0)