Switch to Maven file structure

src/main/java/tools/ArrayMap.java

@@ -0,0 +1,149 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+		       Matthias Butz <matze@odinms.de>
+		       Jan Christian Meyer <vimes@odinms.de>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package tools;
+
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+public class ArrayMap<K, V> extends AbstractMap<K, V> {
+
+    static class Entry<K, V> implements Map.Entry<K, V> {
+        protected K key;
+        protected V value;
+
+        public Entry(K key, V value) {
+            this.key = key;
+            this.value = value;
+        }
+
+        @Override
+        public K getKey() {
+            return key;
+        }
+
+        @Override
+        public V getValue() {
+            return value;
+        }
+
+        @Override
+        public V setValue(V newValue) {
+            V oldValue = value;
+            value = newValue;
+            return oldValue;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (!(o instanceof Map.Entry<?, ?>)) {
+                return false;
+            }
+            Map.Entry<?, ?> e = (Map.Entry<?, ?>) o;
+            return (key == null ? e.getKey() == null : key.equals(e.getKey())) && (value == null ? e.getValue() == null : value.equals(e.getValue()));
+        }
+
+        @Override
+        public int hashCode() {
+            int keyHash = (key == null ? 0 : key.hashCode());
+            int valueHash = (value == null ? 0 : value.hashCode());
+            return keyHash ^ valueHash;
+        }
+
+        @Override
+        public String toString() {
+            return key + "=" + value;
+        }
+    }
+    private Set<? extends java.util.Map.Entry<K, V>> entries = null;
+    private ArrayList<Entry<K, V>> list;
+
+    public ArrayMap() {
+        list = new ArrayList<>();
+    }
+
+    public ArrayMap(Map<K, V> map) {
+        list = new ArrayList<>();
+        putAll(map);
+    }
+
+    public ArrayMap(int initialCapacity) {
+        list = new ArrayList<>(initialCapacity);
+    }
+
+    @Override
+    @SuppressWarnings ("unchecked")
+    public Set<java.util.Map.Entry<K, V>> entrySet() {
+        if (entries == null) {
+            entries = new AbstractSet<Entry<K, V>>() {
+                @Override
+                public void clear() {
+                    throw new UnsupportedOperationException();
+                }
+
+                @Override
+                public Iterator<Entry<K, V>> iterator() {
+                    return list.iterator();
+                }
+
+                @Override
+                public int size() {
+                    return list.size();
+                }
+            };
+        }
+        return (Set<java.util.Map.Entry<K, V>>) entries;
+    }
+
+    @Override
+    public V put(K key, V value) {
+        int size = list.size();
+        Entry<K, V> entry = null;
+        int i;
+        if (key == null) {
+            for (i = 0; i < size; i++) {
+                entry = (list.get(i));
+                if (entry.getKey() == null) {
+                    break;
+                }
+            }
+        } else {
+            for (i = 0; i < size; i++) {
+                entry = (list.get(i));
+                if (key.equals(entry.getKey())) {
+                    break;
+                }
+            }
+        }
+        V oldValue = null;
+        if (i < size) {
+            oldValue = entry.getValue();
+            entry.setValue(value);
+        } else {
+            list.add(new Entry<>(key, value));
+        }
+        return oldValue;
+    }
+}

src/main/java/tools/AutoJCE.java

@@ -0,0 +1,61 @@
+package tools;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.security.Permission;
+import java.security.PermissionCollection;
+import java.util.Map;
+
+public class AutoJCE{   // AutoJCE into server source thanks to Acernis dev team
+
+	/**
+	 * Credits: ntoskrnl of StackOverflow
+	 * http://stackoverflow.com/questions/1179672/
+	 */
+	public static byte removeCryptographyRestrictions(){
+		if(!isRestrictedCryptography()){
+			//System.out.println("Cryptography restrictions removal not needed");
+			return 0;
+		}
+		try{
+			/*
+			 * Do the following, but with reflection to bypass access checks:
+			 *
+			 * JceSecurity.isRestricted = false;
+			 * JceSecurity.defaultPolicy.perms.clear();
+			 * JceSecurity.defaultPolicy.add(CryptoAllPermission.INSTANCE);
+			 */
+			final Class<?> jceSecurity = Class.forName("javax.crypto.JceSecurity");
+			final Class<?> cryptoPermissions = Class.forName("javax.crypto.CryptoPermissions");
+			final Class<?> cryptoAllPermission = Class.forName("javax.crypto.CryptoAllPermission");
+			final Field isRestrictedField = jceSecurity.getDeclaredField("isRestricted");// was set to final in Java 8 Update 112. Requires you to remove the final modifier.
+			Field modifiersField = Field.class.getDeclaredField("modifiers");
+			modifiersField.setAccessible(true);
+			modifiersField.setInt(isRestrictedField, isRestrictedField.getModifiers() & ~Modifier.FINAL);
+			isRestrictedField.setAccessible(true);
+			isRestrictedField.set(null, false);
+			final Field defaultPolicyField = jceSecurity.getDeclaredField("defaultPolicy");
+			defaultPolicyField.setAccessible(true);
+			final PermissionCollection defaultPolicy = (PermissionCollection) defaultPolicyField.get(null);
+			final Field perms = cryptoPermissions.getDeclaredField("perms");
+			perms.setAccessible(true);
+			((Map<?, ?>) perms.get(defaultPolicy)).clear();
+			final Field instance = cryptoAllPermission.getDeclaredField("INSTANCE");
+			instance.setAccessible(true);
+			defaultPolicy.add((Permission) instance.get(null));
+                        
+			//System.out.println("Successfully removed cryptography restrictions");
+                        return 1;
+		}catch(final Exception e){
+			e.printStackTrace();
+                        
+                        System.err.println("Failed to remove cryptography restrictions");
+                        return -1;
+		}
+	}
+
+	private static boolean isRestrictedCryptography(){
+		// This simply matches the Oracle JRE, but not OpenJDK.
+		return "Java(TM) SE Runtime Environment".equals(System.getProperty("java.runtime.name"));
+	}
+}

src/main/java/tools/BCrypt.java

