Fix sub emote downloading being disabled by accident. Added new Sayo

emote to Bandori Module.

src/sig/FileManager.java

@@ -14,13 +14,13 @@ public class FileManager {
 	
 	public FileManager(String location) {
 		this.fileloc=location;
-		if (fileloc.contains(" ")) {
+		/*if (fileloc.contains(" ")) {
 			System.out.println("!!!!!!!!!!!!!!!!!!");
 			System.out.println("!!!!!WARNING!!!!!!");
 			System.out.println("There is a space in the global file location "+fileloc+". This is going to cause huge errors!");
 			System.out.println("!!!!!!!!!!!!!!!!!!");
 			DebugUtils.showStackTrace();
-		}
+		}*/
 		this.folder=false;
 	}
 	

src/sig/UpdateEvent.java

@@ -32,8 +32,9 @@ public class UpdateEvent implements ActionListener{
 	}
 
 	private void UpdateSubEmoticons() {
+		//System.out.println("Subchannels: "+sigIRC.subchannelCount+", "+sigIRC.subchannelIds.size());
 		if (!sigIRC.downloadedSubEmotes &&
-				sigIRC.disableChatMessages &&
+				!sigIRC.disableChatMessages &&
 				sigIRC.subchannelCount==sigIRC.subchannelIds.size()) {
 			Thread downloadThread = new Thread(){
 				public void run() {

src/sig/modules/BandoriModule.java

@@ -39,7 +39,7 @@ public class BandoriModule extends Module{
 		BandoriModule.bandori_module = this;
 		try {
 			stamp_collection1 = ImageIO.read(new File(sigIRC.BASEDIR+"sigIRC/stamps1.png"));
-			stamp_collection2 = ImageIO.read(new File(sigIRC.BASEDIR+"sigIRC/stamps2.png"));
+			stamp_collection2 = ImageIO.read(new File(sigIRC.BASEDIR+"sigIRC/stamps2_1.png"));
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
@@ -90,6 +90,7 @@ public class BandoriModule extends Module{
 		image_map.put("kokoro_letsmaketheworldsmile", new ImageScheme(stamp_collection2,21));
 		image_map.put("hina_nowwereboppin", new ImageScheme(stamp_collection2,22));
 		image_map.put("kokoro_what_a_great_idea", new ImageScheme(stamp_collection2,23));
+		image_map.put("sayo_im_sorry", new ImageScheme(stamp_collection2,24));
 		
 		stamp_map.put("kasumi_gogo",Arrays.asList("gogo"));
 		stamp_map.put("tae_letsplay",Arrays.asList("playtogether","wanttoplay","multilive","letsplay"));
@@ -114,7 +115,7 @@ public class BandoriModule extends Module{
 		stamp_map.put("yukina_notbad",Arrays.asList("notbad","veryclose"));
 		stamp_map.put("sayo_goodwork",Arrays.asList("goodwork","goodjob","nicejob","welldone","greatwork","greatjob"));
 		stamp_map.put("lisa_nextonelastone",Arrays.asList("lastone","mylast"));
-		stamp_map.put("ako_onemoretime",Arrays.asList("onemore","goagain","keepgoing","dontstop"));
+		stamp_map.put("ako_onemoretime",Arrays.asList("onemore","goagain","keepgoing","dontstop","runit"));
 		stamp_map.put("rinko_jam",Arrays.asList("lovethissong","jam"));
 		stamp_map.put("marina_yeahyeah",Arrays.asList("yeahyeah","letsgo"));
 		stamp_map.put("kokoro_moremore",Arrays.asList("moremore","iwantmore"));
@@ -138,6 +139,7 @@ public class BandoriModule extends Module{
 		stamp_map.put("kokoro_letsmaketheworldsmile",Arrays.asList("hhw","happyworld","hellohappy","worldsmile"));
 		stamp_map.put("hina_nowwereboppin",Arrays.asList("bop","nowwere","zap"));
 		stamp_map.put("kokoro_what_a_great_idea",Arrays.asList("greatidea","goodidea","greatthinking","goodthinking"));
+		stamp_map.put("sayo_im_sorry",Arrays.asList("sorry","gomen","apologize","somethingwrong","forgive"));
 		
 		/*for (String s : image_map.keySet()) {
 			ImageScheme scheme = image_map.get(s);

src/sig/sigIRC.java

@@ -339,7 +339,7 @@ public class sigIRC{
 		manager = new FileManager("backcolor.png"); manager.verifyAndFetchFileFromServer();
 		manager = new FileManager("drag_bar.png"); manager.verifyAndFetchFileFromServer();
 		manager = new FileManager("sigIRC/stamps1.png"); manager.verifyAndFetchFileFromServer();
-		manager = new FileManager("sigIRC/stamps2.png"); manager.verifyAndFetchFileFromServer();
+		manager = new FileManager("sigIRC/stamps2_1.png"); manager.verifyAndFetchFileFromServer();
 		manager = new FileManager("sigIRC/stamp_what_a_great_idea.png"); manager.verifyAndFetchFileFromServer();
 		DownloadProgramUpdate();
 		System.out.println("Downloaded Dependencies. ");
@@ -522,17 +522,17 @@ public class sigIRC{
 				emoticons.add(new Emoticon(name, new URL(TWITCHEMOTEURL+id+"/1.0")));
 				System.out.println("Emote "+id+" with name "+name);
 			}
-					//System.out.println("Subscriber object: "+subemotes);
+			//System.out.println("Subscriber object: "+subemotes);
-					String[] channel_names = FileUtils.readFromFile(sigIRC.BASEDIR+"sigIRC/subscribers.txt");
+			String[] channel_names = FileUtils.readFromFile(sigIRC.BASEDIR+"sigIRC/subscribers.txt");
-					subchannelCount = channel_names.length;
+			subchannelCount = channel_names.length;
-					//System.out.println("Expecting "+subchannelCount+" Channel IDs.");
+			//System.out.println("Expecting "+subchannelCount+" Channel IDs.");
-					for (String s : channel_names) {
+			for (String s : channel_names) {
-						if (s.length()>0) {
+				if (s.length()>0) {
-							s=s.trim();
+					s=s.trim();
-							//System.out.println("Got sub emote info for "+s);
+					//System.out.println("Got sub emote info for "+s);
-							getSubChannels(s);
+					getSubChannels(s);
-						}
+				}
-					}
+			}
 			/*JSONObject emotelist = twitchemotes.getJSONObject("emotes");
 			JSONObject templatelist = twitchemotes.getJSONObject("template");
 			String templateurl = templatelist.getString("small");