Plexus/Module-NUSH
1
0
Fork 0
mirror of https://github.com/plexusorg/Module-NUSH.git synced 2024-07-03 01:50:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "https://media.discordapp.net/attachments/968519299763413022/976916680032800868/caption.gif"""""""""""""""

Browse Source 
This reverts commit c8467e2bfe.
This commit is contained in:
Allink 2022-05-19 22:49:43 +01:00
parent 31825d5d56
commit f97cc0a44a
No known key found for this signature in database
GPG Key ID: 7F1F1B98F0FAAD13
11 changed files with 247 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/dev/plex/nush/Message.java
View File

@ -7,9 +7,8 @@ import net.kyori.adventure.text.Component;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
public class Message public class Message {
{
UUID sender; UUID sender;
Component message; Component message;
} }

47
src/main/java/dev/plex/nush/NushAction.java
View File

@ -2,34 +2,29 @@ package dev.plex.nush;
import javax.annotation.Nullable; import javax.annotation.Nullable;
public enum NushAction public enum NushAction {
{ MUTE("Mute Player", 0),
MUTE("Mute Player", 0), CANCEL("Cancel", 1),
CANCEL("Cancel", 1), SMITE("Smite", 2),
SMITE("Smite", 2), BAN("Ban Player", 3),
BAN("Ban Player", 3), ACCEPT("Accept", 4);
ACCEPT("Accept", 4);
public final String humanReadable; public final String humanReadable;
public final int ordinal; public final int ordinal;
NushAction(String humanReadable, int ordinal) NushAction(String humanReadable, int ordinal) {
{ this.humanReadable = humanReadable;
this.humanReadable = humanReadable; this.ordinal = ordinal;
this.ordinal = ordinal; }
}
@Nullable @Nullable
public static NushAction fromOrdinal(int ordinal) public static NushAction fromOrdinal(int ordinal) {
{ for (NushAction value : NushAction.values()) {
for (NushAction value : NushAction.values()) if (value.ordinal == ordinal) {
{ return value;
if (value.ordinal == ordinal) }
{ }
return value;
}
}
return null; return null;
} }
} }

53
src/main/java/dev/plex/nush/NushModule.java
View File

