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

Added /waitwhat, applied userdata changes, added format test, progressed with formatting #62

Merged
NorbiPeti merged 8 commits from dev into master 2017-04-15 11:58:13 +00:00
Conversation 0 Commits 8 Files changed 24 +24 -23
16 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a36c6b564b - Show all commits

2
src/main/java/buttondevteam/chat/ChatPlayer.java
View file

@ -6,8 +6,8 @@ import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import buttondevteam.lib.TBMCPlayer;
import buttondevteam.lib.chat.*;
import buttondevteam.lib.player.TBMCPlayer;
public class ChatPlayer extends TBMCPlayer {
public String getUserName() {

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

@ -22,9 +22,9 @@ import buttondevteam.chat.commands.UnlolCommand;
import buttondevteam.chat.commands.ucmds.admin.DebugCommand;
import buttondevteam.chat.formatting.*;
import buttondevteam.lib.TBMCCoreAPI;
import buttondevteam.lib.TBMCPlayer;
import buttondevteam.lib.chat.Channel;
import buttondevteam.lib.chat.TellrawSerializableEnum;
import buttondevteam.lib.player.TBMCPlayer;
import buttondevteam.chat.listener.PlayerListener;
import buttondevteam.lib.chat.*;

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

@ -17,8 +17,8 @@ import org.htmlcleaner.TagNode;
import buttondevteam.chat.commands.YeehawCommand;
import buttondevteam.chat.listener.PlayerListener;
import buttondevteam.lib.TBMCCoreAPI;
import buttondevteam.lib.TBMCPlayer;
import buttondevteam.lib.chat.TBMCChatAPI;
import buttondevteam.lib.player.TBMCPlayer;
import com.earth2me.essentials.Essentials;
import com.google.gson.JsonArray;
@ -57,7 +57,7 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15.
* This variable is used as a cache for flair state checking when reading the flair thread.
* </p>
* <p>
* It's used because normally it has to load all associated player files every time to read the filename
* It's used because normally it has to load all associated player files every time to read the flair state
* </p>
*/
private Set<String> PlayersWithFlairs = new HashSet<>();

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

@ -5,8 +5,8 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import buttondevteam.chat.ChatPlayer;
import buttondevteam.lib.TBMCPlayer;
import buttondevteam.lib.chat.TBMCCommandBase;
import buttondevteam.lib.player.TBMCPlayer;
public final class ChatonlyCommand extends TBMCCommandBase {

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

@ -4,8 +4,8 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import buttondevteam.chat.ChatPlayer;
import buttondevteam.lib.TBMCPlayer;
import buttondevteam.lib.chat.TBMCCommandBase;
import buttondevteam.lib.player.TBMCPlayer;
public final class OOCCommand extends TBMCCommandBase {

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

@ -7,10 +7,10 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import buttondevteam.chat.ChatPlayer;
import buttondevteam.lib.TBMCPlayer;
import buttondevteam.lib.chat.Channel;
import buttondevteam.lib.chat.TBMCChatAPI;
import buttondevteam.lib.chat.TBMCCommandBase;
import buttondevteam.lib.player.TBMCPlayer;
public class WaitWhatCommand extends TBMCCommandBase {
@Override

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

@ -4,8 +4,8 @@ import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import buttondevteam.lib.TBMCYEEHAWEvent;
import buttondevteam.lib.chat.TBMCCommandBase;
import buttondevteam.lib.player.TBMCYEEHAWEvent;
public class YeehawCommand extends TBMCCommandBase {

2
src/main/java/buttondevteam/chat/commands/appendtext/AppendTextCommandBase.java
View file

@ -5,10 +5,10 @@ import org.bukkit.entity.Player;
import buttondevteam.chat.ChatPlayer;
import buttondevteam.chat.listener.PlayerListener;
import buttondevteam.lib.TBMCPlayer;
import buttondevteam.lib.chat.Channel;
import buttondevteam.lib.chat.TBMCChatAPI;
import buttondevteam.lib.chat.TBMCCommandBase;
import buttondevteam.lib.player.TBMCPlayer;
public abstract class AppendTextCommandBase extends TBMCCommandBase {

2
src/main/java/buttondevteam/chat/commands/ucmds/AcceptCommand.java
View file

@ -10,7 +10,7 @@ import buttondevteam.chat.FlairStates;
import buttondevteam.chat.PlayerJoinTimerTask;
import buttondevteam.chat.PluginMain;
import buttondevteam.lib.TBMCCoreAPI;
import buttondevteam.lib.TBMCPlayer;
import buttondevteam.lib.player.TBMCPlayer;
public class AcceptCommand extends UCommandBase {

2
src/main/java/buttondevteam/chat/commands/ucmds/CCommand.java
View file

@ -5,8 +5,8 @@ import org.bukkit.entity.Player;
import buttondevteam.chat.ChatPlayer;
import buttondevteam.chat.PluginMain;
import buttondevteam.lib.TBMCPlayer;
import buttondevteam.lib.chat.*;
import buttondevteam.lib.player.TBMCPlayer;
public class CCommand extends UCommandBase {

2
src/main/java/buttondevteam/chat/commands/ucmds/IgnoreCommand.java
View file

@ -5,7 +5,7 @@ import org.bukkit.entity.Player;
import buttondevteam.chat.ChatPlayer;
import buttondevteam.chat.FlairStates;
import buttondevteam.lib.TBMCPlayer;
import buttondevteam.lib.player.TBMCPlayer;
public final class IgnoreCommand extends UCommandBase {

4
src/main/java/buttondevteam/chat/commands/ucmds/InfoCommand.java
View file

@ -2,8 +2,8 @@ package buttondevteam.chat.commands.ucmds;
import org.bukkit.command.CommandSender;
import buttondevteam.lib.TBMCPlayer;
import buttondevteam.lib.TBMCPlayer.InfoTarget;
import buttondevteam.lib.player.TBMCPlayer;
import buttondevteam.lib.player.TBMCPlayer.InfoTarget;
public class InfoCommand extends UCommandBase {

2
src/main/java/buttondevteam/chat/commands/ucmds/admin/PlayerInfoCommand.java
View file

@ -3,7 +3,7 @@ package buttondevteam.chat.commands.ucmds.admin;
import org.bukkit.command.CommandSender;
import buttondevteam.chat.ChatPlayer;
import buttondevteam.lib.TBMCPlayer;
import buttondevteam.lib.player.TBMCPlayer;
public class PlayerInfoCommand extends AdminCommandBase {

2
src/main/java/buttondevteam/chat/commands/ucmds/admin/SetFlairCommand.java
View file

@ -6,7 +6,7 @@ import org.bukkit.entity.Player;
import buttondevteam.chat.ChatPlayer;
import buttondevteam.chat.FlairStates;
import buttondevteam.lib.TBMCPlayer;
import buttondevteam.lib.player.TBMCPlayer;
public class SetFlairCommand extends AdminCommandBase {

8
src/main/java/buttondevteam/chat/listener/PlayerJoinLeaveListener.java
View file

@ -17,10 +17,10 @@ import buttondevteam.chat.ChatPlayer;
import buttondevteam.chat.FlairStates;
import buttondevteam.chat.PlayerJoinTimerTask;
import buttondevteam.chat.PluginMain;
import buttondevteam.lib.TBMCPlayerAddEvent;
import buttondevteam.lib.TBMCPlayerJoinEvent;
import buttondevteam.lib.TBMCPlayerLoadEvent;
import buttondevteam.lib.TBMCPlayerSaveEvent;
import buttondevteam.lib.player.TBMCPlayerAddEvent;
import buttondevteam.lib.player.TBMCPlayerJoinEvent;
import buttondevteam.lib.player.TBMCPlayerLoadEvent;
import buttondevteam.lib.player.TBMCPlayerSaveEvent;
public class PlayerJoinLeaveListener implements Listener {

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

@ -31,11 +31,12 @@ import buttondevteam.chat.ChatProcessing;
import buttondevteam.chat.PluginMain;
import buttondevteam.lib.TBMCChatEvent;
import buttondevteam.lib.TBMCCoreAPI;
import buttondevteam.lib.TBMCPlayer;
import buttondevteam.lib.TBMCPlayer.InfoTarget;
import buttondevteam.lib.chat.Channel;
import buttondevteam.lib.chat.TBMCChatAPI;
import buttondevteam.lib.TBMCPlayerGetInfoEvent;
import buttondevteam.lib.player.TBMCPlayer;
import buttondevteam.lib.player.TBMCPlayerGetInfoEvent;
import buttondevteam.lib.player.TBMCPlayer.InfoTarget;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import com.palmergames.bukkit.towny.exceptions.NotRegisteredException;