Skip to content

Commit c85f482

Browse files
vaperionvaperion
committed
Move uuid pattern to helper
1 parent c5cd835 commit c85f482

10 files changed

Lines changed: 24 additions & 57 deletions

File tree

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
}
77

88
group = "io.github.vaperion.blade"
9-
version = "1.0.28"
9+
version = "1.0.29"
1010

1111
subprojects {
1212
apply(plugin = "io.freefair.lombok")

‎bukkit/src/main/java/me/vaperion/blade/bukkit/argument/OfflinePlayerArgument.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@
1515

1616
import java.lang.reflect.AnnotatedElement;
1717
import java.util.UUID;
18-
import java.util.regex.Pattern;
1918

20-
public class OfflinePlayerArgument implements ArgumentProvider<OfflinePlayer> {
19+
import static me.vaperion.blade.util.BladeHelper.isUUID;
2120

22-
public static final Pattern UUID_PATTERN = Pattern.compile("[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[34][0-9a-fA-F]{3}-[89ab][0-9a-fA-F]{3}-[0-9a-fA-F]{12}");
21+
public class OfflinePlayerArgument implements ArgumentProvider<OfflinePlayer> {
2322

2423
@Override
2524
public boolean handlesNullInputArguments() {
@@ -66,10 +65,6 @@ public void suggest(@NotNull Context ctx,
6665
return "offline player";
6766
}
6867

69-
private boolean isUUID(@NotNull String input) {
70-
return UUID_PATTERN.matcher(input).matches();
71-
}
72-
7368
@SuppressWarnings("deprecation")
7469
@NotNull
7570
private OfflinePlayer getOfflinePlayer(@NotNull String input) {

‎bukkit/src/main/java/me/vaperion/blade/bukkit/argument/PlayerArgument.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@
1414

1515
import java.lang.reflect.AnnotatedElement;
1616
import java.util.UUID;
17-
import java.util.regex.Pattern;
1817

19-
public class PlayerArgument implements ArgumentProvider<Player> {
18+
import static me.vaperion.blade.util.BladeHelper.isUUID;
2019

21-
public static final Pattern UUID_PATTERN = Pattern.compile("[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[34][0-9a-fA-F]{3}-[89ab][0-9a-fA-F]{3}-[0-9a-fA-F]{12}");
20+
public class PlayerArgument implements ArgumentProvider<Player> {
2221

2322
@Override
2423
public boolean handlesNullInputArguments() {
@@ -74,10 +73,6 @@ public void suggest(@NotNull Context ctx,
7473
return "player";
7574
}
7675

77-
private boolean isUUID(@NotNull String input) {
78-
return UUID_PATTERN.matcher(input).matches();
79-
}
80-
8176
@Nullable
8277
private Player getPlayer(@NotNull String input) {
8378
if (isUUID(input)) return Bukkit.getPlayer(UUID.fromString(input));

‎core/src/main/java/me/vaperion/blade/util/BladeHelper.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,17 @@
1313
import java.util.Arrays;
1414
import java.util.EnumSet;
1515
import java.util.List;
16+
import java.util.regex.Pattern;
1617

1718
@SuppressWarnings("unused")
1819
public interface BladeHelper {
1920

21+
Pattern UUID_PATTERN = Pattern.compile("[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}");
22+
23+
static boolean isUUID(@NotNull String input) {
24+
return UUID_PATTERN.matcher(input).matches();
25+
}
26+
2027
String ERROR_MESSAGE = "An error occurred while executing this command. " +
2128
"Contact a server administrator if this continues.";
2229

‎fabric-legacy/src/main/java/me/vaperion/blade/fabric/argument/ServerPlayerArgument.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@
1515

1616
import java.lang.reflect.AnnotatedElement;
1717
import java.util.UUID;
18-
import java.util.regex.Pattern;
1918

20-
public class ServerPlayerArgument implements ArgumentProvider<ServerPlayer> {
19+
import static me.vaperion.blade.util.BladeHelper.isUUID;
2120

22-
public static final Pattern UUID_PATTERN = Pattern.compile("[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[34][0-9a-fA-F]{3}-[89ab][0-9a-fA-F]{3}-[0-9a-fA-F]{12}");
21+
public class ServerPlayerArgument implements ArgumentProvider<ServerPlayer> {
2322

2423
@Override
2524
public boolean handlesNullInputArguments() {
@@ -80,10 +79,6 @@ public void suggest(@NotNull Context ctx,
8079
return "player";
8180
}
8281

83-
private boolean isUUID(@NotNull String input) {
84-
return UUID_PATTERN.matcher(input).matches();
85-
}
86-
8782
@Nullable
8883
private ServerPlayer getPlayer(@NotNull MinecraftServer server, @NotNull String input) {
8984
if (isUUID(input)) return server.getPlayerList().getPlayer(UUID.fromString(input));

‎fabric/src/main/java/me/vaperion/blade/fabric/argument/ServerPlayerArgument.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@
1515

1616
import java.lang.reflect.AnnotatedElement;
1717
import java.util.UUID;
18-
import java.util.regex.Pattern;
1918

20-
public class ServerPlayerArgument implements ArgumentProvider<ServerPlayer> {
19+
import static me.vaperion.blade.util.BladeHelper.isUUID;
2120

22-
public static final Pattern UUID_PATTERN = Pattern.compile("[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[34][0-9a-fA-F]{3}-[89ab][0-9a-fA-F]{3}-[0-9a-fA-F]{12}");
21+
public class ServerPlayerArgument implements ArgumentProvider<ServerPlayer> {
2322

2423
@Override
2524
public boolean handlesNullInputArguments() {
@@ -80,10 +79,6 @@ public void suggest(@NotNull Context ctx,
8079
return "player";
8180
}
8281

83-
private boolean isUUID(@NotNull String input) {
84-
return UUID_PATTERN.matcher(input).matches();
85-
}
86-
8782
@Nullable
8883
private ServerPlayer getPlayer(@NotNull MinecraftServer server, @NotNull String input) {
8984
if (isUUID(input)) return server.getPlayerList().getPlayer(UUID.fromString(input));

‎hytale/src/main/java/me/vaperion/blade/hytale/argument/PlayerArgument.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@
1919

2020
import java.lang.reflect.AnnotatedElement;
2121
import java.util.UUID;
22-
import java.util.regex.Pattern;
2322

24-
public class PlayerArgument implements ArgumentProvider<Player> {
23+
import static me.vaperion.blade.util.BladeHelper.isUUID;
2524

26-
public static final Pattern UUID_PATTERN = Pattern.compile("[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[34][0-9a-fA-F]{3}-[89ab][0-9a-fA-F]{3}-[0-9a-fA-F]{12}");
25+
public class PlayerArgument implements ArgumentProvider<Player> {
2726

2827
@Override
2928
public boolean handlesNullInputArguments() {
@@ -77,10 +76,6 @@ public void suggest(@NotNull Context ctx,
7776
return "player";
7877
}
7978

80-
private boolean isUUID(@NotNull String input) {
81-
return UUID_PATTERN.matcher(input).matches();
82-
}
83-
8479
@SuppressWarnings("RedundantIfStatement")
8580
@Nullable
8681
private Player getPlayer(@NotNull String input) {

‎hytale/src/main/java/me/vaperion/blade/hytale/argument/PlayerRefArgument.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@
1616

1717
import java.lang.reflect.AnnotatedElement;
1818
import java.util.UUID;
19-
import java.util.regex.Pattern;
2019

21-
public class PlayerRefArgument implements ArgumentProvider<PlayerRef> {
20+
import static me.vaperion.blade.util.BladeHelper.isUUID;
2221

23-
public static final Pattern UUID_PATTERN = Pattern.compile("[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[34][0-9a-fA-F]{3}-[89ab][0-9a-fA-F]{3}-[0-9a-fA-F]{12}");
22+
public class PlayerRefArgument implements ArgumentProvider<PlayerRef> {
2423

2524
@Override
2625
public boolean handlesNullInputArguments() {
@@ -77,10 +76,6 @@ public void suggest(@NotNull Context ctx,
7776
return "player";
7877
}
7978

80-
private boolean isUUID(@NotNull String input) {
81-
return UUID_PATTERN.matcher(input).matches();
82-
}
83-
8479
@Nullable
8580
private PlayerRef getPlayer(@NotNull String input) {
8681
if (isUUID(input)) {

‎minestom/src/main/java/me/vaperion/blade/minestom/argument/PlayerArgument.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@
1515

1616
import java.lang.reflect.AnnotatedElement;
1717
import java.util.UUID;
18-
import java.util.regex.Pattern;
1918

20-
public class PlayerArgument implements ArgumentProvider<Player> {
19+
import static me.vaperion.blade.util.BladeHelper.isUUID;
2120

22-
public static final Pattern UUID_PATTERN = Pattern.compile("[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[34][0-9a-fA-F]{3}-[89ab][0-9a-fA-F]{3}-[0-9a-fA-F]{12}");
21+
public class PlayerArgument implements ArgumentProvider<Player> {
2322

2423
@Override
2524
public boolean handlesNullInputArguments() {
@@ -75,10 +74,6 @@ public void suggest(@NotNull Context ctx,
7574
return "player";
7675
}
7776

78-
private boolean isUUID(@NotNull String input) {
79-
return UUID_PATTERN.matcher(input).matches();
80-
}
81-
8277
@Nullable
8378
private Player getPlayer(@NotNull MinecraftServer server, @NotNull String input) {
8479
if (isUUID(input)) {

‎velocity/src/main/java/me/vaperion/blade/velocity/argument/PlayerArgument.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@
1515

1616
import java.lang.reflect.AnnotatedElement;
1717
import java.util.UUID;
18-
import java.util.regex.Pattern;
1918

20-
public class PlayerArgument implements ArgumentProvider<Player> {
19+
import static me.vaperion.blade.util.BladeHelper.isUUID;
2120

22-
public static final Pattern UUID_PATTERN = Pattern.compile("[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[34][0-9a-fA-F]{3}-[89ab][0-9a-fA-F]{3}-[0-9a-fA-F]{12}");
21+
public class PlayerArgument implements ArgumentProvider<Player> {
2322

2423
@Override
2524
public boolean handlesNullInputArguments() {
@@ -75,10 +74,6 @@ public void suggest(@NotNull Context ctx,
7574
return "player";
7675
}
7776

78-
private boolean isUUID(@NotNull String input) {
79-
return UUID_PATTERN.matcher(input).matches();
80-
}
81-
8277
@Nullable
8378
private Player getPlayer(@NotNull ProxyServer proxyServer, @NotNull String input) {
8479
if (isUUID(input))

0 commit comments

Comments
 (0)