@ -8,38 +8,33 @@ import dev.plex.nush.handler.impl.ListenerHandler;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
public class NushModule extends PlexModule public class NushModule extends PlexModule {
{
public static final Map<String, String> messages = Map.ofEntries( public static final Map<String, String> messages = Map.ofEntries(
Map.entry("nushToggled", "<aqua>{0} - {1} NUSH."), Map.entry("nushToggled", "<aqua>{0} - {1} NUSH."),
Map.entry("nushApply", "<yellow>Applying {0} to {1}!")); Map.entry("nushApply", "<yellow>Applying {0} to {1}!"));
public static boolean enabled = false; public static boolean enabled = false;
private static NushModule INSTANCE; private static NushModule INSTANCE;
public static NushModule getInstance() public static NushModule getInstance() {
{ return INSTANCE;
return INSTANCE; }
}
@Override @Override
public void enable() public void enable() {
{ INSTANCE = this;
INSTANCE = this; Plex plex = getPlex();
Plex plex = getPlex(); for (Entry<String, String> entry : messages.entrySet()) {
for (Entry<String, String> entry : messages.entrySet()) plex.messages.addDefault(entry.getKey(), entry.getValue());
{ }
plex.messages.addDefault(entry.getKey(), entry.getValue());
}
new ActionHandler().init(this); new ActionHandler().init(this);
new CommandHandler().init(this); new CommandHandler().init(this);
new ListenerHandler().init(this); new ListenerHandler().init(this);
} }
@Override @Override
public void disable() public void disable() {
{ // Unregistering listeners / commands is handled by Plex
// Unregistering listeners / commands is handled by Plex }
}
} }

113
src/main/java/dev/plex/nush/command/impl/NUSHCommand.java
View File

@ -18,83 +18,68 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import static dev.plex.nush.NushAction.ACCEPT; import static dev.plex.nush.NushAction.ACCEPT;
import static dev.plex.nush.NushAction.CANCEL; import static dev.plex.nush.NushAction.CANCEL;
@CommandParameters(name = "nush", aliases = "raidmode", description = "Toggle NUSH on or off.", usage = "/<command> [on | enable | off | disable | toggle]") @CommandParameters(name = "nush", aliases = "raidmode", description = "Toggle NUSH on or off.", usage = "/<command> [on | enable | off | disable | toggle]")
@CommandPermissions(level = Rank.ADMIN, permission = "plex.nush.command") @CommandPermissions(level = Rank.ADMIN, permission = "plex.nush.command")
public class NUSHCommand extends PlexCommand public class NUSHCommand extends PlexCommand {
{
@Override @Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player,
@NotNull String[] args) @NotNull String[] args) {
{ if (args.length == 0) {
if (args.length == 0) NushModule.enabled = !NushModule.enabled;
{ } else if (args.length == 1) {
NushModule.enabled = !NushModule.enabled; switch (args[0].toLowerCase()) {
} case "on", "enable" -> NushModule.enabled = true;
else if (args.length == 1) case "off", "disable" -> NushModule.enabled = false;
{ case "toggle" -> NushModule.enabled = !NushModule.enabled;
switch (args[0].toLowerCase()) }
{ } else {
case "on", "enable" -> NushModule.enabled = true; if (args[0].equalsIgnoreCase("work")) {
case "off", "disable" -> NushModule.enabled = false; try {
case "toggle" -> NushModule.enabled = !NushModule.enabled; UUID nushIdentifier = UUID.fromString(args[1]);
} Message nushMessage = ActionHandler.MAP.get(nushIdentifier);
}
else
{
if (args[0].equalsIgnoreCase("work"))
{
try
{
UUID nushIdentifier = UUID.fromString(args[1]);
Message nushMessage = ActionHandler.MAP.get(nushIdentifier);
if (nushMessage == null) if (nushMessage == null) {
{ return null;
return null; }
}
NushAction action = NushAction.fromOrdinal(Integer.parseInt(args[2])); NushAction action = NushAction.fromOrdinal(Integer.parseInt(args[2]));
if (action == null) if (action == null) {
{ return null;
return null; }
}
if (action == ACCEPT || action == CANCEL) if (action == ACCEPT || action == CANCEL) {
{ ActionHandler.resolve(nushIdentifier, action);
ActionHandler.resolve(nushIdentifier, action); return Component.text(action.humanReadable, NamedTextColor.YELLOW);
return Component.text(action.humanReadable, NamedTextColor.YELLOW); }
}
StringBuilder command = new StringBuilder(); StringBuilder command = new StringBuilder();
command.append(action.name().toLowerCase()); command.append(action.name().toLowerCase());
command.append(" "); command.append(" ");
command.append(nushMessage.getSender()); command.append(nushMessage.getSender());
if (!command.toString().trim().isEmpty()) if (!command.toString().trim().isEmpty()) {
{ PlexLog.debug("Dispatching command: {0}", command.toString());
PlexLog.debug("Dispatching command: {0}", command.toString()); Bukkit.dispatchCommand(commandSender, command.toString());
Bukkit.dispatchCommand(commandSender, command.toString()); }
}
ActionHandler.resolve(nushIdentifier, action); ActionHandler.resolve(nushIdentifier, action);
return Component.text(action.humanReadable, NamedTextColor.YELLOW); return Component.text(action.humanReadable, NamedTextColor.YELLOW);
} } catch (Exception ignored) {
catch (Exception ignored) return null;
{ }
return null; }
}
}
return null; return null;
} }
PlexUtils.broadcastToAdmins(messageComponent("nushToggled", commandSender.getName(), PlexUtils.broadcastToAdmins(messageComponent("nushToggled", commandSender.getName(),
NushModule.enabled ? "Enabling" : "Disabling")); NushModule.enabled ? "Enabling" : "Disabling"));
return null; return null;
} }
} }

5
src/main/java/dev/plex/nush/handler/Handler.java
View File

@ -2,8 +2,7 @@ package dev.plex.nush.handler;
import dev.plex.nush.NushModule; import dev.plex.nush.NushModule;
public interface Handler public interface Handler {
{
void init(NushModule module); void init(NushModule module);
} }

106
src/main/java/dev/plex/nush/handler/impl/ActionHandler.java
View File

