cerevisiae 14 years ago
parent
commit
d8de7af3cb
2 changed files with 9 additions and 8 deletions
  1. 8 7
      vMinecraftChat.java
  2. 1 1
      vMinecraftCommands.java

+ 8 - 7
vMinecraftChat.java

@@ -9,6 +9,7 @@ import java.util.logging.Logger;
 //=====================================================================
 //=====================================================================
 public class vMinecraftChat {
 public class vMinecraftChat {
     protected static final Logger log = Logger.getLogger("Minecraft");
     protected static final Logger log = Logger.getLogger("Minecraft");
+    protected static final int lineLength = 312;
 
 
 	//=====================================================================
 	//=====================================================================
 	//Function:	gmsg
 	//Function:	gmsg
@@ -60,12 +61,12 @@ public class vMinecraftChat {
 
 
     		//Loop through the words finding their length and increasing
     		//Loop through the words finding their length and increasing
     		//j, the end point for the sub string
     		//j, the end point for the sub string
-    		while(len <= 316 && !split.isEmpty())
+    		while(len <= lineLength && !split.isEmpty())
     		{
     		{
     			int wordLength = msgLength(split.get(0)) + 4;
     			int wordLength = msgLength(split.get(0)) + 4;
     			
     			
     			//If a word is too long for a line
     			//If a word is too long for a line
-    			if(wordLength > 316)
+    			if(wordLength > lineLength)
     			{
     			{
         			String[] tempArray = wordCut(len, split.remove(0));
         			String[] tempArray = wordCut(len, split.remove(0));
         			words.add(tempArray[0]);
         			words.add(tempArray[0]);
@@ -74,7 +75,7 @@ public class vMinecraftChat {
 
 
     			//If the word is not too long to fit
     			//If the word is not too long to fit
     			len += wordLength;
     			len += wordLength;
-    			if( len < 316)
+    			if( len < lineLength)
     				words.add(split.remove(0));
     				words.add(split.remove(0));
     		}
     		}
     		//Merge them and add them to the output array.
     		//Merge them and add them to the output array.
@@ -118,7 +119,7 @@ public class vMinecraftChat {
 		//and their following color codes
 		//and their following color codes
 		String[] output = new String[2];
 		String[] output = new String[2];
 		int x = 0;
 		int x = 0;
-		while(length < 316 && x < str.length())
+		while(length < lineLength && x < str.length())
 		{
 		{
 			int len = charLength(str.charAt(x));
 			int len = charLength(str.charAt(x));
 			if( len > 0)
 			if( len > 0)
@@ -140,15 +141,15 @@ public class vMinecraftChat {
 	//=====================================================================
 	//=====================================================================
     private static int charLength(char x)
     private static int charLength(char x)
     {
     {
-    	if("i;,.:|!".indexOf(x) != -1)
+    	if("i.:,;|!".indexOf(x) != -1)
 			return 2;
 			return 2;
 		else if("l'".indexOf(x) != -1)
 		else if("l'".indexOf(x) != -1)
 			return 3;
 			return 3;
 		else if("tI[]".indexOf(x) != -1)
 		else if("tI[]".indexOf(x) != -1)
 			return 4;
 			return 4;
-		else if("kf{}<>\"*()".indexOf(x) != -1)
+		else if("fk{}<>\"*()".indexOf(x) != -1)
 			return 5;
 			return 5;
-		else if("hequcbrownxjmpsvazydgTHEQUCKBROWNFXJMPSVLAZYDG1234567890#\\/?$%-=_+&".indexOf(x) != -1)
+		else if("abcdeghjmnopqrsuvwxyzABCDEFGHJKLMNOPQRSTUVWXYZ1234567890\\/#?$%-=_+&^".indexOf(x) != -1)
 			return 6;
 			return 6;
 		else if("@~".indexOf(x) != -1)
 		else if("@~".indexOf(x) != -1)
 			return 7;
 			return 7;

+ 1 - 1
vMinecraftCommands.java

@@ -48,7 +48,7 @@ public class vMinecraftCommands{
         cl.registerAlias("/wrists", "/suicide");
         cl.registerAlias("/wrists", "/suicide");
         cl.registerAlias("/ci", "/clearinventory");
         cl.registerAlias("/ci", "/clearinventory");
     }
     }
-    
+
     //=====================================================================
     //=====================================================================
 	//Function:	me (/me)
 	//Function:	me (/me)
 	//Input:	Player player: The player using the command
 	//Input:	Player player: The player using the command