Skip to content

Commit

Permalink
Release 2.19.8
Browse files Browse the repository at this point in the history 
Drop 1.5.2 support
  • Loading branch information
@Brikster
Brikster committed Apr 21, 2022
1 parent 32c76f1 commit 7f42a66
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 75 deletions.
3 changes: 1 addition & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,10 @@ PaperSpigot e t.c. This plugin doesn't have any non-switchable options. It's sim
## Comparison with ChatEx

| Feature | ChatEx | Chatty |
| ---------------------------------------- | ------ | ------ |
|------------------------------------------| ------ | ------ |
| Vault support | + | + |
| Advertisement protection | + | + |
| PlaceholderAPI support | + | + |
| Old versions support (1.5.2+) | - | + |
| BungeeCord support | - | + |
| Replacement of AutoMessage | - | + |
| Advancements and ActionBar notifications | - | + |
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
allprojects {
group = 'ru.mrbrikster'
version = '2.19.8-SNAPSHOT'
version = '2.19.8'
}

subprojects {
Expand Down
5 changes: 2 additions & 3 deletions spigot/src/main/java/ru/mrbrikster/chatty/bungee/BungeeCordListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import ru.mrbrikster.chatty.chat.Chat;
import ru.mrbrikster.chatty.chat.ChatManager;
import ru.mrbrikster.chatty.json.fanciful.FancyMessage;
import ru.mrbrikster.chatty.reflection.Reflection;

import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
Expand Down Expand Up @@ -75,15 +74,15 @@ public void onPluginMessageReceived(String channel, Player player, byte[] messag

if (json) {
FancyMessage fancyMessage = FancyMessage.deserialize(text);
fancyMessage.send(Reflection.getOnlinePlayers().stream().filter(recipient -> {
fancyMessage.send(Bukkit.getOnlinePlayers().stream().filter(recipient -> {
return !chat.isPermissionRequired()
|| recipient.hasPermission("chatty.chat." + chat.getName() + ".see")
|| recipient.hasPermission("chatty.chat." + chat.getName());
}).collect(Collectors.toList()), null);

fancyMessage.send(Bukkit.getConsoleSender(), null);
} else {
Reflection.getOnlinePlayers().stream().filter(recipient -> {
Bukkit.getOnlinePlayers().stream().filter(recipient -> {
return !chat.isPermissionRequired()
|| recipient.hasPermission("chatty.chat." + chat.getName() + ".see")
|| recipient.hasPermission("chatty.chat." + chat.getName());
Expand Down
3 changes: 1 addition & 2 deletions spigot/src/main/java/ru/mrbrikster/chatty/chat/Chat.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import ru.mrbrikster.baseplugin.commands.BukkitCommand;
import ru.mrbrikster.chatty.Chatty;
import ru.mrbrikster.chatty.json.FormattedMessage;
import ru.mrbrikster.chatty.reflection.Reflection;
import ru.mrbrikster.chatty.util.TextUtil;

import lombok.AllArgsConstructor;
Expand Down Expand Up @@ -86,7 +85,7 @@ public boolean isPermissionRequired() {
@Override
@NotNull
public Collection<? extends Player> getRecipients(@Nullable Player player) {
return filterRecipients(player, new ArrayList<>(Reflection.getOnlinePlayers()));
return filterRecipients(player, new ArrayList<>(Bukkit.getOnlinePlayers()));
}

@Override
Expand Down
5 changes: 2 additions & 3 deletions spigot/src/main/java/ru/mrbrikster/chatty/chat/ChatListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import ru.mrbrikster.chatty.json.JsonMessagePart;
import ru.mrbrikster.chatty.json.LegacyMessagePart;
import ru.mrbrikster.chatty.moderation.*;
import ru.mrbrikster.chatty.reflection.Reflection;
import ru.mrbrikster.chatty.util.Pair;
import ru.mrbrikster.chatty.util.Sound;
import ru.mrbrikster.chatty.util.TextUtil;
Expand Down Expand Up @@ -285,8 +284,8 @@ public void onSpyMessage(AsyncPlayerChatEvent event) {
event.getPlayer().getDisplayName(),
event.getMessage())));

Reflection.getOnlinePlayers().stream().
filter(spy ->
Bukkit.getOnlinePlayers().stream()
.filter(spy ->
(spy.hasPermission("chatty.spy." + pair.getA().getName()))
&& jsonStorage.getProperty(spy, "spy-mode").orElse(new JsonPrimitive(true)).getAsBoolean()
&& !pair.getB().contains(spy))
Expand Down
4 changes: 2 additions & 2 deletions spigot/src/main/java/ru/mrbrikster/chatty/commands/ClearChatCommand.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package ru.mrbrikster.chatty.commands;

import net.amoebaman.util.ArrayWrapper;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import ru.mrbrikster.baseplugin.commands.BukkitCommand;
import ru.mrbrikster.baseplugin.config.Configuration;
import ru.mrbrikster.chatty.Chatty;
import ru.mrbrikster.chatty.reflection.Reflection;

public class ClearChatCommand extends BukkitCommand {

Expand All @@ -32,7 +32,7 @@ public void handle(CommandSender sender, String label, String[] args) {
if (sender.hasPermission("chatty.command.clearchat.all")) {
String chatClearedMessage = Chatty.instance().messages().get("clearchat-command.clear-chat-for-all").replace("{player}", sender.getName());

Reflection.getOnlinePlayers().forEach(player -> {
Bukkit.getOnlinePlayers().forEach(player -> {
for (int i = 0; i < 100; i++) {
player.sendMessage(" ");
}
Expand Down
3 changes: 1 addition & 2 deletions spigot/src/main/java/ru/mrbrikster/chatty/commands/pm/PrivateMessageCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import ru.mrbrikster.chatty.moderation.AdvertisementModerationMethod;
import ru.mrbrikster.chatty.moderation.ModerationManager;
import ru.mrbrikster.chatty.moderation.SwearModerationMethod;
import ru.mrbrikster.chatty.reflection.Reflection;
import ru.mrbrikster.chatty.util.TextUtil;

public abstract class PrivateMessageCommand extends BukkitCommand {
Expand Down Expand Up @@ -142,7 +141,7 @@ protected void handlePrivateMessage(@NotNull CommandSender sender, @NotNull Comm
senderName, senderPrefix, senderSuffix)
.replace("{format}", senderFormat);

Reflection.getOnlinePlayers().stream()
Bukkit.getOnlinePlayers().stream()
.filter(spyPlayer -> !spyPlayer.equals(sender) && !spyPlayer.equals(recipient))
.filter(spyPlayer -> spyPlayer.hasPermission("chatty.spy") || spyPlayer.hasPermission("chatty.spy.pm"))
.filter(spyPlayer -> jsonStorage.getProperty(spyPlayer, "spy-mode").orElse(new JsonPrimitive(true)).getAsBoolean())
Expand Down
3 changes: 1 addition & 2 deletions spigot/src/main/java/ru/mrbrikster/chatty/dependencies/PlaceholderAPIHook.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import ru.mrbrikster.chatty.Chatty;
import ru.mrbrikster.chatty.chat.Chat;
import ru.mrbrikster.chatty.chat.ChatManager;
import ru.mrbrikster.chatty.reflection.Reflection;

import java.util.List;
import java.util.Locale;
Expand Down Expand Up @@ -106,7 +105,7 @@ public String onPlaceholderRequest(Player player, String params) {
}

int i = 0;
for (Player onlinePlayer : Reflection.getOnlinePlayers()) {
for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
if (chat.isWriteAllowed(onlinePlayer)) i++;
}

Expand Down
3 changes: 1 addition & 2 deletions spigot/src/main/java/ru/mrbrikster/chatty/notifications/ActionBarNotification.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import org.bukkit.scheduler.BukkitTask;
import ru.mrbrikster.chatty.Chatty;
import ru.mrbrikster.chatty.dependencies.DependencyManager;
import ru.mrbrikster.chatty.reflection.Reflection;
import ru.mrbrikster.chatty.util.Debugger;
import ru.mrbrikster.chatty.util.TextUtil;
import ru.mrbrikster.chatty.util.textapi.ActionBar;
Expand Down Expand Up @@ -59,7 +58,7 @@ public void run() {
String message = TextUtil.stylish(prefix + messages.get(currentMessage));

DependencyManager dependencyManager = Chatty.instance().getExact(DependencyManager.class);
Reflection.getOnlinePlayers().stream().filter(player -> !isPermission() || player.hasPermission(PERMISSION_NODE))
Bukkit.getOnlinePlayers().stream().filter(player -> !isPermission() || player.hasPermission(PERMISSION_NODE))
.forEach(player -> new ActionBar(dependencyManager.getPlaceholderApi() != null
? dependencyManager.getPlaceholderApi().setPlaceholders(player, message)
: message).send(player));
Expand Down
3 changes: 1 addition & 2 deletions spigot/src/main/java/ru/mrbrikster/chatty/notifications/AdvancementsNotification.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import org.bukkit.plugin.java.JavaPlugin;
import org.jetbrains.annotations.NotNull;
import ru.mrbrikster.chatty.Chatty;
import ru.mrbrikster.chatty.reflection.Reflection;
import ru.mrbrikster.chatty.util.Debugger;
import ru.mrbrikster.chatty.util.TextUtil;

Expand Down Expand Up @@ -43,7 +42,7 @@ public void run() {
Chatty.instance().getExact(Debugger.class).debug("Run \"%s\" AdvancementsNotification.", name);

AdvancementMessage advancementMessage = new AdvancementMessage((Map<String, String>) messages.get(nextMessage()));
Reflection.getOnlinePlayers().stream().filter(player -> !isPermission() || player.hasPermission(String.format(PERMISSION_NODE, name)))
Bukkit.getOnlinePlayers().stream().filter(player -> !isPermission() || player.hasPermission(String.format(PERMISSION_NODE, name)))
.forEach(advancementMessage::show);
}

Expand Down
4 changes: 2 additions & 2 deletions spigot/src/main/java/ru/mrbrikster/chatty/notifications/ChatNotification.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.JsonSyntaxException;
import org.bukkit.Bukkit;
import ru.mrbrikster.chatty.Chatty;
import ru.mrbrikster.chatty.dependencies.DependencyManager;
import ru.mrbrikster.chatty.reflection.Reflection;
import ru.mrbrikster.chatty.util.Debugger;
import ru.mrbrikster.chatty.util.Pair;
import ru.mrbrikster.chatty.util.TextUtil;
Expand Down Expand Up @@ -62,7 +62,7 @@ public void run() {
List<Pair<String, Boolean>> lines = messages.get(nextMessage());

DependencyManager dependencyManager = Chatty.instance().getExact(DependencyManager.class);
Reflection.getOnlinePlayers().stream().filter(player -> !isPermission() || player.hasPermission(String.format(PERMISSION_NODE, name)))
Bukkit.getOnlinePlayers().stream().filter(player -> !isPermission() || player.hasPermission(String.format(PERMISSION_NODE, name)))
.forEach(player -> lines.forEach(line -> {
String formattedLine = dependencyManager.getPlaceholderApi() != null
? dependencyManager.getPlaceholderApi().setPlaceholders(player, line.getA())
Expand Down
4 changes: 2 additions & 2 deletions spigot/src/main/java/ru/mrbrikster/chatty/notifications/TitleNotification.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package ru.mrbrikster.chatty.notifications;

import org.bukkit.Bukkit;
import ru.mrbrikster.chatty.Chatty;
import ru.mrbrikster.chatty.dependencies.DependencyManager;
import ru.mrbrikster.chatty.reflection.Reflection;
import ru.mrbrikster.chatty.util.Debugger;
import ru.mrbrikster.chatty.util.TextUtil;
import ru.mrbrikster.chatty.util.textapi.Title;
Expand Down Expand Up @@ -38,7 +38,7 @@ public void run() {

DependencyManager dependencyManager = Chatty.instance().getExact(DependencyManager.class);

Reflection.getOnlinePlayers()
Bukkit.getOnlinePlayers()
.stream()
.filter(player -> !isPermission() || player.hasPermission(String.format(PERMISSION_NODE, name)))
.forEach(onlinePlayer -> {
Expand Down
50 changes: 0 additions & 50 deletions spigot/src/main/java/ru/mrbrikster/chatty/reflection/Reflection.java
View file

This file was deleted.

0 comments on commit 7f42a66

Please sign in to comment.