Skip to content

Commit f695043

Browse files
czQeryczQery
committed
Added console support for some commands. Thx @FlyGuyGo for your advice. #1
(gmc, gms, gma, gmsp, crash, pinfo, rp, skick, toolkit, troll)
1 parent 1addeee commit f695043

File tree

9 files changed

+337
-247
lines changed

9 files changed

+337
-247
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
## Trolls
3333

3434
- Sneak
35-
- Sleep
35+
- Sleep (it must be night, and you must stand on the bed)
3636
- Close
3737
- Glow
3838
- PickUp

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>cz.qery</groupId>
66
<artifactId>ToolKit</artifactId>
7-
<version>2.7</version>
7+
<version>2.8</version>
88
<packaging>jar</packaging>
99

1010
<name>ToolKit</name>

‎src/main/java/cz/qery/toolkit/commands/Aliases.java

Lines changed: 34 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,43 +23,55 @@ public class Aliases implements CommandExecutor {
2323

2424
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, String[] args) {
2525

26+
Player target = null;
27+
2628
if (!(sender instanceof Player)) {
27-
Tools.log(b+"["+n+"SERVER"+b+"]"+t+" This command cannot be used by the console!");
29+
if (args.length > 0) {
30+
target = Bukkit.getServer().getPlayer(args[0]);
31+
if(target == null){
32+
sender.sendMessage(Tools.chat(b+"["+n+"SERVER"+b+"]"+t+" Player "+h+args[0]+t+" is not online!"));
33+
return false;
34+
}
35+
} else {
36+
Tools.log(b+"["+n+"SERVER"+b+"]"+t+" Please use "+h+"/"+cmd.getName().toLowerCase()+" <player>");
37+
return false;
38+
}
2839
} else {
2940
Player p = (Player) sender;
3041
if (!p.hasPermission("toolkit."+cmd.getName().toLowerCase())) {
3142
p.sendMessage(Tools.chat(b + "[" + n + "SERVER" + b + "]" + t + " You're not allowed to do this!"));
43+
return false;
3244
} else {
33-
Player target;
3445
if (args.length > 0) {
3546
target = Bukkit.getServer().getPlayer(args[0]);
36-
if(target == null){
37-
p.sendMessage(Tools.chat(b+"["+n+"SERVER"+b+"]"+t+" Player "+h+args[0]+t+" is not online!"));
47+
if (target == null) {
48+
p.sendMessage(Tools.chat(b + "[" + n + "SERVER" + b + "]" + t + " Player " + h + args[0] + t + " is not online!"));
3849
return false;
3950
}
4051
} else {
4152
target = p;
4253
}
43-
switch (cmd.getName().toLowerCase()) {
44-
case "gmc":
45-
target.setGameMode(GameMode.CREATIVE);
46-
p.sendMessage(Tools.chat(b + "[" + n + "SERVER" + b + "]" + t + " Switched to " + h + "CREATIVE"));
47-
break;
48-
case "gms":
49-
target.setGameMode(GameMode.SURVIVAL);
50-
p.sendMessage(Tools.chat(b + "[" + n + "SERVER" + b + "]" + t + " Switched to " + h + "SURVIVAL"));
51-
break;
52-
case "gma":
53-
target.setGameMode(GameMode.ADVENTURE);
54-
p.sendMessage(Tools.chat(b + "[" + n + "SERVER" + b + "]" + t + " Switched to " + h + "ADVENTURE"));
55-
break;
56-
case "gmsp":
57-
target.setGameMode(GameMode.SPECTATOR);
58-
p.sendMessage(Tools.chat(b + "[" + n + "SERVER" + b + "]" + t + " Switched to " + h + "SPECTATOR"));
59-
break;
60-
}
6154
}
6255
}
56+
57+
switch (cmd.getName().toLowerCase()) {
58+
case "gmc":
59+
target.setGameMode(GameMode.CREATIVE);
60+
sender.sendMessage(Tools.chat(b + "[" + n + "SERVER" + b + "]" + t + " Switched to " + h + "CREATIVE"));
61+
break;
62+
case "gms":
63+
target.setGameMode(GameMode.SURVIVAL);
64+
sender.sendMessage(Tools.chat(b + "[" + n + "SERVER" + b + "]" + t + " Switched to " + h + "SURVIVAL"));
65+
break;
66+
case "gma":
67+
target.setGameMode(GameMode.ADVENTURE);
68+
sender.sendMessage(Tools.chat(b + "[" + n + "SERVER" + b + "]" + t + " Switched to " + h + "ADVENTURE"));
69+
break;
70+
case "gmsp":
71+
target.setGameMode(GameMode.SPECTATOR);
72+
sender.sendMessage(Tools.chat(b + "[" + n + "SERVER" + b + "]" + t + " Switched to " + h + "SPECTATOR"));
73+
break;
74+
}
6375
return false;
6476
}
6577
}

