Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CommandAPI to 9.4.0 #56

Merged
merged 2 commits into from
May 12, 2024
Merged

Update CommandAPI to 9.4.0 #56

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0d90e9
Update CommandAPI to 9.4.0
Nobody314159 May 4, 2024
6b7b663
merge master and bump to 9.4.1
Nobody314159 May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,13 @@ repositories {
maven {
url = uri("https://repo.maven.apache.org/maven2/")
}

maven("https://repo.codemc.org/repository/maven-public/")
}

dependencies {
compileOnly("io.papermc.paper:paper-api:1.18.2-R0.1-SNAPSHOT")
compileOnly("dev.jorel.CommandAPI:commandapi-core:8.7.0")
compileOnly("dev.jorel:commandapi-bukkit-core:9.4.0")
compileOnly("com.playmonumenta:nbteditor:4.0")
compileOnly("com.playmonumenta:redissync:3.0")
compileOnly("com.google.code.gson:gson:2.8.5")
Expand Down
116 changes: 57 additions & 59 deletions src/main/java/com/playmonumenta/libraryofsouls/bestiary/BestiaryCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,45 +32,46 @@ public class BestiaryCommand {
public static void register() {
final String command = "bestiary";

EntitySelectorArgument.OnePlayer playerArg = new EntitySelectorArgument.OnePlayer("player");
IntegerArgument amountArg = new IntegerArgument("amount");

new CommandAPICommand(command)
.withSubcommand(new CommandAPICommand("get")
.withPermission(CommandPermission.fromString("los.bestiary.get"))
.withArguments(new EntitySelectorArgument.OnePlayer("player"))
.withArguments(new StringArgument("mobLabel").replaceSuggestions(LibraryOfSoulsCommand.LIST_MOBS_FUNCTION))
.withArguments(playerArg)
.withArguments(LibraryOfSoulsCommand.mobLabelArg)
.executes((sender, args) -> {
int kills = 0;
Soul soul = LibraryOfSoulsCommand.getSoul((String)args[1]);
SoulEntry soul = LibraryOfSoulsCommand.getSoul(args.getByArgument(LibraryOfSoulsCommand.mobLabelArg));
Player player = args.getByArgument(playerArg);
try {
kills = BestiaryManager.getKillsForMob((Player)args[0], LibraryOfSoulsCommand.getSoul((String)args[1]));
kills = BestiaryManager.getKillsForMob(player, soul);
} catch (Exception ex) {
throw CommandAPI.failWithString(ex.getMessage());
}
if (sender instanceof Player) {
sender.sendMessage(MessageFormat.format("{0}{1} {2}has killed {3}{4} {5}{6}",
ChatColor.BLUE, ((Player)args[0]).getName(),
ChatColor.WHITE,
ChatColor.GREEN, kills,
ChatColor.WHITE, LegacyComponentSerializer.legacySection().serialize(soul.getDisplayName())));
}
sender.sendMessage(Component.text().append(Component.text(player.getName(), NamedTextColor.BLUE))
.append(Component.text(" has killed "))
.append(Component.text(kills + " ", NamedTextColor.GREEN))
.append(soul.getDisplayName()));
return kills;
}))
.withSubcommand(new CommandAPICommand("set")
.withPermission(CommandPermission.fromString("los.bestiary.set"))
.withArguments(new EntitySelectorArgument.OnePlayer("player"))
.withArguments(new StringArgument("mobLabel").replaceSuggestions(LibraryOfSoulsCommand.LIST_MOBS_FUNCTION))
.withArguments(new IntegerArgument("amount"))
.withArguments(playerArg)
.withArguments(LibraryOfSoulsCommand.mobLabelArg)
.withArguments(amountArg)
.executes((sender, args) -> {
BestiaryManager.setKillsForMob((Player)args[0], LibraryOfSoulsCommand.getSoul((String)args[1]), (Integer)args[2]);
BestiaryManager.setKillsForMob(args.getByArgument(playerArg), LibraryOfSoulsCommand.getSoul(args.getByArgument(LibraryOfSoulsCommand.mobLabelArg)), args.getByArgument(amountArg));
}))
.withSubcommand(new CommandAPICommand("add")
.withPermission(CommandPermission.fromString("los.bestiary.add"))
.withArguments(new EntitySelectorArgument.OnePlayer("player"))
.withArguments(new StringArgument("mobLabel").replaceSuggestions(LibraryOfSoulsCommand.LIST_MOBS_FUNCTION))
.withArguments(new IntegerArgument("amount"))
.withArguments(playerArg)
.withArguments(LibraryOfSoulsCommand.mobLabelArg)
.withArguments(amountArg)
.executes((sender, args) -> {
int kills = 0;
try {
kills = BestiaryManager.addKillsToMob((Player)args[0], LibraryOfSoulsCommand.getSoul((String)args[1]), (Integer)args[2]);
kills = BestiaryManager.addKillsToMob(args.getByArgument(playerArg), LibraryOfSoulsCommand.getSoul(args.getByArgument(LibraryOfSoulsCommand.mobLabelArg)), args.getByArgument(amountArg));
} catch (Exception ex) {
throw CommandAPI.failWithString(ex.getMessage());
}
Expand All @@ -82,28 +83,28 @@ public static void register() {
Player player = LibraryOfSoulsCommand.getPlayer(sender);
BestiaryArea bestiary = LibraryOfSouls.Config.getBestiary();
if (bestiary == null) {
player.sendMessage(ChatColor.RED + "Bestiary not loaded");
player.sendMessage(Component.text("Bestiary not loaded", NamedTextColor.RED));
} else {
bestiary.openBestiary(player, null, null, -1);
}
}))
.withSubcommand(new CommandAPICommand("open")
.withPermission(CommandPermission.fromString("los.bestiary.openother"))
.withArguments(new EntitySelectorArgument.OnePlayer("player"))
.withArguments(playerArg)
.executes((sender, args) -> {
Player player = (Player)args[0];
Player player = args.getByArgument(playerArg);
BestiaryArea bestiary = LibraryOfSouls.Config.getBestiary();
if (bestiary == null) {
player.sendMessage(ChatColor.RED + "Bestiary not loaded");
player.sendMessage(Component.text("Bestiary not loaded", NamedTextColor.RED));
} else {
bestiary.openBestiary(player, null, null, -1);
}
}))
.withSubcommand(new CommandAPICommand("info")
.withPermission(CommandPermission.fromString("los.bestiary.info"))
.withArguments(new StringArgument("mobLabel").replaceSuggestions(LibraryOfSoulsCommand.LIST_MOBS_FUNCTION))
.withArguments(LibraryOfSoulsCommand.mobLabelArg)
.executesPlayer((sender, args) -> {
String name = (String)args[0];
String name = args.getByArgument(LibraryOfSoulsCommand.mobLabelArg);
SoulEntry soul = SoulsDatabase.getInstance().getSoul(name);
if (soul == null) {
throw CommandAPI.failWithString("Mob '" + name + "' not found");
Expand All @@ -114,9 +115,9 @@ public static void register() {
}))
.withSubcommand(new CommandAPICommand("deleteall")
.withPermission(CommandPermission.fromString("los.bestiary.deleteall"))
.withArguments(new EntitySelectorArgument.OnePlayer("player"))
.withArguments(playerArg)
.executes((sender, args) -> {
Player player = (Player)args[0];
Player player = args.getByArgument(playerArg);
BestiaryManager.deleteAll(player);
}))
.register();
Expand All @@ -125,44 +126,44 @@ public static void register() {
public static void registerWriteAccessCommands() {
final String command = "bestiary";

TextArgument loreArg = new TextArgument("lore");
TextArgument descriptionArg = new TextArgument("description");

new CommandAPICommand(command)
.withSubcommand(new CommandAPICommand("lore")
.withPermission(CommandPermission.fromString("los.bestiary.lore"))
.withArguments(new StringArgument("mobLabel").replaceSuggestions(LibraryOfSoulsCommand.LIST_MOBS_FUNCTION))
.withArguments(new TextArgument("lore"))
.withArguments(LibraryOfSoulsCommand.mobLabelArg)
.withArguments(loreArg)
.executesPlayer((sender, args) -> {
String name = (String)args[0];
String name = args.getByArgument(LibraryOfSoulsCommand.mobLabelArg);
SoulEntry soul = SoulsDatabase.getInstance().getSoul(name);
if (soul == null) {
throw CommandAPI.failWithString("Mob '" + name + "' not found");
} else {
Component component = Component.text((String)args[1]);
List<Component> compList = new ArrayList<Component>();
compList.add(component);
soul.setLore(compList, sender);
Component component = Component.text(args.getByArgument(loreArg));
soul.setLore(List.of(component), sender);
}
})
.executesProxy((sender, args) -> {
if (sender.getCallee() instanceof Player player) {
String name = (String)args[0];
String name = args.getByArgument(LibraryOfSoulsCommand.mobLabelArg);
SoulEntry soul = SoulsDatabase.getInstance().getSoul(name);
if (soul == null) {
throw CommandAPI.failWithString("Mob '" + name + "' not found");
} else {
Component component = Component.text(args.getByArgument(loreArg));
soul.setLore(List.of(component), player);
}
Component component = Component.text((String)args[1]);
List<Component> compList = new ArrayList<Component>();
compList.add(component);
soul.setLore(compList, player);
} else {
throw CommandAPI.failWithString("Callee must be instance of Player");
}
}))
.withSubcommand(new CommandAPICommand("lore")
.withSubcommand(new CommandAPICommand("clear")
.withPermission(CommandPermission.fromString("los.bestiary.lore"))
.withArguments(new StringArgument("mobLabel").replaceSuggestions(LibraryOfSoulsCommand.LIST_MOBS_FUNCTION))
.withArguments(LibraryOfSoulsCommand.mobLabelArg)
.executesPlayer((sender, args) -> {
String name = (String)args[0];
String name = args.getByArgument(LibraryOfSoulsCommand.mobLabelArg);
SoulEntry soul = SoulsDatabase.getInstance().getSoul(name);
if (soul == null) {
throw CommandAPI.failWithString("Mob '" + name + "' not found");
Expand All @@ -171,15 +172,15 @@ public static void registerWriteAccessCommands() {
})))
.withSubcommand(new CommandAPICommand("lore")
.withSubcommand(new CommandAPICommand("frommainhand")
.withArguments(new StringArgument("mobLabel").replaceSuggestions(LibraryOfSoulsCommand.LIST_MOBS_FUNCTION))
.withArguments(LibraryOfSoulsCommand.mobLabelArg)
.withPermission(CommandPermission.fromString("los.bestiary.lore"))
.executesPlayer((sender, args) -> {
ItemStack item = sender.getInventory().getItemInMainHand();
if (item == null || !item.getItemMeta().hasLore()) {
throw CommandAPI.failWithString("You need a valid item with lore text!");
}
List<Component> lore = item.lore();
String name = (String)args[0];
String name = args.getByArgument(LibraryOfSoulsCommand.mobLabelArg);
SoulEntry soul = SoulsDatabase.getInstance().getSoul(name);
if (soul == null) {
throw CommandAPI.failWithString("Mob '" + name + "' not found");
Expand All @@ -188,41 +189,38 @@ public static void registerWriteAccessCommands() {
})))
.withSubcommand(new CommandAPICommand("description")
.withPermission(CommandPermission.fromString("los.bestiary.description"))
.withArguments(new StringArgument("mobLabel").replaceSuggestions(LibraryOfSoulsCommand.LIST_MOBS_FUNCTION))
.withArguments(new TextArgument("description"))
.withArguments(LibraryOfSoulsCommand.mobLabelArg)
.withArguments(descriptionArg)
.executesPlayer((sender, args) -> {
String name = (String)args[0];
String name = args.getByArgument(LibraryOfSoulsCommand.mobLabelArg);
SoulEntry soul = SoulsDatabase.getInstance().getSoul(name);
if (soul == null) {
throw CommandAPI.failWithString("Mob '" + name + "' not found");
} else {
Component component = Component.text((String)args[1]);
List<Component> compList = new ArrayList<>();
compList.add(component);
soul.setDescription(compList, sender);
Component component = Component.text(args.getByArgument(descriptionArg));
soul.setDescription(List.of(component), sender);
}
})
.executesProxy((sender, args) -> {
if (sender.getCallee() instanceof Player player) {
String name = (String)args[0];
String name = args.getByArgument(LibraryOfSoulsCommand.mobLabelArg);
SoulEntry soul = SoulsDatabase.getInstance().getSoul(name);
if (soul == null) {
throw CommandAPI.failWithString("Mob '" + name + "' not found");
} else {
Component component = Component.text(args.getByArgument(descriptionArg));
soul.setDescription(List.of(component), player);
}
Component component = Component.text((String)args[1]);
List<Component> compList = new ArrayList<>();
compList.add(component);
soul.setDescription(compList, player);
} else {
throw CommandAPI.failWithString("Callee must be instance of Player");
}
}))
.withSubcommand(new CommandAPICommand("description")
.withSubcommand(new CommandAPICommand("clear")
.withPermission(CommandPermission.fromString("los.bestiary.description"))
.withArguments(new StringArgument("mobLabel").replaceSuggestions(LibraryOfSoulsCommand.LIST_MOBS_FUNCTION))
.withArguments(LibraryOfSoulsCommand.mobLabelArg)
.executesPlayer((sender, args) -> {
String name = (String)args[0];
String name = args.getByArgument(LibraryOfSoulsCommand.mobLabelArg);
SoulEntry soul = SoulsDatabase.getInstance().getSoul(name);
if (soul == null) {
throw CommandAPI.failWithString("Mob '" + name + "' not found");
Expand All @@ -231,15 +229,15 @@ public static void registerWriteAccessCommands() {
})))
.withSubcommand(new CommandAPICommand("description")
.withSubcommand(new CommandAPICommand("frommainhand")
.withArguments(new StringArgument("mobLabel").replaceSuggestions(LibraryOfSoulsCommand.LIST_MOBS_FUNCTION))
.withArguments(LibraryOfSoulsCommand.mobLabelArg)
.withPermission(CommandPermission.fromString("los.bestiary.description"))
.executesPlayer((sender, args) -> {
ItemStack item = sender.getInventory().getItemInMainHand();
if (item == null || !item.getItemMeta().hasLore()) {
throw CommandAPI.failWithString("You need a valid item with lore text!");
}
List<Component> lore = item.lore();
String name = (String)args[0];
String name = args.getByArgument(LibraryOfSoulsCommand.mobLabelArg);
SoulEntry soul = SoulsDatabase.getInstance().getSoul(name);
if (soul == null) {
throw CommandAPI.failWithString("Mob '" + name + "' not found");
Expand Down
Loading
Loading