Skip to content

Commit 0cd0e52

Browse files
committed
Merge branch 'master' into dev/dev
2 parents 2a86fcd + 3193ce5 commit 0cd0e52

File tree

6 files changed

+6
-13
lines changed

6 files changed

+6
-13
lines changed

docs/en/create-commands/arguments/types/nbt-arguments.md

-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ authors:
1010

1111
The CommandAPI includes support for NBT compound arguments using an NBT API. The usage for the `NBTCompoundArgument` depends on whether you are using the CommandAPI plugin (using a `CommandAPI.jar` file in your `plugins/` folder), or are shading the CommandAPI (including the compiled CommandAPI code in your own plugin).
1212

13-
## Plugin usage setup
14-
15-
By default, the CommandAPI plugin includes a copy of the [NBT API by tr7zw](https://www.spigotmc.org/resources/nbt-api.7939/) in `dev.jorel.commandapi.nbtapi`. No additional setup is required, and it can be used directly out the box.
16-
1713
## Shading usage setup
1814

1915
In order to use the `NBTCompoundArgument`, you will have to use an NBT API that can create an NBT Compound object from an `Object` (ideally a `net.minecraft.nbt.NBTTagCompound` object). Examples of NBT APIs that can do this are _(these are not sponsored in any way)_:

docs/en/intro.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,5 @@ You can use the sidebar on the left to access the various sections of the docume
3737

3838
Using the search icon in the top left corner, you can search for anything in this entire documentation. For example, typing "Example" will show a list of examples which are included throughout the documentation.
3939

40-
## Latest documentation changes ( `9.4.1 → 9.7.0` ) {#latest-changes}
41-
- Updates [Particle data (1.20.5+)](./create-commands/arguments/types/misc/particle-arguments) page with new `Trail` particle information.
42-
- Adds new [`thenNested()`](./create-commands/command-trees#reduce-indentation-with-nested-arguments) method to command trees.
43-
- Adds [tools](./test/intro) for running unit tests on commands.
40+
## Latest documentation changes ( `9.7.0 → 10.0.0` ) {#latest-changes}
41+
- ??? (Coming soon????)

docs/public/versions.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
versions:
2+
- 10.0.0
23
- 9.7.0
34
- 9.6.1
45
- 9.4.2

reference-code/src/main/java/createcommands/Unregistration.java

-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ public void run() {
107107

108108
new JavaPlugin() {
109109
// #region unregisterDelayedVanillaGoodExample
110-
// NOT RECOMMENDED
111110
@Override
112111
public void onEnable() {
113112
new BukkitRunnable() {

reference-code/src/main/kotlin/createcommands/Unregistration.kt

-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ fun unregistration() {
9696

9797
object : JavaPlugin() {
9898
// #region unregisterDelayedVanillaGoodExample
99-
// NOT RECOMMENDED
10099
override fun onEnable() {
101100
object : BukkitRunnable() {
102101
override fun run() {

reference-code/src/main/kotlin/internal/BrigadierPlusCommandAPI.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ fun brigadierPlusCommandAPI() {
4545
// #endregion addPredicateExampleStep5
4646

4747
// #region addPredicateExampleStep6
48-
// Add <numerator> <denominator> as a child of randomchance
49-
randomChance.addChild(numerator.then(denominator).build())
48+
// Add (randomchance <numerator> <denominator>) as a child of (execute -> if)
49+
Brigadier.getRootNode().getChild("execute").getChild("if").addChild(randomChance);
5050
// #endregion addPredicateExampleStep6
5151
// #endregion addPredicateExample
52-
}
52+
}

0 commit comments

Comments
 (0)