‎src/main/java/cz/qery/toolkit/commands/Crash.java

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,47 @@ public class Crash implements CommandExecutor {
2121
String h = plugin.getConfig().getString("color.highlight");
2222

2323
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, String[] args) {
24+
Player target = null;
25+
2426
if (!(sender instanceof Player)) {
25-
Tools.log(b+"["+n+"SERVER"+b+"]"+t+" This command cannot be used by the console!");
27+
if (args.length > 0) {
28+
target = Bukkit.getServer().getPlayer(args[0]);
29+
if(target == null){
30+
sender.sendMessage(Tools.chat(b+"["+n+"CRASH"+b+"]"+t+" Player "+h+args[0]+t+" is not online!"));
31+
return false;
32+
}
33+
} else {
34+
Tools.log(b+"["+n+"CRASH"+b+"]"+t+" Please use "+h+"/crash <player>");
35+
return false;
36+
}
2637
} else {
27-
Player p =(Player) sender;
28-
if(!p.hasPermission("toolkit.crash")){
29-
p.sendMessage(Tools.chat(b+"["+n+"SERVER"+b+"]"+t+" You're not allowed to do this!"));
38+
Player p = (Player) sender;
39+
if (!p.hasPermission("toolkit.crash")) {
40+
p.sendMessage(Tools.chat(b + "[" + n + "SERVER" + b + "]" + t + " You're not allowed to do this!"));
41+
return false;
3042
} else {
31-
if(args.length == 0) {
32-
p.sendMessage(Tools.chat(b+"["+n+"CRASH"+b+"]"+t+" Please use "+h+"/crash <player>"));
33-
} else {
34-
Player target = Bukkit.getServer().getPlayer(args[0]);
35-
if(target == null){
36-
p.sendMessage(Tools.chat(b+"["+n+"CRASH"+b+"]"+t+" Player "+h+args[0]+t+" is not online!"));
37-
} else if(target.hasPermission("toolkit.crash.bypass")){
38-
p.sendMessage(Tools.chat(b+"["+n+"CRASH"+b+"]"+t+" You cannot crash this player!"));
39-
} else {
40-
Location loc = target.getLocation();
41-
target.spawnParticle(Particle.EXPLOSION_HUGE, loc, Integer.MAX_VALUE);
42-
p.sendMessage(Tools.chat(b+"["+n+"CRASH"+b+"]"+t+" Player "+h+target.getName()+t+" has been crashed!"));
43+
if (args.length > 0) {
44+
target = Bukkit.getServer().getPlayer(args[0]);
45+
if (target == null) {
46+
p.sendMessage(Tools.chat(b + "[" + n + "CRASH" + b + "]" + t + " Player " + h + args[0] + t + " is not online!"));
47+
return false;
4348
}
49+
} else {
50+
p.sendMessage(Tools.chat(b+"["+n+"CRASH"+b+"]"+t+" Please use "+h+"/crash <player>"));
51+
return false;
4452
}
4553
}
4654
}
4755

56+
57+
if(target.hasPermission("toolkit.crash.bypass")){
58+
sender.sendMessage(Tools.chat(b+"["+n+"CRASH"+b+"]"+t+" You cannot crash this player!"));
59+
} else {
60+
Location loc = target.getLocation();
61+
target.spawnParticle(Particle.EXPLOSION_HUGE, loc, Integer.MAX_VALUE);
62+
sender.sendMessage(Tools.chat(b+"["+n+"CRASH"+b+"]"+t+" Player "+h+target.getName()+t+" has been crashed!"));
63+
}
64+
4865
return false;
4966
}
5067
}

‎src/main/java/cz/qery/toolkit/commands/PInfo.java

Lines changed: 43 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -19,44 +19,58 @@ public class PInfo implements CommandExecutor {
1919
String h = plugin.getConfig().getString("color.highlight");
2020

2121
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, String[] args) {
22+
23+
Player target = null;
24+
2225
if (!(sender instanceof Player)) {
23-
Tools.log(b+"["+n+"SERVER"+b+"]"+t+" This command cannot be used by the console!");
26+
if (args.length > 0) {
27+
target = Bukkit.getServer().getPlayer(args[0]);
28+
if(target == null){
29+
sender.sendMessage(Tools.chat(b+"["+n+"PINFO"+b+"]"+t+" Player "+h+args[0]+t+" is not online!"));
30+
return false;
31+
}
32+
} else {
33+
Tools.log(b+"["+n+"PINFO"+b+"]"+t+" Please use "+h+"/pinfo <player>");
34+
return false;
35+
}
2436
} else {
2537
Player p = (Player) sender;
26-
2738
if (!p.hasPermission("toolkit.pinfo")) {
28-
p.sendMessage(Tools.chat(b+"["+n+"SERVER"+b+"]"+t+" You're not allowed to do this!"));
39+
p.sendMessage(Tools.chat(b + "[" + n + "SERVER" + b + "]" + t + " You're not allowed to do this!"));
40+
return false;
2941
} else {
30-
if(args.length == 0) {
31-
p.sendMessage(Tools.chat(b+"["+n+"PINFO"+b+"]"+t+" Please use "+h+"/pinfo <player>"));
42+
if (args.length > 0) {
43+
target = Bukkit.getServer().getPlayer(args[0]);
44+
if (target == null) {
45+
p.sendMessage(Tools.chat(b + "[" + n + "PINFO" + b + "]" + t + " Player " + h + args[0] + t + " is not online!"));
46+
return false;
47+
}
3248
} else {
33-
Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
34-
@Override
35-
public void run() {
36-
Player target = Bukkit.getServer().getPlayer(args[0]);
37-
if(target == null){
38-
p.sendMessage(Tools.chat(b+"["+n+"SERVER"+b+"]"+t+" Player "+h+args[0]+t+" is not online!"));
39-
return;
40-
}
41-
String name = target.getName();
42-
String ip = target.getAddress().getHostName();
43-
String client;
44-
if (target.getMetadata("client").toString() != "[]") {
45-
client = target.getMetadata("client").get(0).asString();
46-
} else {
47-
client = "Vanilla";
48-
}
49-
p.sendMessage(Tools.chat(b+"-------["+n+"PlayerInfo"+b+"]-------"));
50-
p.sendMessage(Tools.chat(b+"- "+t+"Username "+h+name));
51-
p.sendMessage(Tools.chat(b+"- "+t+"Ip "+h+ip));
52-
p.sendMessage(Tools.chat(b+"- "+t+"Client "+h+client));
53-
p.sendMessage(Tools.chat(b+"------------------------"));
54-
55-
}
56-
});
49+
target = p;
5750
}
5851
}
5952
}
53+
54+
Player finalTarget = target;
55+
Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
56+
@Override
57+
public void run() {
58+
String name = finalTarget.getName();
59+
String ip = finalTarget.getAddress().getHostName();
60+
String client;
61+
if (finalTarget.getMetadata("client").toString() != "[]") {
62+
client = finalTarget.getMetadata("client").get(0).asString();
63+
} else {
64+
client = "Vanilla";
65+
}
66+
sender.sendMessage(Tools.chat(b+"-------["+n+"PlayerInfo"+b+"]-------"));
67+
sender.sendMessage(Tools.chat(b+"- "+t+"Username "+h+name));
68+
sender.sendMessage(Tools.chat(b+"- "+t+"Ip "+h+ip));
69+
sender.sendMessage(Tools.chat(b+"- "+t+"Client "+h+client));
70+
sender.sendMessage(Tools.chat(b+"------------------------"));
71+
}
72+
});
73+
6074
return false;
6175
}
6276
}

