forked from Civcraft/CivChat2
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #18 from iykHvfIvfR/pr1
Clean up the code
- Loading branch information
Showing
25 changed files
with
838 additions
and
624 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,4 +25,3 @@ mysql: | |
port: 3306 | ||
username: '' | ||
password: '' | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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"; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.