@@ -0,0 +1,955 @@
+// Copyright (c) 2006 Damien Miller <djm@mindrot.org>
+//
+// Permission to use, copy, modify, and distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+package tools;
+
+import java.io.UnsupportedEncodingException;
+
+import java.security.SecureRandom;
+
+import java.util.Arrays;
+
+/**
+ * BCrypt implements OpenBSD-style Blowfish password hashing using
+ * the scheme described in "A Future-Adaptable Password Scheme" by
+ * Niels Provos and David Mazieres.
+ * <p>
+ * This password hashing system tries to thwart off-line password
+ * cracking using a computationally-intensive hashing algorithm,
+ * based on Bruce Schneier's Blowfish cipher. The work factor of
+ * the algorithm is parameterised, so it can be increased as
+ * computers get faster.
+ * <p>
+ * Usage is really simple. To hash a password for the first time,
+ * call the hashpw method with a random salt, like this:
+ * <p>
+ * <code>
+ * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt()); <br />
+ * </code>
+ * <p>
+ * To check whether a plaintext password matches one that has been
+ * hashed previously, use the checkpw method:
+ * <p>
+ * <code>
+ * if (BCrypt.checkpw(candidate_password, stored_hash))<br />
+ * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It matches");<br />
+ * else<br />
+ * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It does not match");<br />
+ * </code>
+ * <p>
+ * The gensalt() method takes an optional parameter (log_rounds)
+ * that determines the computational complexity of the hashing:
+ * <p>
+ * <code>
+ * String strong_salt = BCrypt.gensalt(10)<br />
+ * String stronger_salt = BCrypt.gensalt(12)<br />
+ * </code>
+ * <p>
+ * The amount of work increases exponentially (2**log_rounds), so
+ * each increment is twice as much work. The default log_rounds is
+ * 10, and the valid range is 4 to 30.
+ *
+ * @author Damien Miller
+ * @version 0.4
+ */
+public class BCrypt {
+    // BCrypt parameters
+
+    private static final int GENSALT_DEFAULT_LOG2_ROUNDS = 10;
+    private static final int BCRYPT_SALT_LEN = 16;
+    // Blowfish parameters
+    private static final int BLOWFISH_NUM_ROUNDS = 16;
+    // Initial contents of key schedule
+    private static final int P_orig[] = {
+        0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
+        0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
+        0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
+        0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
+        0x9216d5d9, 0x8979fb1b
+    };
+    private static final int S_orig[] = {
+        0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
+        0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
+        0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
+        0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
+        0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
+        0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
+        0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
+        0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
+        0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
+        0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
+        0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
+        0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
+        0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
+        0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
+        0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
+        0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
+        0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
+        0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
+        0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
+        0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
+        0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
+        0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
+        0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
+        0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
+        0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
+        0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
+        0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
+        0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
+        0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
+        0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
+        0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
+        0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
+        0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
+        0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
+        0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
+        0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
+        0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
+        0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
+        0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
+        0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
+        0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
+        0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
+        0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
+        0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
+        0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
+        0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
+        0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
+        0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
+        0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
+        0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
+        0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
+        0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
+        0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
+        0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
+        0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
+        0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
+        0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
+        0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
+        0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
+        0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
+        0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
+        0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
+        0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
+        0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a,
+        0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
+        0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
+        0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
+        0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
+        0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
+        0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
+        0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
+        0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
+        0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
+        0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
+        0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
+        0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
+        0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
+        0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
+        0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
+        0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
+        0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
+        0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
+        0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
+        0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
+        0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
+        0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
+        0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
+        0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
+        0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
+        0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
+        0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
+        0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
+        0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
+        0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
+        0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
+        0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
+        0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
+        0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
+        0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
+        0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
+        0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
+        0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
+        0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
+        0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
+        0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
+        0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
+        0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
+        0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
+        0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
+        0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
+        0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
+        0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
+        0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
+        0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
+        0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
+        0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
+        0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
+        0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
+        0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
+        0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
+        0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
+        0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
+        0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
+        0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
+        0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
+        0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
+        0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
+        0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7,
+        0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
+        0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
+        0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
+        0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
+        0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
+        0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
+        0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
+        0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
+        0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
+        0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
+        0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
+        0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
+        0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
+        0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
+        0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
+        0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
+        0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
+        0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
+        0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
+        0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
+        0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
+        0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
+        0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
+        0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
+        0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
+        0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
+        0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
+        0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
+        0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
+        0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
+        0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
+        0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
+        0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
+        0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
+        0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
+        0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
+        0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
+        0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
+        0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
+        0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
+        0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
+        0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
+        0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
+        0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
+        0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
+        0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
+        0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
+        0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
+        0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
+        0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
+        0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
+        0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
+        0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
+        0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
+        0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
+        0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
+        0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
+        0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
+        0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
+        0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
+        0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
+        0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
+        0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
+        0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0,
+        0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
+        0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
+        0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
+        0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
+        0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
+        0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
+        0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
+        0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
+        0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
+        0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
+        0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
+        0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
+        0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
+        0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
+        0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
+        0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
+        0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
+        0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
+        0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
+        0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
+        0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
+        0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
+        0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
+        0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
+        0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
+        0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
+        0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
+        0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
+        0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
+        0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
+        0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
+        0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
+        0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
+        0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
+        0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
+        0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
+        0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
+        0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
+        0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
+        0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
+        0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
+        0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
+        0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
+        0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
+        0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
+        0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
+        0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
+        0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
+        0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
+        0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
+        0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
+        0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
+        0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
+        0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
+        0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
+        0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
+        0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
+        0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
+        0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
+        0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
+        0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
+        0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
+        0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
+        0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
+    };
+    // bcrypt IV: "OrpheanBeholderScryDoubt". The C implementation calls
+    // this "ciphertext", but it is really plaintext or an IV. We keep
+    // the name to make code comparison easier.
+    static private final int bf_crypt_ciphertext[] = {
+        0x4f727068, 0x65616e42, 0x65686f6c,
+        0x64657253, 0x63727944, 0x6f756274
+    };
+    // Table for Base64 encoding
+    static private final char base64_code[] = {
+        '.', '/', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
+        'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
+        'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h',
+        'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't',
+        'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5',
+        '6', '7', '8', '9'
+    };
+    // Table for Base64 decoding
+    static private final byte index_64[] = {
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, 0, 1, 54, 55,
+        56, 57, 58, 59, 60, 61, 62, 63, -1, -1,
+        -1, -1, -1, -1, -1, 2, 3, 4, 5, 6,
+        7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+        17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+        -1, -1, -1, -1, -1, -1, 28, 29, 30,
+        31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+        41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+        51, 52, 53, -1, -1, -1, -1, -1
+    };
+    // Expanded Blowfish key
+    private int P[];
+    private int S[];
+
+    /**
+     * Encode a byte array using bcrypt's slightly-modified base64
+     * encoding scheme. Note that this is *not* compatible with
+     * the standard MIME-base64 encoding.
+     *
+     * @param d	the byte array to encode
+     * @param len	the number of bytes to encode
+     * @return	base64-encoded string
+     * @exception IllegalArgumentException if the length is invalid
+     */
+    private static String encode_base64(byte d[], int len)
+            throws IllegalArgumentException {
+        int off = 0;
+        StringBuilder rs = new StringBuilder();
+        int c1, c2;
+
+        if (len <= 0 || len > d.length) {
+            throw new IllegalArgumentException("Invalid len");
+        }
+
+        while (off < len) {
+            c1 = d[off++] & 0xff;
+            rs.append(base64_code[(c1 >> 2) & 0x3f]);
+            c1 = (c1 & 0x03) << 4;
+            if (off >= len) {
+                rs.append(base64_code[c1 & 0x3f]);
+                break;
+            }
+            c2 = d[off++] & 0xff;
+            c1 |= (c2 >> 4) & 0x0f;
+            rs.append(base64_code[c1 & 0x3f]);
+            c1 = (c2 & 0x0f) << 2;
+            if (off >= len) {
+                rs.append(base64_code[c1 & 0x3f]);
+                break;
+            }
+            c2 = d[off++] & 0xff;
+            c1 |= (c2 >> 6) & 0x03;
+            rs.append(base64_code[c1 & 0x3f]);
+            rs.append(base64_code[c2 & 0x3f]);
+        }
+        return rs.toString();
+    }
+
+    /**
+     * Look up the 3 bits base64-encoded with the specified character,
+     * range-checking againt conversion table
+     * @param x	the base64-encoded value
+     * @return	the decoded value of x
+     */
+    private static byte char64(char x) {
+        if ((int) x < 0 || (int) x > index_64.length) {
+            return -1;
+        }
+        return index_64[(int) x];
+    }
+
+    /**
+     * Decode a string encoded using bcrypt's base64 scheme to a
+     * byte array. Note that this is *not* compatible with
+     * the standard MIME-base64 encoding.
+     * @param s	the string to decode
+     * @param maxolen	the maximum number of bytes to decode
+     * @return	an array containing the bytes decoded
+     * @throws IllegalArgumentException if maxolen is invalid
+     */
+    private static byte[] decode_base64(String s, int maxolen)
+            throws IllegalArgumentException {
+        StringBuilder rs = new StringBuilder();
+        int off = 0, slen = s.length(), olen = 0;
+        byte ret[];
+        byte c1, c2, c3, c4, o;
+
+        if (maxolen <= 0) {
+            throw new IllegalArgumentException("Invalid maxolen");
+        }
+
+        while (off < slen - 1 && olen < maxolen) {
+            c1 = char64(s.charAt(off++));
+            c2 = char64(s.charAt(off++));
+            if (c1 == -1 || c2 == -1) {
+                break;
+            }
+            o = (byte) (c1 << 2);
+            o |= (c2 & 0x30) >> 4;
+            rs.append((char) o);
+            if (++olen >= maxolen || off >= slen) {
+                break;
+            }
+            c3 = char64(s.charAt(off++));
+            if (c3 == -1) {
+                break;
+            }
+            o = (byte) ((c2 & 0x0f) << 4);
+            o |= (c3 & 0x3c) >> 2;
+            rs.append((char) o);
+            if (++olen >= maxolen || off >= slen) {
+                break;
+            }
+            c4 = char64(s.charAt(off++));
+            o = (byte) ((c3 & 0x03) << 6);
+            o |= c4;
+            rs.append((char) o);
+            ++olen;
+        }
+
+        ret = new byte[olen];
+        for (off = 0; off < olen; off++) {
+            ret[off] = (byte) rs.charAt(off);
+        }
+        return ret;
+    }
+
+    /**
+     * Blowfish encipher a single 64-bit block encoded as
+     * two 32-bit halves
+     * @param lr	an array containing the two 32-bit half blocks
+     * @param off	the position in the array of the blocks
+     */
+    private final void encipher(int lr[], int off) {
+        int i, n, l = lr[off], r = lr[off + 1];
+
+        l ^= P[0];
+        for (i = 0; i <= BLOWFISH_NUM_ROUNDS - 2;) {
+            // Feistel substitution on left word
+            n = S[(l >> 24) & 0xff];
+            n += S[0x100 | ((l >> 16) & 0xff)];
+            n ^= S[0x200 | ((l >> 8) & 0xff)];
+            n += S[0x300 | (l & 0xff)];
+            r ^= n ^ P[++i];
+
+            // Feistel substitution on right word
+            n = S[(r >> 24) & 0xff];
+            n += S[0x100 | ((r >> 16) & 0xff)];
+            n ^= S[0x200 | ((r >> 8) & 0xff)];
+            n += S[0x300 | (r & 0xff)];
+            l ^= n ^ P[++i];
+        }
+        lr[off] = r ^ P[BLOWFISH_NUM_ROUNDS + 1];
+        lr[off + 1] = l;
+    }
+
+    /**
+     * Cycically extract a word of key material
+     * @param data	the string to extract the data from
+     * @param offp	a "pointer" (as a one-entry array) to the
+     * current offset into data
+     * @param signp	a "pointer" (as a one-entry array) to the
+     * cumulative flag for non-benign sign extension
+     * @return	correct and buggy next word of material from data as int[2]
+     */
+    private static int[] streamtowords(byte data[], int offp[], int signp[]) {
+        int i;
+        int words[] = { 0, 0 };
+        int off = offp[0];
+        int sign = signp[0];
+
+        for (i = 0; i < 4; i++) {
+            words[0] = (words[0] << 8) | (data[off] & 0xff);
+            words[1] = (words[1] << 8) | (int)data[off];
+            if (i > 0) sign |= words[1] & 0x80;
+            off = (off + 1) % data.length;
+        }
+
+        offp[0] = off;
+        signp[0] = sign;
+        return words;
+    }
+
+    /**
+     * Cycically extract a word of key material
+     * @param data	the string to extract the data from
+     * @param offp	a "pointer" (as a one-entry array) to the
+     * current offset into data
+     * @return	the next word of material from data
+     */
+    private static int streamtoword(byte data[], int offp[]) {
+        int signp[] = { 0 };
+        return streamtowords(data, offp, signp)[0];
+    }
+
+    /**
+     * Cycically extract a word of key material, with sign-extension bug
+     * @param data	the string to extract the data from
+     * @param offp	a "pointer" (as a one-entry array) to the
+     * current offset into data
+     * @return	the next word of material from data
+     */
+    private static int streamtoword_bug(byte data[], int offp[]) {
+        int signp[] = { 0 };
+        return streamtowords(data, offp, signp)[1];
+    }
+
+    /**
+     * Initialise the Blowfish key schedule
+     */
+    private void init_key() {
+        P = (int[]) P_orig.clone();
+        S = (int[]) S_orig.clone();
+    }
+
+    /**
+     * Key the Blowfish cipher
+     * @param key	an array containing the key
+     * @param sign_ext_bug	true to implement the 2x bug
+     */
+    private void key(byte key[], boolean sign_ext_bug) {
+        int i;
+        int koffp[] = {0};
+        int lr[] = {0, 0};
+        int plen = P.length, slen = S.length;
+
+        for (i = 0; i < plen; i++) {
+            if (!sign_ext_bug)
+                P[i] = P[i] ^ streamtoword(key, koffp);
+            else
+                P[i] = P[i] ^ streamtoword_bug(key, koffp);
+        }
+
+        for (i = 0; i < plen; i += 2) {
+            encipher(lr, 0);
+            P[i] = lr[0];
+            P[i + 1] = lr[1];
+        }
+
+        for (i = 0; i < slen; i += 2) {
+            encipher(lr, 0);
+            S[i] = lr[0];
+            S[i + 1] = lr[1];
+        }
+    }
+
+    /**
+     * Perform the "enhanced key schedule" step described by
+     * Provos and Mazieres in "A Future-Adaptable Password Scheme"
+     * http://www.openbsd.org/papers/bcrypt-paper.ps
+     * @param data			salt information
+     * @param key			password information
+     * @param sign_ext_bug	true to implement the 2x bug
+     * @param safety		bit 16 is set when the safety measure is requested
+     */
+    private void ekskey(byte data[], byte key[],
+            boolean sign_ext_bug, int safety) {
+        int i;
+        int koffp[] = {0}, doffp[] = {0};
+        int lr[] = {0, 0};
+        int plen = P.length, slen = S.length;
+        int signp[] = { 0 }; // non-benign sign-extension flag
+        int diff = 0;        // zero iff correct and buggy are same
+
+        for (i = 0; i < plen; i++) {
+            int words[] = streamtowords(key, koffp, signp);
+            diff |= words[0] ^ words[1];
+            P[i] = P[i] ^ words[sign_ext_bug ? 1 : 0];
+        }
+
+        int sign = signp[0];
+
+        /*
+         * At this point, "diff" is zero iff the correct and buggy algorithms produced
+         * exactly the same result.  If so and if "sign" is non-zero, which indicates
+         * that there was a non-benign sign extension, this means that we have a
+         * collision between the correctly computed hash for this password and a set of
+         * passwords that could be supplied to the buggy algorithm.  Our safety measure
+         * is meant to protect from such many-buggy to one-correct collisions, by
+         * deviating from the correct algorithm in such cases.  Let's check for this.
+         */
+        diff |= diff >> 16; /* still zero iff exact match */
+        diff &= 0xffff; /* ditto */
+        diff += 0xffff; /* bit 16 set iff "diff" was non-zero (on non-match) */
+        sign <<= 9; /* move the non-benign sign extension flag to bit 16 */
+        sign &= ~diff & safety; /* action needed? */
+
+        /*
+         * If we have determined that we need to deviate from the correct algorithm,
+         * flip bit 16 in initial expanded key.  (The choice of 16 is arbitrary, but
+         * let's stick to it now.  It came out of the approach we used above, and it's
+         * not any worse than any other choice we could make.)
+         *
+         * It is crucial that we don't do the same to the expanded key used in the main
+         * Eksblowfish loop.  By doing it to only one of these two, we deviate from a
+         * state that could be directly specified on a password to the buggy algorithm
+         * (and to the fully correct one as well, but that's a side-effect).
+         */
+        P[0] ^= sign;
+
+        for (i = 0; i < plen; i += 2) {
+            lr[0] ^= streamtoword(data, doffp);
+            lr[1] ^= streamtoword(data, doffp);
+            encipher(lr, 0);
+            P[i] = lr[0];
+            P[i + 1] = lr[1];
+        }
+
+        for (i = 0; i < slen; i += 2) {
+            lr[0] ^= streamtoword(data, doffp);
+            lr[1] ^= streamtoword(data, doffp);
+            encipher(lr, 0);
+            S[i] = lr[0];
+            S[i + 1] = lr[1];
+        }
+    }
+
+    /**
+     * Perform the central password hashing step in the
+     * bcrypt scheme
+     * @param password	the password to hash
+     * @param salt	the binary salt to hash with the password
+     * @param log_rounds	the binary logarithm of the number
+     * of rounds of hashing to apply
+     * @param sign_ext_bug	true to implement the 2x bug
+     * @param safety		bit 16 is set when the safety measure is requested
+     * @param cdata         the plaintext to encrypt
+     * @return	an array containing the binary hashed password
+     */
+    private byte[] crypt_raw(byte password[], byte salt[], int log_rounds,
+            boolean sign_ext_bug, int safety, int cdata[]) {
+        int rounds, i, j;
+        int clen = cdata.length;
+        byte ret[];
+
+        if (log_rounds < 4 || log_rounds > 30) {
+            throw new IllegalArgumentException("Bad number of rounds");
+        }
+        rounds = 1 << log_rounds;
+        if (salt.length != BCRYPT_SALT_LEN) {
+            throw new IllegalArgumentException("Bad salt length");
+        }
+
+        init_key();
+        ekskey(salt, password, sign_ext_bug, safety);
+        for (i = 0; i != rounds; i++) {
+            key(password, sign_ext_bug);
+            key(salt, false);
+        }
+
+        for (i = 0; i < 64; i++) {
+            for (j = 0; j < (clen >> 1); j++) {
+                encipher(cdata, j << 1);
+            }
+        }
+
+        ret = new byte[clen * 4];
+        for (i = 0, j = 0; i < clen; i++) {
+            ret[j++] = (byte) ((cdata[i] >> 24) & 0xff);
+            ret[j++] = (byte) ((cdata[i] >> 16) & 0xff);
+            ret[j++] = (byte) ((cdata[i] >> 8) & 0xff);
+            ret[j++] = (byte) (cdata[i] & 0xff);
+        }
+        return ret;
+    }
+
+    /**
+     * Converts given plaintext to byte representation.
+     * @param plaintext		the plaintext password to convert
+     * @return Byte representation of given plaintext.
+     */
+    private static byte[] stringToBytes(String plaintext) {
+        byte plaintextb[];
+
+        try {
+            plaintextb = plaintext.getBytes("UTF-8");
+        } catch (UnsupportedEncodingException uee) {
+            throw new AssertionError("UTF-8 is not supported");
+        }
+
+        return plaintextb;
+    }
+
+    /**
+     * Hash a password using the OpenBSD bcrypt scheme
+     * @param password	the password to hash
+     * @param salt	the salt to hash with (perhaps generated
+     * using BCrypt.gensalt)
+     * @return	the hashed password
+     */
+    public static String hashpw(String password, String salt) {
+        byte passwordb[] = stringToBytes(password);
+
+        return hashpw(passwordb, salt);
+    }
+
+    /**
+     * Hash a password using the OpenBSD bcrypt scheme
+     * @param passwordb	the password to hash, as a byte array
+     * @param salt	the salt to hash with (perhaps generated
+     * using BCrypt.gensalt)
+     * @return	the hashed password
+     */
+    public static String hashpw(byte passwordb[], String salt) {
+        BCrypt B;
+        String real_salt;
+        byte saltb[], hashed[];
+        char minor = (char) 0;
+        int rounds, off = 0;
+        StringBuilder rs = new StringBuilder();
+
+        if (salt.charAt(0) != '$' || salt.charAt(1) != '2') {
+            throw new IllegalArgumentException("Invalid salt version");
+        }
+        if (salt.charAt(2) == '$') {
+            off = 3;
+        } else {
+            minor = salt.charAt(2);
+            if ((minor != 'a' && minor != 'x' && minor != 'y' && minor != 'b')
+                    || salt.charAt(3) != '$') {
+                throw new IllegalArgumentException("Invalid salt revision");
+            }
+            off = 4;
+        }
+
+        // Extract number of rounds
+        if (salt.charAt(off + 2) > '$') {
+            throw new IllegalArgumentException("Missing salt rounds");
+        }
+        rounds = Integer.parseInt(salt.substring(off, off + 2));
+
+        real_salt = salt.substring(off + 3, off + 25);
+
+        saltb = decode_base64(real_salt, BCRYPT_SALT_LEN);
+
+        if (minor >= 'a') // add null terminator
+            passwordb = Arrays.copyOf(passwordb, passwordb.length + 1);
+
+        B = new BCrypt();
+        hashed = B.crypt_raw(passwordb, saltb, rounds,
+                minor == 'x',  // true for sign extension bug ('2x')
+                minor == 'a' ? 0x10000 : 0, // safety factor for '2a'
+                (int[])bf_crypt_ciphertext.clone());
+
+        rs.append("$2");
+        if (minor >= 'a') {
+            rs.append(minor);
+        }
+        rs.append("$");
+        if (rounds < 10) {
+            rs.append("0");
+        }
+        if (rounds > 30) {
+            throw new IllegalArgumentException(
+                    "rounds exceeds maximum (30)");
+        }
+        rs.append(Integer.toString(rounds));
+        rs.append("$");
+        rs.append(encode_base64(saltb, saltb.length));
+        rs.append(encode_base64(hashed,
+                bf_crypt_ciphertext.length * 4 - 1));
+        return rs.toString();
+    }
+
+    /**
+     * Generate a salt for use with the BCrypt.hashpw() method
+     * @param prefix		the prefix value (default $2y)
+     * @param log_rounds	the log2 of the number of rounds of
+     * hashing to apply - the work factor therefore increases as
+     * 2**log_rounds.
+     * @param random		an instance of SecureRandom to use
+     * @return	an encoded salt value
+     * @exception IllegalArgumentException if prefix or log_rounds is invalid
+     */
+    public static String gensalt(String prefix, int log_rounds, SecureRandom random)
+            throws IllegalArgumentException {
+        StringBuilder rs = new StringBuilder();
+        byte rnd[] = new byte[BCRYPT_SALT_LEN];
+
+        if (!prefix.startsWith("$2") ||
+                (prefix.charAt(2) != 'a' && prefix.charAt(2) != 'y') &&
+                 prefix.charAt(2) != 'b') {
+            throw new IllegalArgumentException ("Invalid prefix");
+        }
+        if (log_rounds < 4 || log_rounds > 31) {
+            throw new IllegalArgumentException ("Invalid log_rounds");
+        }
+
+        random.nextBytes(rnd);
+
+        rs.append("$2");
+        rs.append(prefix.charAt(2));
+        rs.append("$");
+        if (log_rounds < 10) {
+            rs.append("0");
+        }
+        if (log_rounds > 30) {
+            throw new IllegalArgumentException(
+                    "log_rounds exceeds maximum (30)");
+        }
+        rs.append(Integer.toString(log_rounds));
+        rs.append("$");
+        rs.append(encode_base64(rnd, rnd.length));
+        return rs.toString();
+    }
+
+    /**
+     * Generate a salt for use with the BCrypt.hashpw() method
+     * @param prefix		the prefix value (default $2y)
+     * @param log_rounds	the log2 of the number of rounds of
+     * hashing to apply - the work factor therefore increases as
+     * 2**log_rounds.
+     * @return	an encoded salt value
+     * @exception IllegalArgumentException if prefix or log_rounds is invalid
+     */
+    public static String gensalt(String prefix, int log_rounds)
+            throws IllegalArgumentException {
+        return gensalt(prefix, log_rounds, new SecureRandom());
+    }
+
+    /**
+     * Generate a salt for use with the BCrypt.hashpw() method
+     * @param log_rounds	the log2 of the number of rounds of
+     * hashing to apply - the work factor therefore increases as
+     * 2**log_rounds.
+     * @param random		an instance of SecureRandom to use
+     * @return	an encoded salt value
+     * @exception IllegalArgumentException if prefix or log_rounds is invalid
+     */
+    public static String gensalt(int log_rounds, SecureRandom random)
+            throws IllegalArgumentException {
+        return gensalt("$2y", log_rounds, random);
+    }
+
+    /**
+     * Generate a salt for use with the BCrypt.hashpw() method
+     * @param log_rounds	the log2 of the number of rounds of
+     * hashing to apply - the work factor therefore increases as
+     * 2**log_rounds.
+     * @return	an encoded salt value
+     * @exception IllegalArgumentException if prefix or log_rounds is invalid
+     */
+    public static String gensalt(int log_rounds)
+            throws IllegalArgumentException {
+        return gensalt(log_rounds, new SecureRandom());
+    }
+
+    /**
+     * Generate a salt for use with the BCrypt.hashpw() method,
+     * selecting a reasonable default for the number of hashing
+     * rounds to apply
+     * @return	an encoded salt value
+     * @exception IllegalArgumentException if prefix or log_rounds is invalid
+     */
+    public static String gensalt()
+            throws IllegalArgumentException {
+        return gensalt(GENSALT_DEFAULT_LOG2_ROUNDS);
+    }
+
+    /**
+     * Check that a plaintext password matches a previously hashed
+     * one
+     * @param plaintext	the plaintext password to verify
+     * @param hashed	the previously-hashed password
+     * @return	true if the passwords match, false otherwise
+     */
+    public static boolean checkpw(String plaintext, String hashed) {
+        byte plaintextb[] = stringToBytes(plaintext);
+        return checkpw(plaintextb, hashed);
+    }
+
+    /**
+     * Check that a plaintext byte[] password matches a previously hashed
+     * one
+     * @param plaintext	the plaintext password to verify
+     * @param hashed	the previously-hashed password
+     * @return	true if the passwords match, false otherwise
+     */
+    public static boolean checkpw(byte[] plaintext, String hashed) {
+        byte hashed_bytes[];
+        byte try_bytes[];
+        try {
+            String try_pw = hashpw(plaintext, hashed);
+            hashed_bytes = hashed.getBytes("UTF-8");
+            try_bytes = try_pw.getBytes("UTF-8");
+        } catch (UnsupportedEncodingException uee) {
+            return false;
+        }
+        if (hashed_bytes.length != try_bytes.length)
+            return false;
+        byte ret = 0;
+        for (int i = 0; i < try_bytes.length; i++)
+            ret |= hashed_bytes[i] ^ try_bytes[i];
+        return ret == 0;
+    }
+}

