Skip to content

Commit

Permalink
Merge pull request #50 from PowerNetworkHub/dev
Browse files Browse the repository at this point in the history
dev > master
  • Loading branch information
svenar-nl authored Mar 22, 2022
2 parents 52b0d83 + afcdd49 commit 6448480
Show file tree
Hide file tree
Showing 12 changed files with 527 additions and 114 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>nl.svenar</groupId>
<artifactId>powerranks</artifactId>
<version>1.10.5</version>
<version>1.10.5R2</version>
<name>PowerRanks</name>
<description>An amazing permission plugin!</description>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,11 @@
import nl.svenar.PowerRanks.Commands.rank.cmd_setweight;
import nl.svenar.PowerRanks.Commands.usertags.cmd_clearusertag;
import nl.svenar.PowerRanks.Commands.usertags.cmd_createusertag;
import nl.svenar.PowerRanks.Commands.usertags.cmd_delusertag;
import nl.svenar.PowerRanks.Commands.usertags.cmd_editusertag;
import nl.svenar.PowerRanks.Commands.usertags.cmd_listusertags;
import nl.svenar.PowerRanks.Commands.usertags.cmd_removeusertag;
import nl.svenar.PowerRanks.Commands.usertags.cmd_addusertag;
import nl.svenar.PowerRanks.Commands.usertags.cmd_setusertag;
import nl.svenar.PowerRanks.Commands.webeditor.cmd_webeditor;
import nl.svenar.PowerRanks.addons.PowerRanksAddon;
Expand Down Expand Up @@ -137,7 +139,9 @@ public PowerCommandHandler(PowerRanks plugin) {
new cmd_createusertag(plugin, "createusertag", COMMAND_EXECUTOR.ALL);
new cmd_editusertag(plugin, "editusertag", COMMAND_EXECUTOR.ALL);
new cmd_removeusertag(plugin, "removeusertag", COMMAND_EXECUTOR.ALL);
new cmd_addusertag(plugin, "addusertag", COMMAND_EXECUTOR.ALL);
new cmd_setusertag(plugin, "setusertag", COMMAND_EXECUTOR.ALL);
new cmd_delusertag(plugin, "delusertag", COMMAND_EXECUTOR.ALL);
new cmd_clearusertag(plugin, "clearusertag", COMMAND_EXECUTOR.ALL);

new cmd_webeditor(plugin, "webeditor", COMMAND_EXECUTOR.ALL);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
package nl.svenar.PowerRanks.Commands.usertags;

import java.util.ArrayList;

import com.google.common.collect.ImmutableMap;

import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;

import nl.svenar.PowerRanks.PowerRanks;
import nl.svenar.PowerRanks.Cache.CacheManager;
import nl.svenar.PowerRanks.Commands.PowerCommand;
import nl.svenar.PowerRanks.Data.Users;
import nl.svenar.PowerRanks.Util.Util;

public class cmd_addusertag extends PowerCommand {

private Users users;

public cmd_addusertag(PowerRanks plugin, String command_name, COMMAND_EXECUTOR ce) {
super(plugin, command_name, ce);
this.users = new Users(plugin);
this.setCommandPermission("powerranks.cmd." + command_name.toLowerCase());
}

@Override
public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String commandName,
String[] args) {
if (args.length == 1) {
if (!PowerRanks.plugin_hook_deluxetags) {
final String playername = sender.getName();
final String tag = args[0];
final boolean result = this.users.addUserTag(playername, tag);
if (result) {
Player targetPlayer = Bukkit.getServer().getPlayer(playername);
if (targetPlayer != null) {
PowerRanks.getInstance().updateTablistName(targetPlayer);
}

sender.sendMessage(Util.powerFormatter(
PowerRanks.getLanguageManager().getFormattedMessage(
"commands." + commandName.toLowerCase() + ".success"),
ImmutableMap.<String, String>builder()
.put("player", sender.getName())
.put("target", playername)
.put("usertag", tag)
.build(),
'[', ']'));
} else {
sender.sendMessage(Util.powerFormatter(
PowerRanks.getLanguageManager().getFormattedMessage(
"commands." + commandName.toLowerCase() + ".failed"),
ImmutableMap.<String, String>builder()
.put("player", sender.getName())
.put("target", playername)
.put("usertag", tag)
.build(),
'[', ']'));
}
} else {
sender.sendMessage(
PowerRanks.getLanguageManager().getFormattedMessage(
"commands." + commandName.toLowerCase() + ".disabled"));
}
} else if (args.length == 2) {
if (sender.hasPermission("powerranks.cmd." + commandName.toLowerCase() + ".other")) {
if (!PowerRanks.plugin_hook_deluxetags) {
final String playername = args[0];
final String tag = args[1];
final boolean result = this.users.addUserTag(playername, tag);
if (result) {
Player targetPlayer = Bukkit.getServer().getPlayer(playername);
if (targetPlayer != null) {
PowerRanks.getInstance().updateTablistName(targetPlayer);
}

sender.sendMessage(Util.powerFormatter(
PowerRanks.getLanguageManager().getFormattedMessage(
"commands." + commandName.toLowerCase() + ".success"),
ImmutableMap.<String, String>builder()
.put("player", sender.getName())
.put("target", playername)
.put("usertag", tag)
.build(),
'[', ']'));
} else {
sender.sendMessage(Util.powerFormatter(
PowerRanks.getLanguageManager().getFormattedMessage(
"commands." + commandName.toLowerCase() + ".failed"),
ImmutableMap.<String, String>builder()
.put("player", sender.getName())
.put("target", playername)
.put("usertag", tag)
.build(),
'[', ']'));
}
} else {
sender.sendMessage(
PowerRanks.getLanguageManager().getFormattedMessage(
"commands." + commandName.toLowerCase() + ".disabled"));
}
} else {
sender.sendMessage(PowerRanks.getLanguageManager().getFormattedMessage("general.no-permission"));
}
} else {
sender.sendMessage(
PowerRanks.getLanguageManager().getFormattedUsageMessage(commandLabel, commandName,
"commands." + commandName.toLowerCase() + ".arguments", sender instanceof Player));
}

return false;
}

public ArrayList<String> tabCompleteEvent(CommandSender sender, String[] args) {
ArrayList<String> tabcomplete = new ArrayList<String>();

if (args.length == 1) {
for (Player player : Bukkit.getServer().getOnlinePlayers()) {
tabcomplete.add(player.getName());
}
}

if (args.length == 2) {
for (String tag : this.users.getUserTags()) {
tabcomplete.add(tag);
}
Player target_player = Util.getPlayerByName(args[0]);
if (target_player != null) {
for (String tag : CacheManager.getPlayer(target_player.getUniqueId().toString()).getUsertags()) {
tabcomplete.remove(tag);
}
}
}

return tabcomplete;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
package nl.svenar.PowerRanks.Commands.usertags;

import java.util.ArrayList;

import com.google.common.collect.ImmutableMap;

import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;

import nl.svenar.PowerRanks.PowerRanks;
import nl.svenar.PowerRanks.Cache.CacheManager;
import nl.svenar.PowerRanks.Commands.PowerCommand;
import nl.svenar.PowerRanks.Data.Users;
import nl.svenar.PowerRanks.Util.Util;

public class cmd_delusertag extends PowerCommand {

private Users users;

public cmd_delusertag(PowerRanks plugin, String command_name, COMMAND_EXECUTOR ce) {
super(plugin, command_name, ce);
this.users = new Users(plugin);
this.setCommandPermission("powerranks.cmd." + command_name.toLowerCase());
}

@Override
public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String commandName,
String[] args) {
if (args.length == 1) {
if (!PowerRanks.plugin_hook_deluxetags) {
final String playername = sender.getName();
final String tag = args[0];
final boolean result = this.users.delUserTag(playername, tag);
if (result) {
Player targetPlayer = Bukkit.getServer().getPlayer(playername);
if (targetPlayer != null) {
PowerRanks.getInstance().updateTablistName(targetPlayer);
}

sender.sendMessage(Util.powerFormatter(
PowerRanks.getLanguageManager().getFormattedMessage(
"commands." + commandName.toLowerCase() + ".success"),
ImmutableMap.<String, String>builder()
.put("player", sender.getName())
.put("target", playername)
.put("usertag", tag)
.build(),
'[', ']'));
} else {
sender.sendMessage(Util.powerFormatter(
PowerRanks.getLanguageManager().getFormattedMessage(
"commands." + commandName.toLowerCase() + ".failed"),
ImmutableMap.<String, String>builder()
.put("player", sender.getName())
.put("target", playername)
.put("usertag", tag)
.build(),
'[', ']'));
}
} else {
sender.sendMessage(
PowerRanks.getLanguageManager().getFormattedMessage(
"commands." + commandName.toLowerCase() + ".disabled"));
}
} else if (args.length == 2) {
if (sender.hasPermission("powerranks.cmd." + commandName.toLowerCase() + ".other")) {
if (!PowerRanks.plugin_hook_deluxetags) {
final String playername = args[0];
final String tag = args[1];
final boolean result = this.users.delUserTag(playername, tag);
if (result) {
Player targetPlayer = Bukkit.getServer().getPlayer(playername);
if (targetPlayer != null) {
PowerRanks.getInstance().updateTablistName(targetPlayer);
}

sender.sendMessage(Util.powerFormatter(
PowerRanks.getLanguageManager().getFormattedMessage(
"commands." + commandName.toLowerCase() + ".success"),
ImmutableMap.<String, String>builder()
.put("player", sender.getName())
.put("target", playername)
.put("usertag", tag)
.build(),
'[', ']'));
} else {
sender.sendMessage(Util.powerFormatter(
PowerRanks.getLanguageManager().getFormattedMessage(
"commands." + commandName.toLowerCase() + ".failed"),
ImmutableMap.<String, String>builder()
.put("player", sender.getName())
.put("target", playername)
.put("usertag", tag)
.build(),
'[', ']'));
}
} else {
sender.sendMessage(
PowerRanks.getLanguageManager().getFormattedMessage(
"commands." + commandName.toLowerCase() + ".disabled"));
}
} else {
sender.sendMessage(PowerRanks.getLanguageManager().getFormattedMessage("general.no-permission"));
}
} else {
sender.sendMessage(
PowerRanks.getLanguageManager().getFormattedUsageMessage(commandLabel, commandName,
"commands." + commandName.toLowerCase() + ".arguments", sender instanceof Player));
}

return false;
}

public ArrayList<String> tabCompleteEvent(CommandSender sender, String[] args) {
ArrayList<String> tabcomplete = new ArrayList<String>();

if (args.length == 1) {
for (Player player : Bukkit.getServer().getOnlinePlayers()) {
tabcomplete.add(player.getName());
}
}

if (args.length == 2) {
Player target_player = Util.getPlayerByName(args[0]);
if (target_player != null) {
for (String tag : CacheManager.getPlayer(target_player.getUniqueId().toString()).getUsertags()) {
tabcomplete.add(tag);
}
}
}

return tabcomplete;
}
}
Loading

0 comments on commit 6448480

Please sign in to comment.