Revert "many owner names...."

This reverts commit 487b828c62.
This commit is contained in:
Chayapak 2023-09-10 11:32:18 +07:00
parent 487b828c62
commit d6aa60a778
5 changed files with 15 additions and 39 deletions

View file

@ -25,7 +25,7 @@ public class Configuration {
public ColorPalette colorPalette = new ColorPalette();
public List<String> ownerNames = new ArrayList<>();
public String ownerName = "chayapak"; // mabe mabe
public OwnerAuthentication ownerAuthentication = new OwnerAuthentication();

View file

@ -41,20 +41,13 @@ public class AuthPlugin extends PlayersPlugin.Listener {
bot.executor.scheduleAtFixedRate(this::check, 0, 1, TimeUnit.SECONDS);
}
private List<String> getSanitizedOwnerName() {
return bot.config.ownerNames.stream().map(each -> each.replaceAll("§[a-f0-9rlonmk]", "")).toList();
private String getSanitizedOwnerName() {
return bot.config.ownerName.replaceAll("§[a-f0-9rlonmk]", "");
}
@Override
public void playerJoined(PlayerEntry target) {
boolean has = false;
for (String name : getSanitizedOwnerName()) {
if (!target.profile.getName().equals(name) || !bot.options.useCore) continue;
has = true;
}
if (!has) return;
if (!target.profile.getName().equals(getSanitizedOwnerName()) || !bot.options.useCore) return;
bot.executor.schedule(() -> sendVerificationMessage(target, true), 2, TimeUnit.SECONDS);
}
@ -84,14 +77,7 @@ public class AuthPlugin extends PlayersPlugin.Listener {
@Override
public void playerLeft(PlayerEntry target) {
boolean has = false;
for (String name : getSanitizedOwnerName()) {
if (!target.profile.getName().equals(name) || !bot.options.useCore) continue;
has = true;
}
if (!has) return;
if (!target.profile.getName().equals(getSanitizedOwnerName())) return;
hasCorrectHash = false;
started = false;
@ -124,8 +110,7 @@ public class AuthPlugin extends PlayersPlugin.Listener {
private void check() {
if (!started) return;
for (String name : getSanitizedOwnerName()) {
final PlayerEntry entry = bot.players.getEntry(name);
final PlayerEntry entry = bot.players.getEntry(getSanitizedOwnerName());
if (entry == null) return;
@ -138,5 +123,4 @@ public class AuthPlugin extends PlayersPlugin.Listener {
bot.filter.deOp(entry);
}
}
}
}

View file

@ -105,7 +105,7 @@ public class ConsolePlugin implements Completer {
Component.translatable(
"[%s] %s %s",
Component.text(bot.username + " Console").color(NamedTextColor.GRAY),
Component.text(bot.config.ownerNames.get(0)).color(ColorUtilities.getColorByString(bot.config.colorPalette.ownerName)),
Component.text(bot.config.ownerName).color(ColorUtilities.getColorByString(bot.config.colorPalette.ownerName)),
Component.text(line).color(NamedTextColor.GRAY)
).color(NamedTextColor.DARK_GRAY)
);

View file

@ -56,14 +56,9 @@ public class TrustedPlugin extends PlayersPlugin.Listener {
public void playerJoined (PlayerEntry target) {
if (!list.contains(target.profile.getName())) return;
boolean doesntHaveOwner = true;
for (String name : bot.config.ownerNames) {
if (target.profile.getName().equals(name)) doesntHaveOwner = false;
}
// based (VERY)
Component component;
if (doesntHaveOwner) {
if (!target.profile.getName().equals(bot.config.ownerName)) {
component = Component.translatable(
"Hello, %s!",
Component.text(target.profile.getName()).color(ColorUtilities.getColorByString(bot.config.colorPalette.username))

View file

@ -49,10 +49,7 @@ colorPalette:
number: 'gold'
ownerName: 'green'
# currently this is only used in the console
ownerNames:
# don't leave this array blank or it can cause errors
- 'chayapak'
ownerName: 'chayapak' # currently this is only used in the console
ownerAuthentication:
enabled: false