src/main/java/tools/DatabaseConnection.java

@@ -0,0 +1,97 @@
+package tools;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+
+import config.YamlConfig;
+
+/**
+ * @author Frz (Big Daddy)
+ * @author The Real Spookster - some modifications to this beautiful code
+ * @author Ronan - some connection pool to this beautiful code
+ */
+public class DatabaseConnection {
+    private static HikariDataSource ds;
+    
+    public static Connection getConnection() throws SQLException {
+        if(ds != null) {
+            try {
+                return ds.getConnection();
+            } catch (SQLException sqle) {
+                sqle.printStackTrace();
+            }
+        }
+        
+        int denies = 0;
+        while(true) {   // There is no way it can pass with a null out of here?
+            try {
+                return DriverManager.getConnection(YamlConfig.config.server.DB_URL, YamlConfig.config.server.DB_USER, YamlConfig.config.server.DB_PASS);
+            } catch (SQLException sqle) {
+                denies++;
+                
+                if(denies == 3) {
+                    // Give up, throw exception. Nothing good will come from this.
+                    FilePrinter.printError(FilePrinter.SQL_EXCEPTION, "SQL Driver refused to give a connection after " + denies + " tries. Problem: " + sqle.getMessage());
+                    throw sqle;
+                }
+            }
+        }
+    }
+    
+    private static int getNumberOfAccounts() {
+        try {
+            Connection con = DriverManager.getConnection(YamlConfig.config.server.DB_URL, YamlConfig.config.server.DB_USER, YamlConfig.config.server.DB_PASS);
+            try (PreparedStatement ps = con.prepareStatement("SELECT count(*) FROM accounts")) {
+                try (ResultSet rs = ps.executeQuery()) {
+                    rs.next();
+                    return rs.getInt(1);
+                }
+            } finally {
+                con.close();
+            }
+        } catch(SQLException sqle) {
+            return 20;
+        }
+    }
+    
+    public DatabaseConnection() {
+        try {
+            Class.forName("com.mysql.jdbc.Driver"); // touch the mysql driver
+        } catch (ClassNotFoundException e) {
+            System.out.println("[SEVERE] SQL Driver Not Found. Consider death by clams.");
+            e.printStackTrace();
+        }
+        
+        ds = null;
+        
+        if(YamlConfig.config.server.DB_CONNECTION_POOL) {
+            // Connection Pool on database ftw!
+            
+            HikariConfig config = new HikariConfig();
+            config.setJdbcUrl(YamlConfig.config.server.DB_URL);
+            
+            config.setUsername(YamlConfig.config.server.DB_USER);
+            config.setPassword(YamlConfig.config.server.DB_PASS);
+            
+            // Make sure pool size is comfortable for the worst case scenario.
+            // Under 100 accounts? Make it 10. Over 10000 accounts? Make it 30.
+            int poolSize = (int)Math.ceil(0.00202020202 * getNumberOfAccounts() + 9.797979798);
+            if(poolSize < 10) poolSize = 10;
+            else if(poolSize > 30) poolSize = 30;
+            
+            config.setConnectionTimeout(30 * 1000);
+            config.setMaximumPoolSize(poolSize);
+            
+            config.addDataSourceProperty("cachePrepStmts", true);
+            config.addDataSourceProperty("prepStmtCacheSize", 25);
+            config.addDataSourceProperty("prepStmtCacheSqlLimit", 2048);
+
+            ds = new HikariDataSource(config);
+        }
+    }
+}

src/main/java/tools/FilePrinter.java

@@ -0,0 +1,224 @@
+package tools;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+public class FilePrinter {
+
+    public static final String 
+            AUTOBAN_WARNING = "game/AutoBanWarning.txt",    // log naming version by Vcoc
+            AUTOBAN_DC = "game/AutoBanDC.txt",
+            ACCOUNT_STUCK = "players/AccountStuck.txt",
+            COMMAND_GM = "reports/Gm.txt",
+            COMMAND_BUG = "reports/Bug.txt",
+            LOG_TRADE = "interactions/Trades.txt",
+            LOG_EXPEDITION = "interactions/Expeditions.txt",
+            LOG_LEAF = "interactions/MapleLeaves.txt",
+            LOG_GACHAPON = "interactions/Gachapon.txt",
+            LOG_CHAT = "interactions/ChatLog.txt",
+            QUEST_RESTORE_ITEM = "game/QuestItemRestore.txt",
+            EXCEPTION_CAUGHT = "game/ExceptionCaught.txt",
+            CLIENT_START = "game/ClientStartError.txt",
+            MAPLE_MAP = "game/MapleMap.txt",
+            ERROR38 = "game/Error38.txt",
+            PACKET_LOG = "game/Log.txt",
+            CASHITEM_BOUGHT = "interactions/CashLog.txt",
+            EXCEPTION = "game/Exceptions.txt",
+            LOGIN_EXCEPTION = "game/LoginExceptions.txt",
+            TRADE_EXCEPTION = "game/TradeExceptions.txt",
+            SQL_EXCEPTION = "game/SqlExceptions.txt",
+            PACKET_HANDLER = "game/packethandler/",
+            PORTAL = "game/portals/",
+            PORTAL_STUCK = "game/portalblocks/",
+            NPC = "game/npcs/",
+            INVOCABLE = "game/invocable/",
+            REACTOR = "game/reactors/",
+            QUEST = "game/quests/",
+            ITEM = "game/items/",
+            MOB_MOVEMENT = "game/MobMovement.txt",
+            MAP_SCRIPT = "game/mapscript/",
+            DIRECTION = "game/directions/",
+            GUILD_CHAR_ERROR = "guilds/GuildCharError.txt",
+            SAVE_CHAR = "players/SaveToDB.txt",
+            INSERT_CHAR = "players/InsertCharacter.txt",
+            LOAD_CHAR = "players/LoadCharFromDB.txt",
+            CREATED_CHAR = "players/createdchars/",
+            DELETED_CHAR = "players/deletedchars/",
+            UNHANDLED_EVENT = "game/DoesNotExist.txt",
+            SESSION = "players/Sessions.txt",
+            DCS = "game/disconnections/",
+            EXPLOITS = "game/exploits/",
+            STORAGE = "game/storage/",
+            PACKET_LOGS = "game/packetlogs/",
+            PACKET_STREAM = "game/packetstream/",
+            FREDRICK = "game/npcs/fredrick/",
+            NPC_UNCODED = "game/npcs/UncodedNPCs.txt",
+            QUEST_UNCODED = "game/quests/UncodedQuests.txt",
+            AUTOSAVING_CHARACTER = "players/SaveCharAuto.txt",
+            SAVING_CHARACTER = "players/SaveChar.txt",
+            CHANGE_CHARACTER_NAME = "players/NameChange.txt",
+            WORLD_TRANSFER = "players/WorldTransfer.txt",
+            FAMILY_ERROR = "players/FamilyErrors.txt",
+            USED_COMMANDS = "commands/UsedCommands.txt",
+            DEADLOCK_ERROR = "deadlocks/Deadlocks.txt",
+            DEADLOCK_STACK = "deadlocks/Path.txt",
+            DEADLOCK_LOCKS = "deadlocks/Locks.txt",
+            DEADLOCK_STATE = "deadlocks/State.txt",
+            DISPOSED_LOCKS = "deadlocks/Disposed.txt";
+    
+    private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); //for file system purposes, it's nice to use yyyy-MM-dd
+    private static final String FILE_PATH = "logs/" + sdf.format(Calendar.getInstance().getTime()) + "/"; // + sdf.format(Calendar.getInstance().getTime()) + "/"
+    private static final String ERROR = "error/";
+
+    public static void printError(final String name, final Throwable t) {
+        String stringT = getString(t);
+        
+    	System.out.println("Error thrown: " + name);
+    	System.out.println(stringT);
+        System.out.println();
+        FileOutputStream out = null;
+        final String file = FILE_PATH + ERROR + name;
+        try {
+            File outputFile = new File(file);
+            if (outputFile.getParentFile() != null) {
+                outputFile.getParentFile().mkdirs();
+            }
+            out = new FileOutputStream(file, true);
+            out.write(stringT.getBytes());
+            out.write("\r\n---------------------------------\r\n".getBytes());
+            out.write("\r\n".getBytes()); // thanks Vcoc for suggesting review body log structure
+        } catch (IOException ess) {
+            ess.printStackTrace();
+        } finally {
+            try {
+                if (out != null) {
+                    out.close();
+                }
+            } catch (IOException ignore) {
+                ignore.printStackTrace();
+            }
+        }
+    }
+
+    public static void printError(final String name, final Throwable t, final String info) {
+        String stringT = getString(t);
+        
+    	System.out.println("Error thrown: " + name);
+    	System.out.println(stringT);
+        System.out.println();
+        FileOutputStream out = null;
+        final String file = FILE_PATH + ERROR + name;
+        try {
+            File outputFile = new File(file);
+            if (outputFile.getParentFile() != null) {
+                outputFile.getParentFile().mkdirs();
+            }
+            out = new FileOutputStream(file, true);
+            out.write((info + "\r\n").getBytes());
+            out.write(stringT.getBytes());
+            out.write("\r\n---------------------------------\r\n".getBytes());
+            out.write("\r\n".getBytes());
+        } catch (IOException ess) {
+            ess.printStackTrace();
+        } finally {
+            try {
+                if (out != null) {
+                    out.close();
+                }
+            } catch (IOException ignore) {
+                ignore.printStackTrace();
+            }
+        }
+    }
+
+    public static void printError(final String name, final String s) {
+    	System.out.println("Error thrown: " + name);
+    	System.out.println(s);
+        System.out.println();
+        FileOutputStream out = null;
+        final String file = FILE_PATH + ERROR + name;
+        try {
+            File outputFile = new File(file);
+            if (outputFile.getParentFile() != null) {
+                outputFile.getParentFile().mkdirs();
+            }
+            out = new FileOutputStream(file, true);
+            out.write(s.getBytes());
+            //out.write("\r\n---------------------------------\r\n".getBytes());
+            out.write("\r\n".getBytes());
+        } catch (IOException ess) {
+            ess.printStackTrace();
+        } finally {
+            try {
+                if (out != null) {
+                    out.close();
+                }
+            } catch (IOException ignore) {
+                ignore.printStackTrace();
+            }
+        }
+    }
+
+    public static void print(final String name, final String s) {
+        print(name, s, true);
+    }
+
+    public static void print(final String name, final String s, boolean line) {
+    	System.out.println("Log: " + name);
+    	System.out.println(s);
+        System.out.println();
+        FileOutputStream out = null;
+        String file = FILE_PATH + name;
+        try {
+            File outputFile = new File(file);
+            if (outputFile.getParentFile() != null) {
+                outputFile.getParentFile().mkdirs();
+            }
+            out = new FileOutputStream(file, true);
+            out.write(s.getBytes());
+            if (line) {
+                out.write("\r\n---------------------------------\r\n".getBytes());
+            }
+            out.write("\r\n".getBytes());
+        } catch (IOException ess) {
+            ess.printStackTrace();
+        } finally {
+            try {
+                if (out != null) {
+                    out.close();
+                }
+            } catch (IOException ignore) {
+                ignore.printStackTrace();
+            }
+        }
+    }
+
+    private static String getString(final Throwable e) {
+        String retValue = null;
+        StringWriter sw = null;
+        PrintWriter pw = null;
+        try {
+            sw = new StringWriter();
+            pw = new PrintWriter(sw);
+            e.printStackTrace(pw);
+            retValue = sw.toString();
+        } finally {
+            try {
+                if (pw != null) {
+                    pw.close();
+                }
+                if (sw != null) {
+                    sw.close();
+                }
+            } catch (IOException ignore) {
+                ignore.printStackTrace();
+            }
+        }
+        return retValue;
+    }
+}

src/main/java/tools/HexTool.java

@@ -0,0 +1,107 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+		       Matthias Butz <matze@odinms.de>
+		       Jan Christian Meyer <vimes@odinms.de>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package tools;
+
+import constants.string.CharsetConstants;
+import java.io.ByteArrayOutputStream;
+
+public class HexTool {
+    private static final char[] HEX = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+
+    private static String toString(byte byteValue) {
+        int tmp = byteValue << 8;
+        char[] retstr = new char[]{HEX[(tmp >> 12) & 0x0F], HEX[(tmp >> 8) & 0x0F]};
+        return String.valueOf(retstr);
+    }
+
+    public static String toString(byte[] bytes) {
+        StringBuilder hexed = new StringBuilder();
+        for (int i = 0; i < bytes.length; i++) {
+            hexed.append(toString(bytes[i]));
+            hexed.append(' ');
+        }
+        return hexed.substring(0, hexed.length() - 1);
+    }
+    
+    public static String toCompressedString(byte[] bytes) {
+        StringBuilder hexed = new StringBuilder();
+        for (int i = 0; i < bytes.length; i++) {
+            hexed.append(toString(bytes[i]));
+        }
+        return hexed.substring(0, hexed.length());
+    }
+
+    public static byte[] getByteArrayFromHexString(String hex) {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        int nexti = 0;
+        int nextb = 0;
+        boolean highoc = true;
+        outer:
+        for (;;) {
+            int number = -1;
+            while (number == -1) {
+                if (nexti == hex.length()) {
+                    break outer;
+                }
+                char chr = hex.charAt(nexti);
+                if (chr >= '0' && chr <= '9') {
+                    number = chr - '0';
+                } else if (chr >= 'a' && chr <= 'f') {
+                    number = chr - 'a' + 10;
+                } else if (chr >= 'A' && chr <= 'F') {
+                    number = chr - 'A' + 10;
+                } else {
+                    number = -1;
+                }
+                nexti++;
+            }
+            if (highoc) {
+                nextb = number << 4;
+                highoc = false;
+            } else {
+                nextb |= number;
+                highoc = true;
+                baos.write(nextb);
+            }
+        }
+        return baos.toByteArray();
+    }
+    
+    public static final String toStringFromAscii(final byte[] bytes) {
+        byte[] ret = new byte[bytes.length];
+        for (int x = 0; x < bytes.length; x++) {
+            if (bytes[x] < 32 && bytes[x] >= 0) {
+                ret[x] = '.';
+            } else {
+                int chr = ((short) bytes[x]) & 0xFF;
+                ret[x] = (byte) chr;
+            }
+        }
+        String encode = CharsetConstants.MAPLE_TYPE.getAscii();
+        try {
+            String str = new String(ret, encode);
+            return str;
+        } catch (Exception e) {}
+        return "";
+    }
+
+}

src/main/java/tools/IntervalBuilder.java

