mirror of
https://github.com/kaboomserver/extras.git
synced 2025-02-17 07:10:14 -05:00
Better command handling in console
This commit is contained in:
parent
d3902cbc8b
commit
6b22761698
14 changed files with 203 additions and 299 deletions
|
@ -11,10 +11,8 @@ import org.bukkit.entity.Player;
|
|||
|
||||
class CommandConsole implements CommandExecutor {
|
||||
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
|
||||
final Player player = (Player) sender;
|
||||
|
||||
if (args.length == 0) {
|
||||
player.sendMessage(ChatColor.RED + "Usage: /" + label + " <message ..>");
|
||||
sender.sendMessage(ChatColor.RED + "Usage: /" + label + " <message ..>");
|
||||
} else {
|
||||
Bukkit.dispatchCommand(
|
||||
Bukkit.getConsoleSender(),
|
||||
|
|
|
@ -13,7 +13,6 @@ import org.bukkit.entity.Player;
|
|||
|
||||
class CommandDestroyEntities implements CommandExecutor {
|
||||
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
|
||||
final Player player = (Player) sender;
|
||||
int entityCount = 0;
|
||||
int worldCount = 0;
|
||||
|
||||
|
@ -26,7 +25,7 @@ class CommandDestroyEntities implements CommandExecutor {
|
|||
}
|
||||
worldCount++;
|
||||
}
|
||||
player.sendMessage("Successfully destroyed " + entityCount + " entities in " + worldCount + " worlds");
|
||||
sender.sendMessage("Successfully destroyed " + entityCount + " entities in " + worldCount + " worlds");
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -5,6 +5,7 @@ import org.bukkit.Material;
|
|||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.command.ConsoleCommandSender;
|
||||
|
||||
import org.bukkit.enchantments.Enchantment;
|
||||
|
||||
|
@ -14,43 +15,47 @@ import org.bukkit.inventory.ItemStack;
|
|||
|
||||
class CommandEnchantAll implements CommandExecutor {
|
||||
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
|
||||
final Player player = (Player) sender;
|
||||
final ItemStack item = player.getInventory().getItemInMainHand();
|
||||
|
||||
if (item.getType() == Material.AIR) {
|
||||
player.sendMessage("Please hold an item in your hand to enchant it");
|
||||
if (sender instanceof ConsoleCommandSender) {
|
||||
sender.sendMessage("Command has to be run by a player");
|
||||
} else {
|
||||
item.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.ARROW_FIRE, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.ARROW_INFINITE, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.ARROW_KNOCKBACK, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.BINDING_CURSE, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.DAMAGE_ALL, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.DAMAGE_ARTHROPODS, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.DAMAGE_UNDEAD, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.DEPTH_STRIDER, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.DIG_SPEED, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.DURABILITY, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.FIRE_ASPECT, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.FROST_WALKER, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.KNOCKBACK, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.LOOT_BONUS_BLOCKS, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.LOOT_BONUS_MOBS, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.LUCK, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.LURE, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.MENDING, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.OXYGEN, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.PROTECTION_EXPLOSIONS, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.PROTECTION_FALL, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.PROTECTION_FIRE, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.PROTECTION_PROJECTILE, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.SILK_TOUCH, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.SWEEPING_EDGE, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.THORNS, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.VANISHING_CURSE, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.WATER_WORKER, 32767);
|
||||
player.sendMessage("I killed Tim.");
|
||||
final Player player = (Player) sender;
|
||||
final ItemStack item = player.getInventory().getItemInMainHand();
|
||||
|
||||
if (item.getType() == Material.AIR) {
|
||||
player.sendMessage("Please hold an item in your hand to enchant it");
|
||||
} else {
|
||||
item.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.ARROW_FIRE, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.ARROW_INFINITE, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.ARROW_KNOCKBACK, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.BINDING_CURSE, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.DAMAGE_ALL, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.DAMAGE_ARTHROPODS, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.DAMAGE_UNDEAD, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.DEPTH_STRIDER, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.DIG_SPEED, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.DURABILITY, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.FIRE_ASPECT, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.FROST_WALKER, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.KNOCKBACK, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.LOOT_BONUS_BLOCKS, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.LOOT_BONUS_MOBS, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.LUCK, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.LURE, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.MENDING, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.OXYGEN, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.PROTECTION_EXPLOSIONS, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.PROTECTION_FALL, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.PROTECTION_FIRE, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.PROTECTION_PROJECTILE, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.SILK_TOUCH, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.SWEEPING_EDGE, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.THORNS, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.VANISHING_CURSE, 32767);
|
||||
item.addUnsafeEnchantment(Enchantment.WATER_WORKER, 32767);
|
||||
player.sendMessage("I killed Tim.");
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -20,23 +20,21 @@ class CommandJumpscare implements CommandExecutor {
|
|||
}
|
||||
|
||||
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
|
||||
final Player player = (Player) sender;
|
||||
|
||||
if (args.length == 0) {
|
||||
player.sendMessage(ChatColor.RED + "Usage: /" + label + " <player>");
|
||||
sender.sendMessage(ChatColor.RED + "Usage: /" + label + " <player>");
|
||||
} else {
|
||||
if (args[0].equals("*") || args[0].equals("**")) {
|
||||
for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
|
||||
createJumpscare(onlinePlayer);
|
||||
}
|
||||
player.sendMessage("Successfully created jumpscare for every player");
|
||||
sender.sendMessage("Successfully created jumpscare for every player");
|
||||
} else {
|
||||
final Player target = Bukkit.getPlayer(args[0]);
|
||||
if (target != null) {
|
||||
createJumpscare(target);
|
||||
player.sendMessage("Successfully created jumpscare for player \"" + target.getName() + "\"");
|
||||
sender.sendMessage("Successfully created jumpscare for player \"" + target.getName() + "\"");
|
||||
} else {
|
||||
player.sendMessage("Player \"" + target.getName() + "\" not found");
|
||||
sender.sendMessage("Player \"" + target.getName() + "\" not found");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -5,6 +5,7 @@ import org.bukkit.ChatColor;
|
|||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.command.ConsoleCommandSender;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
@ -15,18 +16,22 @@ class CommandPrefix implements CommandExecutor {
|
|||
}
|
||||
|
||||
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
|
||||
final Player player = (Player) sender;
|
||||
|
||||
if (args.length == 0) {
|
||||
player.sendMessage(ChatColor.RED + "Usage: /" + label + " <prefix|off>");
|
||||
} else if (args[0].equalsIgnoreCase("off")) {
|
||||
main.getConfig().set(player.getUniqueId().toString(), null);
|
||||
main.saveConfig();
|
||||
player.sendMessage("You no longer have a tag");
|
||||
if (sender instanceof ConsoleCommandSender) {
|
||||
sender.sendMessage("Command has to be run by a player");
|
||||
} else {
|
||||
main.getConfig().set(player.getUniqueId().toString(), String.join(" ", args));
|
||||
main.saveConfig();
|
||||
player.sendMessage("You now have the tag: " + ChatColor.translateAlternateColorCodes('&', String.join(" ", args)));
|
||||
final Player player = (Player) sender;
|
||||
|
||||
if (args.length == 0) {
|
||||
player.sendMessage(ChatColor.RED + "Usage: /" + label + " <prefix|off>");
|
||||
} else if (args[0].equalsIgnoreCase("off")) {
|
||||
main.getConfig().set(player.getUniqueId().toString(), null);
|
||||
main.saveConfig();
|
||||
player.sendMessage("You no longer have a tag");
|
||||
} else {
|
||||
main.getConfig().set(player.getUniqueId().toString(), String.join(" ", args));
|
||||
main.saveConfig();
|
||||
player.sendMessage("You now have the tag: " + ChatColor.translateAlternateColorCodes('&', String.join(" ", args)));
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -18,23 +18,21 @@ class CommandPumpkin implements CommandExecutor {
|
|||
}
|
||||
|
||||
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
|
||||
final Player player = (Player) sender;
|
||||
|
||||
if (args.length == 0) {
|
||||
player.sendMessage(ChatColor.RED + "Usage: /" + label + " <player>");
|
||||
sender.sendMessage(ChatColor.RED + "Usage: /" + label + " <player>");
|
||||
} else {
|
||||
if (args[0].equals("*") || args[0].equals("**")) {
|
||||
for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
|
||||
placePumpkin(onlinePlayer);
|
||||
}
|
||||
player.sendMessage("Everyone is now a pumpkin");
|
||||
sender.sendMessage("Everyone is now a pumpkin");
|
||||
} else {
|
||||
final Player target = Bukkit.getPlayer(args[0]);
|
||||
if (target != null) {
|
||||
placePumpkin(target);
|
||||
player.sendMessage("Player \"" + target.getName() + "\" is now a pumpkin");
|
||||
sender.sendMessage("Player \"" + target.getName() + "\" is now a pumpkin");
|
||||
} else {
|
||||
player.sendMessage("Player \"" + target.getName() + "\" not found");
|
||||
sender.sendMessage("Player \"" + target.getName() + "\" not found");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -10,6 +10,7 @@ import org.bukkit.ChatColor;
|
|||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.command.ConsoleCommandSender;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
@ -28,47 +29,51 @@ class CommandSkin implements CommandExecutor {
|
|||
}
|
||||
|
||||
public boolean onCommand(CommandSender sender, Command command, String label, final String[] args) {
|
||||
final Player player = (Player) sender;
|
||||
|
||||
if (args.length == 0) {
|
||||
player.sendMessage(ChatColor.RED + "Usage: /" + label + " <username>");
|
||||
if (sender instanceof ConsoleCommandSender) {
|
||||
sender.sendMessage("Command has to be run by a player");
|
||||
} else {
|
||||
final String name = args[0];
|
||||
new BukkitRunnable() {
|
||||
public void run() {
|
||||
try {
|
||||
final URL skinUrl = new URL("https://api.ashcon.app/mojang/v2/user/" + name);
|
||||
final HttpsURLConnection skinConnection = (HttpsURLConnection) skinUrl.openConnection();
|
||||
skinConnection.setConnectTimeout(0);
|
||||
skinConnection.setDefaultUseCaches(false);
|
||||
skinConnection.setUseCaches(false);
|
||||
|
||||
if (skinConnection.getResponseCode() == HttpsURLConnection.HTTP_OK) {
|
||||
final InputStreamReader skinStream = new InputStreamReader(skinConnection.getInputStream());
|
||||
final JsonObject response = new JsonParser().parse(skinStream).getAsJsonObject();
|
||||
final JsonObject rawSkin = response.getAsJsonObject("textures").getAsJsonObject("raw");
|
||||
final String texture = rawSkin.get("value").getAsString();
|
||||
final String signature = rawSkin.get("signature").getAsString();
|
||||
skinStream.close();
|
||||
|
||||
final PlayerProfile textureProfile = player.getPlayerProfile();
|
||||
textureProfile.setProperty(new ProfileProperty("textures", texture, signature));
|
||||
|
||||
player.sendMessage("Successfully set your skin to " + name + "'s");
|
||||
new BukkitRunnable() {
|
||||
public void run() {
|
||||
player.setPlayerProfile(textureProfile);
|
||||
}
|
||||
}.runTask(main);
|
||||
} else {
|
||||
player.sendMessage("A player with that username doesn't exist");
|
||||
final Player player = (Player) sender;
|
||||
|
||||
if (args.length == 0) {
|
||||
player.sendMessage(ChatColor.RED + "Usage: /" + label + " <username>");
|
||||
} else {
|
||||
final String name = args[0];
|
||||
new BukkitRunnable() {
|
||||
public void run() {
|
||||
try {
|
||||
final URL skinUrl = new URL("https://api.ashcon.app/mojang/v2/user/" + name);
|
||||
final HttpsURLConnection skinConnection = (HttpsURLConnection) skinUrl.openConnection();
|
||||
skinConnection.setConnectTimeout(0);
|
||||
skinConnection.setDefaultUseCaches(false);
|
||||
skinConnection.setUseCaches(false);
|
||||
|
||||
if (skinConnection.getResponseCode() == HttpsURLConnection.HTTP_OK) {
|
||||
final InputStreamReader skinStream = new InputStreamReader(skinConnection.getInputStream());
|
||||
final JsonObject response = new JsonParser().parse(skinStream).getAsJsonObject();
|
||||
final JsonObject rawSkin = response.getAsJsonObject("textures").getAsJsonObject("raw");
|
||||
final String texture = rawSkin.get("value").getAsString();
|
||||
final String signature = rawSkin.get("signature").getAsString();
|
||||
skinStream.close();
|
||||
|
||||
final PlayerProfile textureProfile = player.getPlayerProfile();
|
||||
textureProfile.setProperty(new ProfileProperty("textures", texture, signature));
|
||||
|
||||
player.sendMessage("Successfully set your skin to " + name + "'s");
|
||||
new BukkitRunnable() {
|
||||
public void run() {
|
||||
player.setPlayerProfile(textureProfile);
|
||||
}
|
||||
}.runTask(main);
|
||||
} else {
|
||||
player.sendMessage("A player with that username doesn't exist");
|
||||
}
|
||||
|
||||
skinConnection.disconnect();
|
||||
} catch (Exception exception) {
|
||||
}
|
||||
|
||||
skinConnection.disconnect();
|
||||
} catch (Exception exception) {
|
||||
}
|
||||
}
|
||||
}.runTaskAsynchronously(main);
|
||||
}.runTaskAsynchronously(main);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -10,27 +10,32 @@ import org.bukkit.block.BlockFace;
|
|||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.command.ConsoleCommandSender;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
class CommandSpawn implements CommandExecutor {
|
||||
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
|
||||
final Player player = (Player) sender;
|
||||
final World world = Bukkit.getWorld("world");
|
||||
final Location spawnLocation = world.getSpawnLocation();
|
||||
|
||||
for (double y = spawnLocation.getY(); y <= 256; y++) {
|
||||
final Location yLocation = new Location(world, spawnLocation.getX(), y, spawnLocation.getZ());
|
||||
final Block coordBlock = world.getBlockAt(yLocation);
|
||||
|
||||
if (!coordBlock.getType().isSolid() &&
|
||||
!coordBlock.getRelative(BlockFace.UP).getType().isSolid()) {
|
||||
player.teleportAsync(yLocation);
|
||||
break;
|
||||
if (sender instanceof ConsoleCommandSender) {
|
||||
sender.sendMessage("Command has to be run by a player");
|
||||
} else {
|
||||
final Player player = (Player) sender;
|
||||
final World world = Bukkit.getWorld("world");
|
||||
final Location spawnLocation = world.getSpawnLocation();
|
||||
|
||||
for (double y = spawnLocation.getY(); y <= 256; y++) {
|
||||
final Location yLocation = new Location(world, spawnLocation.getX(), y, spawnLocation.getZ());
|
||||
final Block coordBlock = world.getBlockAt(yLocation);
|
||||
|
||||
if (!coordBlock.getType().isSolid() &&
|
||||
!coordBlock.getRelative(BlockFace.UP).getType().isSolid()) {
|
||||
player.teleportAsync(yLocation);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
player.sendMessage("Successfully moved to spawn");
|
||||
}
|
||||
|
||||
player.sendMessage("Successfully moved to spawn");
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,6 +6,7 @@ import org.bukkit.Material;
|
|||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.command.ConsoleCommandSender;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
@ -14,18 +15,22 @@ import org.bukkit.util.Vector;
|
|||
|
||||
class CommandSpidey implements CommandExecutor {
|
||||
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
|
||||
final Player player = (Player) sender;
|
||||
final Location eyePos = player.getEyeLocation();
|
||||
final Vector playerPos = new Vector(eyePos.getX(), eyePos.getY(), eyePos.getZ());
|
||||
final Vector direction = eyePos.getDirection();
|
||||
final int distance = 50;
|
||||
|
||||
final BlockIterator blockIterator = new BlockIterator(player.getWorld(), playerPos, direction, 0, distance);
|
||||
|
||||
while (blockIterator.hasNext() &&
|
||||
(blockIterator.next().getType() == Material.AIR ||
|
||||
blockIterator.next().getType() == Material.CAVE_AIR)) {
|
||||
blockIterator.next().setType(Material.COBWEB);
|
||||
if (sender instanceof ConsoleCommandSender) {
|
||||
sender.sendMessage("Command has to be run by a player");
|
||||
} else {
|
||||
final Player player = (Player) sender;
|
||||
final Location eyePos = player.getEyeLocation();
|
||||
final Vector playerPos = new Vector(eyePos.getX(), eyePos.getY(), eyePos.getZ());
|
||||
final Vector direction = eyePos.getDirection();
|
||||
final int distance = 50;
|
||||
|
||||
final BlockIterator blockIterator = new BlockIterator(player.getWorld(), playerPos, direction, 0, distance);
|
||||
|
||||
while (blockIterator.hasNext() &&
|
||||
(blockIterator.next().getType() == Material.AIR ||
|
||||
blockIterator.next().getType() == Material.CAVE_AIR)) {
|
||||
blockIterator.next().setType(Material.COBWEB);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -11,10 +11,8 @@ import org.bukkit.entity.Player;
|
|||
|
||||
class CommandTellraw implements CommandExecutor {
|
||||
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
|
||||
final Player player = (Player) sender;
|
||||
|
||||
if (args.length == 0) {
|
||||
player.sendMessage(ChatColor.RED + "Usage: /" + label + " <message ..>");
|
||||
sender.sendMessage(ChatColor.RED + "Usage: /" + label + " <message ..>");
|
||||
} else {
|
||||
for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
|
||||
onlinePlayer.sendMessage(ChatColor.translateAlternateColorCodes('&', String.join(" ", args)));
|
||||
|
|
|
@ -12,7 +12,6 @@ import org.bukkit.entity.Player;
|
|||
|
||||
class CommandUnloadChunks implements CommandExecutor {
|
||||
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
|
||||
final Player player = (Player) sender;
|
||||
int chunkCount = 0;
|
||||
|
||||
for (World world : Bukkit.getServer().getWorlds()) {
|
||||
|
@ -23,7 +22,7 @@ class CommandUnloadChunks implements CommandExecutor {
|
|||
}
|
||||
}
|
||||
|
||||
player.sendMessage("Unloaded " + chunkCount + " unused chunks");
|
||||
sender.sendMessage("Unloaded " + chunkCount + " unused chunks");
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -10,6 +10,7 @@ import org.bukkit.ChatColor;
|
|||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.command.ConsoleCommandSender;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
@ -28,57 +29,61 @@ class CommandUsername implements CommandExecutor {
|
|||
}
|
||||
|
||||
public boolean onCommand(CommandSender sender, Command command, String label, final String[] args) {
|
||||
final Player player = (Player) sender;
|
||||
|
||||
if (args.length == 0) {
|
||||
player.sendMessage(ChatColor.RED + "Usage: /" + label + " <username>");
|
||||
if (sender instanceof ConsoleCommandSender) {
|
||||
sender.sendMessage("Command has to be run by a player");
|
||||
} else {
|
||||
final String[] name = args;
|
||||
|
||||
new BukkitRunnable() {
|
||||
public void run() {
|
||||
try {
|
||||
String texture = "";
|
||||
String signature = "";
|
||||
|
||||
final String nameColor = ChatColor.translateAlternateColorCodes('&', String.join(" ", name));
|
||||
final String nameShort = nameColor.substring(0, Math.min(16, nameColor.length()));
|
||||
|
||||
final URL skinUrl = new URL("https://api.ashcon.app/mojang/v2/user/" + nameShort);
|
||||
final HttpsURLConnection skinConnection = (HttpsURLConnection) skinUrl.openConnection();
|
||||
skinConnection.setConnectTimeout(0);
|
||||
skinConnection.setDefaultUseCaches(false);
|
||||
skinConnection.setUseCaches(false);
|
||||
|
||||
if (skinConnection.getResponseCode() == HttpsURLConnection.HTTP_OK) {
|
||||
final InputStreamReader skinStream = new InputStreamReader(skinConnection.getInputStream());
|
||||
final JsonObject response = new JsonParser().parse(skinStream).getAsJsonObject();
|
||||
final JsonObject rawSkin = response.getAsJsonObject("textures").getAsJsonObject("raw");
|
||||
texture = rawSkin.get("value").getAsString();
|
||||
signature = rawSkin.get("signature").getAsString();
|
||||
skinStream.close();
|
||||
}
|
||||
|
||||
skinConnection.disconnect();
|
||||
|
||||
final PlayerProfile profile = player.getPlayerProfile();
|
||||
profile.setName(nameShort);
|
||||
|
||||
if (!("".equals(texture)) &&
|
||||
!("".equals(signature))) {
|
||||
profile.setProperty(new ProfileProperty("textures", texture, signature));
|
||||
}
|
||||
|
||||
player.sendMessage("Successfully set your username to \"" + nameShort + "\"");
|
||||
new BukkitRunnable() {
|
||||
public void run() {
|
||||
player.setPlayerProfile(profile);
|
||||
final Player player = (Player) sender;
|
||||
|
||||
if (args.length == 0) {
|
||||
player.sendMessage(ChatColor.RED + "Usage: /" + label + " <username>");
|
||||
} else {
|
||||
final String[] name = args;
|
||||
|
||||
new BukkitRunnable() {
|
||||
public void run() {
|
||||
try {
|
||||
String texture = "";
|
||||
String signature = "";
|
||||
|
||||
final String nameColor = ChatColor.translateAlternateColorCodes('&', String.join(" ", name));
|
||||
final String nameShort = nameColor.substring(0, Math.min(16, nameColor.length()));
|
||||
|
||||
final URL skinUrl = new URL("https://api.ashcon.app/mojang/v2/user/" + nameShort);
|
||||
final HttpsURLConnection skinConnection = (HttpsURLConnection) skinUrl.openConnection();
|
||||
skinConnection.setConnectTimeout(0);
|
||||
skinConnection.setDefaultUseCaches(false);
|
||||
skinConnection.setUseCaches(false);
|
||||
|
||||
if (skinConnection.getResponseCode() == HttpsURLConnection.HTTP_OK) {
|
||||
final InputStreamReader skinStream = new InputStreamReader(skinConnection.getInputStream());
|
||||
final JsonObject response = new JsonParser().parse(skinStream).getAsJsonObject();
|
||||
final JsonObject rawSkin = response.getAsJsonObject("textures").getAsJsonObject("raw");
|
||||
texture = rawSkin.get("value").getAsString();
|
||||
signature = rawSkin.get("signature").getAsString();
|
||||
skinStream.close();
|
||||
}
|
||||
}.runTask(main);
|
||||
} catch (Exception exception) {
|
||||
|
||||
skinConnection.disconnect();
|
||||
|
||||
final PlayerProfile profile = player.getPlayerProfile();
|
||||
profile.setName(nameShort);
|
||||
|
||||
if (!("".equals(texture)) &&
|
||||
!("".equals(signature))) {
|
||||
profile.setProperty(new ProfileProperty("textures", texture, signature));
|
||||
}
|
||||
|
||||
player.sendMessage("Successfully set your username to \"" + nameShort + "\"");
|
||||
new BukkitRunnable() {
|
||||
public void run() {
|
||||
player.setPlayerProfile(profile);
|
||||
}
|
||||
}.runTask(main);
|
||||
} catch (Exception exception) {
|
||||
}
|
||||
}
|
||||
}
|
||||
}.runTaskAsynchronously(main);
|
||||
}.runTaskAsynchronously(main);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -25,7 +25,7 @@ class PlayerChat implements Listener {
|
|||
if (main.commandMillisList.get(playerUuid) != null) {
|
||||
final long millisDifference = System.currentTimeMillis() - main.commandMillisList.get(playerUuid);
|
||||
|
||||
if (millisDifference < 20) {
|
||||
if (millisDifference < 5) {
|
||||
event.setCancelled(true);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -14,116 +14,6 @@ import org.bukkit.event.player.PlayerCommandPreprocessEvent;
|
|||
|
||||
import org.bukkit.scheduler.BukkitRunnable;
|
||||
|
||||
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.permissions.Permission;
|
||||
|
||||
import org.bukkit.permissions.PermissionAttachment;
|
||||
|
||||
import org.bukkit.permissions.PermissionAttachmentInfo;
|
||||
import org.bukkit.Server;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
class WrappedSender implements CommandSender {
|
||||
private final CommandSender sender;
|
||||
|
||||
public WrappedSender(CommandSender sender) {
|
||||
this.sender = sender;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendMessage(String message) {
|
||||
sender.sendMessage(message);/*.substring(0, Math.min(256, message.length())));*/
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendMessage(String[] messages) {
|
||||
sender.sendMessage(messages);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Server getServer() {
|
||||
return sender.getServer();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return sender.getName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isPermissionSet(String name) {
|
||||
return sender.isPermissionSet(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isPermissionSet(Permission perm) {
|
||||
return sender.isPermissionSet(perm);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasPermission(String name) {
|
||||
return sender.hasPermission(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasPermission(Permission perm) {
|
||||
return sender.hasPermission(perm);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value) {
|
||||
return sender.addAttachment(plugin, name, value);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PermissionAttachment addAttachment(Plugin plugin) {
|
||||
return sender.addAttachment(plugin);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value, int ticks) {
|
||||
return sender.addAttachment(plugin, name, value, ticks);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PermissionAttachment addAttachment(Plugin plugin, int ticks) {
|
||||
return sender.addAttachment(plugin, ticks);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeAttachment(PermissionAttachment attachment) {
|
||||
sender.removeAttachment(attachment);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void recalculatePermissions() {
|
||||
sender.recalculatePermissions();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<PermissionAttachmentInfo> getEffectivePermissions() {
|
||||
return sender.getEffectivePermissions();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isOp() {
|
||||
return sender.isOp();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setOp(boolean value) {
|
||||
sender.setOp(value);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Spigot spigot() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
class PlayerCommand implements Listener {
|
||||
private Main main;
|
||||
public PlayerCommand(Main main) {
|
||||
|
@ -139,7 +29,7 @@ class PlayerCommand implements Listener {
|
|||
if (main.commandMillisList.get(playerUuid) != null) {
|
||||
final long millisDifference = System.currentTimeMillis() - main.commandMillisList.get(playerUuid);
|
||||
|
||||
if (millisDifference < 200) {
|
||||
if (millisDifference < 75) {
|
||||
event.setCancelled(true);
|
||||
}
|
||||
}
|
||||
|
@ -233,11 +123,5 @@ class PlayerCommand implements Listener {
|
|||
event.setCancelled(true);
|
||||
Command.broadcastCommandMessage(event.getPlayer(), "Stopping the server");
|
||||
}
|
||||
|
||||
/*if (!event.isCancelled()) {
|
||||
WrappedSender wrapped = new WrappedSender(event.getPlayer());
|
||||
Bukkit.getServer().dispatchCommand(wrapped, event.getMessage().substring(1));
|
||||
event.setCancelled(true);
|
||||
}*/
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue