Skip to content

Commit

Permalink
Merge pull request #18 from iykHvfIvfR/pr1
Browse files Browse the repository at this point in the history 
Clean up the code
  • Loading branch information
@ProgrammerDan
ProgrammerDan committed Jun 8, 2017
2 parents a240652 + 3307c1e commit 7bc322d
Show file tree
Hide file tree
Showing 25 changed files with 838 additions and 624 deletions.
1 change: 0 additions & 1 deletion config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ mysql:
port: 3306
username: ''
password: ''

100 changes: 73 additions & 27 deletions log4j2.xml
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,73 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="WARN" packages="com.mojang.util">
<Appenders>
<Console name="WINDOWS_COMPAT" target="SYSTEM_OUT"></Console>
<Queue name="TerminalConsole">
<PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg%n" />
</Queue>
<RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
<PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
<Policies>
<TimeBasedTriggeringPolicy />
<OnStartupTriggeringPolicy />
</Policies>
</RollingRandomAccessFile> <RollingRandomAccessFile name="ChatLogsFile" fileName="logs/ChatLogs/latest.log" filePattern="logs/ChatLogs/%d{yyyy-MM-dd}-%i.log.gz"> <PatternLayout pattern="[%d{HH:mm:ss}] [Chat]: %msg%n" /> <Policies> <TimeBasedTriggeringPolicy /> <OnStartupTriggeringPolicy /> </Policies> </RollingRandomAccessFile>
</Appenders>
<Loggers> <Logger name="ChatLogs" level="info" additivity="false"> <AppenderRef ref="ChatLogsFile"/> <AppenderRef ref="TerminalConsole" level="info"/> </Logger>
<Root level="info">
<filters>
<MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL" />
</filters>
<AppenderRef ref="WINDOWS_COMPAT" level="info"/>
<AppenderRef ref="File"/>
<AppenderRef ref="TerminalConsole" level="info"/>
</Root>
</Loggers>
</Configuration>
<?xml version="1.0" encoding="UTF-8"?>

<Configuration status="WARN" packages="com.mojang.util">

<Appenders>

<Console name="WINDOWS_COMPAT" target="SYSTEM_OUT"></Console>

<Queue name="TerminalConsole">

<PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg%n" />

</Queue>

<RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">

<PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />

<Policies>

<TimeBasedTriggeringPolicy />

<OnStartupTriggeringPolicy />

</Policies>

</RollingRandomAccessFile>

<RollingRandomAccessFile name="ChatLogsFile" fileName="logs/ChatLogs/latest.log" filePattern="logs/ChatLogs/%d{yyyy-MM-dd}-%i.log.gz">

<PatternLayout pattern="[%d{HH:mm:ss}] [Chat]: %msg%n" />

<Policies>

<TimeBasedTriggeringPolicy />

<OnStartupTriggeringPolicy />

</Policies>

</RollingRandomAccessFile>

</Appenders>

<Loggers>

<Logger name="ChatLogs" level="info" additivity="false">

<AppenderRef ref="ChatLogsFile"/>

<AppenderRef ref="TerminalConsole" level="info"/>

</Logger>

<Root level="info">

<filters>

<MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL" />

</filters>

<AppenderRef ref="WINDOWS_COMPAT" level="info"/>

<AppenderRef ref="File"/>

<AppenderRef ref="TerminalConsole" level="info"/>

</Root>

</Loggers>

</Configuration>
26 changes: 23 additions & 3 deletions src/vg/civcraft/mc/civchat2/ChatStrings.java
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,50 @@
package vg.civcraft.mc.civchat2;

public class ChatStrings {

public final static String chatPlayerIsOffline = "<i>That player is offline.";

public final static String chatNoOneToReplyTo = "<i>You have no one to reply to.";

public final static String chatCantMessageSelf = "<i>You can't message yourself.";

public final static String chatCantIgnoreSelf = "<i>You can't ignore yourself.";

public final static String chatNowChattingWith = "<g>You are now chatting with <c>%s.";

public final static String chatMovedToGlobal = "<i>You are now in global chat.";

public final static String chatGroupNotFound = "<b>There is no group with that name.";

public final static String chatGroupAlreadyChatting = "<i>You are already chatting in that group.";

public final static String chatGroupNowChattingIn = "<g>You are now chatting in group <c>%s.";

public final static String chatGroupNoPerms = "<b>You don't have permission to chat in this group.";

public final static String chatNeedToUnignore = "<i>You need to unignore <c>%s.";

public final static String chatPlayerNotFound = "<b>No player exists with that name.";

public final static String chatNowIgnoring = "<g>You are now ignoring <c>%s";

public final static String chatStoppedIgnoring = "<g>You stopped ignoring <c>%s.";

public final static String chatNotIgnoringAnyPlayers = "<a>You are not ignoring any players.";

public final static String chatNotIgnoringAnyGroups = "<a>You are not ignoring any groups.";

public final static String chatPlayerIgnoringYou = "<i>That player is ignoring you.";

public final static String chatRemovedFromChat = "<g>You left private chat.";

public final static String chatNotInPrivateChat = "<i>You aren't in private chat.";

public final static String chatAfk = "<blue>You are now AFK, type /afk to remove AFK status.";

public final static String chatNotAfk = "<blue>You are no longer AFK.";

public final static String chatPlayerAfk = "<aqua>That player is currently AFK.";

public final static String chatGroupMessage = "<gray>[%s] %s: <white>%s";

public final static String chatGroupMessage = "<gray>[%s] %s: <white>%s";
}
96 changes: 61 additions & 35 deletions src/vg/civcraft/mc/civchat2/CivChat2.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,33 @@
* @author jjj5311
*
*/
public class CivChat2 extends ACivMod{
public class CivChat2 extends ACivMod {

private static CivChat2 instance;

private static CivChat2Log log_;

private static boolean groupsEnabled;

private static CivChat2Config config_;

private static CivChat2Manager chatMan;

private CivChat2Listener chatListener;

private CivChat2FileLogger fileLog;

private DatabaseManager DBM;

public void onEnable(){
//onEnable stuff

public void onEnable() {

// onEnable stuff
StringBuilder sb = new StringBuilder();
instance = this;
config_ = new CivChat2Config();
config_.setConfigOptions(getConfig());
if(!new File(sb.append(this.getDataFolder()).append("config.yml").toString()).exists()){
//config.yml does not exist save the default
if (!new File(sb.append(this.getDataFolder()).append("config.yml").toString()).exists()) {
// config.yml does not exist, save the default
this.saveDefaultConfig();
}
sb.delete(0, sb.length());
Expand All @@ -53,96 +61,114 @@ public void onEnable(){
chatMan = new CivChat2Manager(instance);
groupsEnabled = config_.getGroupsEnabled();
log_.info(sb.append("groupsEnabled is set to: ")
.append(groupsEnabled)
.toString());
.append(groupsEnabled)
.toString());
sb.delete(0, sb.length());
log_.debug("Debug Enabled");
handle = new CivChat2CommandHandler();
handle.registerCommands();

chatListener = new CivChat2Listener(chatMan);
registerNameLayerPermissions();
registerEvents();
}

public void onDisable(){
//onDisable stuff

public void onDisable() {

// onDisable stuff
}

public CivChat2Manager getCivChat2Manager(){

public CivChat2Manager getCivChat2Manager() {

return CivChat2.chatMan;
}

public static boolean debugEnabled() {

return config_.getDebug();
}

public static void debugmessage(String msg){

public static void debugmessage(String msg) {

log_.debug(msg);
}

public static CivChat2Log getCivChat2Log() {

return log_;
}

public void registerEvents(){

public void registerEvents() {

getServer().getPluginManager().registerEvents(chatListener, instance);
}

@SuppressWarnings("unchecked")
public void registerNameLayerPermissions() {

LinkedList<PlayerType> memberAndAbove = new LinkedList<PlayerType>();
memberAndAbove.add(PlayerType.MEMBERS);
memberAndAbove.add(PlayerType.MODS);
memberAndAbove.add(PlayerType.ADMINS);
memberAndAbove.add(PlayerType.OWNER);
PermissionType.registerPermission("READ_CHAT", (LinkedList<PlayerType>)memberAndAbove.clone());
PermissionType.registerPermission("WRITE_CHAT", (LinkedList<PlayerType>)memberAndAbove.clone());
PermissionType.registerPermission("READ_CHAT", (LinkedList<PlayerType>) memberAndAbove.clone());
PermissionType.registerPermission("WRITE_CHAT", (LinkedList<PlayerType>) memberAndAbove.clone());
}

public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args){

public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {

return handle.execute(sender, cmd, args);
}

public CommandHandler getCivChat2CommandHandler() {

return handle;
}

public static void warningMessage(String errorMsg) {
log_.warning(errorMsg);

log_.warning(errorMsg);
}

public static void infoMessage(String infoMsg){

public static void infoMessage(String infoMsg) {

log_.info(infoMsg);
}

public static CivChat2 getInstance() {

return instance;
}

public static void severeMessage(String severeMsg) {

log_.severe(severeMsg);
}

public CivChat2Config getPluginConfig() {

return config_;
}

public CivChat2FileLogger getCivChat2FileLogger() {

return fileLog;
}

public DatabaseManager getDatabaseManager(){

public DatabaseManager getDatabaseManager() {

return this.DBM;
}

@Override
protected String getPluginName() {

return "CivChat2";
}

@Override
public List<String> onTabComplete(CommandSender sender, Command cmd, String alias, String[] args){
return handle == null ? null : handle.complete(sender, cmd, args);
}

@Override
public List<String> onTabComplete(CommandSender sender, Command cmd, String alias, String[] args) {

return handle == null ? null : handle.complete(sender, cmd, args);
}
}

0 comments on commit 7bc322d

Please sign in to comment.