Make queue IDs much nicer

yay for nice looking queue IDs
DenizenScript · Nov 4, 2014 · b1175e0 · b1175e0
1 parent 5aae1a7
commit b1175e0
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/queues/ScriptQueue.java b/src/main/java/net/aufdemrand/denizen/scripts/queues/ScriptQueue.java
@@ -13,6 +13,8 @@
 import net.aufdemrand.denizen.scripts.queues.core.TimedQueue;
 import net.aufdemrand.denizen.tags.Attribute;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
+import net.aufdemrand.denizencore.utilities.CoreUtilities;
+import net.aufdemrand.denizencore.utilities.QueueWordList;
 import net.aufdemrand.denizencore.utilities.debugging.Debuggable;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 
@@ -56,7 +58,7 @@ public static String _getStats() {
      */
     public static ScriptQueue _getExistingQueue(String id) {
         if (!_queueExists(id)) return null;
-        else return _queues.get(id.toUpperCase());
+        else return _queues.get(id);
     }
 
 
@@ -66,7 +68,11 @@ public static ScriptQueue _getExistingQueue(String id) {
      * @return String value of a random id
      */
     public static String _getNextId() {
-        String id = RandomStringUtils.random(10, "DENIZEN");
+        //String id = RandomStringUtils.random(10, "DENIZEN");
+        int size = QueueWordList.FinalWordList.size();
+        String id = QueueWordList.FinalWordList.get(CoreUtilities.getRandom().nextInt(size))
+                + QueueWordList.FinalWordList.get(CoreUtilities.getRandom().nextInt(size))
+                + QueueWordList.FinalWordList.get(CoreUtilities.getRandom().nextInt(size));
         return _queues.containsKey(id) ? _getNextId() : id;
     }
 
@@ -80,7 +86,7 @@ public static String _getNextId() {
      *               doesn't exist or does not match
      */
     public static boolean _matchesType(String queue, Class type) {
-        return (_queueExists(queue.toUpperCase())) && _queues.get(queue.toUpperCase()).getClass() == type;
+        return (_queueExists(queue)) && _queues.get(queue).getClass() == type;
     }
 
 
@@ -106,7 +112,7 @@ public static Collection<ScriptQueue> _getQueues() {
      * @return  true if it exists.
      */
     public static boolean _queueExists(String id) {
-        return _queues.containsKey(id.toUpperCase());
+        return _queues.containsKey(id);
     }
 
     /////////////////////
@@ -179,9 +185,9 @@ public static boolean _queueExists(String id) {
      */
     protected ScriptQueue(String id) {
         // Remember the 'id'
-        this.id = id.toUpperCase();
+        this.id = id;
         // Save the instance to the _queues static map
-        _queues.put(id.toUpperCase(), this);
+        _queues.put(id, this);
         // Increment the stats
         total_queues++;
     }