diff --git a/sigIRCv2.jar b/sigIRCv2.jar index 051783d..f9fc9aa 100644 Binary files a/sigIRCv2.jar and b/sigIRCv2.jar differ diff --git a/src/sig/BackgroundColorButton.java b/src/sig/BackgroundColorButton.java index 86cace3..d2c3849 100644 --- a/src/sig/BackgroundColorButton.java +++ b/src/sig/BackgroundColorButton.java @@ -35,7 +35,7 @@ public class BackgroundColorButton { public void draw(Graphics g) { if (buttonEnabled) { - g.drawImage(buttonimg, x, y, sigIRC.panel); + g.drawImage(buttonimg, x, y, null); } } diff --git a/src/sig/Module.java b/src/sig/Module.java index 83acaf7..d521fca 100644 --- a/src/sig/Module.java +++ b/src/sig/Module.java @@ -145,10 +145,6 @@ public class Module extends JFrame implements ComponentListener, WindowListener, updateFPSCounter(); } - public void ModuleDragEvent(int oldX, int oldY, int newX, int newY) { - - } - public void windowClosed(WindowEvent ev) { } diff --git a/src/sig/TwitchEmote.java b/src/sig/TwitchEmote.java index 6eaf49c..e1efa11 100644 --- a/src/sig/TwitchEmote.java +++ b/src/sig/TwitchEmote.java @@ -40,7 +40,7 @@ public class TwitchEmote { public void draw(Graphics g) { if (WithinBounds((int)(text.getX()+x), (int)(text.getY()+y), emote.getImage().getWidth(), emote.getImage().getHeight())) { - g.drawImage(emote.getImage(), (int)(text.getX()+x), (int)(text.getY()+y), ScrollingChatModule.module.panel); + g.drawImage(emote.getImage(), (int)(text.getX()+x), (int)(text.getY()+y), null); } } diff --git a/src/sig/modules/ChatLog/ChatLogMessage.java b/src/sig/modules/ChatLog/ChatLogMessage.java index 52e112d..8c00e6a 100644 --- a/src/sig/modules/ChatLog/ChatLogMessage.java +++ b/src/sig/modules/ChatLog/ChatLogMessage.java @@ -227,7 +227,7 @@ public class ChatLogMessage { DrawUtils.drawTextFont(g, sigIRC.userFont, position.getX(), position.getY()+(i*MESSAGE_SPACING)+32-Module.WINDOW_EXTRA_BORDER, Color.BLACK, displayMessage.get(i)); } } - g.drawImage(Module.MSG_SEPARATOR, (int)(position.getX()+8), (int)(position.getY()+messageDisplaySize.getY()+8-Module.WINDOW_EXTRA_BORDER), (int)(messageDisplaySize.getX()-8), 1, sigIRC.panel); + g.drawImage(Module.MSG_SEPARATOR, (int)(position.getX()+8), (int)(position.getY()+messageDisplaySize.getY()+8-Module.WINDOW_EXTRA_BORDER), (int)(messageDisplaySize.getX()-8), 1, null); //g.drawLine((int)(position.getX()+8), (int)(position.getY()+messageDisplaySize.getY()+32), (int)(position.getX()+messageDisplaySize.getX()-8), (int)(position.getY()+messageDisplaySize.getY()+32)); } for (int i=0;imessageHistoryCount) { logContents = Arrays.copyOfRange(logContents, logContents.length-messageHistoryCount-1, logContents.length); } + messageHistory.clear(); ChatLogMessage.importMessages(logContents); } } @@ -66,11 +67,6 @@ public class ChatLogModule extends Module{ } if (delay>0 && sigIRC.subEmotesCompleted) { delay--; - } else - if (!initialized) - { - Initialize(); - initialized=true; } for (int i=0; i0) { spacing = width/session.eggCount; rainbowEggLimit = session.eggCount; + //shiftyval+=RabiRaceModule.image_map.get("easter_egg.png").getHeight(parent.panel); } else { spacing = width/5; rainbowEggLimit = session.eggCount; } //Image img = RabiRaceModule.image_map.get("easter_egg.png"); - for (int i=0;ii)?RabiRaceModule.rainbowcycler.getCycleColor():new Color(0,0,0,192); //DrawUtils.drawImage(g2, img, (int)(border+i*spacing-img.getWidth(parent.panel)/4),(int)(36),col,parent.panel); Image img; @@ -591,7 +594,7 @@ public class Profile { img = Profile.darkRainbowEggImage; } g2.drawImage(img, (int)(border+i*spacing-img.getWidth(parent.panel)/4),(int)(36), parent.panel); - } + }*/ }break; case 1:{ //Item Hunt. spacing = width/session.itemHuntData.length; @@ -602,9 +605,9 @@ public class Profile { (badges.containsKey(item) && badges.get(item)>=1)) { //DrawUtils.drawImage(g2, item.getImage(), (int)(border+i*spacing-item.getImage().getWidth(sigIRC.panel)/4),(int)(36),col,sigIRC.panel); - g2.drawImage(item.getImage(), (int)(border+i*spacing),(int)(36+16), icon_size*2, icon_size*2, parent.panel); + g2.drawImage(item.getImage(), (int)(border+i*spacing),(int)(36+16), icon_size*2, icon_size*2, null); } else { - DrawUtils.drawImageScaled(g2, item.getImage(), (int)(border+i*spacing),(int)(36+16),icon_size*2, icon_size*2,new Color(0,0,0,192),parent.panel); + DrawUtils.drawImageScaled(g2, item.getImage(), (int)(border+i*spacing),(int)(36+16),icon_size*2, icon_size*2,new Color(0,0,0,192),null); } } spacing=width/5; @@ -629,15 +632,15 @@ public class Profile { if (key_items.get(data)<0) { Image img = data.getImage().getScaledInstance(icon_size, icon_size, Image.SCALE_DEFAULT); if (size*icon_size0) { lastValueChange--; - g.drawImage((upArrow)?TwitchModule.UPARROWIMAGE:TwitchModule.DOWNARROWIMAGE, x+xoffset, y+yoffset, sigIRC.panel); + g.drawImage((upArrow)?TwitchModule.UPARROWIMAGE:TwitchModule.DOWNARROWIMAGE, x+xoffset, y+yoffset, null); } xoffset+=((upArrow)?TwitchModule.UPARROWIMAGE.getWidth():TwitchModule.DOWNARROWIMAGE.getWidth())+4; return new Rectangle(x,y,xoffset,yoffset+16); diff --git a/src/sig/modules/TwitchModule.java b/src/sig/modules/TwitchModule.java index 4a96722..5f84df0 100644 --- a/src/sig/modules/TwitchModule.java +++ b/src/sig/modules/TwitchModule.java @@ -445,7 +445,8 @@ public class TwitchModule extends Module{ private Rectangle DrawUptime(Graphics g, int x, int y) { int xoffset = 0; int yoffset = 0; - g.drawImage(UPTIMEIMAGE, x+xoffset, y+yoffset-2, sigIRC.panel);xoffset+=UPTIMEIMAGE.getWidth()+4; + g.drawImage(UPTIMEIMAGE, x+xoffset, y+yoffset-2, null); + xoffset+=UPTIMEIMAGE.getWidth()+4; String timediff = TimeUtils.GetTimeDifferenceFromCurrentDate(uptime); if (timediff.length()>0) { DrawUtils.drawTextFont(g, sigIRC.userFont, x+xoffset, y+yoffset+TextUtils.calculateStringBoundsFont(timediff, sigIRC.userFont).getHeight()/2+3,new Color(184,181,192),timediff);xoffset+=TextUtils.calculateStringBoundsFont(timediff, sigIRC.userFont).getWidth()+12; @@ -477,7 +478,7 @@ public class TwitchModule extends Module{ //g.drawImage(follower_img, (int)bounds.getX()+xAlteration, (int)bounds.getY()+yAlteration, sigIRC.panel); //g.drawImage(follower_img, (int)bounds.getX(), (int)bounds.getY(), , , sigIRC.panel) g.drawImage(follower_img, (int)position.getX(), (int)position.getY()+canvasYOffset, (int)position.getX()+follower_img.getWidth()+canvasXOffset, (int)position.getY()+follower_img.getHeight(), - -xAlteration, 0, follower_img.getWidth(), follower_img.getHeight()-yAlteration, sigIRC.panel); + -xAlteration, 0, follower_img.getWidth(), follower_img.getHeight()-yAlteration, null); Rectangle2D usernameTextsize = TextUtils.calculateStringBoundsFont(announcedFollowerUser.getDisplayName(), sigIRC.programFont); int textY = (int)position.getY()+sigIRC.twitchmodule_followerText_Y+yAlteration; int textX = (int)position.getX()+sigIRC.twitchmodule_followerText_centerX+xAlteration; @@ -491,7 +492,7 @@ public class TwitchModule extends Module{ int img_starty = (int)(position.getY()+follower_img.getHeight()+2-image_size/2); //g.setColor(Color.BLACK); //g.drawRect(img_startx, img_starty, image_size, image_size); - g.drawImage(followerUserLogo, img_startx, img_starty, img_startx+image_size, img_starty+image_size, 0, 0, followerUserLogo.getWidth(), followerUserLogo.getHeight(), TextUtils.convertStringToColor(sigIRC.twitchmodule_newfollowerImgBackgroundColor), sigIRC.panel); + g.drawImage(followerUserLogo, img_startx, img_starty, img_startx+image_size, img_starty+image_size, 0, 0, followerUserLogo.getWidth(), followerUserLogo.getHeight(), TextUtils.convertStringToColor(sigIRC.twitchmodule_newfollowerImgBackgroundColor),null); } if (announcedFollowerUser.getBio()!=null && announcedFollowerUser.getBio().length()>0) { DrawUtils.drawOutlineText(g, sigIRC.userFont, position.getX()+position.getWidth()-ticksPassed*3, position.getY()+follower_img.getHeight()+2+8, 2, TextUtils.convertStringToColor(sigIRC.twitchmodule_newfollowerTextColor), TextUtils.convertStringToColor(sigIRC.twitchmodule_newfollowerShadowTextColor), announcedFollowerUser.getBio()); diff --git a/src/sig/utils/DrawUtils.java b/src/sig/utils/DrawUtils.java index cf151cc..f85af47 100644 --- a/src/sig/utils/DrawUtils.java +++ b/src/sig/utils/DrawUtils.java @@ -125,7 +125,7 @@ public class DrawUtils { g2.setColor(blend_col); g2.fillRect(0, 0, img.getWidth(source), img.getHeight(source)); g2.dispose(); - g.drawImage(tmp,(int)x,(int)y,source); + g.drawImage(tmp,(int)x,(int)y,null); } public static void drawImageScaled(Graphics g, Image img, double x, double y, double xsize, double ysize, Color blend_col, ImageObserver source) { @@ -136,7 +136,7 @@ public class DrawUtils { g2.setColor(blend_col); g2.fillRect(0, 0, img.getWidth(source), img.getHeight(source)); g2.dispose(); - g.drawImage(tmp,(int)x,(int)y,(int)xsize,(int)ysize,source); + g.drawImage(tmp,(int)x,(int)y,(int)xsize,(int)ysize,null); } public static Color invertColor(Color c) {