Update V. 1.0

Author: IamPekka058

src/api/zerodeveloping/KeyGenerator.java

@@ -9,59 +9,44 @@ public void setPattern(KeyPattern pattern) {
         this.pattern = pattern;
     }
 
-    public void generate() {
+    public String generate() {
         String[] sections = pattern.getKey_pattern().split("-");
 
         int security_numbers = (int) (Math.ceil(sections.length / 2.0));
         int maxAscii = 0;
         int ascii_multiplier = 0;
+
         for (String section : sections) {
             maxAscii += section.length();
             for(int i = 0; i < section.length(); i++){
                 int ascii_char = (int) section.charAt(i);
-                if(ascii_char > ascii_multiplier){
-                    ascii_multiplier = ascii_char;
-                }
+                if(ascii_char > ascii_multiplier) ascii_multiplier = ascii_char;
             }
         }
         maxAscii *= ascii_multiplier;
-        try{
-            if(pattern.getAscii_count() > maxAscii) throw new AsciiException(maxAscii, pattern.getAscii_count());
-
-        }catch (AsciiException e){
-            e.printStackTrace();
-        }
+        try{if(pattern.getAscii_count() > maxAscii) throw new AsciiException(maxAscii, pattern.getAscii_count());}catch (AsciiException e){e.printStackTrace();}
 
         String key = "";
         while(true) {
             int char_counter = 0;
             int counter = 0;
             for (String section : sections) {
                 counter++;
-                for(int i = 0; i < section.length(); i++) {
-                    key += pattern.getAlphabet_pattern().charAt((int) Math.round(Math.random() * (pattern.getAlphabet_pattern().length() - 1)));
-                }
-                if(counter != sections.length)
-                    key += "-";
+                for(int i = 0; i < section.length(); i++) key += pattern.getAlphabet_pattern().charAt((int) Math.round(Math.random() * (pattern.getAlphabet_pattern().length() - 1)));
+
+                if(counter != sections.length) key += "-";
             }
             counter = 0;
 
-            for(int i = 0; i < key.length(); i++) {
-                if(key.charAt(i) == pattern.getControl_number()) {
-                    char_counter++;
-                }
-            }
+            for(int i = 0; i < key.length(); i++) if(key.charAt(i) == pattern.getControl_number()) char_counter++;
 
             if(security_numbers <= char_counter) {
                 int ascii_count = 0;
                 for(int i = 0; i < key.length(); i++) {
-                    if(key.charAt(i) != '-') {
-                        ascii_count += (int) key.charAt(i);
-                    }
+                    if(key.charAt(i) != '-') ascii_count += (int) key.charAt(i);
                 }
                 if(ascii_count == pattern.getAscii_count()) {
-                    System.out.println(key);
-                    break;
+                    return key;
                 }
             }
             key = "";

src/api/zerodeveloping/KeyPattern.java

@@ -18,7 +18,7 @@ public KeyPattern(String key_pattern, char control_number, int ascii_count, Stri
     }
 
     public static KeyPattern getDefault(){
-        return new KeyPattern("aaaa-aaaa-aaaa-aaaa-1111",'7', 50000, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYL0123456789");
+        return new KeyPattern("aaaa-aaaa-aaaa-aaaa-aaaa",'7', 1648, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYL0123456789");
     }
 
     public String getKey_pattern() {

src/examples/CreateKey.java

@@ -0,0 +1,18 @@
+package examples;
+
+import api.zerodeveloping.KeyGenerator;
+import api.zerodeveloping.KeyPattern;
+import api.zerodeveloping.KeyScanner;
+
+import java.util.Scanner;
+
+public class CreateKey {
+    //A simple test method to create a key
+    public static void main(String[] args) {
+        KeyGenerator keyGenerator = new KeyGenerator();
+        keyGenerator.setPattern(KeyPattern.getDefault());
+
+        String key = keyGenerator.generate();
+        System.out.println(key);
+    }
+}

src/api/zerodeveloping/main/Main.java src/examples/ScanKey.javasrc/api/zerodeveloping/main/Main.java renamed to src/examples/ScanKey.java

@@ -1,20 +1,17 @@
-package api.zerodeveloping.main;
+package examples;
 
-import api.zerodeveloping.KeyGenerator;
 import api.zerodeveloping.KeyPattern;
 import api.zerodeveloping.KeyScanner;
 
 import java.util.Scanner;
 
-public class Main {
+public class ScanKey {
+    //A simple test method to scan a key
     public static void main(String[] args) {
-        KeyGenerator keyGenerator = new KeyGenerator();
-        keyGenerator.setPattern(KeyPattern.getDefault());
-        keyGenerator.generate();
-
         KeyScanner keyScanner = new KeyScanner();
         keyScanner.setPattern(KeyPattern.getDefault());
         Scanner scanner = new Scanner(System.in);
+
         if(keyScanner.isValid(scanner.nextLine())){
             System.out.println("Key Valid");
         }else{