zhdev/oblak
1
0
Fork 0
Code Issues Pull requests Activity

Update CraftBukkit reflection for 1.18

Browse source
This commit is contained in:
Jason Penilla 2021-11-25 14:23:19 -08:00 • committed by Jason
parent 9dc4e87fa8
commit 66c803852c
6 changed files with 162 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

45
examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/ExamplePlugin.java
View file

@ -44,11 +44,8 @@ import cloud.commandframework.arguments.standard.StringArrayArgument;
import cloud.commandframework.bukkit.BukkitCommandManager;
import cloud.commandframework.bukkit.CloudBukkitCapabilities;
import cloud.commandframework.bukkit.arguments.selector.SingleEntitySelector;
import cloud.commandframework.bukkit.data.ItemStackPredicate;
import cloud.commandframework.bukkit.data.ProtoItemStack;
import cloud.commandframework.bukkit.parsers.EnchantmentArgument;
import cloud.commandframework.bukkit.parsers.ItemStackArgument;
import cloud.commandframework.bukkit.parsers.ItemStackPredicateArgument;
import cloud.commandframework.bukkit.parsers.MaterialArgument;
import cloud.commandframework.bukkit.parsers.WorldArgument;
import cloud.commandframework.bukkit.parsers.selector.SingleEntitySelectorArgument;
@ -383,47 +380,9 @@ public final class ExamplePlugin extends JavaPlugin {
)))
);
// MC 1.13+ commands todo: move to separate class
// Commands using MC 1.13+ argument types
if (this.manager.queryCapability(CloudBukkitCapabilities.BRIGADIER)) {
/*
this.manager.command(builder.literal("replace")
.senderType(Player.class)
.argument(BlockPredicateArgument.of("predicate"))
.literal("with")
.argument(MaterialArgument.of("block")) // todo: use BlockDataArgument
.argument(IntegerArgument.<CommandSender>newBuilder("radius").withMin(1))
.handler(ctx -> {
final BlockData block = ctx.<Material>get("block").createBlockData();
final BlockPredicate predicate = ctx.get("predicate");
final int radius = ctx.get("radius");
final Player player = (Player) ctx.getSender();
final Location loc = player.getLocation();
this.manager.taskRecipe().begin(ctx).synchronous(context -> {
for (double x = loc.getX() - radius; x < loc.getX() + radius; x++) {
for (double y = loc.getY() - radius; y < loc.getY() + radius; y++) {
for (double z = loc.getZ() - radius; z < loc.getZ() + radius; z++) {
final Block blockAt = player.getWorld().getBlockAt((int) x, (int) y, (int) z);
if (predicate.test(blockAt)) {
blockAt.setBlockData(block);
}
}
}
}
}).execute();
}));
*/
this.manager.command(builder.literal("test_item")
.argument(ItemStackArgument.of("item"))
.literal("is")
.argument(ItemStackPredicateArgument.of("predicate"))
.handler(ctx -> {
final ProtoItemStack protoItemStack = ctx.get("item");
final ItemStackPredicate predicate = ctx.get("predicate");
ctx.getSender().sendMessage("result: " + predicate.test(
protoItemStack.createItemStack(1, true)));
}));
new Mc113(this.manager).registerCommands();
}
//

102
examples/example-bukkit/src/main/java/cloud/commandframework/examples/bukkit/Mc113.java Normal file
View file

@ -0,0 +1,102 @@
//
// MIT License
//
// Copyright (c) 2021 Alexander Söderberg & Contributors
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
//
package cloud.commandframework.examples.bukkit;
import cloud.commandframework.Command;
import cloud.commandframework.arguments.standard.IntegerArgument;
import cloud.commandframework.bukkit.BukkitCommandManager;
import cloud.commandframework.bukkit.data.BlockPredicate;
import cloud.commandframework.bukkit.data.ItemStackPredicate;
import cloud.commandframework.bukkit.data.ProtoItemStack;
import cloud.commandframework.bukkit.parsers.BlockPredicateArgument;
import cloud.commandframework.bukkit.parsers.ItemStackArgument;
import cloud.commandframework.bukkit.parsers.ItemStackPredicateArgument;
import cloud.commandframework.bukkit.parsers.MaterialArgument;
import cloud.commandframework.context.CommandContext;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.data.BlockData;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.framework.qual.DefaultQualifier;
@DefaultQualifier(NonNull.class)
final class Mc113 {
private final BukkitCommandManager<CommandSender> manager;
Mc113(final BukkitCommandManager<CommandSender> manager) {
this.manager = manager;
}
void registerCommands() {
final Command.Builder<CommandSender> builder = this.manager.commandBuilder("example")
.literal("mc113");
this.manager.command(builder.literal("replace")
.senderType(Player.class)
.argument(BlockPredicateArgument.of("predicate"))
.literal("with")
.argument(MaterialArgument.of("block")) // todo: use BlockDataArgument
.argument(IntegerArgument.<CommandSender>newBuilder("radius").withMin(1))
.handler(this::executeReplace));
this.manager.command(builder.literal("test_item")
.argument(ItemStackArgument.of("item"))
.literal("is")
.argument(ItemStackPredicateArgument.of("predicate"))
.handler(Mc113::executeTestItem));
}
private void executeReplace(final CommandContext<CommandSender> ctx) {
final BlockData block = ctx.<Material>get("block").createBlockData();
final BlockPredicate predicate = ctx.get("predicate");
final int radius = ctx.get("radius");
final Player player = (Player) ctx.getSender();
final Location loc = player.getLocation();
this.manager.taskRecipe().begin(ctx).synchronous(context -> {
for (double x = loc.getX() - radius; x < loc.getX() + radius; x++) {
for (double y = loc.getY() - radius; y < loc.getY() + radius; y++) {
for (double z = loc.getZ() - radius; z < loc.getZ() + radius; z++) {
final Block blockAt = player.getWorld().getBlockAt((int) x, (int) y, (int) z);
if (predicate.test(blockAt)) {
blockAt.setBlockData(block);
}
}
}
}
}).execute();
}
private static void executeTestItem(final CommandContext<CommandSender> ctx) {
final ProtoItemStack protoItemStack = ctx.get("item");
final ItemStackPredicate predicate = ctx.get("predicate");
ctx.getSender().sendMessage("result: " + predicate.test(
protoItemStack.createItemStack(1, true)));
}
}