sigonasr2/sigIRCv2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source 
Conflicts:
	sigIRCv2.jar
This commit is contained in:
sigonasr2 2017-10-23 16:06:08 -05:00
commit 42ab9d857f
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
sigIRCv2.jar
View File

Binary file not shown.

2
src/sig/Module.java
View File

@ -149,7 +149,7 @@ public class Module {
} }
private Rectangle2D getDrawBounds() { private Rectangle2D getDrawBounds() {
Rectangle2D drawBounds = new Rectangle((int)position.getX(),(int)position.getY()-titleHeight+3,(int)position.getWidth(),(int)position.getHeight()+titleHeight); Rectangle2D drawBounds = new Rectangle((int)position.getX()-2,(int)position.getY()-titleHeight+3-1,(int)position.getWidth()+2,(int)position.getHeight()+titleHeight+1);
return drawBounds; return drawBounds;
} }

2
src/sig/ScrollingText.java
View File

@ -118,7 +118,7 @@ public class ScrollingText {
private void LogMessageToFile(String message) { private void LogMessageToFile(String message) {
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
FileUtils.logToFile(message, sigIRC.BASEDIR+"sigIRC/logs/log_"+(cal.get(Calendar.MONTH)+1)+"_"+cal.get(Calendar.DAY_OF_MONTH)+"_"+cal.get(Calendar.YEAR)+".txt"); FileUtils.logToFile(message, sigIRC.BASEDIR+"sigIRC/logs/log_"+(cal.get(Calendar.MONTH)+1)+"_"+cal.get(Calendar.DAY_OF_MONTH)+"_"+cal.get(Calendar.YEAR)+".txt",true);
} }
private Color GetUserNameColor(String username) { private Color GetUserNameColor(String username) {

2
src/sig/modules/TwitchModule.java
View File

@ -414,7 +414,7 @@ public class TwitchModule extends Module{
private void LogMessageToFile(String message) { private void LogMessageToFile(String message) {
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
FileUtils.logToFile(message, sigIRC.BASEDIR+"sigIRC/logs/log_"+(cal.get(Calendar.MONTH)+1)+"_"+cal.get(Calendar.DAY_OF_MONTH)+"_"+cal.get(Calendar.YEAR)+".txt"); FileUtils.logToFile(message, sigIRC.BASEDIR+"sigIRC/logs/log_"+(cal.get(Calendar.MONTH)+1)+"_"+cal.get(Calendar.DAY_OF_MONTH)+"_"+cal.get(Calendar.YEAR)+".txt",true);
} }
public void draw(Graphics g){ public void draw(Graphics g){

6
src/sig/utils/FileUtils.java
View File

@ -236,6 +236,10 @@ public class FileUtils {
} }
public static void logToFile(String message, String filename) { public static void logToFile(String message, String filename) {
logToFile(message,filename,false);
}
public static void logToFile(String message, String filename, boolean outputToChatLog) {
File file = new File(filename); File file = new File(filename);
try { try {
@ -252,8 +256,10 @@ public class FileUtils {
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
if (outputToChatLog) {
ChatLogMessage.importMessages(message); ChatLogMessage.importMessages(message);
} }
}
public static void writetoFile(String[] data, String filename) { public static void writetoFile(String[] data, String filename) {
File file = new File(filename); File file = new File(filename);