@@ -0,0 +1,133 @@
+/*
+    This file is part of the HeavenMS MapleStory Server
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package tools;
+
+import java.awt.geom.Line2D;
+import java.util.ArrayList;
+import java.util.List;
+import net.server.audit.locks.MonitoredLockType;
+import net.server.audit.locks.MonitoredReadLock;
+import net.server.audit.locks.MonitoredReentrantReadWriteLock;
+import net.server.audit.locks.MonitoredWriteLock;
+import net.server.audit.locks.factory.MonitoredReadLockFactory;
+import net.server.audit.locks.factory.MonitoredWriteLockFactory;
+
+/**
+ *
+ * @author Ronan
+ */
+public class IntervalBuilder {
+        
+    private List<Line2D> intervalLimits = new ArrayList<>();
+    
+    protected MonitoredReadLock intervalRlock;
+    protected MonitoredWriteLock intervalWlock;
+    
+    public IntervalBuilder() {
+        MonitoredReentrantReadWriteLock locks = new MonitoredReentrantReadWriteLock(MonitoredLockType.INTERVAL, true);
+        intervalRlock = MonitoredReadLockFactory.createLock(locks);
+        intervalWlock = MonitoredWriteLockFactory.createLock(locks);
+    }
+
+    private void refitOverlappedIntervals(int st, int en, int newFrom, int newTo) {
+        List<Line2D> checkLimits = new ArrayList<>(intervalLimits.subList(st, en));
+
+        float newLimitX1, newLimitX2;
+        if (!checkLimits.isEmpty()) {
+            Line2D firstLimit = checkLimits.get(0);
+            Line2D lastLimit = checkLimits.get(checkLimits.size() - 1);
+
+            newLimitX1 = (float) ((newFrom < firstLimit.getX1()) ? newFrom : firstLimit.getX1());
+            newLimitX2 = (float) ((newTo > lastLimit.getX2()) ? newTo : lastLimit.getX2());
+
+            for (Line2D limit : checkLimits) {
+                intervalLimits.remove(st);
+            }
+        } else {
+            newLimitX1 = newFrom;
+            newLimitX2 = newTo;
+        }
+
+        intervalLimits.add(st, new Line2D.Float((float) newLimitX1, 0, (float) newLimitX2, 0));
+    }
+
+    private int bsearchInterval(int point) {
+        int st = 0, en = intervalLimits.size() - 1;
+
+        int mid, idx;
+        while (en >= st) {
+            idx = (st + en) / 2;
+            mid = (int) intervalLimits.get(idx).getX1();
+
+            if (mid == point) {
+                return idx;
+            } else if (mid < point) {
+                st = idx + 1;
+            } else {
+                en = idx - 1;
+            }
+        }
+
+        return en;
+    }
+
+    public void addInterval(int from, int to) {
+        intervalWlock.lock();
+        try {
+            int st = bsearchInterval(from);
+            if (st < 0) {
+                st = 0;
+            } else if (intervalLimits.get(st).getX2() < from) {
+                st += 1;
+            }
+
+            int en = bsearchInterval(to);
+            if (en < st) en = st - 1;
+
+            refitOverlappedIntervals(st, en + 1, from, to);
+        } finally {
+            intervalWlock.unlock();
+        }
+    }
+
+    public boolean inInterval(int point) {
+        return inInterval(point, point);
+    }
+    
+    public boolean inInterval(int from, int to) {
+        intervalRlock.lock();
+        try {
+            int idx = bsearchInterval(from);
+            return idx >= 0 && to <= intervalLimits.get(idx).getX2();
+        } finally {
+            intervalRlock.unlock();
+        }
+    }
+
+    public void clear() {
+        intervalWlock.lock();
+        try {
+            intervalLimits.clear();
+        } finally {
+            intervalWlock.unlock();
+        }
+    }
+    
+}

src/main/java/tools/LogHelper.java

@@ -0,0 +1,79 @@
+package tools;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+import client.MapleClient;
+import net.server.Server;
+import server.MapleItemInformationProvider;
+import server.MapleTrade;
+import server.expeditions.MapleExpedition;
+import client.MapleCharacter;
+import client.inventory.Item;
+
+public class LogHelper {
+
+	public static void logTrade(MapleTrade trade1, MapleTrade trade2) {
+		String name1 = trade1.getChr().getName();
+		String name2 = trade2.getChr().getName();
+		String log = "TRADE BETWEEN " + name1 + " AND " + name2 + "\r\n";
+		//Trade 1 to trade 2
+		log += trade1.getExchangeMesos() + " mesos from " + name1 + " to " + name2 + " \r\n";
+		for (Item item : trade1.getItems()){
+			String itemName = MapleItemInformationProvider.getInstance().getName(item.getItemId()) + "(" + item.getItemId() + ")";
+			log += item.getQuantity() + " " + itemName + " from "  + name1 + " to " + name2 + " \r\n";;
+		}
+		//Trade 2 to trade 1
+		log += trade2.getExchangeMesos() + " mesos from " + name2 + " to " + name1 + " \r\n";
+		for (Item item : trade2.getItems()){
+			String itemName = MapleItemInformationProvider.getInstance().getName(item.getItemId()) + "(" + item.getItemId() + ")";
+			log += item.getQuantity() + " " + itemName + " from " + name2 + " to " + name1 + " \r\n";;
+		}
+		log += "\r\n\r\n";
+		FilePrinter.print(FilePrinter.LOG_TRADE, log);
+	}
+
+	public static void logExpedition(MapleExpedition expedition) {
+		Server.getInstance().broadcastGMMessage(expedition.getLeader().getWorld(), MaplePacketCreator.serverNotice(6, expedition.getType().toString() + " Expedition with leader " + expedition.getLeader().getName() + " finished after " + getTimeString(expedition.getStartTime())));
+
+		String log = expedition.getType().toString() + " EXPEDITION\r\n";
+		log += getTimeString(expedition.getStartTime()) + "\r\n";
+
+		for (String memberName : expedition.getMembers().values()){
+			log += ">>" + memberName + "\r\n";
+		}
+		log += "BOSS KILLS\r\n";
+		for (String message: expedition.getBossLogs()){
+			log += message;
+		}
+		log += "\r\n";
+		FilePrinter.print(FilePrinter.LOG_EXPEDITION, log);
+	}
+	
+	public static String getTimeString(long then){
+		long duration = System.currentTimeMillis() - then;
+		int seconds = (int) (duration / 1000) % 60 ;
+		int minutes = (int) ((duration / (1000*60)) % 60);
+		return minutes + " Minutes and " + seconds + " Seconds";
+	}
+
+	public static void logLeaf(MapleCharacter player, boolean gotPrize, String operation) {
+		String timeStamp = new SimpleDateFormat("dd-MM-yyyy hh:mm:ss").format(new Date());
+		String log = player.getName() + (gotPrize ? " used a maple leaf to buy " + operation : " redeemed " + operation + " VP for a leaf") + " - " + timeStamp;
+		FilePrinter.print(FilePrinter.LOG_LEAF, log);
+	}
+	
+	public static void logGacha(MapleCharacter player, int itemid, String map) {
+		String itemName = MapleItemInformationProvider.getInstance().getName(itemid);
+		String timeStamp = new SimpleDateFormat("dd-MM-yyyy hh:mm:ss").format(new Date());
+		String log = player.getName() + " got a " + itemName + "(" + itemid + ") from the " + map + " gachapon. - " + timeStamp;
+		FilePrinter.print(FilePrinter.LOG_GACHAPON, log);
+	}
+
+	public static void logChat(MapleClient player, String chatType, String text){
+		SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy HH:mm");
+		FilePrinter.print(FilePrinter.LOG_CHAT, "[" + sdf.format(Calendar.getInstance().getTime()) + "] (" + chatType + ") " +player.getPlayer().getName() + ": " + text);
+	}
+
+}

src/main/java/tools/LongTool.java

@@ -0,0 +1,41 @@
+package tools;
+
+/**
+ *
+ * @author Shavit
+ */
+public class LongTool {
+    
+    // Converts 8 bytes to a long.
+    public static long BytesToLong(byte[] aToConvert)
+    {
+        if(aToConvert.length != Long.BYTES)
+        {
+            throw new IllegalArgumentException(String.format("Size of input should be %d", (Long.SIZE / 8)));
+        }
+
+        long nResult = 0;
+
+        for(int i = 0; i < Long.BYTES; i++)
+        {
+            nResult <<= Byte.SIZE;
+            nResult |= (aToConvert[i] & 0xFF);
+        }
+
+        return nResult;
+    }
+
+    // Converts a long to 8 bytes.
+    public static byte[] LongToBytes(long nToConvert)
+    {
+        byte[] aBytes = new byte[Long.BYTES];
+
+        for(int i = aBytes.length - 1; i >= 0; i--)
+        {
+            aBytes[i] = (byte) (nToConvert & 0xFF);
+            nToConvert >>= Byte.SIZE;
+        }
+
+        return aBytes;
+    }
+}

src/main/java/tools/MapleAESOFB.java

@@ -0,0 +1,197 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+		       Matthias Butz <matze@odinms.de>
+		       Jan Christian Meyer <vimes@odinms.de>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package tools;
+
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.spec.SecretKeySpec;
+
+public class MapleAESOFB {
+    private byte iv[];
+    private Cipher cipher;
+    private short mapleVersion;
+    private final static SecretKeySpec skey = new SecretKeySpec(
+        new byte[]{0x13, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, (byte) 0xB4, 0x00, 0x00, 0x00, 0x1B, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x52, 0x00, 0x00, 0x00}, "AES");
+
+    private static final byte[] funnyBytes = new byte[]{(byte) 0xEC, (byte) 0x3F, (byte) 0x77, (byte) 0xA4, (byte) 0x45, (byte) 0xD0, (byte) 0x71, (byte) 0xBF, (byte) 0xB7, (byte) 0x98, (byte) 0x20, (byte) 0xFC,
+        (byte) 0x4B, (byte) 0xE9, (byte) 0xB3, (byte) 0xE1, (byte) 0x5C, (byte) 0x22, (byte) 0xF7, (byte) 0x0C, (byte) 0x44, (byte) 0x1B, (byte) 0x81, (byte) 0xBD, (byte) 0x63, (byte) 0x8D, (byte) 0xD4, (byte) 0xC3,
+        (byte) 0xF2, (byte) 0x10, (byte) 0x19, (byte) 0xE0, (byte) 0xFB, (byte) 0xA1, (byte) 0x6E, (byte) 0x66, (byte) 0xEA, (byte) 0xAE, (byte) 0xD6, (byte) 0xCE, (byte) 0x06, (byte) 0x18, (byte) 0x4E, (byte) 0xEB,
+        (byte) 0x78, (byte) 0x95, (byte) 0xDB, (byte) 0xBA, (byte) 0xB6, (byte) 0x42, (byte) 0x7A, (byte) 0x2A, (byte) 0x83, (byte) 0x0B, (byte) 0x54, (byte) 0x67, (byte) 0x6D, (byte) 0xE8, (byte) 0x65, (byte) 0xE7,
+        (byte) 0x2F, (byte) 0x07, (byte) 0xF3, (byte) 0xAA, (byte) 0x27, (byte) 0x7B, (byte) 0x85, (byte) 0xB0, (byte) 0x26, (byte) 0xFD, (byte) 0x8B, (byte) 0xA9, (byte) 0xFA, (byte) 0xBE, (byte) 0xA8, (byte) 0xD7,
+        (byte) 0xCB, (byte) 0xCC, (byte) 0x92, (byte) 0xDA, (byte) 0xF9, (byte) 0x93, (byte) 0x60, (byte) 0x2D, (byte) 0xDD, (byte) 0xD2, (byte) 0xA2, (byte) 0x9B, (byte) 0x39, (byte) 0x5F, (byte) 0x82, (byte) 0x21,
+        (byte) 0x4C, (byte) 0x69, (byte) 0xF8, (byte) 0x31, (byte) 0x87, (byte) 0xEE, (byte) 0x8E, (byte) 0xAD, (byte) 0x8C, (byte) 0x6A, (byte) 0xBC, (byte) 0xB5, (byte) 0x6B, (byte) 0x59, (byte) 0x13, (byte) 0xF1,
+        (byte) 0x04, (byte) 0x00, (byte) 0xF6, (byte) 0x5A, (byte) 0x35, (byte) 0x79, (byte) 0x48, (byte) 0x8F, (byte) 0x15, (byte) 0xCD, (byte) 0x97, (byte) 0x57, (byte) 0x12, (byte) 0x3E, (byte) 0x37, (byte) 0xFF,
+        (byte) 0x9D, (byte) 0x4F, (byte) 0x51, (byte) 0xF5, (byte) 0xA3, (byte) 0x70, (byte) 0xBB, (byte) 0x14, (byte) 0x75, (byte) 0xC2, (byte) 0xB8, (byte) 0x72, (byte) 0xC0, (byte) 0xED, (byte) 0x7D, (byte) 0x68,
+        (byte) 0xC9, (byte) 0x2E, (byte) 0x0D, (byte) 0x62, (byte) 0x46, (byte) 0x17, (byte) 0x11, (byte) 0x4D, (byte) 0x6C, (byte) 0xC4, (byte) 0x7E, (byte) 0x53, (byte) 0xC1, (byte) 0x25, (byte) 0xC7, (byte) 0x9A,
+        (byte) 0x1C, (byte) 0x88, (byte) 0x58, (byte) 0x2C, (byte) 0x89, (byte) 0xDC, (byte) 0x02, (byte) 0x64, (byte) 0x40, (byte) 0x01, (byte) 0x5D, (byte) 0x38, (byte) 0xA5, (byte) 0xE2, (byte) 0xAF, (byte) 0x55,
+        (byte) 0xD5, (byte) 0xEF, (byte) 0x1A, (byte) 0x7C, (byte) 0xA7, (byte) 0x5B, (byte) 0xA6, (byte) 0x6F, (byte) 0x86, (byte) 0x9F, (byte) 0x73, (byte) 0xE6, (byte) 0x0A, (byte) 0xDE, (byte) 0x2B, (byte) 0x99,
+        (byte) 0x4A, (byte) 0x47, (byte) 0x9C, (byte) 0xDF, (byte) 0x09, (byte) 0x76, (byte) 0x9E, (byte) 0x30, (byte) 0x0E, (byte) 0xE4, (byte) 0xB2, (byte) 0x94, (byte) 0xA0, (byte) 0x3B, (byte) 0x34, (byte) 0x1D,
+        (byte) 0x28, (byte) 0x0F, (byte) 0x36, (byte) 0xE3, (byte) 0x23, (byte) 0xB4, (byte) 0x03, (byte) 0xD8, (byte) 0x90, (byte) 0xC8, (byte) 0x3C, (byte) 0xFE, (byte) 0x5E, (byte) 0x32, (byte) 0x24, (byte) 0x50,
+        (byte) 0x1F, (byte) 0x3A, (byte) 0x43, (byte) 0x8A, (byte) 0x96, (byte) 0x41, (byte) 0x74, (byte) 0xAC, (byte) 0x52, (byte) 0x33, (byte) 0xF0, (byte) 0xD9, (byte) 0x29, (byte) 0x80, (byte) 0xB1, (byte) 0x16,
+        (byte) 0xD3, (byte) 0xAB, (byte) 0x91, (byte) 0xB9, (byte) 0x84, (byte) 0x7F, (byte) 0x61, (byte) 0x1E, (byte) 0xCF, (byte) 0xC5, (byte) 0xD1, (byte) 0x56, (byte) 0x3D, (byte) 0xCA, (byte) 0xF4, (byte) 0x05,
+        (byte) 0xC6, (byte) 0xE5, (byte) 0x08, (byte) 0x49};
+
+    public MapleAESOFB(byte iv[], short mapleVersion) {
+        try {
+            cipher = Cipher.getInstance("AES");
+            cipher.init(Cipher.ENCRYPT_MODE, skey);
+        } catch (NoSuchAlgorithmException e) {
+            System.out.println("ERROR " + e);
+        } catch (NoSuchPaddingException e) {
+            System.out.println("ERROR " + e);
+        } catch (InvalidKeyException e) {
+            System.out.println("Error initializing the encryption cipher.  Make sure you're using the Unlimited Strength cryptography jar files.");
+        }
+        this.setIv(iv);
+        this.mapleVersion = (short) (((mapleVersion >> 8) & 0xFF) | ((mapleVersion << 8) & 0xFF00));
+    }
+
+    private void setIv(byte[] iv) {
+        this.iv = iv;
+    }
+
+    private static byte[] multiplyBytes(byte[] in, int count, int mul) {
+        byte[] ret = new byte[count * mul];
+        for (int x = 0; x < count * mul; x++) {
+            ret[x] = in[x % count];
+        }
+        return ret;
+    }
+
+    public synchronized byte[] crypt(byte[] data) {
+        int remaining = data.length;
+        int llength = 0x5B0;
+        int start = 0;
+        while (remaining > 0) {
+            byte[] myIv = multiplyBytes(this.iv, 4, 4);
+            if (remaining < llength) {
+                llength = remaining;
+            }
+            for (int x = start; x < (start + llength); x++) {
+                if ((x - start) % myIv.length == 0) {
+                    try {
+                        byte[] newIv = cipher.doFinal(myIv);
+                        for (int j = 0; j < myIv.length; j++) {
+                            myIv[j] = newIv[j];
+                        }
+                    } catch (IllegalBlockSizeException e) {
+                        e.printStackTrace();
+                    } catch (BadPaddingException e) {
+                        e.printStackTrace();
+                    }
+                }
+                data[x] ^= myIv[(x - start) % myIv.length];
+            }
+            start += llength;
+            remaining -= llength;
+            llength = 0x5B4;
+        }
+        updateIv();
+        return data;
+    }
+
+    private synchronized void updateIv() {
+        this.iv = getNewIv(this.iv);
+    }
+
+    public byte[] getPacketHeader(int length) {
+        int iiv = (iv[3]) & 0xFF;
+        iiv |= (iv[2] << 8) & 0xFF00;
+        iiv ^= mapleVersion;
+        int mlength = ((length << 8) & 0xFF00) | (length >>> 8);
+        int xoredIv = iiv ^ mlength;
+        byte[] ret = new byte[4];
+        ret[0] = (byte) ((iiv >>> 8) & 0xFF);
+        ret[1] = (byte) (iiv & 0xFF);
+        ret[2] = (byte) ((xoredIv >>> 8) & 0xFF);
+        ret[3] = (byte) (xoredIv & 0xFF);
+        return ret;
+    }
+
+    public static int getPacketLength(int packetHeader) {
+        int packetLength = ((packetHeader >>> 16) ^ (packetHeader & 0xFFFF));
+        packetLength = ((packetLength << 8) & 0xFF00) | ((packetLength >>> 8) & 0xFF);
+        return packetLength;
+    }
+
+    public boolean checkPacket(byte[] packet) {
+        return ((((packet[0] ^ iv[2]) & 0xFF) == ((mapleVersion >> 8) & 0xFF)) && (((packet[1] ^ iv[3]) & 0xFF) == (mapleVersion & 0xFF)));
+    }
+
+    public boolean checkPacket(int packetHeader) {
+        byte packetHeaderBuf[] = new byte[2];
+        packetHeaderBuf[0] = (byte) ((packetHeader >> 24) & 0xFF);
+        packetHeaderBuf[1] = (byte) ((packetHeader >> 16) & 0xFF);
+        return checkPacket(packetHeaderBuf);
+    }
+
+    public static byte[] getNewIv(byte oldIv[]) {
+        byte[] in = {(byte) 0xf2, 0x53, (byte) 0x50, (byte) 0xc6};
+        for (int x = 0; x < 4; x++) {
+            funnyShit(oldIv[x], in);
+        }
+        return in;
+    }
+
+    @Override
+    public String toString() {
+        return "IV: " + HexTool.toString(this.iv);
+    }
+
+    private static byte[] funnyShit(byte inputByte, byte[] in) {
+        byte elina = in[1];
+        byte anna = inputByte;
+        byte moritz = funnyBytes[(int) elina & 0xFF];
+        moritz -= inputByte;
+        in[0] += moritz;
+        moritz = in[2];
+        moritz ^= funnyBytes[(int) anna & 0xFF];
+        elina -= (int) moritz & 0xFF;
+        in[1] = elina;
+        elina = in[3];
+        moritz = elina;
+        elina -= (int) in[0] & 0xFF;
+        moritz = funnyBytes[(int) moritz & 0xFF];
+        moritz += inputByte;
+        moritz ^= in[2];
+        in[2] = moritz;
+        elina += (int) funnyBytes[(int) anna & 0xFF] & 0xFF;
+        in[3] = elina;
+        int merry = ((int) in[0]) & 0xFF;
+        merry |= (in[1] << 8) & 0xFF00;
+        merry |= (in[2] << 16) & 0xFF0000;
+        merry |= (in[3] << 24) & 0xFF000000;
+        int ret_value = merry;
+        ret_value = ret_value >>> 0x1d;
+        merry = merry << 3;
+        ret_value = ret_value | merry;
+        in[0] = (byte) (ret_value & 0xFF);
+        in[1] = (byte) ((ret_value >> 8) & 0xFF);
+        in[2] = (byte) ((ret_value >> 16) & 0xFF);
+        in[3] = (byte) ((ret_value >> 24) & 0xFF);
+        return in;
+    }
+}

