X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fkaka%2Fcakelight%2Fmode%2FTwoColorNoiseMode.java;h=4046cbda17cb8b2770442e4d8ff97425aeeb4c80;hb=35990bbd6f1aacd5445aa2cb7dfd079d84b6c901;hp=7577f6648dc0132cf547bc5a2984ac05e062bfb5;hpb=fa013e4bfdfe17f97ddeab2596ae8daa03337e4a;p=kaka%2Fcakelight.git

diff --git a/src/kaka/cakelight/mode/TwoColorNoiseMode.java b/src/kaka/cakelight/mode/TwoColorNoiseMode.java
index 7577f66..4046cbd 100644
--- a/src/kaka/cakelight/mode/TwoColorNoiseMode.java
+++ b/src/kaka/cakelight/mode/TwoColorNoiseMode.java
@@ -11,41 +11,21 @@ public class TwoColorNoiseMode extends AmbientMode {
 
     public static Console.Command getCommand() {
         return new Console.Command() {
+            @Override
             public String[] getNames() {
                 return new String[] {"n", "noise"};
             }
 
+            @Override
             public void activate(Console console, String[] args) {
-                if (args.length == 3) { // cmd + col1 + col2
+                if (args.length == 2) { // col1 + col2
                     console.getCakelight().setMode(new TwoColorNoiseMode(
-                            parseColor(args[1]),
-                            parseColor(args[2])
+                            parseColor(args[0]),
+                            parseColor(args[1])
                     ));
+                    output("setting two-color noise mode");
                 }
             }
-
-            private Color parseColor(String s) {
-                switch (s.toLowerCase()) {
-                    case "r": return Color.rgb(255, 0, 0);
-                    case "g": return Color.rgb(0, 255, 0);
-                    case "b": return Color.rgb(0, 0, 255);
-                    default: // assume hexadecimal
-                        if (s.length() == 3) {
-                            return Color.rgb(
-                                    Integer.parseInt(s.substring(0, 1), 16) * 16 + Integer.parseInt(s.substring(0, 1), 16),
-                                    Integer.parseInt(s.substring(1, 2), 16) * 16 + Integer.parseInt(s.substring(1, 2), 16),
-                                    Integer.parseInt(s.substring(2, 3), 16) * 16 + Integer.parseInt(s.substring(2, 3), 16)
-                            );
-                        } else if (s.length() == 6) {
-                            return Color.rgb(
-                                    Integer.parseInt(s.substring(0, 2), 16),
-                                    Integer.parseInt(s.substring(2, 4), 16),
-                                    Integer.parseInt(s.substring(4, 6), 16)
-                            );
-                        }
-                }
-                return Color.BLACK;
-            }
         };
     }