@ -12,6 +12,7 @@ import dev.plex.util.minimessage.SafeMiniMessage;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import net.kyori.adventure.audience.Audience;
import net.kyori.adventure.identity.Identity; import net.kyori.adventure.identity.Identity;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextReplacementConfig; import net.kyori.adventure.text.TextReplacementConfig;
@ -23,67 +24,58 @@ import net.kyori.adventure.text.minimessage.tag.standard.StandardTags;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class ActionHandler implements Handler public class ActionHandler implements Handler {
{
public static final Map<UUID, Message> MAP = new HashMap<>(); public static final Map<UUID, Message> MAP = new HashMap<>();
private final static TextReplacementConfig URL_REPLACEMENT_CONFIG = TextReplacementConfig.builder() private final static TextReplacementConfig URL_REPLACEMENT_CONFIG = TextReplacementConfig.builder()
.match("(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]") .match("(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]")
.replacement( .replacement(
(matchResult, builder) -> Component.empty().content(matchResult.group()).clickEvent( (matchResult, builder) -> Component.empty().content(matchResult.group()).clickEvent(
ClickEvent.openUrl(matchResult.group()))).build(); ClickEvent.openUrl(matchResult.group()))).build();
private static NushModule MODULE; private static NushModule MODULE;
public static void resolve(UUID uuid, NushAction action) public static void resolve(UUID uuid, NushAction action) {
{ Message message = MAP.get(uuid);
Message message = MAP.get(uuid); if (message == null) {
if (message == null) return;
{ }
return; if (action == NushAction.ACCEPT) {
} for (Player player : Bukkit.getOnlinePlayers()) {
if (action == NushAction.ACCEPT) if (player.getUniqueId() != message.getSender()) {
{ player.sendMessage(Identity.identity(message.getSender()), getMessage(message));
for (Player player : Bukkit.getOnlinePlayers()) }
{ }
if (player.getUniqueId() != message.getSender()) }
{ MAP.remove(uuid);
player.sendMessage(Identity.identity(message.getSender()), getMessage(message)); }
}
}
}
MAP.remove(uuid);
}
public static Component getMessage(Message message) public static Component getMessage(Message message) {
{ String text = PlexUtils.getTextFromComponent(message.getMessage());
String text = PlexUtils.getTextFromComponent(message.getMessage()); Plex plex = MODULE.getPlex();
Plex plex = MODULE.getPlex(); PlexPlayer plexPlayer = DataUtils.getPlayer(message.getSender());
PlexPlayer plexPlayer = DataUtils.getPlayer(message.getSender()); Component prefix = plex.getRankManager().getPrefix(plexPlayer);
Component prefix = plex.getRankManager().getPrefix(plexPlayer); Component component = Component.empty();
Component component = Component.empty();
if (prefix != null) if (prefix != null) {
{ component = component.append(prefix);
component = component.append(prefix); }
}
return component.append(Component.space()).append( return component.append(Component.space()).append(
PlexUtils.mmDeserialize(plex.config.getString("chat.name-color", "<white>") + PlexUtils.mmDeserialize(plex.config.getString("chat.name-color", "<white>") +
MiniMessage.builder().tags( MiniMessage.builder().tags(
TagResolver.resolver(StandardTags.color(), StandardTags.rainbow(), TagResolver.resolver(StandardTags.color(), StandardTags.rainbow(),
StandardTags.decorations(), StandardTags.gradient(), StandardTags.decorations(), StandardTags.gradient(),
StandardTags.transition() StandardTags.transition()
)).build().serialize(plexPlayer.getPlayer().displayName()))) )).build().serialize(plexPlayer.getPlayer().displayName())))
.append(Component.space()) .append(Component.space())
.append(Component.text("»").color(NamedTextColor.GRAY)).append(Component.space()) .append(Component.text("»").color(NamedTextColor.GRAY)).append(Component.space())
.append( .append(
SafeMiniMessage.mmDeserializeWithoutEvents(text)) SafeMiniMessage.mmDeserializeWithoutEvents(text))
.replaceText(URL_REPLACEMENT_CONFIG); .replaceText(URL_REPLACEMENT_CONFIG);
} }
@Override @Override
public void init(NushModule module) public void init(NushModule module) {
{ MODULE = NushModule.getInstance();
MODULE = NushModule.getInstance(); }
}
} }

12
src/main/java/dev/plex/nush/handler/impl/CommandHandler.java
View File

