|
8 | 8 | import net.swofty.type.generic.HypixelConst; |
9 | 9 | import net.swofty.type.generic.command.CommandParameters; |
10 | 10 | import net.swofty.type.generic.command.HypixelCommand; |
| 11 | +import net.swofty.type.generic.user.categories.Rank; |
| 12 | +import net.swofty.type.skyblockgeneric.item.components.RegionSelectorComponent; |
11 | 13 | import net.swofty.type.skyblockgeneric.region.RegionType; |
12 | 14 | import net.swofty.type.skyblockgeneric.region.SkyBlockRegion; |
13 | 15 | import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; |
14 | | -import net.swofty.type.generic.user.categories.Rank; |
15 | 16 |
|
16 | 17 | @CommandParameters(aliases = "regions", |
17 | | - description = "Handles regions across the server", |
18 | | - usage = "/signgui <text>", |
19 | | - permission = Rank.STAFF, |
20 | | - allowsConsole = false) |
| 18 | + description = "Handles regions across the server", |
| 19 | + usage = "/signgui <text>", |
| 20 | + permission = Rank.STAFF, |
| 21 | + allowsConsole = false) |
21 | 22 | public class RegionCommand extends HypixelCommand { |
22 | 23 | @Override |
23 | 24 | public void registerUsage(MinestomCommand command) { |
24 | 25 | ArgumentGroup removeRegion = ArgumentType.Group("remove", |
25 | | - ArgumentType.Literal("remove"), |
26 | | - ArgumentType.String("region_id")); |
| 26 | + ArgumentType.Literal("remove"), |
| 27 | + ArgumentType.String("region_id")); |
27 | 28 | ArgumentGroup addRegion = ArgumentType.Group("add", |
28 | | - ArgumentType.Literal("add"), |
29 | | - ArgumentType.String("region_id"), |
30 | | - ArgumentType.Enum("region_type", RegionType.class), |
31 | | - ArgumentType.RelativeBlockPosition("pos1"), |
32 | | - ArgumentType.RelativeBlockPosition("pos2")); |
| 29 | + ArgumentType.Literal("add"), |
| 30 | + ArgumentType.String("region_id"), |
| 31 | + ArgumentType.Enum("region_type", RegionType.class), |
| 32 | + ArgumentType.RelativeBlockPosition("pos1"), |
| 33 | + ArgumentType.RelativeBlockPosition("pos2")); |
| 34 | + ArgumentGroup wandRegion = ArgumentType.Group("wand", |
| 35 | + ArgumentType.Literal("wand"), |
| 36 | + ArgumentType.String("region_id"), |
| 37 | + ArgumentType.Enum("region_type", RegionType.class)); |
33 | 38 |
|
34 | 39 | command.addSyntax((sender, context) -> { |
35 | 40 | if (!permissionCheck(sender)) return; |
@@ -61,10 +66,31 @@ public void registerUsage(MinestomCommand command) { |
61 | 66 | sender.sendMessage("§aPosition 2: §e" + vectorPosition2.x() + ", " + vectorPosition2.y() + ", " + vectorPosition2.z()); |
62 | 67 |
|
63 | 68 | new SkyBlockRegion(regionId, |
64 | | - new Pos(vectorPosition1.x(), vectorPosition1.y(), vectorPosition1.z()), |
65 | | - new Pos(vectorPosition2.x(), vectorPosition2.y(), vectorPosition2.z()), |
66 | | - regionType, |
67 | | - HypixelConst.getTypeLoader().getType()).save(); |
| 69 | + new Pos(vectorPosition1.x(), vectorPosition1.y(), vectorPosition1.z()), |
| 70 | + new Pos(vectorPosition2.x(), vectorPosition2.y(), vectorPosition2.z()), |
| 71 | + regionType, |
| 72 | + HypixelConst.getTypeLoader().getType()).save(); |
68 | 73 | }, addRegion); |
| 74 | + |
| 75 | + command.addSyntax((sender, context) -> { |
| 76 | + RegionSelectorComponent.SelectedRegion region = RegionSelectorComponent.getPlayerRegionSelection().get((SkyBlockPlayer) sender); |
| 77 | + if (region == null || region.getPos1() == null || region.getPos2() == null) { |
| 78 | + sender.sendMessage("§cYou must select a region first using the region selector item."); |
| 79 | + return; |
| 80 | + } |
| 81 | + |
| 82 | + String regionId = context.get(wandRegion).get("region_id"); |
| 83 | + RegionType regionType = context.get(wandRegion).get("region_type"); |
| 84 | + |
| 85 | + sender.sendMessage("§aSuccessfully created region §e" + regionId + "§a with type §e" + regionType.name() + "§a."); |
| 86 | + sender.sendMessage("§aPosition 1: §e" + region.getPos1().x() + ", " + region.getPos1().y() + ", " + region.getPos1().z()); |
| 87 | + sender.sendMessage("§aPosition 2: §e" + region.getPos2().x() + ", " + region.getPos2().y() + ", " + region.getPos2().z()); |
| 88 | + |
| 89 | + new SkyBlockRegion(regionId, |
| 90 | + new Pos(region.getPos1().x(), region.getPos1().y(), region.getPos1().z()), |
| 91 | + new Pos(region.getPos2().x(), region.getPos2().y(), region.getPos2().z()), |
| 92 | + regionType, |
| 93 | + HypixelConst.getTypeLoader().getType()).save(); |
| 94 | + }, wandRegion); |
69 | 95 | } |
70 | 96 | } |
0 commit comments