diff --git a/Controller$1AcksReceived.class b/Controller$1AcksReceived.class index 836a4049b4d79a563d58278c25364dd2c7f4e3fd..006d665a491cd54080fef1132fe21d339e435a9f 100644 Binary files a/Controller$1AcksReceived.class and b/Controller$1AcksReceived.class differ diff --git a/Controller$IndexEntry.class b/Controller$IndexEntry.class index edc1b21143e21f61a560c0a32373eb534e50f0ff..64003c3c96a02e9e921e9d6eb5a319357ddc74dc 100644 Binary files a/Controller$IndexEntry.class and b/Controller$IndexEntry.class differ diff --git a/Controller$RebalanceMessages.class b/Controller$RebalanceMessages.class index dcaf9491a4cf67058368055f88138704d02f5634..80d167489f739ee9eba94387b9449faf8167dd0c 100644 Binary files a/Controller$RebalanceMessages.class and b/Controller$RebalanceMessages.class differ diff --git a/Controller$RebalanceThread.class b/Controller$RebalanceThread.class index cd769f29c09ee36dad3ef7cc340f40e32a7bdaa4..33a49d5601312bef9a9513a5464c7a61da1c5024 100644 Binary files a/Controller$RebalanceThread.class and b/Controller$RebalanceThread.class differ diff --git a/Controller$Reloader.class b/Controller$Reloader.class index a9b24663eb7db7dccfd7a31569087679d73d4497..506b3988a3dbd4a35223a628cb012c5b5a9b92c7 100644 Binary files a/Controller$Reloader.class and b/Controller$Reloader.class differ diff --git a/Controller.class b/Controller.class index 471ff46290ce586309aad08742f08ea7d3223665..514327fe08525b5aa27de405c9c8ade4f55b05cd 100644 Binary files a/Controller.class and b/Controller.class differ diff --git a/Controller.java b/Controller.java index ec5677c67af77b3eda1a7889e23c179fc2fb1ba9..edcfa3892321be7d6b49d38e22f43e598e2e07b1 100644 --- a/Controller.java +++ b/Controller.java @@ -38,8 +38,12 @@ public class Controller { } public synchronized void addStoredBy(int dstore) { + addStoredBy(dstore, true); + } + + public synchronized void addStoredBy(int dstore, boolean notify) { storedBy.add(Integer.valueOf(dstore)); - if(storedBy.size() >= numberToStore) notifyAll(); + if(storedBy.size() >= numberToStore && notify) notifyAll(); } public synchronized void addStoredBy(List<Integer> dstores) { @@ -47,6 +51,11 @@ public class Controller { if(storedBy.size() >= numberToStore) notifyAll(); } + public synchronized void newAllocation(List<Integer> dstores) { + storedBy.clear(); + storedBy.addAll(dstores); + } + public synchronized void removeStoredBy(int dstore) { storedBy.remove(Integer.valueOf(dstore)); if(storedBy.isEmpty()) notifyAll(); @@ -302,11 +311,11 @@ public class Controller { catch(InterruptedException e) { e.printStackTrace(); } - } - - if(entry.getStoredBy().size() < rFactor) { - //Log error - System.out.println("Not all STORE_ACKs have been received"); + + if(entry.getStoredBy().size() < rFactor) { + //Log error + System.out.println("Not all STORE_ACKs have been received"); + } } //Update index to "store complete" @@ -470,8 +479,6 @@ public class Controller { try { //Send LIST message to each Dstore and receive their file list for(Integer dstore : dstores.keySet()) { - dstoreFiles.put(dstore, new ArrayList<String>()); - new Thread(() -> { try { String[] message = dstores.get(dstore).sendAndReceive("LIST").split(" "); @@ -588,6 +595,7 @@ public class Controller { //Log error System.out.println("Dstore " + thisStore + " should have sent REBALANCE_COMPLETE but Controller received " + returnMessage); } + synchronized(acksReceived) { acksReceived.incr(); if(acksReceived.getValue() == storeOrder.size()) { @@ -612,11 +620,29 @@ public class Controller { System.out.println("Not all REBALANCE_COMPLETEs received. Restarting rebalance operation..."); success = false; } + else if(acksReceived.getValue() > storeOrder.size()) { + System.out.println("Too many REBALANCE_COMPLETEs received"); + } } catch(InterruptedException e) { e.printStackTrace(); } } + + if(success) { + synchronized(index) { + Iterator<Integer> jt = requireIndex.keySet().iterator(); + while(jt.hasNext()) { + Integer dstore = jt.next(); + for(String file : requireIndex.get(dstore)) { + index.get(file).addStoredBy(Integer.valueOf(dstore), false); + } + for(String file : removeIndex.get(dstore)) { + index.get(file).removeStoredBy(Integer.valueOf(dstore)); + } + } + } + } } catch(Exception e) { e.printStackTrace(); diff --git a/DstoreConnection.class b/DstoreConnection.class index 42fb9143a47eaea3233715ce29a55e93398a6448..4cd5bbd5bd6e2a239616b6ab9228d2a0898566e7 100644 Binary files a/DstoreConnection.class and b/DstoreConnection.class differ diff --git a/DstoreConnection.java b/DstoreConnection.java index 9e85c7d57ee9046f41aec0db15183c32fa5c65dc..bdd3bc17f7293521ca347c0046075dc118554799 100644 --- a/DstoreConnection.java +++ b/DstoreConnection.java @@ -66,7 +66,7 @@ public class DstoreConnection { //Check the queue for the message before trying to receive any new messages (if no expected message is specified, return the head of the queue) for(int i=0; i<queue.size(); i++) { String message = queue.get(i); - if(expectedMessage == null || message.equals(expectedMessage)) { + if(expectedMessage == null || expectedMessage.equals(message.split(" ")[0])) { queue.remove(message); return message; } @@ -90,7 +90,7 @@ public class DstoreConnection { available = false; throw new NullPointerException(); } - if(expectedMessage != null && !returnMessage.equals(expectedMessage)) { + if(expectedMessage != null && !expectedMessage.equals(returnMessage.split(" ")[0])) { queue.add(returnMessage); if(queue.size() > MAX_QUEUE_SIZE) queue.remove(0); returnMessage = null; diff --git a/store1/AllStar.txt b/store1/AllStar.txt deleted file mode 100644 index 0cf2ab6ddb860e30164ffd18ddc32efdb9760851..0000000000000000000000000000000000000000 --- a/store1/AllStar.txt +++ /dev/null @@ -1,69 +0,0 @@ -Somebody once told me the world is gonna roll me -I ain't the sharpest tool in the shed -She was looking kind of dumb with her finger and her thumb -In the shape of an "L" on her forehead - -Well, the years start coming and they don't stop coming -Fed to the rules and I hit the ground running -Didn't make sense not to live for fun -Your brain gets smart but your head gets dumb - -So much to do, so much to see -So what's wrong with taking the back streets? -You'll never know if you don't go -You'll never shine if you don't glow - -Hey, now, you're an all-star, get your game on, go play -Hey, now, you're a rock star, get the show on, get paid -And all that glitters is gold -Only shooting stars break the mold - -It's a cool place and they say it gets colder -You're bundled up now wait 'til you get older -But the meteor men beg to differ -Judging by the hole in the satellite picture - -The ice we skate is getting pretty thin -The water's getting warm so you might as well swim -My world's on fire. How about yours? -That's the way I like it and I'll never get bored - -Hey, now, you're an all-star, get your game on, go play -Hey, now, you're a rock star, get the show on, get paid -And all that glitters is gold -Only shooting stars break the mold - -Go for the moon -Go for the moon -Go for the moon -Go for the moon - -Hey, now, you're an all-star, get your game on, go play -Hey, now, you're a rock star, get the show on, get paid -And all that glitters is gold -Only shooting stars - -Somebody once asked could I spare some change for gas -I need to get myself away from this place -I said yep, what a concept -I could use a little fuel myself -And we could all use a little change - -Well, the years start coming and they don't stop coming -Fed to the rules and I hit the ground running -Didn't make sense not to live for fun -Your brain gets smart but your head gets dumb - -So much to do, so much to see -So what's wrong with taking the back streets? -You'll never know if you don't go -You'll never shine if you don't glow - -Hey, now, you're an all star, get your game on, go play -Hey, now, you're a rock star, get the show on, get paid -And all that glitters is gold -Only shooting stars break the mold - -And all that glitters is gold -Only shooting stars break the mold -he mo \ No newline at end of file diff --git a/store1/Grandad.txt b/store1/Grandad.txt deleted file mode 100644 index 75e3e88c80ee07e973d90c6cad6ee987a06ab90c..0000000000000000000000000000000000000000 --- a/store1/Grandad.txt +++ /dev/null @@ -1,15 +0,0 @@ -(Yabba Dabba Doo!) - -Flintstones. Meet the Flintstones. -They're the modern stone age family. -From the town of Bedrock, -They're a page right out of history. - -Let's ride with the family down the street. -Through the courtesy of Fred's two feet. - -When you're with the Flintstones -Have a yabba dabba doo time. -A dabba doo time. -We'll have a gay old time. -d t \ No newline at end of file diff --git a/store1/PumpkinHill.txt b/store1/PumpkinHill.txt deleted file mode 100644 index 0489b4bfc071a8da30751cdf306b1171993e60c7..0000000000000000000000000000000000000000 --- a/store1/PumpkinHill.txt +++ /dev/null @@ -1,69 +0,0 @@ -You know me, the fighting freak Knuckles, -And we're at Pumpkin Hill, -You ready? - -I ain't gonna let it get to me, I'm just gonna creep, -Down in Pumpkin Hill I gots to find my lost piece. -I know that it's here, I can sense it in my feet, -The great Emerald's power allows me to feel. -I can't see a thing but it's around somewhere, -I'm gonna hold my head 'cause I have no fear. -This probably seems crazy, crazy, a graveyard theory, -A ghost tried to approach me and got leery. - -Asked him a question and he vanished in a second, -I'm walkin' through valleys cryin' pumpkin in the alley. -Didn't seem happy but they sure tried to get me, -Had to back 'em up with the fist, metal crack 'em. -I'm hearing someone sayin' "You a chicken, don't be scared!" -It had to be the wind, 'cause nobody wasn't there. -I searched and I searched as I climbed up the wall, -And then I started to fly, I went in deeper! - -Let it get to me? I'm just gonna creep, -Down in Pumpkin Hill I gots to find my lost piece. -I know that it's here, I sense it in my feet, -The great Emerald's power allows me to feel. -I can't see a thing but it's around somewhere, -I gotta hold my head, I have no fear. -It probably seems crazy, crazy, a graveyard theory, -A ghost tried to approach me, he got leery. - -(This is Knuckles, who fears none.) -(It's real deal when it comes to my name, kid!) - -I ain't gonna let it get to me, I'm just gonna creep, -Down in Pumpkin Hill I gots to find my lost piece. -I know that it's here, I can sense it in my feet, -The great Emerald's power allows me to feel. -I can't see a thing but it's around somewhere, -I'm gonna hold my head 'cause I have no fear. -This probably seems crazy, crazy, a graveyard theory, -A ghost tried to approach me and got leery. - -Asked him a question and he vanished in a second, -I'm walkin' through valleys cryin' pumpkin in the alley. -Didn't seem happy but they sure tried to get me, -Had to back 'em up with the fist, metal crack 'em. -I'm hearing someone sayin' "You a chicken, don't be scared!" -It had to be the wind, 'cause nobody wasn't there. -I searched and I searched as I climbed up the wall, -And then I started to fly, I went in deeper! - -Let it get to me? I'm just gonna creep, -Down in Pumpkin Hill I gots to find my lost piece. -I know that it's here, I sense it in my feet, -The great Emerald's power allows me to feel. -I can't see a thing but it's around somewhere, -I gotta hold my head, I have no fear. -It probably seems crazy, crazy, a graveyard theory, -A ghost tried to approach me, he got leery. - -(Spooky up in here, it's crazy in here,) -(We still gon' keep it goin', I'm Knuckles.) -(Nobody scares me,) -(Whoever want it, bring it!) -(I don't care, we 'ka do this.) -(Then come step up to the plate, and meet your match,) -(It ain't no thang.) -thang \ No newline at end of file diff --git a/store1/SnowHalation.txt b/store1/SnowHalation.txt deleted file mode 100644 index 5d7aafbb7ab2e7737b0279194b5a4db77d9712d3..0000000000000000000000000000000000000000 --- a/store1/SnowHalation.txt +++ /dev/null @@ -1,37 +0,0 @@ -Fushigi da ne ima no kimochi -Sora kara futte kita mitai -Tokubetsu na kisetsu no iro ga tokimeki o miseru yo - -Hajimete deatta toki kara -Yokan ni sawagu kokoro no Melody -Tomerarenai tomaranai na・ze - -Todokete -Setsunasa ni wa namae o tsukeyou ka "Snow halation" -Omoi ga kasanaru made matezu ni -Kuyashii kedo suki tte junjou -Binetsu no naka tameratte mo dame da ne -Tobikomu yuuki ni sansei mamonaku Start!! - -Oto mo naku kehai mo naku -Shizuka ni unmei wa kawaru -Korekara no mirai ni mune no kodou ga hayaku naru - -Tatoeba komatta toki ni wa -Sugu kaketsukete dakishimetakute -Doko ni ite mo dokodemo Fly high - -Isoide -Itsu no ma ni ka ookiku nari sugita "True emotion" -Yume dake miteru you ja tsurai yo -Koibito wa kimi tte iitai -Yasashii me ga tomadotteru iya da yo -Kono mama ikki ni aijou azukete Please!! - -Todokete -Setsunasa ni wa namae o tsukeyou ka "Snow halation" -Omoi ga kasanaru made matezu ni -Kuyashii kedo suki tte junjou -Binetsu no naka tameratte mo dame da ne -Tobikomu yuuki ni sansei mamonaku Start!! -ta \ No newline at end of file diff --git a/store1/Unknown.txt b/store1/Unknown.txt deleted file mode 100644 index 349b7a9f0370d0d0c2eb90303d8ed5622787bed0..0000000000000000000000000000000000000000 --- a/store1/Unknown.txt +++ /dev/null @@ -1,75 +0,0 @@ -Here I come, rougher than the rest of them -The best of them, tougher than leather -You can call me Knuckles, unlike Sonic I don't chuckle -I'd rather flex my muscles - -I'm hard as nails, it ain't hard to tell -I break 'em down whether they're solid or frail -Unlike the rest I'm independent since my first breath -First test, feel the right, than the worst's left - -Born on an island in the heavens -The blood of my ancestors flows inside me -My duty is to save the flower -From evil deterioration - -I will be the one to set your heart free, true -Cleanse yourself of them evil spirits that's in you - -Streaking lights, loud sounds, and instincts -Are the elements that keep me going -I am fighting my own mission -Nothing's gonna stand in my way - -I will be the one to set your heart free, true -Cleanse yourself of them evil spirits that's in you - -Won't be frightened, I'll stand up to all the pain and turmoil -Just believe in myself, won't rely on others -Get this power to wipe out the havoc and anarchy -This is my planet, gonna fight for my destiny - -Here I come, rougher than the rest of them -The best of them, tougher than leather -You can call me Knuckles, unlike Sonic I don't chuckle -I'd rather flex my muscles - -I'm hard as nails, it ain't hard to tell -I break 'em down whether they're solid or frail -Unlike the rest I'm independent since my first breath -First test, feel the right, than the worst's left - -I have no such things as weak spots -Don't approve of him but gotta trust him -This alliance has a purpose -This partnership is only temporary - -I will be the one to set your heart free, true -Cleanse yourself of evil spirits that got in you - -Won't be frightened, I'll stand up to all the pain and turmoil -Just believe in myself, won't rely on others -Freedom will be waiting when serenity is restored -This is my planet, I shall not surrender - -Won't be frightened, I'll stand up to all the pain and turmoil -Just believe in myself, won't rely on others -Get this power to wipe out the havoc and anarchy -This is my planet, gonna fight - -Won't be frightened, I'll stand up to all the pain and turmoil -Just believe in myself, won't rely on others -Freedom will be waiting when serenity is restored -This is my planet, I shall not surrender - -The new porcupine on the block with the buff chest -In the wilderness with the ruggedness -Knock, knock, it's Knuckles, the bloat thrower -Independent flower, Magical Emerald holder -I'll give you the coldest shoulder -My spikes go through boulders, that's why I stay a loner -I was born by myself, I don't need a posse -I get it on by myself, adversaries get shelved - -Right on! -ght on \ No newline at end of file diff --git a/store2/AllStar.txt b/store2/AllStar.txt deleted file mode 100644 index 0cf2ab6ddb860e30164ffd18ddc32efdb9760851..0000000000000000000000000000000000000000 --- a/store2/AllStar.txt +++ /dev/null @@ -1,69 +0,0 @@ -Somebody once told me the world is gonna roll me -I ain't the sharpest tool in the shed -She was looking kind of dumb with her finger and her thumb -In the shape of an "L" on her forehead - -Well, the years start coming and they don't stop coming -Fed to the rules and I hit the ground running -Didn't make sense not to live for fun -Your brain gets smart but your head gets dumb - -So much to do, so much to see -So what's wrong with taking the back streets? -You'll never know if you don't go -You'll never shine if you don't glow - -Hey, now, you're an all-star, get your game on, go play -Hey, now, you're a rock star, get the show on, get paid -And all that glitters is gold -Only shooting stars break the mold - -It's a cool place and they say it gets colder -You're bundled up now wait 'til you get older -But the meteor men beg to differ -Judging by the hole in the satellite picture - -The ice we skate is getting pretty thin -The water's getting warm so you might as well swim -My world's on fire. How about yours? -That's the way I like it and I'll never get bored - -Hey, now, you're an all-star, get your game on, go play -Hey, now, you're a rock star, get the show on, get paid -And all that glitters is gold -Only shooting stars break the mold - -Go for the moon -Go for the moon -Go for the moon -Go for the moon - -Hey, now, you're an all-star, get your game on, go play -Hey, now, you're a rock star, get the show on, get paid -And all that glitters is gold -Only shooting stars - -Somebody once asked could I spare some change for gas -I need to get myself away from this place -I said yep, what a concept -I could use a little fuel myself -And we could all use a little change - -Well, the years start coming and they don't stop coming -Fed to the rules and I hit the ground running -Didn't make sense not to live for fun -Your brain gets smart but your head gets dumb - -So much to do, so much to see -So what's wrong with taking the back streets? -You'll never know if you don't go -You'll never shine if you don't glow - -Hey, now, you're an all star, get your game on, go play -Hey, now, you're a rock star, get the show on, get paid -And all that glitters is gold -Only shooting stars break the mold - -And all that glitters is gold -Only shooting stars break the mold -he mo \ No newline at end of file diff --git a/store2/Grandad.txt b/store2/Grandad.txt deleted file mode 100644 index 75e3e88c80ee07e973d90c6cad6ee987a06ab90c..0000000000000000000000000000000000000000 --- a/store2/Grandad.txt +++ /dev/null @@ -1,15 +0,0 @@ -(Yabba Dabba Doo!) - -Flintstones. Meet the Flintstones. -They're the modern stone age family. -From the town of Bedrock, -They're a page right out of history. - -Let's ride with the family down the street. -Through the courtesy of Fred's two feet. - -When you're with the Flintstones -Have a yabba dabba doo time. -A dabba doo time. -We'll have a gay old time. -d t \ No newline at end of file diff --git a/store2/PumpkinHill.txt b/store2/PumpkinHill.txt deleted file mode 100644 index 0489b4bfc071a8da30751cdf306b1171993e60c7..0000000000000000000000000000000000000000 --- a/store2/PumpkinHill.txt +++ /dev/null @@ -1,69 +0,0 @@ -You know me, the fighting freak Knuckles, -And we're at Pumpkin Hill, -You ready? - -I ain't gonna let it get to me, I'm just gonna creep, -Down in Pumpkin Hill I gots to find my lost piece. -I know that it's here, I can sense it in my feet, -The great Emerald's power allows me to feel. -I can't see a thing but it's around somewhere, -I'm gonna hold my head 'cause I have no fear. -This probably seems crazy, crazy, a graveyard theory, -A ghost tried to approach me and got leery. - -Asked him a question and he vanished in a second, -I'm walkin' through valleys cryin' pumpkin in the alley. -Didn't seem happy but they sure tried to get me, -Had to back 'em up with the fist, metal crack 'em. -I'm hearing someone sayin' "You a chicken, don't be scared!" -It had to be the wind, 'cause nobody wasn't there. -I searched and I searched as I climbed up the wall, -And then I started to fly, I went in deeper! - -Let it get to me? I'm just gonna creep, -Down in Pumpkin Hill I gots to find my lost piece. -I know that it's here, I sense it in my feet, -The great Emerald's power allows me to feel. -I can't see a thing but it's around somewhere, -I gotta hold my head, I have no fear. -It probably seems crazy, crazy, a graveyard theory, -A ghost tried to approach me, he got leery. - -(This is Knuckles, who fears none.) -(It's real deal when it comes to my name, kid!) - -I ain't gonna let it get to me, I'm just gonna creep, -Down in Pumpkin Hill I gots to find my lost piece. -I know that it's here, I can sense it in my feet, -The great Emerald's power allows me to feel. -I can't see a thing but it's around somewhere, -I'm gonna hold my head 'cause I have no fear. -This probably seems crazy, crazy, a graveyard theory, -A ghost tried to approach me and got leery. - -Asked him a question and he vanished in a second, -I'm walkin' through valleys cryin' pumpkin in the alley. -Didn't seem happy but they sure tried to get me, -Had to back 'em up with the fist, metal crack 'em. -I'm hearing someone sayin' "You a chicken, don't be scared!" -It had to be the wind, 'cause nobody wasn't there. -I searched and I searched as I climbed up the wall, -And then I started to fly, I went in deeper! - -Let it get to me? I'm just gonna creep, -Down in Pumpkin Hill I gots to find my lost piece. -I know that it's here, I sense it in my feet, -The great Emerald's power allows me to feel. -I can't see a thing but it's around somewhere, -I gotta hold my head, I have no fear. -It probably seems crazy, crazy, a graveyard theory, -A ghost tried to approach me, he got leery. - -(Spooky up in here, it's crazy in here,) -(We still gon' keep it goin', I'm Knuckles.) -(Nobody scares me,) -(Whoever want it, bring it!) -(I don't care, we 'ka do this.) -(Then come step up to the plate, and meet your match,) -(It ain't no thang.) -thang \ No newline at end of file diff --git a/store2/SnowHalation.txt b/store2/SnowHalation.txt deleted file mode 100644 index 5d7aafbb7ab2e7737b0279194b5a4db77d9712d3..0000000000000000000000000000000000000000 --- a/store2/SnowHalation.txt +++ /dev/null @@ -1,37 +0,0 @@ -Fushigi da ne ima no kimochi -Sora kara futte kita mitai -Tokubetsu na kisetsu no iro ga tokimeki o miseru yo - -Hajimete deatta toki kara -Yokan ni sawagu kokoro no Melody -Tomerarenai tomaranai na・ze - -Todokete -Setsunasa ni wa namae o tsukeyou ka "Snow halation" -Omoi ga kasanaru made matezu ni -Kuyashii kedo suki tte junjou -Binetsu no naka tameratte mo dame da ne -Tobikomu yuuki ni sansei mamonaku Start!! - -Oto mo naku kehai mo naku -Shizuka ni unmei wa kawaru -Korekara no mirai ni mune no kodou ga hayaku naru - -Tatoeba komatta toki ni wa -Sugu kaketsukete dakishimetakute -Doko ni ite mo dokodemo Fly high - -Isoide -Itsu no ma ni ka ookiku nari sugita "True emotion" -Yume dake miteru you ja tsurai yo -Koibito wa kimi tte iitai -Yasashii me ga tomadotteru iya da yo -Kono mama ikki ni aijou azukete Please!! - -Todokete -Setsunasa ni wa namae o tsukeyou ka "Snow halation" -Omoi ga kasanaru made matezu ni -Kuyashii kedo suki tte junjou -Binetsu no naka tameratte mo dame da ne -Tobikomu yuuki ni sansei mamonaku Start!! -ta \ No newline at end of file diff --git a/store2/Unknown.txt b/store2/Unknown.txt deleted file mode 100644 index 349b7a9f0370d0d0c2eb90303d8ed5622787bed0..0000000000000000000000000000000000000000 --- a/store2/Unknown.txt +++ /dev/null @@ -1,75 +0,0 @@ -Here I come, rougher than the rest of them -The best of them, tougher than leather -You can call me Knuckles, unlike Sonic I don't chuckle -I'd rather flex my muscles - -I'm hard as nails, it ain't hard to tell -I break 'em down whether they're solid or frail -Unlike the rest I'm independent since my first breath -First test, feel the right, than the worst's left - -Born on an island in the heavens -The blood of my ancestors flows inside me -My duty is to save the flower -From evil deterioration - -I will be the one to set your heart free, true -Cleanse yourself of them evil spirits that's in you - -Streaking lights, loud sounds, and instincts -Are the elements that keep me going -I am fighting my own mission -Nothing's gonna stand in my way - -I will be the one to set your heart free, true -Cleanse yourself of them evil spirits that's in you - -Won't be frightened, I'll stand up to all the pain and turmoil -Just believe in myself, won't rely on others -Get this power to wipe out the havoc and anarchy -This is my planet, gonna fight for my destiny - -Here I come, rougher than the rest of them -The best of them, tougher than leather -You can call me Knuckles, unlike Sonic I don't chuckle -I'd rather flex my muscles - -I'm hard as nails, it ain't hard to tell -I break 'em down whether they're solid or frail -Unlike the rest I'm independent since my first breath -First test, feel the right, than the worst's left - -I have no such things as weak spots -Don't approve of him but gotta trust him -This alliance has a purpose -This partnership is only temporary - -I will be the one to set your heart free, true -Cleanse yourself of evil spirits that got in you - -Won't be frightened, I'll stand up to all the pain and turmoil -Just believe in myself, won't rely on others -Freedom will be waiting when serenity is restored -This is my planet, I shall not surrender - -Won't be frightened, I'll stand up to all the pain and turmoil -Just believe in myself, won't rely on others -Get this power to wipe out the havoc and anarchy -This is my planet, gonna fight - -Won't be frightened, I'll stand up to all the pain and turmoil -Just believe in myself, won't rely on others -Freedom will be waiting when serenity is restored -This is my planet, I shall not surrender - -The new porcupine on the block with the buff chest -In the wilderness with the ruggedness -Knock, knock, it's Knuckles, the bloat thrower -Independent flower, Magical Emerald holder -I'll give you the coldest shoulder -My spikes go through boulders, that's why I stay a loner -I was born by myself, I don't need a posse -I get it on by myself, adversaries get shelved - -Right on! -ght on \ No newline at end of file diff --git a/store3/AllStar.txt b/store3/AllStar.txt deleted file mode 100644 index 0cf2ab6ddb860e30164ffd18ddc32efdb9760851..0000000000000000000000000000000000000000 --- a/store3/AllStar.txt +++ /dev/null @@ -1,69 +0,0 @@ -Somebody once told me the world is gonna roll me -I ain't the sharpest tool in the shed -She was looking kind of dumb with her finger and her thumb -In the shape of an "L" on her forehead - -Well, the years start coming and they don't stop coming -Fed to the rules and I hit the ground running -Didn't make sense not to live for fun -Your brain gets smart but your head gets dumb - -So much to do, so much to see -So what's wrong with taking the back streets? -You'll never know if you don't go -You'll never shine if you don't glow - -Hey, now, you're an all-star, get your game on, go play -Hey, now, you're a rock star, get the show on, get paid -And all that glitters is gold -Only shooting stars break the mold - -It's a cool place and they say it gets colder -You're bundled up now wait 'til you get older -But the meteor men beg to differ -Judging by the hole in the satellite picture - -The ice we skate is getting pretty thin -The water's getting warm so you might as well swim -My world's on fire. How about yours? -That's the way I like it and I'll never get bored - -Hey, now, you're an all-star, get your game on, go play -Hey, now, you're a rock star, get the show on, get paid -And all that glitters is gold -Only shooting stars break the mold - -Go for the moon -Go for the moon -Go for the moon -Go for the moon - -Hey, now, you're an all-star, get your game on, go play -Hey, now, you're a rock star, get the show on, get paid -And all that glitters is gold -Only shooting stars - -Somebody once asked could I spare some change for gas -I need to get myself away from this place -I said yep, what a concept -I could use a little fuel myself -And we could all use a little change - -Well, the years start coming and they don't stop coming -Fed to the rules and I hit the ground running -Didn't make sense not to live for fun -Your brain gets smart but your head gets dumb - -So much to do, so much to see -So what's wrong with taking the back streets? -You'll never know if you don't go -You'll never shine if you don't glow - -Hey, now, you're an all star, get your game on, go play -Hey, now, you're a rock star, get the show on, get paid -And all that glitters is gold -Only shooting stars break the mold - -And all that glitters is gold -Only shooting stars break the mold -he mo \ No newline at end of file diff --git a/store3/Grandad.txt b/store3/Grandad.txt deleted file mode 100644 index 75e3e88c80ee07e973d90c6cad6ee987a06ab90c..0000000000000000000000000000000000000000 --- a/store3/Grandad.txt +++ /dev/null @@ -1,15 +0,0 @@ -(Yabba Dabba Doo!) - -Flintstones. Meet the Flintstones. -They're the modern stone age family. -From the town of Bedrock, -They're a page right out of history. - -Let's ride with the family down the street. -Through the courtesy of Fred's two feet. - -When you're with the Flintstones -Have a yabba dabba doo time. -A dabba doo time. -We'll have a gay old time. -d t \ No newline at end of file diff --git a/store3/PumpkinHill.txt b/store3/PumpkinHill.txt deleted file mode 100644 index 0489b4bfc071a8da30751cdf306b1171993e60c7..0000000000000000000000000000000000000000 --- a/store3/PumpkinHill.txt +++ /dev/null @@ -1,69 +0,0 @@ -You know me, the fighting freak Knuckles, -And we're at Pumpkin Hill, -You ready? - -I ain't gonna let it get to me, I'm just gonna creep, -Down in Pumpkin Hill I gots to find my lost piece. -I know that it's here, I can sense it in my feet, -The great Emerald's power allows me to feel. -I can't see a thing but it's around somewhere, -I'm gonna hold my head 'cause I have no fear. -This probably seems crazy, crazy, a graveyard theory, -A ghost tried to approach me and got leery. - -Asked him a question and he vanished in a second, -I'm walkin' through valleys cryin' pumpkin in the alley. -Didn't seem happy but they sure tried to get me, -Had to back 'em up with the fist, metal crack 'em. -I'm hearing someone sayin' "You a chicken, don't be scared!" -It had to be the wind, 'cause nobody wasn't there. -I searched and I searched as I climbed up the wall, -And then I started to fly, I went in deeper! - -Let it get to me? I'm just gonna creep, -Down in Pumpkin Hill I gots to find my lost piece. -I know that it's here, I sense it in my feet, -The great Emerald's power allows me to feel. -I can't see a thing but it's around somewhere, -I gotta hold my head, I have no fear. -It probably seems crazy, crazy, a graveyard theory, -A ghost tried to approach me, he got leery. - -(This is Knuckles, who fears none.) -(It's real deal when it comes to my name, kid!) - -I ain't gonna let it get to me, I'm just gonna creep, -Down in Pumpkin Hill I gots to find my lost piece. -I know that it's here, I can sense it in my feet, -The great Emerald's power allows me to feel. -I can't see a thing but it's around somewhere, -I'm gonna hold my head 'cause I have no fear. -This probably seems crazy, crazy, a graveyard theory, -A ghost tried to approach me and got leery. - -Asked him a question and he vanished in a second, -I'm walkin' through valleys cryin' pumpkin in the alley. -Didn't seem happy but they sure tried to get me, -Had to back 'em up with the fist, metal crack 'em. -I'm hearing someone sayin' "You a chicken, don't be scared!" -It had to be the wind, 'cause nobody wasn't there. -I searched and I searched as I climbed up the wall, -And then I started to fly, I went in deeper! - -Let it get to me? I'm just gonna creep, -Down in Pumpkin Hill I gots to find my lost piece. -I know that it's here, I sense it in my feet, -The great Emerald's power allows me to feel. -I can't see a thing but it's around somewhere, -I gotta hold my head, I have no fear. -It probably seems crazy, crazy, a graveyard theory, -A ghost tried to approach me, he got leery. - -(Spooky up in here, it's crazy in here,) -(We still gon' keep it goin', I'm Knuckles.) -(Nobody scares me,) -(Whoever want it, bring it!) -(I don't care, we 'ka do this.) -(Then come step up to the plate, and meet your match,) -(It ain't no thang.) -thang \ No newline at end of file diff --git a/store3/SnowHalation.txt b/store3/SnowHalation.txt deleted file mode 100644 index 5d7aafbb7ab2e7737b0279194b5a4db77d9712d3..0000000000000000000000000000000000000000 --- a/store3/SnowHalation.txt +++ /dev/null @@ -1,37 +0,0 @@ -Fushigi da ne ima no kimochi -Sora kara futte kita mitai -Tokubetsu na kisetsu no iro ga tokimeki o miseru yo - -Hajimete deatta toki kara -Yokan ni sawagu kokoro no Melody -Tomerarenai tomaranai na・ze - -Todokete -Setsunasa ni wa namae o tsukeyou ka "Snow halation" -Omoi ga kasanaru made matezu ni -Kuyashii kedo suki tte junjou -Binetsu no naka tameratte mo dame da ne -Tobikomu yuuki ni sansei mamonaku Start!! - -Oto mo naku kehai mo naku -Shizuka ni unmei wa kawaru -Korekara no mirai ni mune no kodou ga hayaku naru - -Tatoeba komatta toki ni wa -Sugu kaketsukete dakishimetakute -Doko ni ite mo dokodemo Fly high - -Isoide -Itsu no ma ni ka ookiku nari sugita "True emotion" -Yume dake miteru you ja tsurai yo -Koibito wa kimi tte iitai -Yasashii me ga tomadotteru iya da yo -Kono mama ikki ni aijou azukete Please!! - -Todokete -Setsunasa ni wa namae o tsukeyou ka "Snow halation" -Omoi ga kasanaru made matezu ni -Kuyashii kedo suki tte junjou -Binetsu no naka tameratte mo dame da ne -Tobikomu yuuki ni sansei mamonaku Start!! -ta \ No newline at end of file diff --git a/store3/Unknown.txt b/store3/Unknown.txt deleted file mode 100644 index 349b7a9f0370d0d0c2eb90303d8ed5622787bed0..0000000000000000000000000000000000000000 --- a/store3/Unknown.txt +++ /dev/null @@ -1,75 +0,0 @@ -Here I come, rougher than the rest of them -The best of them, tougher than leather -You can call me Knuckles, unlike Sonic I don't chuckle -I'd rather flex my muscles - -I'm hard as nails, it ain't hard to tell -I break 'em down whether they're solid or frail -Unlike the rest I'm independent since my first breath -First test, feel the right, than the worst's left - -Born on an island in the heavens -The blood of my ancestors flows inside me -My duty is to save the flower -From evil deterioration - -I will be the one to set your heart free, true -Cleanse yourself of them evil spirits that's in you - -Streaking lights, loud sounds, and instincts -Are the elements that keep me going -I am fighting my own mission -Nothing's gonna stand in my way - -I will be the one to set your heart free, true -Cleanse yourself of them evil spirits that's in you - -Won't be frightened, I'll stand up to all the pain and turmoil -Just believe in myself, won't rely on others -Get this power to wipe out the havoc and anarchy -This is my planet, gonna fight for my destiny - -Here I come, rougher than the rest of them -The best of them, tougher than leather -You can call me Knuckles, unlike Sonic I don't chuckle -I'd rather flex my muscles - -I'm hard as nails, it ain't hard to tell -I break 'em down whether they're solid or frail -Unlike the rest I'm independent since my first breath -First test, feel the right, than the worst's left - -I have no such things as weak spots -Don't approve of him but gotta trust him -This alliance has a purpose -This partnership is only temporary - -I will be the one to set your heart free, true -Cleanse yourself of evil spirits that got in you - -Won't be frightened, I'll stand up to all the pain and turmoil -Just believe in myself, won't rely on others -Freedom will be waiting when serenity is restored -This is my planet, I shall not surrender - -Won't be frightened, I'll stand up to all the pain and turmoil -Just believe in myself, won't rely on others -Get this power to wipe out the havoc and anarchy -This is my planet, gonna fight - -Won't be frightened, I'll stand up to all the pain and turmoil -Just believe in myself, won't rely on others -Freedom will be waiting when serenity is restored -This is my planet, I shall not surrender - -The new porcupine on the block with the buff chest -In the wilderness with the ruggedness -Knock, knock, it's Knuckles, the bloat thrower -Independent flower, Magical Emerald holder -I'll give you the coldest shoulder -My spikes go through boulders, that's why I stay a loner -I was born by myself, I don't need a posse -I get it on by myself, adversaries get shelved - -Right on! -ght on \ No newline at end of file diff --git a/store4/AllStar.txt b/store4/AllStar.txt deleted file mode 100644 index 0cf2ab6ddb860e30164ffd18ddc32efdb9760851..0000000000000000000000000000000000000000 --- a/store4/AllStar.txt +++ /dev/null @@ -1,69 +0,0 @@ -Somebody once told me the world is gonna roll me -I ain't the sharpest tool in the shed -She was looking kind of dumb with her finger and her thumb -In the shape of an "L" on her forehead - -Well, the years start coming and they don't stop coming -Fed to the rules and I hit the ground running -Didn't make sense not to live for fun -Your brain gets smart but your head gets dumb - -So much to do, so much to see -So what's wrong with taking the back streets? -You'll never know if you don't go -You'll never shine if you don't glow - -Hey, now, you're an all-star, get your game on, go play -Hey, now, you're a rock star, get the show on, get paid -And all that glitters is gold -Only shooting stars break the mold - -It's a cool place and they say it gets colder -You're bundled up now wait 'til you get older -But the meteor men beg to differ -Judging by the hole in the satellite picture - -The ice we skate is getting pretty thin -The water's getting warm so you might as well swim -My world's on fire. How about yours? -That's the way I like it and I'll never get bored - -Hey, now, you're an all-star, get your game on, go play -Hey, now, you're a rock star, get the show on, get paid -And all that glitters is gold -Only shooting stars break the mold - -Go for the moon -Go for the moon -Go for the moon -Go for the moon - -Hey, now, you're an all-star, get your game on, go play -Hey, now, you're a rock star, get the show on, get paid -And all that glitters is gold -Only shooting stars - -Somebody once asked could I spare some change for gas -I need to get myself away from this place -I said yep, what a concept -I could use a little fuel myself -And we could all use a little change - -Well, the years start coming and they don't stop coming -Fed to the rules and I hit the ground running -Didn't make sense not to live for fun -Your brain gets smart but your head gets dumb - -So much to do, so much to see -So what's wrong with taking the back streets? -You'll never know if you don't go -You'll never shine if you don't glow - -Hey, now, you're an all star, get your game on, go play -Hey, now, you're a rock star, get the show on, get paid -And all that glitters is gold -Only shooting stars break the mold - -And all that glitters is gold -Only shooting stars break the mold -he mo \ No newline at end of file diff --git a/store4/Grandad.txt b/store4/Grandad.txt deleted file mode 100644 index 75e3e88c80ee07e973d90c6cad6ee987a06ab90c..0000000000000000000000000000000000000000 --- a/store4/Grandad.txt +++ /dev/null @@ -1,15 +0,0 @@ -(Yabba Dabba Doo!) - -Flintstones. Meet the Flintstones. -They're the modern stone age family. -From the town of Bedrock, -They're a page right out of history. - -Let's ride with the family down the street. -Through the courtesy of Fred's two feet. - -When you're with the Flintstones -Have a yabba dabba doo time. -A dabba doo time. -We'll have a gay old time. -d t \ No newline at end of file diff --git a/store4/PumpkinHill.txt b/store4/PumpkinHill.txt deleted file mode 100644 index 0489b4bfc071a8da30751cdf306b1171993e60c7..0000000000000000000000000000000000000000 --- a/store4/PumpkinHill.txt +++ /dev/null @@ -1,69 +0,0 @@ -You know me, the fighting freak Knuckles, -And we're at Pumpkin Hill, -You ready? - -I ain't gonna let it get to me, I'm just gonna creep, -Down in Pumpkin Hill I gots to find my lost piece. -I know that it's here, I can sense it in my feet, -The great Emerald's power allows me to feel. -I can't see a thing but it's around somewhere, -I'm gonna hold my head 'cause I have no fear. -This probably seems crazy, crazy, a graveyard theory, -A ghost tried to approach me and got leery. - -Asked him a question and he vanished in a second, -I'm walkin' through valleys cryin' pumpkin in the alley. -Didn't seem happy but they sure tried to get me, -Had to back 'em up with the fist, metal crack 'em. -I'm hearing someone sayin' "You a chicken, don't be scared!" -It had to be the wind, 'cause nobody wasn't there. -I searched and I searched as I climbed up the wall, -And then I started to fly, I went in deeper! - -Let it get to me? I'm just gonna creep, -Down in Pumpkin Hill I gots to find my lost piece. -I know that it's here, I sense it in my feet, -The great Emerald's power allows me to feel. -I can't see a thing but it's around somewhere, -I gotta hold my head, I have no fear. -It probably seems crazy, crazy, a graveyard theory, -A ghost tried to approach me, he got leery. - -(This is Knuckles, who fears none.) -(It's real deal when it comes to my name, kid!) - -I ain't gonna let it get to me, I'm just gonna creep, -Down in Pumpkin Hill I gots to find my lost piece. -I know that it's here, I can sense it in my feet, -The great Emerald's power allows me to feel. -I can't see a thing but it's around somewhere, -I'm gonna hold my head 'cause I have no fear. -This probably seems crazy, crazy, a graveyard theory, -A ghost tried to approach me and got leery. - -Asked him a question and he vanished in a second, -I'm walkin' through valleys cryin' pumpkin in the alley. -Didn't seem happy but they sure tried to get me, -Had to back 'em up with the fist, metal crack 'em. -I'm hearing someone sayin' "You a chicken, don't be scared!" -It had to be the wind, 'cause nobody wasn't there. -I searched and I searched as I climbed up the wall, -And then I started to fly, I went in deeper! - -Let it get to me? I'm just gonna creep, -Down in Pumpkin Hill I gots to find my lost piece. -I know that it's here, I sense it in my feet, -The great Emerald's power allows me to feel. -I can't see a thing but it's around somewhere, -I gotta hold my head, I have no fear. -It probably seems crazy, crazy, a graveyard theory, -A ghost tried to approach me, he got leery. - -(Spooky up in here, it's crazy in here,) -(We still gon' keep it goin', I'm Knuckles.) -(Nobody scares me,) -(Whoever want it, bring it!) -(I don't care, we 'ka do this.) -(Then come step up to the plate, and meet your match,) -(It ain't no thang.) -thang \ No newline at end of file diff --git a/store4/SnowHalation.txt b/store4/SnowHalation.txt deleted file mode 100644 index 5d7aafbb7ab2e7737b0279194b5a4db77d9712d3..0000000000000000000000000000000000000000 --- a/store4/SnowHalation.txt +++ /dev/null @@ -1,37 +0,0 @@ -Fushigi da ne ima no kimochi -Sora kara futte kita mitai -Tokubetsu na kisetsu no iro ga tokimeki o miseru yo - -Hajimete deatta toki kara -Yokan ni sawagu kokoro no Melody -Tomerarenai tomaranai na・ze - -Todokete -Setsunasa ni wa namae o tsukeyou ka "Snow halation" -Omoi ga kasanaru made matezu ni -Kuyashii kedo suki tte junjou -Binetsu no naka tameratte mo dame da ne -Tobikomu yuuki ni sansei mamonaku Start!! - -Oto mo naku kehai mo naku -Shizuka ni unmei wa kawaru -Korekara no mirai ni mune no kodou ga hayaku naru - -Tatoeba komatta toki ni wa -Sugu kaketsukete dakishimetakute -Doko ni ite mo dokodemo Fly high - -Isoide -Itsu no ma ni ka ookiku nari sugita "True emotion" -Yume dake miteru you ja tsurai yo -Koibito wa kimi tte iitai -Yasashii me ga tomadotteru iya da yo -Kono mama ikki ni aijou azukete Please!! - -Todokete -Setsunasa ni wa namae o tsukeyou ka "Snow halation" -Omoi ga kasanaru made matezu ni -Kuyashii kedo suki tte junjou -Binetsu no naka tameratte mo dame da ne -Tobikomu yuuki ni sansei mamonaku Start!! -ta \ No newline at end of file diff --git a/store4/Unknown.txt b/store4/Unknown.txt deleted file mode 100644 index 349b7a9f0370d0d0c2eb90303d8ed5622787bed0..0000000000000000000000000000000000000000 --- a/store4/Unknown.txt +++ /dev/null @@ -1,75 +0,0 @@ -Here I come, rougher than the rest of them -The best of them, tougher than leather -You can call me Knuckles, unlike Sonic I don't chuckle -I'd rather flex my muscles - -I'm hard as nails, it ain't hard to tell -I break 'em down whether they're solid or frail -Unlike the rest I'm independent since my first breath -First test, feel the right, than the worst's left - -Born on an island in the heavens -The blood of my ancestors flows inside me -My duty is to save the flower -From evil deterioration - -I will be the one to set your heart free, true -Cleanse yourself of them evil spirits that's in you - -Streaking lights, loud sounds, and instincts -Are the elements that keep me going -I am fighting my own mission -Nothing's gonna stand in my way - -I will be the one to set your heart free, true -Cleanse yourself of them evil spirits that's in you - -Won't be frightened, I'll stand up to all the pain and turmoil -Just believe in myself, won't rely on others -Get this power to wipe out the havoc and anarchy -This is my planet, gonna fight for my destiny - -Here I come, rougher than the rest of them -The best of them, tougher than leather -You can call me Knuckles, unlike Sonic I don't chuckle -I'd rather flex my muscles - -I'm hard as nails, it ain't hard to tell -I break 'em down whether they're solid or frail -Unlike the rest I'm independent since my first breath -First test, feel the right, than the worst's left - -I have no such things as weak spots -Don't approve of him but gotta trust him -This alliance has a purpose -This partnership is only temporary - -I will be the one to set your heart free, true -Cleanse yourself of evil spirits that got in you - -Won't be frightened, I'll stand up to all the pain and turmoil -Just believe in myself, won't rely on others -Freedom will be waiting when serenity is restored -This is my planet, I shall not surrender - -Won't be frightened, I'll stand up to all the pain and turmoil -Just believe in myself, won't rely on others -Get this power to wipe out the havoc and anarchy -This is my planet, gonna fight - -Won't be frightened, I'll stand up to all the pain and turmoil -Just believe in myself, won't rely on others -Freedom will be waiting when serenity is restored -This is my planet, I shall not surrender - -The new porcupine on the block with the buff chest -In the wilderness with the ruggedness -Knock, knock, it's Knuckles, the bloat thrower -Independent flower, Magical Emerald holder -I'll give you the coldest shoulder -My spikes go through boulders, that's why I stay a loner -I was born by myself, I don't need a posse -I get it on by myself, adversaries get shelved - -Right on! -ght on \ No newline at end of file