‎src/main/java/cz/qery/toolkit/commands/RP.java

Lines changed: 42 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,38 +24,58 @@ public class RP implements CommandExecutor {
2424

2525
@SuppressWarnings("deprecation")
2626
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
27+
Player target = null;
28+
2729
if (!(sender instanceof Player)) {
28-
Tools.log(b + "[" + n + "SERVER" + b + "]" + t + " This command cannot be used by the console!");
30+
if (args.length > 1) {
31+
target = Bukkit.getServer().getPlayer(args[0]);
32+
if(target == null){
33+
sender.sendMessage(Tools.chat(b+"["+n+"RP"+b+"]"+t+" Player "+h+args[0]+t+" is not online!"));
34+
return false;
35+
}
36+
} else {
37+
Tools.log(b+"["+n+"RP"+b+"]"+t+" Please use "+h+"/rp <player> <url>");
38+
return false;
39+
}
2940
} else {
3041
Player p = (Player) sender;
3142
if (!p.hasPermission("toolkit.rp")) {
3243
p.sendMessage(Tools.chat(b + "[" + n + "SERVER" + b + "]" + t + " You're not allowed to do this!"));
44+
return false;
3345
} else {
34-
if (args.length < 2) {
35-
p.sendMessage(Tools.chat(b + "[" + n + "RP" + b + "]" + t + " Please use " + h + "/rp <player> <url>"));
46+
if (args.length > 1) {
47+
target = Bukkit.getServer().getPlayer(args[0]);
48+
if (target == null) {
49+
p.sendMessage(Tools.chat(b + "[" + n + "RP" + b + "]" + t + " Player " + h + args[0] + t + " is not online!"));
50+
return false;
51+
}
3652
} else {
37-
Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
38-
@Override
39-
public void run() {
40-
Player target = Bukkit.getServer().getPlayer(args[0]);
41-
if (target == null) {
42-
p.sendMessage(Tools.chat(b + "[" + n + "SERVER" + b + "]" + t + " Player " + h + args[0]+ t + " is not online!"));
43-
return;
44-
}
45-
String url = args[1];
46-
47-
EntityPlayer target_entity = (EntityPlayer) ((CraftPlayer) target).getHandle();
48-
final PacketPlayOutResourcePackSend packet = new PacketPlayOutResourcePackSend(url, "", true, null);
49-
50-
target_entity.b.sendPacket(packet);
51-
52-
target.sendMessage(Tools.chat(b + "[" + n + "RP" + b + "]" + t + " Player " + h + p.getName() + t + " has sent you" + h + " resource pack" + t + "!"));
53-
p.sendMessage(Tools.chat(b + "[" + n + "RP" + b + "]" + t + " Player " + h + target.getName() + t + " has been set" + h + " resource pack" + t + "!"));
54-
}
55-
});
53+
p.sendMessage(Tools.chat(b+"["+n+"RP"+b+"]"+t+" Please use "+h+"/rp <player> <url>"));
54+
return false;
5655
}
5756
}
5857
}
58+
59+
60+
Player finalTarget = target;
61+
Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
62+
@Override
63+
public void run() {
64+
if (finalTarget == null) {
65+
sender.sendMessage(Tools.chat(b + "[" + n + "SERVER" + b + "]" + t + " Player " + h + args[0]+ t + " is not online!"));
66+
return;
67+
}
68+
String url = args[1];
69+
70+
EntityPlayer target_entity = (EntityPlayer) ((CraftPlayer) finalTarget).getHandle();
71+
final PacketPlayOutResourcePackSend packet = new PacketPlayOutResourcePackSend(url, "", true, null);
72+
73+
target_entity.b.sendPacket(packet);
74+
75+
finalTarget.sendMessage(Tools.chat(b + "[" + n + "RP" + b + "]" + t + " Player " + h + sender.getName() + t + " has sent you" + h + " resource pack" + t + "!"));
76+
sender.sendMessage(Tools.chat(b + "[" + n + "RP" + b + "]" + t + " Player " + h + finalTarget.getName() + t + " has been set" + h + " resource pack" + t + "!"));
77+
}
78+
});
5979
return false;
6080
}
6181
}

0 commit comments

Comments
 (0)