ChromaGaming/Chroma-Chat
1
0
Fork 0
Code Issues 15 Pull requests 1 Projects Releases 8 Packages Wiki Activity

Less error messages, channel and command changes applied #66

Merged
NorbiPeti merged 6 commits from dev into master 2017-05-15 00:38:33 +00:00
Conversation 0 Commits 6 Files changed 33 +46 -218
5 changed files with 46 additions and 218 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9e1bd49cd0 - Show all commits

129
src/main/java/buttondevteam/chat/ChatProcessing.java
View file

@ -23,6 +23,7 @@ import buttondevteam.chat.commands.ucmds.admin.DebugCommand;
import buttondevteam.chat.formatting.*; import buttondevteam.chat.formatting.*;
import buttondevteam.lib.TBMCCoreAPI; import buttondevteam.lib.TBMCCoreAPI;
import buttondevteam.lib.chat.Channel; import buttondevteam.lib.chat.Channel;
import buttondevteam.lib.chat.Channel.RecipientTestResult;
import buttondevteam.lib.chat.TellrawSerializableEnum; import buttondevteam.lib.chat.TellrawSerializableEnum;
import buttondevteam.lib.player.TBMCPlayer; import buttondevteam.lib.player.TBMCPlayer;
import buttondevteam.lib.player.TBMCPlayerBase; import buttondevteam.lib.player.TBMCPlayerBase;
@ -122,125 +123,31 @@ public class ChatProcessing {
return true; return true;
} }
DebugCommand.SendDebugMessage(jsonstr); DebugCommand.SendDebugMessage(jsonstr);
if (channel.equals(Channel.TownChat) || channel.equals(Channel.NationChat)) {
if (player == null) {
sender.sendMessage("§cYou are not a player!");
return true;
}
for (Player p : Bukkit.getOnlinePlayers()) {
try {
Resident resident = PluginMain.Instance.TU.getResidentMap().get(p.getName().toLowerCase());
if (resident != null && !resident.getName().equals(player.getName())
&& resident.getModes().contains("spy"))
Bukkit.getPlayer(resident.getName()).sendMessage(String.format("[SPY-%s] - %s: %s",
channel.DisplayName, player.getDisplayName(), message));
} catch (Exception e) {
}
}
}
try { try {
if (channel.equals(Channel.TownChat)) { if (channel.filteranderrormsg != null) {
Town town = null; Objective obj = PluginMain.SB.getObjective(channel.ID);
try { RecipientTestResult result = channel.filteranderrormsg.apply(player);
final Resident resident = PluginMain.Instance.TU.getResidentMap() if (result.errormessage != null)
.get(player.getName().toLowerCase()); player.sendMessage("§c" + result.errormessage);
if (resident != null && resident.hasTown()) else
town = resident.getTown(); for (Player p : Bukkit.getOnlinePlayers()) {
} catch (NotRegisteredException e) { if (p == player)
} continue;
if (town == null) { result = channel.filteranderrormsg.apply(p);
player.sendMessage("§cYou aren't in a town or an error occured."); if (result.errormessage == null)
return true; obj.getScore(p.getName()).setScore(result.score);
}
int index = PluginMain.Instance.Towns.indexOf(town);
if (index < 0) {
PluginMain.Instance.Towns.add(town);
index = PluginMain.Instance.Towns.size() - 1;
}
Objective obj = PluginMain.SB.getObjective("town");
for (Player p : Bukkit.getOnlinePlayers()) {
try {
if (town.getResidents().stream().anyMatch(r -> r.getName().equalsIgnoreCase(p.getName())))
obj.getScore(p.getName()).setScore(index);
else else
obj.getScore(p.getName()).setScore(-1); obj.getScore(p.getName()).setScore(-1);
} catch (Exception e) {
obj.getScore(p.getName()).setScore(-1);
} }
}
PluginMain.Instance.getServer().dispatchCommand(PluginMain.Console, PluginMain.Instance.getServer().dispatchCommand(PluginMain.Console,
String.format("tellraw @a[score_town=%d,score_town_min=%d] %s", index, index, jsonstr)); String.format("tellraw @a[score_%s=%d,score_%s_min=%d] %s", channel.ID, result.score, jsonstr));
} else if (channel.equals(Channel.NationChat)) {
Town town = null;
try {
final Resident resident = PluginMain.Instance.TU.getResidentMap()
.get(player.getName().toLowerCase());
if (resident != null && resident.hasTown())
town = resident.getTown();
} catch (NotRegisteredException e) {
}
if (town == null) {
player.sendMessage("§cYou aren't in a town or an error occured.");
return true;
}
Nation nation = null;
try {
nation = town.getNation();
} catch (NotRegisteredException e) {
}
if (nation == null) {
player.sendMessage("§cYour town isn't in a nation or an error occured.");
return true;
}
int index = PluginMain.Instance.Nations.indexOf(nation);
if (index < 0) {
PluginMain.Instance.Nations.add(nation);
index = PluginMain.Instance.Nations.size() - 1;
}
Objective obj = PluginMain.SB.getObjective("nation");
for (Player p : Bukkit.getOnlinePlayers()) {
try {
if (nation.getResidents().stream().anyMatch(r -> r.getName().equalsIgnoreCase(p.getName())))
obj.getScore(p.getName()).setScore(index);
else
obj.getScore(p.getName()).setScore(-1);
} catch (Exception e) {
}
}
PluginMain.Instance.getServer().dispatchCommand(PluginMain.Console,
String.format("tellraw @a[score_nation=%d,score_nation_min=%d] %s", index, index, jsonstr));
} else if (channel.equals(Channel.AdminChat)) {
if (player != null && !player.isOp()) {
player.sendMessage("§cYou need to be an OP to use this channel.");
return true;
}
Objective obj = PluginMain.SB.getObjective("admin");
for (Player p : Bukkit.getOnlinePlayers()) {
if (p.isOp())
obj.getScore(p.getName()).setScore(1);
else
obj.getScore(p.getName()).setScore(0);
}
PluginMain.Instance.getServer().dispatchCommand(PluginMain.Console,
String.format("tellraw @a[score_admin=%d,score_admin_min=%d] %s", 1, 1, jsonstr));
} else if (channel.equals(Channel.ModChat)) {
if (player != null && !PluginMain.permission.playerInGroup(player, "mod")) {
player.sendMessage("§cYou need to be a mod to use this channel.");
return true;
}
Objective obj = PluginMain.SB.getObjective("mod");
for (Player p : Bukkit.getOnlinePlayers()) {
if (PluginMain.permission.playerInGroup(p, "mod"))
obj.getScore(p.getName()).setScore(1);
else
obj.getScore(p.getName()).setScore(0);
}
PluginMain.Instance.getServer().dispatchCommand(PluginMain.Console,
String.format("tellraw @a[score_mod=%d,score_mod_min=%d] %s", 1, 1, jsonstr));
} else } else
PluginMain.Instance.getServer().dispatchCommand(PluginMain.Console, PluginMain.Instance.getServer().dispatchCommand(PluginMain.Console,
String.format("tellraw @a %s", jsonstr)); String.format("tellraw @a %s", jsonstr));
} catch (Exception e) { } catch (
Exception e) {
TBMCCoreAPI.SendException("An error occured while sending a chat message!", e); TBMCCoreAPI.SendException("An error occured while sending a chat message!", e);
player.sendMessage("§cAn error occured while sending the message."); player.sendMessage("§cAn error occured while sending the message.");
return true; return true;

40
src/main/java/buttondevteam/chat/PluginMain.java
View file

@ -47,11 +47,13 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15.
// https://www.reddit.com/r/thebutton/comments/31c32v/i_pressed_the_button_without_really_thinking/ // https://www.reddit.com/r/thebutton/comments/31c32v/i_pressed_the_button_without_really_thinking/
public static PluginMain Instance; public static PluginMain Instance;
public static ConsoleCommandSender Console; public static ConsoleCommandSender Console;
public static Scoreboard SB;
public final static String FlairThreadURL = "https://www.reddit.com/r/Chromagamers/comments/51ys94/flair_thread_for_the_mc_server/"; public final static String FlairThreadURL = "https://www.reddit.com/r/Chromagamers/comments/51ys94/flair_thread_for_the_mc_server/";
public TownyUniverse TU;
public ArrayList<Town> Towns; public static Scoreboard SB;
public ArrayList<Nation> Nations; public static TownyUniverse TU;
public static ArrayList<Town> Towns;
public static ArrayList<Nation> Nations;
/** /**
* <p> * <p>
* This variable is used as a cache for flair state checking when reading the flair thread. * This variable is used as a cache for flair state checking when reading the flair thread.
@ -72,37 +74,17 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15.
Console = this.getServer().getConsoleSender(); Console = this.getServer().getConsoleSender();
LoadFiles(); LoadFiles();
SB = PluginMain.Instance.getServer().getScoreboardManager().getMainScoreboard(); // Main can be detected with @a[score_...] SB = getServer().getScoreboardManager().getMainScoreboard(); // Main can be detected with @a[score_...]
if (SB.getObjective("town") == null)
SB.registerNewObjective("town", "dummy");
if (SB.getObjective("nation") == null)
SB.registerNewObjective("nation", "dummy");
if (SB.getObjective("admin") == null)
SB.registerNewObjective("admin", "dummy");
if (SB.getObjective("mod") == null)
SB.registerNewObjective("mod", "dummy");
TU = ((Towny) Bukkit.getPluginManager().getPlugin("Towny")).getTownyUniverse(); TU = ((Towny) Bukkit.getPluginManager().getPlugin("Towny")).getTownyUniverse();
Towns = new ArrayList<Town>(TU.getTownsMap().values()); Towns = new ArrayList<Town>(TU.getTownsMap().values()); // Creates a snapshot of towns, new towns will be added when needed
Nations = new ArrayList<Nation>(TU.getNationsMap().values()); Nations = new ArrayList<Nation>(TU.getNationsMap().values()); // Same here but with nations
setupChat(); setupChat();
setupEconomy(); setupEconomy();
setupPermissions(); setupPermissions();
Runnable r = new Runnable() { new Thread(() -> FlairGetterThreadMethod()).start();
public void run() { new Thread(() -> AnnouncerThread.Run()).start();
FlairGetterThreadMethod();
}
};
Thread t = new Thread(r);
t.start();
r = new Runnable() {
public void run() {
AnnouncerThread.Run();
}
};
t = new Thread(r);
t.start();
} }
public Boolean stop = false; public Boolean stop = false;

2
src/main/java/buttondevteam/chat/commands/OOCCommand.java
View file

@ -1,12 +1,10 @@
package buttondevteam.chat.commands; package buttondevteam.chat.commands;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import buttondevteam.chat.ChatPlayer; import buttondevteam.chat.ChatPlayer;
import buttondevteam.lib.chat.CommandClass; import buttondevteam.lib.chat.CommandClass;
import buttondevteam.lib.chat.PlayerCommandBase; import buttondevteam.lib.chat.PlayerCommandBase;
import buttondevteam.lib.chat.TBMCCommandBase;
import buttondevteam.lib.player.TBMCPlayer; import buttondevteam.lib.player.TBMCPlayer;
@CommandClass(modOnly = false) @CommandClass(modOnly = false)

2
src/main/java/buttondevteam/chat/commands/UnlolCommand.java
View file

@ -28,7 +28,7 @@ public final class UnlolCommand extends TBMCCommandBase {
if (Lastlol != null) { if (Lastlol != null) {
if (Lastlol instanceof Player) if (Lastlol instanceof Player)
((Player) Lastlol) ((Player) Lastlol)
.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, 10 * 20, 5, false, false)); .addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, 2 * 20, 5, false, false));
String msg = (sender instanceof Player ? ((Player) sender).getDisplayName() : sender.getName()) String msg = (sender instanceof Player ? ((Player) sender).getDisplayName() : sender.getName())
+ (Lastlolornot ? " unlolled " : " unlaughed ") + (Lastlolornot ? " unlolled " : " unlaughed ")
+ (Lastlol instanceof Player ? ((Player) Lastlol).getDisplayName() : Lastlol.getName()); + (Lastlol instanceof Player ? ((Player) Lastlol).getDisplayName() : Lastlol.getName());

91
src/main/java/buttondevteam/chat/listener/PlayerListener.java
View file

@ -1,37 +1,23 @@
package buttondevteam.chat.listener; package buttondevteam.chat.listener;
import java.util.ArrayList; import java.util.*;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Random;
import java.util.Timer;
import java.util.TimerTask;
import java.util.UUID;
import com.palmergames.bukkit.towny.Towny;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.*;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.player.AsyncPlayerChatEvent; import org.bukkit.event.player.*;
import org.bukkit.event.player.PlayerChatTabCompleteEvent;
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.event.player.PlayerTeleportEvent;
import org.bukkit.event.server.ServerCommandEvent; import org.bukkit.event.server.ServerCommandEvent;
import org.bukkit.help.HelpTopic; import org.bukkit.help.HelpTopic;
import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
import buttondevteam.chat.ChatPlayer; import buttondevteam.chat.*;
import buttondevteam.chat.ChatProcessing;
import buttondevteam.chat.PluginMain;
import buttondevteam.lib.TBMCChatEvent; import buttondevteam.lib.TBMCChatEvent;
import buttondevteam.lib.TBMCCoreAPI; import buttondevteam.lib.TBMCCoreAPI;
import buttondevteam.lib.chat.Channel; import buttondevteam.lib.chat.Channel;
import buttondevteam.lib.chat.ChatChannelRegisterEvent;
import buttondevteam.lib.chat.TBMCChatAPI; import buttondevteam.lib.chat.TBMCChatAPI;
import buttondevteam.lib.player.TBMCPlayer; import buttondevteam.lib.player.TBMCPlayer;
import buttondevteam.lib.player.TBMCPlayerGetInfoEvent; import buttondevteam.lib.player.TBMCPlayerGetInfoEvent;
@ -39,13 +25,6 @@ import buttondevteam.lib.player.ChromaGamerBase.InfoTarget;
import com.google.common.collect.BiMap; import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap; import com.google.common.collect.HashBiMap;
import com.palmergames.bukkit.towny.exceptions.NotRegisteredException;
import com.palmergames.bukkit.towny.object.Resident;
import com.palmergames.bukkit.towny.object.Town;
import com.palmergames.bukkit.towny.object.TownBlock;
import com.palmergames.bukkit.towny.object.TownyUniverse;
import com.palmergames.bukkit.towny.war.eventwar.War;
import com.palmergames.bukkit.towny.object.WorldCoord;
import com.vexsoftware.votifier.model.Vote; import com.vexsoftware.votifier.model.Vote;
import com.vexsoftware.votifier.model.VotifierEvent; import com.vexsoftware.votifier.model.VotifierEvent;
@ -86,7 +65,7 @@ public class PlayerListener implements Listener {
if (index == -1) { if (index == -1) {
cmd = event.getMessage().substring(1); cmd = event.getMessage().substring(1);
for (Channel channel : Channel.getChannels()) { for (Channel channel : Channel.getChannels()) {
if (cmd.equalsIgnoreCase(channel.Command)) { if (cmd.equalsIgnoreCase(channel.ID)) {
if (mp.CurrentChannel.equals(channel)) if (mp.CurrentChannel.equals(channel))
mp.CurrentChannel = Channel.GlobalChat; mp.CurrentChannel = Channel.GlobalChat;
else else
@ -99,7 +78,7 @@ public class PlayerListener implements Listener {
} else { } else {
cmd = event.getMessage().substring(1, index); cmd = event.getMessage().substring(1, index);
for (Channel channel : Channel.getChannels()) { for (Channel channel : Channel.getChannels()) {
if (cmd.equalsIgnoreCase(channel.Command)) { if (cmd.equalsIgnoreCase(channel.ID)) {
event.setCancelled(true); event.setCancelled(true);
Channel c = mp.CurrentChannel; Channel c = mp.CurrentChannel;
mp.CurrentChannel = channel; mp.CurrentChannel = channel;
@ -119,42 +98,7 @@ public class PlayerListener implements Listener {
} }
} }
} }
if (cmd.equalsIgnoreCase("sethome")) { // TODO: Move out? if (cmd.toLowerCase().startsWith("un")) {
TownyUniverse tu = PluginMain.Instance.TU;
try {
TownBlock tb = WorldCoord.parseWorldCoord(event.getPlayer()).getTownBlock();
if (tb.hasTown()) {
Town town = tb.getTown();
if (town.hasNation()) {
Resident res = tu.getResidentMap().get(event.getPlayer().getName());
if (res != null && res.hasTown()) {
Town town2 = res.getTown();
if (town2.hasNation()) {
if (town.getNation().getEnemies().contains(town2.getNation())) {
event.getPlayer().sendMessage("§cYou cannot set homes in enemy territory.");
event.setCancelled(true);
return;
}
}
}
}
}
} catch (NotRegisteredException e) {
return;
}
} else if (cmd.equalsIgnoreCase("home") || cmd.equalsIgnoreCase("tpa") || cmd.equalsIgnoreCase("tp")) {
String currentWorld = event.getPlayer().getLocation().getWorld().getName();
Location currentLocation = event.getPlayer().getLocation();
TownyUniverse universe = Towny.getPlugin(Towny.class).getTownyUniverse();
if (TownyUniverse.isWarTime()) {
War war = universe.getWarEvent();
if (war.isWarZone(
new WorldCoord(currentWorld, currentLocation.getBlockX(), currentLocation.getBlockZ()))) {
event.getPlayer().sendMessage("§cError: You can't teleport out of a war zone!");
event.setCancelled(true);
}
}
} else if (cmd.toLowerCase().startsWith("un")) {
for (HelpTopic ht : PluginMain.Instance.getServer().getHelpMap().getHelpTopics()) { for (HelpTopic ht : PluginMain.Instance.getServer().getHelpMap().getHelpTopics()) {
if (ht.getName().equalsIgnoreCase("/" + cmd)) if (ht.getName().equalsIgnoreCase("/" + cmd))
return; return;
@ -175,15 +119,6 @@ public class PlayerListener implements Listener {
} }
} }
} }
if (cmd.equalsIgnoreCase("f")) {
String[] args = event.getMessage().substring(index + 1).split(" ");
if (args.length > 1) {
if (args[0].toLowerCase().equals("enemy") && args[1].equalsIgnoreCase("newhaven")) {
event.setCancelled(true);
event.getPlayer().sendMessage("§cYou are not allowed to set New Haven as your enemy faction.");
}
}
}
} }
@EventHandler @EventHandler
@ -274,7 +209,7 @@ public class PlayerListener implements Listener {
if (index == -1) { if (index == -1) {
cmd = event.getCommand(); cmd = event.getCommand();
for (Channel channel : Channel.getChannels()) { for (Channel channel : Channel.getChannels()) {
if (cmd.equalsIgnoreCase(channel.Command)) { if (cmd.equalsIgnoreCase(channel.ID)) {
if (ConsoleChannel.equals(channel)) if (ConsoleChannel.equals(channel))
ConsoleChannel = Channel.GlobalChat; ConsoleChannel = Channel.GlobalChat;
else else
@ -287,7 +222,7 @@ public class PlayerListener implements Listener {
} else { } else {
cmd = event.getCommand().substring(0, index); cmd = event.getCommand().substring(0, index);
for (Channel channel : Channel.getChannels()) { for (Channel channel : Channel.getChannels()) {
if (cmd.equalsIgnoreCase(channel.Command)) { if (cmd.equalsIgnoreCase(channel.ID)) {
Channel c = ConsoleChannel; Channel c = ConsoleChannel;
ConsoleChannel = channel; ConsoleChannel = channel;
TBMCChatAPI.SendChatMessage(PlayerListener.ConsoleChannel, Bukkit.getConsoleSender(), TBMCChatAPI.SendChatMessage(PlayerListener.ConsoleChannel, Bukkit.getConsoleSender(),
@ -349,4 +284,10 @@ public class PlayerListener implements Listener {
TBMCCoreAPI.SendException("An error occured while processing a chat message!", ex); TBMCCoreAPI.SendException("An error occured while processing a chat message!", ex);
} }
} }
@EventHandler
public void onChannelRegistered(ChatChannelRegisterEvent e) {
if (e.getChannel().filteranderrormsg != null && PluginMain.SB.getObjective(e.getChannel().ID) == null) // Not global chat and doesn't exist yet
PluginMain.SB.registerNewObjective(e.getChannel().ID, "dummy");
}
} }