@ -4,12 +4,10 @@ import dev.plex.nush.NushModule;
import dev.plex.nush.command.impl.NUSHCommand; import dev.plex.nush.command.impl.NUSHCommand;
import dev.plex.nush.handler.Handler; import dev.plex.nush.handler.Handler;
public class CommandHandler implements Handler public class CommandHandler implements Handler {
{
@Override @Override
public void init(NushModule module) public void init(NushModule module) {
{ module.registerCommand(new NUSHCommand());
module.registerCommand(new NUSHCommand()); }
}
} }

14
src/main/java/dev/plex/nush/handler/impl/ListenerHandler.java
View File

@ -5,13 +5,11 @@ import dev.plex.nush.handler.Handler;
import dev.plex.nush.listener.impl.ChatListener; import dev.plex.nush.listener.impl.ChatListener;
import dev.plex.nush.listener.impl.JoinListener; import dev.plex.nush.listener.impl.JoinListener;
public class ListenerHandler implements Handler public class ListenerHandler implements Handler {
{
@Override @Override
public void init(NushModule module) public void init(NushModule module) {
{ module.registerListener(new ChatListener());
module.registerListener(new ChatListener()); module.registerListener(new JoinListener());
module.registerListener(new JoinListener()); }
}
} }

88
src/main/java/dev/plex/nush/listener/impl/ChatListener.java
View File