src/main/java/tools/MapleLogger.java

@@ -0,0 +1,80 @@
+/*
+ This file is part of the OdinMS Maple Story Server
+ Copyright (C) 2008 ~ 2010 Patrick Huy <patrick.huy@frz.cc>
+ Matthias Butz <matze@odinms.de>
+ Jan Christian Meyer <vimes@odinms.de>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License version 3
+ as published by the Free Software Foundation. You may not use, modify
+ or distribute this program under any other version of the
+ GNU Affero General Public License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package tools;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import net.opcodes.RecvOpcode;
+import client.MapleCharacter;
+import client.MapleClient;
+
+/**
+ * Logs packets to console and file.
+ *
+ * @author Alan (SharpAceX)
+ */
+
+public class MapleLogger {
+
+        public static Set<Integer> monitored = new HashSet<>();
+        public static Set<Integer> ignored = new HashSet<>();
+    
+	public static void logRecv(MapleClient c, short packetId, Object message) {
+                MapleCharacter chr = c.getPlayer();
+		if (chr == null){
+			return;
+		}
+		if (!monitored.contains(chr.getId())){
+			return;
+		}
+		RecvOpcode op = getOpcodeFromValue(packetId);
+		if (isRecvBlocked(op)){
+			return;
+		}
+		String packet = op.toString() + "\r\n" + HexTool.toString((byte[]) message);
+		FilePrinter.printError(FilePrinter.PACKET_LOGS + c.getAccountName() + "-" + chr.getName() + ".txt", packet);
+	}
+	
+	private static final boolean isRecvBlocked(RecvOpcode op){
+		switch(op){
+		case MOVE_PLAYER:
+		case GENERAL_CHAT:
+		case TAKE_DAMAGE:
+		case MOVE_PET:
+		case MOVE_LIFE:
+		case NPC_ACTION:
+		case FACE_EXPRESSION:
+			return true;
+		default:
+			return false;
+		}
+	}
+	
+	private static final RecvOpcode getOpcodeFromValue(int value){
+		for (RecvOpcode op : RecvOpcode.values()){
+			if (op.getValue() == value){
+				return op;
+			}
+		}
+		return null;
+	}
+}

src/main/java/tools/Pair.java

@@ -0,0 +1,121 @@
+/*
+This file is part of the OdinMS Maple Story Server
+Copyright (C) 2008 ~ 2010 Patrick Huy <patrick.huy@frz.cc> 
+Matthias Butz <matze@odinms.de>
+Jan Christian Meyer <vimes@odinms.de>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License version 3
+as published by the Free Software Foundation. You may not use, modify
+or distribute this program under any other version of the
+GNU Affero General Public License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package tools;
+
+/**
+ * Represents a pair of values.
+ * 
+ * @author Frz
+ * @since Revision 333
+ * @version 1.0
+ * 
+ * @param <E> The type of the left value.
+ * @param <F> The type of the right value.
+ */
+public class Pair<E, F> {
+
+    public E left;
+    public F right;
+
+    /**
+     * Class constructor - pairs two objects together.
+     *
+     * @param left The left object.
+     * @param right The right object.
+     */
+    public Pair(E left, F right) {
+        this.left = left;
+        this.right = right;
+    }
+
+    /**
+     * Gets the left value.
+     *
+     * @return The left value.
+     */
+    public E getLeft() {
+        return left;
+    }
+
+    /**
+     * Gets the right value.
+     *
+     * @return The right value.
+     */
+    public F getRight() {
+        return right;
+    }
+
+    /**
+     * Turns the pair into a string.
+     *
+     * @return Each value of the pair as a string joined with a colon.
+     */
+    @Override
+    public String toString() {
+        return left.toString() + ":" + right.toString();
+    }
+
+    /**
+     * Gets the hash code of this pair.
+     */
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((left == null) ? 0 : left.hashCode());
+        result = prime * result + ((right == null) ? 0 : right.hashCode());
+        return result;
+    }
+
+    /**
+     * Checks to see if two pairs are equal.
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final Pair other = (Pair) obj;
+        if (left == null) {
+            if (other.left != null) {
+                return false;
+            }
+        } else if (!left.equals(other.left)) {
+            return false;
+        }
+        if (right == null) {
+            if (other.right != null) {
+                return false;
+            }
+        } else if (!right.equals(other.right)) {
+            return false;
+        }
+        return true;
+    }
+}

src/main/java/tools/Randomizer.java

@@ -0,0 +1,40 @@
+package tools;
+
+import java.util.Random;
+
+public class Randomizer {
+
+    private final static Random rand = new Random();
+
+    public static int nextInt() {
+	return rand.nextInt();
+    }
+
+    public static int nextInt(final int arg0) {
+	return rand.nextInt(arg0);
+    }
+
+    public static void nextBytes(final byte[] bytes) {
+	rand.nextBytes(bytes);
+    }
+
+    public static boolean nextBoolean() {
+	return rand.nextBoolean();
+    }
+
+    public static double nextDouble() {
+	return rand.nextDouble();
+    }
+
+    public static float nextFloat() {
+	return rand.nextFloat();
+    }
+
+    public static long nextLong() {
+	return rand.nextLong();
+    }
+
+    public static int rand(final int lbound, final int ubound) {
+	return (int) ((rand.nextDouble() * (ubound - lbound + 1)) + lbound);
+    }
+}

src/main/java/tools/StringUtil.java

@@ -0,0 +1,128 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+		       Matthias Butz <matze@odinms.de>
+		       Jan Christian Meyer <vimes@odinms.de>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package tools;
+
+public class StringUtil {
+	/**
+	 * Gets a string padded from the left to <code>length</code> by
+	 * <code>padchar</code>.
+	 *
+	 * @param in The input string to be padded.
+	 * @param padchar The character to pad with.
+	 * @param length The length to pad to.
+	 * @return The padded string.
+	 */
+	public static String getLeftPaddedStr(String in, char padchar, int length) {
+		StringBuilder builder = new StringBuilder(length);
+		for (int x = in.length(); x < length; x++) {
+			builder.append(padchar);
+		}
+		builder.append(in);
+		return builder.toString();
+	}
+
+	/**
+	 * Gets a string padded from the right to <code>length</code> by
+	 * <code>padchar</code>.
+	 *
+	 * @param in The input string to be padded.
+	 * @param padchar The character to pad with.
+	 * @param length The length to pad to.
+	 * @return The padded string.
+	 */
+	public static String getRightPaddedStr(String in, char padchar, int length) {
+		StringBuilder builder = new StringBuilder(in);
+		for (int x = in.length(); x < length; x++) {
+			builder.append(padchar);
+		}
+		return builder.toString();
+	}
+
+	/**
+	 * Joins an array of strings starting from string <code>start</code> with
+	 * a space.
+	 *
+	 * @param arr The array of strings to join.
+	 * @param start Starting from which string.
+	 * @return The joined strings.
+	 */
+	public static String joinStringFrom(String arr[], int start) {
+		return joinStringFrom(arr, start, " ");
+	}
+
+	/**
+	 * Joins an array of strings starting from string <code>start</code> with
+	 * <code>sep</code> as a seperator.
+	 *
+	 * @param arr The array of strings to join.
+	 * @param start Starting from which string.
+	 * @return The joined strings.
+	 */
+	public static String joinStringFrom(String arr[], int start, String sep) {
+		StringBuilder builder = new StringBuilder();
+		for (int i = start; i < arr.length; i++) {
+			builder.append(arr[i]);
+			if (i != arr.length - 1) {
+				builder.append(sep);
+			}
+		}
+		return builder.toString();
+	}
+
+	/**
+	 * Makes an enum name human readable (fixes spaces, capitalization, etc)
+	 *
+	 * @param enumName The name of the enum to neaten up.
+	 * @return The human-readable enum name.
+	 */
+	public static String makeEnumHumanReadable(String enumName) {
+		StringBuilder builder = new StringBuilder(enumName.length() + 1);
+		String[] words = enumName.split("_");
+		for (String word : words) {
+			if (word.length() <= 2) {
+				builder.append(word); // assume that it's an abbrevation
+			} else {
+				builder.append(word.charAt(0));
+				builder.append(word.substring(1).toLowerCase());
+			}
+			builder.append(' ');
+		}
+		return builder.substring(0, enumName.length());
+	}
+
+	/**
+	 * Counts the number of <code>chr</code>'s in <code>str</code>.
+	 *
+	 * @param str The string to check for instances of <code>chr</code>.
+	 * @param chr The character to check for.
+	 * @return The number of times <code>chr</code> occurs in <code>str</code>.
+	 */
+	public static int countCharacters(String str, char chr) {
+		int ret = 0;
+		for (int i = 0; i < str.length(); i++) {
+			if (str.charAt(i) == chr) {
+				ret++;
+			}
+		}
+		return ret;
+	}
+}

src/main/java/tools/data/input/ByteArrayByteStream.java

@@ -0,0 +1,72 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+		       Matthias Butz <matze@odinms.de>
+		       Jan Christian Meyer <vimes@odinms.de>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package tools.data.input;
+
+import java.io.IOException;
+import tools.HexTool;
+
+public class ByteArrayByteStream implements SeekableInputStreamBytestream {
+    private int pos = 0;
+    private long bytesRead = 0;
+    private byte[] arr;
+
+    public ByteArrayByteStream(byte[] arr) {
+        this.arr = arr;
+    }
+
+    @Override
+    public long getPosition() {
+        return pos;
+    }
+
+    @Override
+    public void seek(long offset) throws IOException {
+        pos = (int) offset;
+    }
+
+    @Override
+    public long getBytesRead() {
+        return bytesRead;
+    }
+
+    @Override
+    public int readByte() {
+        bytesRead++;
+        return ((int) arr[pos++]) & 0xFF;
+    }
+
+    @Override
+    public String toString() {
+        String nows = "kevintjuh93 pwns";//I lol'd
+        if (arr.length - pos > 0) {
+            byte[] now = new byte[arr.length - pos];
+            System.arraycopy(arr, pos, now, 0, arr.length - pos);
+            nows = HexTool.toString(now);
+        }
+        return "All: " + HexTool.toString(arr) + "\nNow: " + nows;
+    }
+  
+    @Override
+    public long available() {
+        return arr.length - pos;
+    }
+}

src/main/java/tools/data/input/ByteInputStream.java

@@ -0,0 +1,35 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+		       Matthias Butz <matze@odinms.de>
+		       Jan Christian Meyer <vimes@odinms.de>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package tools.data.input;
+
+/**
+ * Represents an abstract stream of bytes.
+ * 
+ * @author Frz
+ * @version 1.0
+ * @since Revision 323
+ */
+public interface ByteInputStream {
+    int readByte();
+    long getBytesRead();
+    long available();
+}

src/main/java/tools/data/input/GenericLittleEndianAccessor.java

