mirror of
https://github.com/songoda/UltimateModeration.git
synced 2025-02-07 15:11:31 +01:00
Added support for FabledSkyBlock island chat.
This commit is contained in:
parent
ba1244fbac
commit
47554df3a7
6
pom.xml
6
pom.xml
@ -69,6 +69,12 @@
|
|||||||
<artifactId>spigot</artifactId>
|
<artifactId>spigot</artifactId>
|
||||||
<version>1.14.4</version>
|
<version>1.14.4</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.songoda</groupId>
|
||||||
|
<artifactId>abledskyblock</artifactId>
|
||||||
|
<version>79.1</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.songoda</groupId>
|
<groupId>com.songoda</groupId>
|
||||||
<artifactId>SongodaCore</artifactId>
|
<artifactId>SongodaCore</artifactId>
|
||||||
|
@ -29,6 +29,7 @@ import com.songoda.ultimatemoderation.tickets.TicketStatus;
|
|||||||
import com.songoda.ultimatemoderation.utils.Methods;
|
import com.songoda.ultimatemoderation.utils.Methods;
|
||||||
import com.songoda.ultimatemoderation.utils.gui.AbstractGUI;
|
import com.songoda.ultimatemoderation.utils.gui.AbstractGUI;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.plugin.PluginManager;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
@ -111,18 +112,21 @@ public class UltimateModeration extends SongodaPlugin {
|
|||||||
// Register Listeners
|
// Register Listeners
|
||||||
guiManager.init();
|
guiManager.init();
|
||||||
AbstractGUI.initializeListeners(this);
|
AbstractGUI.initializeListeners(this);
|
||||||
Bukkit.getPluginManager().registerEvents(new CommandListener(this), this);
|
PluginManager pluginManager = Bukkit.getPluginManager();
|
||||||
Bukkit.getPluginManager().registerEvents(new DeathListener(this), this);
|
pluginManager.registerEvents(new CommandListener(this), this);
|
||||||
Bukkit.getPluginManager().registerEvents(new MoveListener(this), this);
|
pluginManager.registerEvents(new DeathListener(this), this);
|
||||||
Bukkit.getPluginManager().registerEvents(new DropListener(this), this);
|
pluginManager.registerEvents(new MoveListener(this), this);
|
||||||
Bukkit.getPluginManager().registerEvents(new InventoryListener(this), this);
|
pluginManager.registerEvents(new DropListener(this), this);
|
||||||
Bukkit.getPluginManager().registerEvents(new ChatListener(this), this);
|
pluginManager.registerEvents(new InventoryListener(this), this);
|
||||||
Bukkit.getPluginManager().registerEvents(new LoginListener(this), this);
|
pluginManager.registerEvents(new ChatListener(this), this);
|
||||||
Bukkit.getPluginManager().registerEvents(new MobTargetLister(), this);
|
pluginManager.registerEvents(new LoginListener(this), this);
|
||||||
Bukkit.getPluginManager().registerEvents(new BlockListener(this), this);
|
pluginManager.registerEvents(new MobTargetLister(), this);
|
||||||
|
pluginManager.registerEvents(new BlockListener(this), this);
|
||||||
|
if (pluginManager.isPluginEnabled("FabledSkyBlock"))
|
||||||
|
pluginManager.registerEvents(new SkyBlockListener(this), this);
|
||||||
|
|
||||||
if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13))
|
if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13))
|
||||||
Bukkit.getPluginManager().registerEvents(new SpyingDismountListener(), this);
|
pluginManager.registerEvents(new SpyingDismountListener(), this);
|
||||||
|
|
||||||
// Start tasks
|
// Start tasks
|
||||||
SlowModeTask.startTask(this);
|
SlowModeTask.startTask(this);
|
||||||
|
@ -38,6 +38,12 @@ public class ChatListener implements Listener {
|
|||||||
@EventHandler
|
@EventHandler
|
||||||
public void onChat(AsyncPlayerChatEvent event) {
|
public void onChat(AsyncPlayerChatEvent event) {
|
||||||
Player player = event.getPlayer();
|
Player player = event.getPlayer();
|
||||||
|
if (!onChat(player, event.getMessage()))
|
||||||
|
event.setCancelled(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean onChat(Player player, String message) {
|
||||||
|
UltimateModeration instance = UltimateModeration.getInstance();
|
||||||
|
|
||||||
long slowmode = slowModeOverride == 0 ? Methods.parseTime(Settings.SLOW_MODE.getString()) : slowModeOverride;
|
long slowmode = slowModeOverride == 0 ? Methods.parseTime(Settings.SLOW_MODE.getString()) : slowModeOverride;
|
||||||
|
|
||||||
@ -46,33 +52,35 @@ public class ChatListener implements Listener {
|
|||||||
if (chats.size() != 0) {
|
if (chats.size() != 0) {
|
||||||
Log last = chats.get(chats.size() - 1);
|
Log last = chats.get(chats.size() - 1);
|
||||||
if ((System.currentTimeMillis() - last.sent) < slowmode) {
|
if ((System.currentTimeMillis() - last.sent) < slowmode) {
|
||||||
event.setCancelled(true);
|
return false;
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
boolean isCancelled = false;
|
||||||
|
|
||||||
for (StaffChannel channel : instance.getStaffChatManager().getChats().values()) {
|
for (StaffChannel channel : instance.getStaffChatManager().getChats().values()) {
|
||||||
if (!channel.listMembers().contains(player.getUniqueId())) continue;
|
if (!channel.listMembers().contains(player.getUniqueId())) continue;
|
||||||
event.setCancelled(true);
|
isCancelled = true;
|
||||||
channel.processMessage(event.getMessage(), player);
|
channel.processMessage(message, player);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isChatToggled && !player.hasPermission("um.togglechat.bypass")) {
|
if (!isChatToggled && !player.hasPermission("um.togglechat.bypass")) {
|
||||||
event.setCancelled(true);
|
isCancelled = true;
|
||||||
instance.getLocale().getMessage("command.togglechat.muted").sendPrefixedMessage(player);
|
instance.getLocale().getMessage("command.togglechat.muted").sendPrefixedMessage(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
List<AppliedPunishment> appliedPunishments = instance.getPunishmentManager().getPlayer(player).getActivePunishments(PunishmentType.MUTE);
|
List<AppliedPunishment> appliedPunishments = instance.getPunishmentManager().getPlayer(player).getActivePunishments(PunishmentType.MUTE);
|
||||||
if (!appliedPunishments.isEmpty()) {
|
if (!appliedPunishments.isEmpty()) {
|
||||||
appliedPunishments.get(0).sendMessage(player);
|
appliedPunishments.get(0).sendMessage(player);
|
||||||
event.setCancelled(true);
|
isCancelled = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Log chat.
|
// Log chat.
|
||||||
chatLog.add(new Log(player.getUniqueId(), System.currentTimeMillis(), event.getMessage()));
|
chatLog.add(new Log(player.getUniqueId(), System.currentTimeMillis(), message));
|
||||||
|
|
||||||
|
return !isCancelled;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void setSlowModeOverride(long slowModeOverride) {
|
public static void setSlowModeOverride(long slowModeOverride) {
|
||||||
@ -83,7 +91,7 @@ public class ChatListener implements Listener {
|
|||||||
return new ArrayList<>(chatLog);
|
return new ArrayList<>(chatLog);
|
||||||
}
|
}
|
||||||
|
|
||||||
public class Log {
|
public static class Log {
|
||||||
|
|
||||||
private UUID player;
|
private UUID player;
|
||||||
private long sent;
|
private long sent;
|
||||||
|
@ -0,0 +1,30 @@
|
|||||||
|
package com.songoda.ultimatemoderation.listeners;
|
||||||
|
|
||||||
|
import com.songoda.skyblock.api.event.player.PlayerIslandChatEvent;
|
||||||
|
import com.songoda.ultimatemoderation.UltimateModeration;
|
||||||
|
import com.songoda.ultimatemoderation.staffchat.StaffChatManager;
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.Material;
|
||||||
|
import org.bukkit.block.Block;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.event.EventHandler;
|
||||||
|
import org.bukkit.event.Listener;
|
||||||
|
import org.bukkit.event.block.BlockBreakEvent;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class SkyBlockListener implements Listener {
|
||||||
|
|
||||||
|
private UltimateModeration instance;
|
||||||
|
|
||||||
|
public SkyBlockListener(UltimateModeration ultimateModeration) {
|
||||||
|
this.instance = ultimateModeration;
|
||||||
|
}
|
||||||
|
|
||||||
|
@EventHandler
|
||||||
|
public void onIslandChat(PlayerIslandChatEvent event) {
|
||||||
|
if (!ChatListener.onChat(event.getPlayer(), event.getMessage()))
|
||||||
|
event.setCancelled(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -4,7 +4,7 @@ main: com.songoda.ultimatemoderation.UltimateModeration
|
|||||||
version: maven-version-number
|
version: maven-version-number
|
||||||
author: Songoda
|
author: Songoda
|
||||||
api-version: 1.13
|
api-version: 1.13
|
||||||
softdepend: [Vault]
|
softdepend: [Vault, FabledSkyBlock]
|
||||||
commands:
|
commands:
|
||||||
UltimateModeration:
|
UltimateModeration:
|
||||||
description: View information on this plugin.
|
description: View information on this plugin.
|
||||||
|
Loading…
Reference in New Issue
Block a user