@ -22,60 +22,52 @@ import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
public class ChatListener extends PlexListener public class ChatListener extends PlexListener {
{
@EventHandler(priority = EventPriority.HIGHEST) @EventHandler(priority = EventPriority.HIGHEST)
public void onChat(AsyncChatEvent event) public void onChat(AsyncChatEvent event) {
{ if(event.isCancelled()) return;
if (event.isCancelled()) Player player = event.getPlayer();
{ Instant firstJoined = Instant.ofEpochMilli(player.getFirstPlayed());
return; Instant rightNow = Instant.now();
} long difference = (Duration.between(firstJoined, rightNow).getSeconds() / 60);
Player player = event.getPlayer(); if (difference >= 15) {
Instant firstJoined = Instant.ofEpochMilli(player.getFirstPlayed()); PlexLog.debug("{0} has been on the server for {1} minutes, so Nush will skip them.", player.getName(), difference);
Instant rightNow = Instant.now(); return;
long difference = (Duration.between(firstJoined, rightNow).getSeconds() / 60); }
if (difference >= 15)
{
PlexLog.debug("{0} has been on the server for {1} minutes, so Nush will skip them.", player.getName(), difference);
return;
}
NushModule module = NushModule.getInstance(); NushModule module = NushModule.getInstance();
Plex plex = module.getPlex(); Plex plex = module.getPlex();
PlexPlayer plexPlayer = DataUtils.getPlayer(player.getUniqueId()); PlexPlayer plexPlayer = DataUtils.getPlayer(player.getUniqueId());
RankManager rankManager = plex.getRankManager(); RankManager rankManager = plex.getRankManager();
if (rankManager.isAdmin(plexPlayer)) if (rankManager.isAdmin(plexPlayer)) {
{ PlexLog.debug("{0} is an admin so Nush will skip them.", player.getName());
PlexLog.debug("{0} is an admin so Nush will skip them.", player.getName()); return; // we needn't process the chat message if they're an admin
return; // we needn't process the chat message if they're an admin }
}
event.setCancelled(true); event.setCancelled(true);
UUID key = UUID.randomUUID(); UUID key = UUID.randomUUID();
Message message = new Message(event.getPlayer().getUniqueId(), event.originalMessage()); Message message = new Message(event.getPlayer().getUniqueId(), event.originalMessage());
ActionHandler.MAP.put(key, message); ActionHandler.MAP.put(key, message);
Component component = ActionHandler.getMessage(message); Component component = ActionHandler.getMessage(message);
// Send the user the message so they think it got sent // Send the user the message so they think it got sent
player.sendMessage(component); player.sendMessage(component);
component = component.append(Component.text("\n")); component = component.append(Component.text("\n"));
for (NushAction value : NushAction.values()) for (NushAction value : NushAction.values()) {
{ String command = String.format("/nush work %s %d", key, value.ordinal);
String command = String.format("/nush work %s %d", key, value.ordinal); component = component.append(
component = component.append( Component.text(String.format("[%s] ", value.humanReadable))
Component.text(String.format("[%s] ", value.humanReadable)) .clickEvent(ClickEvent.runCommand(command))
.clickEvent(ClickEvent.runCommand(command)) .hoverEvent(
.hoverEvent( Component.text(command, NamedTextColor.YELLOW)
Component.text(command, NamedTextColor.YELLOW) )
) );
); }
}
PlexUtils.broadcastToAdmins(component); PlexUtils.broadcastToAdmins(component);
} }
} }

27
src/main/java/dev/plex/nush/listener/impl/JoinListener.java
View File

@ -10,25 +10,22 @@ import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
public class JoinListener extends PlexListener public class JoinListener extends PlexListener {
{
@EventHandler @EventHandler
public void onPlayerJoin(PlayerJoinEvent event) public void onPlayerJoin(PlayerJoinEvent event) {
{ Player player = event.getPlayer();
Player player = event.getPlayer(); NushModule module = NushModule.getInstance();
NushModule module = NushModule.getInstance(); Plex plex = module.getPlex();
Plex plex = module.getPlex(); PlexPlayer plexPlayer = DataUtils.getPlayer(player.getUniqueId());
PlexPlayer plexPlayer = DataUtils.getPlayer(player.getUniqueId()); RankManager rankManager = plex.getRankManager();
RankManager rankManager = plex.getRankManager();
if (!rankManager.isAdmin(plexPlayer)) if (!rankManager.isAdmin(plexPlayer)) {
{ return; // we only want to add admins
return; // we only want to add admins }
}
/*if (ChatListener.work.containsKey()) /*if (ChatListener.work.containsKey())
{ {
}*/ }*/
} }
} }

82
src/main/java/dev/plex/nush/util/ReflectionsUtil.java
View File

@ -10,52 +10,42 @@ import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
public class ReflectionsUtil public class ReflectionsUtil {
{
@SuppressWarnings("UnstableApiUsage") @SuppressWarnings("UnstableApiUsage")
public static Set<Class<?>> getClassesFrom(String packageName) public static Set<Class<?>> getClassesFrom(String packageName) {
{ Set<Class<?>> classes = new HashSet<>();
Set<Class<?>> classes = new HashSet<>(); try {
try ClassPath path = ClassPath.from(Plex.class.getClassLoader());
{ ImmutableSet<ClassPath.ClassInfo> infoSet = path.getTopLevelClasses(packageName);
ClassPath path = ClassPath.from(Plex.class.getClassLoader()); infoSet.forEach(info ->
ImmutableSet<ClassPath.ClassInfo> infoSet = path.getTopLevelClasses(packageName); {
infoSet.forEach(info -> try {
{ Class<?> clazz = Class.forName(info.getName());
try classes.add(clazz);
{ } catch (ClassNotFoundException ex) {
Class<?> clazz = Class.forName(info.getName()); PlexLog.error("Unable to find class " + info.getName() + " in " + packageName);
classes.add(clazz); }
} });
catch (ClassNotFoundException ex) } catch (IOException ex) {
{ PlexLog.error("Something went wrong while fetching classes from " + packageName);
PlexLog.error("Unable to find class " + info.getName() + " in " + packageName); throw new RuntimeException(ex);
} }
}); return Collections.unmodifiableSet(classes);
} }
catch (IOException ex)
{
PlexLog.error("Something went wrong while fetching classes from " + packageName);
throw new RuntimeException(ex);
}
return Collections.unmodifiableSet(classes);
}
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static <T> Set<Class<? extends T>> getClassesBySubType(String packageName, public static <T> Set<Class<? extends T>> getClassesBySubType(String packageName,
Class<T> subType) Class<T> subType) {
{ Set<Class<?>> loadedClasses = getClassesFrom(packageName);
Set<Class<?>> loadedClasses = getClassesFrom(packageName); Set<Class<? extends T>> classes = new HashSet<>();
Set<Class<? extends T>> classes = new HashSet<>(); loadedClasses.forEach(clazz ->
loadedClasses.forEach(clazz -> {
{ if (clazz.getSuperclass() == subType || Arrays.asList(clazz.getInterfaces())
if (clazz.getSuperclass() == subType || Arrays.asList(clazz.getInterfaces()) .contains(subType)) {
.contains(subType)) classes.add((Class<? extends T>) clazz);
{ }
classes.add((Class<? extends T>)clazz); });
} return Collections.unmodifiableSet(classes);
}); }
return Collections.unmodifiableSet(classes);
}
} }