@@ -0,0 +1,239 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+		       Matthias Butz <matze@odinms.de>
+		       Jan Christian Meyer <vimes@odinms.de>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package tools.data.input;
+
+import java.awt.Point;
+import java.io.ByteArrayOutputStream;
+
+/**
+ * Provides a generic interface to a Little Endian stream of bytes.
+ *
+ * @version 1.0
+ * @author Frz
+ * @since Revision 323
+ */
+public class GenericLittleEndianAccessor implements LittleEndianAccessor {
+    private ByteInputStream bs;
+
+    /**
+     * Class constructor - Wraps the accessor around a stream of bytes.
+     *
+     * @param bs The byte stream to wrap the accessor around.
+     */
+    public GenericLittleEndianAccessor(ByteInputStream bs) {
+        this.bs = bs;
+    }
+
+    /**
+     * Read a single byte from the stream.
+     *
+     * @return The byte read.
+     * @see tools.data.input.ByteInputStream#readByte
+     */
+    @Override
+    public byte readByte() {
+        return (byte) bs.readByte();
+    }
+
+    /**
+     * Reads an integer from the stream.
+     *
+     * @return The integer read.
+     */
+    @Override
+    public int readInt() {
+        return bs.readByte() + (bs.readByte() << 8) + (bs.readByte() << 16) + (bs.readByte() << 24);
+    }
+
+    /**
+     * Reads a short integer from the stream.
+     *
+     * @return The short read.
+     */
+    @Override
+    public short readShort() {
+        return (short) (bs.readByte() + (bs.readByte() << 8));
+    }
+
+    /**
+     * Reads a single character from the stream.
+     *
+     * @return The character read.
+     */
+    @Override
+    public char readChar() {
+        return (char) readShort();
+    }
+
+    /**
+     * Reads a long integer from the stream.
+     *
+     * @return The long integer read.
+     */
+    @Override
+    public long readLong() {
+        long byte1 = bs.readByte();
+        long byte2 = bs.readByte();
+        long byte3 = bs.readByte();
+        long byte4 = bs.readByte();
+        long byte5 = bs.readByte();
+        long byte6 = bs.readByte();
+        long byte7 = bs.readByte();
+        long byte8 = bs.readByte();
+        return (byte8 << 56) + (byte7 << 48) + (byte6 << 40) + (byte5 << 32) + (byte4 << 24) + (byte3 << 16) + (byte2 << 8) + byte1;
+    }
+
+    /**
+     * Reads a floating point integer from the stream.
+     *
+     * @return The float-type integer read.
+     */
+    @Override
+    public float readFloat() {
+        return Float.intBitsToFloat(readInt());
+    }
+
+    /**
+     * Reads a double-precision integer from the stream.
+     *
+     * @return The double-type integer read.
+     */
+    @Override
+    public double readDouble() {
+        return Double.longBitsToDouble(readLong());
+    }
+
+    /**
+     * Reads an ASCII string from the stream with length <code>n</code>.
+     *
+     * @param n Number of characters to read.
+     * @return The string read.
+     */
+    public final String readAsciiString(int n) {
+        char ret[] = new char[n];
+        for (int x = 0; x < n; x++) {
+            ret[x] = (char) readByte();
+        }
+        return String.valueOf(ret);
+    }
+
+    /**
+     * Reads a null-terminated string from the stream.
+     *
+     * @return The string read.
+     */
+    public final String readNullTerminatedAsciiString() {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        byte b;
+        while (true) {
+            b = readByte();
+            if (b == 0) {
+                break;
+            }
+            baos.write(b);
+        }
+        byte[] buf = baos.toByteArray();
+        char[] chrBuf = new char[buf.length];
+        for (int x = 0; x < buf.length; x++) {
+            chrBuf[x] = (char) buf[x];
+        }
+        return String.valueOf(chrBuf);
+    }
+
+    /**
+     * Gets the number of bytes read from the stream so far.
+     *
+     * @return A long integer representing the number of bytes read.
+     * @see tools.data.input.ByteInputStream#getBytesRead()
+     */
+    public long getBytesRead() {
+        return bs.getBytesRead();
+    }
+
+    /**
+     * Reads a MapleStory convention lengthed ASCII string.
+     * This consists of a short integer telling the length of the string,
+     * then the string itself.
+     *
+     * @return The string read.
+     */
+    @Override
+    public String readMapleAsciiString() {
+        return readAsciiString(readShort());
+    }
+
+    /**
+     * Reads <code>num</code> bytes off the stream.
+     *
+     * @param num The number of bytes to read.
+     * @return An array of bytes with the length of <code>num</code>
+     */
+    @Override
+    public byte[] read(int num) {
+        byte[] ret = new byte[num];
+        for (int x = 0; x < num; x++) {
+            ret[x] = readByte();
+        }
+        return ret;
+    }
+
+    /**
+     * Reads a MapleStory Position information.
+     * This consists of 2 short integer.
+     *
+     * @return The Position read.
+     */
+    @Override
+    public final Point readPos() {
+	final int x = readShort();
+	final int y = readShort();
+	return new Point(x, y);
+    }
+
+    /**
+     * Skips the current position of the stream <code>num</code> bytes ahead.
+     *
+     * @param num Number of bytes to skip.
+     */
+    @Override
+    public void skip(int num) {
+        for (int x = 0; x < num; x++) {
+            readByte();
+        }
+    }
+
+    /**
+     * @see tools.data.input.ByteInputStream#available
+     */
+    @Override
+    public long available() {
+        return bs.available();
+    }
+
+    /**
+     * @see java.lang.Object#toString
+     */
+    @Override
+    public String toString() {
+        return bs.toString();
+    }
+}

src/main/java/tools/data/input/GenericSeekableLittleEndianAccessor.java

@@ -0,0 +1,91 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+		       Matthias Butz <matze@odinms.de>
+		       Jan Christian Meyer <vimes@odinms.de>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package tools.data.input;
+
+import java.io.IOException;
+
+/**
+ * Provides an abstract accessor to a generic Little Endian byte stream. This
+ * accessor is seekable.
+ * 
+ * @author Frz
+ * @version 1.0
+ * @since Revision 323
+ * @see tools.data.input.GenericLittleEndianAccessor
+ */
+public class GenericSeekableLittleEndianAccessor extends GenericLittleEndianAccessor implements SeekableLittleEndianAccessor {
+    private SeekableInputStreamBytestream bs;
+
+    /**
+     * Class constructor
+     * Provide a seekable input stream to wrap this object around.
+     *
+     * @param bs The byte stream to wrap this around.
+     */
+    public GenericSeekableLittleEndianAccessor(SeekableInputStreamBytestream bs) {
+        super(bs);
+        this.bs = bs;
+    }
+
+    /**
+     * Seek the pointer to <code>offset</code>
+     *
+     * @param offset The offset to seek to.
+     * @see tools.data.input.SeekableInputStreamBytestream#seek
+     */
+    @Override
+    public void seek(long offset) {
+        try {
+            bs.seek(offset);
+        } catch (IOException e) {
+            e.printStackTrace();
+            System.out.println("Seek failed " + e);
+        }
+    }
+
+    /**
+     * Get the current position of the pointer.
+     *
+     * @return The current position of the pointer as a long integer.
+     * @see tools.data.input.SeekableInputStreamBytestream#getPosition
+     */
+    @Override
+    public long getPosition() {
+        try {
+            return bs.getPosition();
+        } catch (IOException e) {
+            e.printStackTrace();
+            System.out.println("getPosition failed" + e);
+            return -1;
+        }
+    }
+
+    /**
+     * Skip <code>num</code> number of bytes in the stream.
+     *
+     * @param num The number of bytes to skip.
+     */
+    @Override
+    public void skip(int num) {
+        seek(getPosition() + num);
+    }
+}

src/main/java/tools/data/input/InputStreamByteStream.java

