Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
6f054a8993 | |||
a3ec7117dd |
2
pom.xml
2
pom.xml
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>net.t2code</groupId>
|
<groupId>net.t2code</groupId>
|
||||||
<artifactId>T2CodeLib</artifactId>
|
<artifactId>T2CodeLib</artifactId>
|
||||||
<version>15.2</version>
|
<version>15.3</version>
|
||||||
<!--version>VERSION_snapshot-0</version-->
|
<!--version>VERSION_snapshot-0</version-->
|
||||||
<!--version>VERSION_beta-0</version-->
|
<!--version>VERSION_beta-0</version-->
|
||||||
<!--version>VERSION_dev-0</version-->
|
<!--version>VERSION_dev-0</version-->
|
||||||
|
@@ -10,31 +10,55 @@ import java.util.Iterator;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class T2CBtab {
|
public class T2CBtab {
|
||||||
public static Iterable<String> tab(CommandSender sender, String[] args, String perm,Boolean onlinePlayer){
|
|
||||||
List<String> matches = new ArrayList<>();
|
|
||||||
Iterator var6 = ProxyServer.getInstance().getPlayers().iterator();
|
public static void tab(List<String> matches, CommandSender sender, int arg, String[] args, String perm, Boolean onlinePlayer) {
|
||||||
while (var6.hasNext()) {
|
if (args.length != arg + 1) return;
|
||||||
ProxiedPlayer player1 = (ProxiedPlayer) var6.next();
|
for (ProxiedPlayer player1 : ProxyServer.getInstance().getPlayers()) {
|
||||||
if (passend(player1.getName(), args[0]) && hasPermission(sender, perm)){
|
if (passend(player1.getName(), args[arg]) && hasPermission(sender, perm)) {
|
||||||
matches.add(player1.getName());
|
matches.add(player1.getName());
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return matches;
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Iterable<String> tab(CommandSender sender, String[] args, HashMap<String, String> permMap) {
|
public static void tab(List<String> matches, CommandSender sender, int argEquals, String equalsValue, int arg, String[] args, String perm, Boolean onlinePlayer) {
|
||||||
List<String> matches = new ArrayList<>();
|
if (args.length != arg + 1) return;
|
||||||
|
if (!args[argEquals].toLowerCase().equals(equalsValue)) return;
|
||||||
|
for (ProxiedPlayer player1 : ProxyServer.getInstance().getPlayers()) {
|
||||||
|
if (passend(player1.getName(), args[arg]) && hasPermission(sender, perm)) {
|
||||||
|
matches.add(player1.getName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void tab(List<String> matches, CommandSender sender, int arg, String[] args, HashMap<String, String> permMap, Boolean onlinePlayer, String permForPlayer) {
|
||||||
|
if (args.length != arg + 1) return;
|
||||||
for (String command : permMap.keySet()) {
|
for (String command : permMap.keySet()) {
|
||||||
if (hasPermission(sender, permMap.get(command)) && passend(command, args[0])) {
|
if (hasPermission(sender, permMap.get(command)) && passend(command, args[arg])) {
|
||||||
|
matches.add(command);
|
||||||
|
} else if (onlinePlayer != null && permForPlayer != null) {
|
||||||
|
tab(matches, sender, arg, args, permForPlayer, onlinePlayer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void tab(List<String> matches, CommandSender sender, int arg, String[] args, HashMap<String, String> permMap) {
|
||||||
|
tab(matches, sender, arg, args, permMap, null, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void tab(List<String> matches, CommandSender sender, int argEquals, String equalsValue, int arg, String[] args, HashMap<String, String> permMap) {
|
||||||
|
if (args.length != arg + 1) return;
|
||||||
|
if (!args[argEquals].toLowerCase().equals(equalsValue)) return;
|
||||||
|
for (String command : permMap.keySet()) {
|
||||||
|
if (hasPermission(sender, permMap.get(command)) && passend(command, args[arg])) {
|
||||||
matches.add(command);
|
matches.add(command);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return matches;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Iterable<String> tab(CommandSender sender, String[] args, String perm, String command) {
|
public static List<String> tab(CommandSender sender, int arg, String[] args, String perm, String command) {
|
||||||
List<String> matches = new ArrayList<>();
|
List<String> matches = new ArrayList<>();
|
||||||
if (hasPermission(sender, perm) && passend(command, args[0])) {
|
if (hasPermission(sender, perm) && passend(command, args[arg])) {
|
||||||
matches.add(command);
|
matches.add(command);
|
||||||
}
|
}
|
||||||
return matches;
|
return matches;
|
||||||
|
@@ -21,7 +21,7 @@ public class T2CmcVersion {
|
|||||||
mc1_18 = nms.contains("1_18");
|
mc1_18 = nms.contains("1_18");
|
||||||
mc1_19 = nms.contains("1_19");
|
mc1_19 = nms.contains("1_19");
|
||||||
mc1_20 = nms.contains("1_20");
|
mc1_20 = nms.contains("1_20");
|
||||||
|
|
||||||
nms1_8_R1 = nms.contains("1_8_R1");
|
nms1_8_R1 = nms.contains("1_8_R1");
|
||||||
nms1_8_R2 = nms.contains("1_8_R2");
|
nms1_8_R2 = nms.contains("1_8_R2");
|
||||||
nms1_8_R3 = nms.contains("1_8_R3");
|
nms1_8_R3 = nms.contains("1_8_R3");
|
||||||
@@ -233,7 +233,62 @@ public class T2CmcVersion {
|
|||||||
public static boolean isNms1_20_R1() {
|
public static boolean isNms1_20_R1() {
|
||||||
return nms1_20_R1;
|
return nms1_20_R1;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isNms1_20_R2() {
|
public static boolean isNms1_20_R2() {
|
||||||
return nms1_20_R2;
|
return nms1_20_R2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public static boolean minMc1_8() {
|
||||||
|
return isMc1_8();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean minMc1_9() {
|
||||||
|
return !isMc1_8();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean minMc1_10() {
|
||||||
|
return !isMc1_8() && !isMc1_9();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean minMc1_11() {
|
||||||
|
return !isMc1_8() && !isMc1_9() && !isMc1_10();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean minMc1_12() {
|
||||||
|
return !isMc1_8() && !isMc1_9() && !isMc1_10() && !isMc1_11();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean minMc1_13() {
|
||||||
|
return !isMc1_8() && !isMc1_9() && !isMc1_10() && !isMc1_11() && !isMc1_12() ;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean minMc1_14() {
|
||||||
|
return !isMc1_8() && !isMc1_9() && !isMc1_10() && !isMc1_11() && !isMc1_12() && !isMc1_13();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean minMc1_15() {
|
||||||
|
return !isMc1_8() && !isMc1_9() && !isMc1_10() && !isMc1_11() && !isMc1_12() && !isMc1_13() && !isMc1_14() ;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean minMc1_16() {
|
||||||
|
return !isMc1_8() && !isMc1_9() && !isMc1_10() && !isMc1_11() && !isMc1_12() && !isMc1_13() && !isMc1_14() && !isMc1_15();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean minMc1_17() {
|
||||||
|
return !isMc1_8() && !isMc1_9() && !isMc1_10() && !isMc1_11() && !isMc1_12() && !isMc1_13() && !isMc1_14() && !isMc1_15() && !isMc1_16();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean minMc1_18() {
|
||||||
|
return !isMc1_8() && !isMc1_9() && !isMc1_10() && !isMc1_11() && !isMc1_12() && !isMc1_13() && !isMc1_14() && !isMc1_15() && !isMc1_16() && !isMc1_17();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean minMc1_19() {
|
||||||
|
return !isMc1_8() && !isMc1_9() && !isMc1_10() && !isMc1_11() && !isMc1_12() && !isMc1_13() && !isMc1_14() && !isMc1_15() && !isMc1_16() && !isMc1_17() && !isMc1_18();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean minMc1_20() {
|
||||||
|
return !isMc1_8() && !isMc1_9() && !isMc1_10() && !isMc1_11() && !isMc1_12() && !isMc1_13() && !isMc1_14() && !isMc1_15() && !isMc1_16() && !isMc1_17()
|
||||||
|
&& !isMc1_18() && !isMc1_19();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -2,6 +2,7 @@ package net.t2code.t2codelib.SPIGOT.system.cmd;
|
|||||||
|
|
||||||
import net.t2code.t2codelib.SPIGOT.api.debug.T2Cdebug;
|
import net.t2code.t2codelib.SPIGOT.api.debug.T2Cdebug;
|
||||||
import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
|
import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
|
||||||
|
import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion;
|
||||||
import net.t2code.t2codelib.SPIGOT.api.update.T2CupdateAPI;
|
import net.t2code.t2codelib.SPIGOT.api.update.T2CupdateAPI;
|
||||||
import net.t2code.t2codelib.SPIGOT.api.bungeePlayers.T2CbungeePlayers;
|
import net.t2code.t2codelib.SPIGOT.api.bungeePlayers.T2CbungeePlayers;
|
||||||
import net.t2code.t2codelib.SPIGOT.system.T2CbungeeCommandSenderReciver;
|
import net.t2code.t2codelib.SPIGOT.system.T2CbungeeCommandSenderReciver;
|
||||||
@@ -51,7 +52,7 @@ public class CmdExecuter implements CommandExecutor, TabCompleter {
|
|||||||
Commands.debug(sender, args);
|
Commands.debug(sender, args);
|
||||||
return false;
|
return false;
|
||||||
case "test":
|
case "test":
|
||||||
T2Csend.sender(sender, T2CbungeePlayers.getBungeePlayers().toString());
|
Commands.test(sender, args);
|
||||||
return false;
|
return false;
|
||||||
case "serverid":
|
case "serverid":
|
||||||
T2Csend.sender(sender, ("[prefix] <red>T2C ServerID:</red> <gold><hover:show_text:'<yellow>copy</yellow>'>" +
|
T2Csend.sender(sender, ("[prefix] <red>T2C ServerID:</red> <gold><hover:show_text:'<yellow>copy</yellow>'>" +
|
||||||
|
@@ -16,6 +16,9 @@ public class Commands {
|
|||||||
public static void info(CommandSender sender) {
|
public static void info(CommandSender sender) {
|
||||||
T2Ctemplate.sendInfo(sender, T2CodeLibMain.getPlugin(), Util.getSpigotID(), Util.getDiscord(), null, Util.getInfoText());
|
T2Ctemplate.sendInfo(sender, T2CodeLibMain.getPlugin(), Util.getSpigotID(), Util.getDiscord(), null, Util.getInfoText());
|
||||||
}
|
}
|
||||||
|
public static void test(CommandSender sender, String[] args) {
|
||||||
|
T2Csend.sender(sender,Util.getPrefix()+" &4Currently there is no development test command");
|
||||||
|
}
|
||||||
|
|
||||||
public static void debug(CommandSender sender, String[] args) {
|
public static void debug(CommandSender sender, String[] args) {
|
||||||
if (args.length < 2) {
|
if (args.length < 2) {
|
||||||
|
Reference in New Issue
Block a user