@@ -0,0 +1,93 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+		       Matthias Butz <matze@odinms.de>
+		       Jan Christian Meyer <vimes@odinms.de>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package tools.data.input;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Provides an abstract wrapper to a stream of bytes.
+ * 
+ * @author Frz
+ * @version 1.0
+ * @since Revision 323
+ */
+public class InputStreamByteStream implements ByteInputStream {
+    private InputStream is;
+    private long read = 0;
+
+    /**
+     * Class constructor.
+     * Provide an input stream to wrap this around.
+     *
+     * @param is The input stream to wrap this object around.
+     */
+    public InputStreamByteStream(InputStream is) {
+        this.is = is;
+    }
+
+    /**
+     * Reads the next byte from the stream.
+     *
+     * @return Then next byte in the stream.
+     */
+    @Override
+    public int readByte() {
+        int temp;
+        try {
+            temp = is.read();
+            if (temp == -1) {
+                throw new RuntimeException("EOF");
+            }
+            read++;
+            return temp;
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Gets the number of bytes read from the stream.
+     *
+     * @return The number of bytes read as a long integer.
+     */
+    @Override
+    public long getBytesRead() {
+        return read;
+    }
+
+    /**
+     * Returns the number of bytes left in the stream.
+     *
+     * @return The number of bytes available for reading as a long integer.
+     */
+    @Override
+    public long available() {
+        try {
+            return is.available();
+        } catch (IOException e) {
+            e.printStackTrace();
+            System.out.println("ERROR" + e);
+            return 0;
+        }
+    }
+}

src/main/java/tools/data/input/LittleEndianAccessor.java

@@ -0,0 +1,45 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+		       Matthias Butz <matze@odinms.de>
+		       Jan Christian Meyer <vimes@odinms.de>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package tools.data.input;
+
+import java.awt.Point;
+
+/**
+ * @author Frz
+ */
+public interface LittleEndianAccessor {
+    byte readByte();
+    char readChar();
+    short readShort();
+    int readInt();
+    Point readPos();
+    long readLong();
+    void skip(int num);
+    byte[] read(int num);
+    float readFloat();
+    double readDouble();
+    String readAsciiString(int n);
+    String readNullTerminatedAsciiString();
+    String readMapleAsciiString();
+    long getBytesRead();
+    long available();
+}

src/main/java/tools/data/input/RandomAccessByteStream.java

@@ -0,0 +1,84 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+		       Matthias Butz <matze@odinms.de>
+		       Jan Christian Meyer <vimes@odinms.de>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package tools.data.input;
+
+import java.io.IOException;
+import java.io.RandomAccessFile;
+
+/**
+ * Provides an abstract layer to a byte stream. This layer can be accessed
+ * randomly.
+ * 
+ * @author Frz
+ * @version 1.0
+ * @since Revision 323
+ */
+public class RandomAccessByteStream implements SeekableInputStreamBytestream {
+    private RandomAccessFile raf;
+    private long read = 0;
+
+    public RandomAccessByteStream(RandomAccessFile raf) {
+        super();
+        this.raf = raf;
+    }
+
+    @Override
+    public int readByte() {
+        int temp;
+        try {
+            temp = raf.read();
+            if (temp == -1) {
+                throw new RuntimeException("EOF");
+            }
+            read++;
+            return temp;
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void seek(long offset) throws IOException {
+        raf.seek(offset);
+    }
+
+    @Override
+    public long getPosition() throws IOException {
+        return raf.getFilePointer();
+    }
+
+    @Override
+    public long getBytesRead() {
+        return read;
+    }
+
+    @Override
+    public long available() {
+        try {
+            return raf.length() - raf.getFilePointer();
+        } catch (IOException e) {
+            e.printStackTrace();
+            System.out.println("ERROR " + e);
+            return 0;
+        }
+    }
+}

src/main/java/tools/data/input/SeekableInputStreamBytestream.java

@@ -0,0 +1,51 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+		       Matthias Butz <matze@odinms.de>
+		       Jan Christian Meyer <vimes@odinms.de>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package tools.data.input;
+
+import java.io.IOException;
+
+/**
+ * Provides an abstract interface to a stream of bytes. This stream can be
+ * seeked.
+ * 
+ * @author Frz
+ * @version 1.0
+ * @since 299
+ */
+public interface SeekableInputStreamBytestream extends ByteInputStream {
+    /**
+     * Seeks the stream by the specified offset.
+     *
+     * @param offset
+     *            Number of bytes to seek.
+     * @throws IOException
+     */
+    void seek(long offset) throws IOException;
+
+    /**
+     * Gets the current position of the stream.
+     *
+     * @return The stream position as a long integer.
+     * @throws IOException
+     */
+    long getPosition() throws IOException;
+}

src/main/java/tools/data/input/SeekableLittleEndianAccessor.java

@@ -0,0 +1,27 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+		       Matthias Butz <matze@odinms.de>
+		       Jan Christian Meyer <vimes@odinms.de>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package tools.data.input;
+
+public interface SeekableLittleEndianAccessor extends LittleEndianAccessor {
+    void seek(long offset);
+    long getPosition();
+}

src/main/java/tools/data/output/BAOSByteOutputStream.java

@@ -0,0 +1,56 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+		       Matthias Butz <matze@odinms.de>
+		       Jan Christian Meyer <vimes@odinms.de>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package tools.data.output;
+
+import java.io.ByteArrayOutputStream;
+
+/**
+ * Uses a byte array to output a stream of bytes.
+ * 
+ * @author Frz
+ * @version 1.0
+ * @since Revision 352
+ */
+class BAOSByteOutputStream implements ByteOutputStream {
+    private ByteArrayOutputStream baos;
+
+    /**
+     * Class constructor - Wraps the stream around a Java BAOS.
+     *
+     * @param baos <code>The ByteArrayOutputStream</code> to wrap this around.
+     */
+    BAOSByteOutputStream(ByteArrayOutputStream baos) {
+        super();
+        this.baos = baos;
+    }
+
+    /**
+     * Writes a byte to the stream.
+     *
+     * @param b The byte to write to the stream.
+     * @see tools.data.output.ByteOutputStream#writeByte(byte)
+     */
+    @Override
+    public void writeByte(byte b) {
+        baos.write(b);
+    }
+}

src/main/java/tools/data/output/ByteOutputStream.java

@@ -0,0 +1,38 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+		       Matthias Butz <matze@odinms.de>
+		       Jan Christian Meyer <vimes@odinms.de>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package tools.data.output;
+
+/**
+ * Provides an interface to an output stream of bytes.
+ * 
+ * @author Frz
+ * @since Revision 323
+ * @version 1.0
+ */
+interface ByteOutputStream {
+    /**
+     * Writes a byte to the stream.
+     *
+     * @param b The byte to write.
+     */
+    void writeByte(byte b);
+}

src/main/java/tools/data/output/GenericLittleEndianWriter.java

@@ -0,0 +1,184 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+		       Matthias Butz <matze@odinms.de>
+		       Jan Christian Meyer <vimes@odinms.de>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package tools.data.output;
+
+import java.awt.Point;
+import java.nio.charset.Charset;
+import constants.string.CharsetConstants.MapleLanguageType;
+
+/**
+ * Provides a generic writer of a little-endian sequence of bytes.
+ * 
+ * @author Frz
+ * @version 1.0
+ * @since Revision 323
+ */
+public class GenericLittleEndianWriter implements LittleEndianWriter {
+    private static Charset ASCII = Charset.forName(MapleLanguageType.LANGUAGE_US.getAscii());
+    private ByteOutputStream bos;
+
+    /**
+     * Class constructor - Protected to prevent instantiation with no arguments.
+     */
+    protected GenericLittleEndianWriter() {
+        // Blah!
+    }
+
+    /**
+     * Sets the byte-output stream for this instance of the object.
+     *
+     * @param bos The new output stream to set.
+     */
+    void setByteOutputStream(ByteOutputStream bos) {
+        this.bos = bos;
+    }
+
+    /**
+     * Write an array of bytes to the stream.
+     *
+     * @param b The bytes to write.
+     */
+    @Override
+    public void write(byte[] b) {
+        for (int x = 0; x < b.length; x++) {
+            bos.writeByte(b[x]);
+        }
+    }
+
+    /**
+     * Write a byte to the stream.
+     *
+     * @param b The byte to write.
+     */
+    @Override
+    public void write(byte b) {
+        bos.writeByte(b);
+    }
+
+    /**
+     * Write a byte in integer form to the stream.
+     *
+     * @param b The byte as an <code>Integer</code> to write.
+     */
+    @Override
+    public void write(int b) {
+        bos.writeByte((byte) b);
+    }
+
+    @Override
+    public void skip(int b) {
+        write(new byte[b]);
+    }
+
+    /**
+     * Write a short integer to the stream.
+     *
+     * @param i The short integer to write.
+     */
+    @Override
+    public void writeShort(int i) {
+        bos.writeByte((byte) (i & 0xFF));
+        bos.writeByte((byte) ((i >>> 8) & 0xFF));
+    }
+    
+    /**
+     * Writes an integer to the stream.
+     *
+     * @param i The integer to write.
+     */
+    @Override
+    public void writeInt(int i) {
+        bos.writeByte((byte) (i & 0xFF));
+        bos.writeByte((byte) ((i >>> 8) & 0xFF));
+        bos.writeByte((byte) ((i >>> 16) & 0xFF));
+        bos.writeByte((byte) ((i >>> 24) & 0xFF));
+    }
+
+    /**
+     * Writes an ASCII string the the stream.
+     *
+     * @param s The ASCII string to write.
+     */
+    @Override
+    public void writeAsciiString(String s) {
+        write(s.getBytes(ASCII));
+    }
+
+    /**
+     * Writes a maple-convention ASCII string to the stream.
+     *
+     * @param s The ASCII string to use maple-convention to write.
+     */
+    @Override
+    public void writeMapleAsciiString(String s) {
+        writeShort((short) s.length());
+        writeAsciiString(s);
+    }
+
+    /**
+     * Writes a null-terminated ASCII string to the stream.
+     *
+     * @param s The ASCII string to write.
+     */
+    @Override
+    public void writeNullTerminatedAsciiString(String s) {
+        writeAsciiString(s);
+        write(0);
+    }
+
+    /**
+     * Write a long integer to the stream.
+     * @param l The long integer to write.
+     */
+    @Override
+    public void writeLong(long l) {
+        bos.writeByte((byte) (l & 0xFF));
+        bos.writeByte((byte) ((l >>> 8) & 0xFF));
+        bos.writeByte((byte) ((l >>> 16) & 0xFF));
+        bos.writeByte((byte) ((l >>> 24) & 0xFF));
+        bos.writeByte((byte) ((l >>> 32) & 0xFF));
+        bos.writeByte((byte) ((l >>> 40) & 0xFF));
+        bos.writeByte((byte) ((l >>> 48) & 0xFF));
+        bos.writeByte((byte) ((l >>> 56) & 0xFF));
+    }
+
+    /**
+     * Writes a 2D 4 byte position information
+     *
+     * @param s The Point position to write.
+     */
+    @Override
+    public void writePos(Point s) {
+        writeShort(s.x);
+        writeShort(s.y);
+    }
+
+    /**
+     * Writes a boolean true ? 1 : 0
+     *
+     * @param b The boolean to write.
+     */
+    @Override
+    public void writeBool(final boolean b) {
+        write(b ? 1 : 0);
+    }
+}

src/main/java/tools/data/output/LittleEndianWriter.java

@@ -0,0 +1,114 @@
+/*
+ This file is part of the OdinMS Maple Story Server
+ Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+ Matthias Butz <matze@odinms.de>
+ Jan Christian Meyer <vimes@odinms.de>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation version 3 as published by
+ the Free Software Foundation. You may not use, modify or distribute
+ this program under any other version of the GNU Affero General Public
+ License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package tools.data.output;
+
+import java.awt.Point;
+
+/**
+ * Provides an interface to a writer class that writes a little-endian sequence
+ * of bytes.
+ *
+ * @author Frz
+ * @version 1.0
+ * @since Revision 323
+ */
+public interface LittleEndianWriter {
+
+    /**
+     * Write an array of bytes to the sequence.
+     *
+     * @param b The bytes to write.
+     */
+    public void write(byte b[]);
+
+    /**
+     * Write a byte to the sequence.
+     *
+     * @param b The byte to write.
+     */
+    public void write(byte b);
+
+    /**
+     * Write a byte in integer form to the sequence.
+     *
+     * @param b The byte as an <code>Integer</code> to write.
+     */
+    public void write(int b);
+
+    public void skip(int b);
+
+    /**
+     * Writes an integer to the sequence.
+     *
+     * @param i The integer to write.
+     */
+    public void writeInt(int i);
+
+    /**
+     * Write a short integer to the sequence.
+     *
+     * @param s The short integer to write.
+     */
+    public void writeShort(int s);
+
+    /**
+     * Write a long integer to the sequence.
+     *
+     * @param l The long integer to write.
+     */
+    public void writeLong(long l);
+
+    /**
+     * Writes an ASCII string the the sequence.
+     *
+     * @param s The ASCII string to write.
+     */
+    void writeAsciiString(String s);
+
+    /**
+     * Writes a null-terminated ASCII string to the sequence.
+     *
+     * @param s The ASCII string to write.
+     */
+    void writeNullTerminatedAsciiString(String s);
+
+    /**
+     * Writes a maple-convention ASCII string to the sequence.
+     *
+     * @param s The ASCII string to use maple-convention to write.
+     */
+    void writeMapleAsciiString(String s);
+
+    /**
+     * Writes a 2D 4 byte position information
+     *
+     * @param s The Point position to write.
+     */
+    void writePos(Point s);
+
+    /**
+     * Writes a boolean true ? 1 : 0
+     *
+     * @param b The boolean to write.
+     */
+    void writeBool(final boolean b);
+}

src/main/java/tools/data/output/MaplePacketLittleEndianWriter.java

@@ -0,0 +1,73 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+		       Matthias Butz <matze@odinms.de>
+		       Jan Christian Meyer <vimes@odinms.de>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package tools.data.output;
+
+import java.io.ByteArrayOutputStream;
+import tools.HexTool;
+
+/**
+ * Writes a maplestory-packet little-endian stream of bytes.
+ * 
+ * @author Frz
+ * @version 1.0
+ * @since Revision 352
+ */
+public class MaplePacketLittleEndianWriter extends GenericLittleEndianWriter {
+    private ByteArrayOutputStream baos;
+
+    /**
+     * Constructor - initializes this stream with a default size.
+     */
+    public MaplePacketLittleEndianWriter() {
+        this(32);
+    }
+
+    /**
+     * Constructor - initializes this stream with size <code>size</code>.
+     *
+     * @param size The size of the underlying stream.
+     */
+    public MaplePacketLittleEndianWriter(int size) {
+        this.baos = new ByteArrayOutputStream(size);
+        setByteOutputStream(new BAOSByteOutputStream(baos));
+    }
+
+    /**
+     * Gets a <code>MaplePacket</code> instance representing this
+     * sequence of bytes.
+     *
+     * @return A <code>MaplePacket</code> with the bytes in this stream.
+     */
+    public byte[] getPacket() {
+        return baos.toByteArray();
+    }
+
+    /**
+     * Changes this packet into a human-readable hexadecimal stream of bytes.
+     *
+     * @return This packet as hex digits.
+     */
+    @Override
+    public String toString() {
+        return HexTool.toString(baos.toByteArray());
+    }
+}

src/main/java/tools/exceptions/EmptyMovementException.java

@@ -0,0 +1,35 @@
+/*
+    This file is part of the HeavenMS MapleStory Server
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package tools.exceptions;
+
+import tools.data.input.LittleEndianAccessor;
+
+
+/**
+ *
+ * @author Ronan
+ */
+public class EmptyMovementException extends Exception {
+    
+    public EmptyMovementException(LittleEndianAccessor lea) {
+        super("Empty movement: " + lea);
+    }
+
+}

src/main/java/tools/exceptions/EventInstanceInProgressException.java

@@ -0,0 +1,35 @@
+/*
+    This file is part of the HeavenMS MapleStory Server
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package tools.exceptions;
+
+
+/**
+ *
+ * @author Ronan
+ */
+public class EventInstanceInProgressException extends Exception {
+    
+    public static String EIIP_KEY = "Event instance ";
+    
+    public EventInstanceInProgressException(String eventName, String eventInstance) {
+        super(EIIP_KEY + "already in progress - " + eventName + ", EM: " + eventInstance);
+    }
+
+}

src/main/java/tools/exceptions/IdTypeNotSupportedException.java

@@ -0,0 +1,11 @@
+package tools.exceptions;
+
+public class IdTypeNotSupportedException extends Exception {
+    public IdTypeNotSupportedException() {
+        super("The given ID type is not supported");
+    }
+
+    public IdTypeNotSupportedException(String message) {
+        super(message);
+    }
+}

src/main/java/tools/exceptions/NotEnabledException.java

@@ -0,0 +1,12 @@
+package tools.exceptions;
+
+public class NotEnabledException extends RuntimeException {
+
+    public NotEnabledException() {
+        super("Feature not enabled, please enable the feature in ServerConstant");
+    }
+
+    public NotEnabledException(String message) {
+        super(message);
+    }
+}

src/main/java/tools/packets/Fishing.java

@@ -0,0 +1,199 @@
+/*
+    This file is part of the HeavenMS MapleStory Server
+    Copyleft (L) 2016 - 2019 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package tools.packets;
+
+import client.MapleCharacter;
+import config.YamlConfig;
+import constants.game.GameConstants;
+import constants.inventory.ItemConstants;
+import server.MapleItemInformationProvider;
+import tools.MaplePacketCreator;
+
+import java.util.Calendar;
+
+/** 
+ * 
+ * @author FateJiki (RaGeZONE)
+ * @author Ronan - timing pattern
+ */ 
+public class Fishing { 
+    
+    private static double getFishingLikelihood(int x) {
+        return 50.0 + 7.0 * (7.0 * Math.sin(x)) * (Math.cos(Math.pow(x, 0.777)));
+    }
+    
+    public static double[] fetchFishingLikelihood() {
+        Calendar calendar = Calendar.getInstance();
+        int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
+        
+        int hours = calendar.get(Calendar.HOUR);
+        int minutes = calendar.get(Calendar.MINUTE);
+        int seconds = calendar.get(Calendar.SECOND);
+        
+        double yearLikelihood = getFishingLikelihood(dayOfYear);
+        double timeLikelihood = getFishingLikelihood(hours + minutes + seconds);
+        
+        return new double[]{yearLikelihood, timeLikelihood};
+    }
+    
+    private static boolean hitFishingTime(MapleCharacter chr, int baitLevel, double yearLikelihood, double timeLikelihood) {
+        double baitLikelihood = 0.0002 * chr.getWorldServer().getFishingRate() * baitLevel;   // can improve 10.0 at "max level 50000" on rate 1x
+        
+        if (YamlConfig.config.server.USE_DEBUG) {
+            chr.dropMessage(5, "----- FISHING RESULT -----");
+            chr.dropMessage(5, "Likelihoods - Year: " + yearLikelihood + " Time: " + timeLikelihood + " Meso: " + baitLikelihood);
+            chr.dropMessage(5, "Score rolls - Year: " + (0.23 * yearLikelihood) + " Time: " + (0.77 * timeLikelihood) + " Meso: " + baitLikelihood);
+        }
+        
+        return (0.23 * yearLikelihood) + (0.77 * timeLikelihood) + (baitLikelihood) > 57.777;
+    }
+    
+    public static void doFishing(MapleCharacter chr, int baitLevel, double yearLikelihood, double timeLikelihood){
+        // thanks Fadi, Vcoc for suggesting a custom fishing system
+        
+        if (!chr.isLoggedinWorld() || !chr.isAlive()) {
+            return;
+        }
+        
+        if (!GameConstants.isFishingArea(chr.getMapId())) {
+            chr.dropMessage("You are not in a fishing area!");
+            return;
+        }
+        
+        if (chr.getLevel() < 30) {
+            chr.dropMessage(5, "You must be above level 30 to fish!");
+            return;
+        }
+        
+        String fishingEffect;
+        if (!hitFishingTime(chr, baitLevel, yearLikelihood, timeLikelihood)) {
+            fishingEffect = "Effect/BasicEff.img/Catch/Fail";
+        } else {
+            String rewardStr = "";
+            fishingEffect = "Effect/BasicEff.img/Catch/Success";
+            
+            int rand = (int)(3.0 * Math.random()); 
+            switch(rand){ 
+                case 0:
+                    int mesoAward = (int)(1400.0 * Math.random() + 1201) * chr.getMesoRate() + (15 * chr.getLevel() / 5);
+                    chr.gainMeso(mesoAward, true, true, true);
+                    
+                    rewardStr = mesoAward + " mesos.";
+                    break; 
+                case 1:
+                    int expAward = (int)(645.0 * Math.random() + 620.0) * chr.getExpRate() + (15 * chr.getLevel() / 4); 
+                    chr.gainExp(expAward, true, true);
+                    
+                    rewardStr = expAward + " EXP.";
+                    break; 
+                case 2:
+                    int itemid = getRandomItem();
+                    rewardStr = "a(n) " + MapleItemInformationProvider.getInstance().getName(itemid) + ".";
+                    
+                    if (chr.canHold(itemid)) {
+                        chr.getAbstractPlayerInteraction().gainItem(itemid, true);
+                    } else {
+                        chr.showHint("Couldn't catch a(n) #r" + MapleItemInformationProvider.getInstance().getName(itemid) + "#k due to #e#b" + ItemConstants.getInventoryType(itemid) + "#k#n inventory limit.");
+                        rewardStr += ".. but has goofed up due to full inventory.";
+                    }
+                    break; 
+            } 
+            
+            chr.getMap().dropMessage(6, chr.getName() + " found " + rewardStr);
+        }
+
+        chr.announce(MaplePacketCreator.showInfo(fishingEffect));
+        chr.getMap().broadcastMessage(chr, MaplePacketCreator.showForeignInfo(chr.getId(), fishingEffect), false);
+    } 
+    
+    public static int getRandomItem(){ 
+        int rand = (int)(100.0 * Math.random()); 
+        int[] commons = {1002851, 2002020, 2002020, 2000006, 2000018, 2002018, 2002024, 2002027, 2002027, 2000018, 2000018, 2000018, 2000018, 2002030, 2002018, 2000016}; // filler' up 
+        int[] uncommons = {1000025, 1002662, 1002812, 1002850, 1002881, 1002880, 1012072, 4020009, 2043220, 2043022, 2040543, 2044420, 2040943, 2043713, 2044220, 2044120, 2040429, 2043220, 2040943}; // filler' uptoo 
+        int[] rares = {1002859, 1002553, 1002762, 1002763, 1002764, 1002765, 1002766, 1002663, 1002788, 1002949, 2049100, 2340000, 2040822, 2040822, 2040822, 2040822}; // filler' uplast 
+        
+        if(rand >= 25){ 
+            return commons[(int)(commons.length * Math.random())]; 
+        } else if(rand <= 7 && rand >= 4){ 
+            return uncommons[(int)(uncommons.length * Math.random())]; 
+        } else { 
+            return rares[(int)(rares.length * Math.random())]; 
+        }
+    }
+    
+    private static void debugFishingLikelihood() {
+        long a[] = new long[365], b[] = new long[365];
+        long hits = 0, hits10 = 0, total = 0;
+        
+        for (int i = 0; i < 365; i++) {
+            double yearLikelihood = getFishingLikelihood(i);
+            
+            int dayHits = 0, dayHits10 = 0;
+            for (int k = 0; k < 24; k++) {
+                for (int l = 0; l < 60; l++) {
+                    for (int m = 0; m < 60; m++) {
+                        double timeLikelihood = getFishingLikelihood(k + l + m);
+                        
+                        if ((0.23 * yearLikelihood) + (0.77 * timeLikelihood) > 57.777) {
+                            hits++;
+                            dayHits++;
+                        }
+                        
+                        if ((0.23 * yearLikelihood) + (0.77 * timeLikelihood) + 10.0 > 57.777) {
+                            hits10++;
+                            dayHits10++;
+                        }
+                        
+                        total++;
+                    }
+                }
+            }
+            
+            a[i] = dayHits;
+            b[i] = dayHits10;
+        }
+        
+        long maxhit = 0, minhit = Long.MAX_VALUE;
+        for (int i = 0; i < 365; i++) {
+            if (maxhit < a[i]) {
+                maxhit = a[i];
+            }
+            
+            if (minhit > a[i]) {
+                minhit = a[i];
+            }
+        }
+        
+        long maxhit10 = 0, minhit10 = Long.MAX_VALUE;
+        for (int i = 0; i < 365; i++) {
+            if (maxhit10 < b[i]) {
+                maxhit10 = b[i];
+            }
+            
+            if (minhit10 > b[i]) {
+                minhit10 = b[i];
+            }
+        }
+        
+        System.out.println("Diary   min " + minhit + " max " + maxhit);
+        System.out.println("Diary10 min " + minhit10 + " max " + maxhit10);
+        System.out.println("Hits: " + hits + "Hits10: " + hits10 + " Total: " + total + "   --  %1000: " + (hits * 1000 / total) + ", +10 %1000: " + (hits10 * 1000 / total));
+    }
+} 

src/main/java/tools/packets/Wedding.java

@@ -0,0 +1,426 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package tools.packets;
+
+import client.inventory.Item;
+import client.MapleCharacter;
+import java.util.ArrayList;
+import java.util.List;
+import tools.MaplePacketCreator;
+import tools.StringUtil;
+import tools.data.output.MaplePacketLittleEndianWriter;
+
+/**
+ * CField_Wedding, CField_WeddingPhoto, CWeddingMan, OnMarriageResult, and all Wedding/Marriage enum/structs.
+ * 
+ * @author Eric
+ * 
+ * Wishlists edited by Drago (Dragohe4rt)
+ */
+public class Wedding extends MaplePacketCreator {
+    private static final short MARRIAGE_REQUEST = 0x48;
+    private static final short MARRIAGE_RESULT = 0x49;
+    private static final short WEDDING_GIFT_RESULT = 0x4A;
+    private static final short NOTIFY_MARRIED_PARTNER_MAP_TRANSFER = 0x4B;
+    private static final short WEDDING_PHOTO = 0x2B;
+    private static final short WEDDING_PROGRESS = 0x140;
+    private static final short WEDDING_CEREMONY_END = 0x141;
+    
+    /*
+        00000000 CWeddingMan     struc ; (sizeof=0x104)
+        00000000 vfptr           dd ?                    ; offset
+        00000004 ___u1           $01CBC6800BD386B8A8FD818EAD990BEC ?
+        0000000C m_mCharIDToMarriageNo ZMap<unsigned long,unsigned long,unsigned long> ?
+        00000024 m_mReservationPending ZMap<unsigned long,ZRef<GW_WeddingReservation>,unsigned long> ?
+        0000003C m_mReservationPendingGroom ZMap<unsigned long,ZRef<CUser>,unsigned long> ?
+        00000054 m_mReservationPendingBride ZMap<unsigned long,ZRef<CUser>,unsigned long> ?
+        0000006C m_mReservationStartUser ZMap<unsigned long,unsigned long,unsigned long> ?
+        00000084 m_mReservationCompleted ZMap<unsigned long,ZRef<GW_WeddingReservation>,unsigned long> ?
+        0000009C m_mGroomWishList ZMap<unsigned long,ZRef<ZArray<ZXString<char> > >,unsigned long> ?
+        000000B4 m_mBrideWishList ZMap<unsigned long,ZRef<ZArray<ZXString<char> > >,unsigned long> ?
+        000000CC m_mEngagementPending ZMap<unsigned long,ZRef<GW_MarriageRecord>,unsigned long> ?
+        000000E4 m_nCurrentWeddingState dd ?
+        000000E8 m_dwCurrentWeddingNo dd ?
+        000000EC m_dwCurrentWeddingMap dd ?
+        000000F0 m_bIsReservationLoaded dd ?
+        000000F4 m_dwNumGuestBless dd ?
+        000000F8 m_bPhotoSuccess dd ?
+        000000FC m_tLastUpdate   dd ?
+        00000100 m_bStartWeddingCeremony dd ?
+        00000104 CWeddingMan     ends
+    */
+    
+    public class Field_Wedding {
+        public int m_nNoticeCount;
+        public int m_nCurrentStep;
+        public int m_nBlessStartTime;
+    }
+    
+    public class Field_WeddingPhoto {
+        public boolean m_bPictureTook;
+    }
+    
+    public class GW_WeddingReservation {
+        public int dwReservationNo;
+        public int dwGroom, dwBride;
+        public String sGroomName, sBrideName;
+        public int usWeddingType;
+    }
+    
+    public class WeddingWishList {
+        public MapleCharacter pUser;
+        public int dwMarriageNo;
+        public int nGender;
+        public int nWLType;
+        public int nSlotCount;
+        public List<String> asWishList = new ArrayList<>();
+        public int usModifiedFlag; // dword
+        public boolean bLoaded;
+    }
+    
+    public class GW_WeddingWishList {
+        public final int WEDDINGWL_MAX = 0xA; // enum WEDDINGWL
+        public int dwReservationNo;
+        public byte nGender;
+        public String sItemName;
+    }
+    
+    public enum MarriageStatus {
+        SINGLE(0x0),
+        ENGAGED(0x1),
+        RESERVED(0x2),
+        MARRIED(0x3);
+        private int ms;
+        private MarriageStatus(int ms) {
+            this.ms = ms;
+        }
+        
+        public int getMarriageStatus() {
+            return ms;
+        }
+    }
+    
+    public enum MarriageRequest {
+        AddMarriageRecord(0x0),
+        SetMarriageRecord(0x1),
+        DeleteMarriageRecord(0x2),
+        LoadReservation(0x3),
+        AddReservation(0x4),
+        DeleteReservation(0x5),
+        GetReservation(0x6);
+        private int req;
+        private MarriageRequest(int req) {
+            this.req = req;
+        }
+        
+        public int getMarriageRequest() {
+            return req;
+        }
+    }
+    
+    public enum WeddingType {
+        CATHEDRAL(0x1),
+        VEGAS(0x2),
+        CATHEDRAL_PREMIUM(0xA),
+        CATHEDRAL_NORMAL(0xB),
+        VEGAS_PREMIUM(0x14),
+        VEGAS_NORMAL(0x15);
+        private int wt;
+        private WeddingType(int wt) {
+            this.wt = wt;
+        }
+        
+        public int getType() {
+            return wt;
+        }
+    }
+    
+    public enum WeddingMap {
+        WEDDINGTOWN(680000000),
+        CHAPEL_STARTMAP(680000110),
+        CATHEDRAL_STARTMAP(680000210),
+        PHOTOMAP(680000300),
+        EXITMAP(680000500);
+        private int wm;
+        private WeddingMap(int wm) {
+            this.wm = wm;
+        }
+        
+        public int getMap() {
+            return wm;
+        }
+    }
+    
+    public enum WeddingItem {
+        WR_MOONSTONE(1112803), // Wedding Ring
+        WR_STARGEM(1112806),
+        WR_GOLDENHEART(1112807),
+        WR_SILVERSWAN(1112809),
+        ERB_MOONSTONE(2240000), // Engagement Ring Box
+        ERB_STARGEM(2240001),
+        ERB_GOLDENHEART(2240002),
+        ERB_SILVERSWAN(2240003),
+        ERBE_MOONSTONE(4031357), // Engagement Ring Box (Empty)
+        ER_MOONSTONE(4031358), // Engagement Ring
+        ERBE_STARGEM(4031359),
+        ER_STARGEM(4031360),
+        ERBE_GOLDENHEART(4031361),
+        ER_GOLDENHEART(4031362),
+        ERBE_SILVERSWAN(4031363),
+        ER_SILVERSWAN(4031364),
+        PARENTS_BLESSING(4031373), // Parents Blessing
+        OFFICIATORS_PERMISSION(4031374), // Officiator's Permission
+        WR_CATHEDRAL_PREMIUM(4031375), // Wedding Ring?
+        WR_VEGAS_PREMIUM(4031376),
+        IB_VEGAS(4031377),      // toSend invitation
+        IB_CATHEDRAL(4031395),  // toSend invitation
+        IG_VEGAS(4031406),      // rcvd invitation
+        IG_CATHEDRAL(4031407),  // rcvd invitation
+        OB_FORCOUPLE(4031424), // Onyx Box? For Couple
+        WR_CATHEDRAL_NORMAL(4031480), // Wedding Ring?
+        WR_VEGAS_NORMAL(4031481),
+        WT_CATHEDRAL_NORMAL(5251000), // Wedding Ticket
+        WT_VEGAS_NORMAL(5251001),
+        WT_VEGAS_PREMIUM(5251002),
+        WT_CATHEDRAL_PREMIUM(5251003);
+        private int wi;
+        private WeddingItem(int wi) {
+            this.wi = wi;
+        }
+        
+        public int getItem() {
+            return wi;
+        }
+    }
+    
+    /**
+     * <name> has requested engagement. Will you accept this proposal?
+     * 
+     *    @param name
+     *    @param playerid
+     *    @return mplew
+     */
+    public static byte[] OnMarriageRequest(String name, int playerid) {
+        MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
+        mplew.writeShort(MARRIAGE_REQUEST);
+        mplew.write(0); //mode, 0 = engage, 1 = cancel, 2 = answer.. etc
+        mplew.writeMapleAsciiString(name); // name
+        mplew.writeInt(playerid); // playerid
+        return mplew.getPacket();
+    }
+    
+    /**
+     * A quick rundown of how (I think based off of enough BMS searching) WeddingPhoto_OnTakePhoto works:
+     * - We send this packet with (first) the Groom / Bride IGNs
+     * - We then send a fieldId (unsure about this part at the moment, 90% sure it's the id of the map)
+     * - After this, we write an integer of the amount of characters within the current map (which is the Cake Map -- exclude users within Exit Map)
+     * - Once we've retrieved the size of the characters, we begin to write information about them (Encode their name, guild, etc info)
+     * - Now that we've Encoded our character data, we begin to Encode the ScreenShotPacket which requires a TemplateID, IGN, and their positioning
+     * - Finally, after encoding all of our data, we send this packet out to a MapGen application server
+     * - The MapGen server will then retrieve the packet byte array and convert the bytes into a ImageIO 2D JPG output
+     * - The result after converting into a JPG will then be remotely uploaded to /weddings/ with ReservedGroomName_ReservedBrideName to be displayed on the web server.
+     * 
+     * - Will no longer continue Wedding Photos, needs a WvsMapGen :(
+     * 
+     *    @param ReservedGroomName The groom IGN of the wedding
+     *    @param ReservedBrideName The bride IGN of the wedding
+     *    @param m_dwField The current field id (the id of the cake map, ex. 680000300)
+     *    @param m_uCount The current user count (equal to m_dwUsers.size)
+     *    @param m_dwUsers The List of all MapleCharacter guests within the current cake map to be encoded
+     *    @return mplew (MaplePacket) Byte array to be converted and read for byte[]->ImageIO
+     */
+    public static byte[] OnTakePhoto(String ReservedGroomName, String ReservedBrideName, int m_dwField, List<MapleCharacter> m_dwUsers) { // OnIFailedAtWeddingPhotos
+        MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
+        mplew.writeShort(WEDDING_PHOTO); // v53 header, convert -> v83
+        mplew.writeMapleAsciiString(ReservedGroomName);
+        mplew.writeMapleAsciiString(ReservedBrideName);
+        mplew.writeInt(m_dwField); // field id?
+        mplew.writeInt(m_dwUsers.size());
+        
+        for (MapleCharacter guest : m_dwUsers) {
+            // Begin Avatar Encoding
+            addCharLook(mplew, guest, false); // CUser::EncodeAvatar
+            mplew.writeInt(30000); // v20 = *(_DWORD *)(v13 + 2192) -- new groom marriage ID??
+            mplew.writeInt(30000); // v20 = *(_DWORD *)(v13 + 2192) -- new bride marriage ID??
+            mplew.writeMapleAsciiString(guest.getName());
+            mplew.writeMapleAsciiString(guest.getGuildId() > 0 && guest.getGuild() != null ? guest.getGuild().getName() : "");
+            mplew.writeShort(guest.getGuildId() > 0 && guest.getGuild() != null ? guest.getGuild().getLogoBG() : 0);
+            mplew.write(guest.getGuildId() > 0 && guest.getGuild() != null ? guest.getGuild().getLogoBGColor() : 0);
+            mplew.writeShort(guest.getGuildId() > 0 && guest.getGuild() != null ? guest.getGuild().getLogo() : 0);
+            mplew.write(guest.getGuildId() > 0 && guest.getGuild() != null ? guest.getGuild().getLogoColor() : 0);
+            mplew.writeShort(guest.getPosition().x); // v18 = *(_DWORD *)(v13 + 3204);
+            mplew.writeShort(guest.getPosition().y); // v20 = *(_DWORD *)(v13 + 3208);
+            // Begin Screenshot Encoding
+            mplew.write(1); // // if ( *(_DWORD *)(v13 + 288) ) { COutPacket::Encode1(&thisa, v20);
+            // CPet::EncodeScreenShotPacket(*(CPet **)(v13 + 288), &thisa);
+            mplew.writeInt(1); // dwTemplateID
+            mplew.writeMapleAsciiString(guest.getName()); // m_sName
+            mplew.writeShort(guest.getPosition().x); // m_ptCurPos.x
+            mplew.writeShort(guest.getPosition().y); // m_ptCurPos.y
+            mplew.write(guest.getStance()); // guest.m_bMoveAction
+        }
+        
+        return mplew.getPacket();
+    }
+    
+    /**
+     * Enable spouse chat and their engagement ring without @relog
+     * 
+     *    @param marriageId
+     *    @param chr
+     *    @param wedding
+     *    @return mplew
+     */
+    public static byte[] OnMarriageResult(int marriageId, MapleCharacter chr, boolean wedding) {
+        MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
+        mplew.writeShort(MARRIAGE_RESULT);
+        mplew.write(11);
+        mplew.writeInt(marriageId);
+        mplew.writeInt(chr.getGender() == 0 ? chr.getId() : chr.getPartnerId());
+        mplew.writeInt(chr.getGender() == 0 ? chr.getPartnerId() : chr.getId());
+        mplew.writeShort(wedding ? 3 : 1);
+        if (wedding) {
+            mplew.writeInt(chr.getMarriageItemId());
+            mplew.writeInt(chr.getMarriageItemId());
+        } else {
+            mplew.writeInt(1112803); // Engagement Ring's Outcome (doesn't matter for engagement)
+            mplew.writeInt(1112803); // Engagement Ring's Outcome (doesn't matter for engagement)
+        }
+        mplew.writeAsciiString(StringUtil.getRightPaddedStr(chr.getGender() == 0 ? chr.getName() : MapleCharacter.getNameById(chr.getPartnerId()), '\0', 13));
+        mplew.writeAsciiString(StringUtil.getRightPaddedStr(chr.getGender() == 0 ? MapleCharacter.getNameById(chr.getPartnerId()) : chr.getName(), '\0', 13));
+        
+        return mplew.getPacket();
+    }
+    
+    /**
+     * To exit the Engagement Window (Waiting for her response...), we send a GMS-like pop-up.
+     * 
+     *    @param msg
+     *    @return mplew
+     */
+    public static byte[] OnMarriageResult(final byte msg) {
+        MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
+        mplew.writeShort(MARRIAGE_RESULT);
+        mplew.write(msg);
+        if (msg == 36) {
+            mplew.write(1);
+            mplew.writeMapleAsciiString("You are now engaged.");
+        }
+        return mplew.getPacket();
+    }
+    
+    /**
+     * The World Map includes 'loverPos' in which this packet controls
+     * 
+     *    @param partner
+     *    @param mapid
+     *    @return mplew
+     */
+    public static byte[] OnNotifyWeddingPartnerTransfer(int partner, int mapid) {
+        MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
+        mplew.writeShort(NOTIFY_MARRIED_PARTNER_MAP_TRANSFER);
+        mplew.writeInt(mapid);
+        mplew.writeInt(partner);
+        
+        return mplew.getPacket();
+    }
+    
+    /**
+     * The wedding packet to display Pelvis Bebop and enable the Wedding Ceremony Effect between two characters
+     * CField_Wedding::OnWeddingProgress - Stages
+     * CField_Wedding::OnWeddingCeremonyEnd - Wedding Ceremony Effect
+     * 
+     *    @param SetBlessEffect
+     *    @param groom
+     *    @param bride
+     *    @param step
+     *    @return mplew
+     */
+    public static byte[] OnWeddingProgress(boolean SetBlessEffect, int groom, int bride, byte step) {
+        MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
+        mplew.writeShort(SetBlessEffect ? WEDDING_CEREMONY_END : WEDDING_PROGRESS);
+        if (!SetBlessEffect) { // in order for ceremony packet to send, byte step = 2 must be sent first
+            mplew.write(step);
+        }
+        mplew.writeInt(groom);
+        mplew.writeInt(bride);
+        return mplew.getPacket();
+    }
+    
+    /**
+     * When we open a Wedding Invitation, we display the Bride & Groom
+     * 
+     *    @param groom
+     *    @param bride
+     *    @return mplew
+     */
+    public static byte[] sendWeddingInvitation(String groom, String bride) {
+        MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
+        mplew.writeShort(MARRIAGE_RESULT);
+        mplew.write(15);
+        mplew.writeMapleAsciiString(groom);
+        mplew.writeMapleAsciiString(bride);
+        mplew.writeShort(1); // 0 = Cathedral Normal?, 1 = Cathedral Premium?, 2 = Chapel Normal?
+        return mplew.getPacket();
+    }
+    
+    public static byte[] sendWishList() { // fuck my life
+        MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
+        mplew.writeShort(MARRIAGE_REQUEST);
+        mplew.write(9);
+        return mplew.getPacket();
+    }
+
+    /**
+     * Handles all of WeddingWishlist packets 
+     * 
+     *    @param mode
+     *    @param itemnames
+     *    @param items
+     *    @return mplew
+     */
+    public static byte[] OnWeddingGiftResult(byte mode, List<String> itemnames, List<Item> items) {
+        MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
+        mplew.writeShort(WEDDING_GIFT_RESULT);
+        mplew.write(mode);
+        switch (mode) {
+            case 0xC: // 12 : You cannot give more than one present for each wishlist 
+            case 0xE: // 14 : Failed to send the gift.
+                break;
+            
+            case 0x09: { // Load Wedding Registry
+                mplew.write(itemnames.size());
+                for (String names : itemnames) {
+                    mplew.writeMapleAsciiString(names);
+                }
+                break;
+            }
+            case 0xA: // Load Bride's Wishlist 
+            case 0xF: // 10, 15, 16 = CWishListRecvDlg::OnPacket
+            case 0xB: { // Add Item to Wedding Registry 
+                // 11 : You have sent a gift | | 13 : Failed to send the gift. | 
+                if (mode == 0xB) {
+                    mplew.write(itemnames.size());
+                    for (String names : itemnames) {
+                        mplew.writeMapleAsciiString(names);
+                    }
+                }
+                mplew.writeLong(32);
+                mplew.write(items.size());
+                for (Item item : items) {
+                    addItemInfo(mplew, item, true);
+                }
+                break;
+            }
+            default: {
+                System.out.println("Unknown Wishlist Mode: " + mode);
+                break;
+            }
+        }
+        return mplew.getPacket();
+    }
+}