- //
- // 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.
-
- /**
- * Gets the instance value.
- * @return The instance.
- */
- public static EncryptionManager getInstance() {
- return INSTANCE;
- }
-
- /**
- * BCrypt implements OpenBSD-style Blowfish password hashing using
- * the scheme described in "A Future-Adaptable Password Scheme" by
- * Niels Provos and David Mazieres.
- *
- * 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.
- *
- * Usage is really simple. To hash a password for the first time,
- * call the hashpw method with a random salt, like this:
- *
- *
- * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt());
- *
- *
- * To check whether a plaintext password matches one that has been
- * hashed previously, use the checkpw method:
- *
- *
- * if (BCrypt.checkpw(candidate_password, stored_hash))
- * System.out.println("It matches");
- * else
- * System.out.println("It does not match");
- *
- *
- * The gensalt() method takes an optional parameter (log_rounds)
- * that determines the computational complexity of the hashing:
- *
- *
- * String strong_salt = BCrypt.gensalt(10)
- * String stronger_salt = BCrypt.gensalt(12)
- *
- *
- * 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 31.
- *
- * @author Damien Miller
- * @version 0.2
- */
- public static 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"
- 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;
- StringBuffer rs = new StringBuffer();
- 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 by 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 > 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 decoded bytes
- * @throws IllegalArgumentException if maxolen is invalid
- */
- private static byte[] decode_base64(String s, int maxolen)
- throws IllegalArgumentException {
- StringBuffer rs = new StringBuffer();
- 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
- * @return the next word of material from data
- */
- private static int streamtoword(byte data[], int offp[]) {
- int i;
- int word = 0;
- int off = offp[0];
-
- for (i = 0; i < 4; i++) {
- word = (word << 8) | (data[off] & 0xff);
- off = (off + 1) % data.length;
- }
-
- offp[0] = off;
- return word;
- }
-
- /**
- * 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
- */
- private void key(byte key[]) {
- int i;
- int koffp[] = { 0 };
- int lr[] = { 0, 0 };
- int plen = P.length, slen = S.length;
-
- for (i = 0; i < plen; i++)
- P[i] = P[i] ^ streamtoword(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
- */
- private void ekskey(byte data[], byte key[]) {
- int i;
- int koffp[] = { 0 }, doffp[] = { 0 };
- int lr[] = { 0, 0 };
- int plen = P.length, slen = S.length;
-
- for (i = 0; i < plen; i++)
- P[i] = P[i] ^ streamtoword(key, koffp);
-
- 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
- * @return an array containing the binary hashed password
- */
- private byte[] crypt_raw(byte password[], byte salt[], int log_rounds) {
- int rounds, i, j;
- int cdata[] = (int[])bf_crypt_ciphertext.clone();
- int clen = cdata.length;
- byte ret[];
-
- if (log_rounds < 4 || log_rounds > 31)
- 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);
- for (i = 0; i < rounds; i++) {
- key(password);
- key(salt);
- }
-
- 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;
- }
-
- /**
- * 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) {
- BCrypt B;
- String real_salt;
- byte passwordb[], saltb[], hashed[];
- char minor = (char)0;
- int rounds, off = 0;
- StringBuffer rs = new StringBuffer();
-
- 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' || 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);
- try {
- passwordb = (password + (minor >= 'a' ? "\000" : "")).getBytes("UTF-8");
- } catch (UnsupportedEncodingException uee) {
- throw new AssertionError("UTF-8 is not supported");
- }
-
- saltb = decode_base64(real_salt, BCRYPT_SALT_LEN);
-
- B = new BCrypt();
- hashed = B.crypt_raw(passwordb, saltb, rounds);
-
- rs.append("$2");
- if (minor >= 'a')
- rs.append(minor);
- rs.append("$");
- if (rounds < 10)
- rs.append("0");
- 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 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
- */
- public static String gensalt(int log_rounds, SecureRandom random) {
- StringBuffer rs = new StringBuffer();
- byte rnd[] = new byte[BCRYPT_SALT_LEN];
-
- random.nextBytes(rnd);
-
- rs.append("$2a$");
- if (log_rounds < 10)
- rs.append("0");
- 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 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
- */
- public static String gensalt(int log_rounds) {
- 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
- */
- public static String gensalt() {
- 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) {
- return (hashed.compareTo(hashpw(plaintext, hashed)) == 0);
- }
- }
-
-}
diff --git a/Management-Server/src/main/java/ms/system/util/ManagementConfigParser.kt b/Management-Server/src/main/java/ms/system/util/ManagementConfigParser.kt
deleted file mode 100644
index 90c0ce80f..000000000
--- a/Management-Server/src/main/java/ms/system/util/ManagementConfigParser.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package ms.system.util
-
-import org.json.simple.JSONObject
-import org.json.simple.parser.JSONParser
-import java.io.File
-import java.io.FileReader
-import kotlin.system.exitProcess
-
-/**
- * Class for parsing the server config, I.E default.conf
- * @param path the path to the JSON file to parse.
- * @author Ceikry
- */
-class ManagementConfigParser(path: String) {
- val pathTo = parsePath(path)
- val confFile = File(pathTo)
- val parser = JSONParser()
- var reader: FileReader? = null
- var data: JSONObject? = null
-
- init {
- if(!confFile.canonicalFile.exists()){
- println("Could not find ${confFile.canonicalFile} - Double check your working directory!")
- exitProcess(0)
- } else if(!pathTo.contains(".json")) {
- println("Config file MUST be a JSON file!!")
- println("(Got $pathTo)")
- } else {
- reader = FileReader(pathTo)
- data = parser.parse(reader) as JSONObject
- parseDatabaseInformation()
- parseWorldTechnicalSettings()
- ManagementConstants.SECRET_KEY = data!!["secret_key"].toString()
- }
- }
-
- private fun parseDatabaseInformation(){
- data ?: return
- val dbData = data!!["DatabaseInformation"] as JSONObject
- ManagementConstants.parseDBProp(dbData)
- }
-
- private fun parseWorldTechnicalSettings(){
- data ?: return
- val wtiData = data!!["WorldTechnicalInformation"] as JSONObject
- ManagementConstants.parseWTIProp(wtiData)
- }
-
- /**
- * Parses a path string
- * @author Ceikry
- * @param pathString The string to parse
- * @return a String with the proper file separators for the current OS.
- */
- fun parsePath(pathString: String): String {
- var pathTokens: List? = null
- if(pathString.contains("/"))
- pathTokens = pathString.split("/")
- else if(pathString.contains("\\"))
- pathTokens = pathString.split("\\")
-
- pathTokens ?: return pathString //return the initial pathString if path does not contain file separators.
- var pathProduct = ""
- for(token in pathTokens){
- if(token != "")
- pathProduct += "$token${File.separator}"
- }
-
- return pathProduct
- }
-}
diff --git a/Management-Server/src/main/java/ms/system/util/ManagementConstants.kt b/Management-Server/src/main/java/ms/system/util/ManagementConstants.kt
deleted file mode 100644
index 01d40fb5a..000000000
--- a/Management-Server/src/main/java/ms/system/util/ManagementConstants.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package ms.system.util
-
-import org.json.simple.JSONObject
-
-object ManagementConstants {
-
- //MySQL main database name
- var DATABASE_NAME: String = "global"
-
- //MySQL database username
- var DATABASE_USERNAME: String = "root"
-
- //MySQL database password
- var DATABASE_PASSWORD: String = ""
-
- //MySQL host
- var DATABASE_HOST_ADDRESS: String = "127.0.0.1"
-
- //MySQL port
- var DATABASE_PORT: Int = 3306
-
- //Max amount of worlds supported on the world list
- var MAX_WORLD_AMOUNT: Int = 10
-
- //User world hop delay in seconds
- var WORLD_HOP_DELAY: Long = 20_000L
-
- @JvmStatic
- var SECRET_KEY: String = ""
-
- fun parseDBProp(data: JSONObject) {
- DATABASE_NAME = data["database_name"].toString()
- DATABASE_USERNAME = data["database_username"].toString()
- DATABASE_PASSWORD = data["database_password"].toString()
- DATABASE_HOST_ADDRESS = data["database_host"].toString()
- DATABASE_PORT = data["database_port"].toString().toInt()
- }
-
- fun parseWTIProp(data: JSONObject) {
- MAX_WORLD_AMOUNT = data["world_limit"].toString().toInt()
- WORLD_HOP_DELAY = data["worldhop_delay"].toString().toLong()
- }
-
-}
\ No newline at end of file
diff --git a/Management-Server/src/main/java/ms/system/util/PlayerDatabaseGen.java b/Management-Server/src/main/java/ms/system/util/PlayerDatabaseGen.java
deleted file mode 100644
index e4187f7ee..000000000
--- a/Management-Server/src/main/java/ms/system/util/PlayerDatabaseGen.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package ms.system.util;
-
-/**
- * Handles generating a player database.
- * @author Emperor
- *
- */
-public final class PlayerDatabaseGen {
-
- /**
- * The main method.
- * @param args The arguments.
- */
- public static void main(String[] args) {
- // TODO Auto-generated method stub
-
- }
-
-}
\ No newline at end of file
diff --git a/Management-Server/src/main/java/ms/system/util/StringUtils.java b/Management-Server/src/main/java/ms/system/util/StringUtils.java
deleted file mode 100644
index 2a85aea8f..000000000
--- a/Management-Server/src/main/java/ms/system/util/StringUtils.java
+++ /dev/null
@@ -1,640 +0,0 @@
-package ms.system.util;
-
-import java.text.DecimalFormat;
-
-import ms.net.packet.IoBuffer;
-
-/**
- * The string utils.
- * @author Emperor
- *
- */
-public final class StringUtils {
-
- /**
- * The valid characters to be used in names/messages/...
- */
- private static final char[] VALID_CHARS = {
- '_', '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'
- };
- /**
- * The an int array241.
- */
- private final static int[] anIntArray241 = { 215, 203, 83, 158, 104, 101, 93, 84,
- 107, 103, 109, 95, 94, 98, 89, 86, 70, 41, 32, 27, 24, 23, -1, -2,
- 26, -3, -4, 31, 30, -5, -6, -7, 37, 38, 36, -8, -9, -10, 40, -11,
- -12, 55, 48, 46, 47, -13, -14, -15, 52, 51, -16, -17, 54, -18, -19,
- 63, 60, 59, -20, -21, 62, -22, -23, 67, 66, -24, -25, 69, -26, -27,
- 199, 132, 80, 77, 76, -28, -29, 79, -30, -31, 87, 85, -32, -33,
- -34, -35, -36, 197, -37, 91, -38, 134, -39, -40, -41, 97, -42, -43,
- 133, 106, -44, 117, -45, -46, 139, -47, -48, 110, -49, -50, 114,
- 113, -51, -52, 116, -53, -54, 135, 138, 136, 129, 125, 124, -55,
- -56, 130, 128, -57, -58, -59, 183, -60, -61, -62, -63, -64, 148,
- -65, -66, 153, 149, 145, 144, -67, -68, 147, -69, -70, -71, 152,
- 154, -72, -73, -74, 157, 171, -75, -76, 207, 184, 174, 167, 166,
- 165, -77, -78, -79, 172, 170, -80, -81, -82, 178, -83, 177, 182,
- -84, -85, 187, 181, -86, -87, -88, -89, 206, 221, -90, 189, -91,
- 198, 254, 262, 195, 196, -92, -93, -94, -95, -96, 252, 255, 250,
- -97, 211, 209, -98, -99, 212, -100, 213, -101, -102, -103, 224,
- -104, 232, 227, 220, 226, -105, -106, 246, 236, -107, 243, -108,
- -109, 231, 237, 235, -110, -111, 239, 238, -112, -113, -114, -115,
- -116, 241, -117, 244, -118, -119, 248, -120, 249, -121, -122, -123,
- 253, -124, -125, -126, -127, 259, 258, -128, -129, 261, -130, -131,
- 390, 327, 296, 281, 274, 271, 270, -132, -133, 273, -134, -135,
- 278, 277, -136, -137, 280, -138, -139, 289, 286, 285, -140, -141,
- 288, -142, -143, 293, 292, -144, -145, 295, -146, -147, 312, 305,
- 302, 301, -148, -149, 304, -150, -151, 309, 308, -152, -153, 311,
- -154, -155, 320, 317, 316, -156, -157, 319, -158, -159, 324, 323,
- -160, -161, 326, -162, -163, 359, 344, 337, 334, 333, -164, -165,
- 336, -166, -167, 341, 340, -168, -169, 343, -170, -171, 352, 349,
- 348, -172, -173, 351, -174, -175, 356, 355, -176, -177, 358, -178,
- -179, 375, 368, 365, 364, -180, -181, 367, -182, -183, 372, 371,
- -184, -185, 374, -186, -187, 383, 380, 379, -188, -189, 382, -190,
- -191, 387, 386, -192, -193, 389, -194, -195, 454, 423, 408, 401,
- 398, 397, -196, -197, 400, -198, -199, 405, 404, -200, -201, 407,
- -202, -203, 416, 413, 412, -204, -205, 415, -206, -207, 420, 419,
- -208, -209, 422, -210, -211, 439, 432, 429, 428, -212, -213, 431,
- -214, -215, 436, 435, -216, -217, 438, -218, -219, 447, 444, 443,
- -220, -221, 446, -222, -223, 451, 450, -224, -225, 453, -226, -227,
- 486, 471, 464, 461, 460, -228, -229, 463, -230, -231, 468, 467,
- -232, -233, 470, -234, -235, 479, 476, 475, -236, -237, 478, -238,
- -239, 483, 482, -240, -241, 485, -242, -243, 499, 495, 492, 491,
- -244, -245, 494, -246, -247, 497, -248, 502, -249, 506, 503, -250,
- -251, 505, -252, -253, 508, -254, 510, -255, -256, 0 };
-
- /**
- * Constructs a new {@code StringUtils.java} {@code Object}.
- */
- public StringUtils() {
- /**
- * empty.
- */
- }
- /**
- * Method used to get the formatted number as a string from the integer inputed.
- * @param amount the ammount.
- * @return the string value.
- */
- public static String getFormattedNumber(int amount) {
- return new DecimalFormat("#,###,##0").format(amount).toString();
- }
- /**
- * Checks if the string contains an invalid character.
- * @param nameThe string.
- * @return {@code True} if so.
- */
- public static boolean containsInvalidCharacter(String name) {
- for (char c : name.toCharArray()) {
- boolean pass = false;
- for (char vc : VALID_CHARS)
- if (vc == c) {
- pass = true;
- break;
- }
- if (!pass)
- return true;
- }
- return false;
- }
- /**
- * If a word starts with a e i o u h for grammar = a + n.
- * @param word The word.
- * @return If the a should have +n {@code true}.
- */
- public static boolean isPlusN(String word) {
- if (word == null)
- return false;
- String s = word.toLowerCase();
- return s.charAt(0) == 'a' || s.charAt(0) == 'e' || s.charAt(0) == 'i'
- || s.charAt(0) == 'o' || s.charAt(0) == 'u'
- || (s.charAt(0) == 'h' && s.length() > 1 && s.charAt(1) != 'e');
- }
- /**
- * Method used to get the player name as a long.
- * @param s the string.
- * @return the long.
- */
- public static long getPlayerNameLong(String s) {
- long l = 0L;
- for(int i = 0; i < s.length() && i < 12; i++) {
- char c = s.charAt(i);
- l *= 37L;
- if(c >= 'A' && c <= 'Z') l += (1 + c) - 65;
- else if(c >= 'a' && c <= 'z') l += (1 + c) - 97;
- else if(c >= '0' && c <= '9') l += (27 + c) - 48;
- }
- while(l % 37L == 0L && l != 0L) l /= 37L;
- return l;
- }
-
- /**
- * Method used to convert the string to a long.
- * @param s the string.
- * @return the long.
- */
- public static long convertStringToLong(String s) {
- if (s.length() > 20) {
- throw new IllegalArgumentException("String is too long: " + s);
- }
- long out = 0L;
- for (int i = 0; i < s.length(); ++i) {
- long m = reducedMapping(s.codePointAt(i));
- if (m == -1) {
- throw new IllegalArgumentException("Unmapped Character in String: " + s);
- }
- m <<= ((9 - i) * 6) + 4;
- out |= m;
- }
- return out;
- }
-
- /**
- * Formats the string as display name.
- * @param name The string to format.
- * @return The formatted name.
- */
- public static String formatDisplayName(String name) {
- name = name.replaceAll("_", " ");
- name = name.toLowerCase();
- StringBuilder newName = new StringBuilder();
- boolean wasSpace = true;
- for (int i = 0; i < name.length(); i++) {
- if (wasSpace) {
- newName.append(("" + name.charAt(i)).toUpperCase());
- wasSpace = false;
- } else {
- newName.append(name.charAt(i));
- }
- if (name.charAt(i) == ' ') {
- wasSpace = true;
- }
- }
- return newName.toString();
- }
-
- /**
- * Gets the byte for the character.
- * @param c The character.
- * @return The byte.
- */
- private static final byte getByte(char c) {
- byte charByte;
- if (c > 0 && c < '\200' || c >= '\240' && c <= '\377')
- charByte = (byte) c;
- else if (c != '\u20AC') {
- if (c != '\u201A') {
- if (c != '\u0192') {
- if (c == '\u201E')
- charByte = -124;
- else if (c != '\u2026') {
- if (c != '\u2020') {
- if (c == '\u2021')
- charByte = -121;
- else if (c == '\u02C6')
- charByte = -120;
- else if (c == '\u2030')
- charByte = -119;
- else if (c == '\u0160')
- charByte = -118;
- else if (c == '\u2039')
- charByte = -117;
- else if (c == '\u0152')
- charByte = -116;
- else if (c != '\u017D') {
- if (c == '\u2018')
- charByte = -111;
- else if (c != '\u2019') {
- if (c != '\u201C') {
- if (c == '\u201D')
- charByte = -108;
- else if (c != '\u2022') {
- if (c == '\u2013')
- charByte = -106;
- else if (c == '\u2014')
- charByte = -105;
- else if (c == '\u02DC')
- charByte = -104;
- else if (c == '\u2122')
- charByte = -103;
- else if (c != '\u0161') {
- if (c == '\u203A')
- charByte = -101;
- else if (c != '\u0153') {
- if (c == '\u017E')
- charByte = -98;
- else if (c != '\u0178')
- charByte = 63;
- else
- charByte = -97;
- } else
- charByte = -100;
- } else
- charByte = -102;
- } else
- charByte = -107;
- } else
- charByte = -109;
- } else
- charByte = -110;
- } else
- charByte = -114;
- } else
- charByte = -122;
- } else
- charByte = -123;
- } else
- charByte = -125;
- } else
- charByte = -126;
- } else
- charByte = -128;
- return charByte;
- }
- /**
- * Gets the double value of this string
- * @param s The string.
- * @return The double value.
- */
- public static double getDouble(String s) {
- s = s.replaceAll(", ", "").replaceAll(",", "");
- StringBuilder sb = new StringBuilder();
- char c;
- boolean foundStart = false;
- for (int i = 0; i < s.length(); i++) {
- c = s.charAt(i);
- if (Character.isDigit(c) || c == '-' || c == '.') {
- sb.append(c);
- foundStart = true;
- } else if (foundStart)
- break;
- }
- try {
- double amount = Double.parseDouble(sb.toString());
- return amount;
- } catch (NumberFormatException e) {
- return 0.0;
- }
- }
- /**
- * Gets the hash for the string.
- * @param str The string.
- * @return The hash.
- */
- public static final int getNameHash(String str) {
- str = str.toLowerCase();
- int hash = 0;
- for (int index = 0; index < str.length(); index++)
- hash = getByte(str.charAt(index)) + ((hash << 5) - hash);
- return hash;
- }
- /**
- * Gets the string value of this string (all html/... removed).
- * @param s The string.
- * @return The string value.
- */
- public static String getString(String s) {
- return s.replaceAll("\\<.*?>", "").replaceAll(" ", "")
- .replaceAll("Discontinued Item:", "");
- }
- /**
- * Characters used to convert a String to a Long.
- */
- public static char[] validChars = {
- '_', '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'
- };
- private final static int[] anIntArray233 = {
- 0, 1024, 2048, 3072, 4096, 5120,
- 6144, 8192, 9216, 12288, 10240, 11264, 16384, 18432, 17408, 20480,
- 21504, 22528, 23552, 24576, 25600, 26624, 27648, 28672, 29696,
- 30720, 31744, 32768, 33792, 34816, 35840, 36864, 536870912,
- 16777216, 37888, 65536, 38912, 131072, 196608, 33554432, 524288,
- 1048576, 1572864, 262144, 67108864, 4194304, 134217728, 327680,
- 8388608, 2097152, 12582912, 13631488, 14680064, 15728640,
- 100663296, 101187584, 101711872, 101974016, 102760448, 102236160,
- 40960, 393216, 229376, 117440512, 104857600, 109051904, 201326592,
- 205520896, 209715200, 213909504, 106954752, 218103808, 226492416,
- 234881024, 222298112, 224395264, 268435456, 272629760, 276824064,
- 285212672, 289406976, 223346688, 293601280, 301989888, 318767104,
- 297795584, 298844160, 310378496, 102498304, 335544320, 299892736,
- 300941312, 301006848, 300974080, 39936, 301465600, 49152,
- 1073741824, 369098752, 402653184, 1342177280, 1610612736,
- 469762048, 1476395008, -2147483648, -1879048192, 352321536,
- 1543503872, -2013265920, -1610612736, -1342177280, -1073741824,
- -1543503872, 356515840, -1476395008, -805306368, -536870912,
- -268435456, 1577058304, -134217728, 360710144, -67108864,
- 364904448, 51200, 57344, 52224, 301203456, 53248, 54272, 55296,
- 56320, 301072384, 301073408, 301074432, 301075456, 301076480,
- 301077504, 301078528, 301079552, 301080576, 301081600, 301082624,
- 301083648, 301084672, 301085696, 301086720, 301087744, 301088768,
- 301089792, 301090816, 301091840, 301092864, 301093888, 301094912,
- 301095936, 301096960, 301097984, 301099008, 301100032, 301101056,
- 301102080, 301103104, 301104128, 301105152, 301106176, 301107200,
- 301108224, 301109248, 301110272, 301111296, 301112320, 301113344,
- 301114368, 301115392, 301116416, 301117440, 301118464, 301119488,
- 301120512, 301121536, 301122560, 301123584, 301124608, 301125632,
- 301126656, 301127680, 301128704, 301129728, 301130752, 301131776,
- 301132800, 301133824, 301134848, 301135872, 301136896, 301137920,
- 301138944, 301139968, 301140992, 301142016, 301143040, 301144064,
- 301145088, 301146112, 301147136, 301148160, 301149184, 301150208,
- 301151232, 301152256, 301153280, 301154304, 301155328, 301156352,
- 301157376, 301158400, 301159424, 301160448, 301161472, 301162496,
- 301163520, 301164544, 301165568, 301166592, 301167616, 301168640,
- 301169664, 301170688, 301171712, 301172736, 301173760, 301174784,
- 301175808, 301176832, 301177856, 301178880, 301179904, 301180928,
- 301181952, 301182976, 301184000, 301185024, 301186048, 301187072,
- 301188096, 301189120, 301190144, 301191168, 301193216, 301195264,
- 301194240, 301197312, 301198336, 301199360, 301201408, 301202432
- };
- private final static byte[] aByteArray235 = {
- 22, 22, 22, 22, 22, 22, 21, 22, 22,
- 20, 22, 22, 22, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 3, 8, 22, 16, 22, 16, 17, 7, 13, 13, 13,
- 16, 7, 10, 6, 16, 10, 11, 12, 12, 12, 12, 13, 13, 14, 14, 11, 14,
- 19, 15, 17, 8, 11, 9, 10, 10, 10, 10, 11, 10, 9, 7, 12, 11, 10, 10,
- 9, 10, 10, 12, 10, 9, 8, 12, 12, 9, 14, 8, 12, 17, 16, 17, 22, 13,
- 21, 4, 7, 6, 5, 3, 6, 6, 5, 4, 10, 7, 5, 6, 4, 4, 6, 10, 5, 4, 4,
- 5, 7, 6, 10, 6, 10, 22, 19, 22, 14, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 22, 21, 22, 22, 22, 21,
- 22, 22
- };
- /**
- * Encrypt a string for the client.
- */
- public static int encryptPlayerChat(byte[] is, int i_25_, int i_26_, int i_27_, byte[] is_28_) {
- try {
- i_27_ += i_25_;
- int i_29_ = 0;
- int i_30_ = i_26_ << 3;
- for (; i_27_ > i_25_; i_25_++) {
- int i_31_ = 0xff & is_28_[i_25_];
- int i_32_ = anIntArray233[i_31_];
- int i_33_ = aByteArray235[i_31_];
- int i_34_ = i_30_ >> 3;
- int i_35_ = i_30_ & 0x7;
- i_29_ &= (-i_35_ >> 31);
- i_30_ += i_33_;
- int i_36_ = ((-1 + (i_35_ - -i_33_)) >> 3) + i_34_;
- i_35_ += 24;
- is[i_34_] = (byte) (i_29_ = (i_29_ | (i_32_ >>> i_35_)));
- if ((i_36_ ^ 0xffffffff) < (i_34_ ^ 0xffffffff)) {
- i_34_++;
- i_35_ -= 8;
- is[i_34_] = (byte) (i_29_ = i_32_ >>> i_35_);
- if (i_36_ > i_34_) {
- i_34_++;
- i_35_ -= 8;
- is[i_34_] = (byte) (i_29_ = i_32_ >>> i_35_);
- if (i_36_ > i_34_) {
- i_35_ -= 8;
- i_34_++;
- is[i_34_] = (byte) (i_29_ = i_32_ >>> i_35_);
- if (i_34_ < i_36_) {
- i_35_ -= 8;
- i_34_++;
- is[i_34_] = (byte) (i_29_ = i_32_ << -i_35_);
- }
- }
- }
- }
- }
- return -i_26_ + ((7 + i_30_) >> 3);
- } catch (RuntimeException runtimeexception) {
- runtimeexception.printStackTrace();
- }
- return 0;
- }
- /**
- * Gets an integer value from a string.
- * @param s the string.
- * @return The value;
- */
- public static int getValue(String s) {
- s = s.replaceAll(", ", "").replaceAll(",", "");
- StringBuilder sb = new StringBuilder();
- char c;
- boolean foundStart = false;
- for (int i = 0; i < s.length(); i++) {
- c = s.charAt(i);
- if (Character.isDigit(c) || c == '-') {
- sb.append(c);
- foundStart = true;
- } else if (foundStart)
- break;
- }
- try {
- int amount = Integer.parseInt(sb.toString());
- return amount;
- } catch (NumberFormatException e) {
- return 0;
- }
- }
- /**
- * Checks if the account name is valid.
- * @param name The account name.
- * @return {@code True} if the account name is invalid.
- */
- public static boolean invalidAccountName(String name) {
- return name.length() < 2 || name.length() > 12 || name.startsWith("_")|| name.endsWith("_") || name.contains("__") || containsInvalidCharacter(name);
- }
-
- /**
- * Converts a long to a string.
- * @param l The long.
- * @return The string.
- */
- public static String longToString(long l) {
- int i = 0;
- char ac[] = new char[32];
- while (l != 0L) {
- long l1 = l;
- l /= 37L;
- ac[11 - i++] = VALID_CHARS[(int) (l1 - l * 37L)];
- }
- return new String(ac, 12 - i, i);
- }
-
- /**
- * Packs a GJ2-String.
- * @param position The position to start.
- * @param buffer The byte-array.
- * @param str The string.
- * @return The size of the string.
- */
- public static final int packGJString2(int position, byte[] buffer,
- String str) {
- int length = str.length();
- int offset = position;
- for (int index = 0; length > index; index++) {
- int character = str.charAt(index);
- if (character > 127) {
- if (character > 2047) {
- buffer[offset++] = (byte) ((character | 919275) >> 12);
- buffer[offset++] = (byte) (128 | ((character >> 6) & 63));
- buffer[offset++] = (byte) (128 | (character & 63));
- } else {
- buffer[offset++] = (byte) ((character | 12309) >> 6);
- buffer[offset++] = (byte) (128 | (character & 63));
- }
- } else
- buffer[offset++] = (byte) character;
- }
- return offset - position;
- }
- /**
- * Method used to...
- * @param x idk,
- * @return the idk.
- */
- public static long reducedMapping(int x) {
- long out = -1;
- if (x >= 97 && x <= 122)
- out = x - 96;
- else if (x >= 65 && x <= 90)
- out = x - 37;
- else if (x >= 48 && x <= 57)
- out = x - +5;
- else if (x == 32)
- out = 63L;
- return out;
- }
- /**
- * Converts a string to a long.
- * @param s The string.
- * @return The long.
- */
- public static long stringToLong(String s) {
- long l = 0L;
- for (int i = 0; i < s.length() && i < 12; i++) {
- char c = s.charAt(i);
- l *= 37L;
- if (c >= 'A' && c <= 'Z')
- l += (1 + c) - 65;
- else if (c >= 'a' && c <= 'z')
- l += (1 + c) - 97;
- else if (c >= '0' && c <= '9')
- l += (27 + c) - 48;
- }
- while (l % 37L == 0L && l != 0L)
- l /= 37L;
- return l;
- }
- /**
- * Decrypt player chat.
- *
- * @param buffer
- * The buffer
- * @param totalChars
- * The total chars
- * @return The string
- */
- public static String decryptPlayerChat(IoBuffer buffer, int totalChars) {
- try {
- if (totalChars == 0)
- return "";
- int charsDecoded = 0;
- int i_4_ = 0;
- String s = "";
- for (;;) {
- byte i_7_ = (byte) buffer.get();
- if (i_7_ >= 0)
- i_4_++;
- else
- i_4_ = anIntArray241[i_4_];
- int i_8_;
- if ((i_8_ = anIntArray241[i_4_]) < 0) {
- s += (char) (byte) (i_8_ ^ 0xffffffff);
- if (totalChars <= ++charsDecoded)
- break;
- i_4_ = 0;
- }
- if (((i_7_ & 0x40) ^ 0xffffffff) != -1)
- i_4_ = anIntArray241[i_4_];
- else
- i_4_++;
- if ((i_8_ = anIntArray241[i_4_]) < 0) {
- s += (char) (byte) (i_8_ ^ 0xffffffff);
- if (++charsDecoded >= totalChars)
- break;
- i_4_ = 0;
- }
- if ((0x20 & i_7_) == 0)
- i_4_++;
- else
- i_4_ = anIntArray241[i_4_];
- if ((i_8_ = anIntArray241[i_4_]) < 0) {
- s += (char) (byte) (i_8_ ^ 0xffffffff);
- if (totalChars <= ++charsDecoded)
- break;
- i_4_ = 0;
- }
- if (((0x10 & i_7_) ^ 0xffffffff) == -1)
- i_4_++;
- else
- i_4_ = anIntArray241[i_4_];
- if ((i_8_ = anIntArray241[i_4_]) < 0) {
- s += (char) (byte) (i_8_ ^ 0xffffffff);
- if (totalChars <= ++charsDecoded)
- break;
-
- i_4_ = 0;
- }
- if (((0x8 & i_7_) ^ 0xffffffff) != -1)
- i_4_ = anIntArray241[i_4_];
- else
- i_4_++;
- if ((i_8_ = anIntArray241[i_4_]) < 0) {
- s += (char) (byte) (i_8_ ^ 0xffffffff);
- if (++charsDecoded >= totalChars)
- break;
- i_4_ = 0;
- }
- if ((0x4 & i_7_) == 0)
- i_4_++;
- else
- i_4_ = anIntArray241[i_4_];
- if ((i_8_ = anIntArray241[i_4_]) < 0) {
- s += (char) (byte) (i_8_ ^ 0xffffffff);
- if (totalChars <= ++charsDecoded)
- break;
- i_4_ = 0;
- }
- if (((i_7_ & 0x2) ^ 0xffffffff) != -1)
- i_4_ = anIntArray241[i_4_];
- else
- i_4_++;
- if ((i_8_ = anIntArray241[i_4_]) < 0) {
- s += (char) (byte) (i_8_ ^ 0xffffffff);
- if (totalChars <= ++charsDecoded)
- break;
- i_4_ = 0;
- }
- if (((i_7_ & 0x1) ^ 0xffffffff) != -1)
- i_4_ = anIntArray241[i_4_];
- else
- i_4_++;
- if ((i_8_ = anIntArray241[i_4_]) < 0) {
- s += (char) (byte) (i_8_ ^ 0xffffffff);
- if (++charsDecoded >= totalChars)
- break;
- i_4_ = 0;
- }
- }
- return s;
- } catch (RuntimeException runtimeexception) {
- runtimeexception.printStackTrace();
- }
- return "";
- }
-}
diff --git a/Management-Server/src/main/java/ms/system/util/TaskExecutor.java b/Management-Server/src/main/java/ms/system/util/TaskExecutor.java
deleted file mode 100644
index e2b3c886b..000000000
--- a/Management-Server/src/main/java/ms/system/util/TaskExecutor.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package ms.system.util;
-
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-
-/**
- * A class holding methods to execute tasks.
- * @author Emperor
- *
- */
-public final class TaskExecutor {
-
- /**
- * The executor to use.
- */
- private static final ScheduledExecutorService EXECUTOR = Executors.newSingleThreadScheduledExecutor();
-
- /**
- * The SQL task executor.
- */
- private static final ScheduledExecutorService SQL_EXECUTOR = Executors.newSingleThreadScheduledExecutor();
-
- /**
- * Constructs a new {@code TaskExecutor} {@code Object}.
- */
- private TaskExecutor() {
- /*
- * empty.
- */
- }
-
- /**
- * Executes an SQL handling task.
- * @param task The task.
- */
- public static void executeSQL(Runnable task) {
- SQL_EXECUTOR.execute(task);
- }
-
- /**
- * Executes the task.
- * @param task The task to execute.
- */
- public static void execute(Runnable task) {
- EXECUTOR.execute(task);
- }
-
- /**
- * Gets the executor.
- * @return The executor.
- */
- public static ScheduledExecutorService getExecutor() {
- return EXECUTOR;
- }
-}
\ No newline at end of file
diff --git a/Management-Server/src/main/java/ms/world/GameServer.java b/Management-Server/src/main/java/ms/world/GameServer.java
deleted file mode 100644
index fed3069b7..000000000
--- a/Management-Server/src/main/java/ms/world/GameServer.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package ms.world;
-
-import ms.net.IoSession;
-import ms.net.packet.WorldPacketRepository;
-import ms.system.mysql.SQLEntryHandler;
-import ms.system.mysql.WorldListSQLHandler;
-import ms.system.util.TaskExecutor;
-import ms.world.info.Response;
-import ms.world.info.WorldInfo;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Represents a game world.
- * @author Emperor
- *
- */
-public final class GameServer {
-
- /**
- * The world info.
- */
- private final WorldInfo info;
-
- /**
- * The I/O session.
- */
- private IoSession session;
-
- /**
- * The players active on the game server.
- */
- private final Map players = new HashMap<>();
-
- /**
- * The scheduled future for the updating task.
- */
- private ScheduledFuture future;
-
- /**
- * constructs a new {@code GameServer} {@code Object}.
- * @param info The world info.
- */
- public GameServer(WorldInfo info) {
- this.info = info;
- }
-
- /**
- * Configures the game server.
- * @param session The I/O session.
- */
- public void configure(IoSession session) {
- this.session = session;
- session.setGameServer(this);
- future = TaskExecutor.getExecutor().scheduleAtFixedRate(() -> {
- SQLEntryHandler.write(new WorldListSQLHandler(GameServer.this));
- if (!isActive()) {
- future.cancel(false);
- future = null;
- }
- }, 0, 10, TimeUnit.SECONDS);
- }
-
- /**
- * Registers a player.
- * @param player The player.
- */
- public void register(PlayerSession player) {
- players.put(player.getUsername(), player);
- player.setWorld(this);
- player.setActive(true);
- player.setWorldId(info.getWorldId());
- player.configure();
- WorldPacketRepository.sendRegistryResponse(this, player, Response.SUCCESSFUL);
- player.getCommunication().sync();
- }
-
- /**
- * Checks if the game server is active.
- * @return {@code True} if so.
- */
- public boolean isActive() {
- return session.isActive();
- }
-
- /**
- * @return the playerAmount
- */
- public int getPlayerAmount() {
- return players.size();
- }
-
- /**
- * @return the info
- */
- public WorldInfo getInfo() {
- return info;
- }
-
- /**
- * @return the session
- */
- public IoSession getSession() {
- return session;
- }
-
- /**
- * @param session the session to set
- */
- public void setSession(IoSession session) {
- this.session = session;
- }
-
- /**
- * Gets the players value.
- * @return The players.
- */
- public Map getPlayers() {
- return players;
- }
-}
\ No newline at end of file
diff --git a/Management-Server/src/main/java/ms/world/PlayerSession.java b/Management-Server/src/main/java/ms/world/PlayerSession.java
deleted file mode 100644
index 09c4682d5..000000000
--- a/Management-Server/src/main/java/ms/world/PlayerSession.java
+++ /dev/null
@@ -1,475 +0,0 @@
-package ms.world;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import ms.ServerConstants;
-import ms.system.communication.ClanRepository;
-import ms.system.communication.CommunicationInfo;
-import ms.system.mysql.SQLManager;
-import ms.world.info.UIDInfo;
-
-/**
- * Represents a player session.
- * @author Emperor
- *
- */
-public final class PlayerSession {
-
- /**
- * The player's communication info.
- */
- private CommunicationInfo communication = new CommunicationInfo(this);
-
- /**
- * The game server the player is currently in.
- */
- private GameServer world;
-
- /**
- * The current clan.
- */
- private ClanRepository clan;
-
- /**
- * The player's UID info.
- */
- private UIDInfo uid;
-
- /**
- * The username.
- */
- private final String username;
-
- /**
- * The password.
- */
- private String password;
-
- /**
- * The player's rights.
- */
- private int rights;
-
- /**
- * The world id.
- */
- private int worldId;
-
- /**
- * If the player session is active.
- */
- private boolean active;
-
- /**
- * The time stamp of last disconnection.
- */
- private long disconnectionTime = 0L;
-
- /**
- * How long the player is banned for.
- */
- private long banTime;
-
- /**
- * How long the player is muted for.
- */
- private long muteTime;
-
- /**
- * The last world the player logged in.
- */
- private int lastWorld = -1;
-
- /**
- * The chat icon.
- */
- private int chatIcon;
-
- /**
- * Constructs a new {@code PlayerSession} {@code Object}.
- * @param username The username.
- * @param password The password.
- * @param ipAddress The ip address.
- * @param macAddress The mac address.
- * @param computerName The computer name.
- * @param serial The motherboard serial key.
- */
- public PlayerSession(String username, String password, UIDInfo uid) {
- this.username = username;
- this.password = password;
- this.uid = uid;
- }
-
- /**
- * Parses the session's data from the database.
- * @return {@code True} if parsed.
- */
- public boolean parse() {
- Connection connection = SQLManager.getConnection();
- if (connection == null) {
- return false;
- }
- ResultSet result = null;
- PreparedStatement statement;
- try {
- statement = connection.prepareStatement("SELECT * FROM " + "members" + " WHERE " + "" + "username" + "='" + username.toLowerCase() + "' LIMIT 1");
- result = statement.executeQuery();
- if (result == null || !result.next()) {
- SQLManager.close(connection);
- return false;
- }
- rights = result.getInt("rights");
- disconnectionTime = result.getLong("disconnectTime");
- lastWorld = result.getInt("lastWorld");
- banTime = result.getLong("banTime");
- communication.parse(result);
- uid.parse(result);
- SQLManager.close(connection);
- } catch (SQLException ex) {
- ex.printStackTrace();
- SQLManager.close(connection);
- return false;
- } finally {
- SQLManager.close(connection);
- }
- return true;
- }
-
- /**
- * Called when a session is removed.
- */
- public void remove() {
- if (world != null && world.getInfo().getRevision() == 498) {
- return;
- }
- Connection connection = SQLManager.getConnection();
- if (connection == null) {
- return;
- }
- PreparedStatement statement;
- try {
- statement = connection.prepareStatement("UPDATE members SET disconnectTime = ?, lastWorld = ?, contacts = ?, blocked = ?, clanName = ?, currentClan = ?, clanReqs = ?, chatSettings = ?, online= ? WHERE username = ?");
- statement.setLong(1, System.currentTimeMillis());
- statement.setInt(2, worldId);
- communication.save(statement);
- statement.setBoolean(9, false);
- statement.setString(10, username);
- statement.executeUpdate();
- SQLManager.close(connection);
- } catch (SQLException e) {
- e.printStackTrace();
- SQLManager.close(connection);
- } finally {
- SQLManager.close(connection);
- }
- communication.clear();
- }
-
- /**
- * Gets a player session.
- * @param username the username.
- * @return the player session.
- */
- public static PlayerSession get(String username) {
- PlayerSession session = new PlayerSession(username, "", new UIDInfo());
- if (!session.parse()) {
- return null;
- }
- return session;
- }
-
- /**
- * Configures the player session.
- */
- public void configure() {
- ClanRepository clan = ClanRepository.getClans().get(username);
- if (clan != null) {
- clan.setOwner(this);
- }
- Connection connection = SQLManager.getConnection();
- if (connection == null) {
- return;
- }
- PreparedStatement statement;
- try {
- statement = connection.prepareStatement("UPDATE members SET online = ?, lastWorld = ?, lastLogin = ? WHERE username = ?");
- statement.setBoolean(1, true);
- statement.setInt(2, worldId);
- statement.setLong(3, System.currentTimeMillis());
- statement.setString(4, username);
- statement.execute();
- SQLManager.close(connection);
- } catch (SQLException e) {
- e.printStackTrace();
- SQLManager.close(connection);
- } finally {
- SQLManager.close(connection);
- }
- }
-
- /**
- * Checks if the player has just moved worlds.
- * @return {@code True} if so.
- */
- public boolean hasMovedWorld() {
- if (rights == 2) {
- return false;
- }
- return System.currentTimeMillis() - disconnectionTime < ServerConstants.WORLD_SWITCH_DELAY;
- }
-
- /**
- * Gets the username value.
- * @return The username.
- */
- public String getUsername() {
- return username;
- }
-
- /**
- * Gets the password value.
- * @return The password.
- */
- public String getPassword() {
- return password;
- }
-
- /**
- * Gets the chat icon.
- * @return The chat icon.
- */
- public int getChatIcon() {
- return chatIcon;
- }
-
- /**
- * Gets the ipAddress value.
- * @return The ipAddress.
- */
- public String getIpAddress() {
- return uid.getIp();
- }
-
- /**
- * Gets the macAddress value.
- * @return The macAddress.
- */
- public String getMacAddress() {
- return uid.getMac();
- }
-
- /**
- * Gets the computerName value.
- * @return The computerName.
- */
- public String getComputerName() {
- return uid.getCompName();
- }
-
- /**
- * Gets the worldId value.
- * @return The worldId.
- */
- public int getWorldId() {
- return worldId;
- }
-
- /**
- * Sets the worldId value.
- * @param worldId The worldId to set.
- */
- public void setWorldId(int worldId) {
- this.worldId = worldId;
- }
-
- /**
- * Gets the active value.
- * @return The active.
- */
- public boolean isActive() {
- return active;
- }
-
- /**
- * Sets the active value.
- * @param active The active to set.
- */
- public void setActive(boolean active) {
- this.active = active;
- }
-
- /**
- * Gets the serialKey value.
- * @return The serialKey.
- */
- public String getSerialKey() {
- return uid.getSerial();
- }
-
- /**
- * Gets the rights value.
- * @return The rights.
- */
- public int getRights() {
- return rights;
- }
-
- /**
- * Sets the rights value.
- * @param rights The rights to set.
- */
- public void setRights(int rights) {
- this.rights = rights;
- }
-
- /**
- * If the player is banned.
- * @return {@code true} if so.
- */
- public boolean isBanned() {
- return banTime > System.currentTimeMillis();
- }
-
- /**
- * Gets the banTime value.
- * @return The banTime.
- */
- public long getBanTime() {
- return banTime;
- }
-
- /**
- * Gets the muteTime.
- * @return the muteTime.
- */
- public long getMuteTime() {
- return muteTime;
- }
-
-
- /**
- * Sets the muteTime.
- * @param muteTime the muteTime to set
- */
- public void setMuteTime(long muteTime) {
- this.muteTime = muteTime;
- }
-
-
- /**
- * Gets the disconnectionTime value.
- * @return The disconnectionTime.
- */
- public long getDisconnectionTime() {
- return disconnectionTime;
- }
-
- /**
- * Gets the lastWorld value.
- * @return The lastWorld.
- */
- public int getLastWorld() {
- return lastWorld;
- }
-
- /**
- * Sets the lastWorld value.
- * @param lastWorld The lastWorld to set.
- */
- public void setLastWorld(int lastWorld) {
- this.lastWorld = lastWorld;
- }
-
- /**
- * Gets the communication value.
- * @return The communication.
- */
- public CommunicationInfo getCommunication() {
- return communication;
- }
-
- /**
- * Sets the communication value.
- * @param communication The communication to set.
- */
- public void setCommunication(CommunicationInfo communication) {
- this.communication = communication;
- }
-
- /**
- * Gets the world value.
- * @return The world.
- */
- public GameServer getWorld() {
- return world;
- }
-
- /**
- * Sets the world value.
- * @param world The world to set.
- */
- public void setWorld(GameServer world) {
- this.world = world;
- }
-
- /**
- * Gets the clan value.
- * @return The clan.
- */
- public ClanRepository getClan() {
- return clan;
- }
-
- /**
- * Sets the clan value.
- * @param clan The clan to set.
- */
- public void setClan(ClanRepository clan) {
- this.clan = clan;
- }
-
- /**
- * Sets the chat icon.
- * @param chatIcon
- */
- public void setChatIcon(int chatIcon) {
- this.chatIcon = chatIcon;
- }
-
- /**
- * Gets the uid.
- * @return the uid.
- */
- public UIDInfo getUid() {
- return uid;
- }
-
- /**
- * Sets the uid.
- * @param uid the uid to set
- */
- public void setUid(UIDInfo uid) {
- this.uid = uid;
- }
-
- /**
- * Sets the disconnect time.
- * @param time the time.
- */
- public void setDisconnectTime(long time) {
- this.disconnectionTime = time;
- }
-
- public boolean equalsSession(PlayerSession o){
- return username.equals(o.username);
- }
-
- @Override
- public String toString() {
- return "player [name=" + username + ", pass=" + password + ", ip=" + uid.getIp() + ", mac=" + uid.getMac() + ", comp=" + uid.getCompName() + ", msk=" + uid.getSerial() + "]";
- }
-
-}
\ No newline at end of file
diff --git a/Management-Server/src/main/java/ms/world/WorldDatabase.java b/Management-Server/src/main/java/ms/world/WorldDatabase.java
deleted file mode 100644
index e23e17f17..000000000
--- a/Management-Server/src/main/java/ms/world/WorldDatabase.java
+++ /dev/null
@@ -1,275 +0,0 @@
-package ms.world;
-
-import java.nio.ByteBuffer;
-
-import ms.ServerConstants;
-import ms.net.IoSession;
-import ms.net.packet.IoBuffer;
-import ms.world.info.CountryFlag;
-import ms.world.info.WorldInfo;
-import ms09.MSLogger;
-
-/**
- * Holds all the world servers.
- * @author Emperor
- *
- */
-public class WorldDatabase {
-
- /**
- * The game servers.
- */
- private static final GameServer[] DATABASE = new GameServer[ServerConstants.WORLD_LIMIT];
-
- /**
- * The update time stamp.
- */
- private static long updateStamp = System.currentTimeMillis();
-
- /**
- * Used to prevent {@code WorldDatabase} from getting instantiated.
- */
- private WorldDatabase() {
- /*
- * empty.
- */
- }
-
- /**
- * Gets the packet to update the world list in the lobby.
- * @param player The player.
- * @param worldConfiguration If the configuration should be added.
- * @param worldStatus If the status should be added.
- * @return The {@code OutgoingPacket} to write.
- */
- public static void sendUpdate(IoSession session, int updateStamp) {
- ByteBuffer buf = ByteBuffer.allocate(1024);
- buf.put((byte) 0);
- buf.putShort((short) 0);
- buf.put((byte) 1);
- IoBuffer buffer = new IoBuffer();
- if (updateStamp == (int) WorldDatabase.updateStamp) {
- buf.put((byte) 0);
- } else {
- buf.put((byte) 1); // Indicates an update occured.
- putWorldListinfo(buffer);
- }
- putPlayerInfo(buffer);
- if (buffer.toByteBuffer().position() > 0) {
- buf.put((ByteBuffer) buffer.toByteBuffer().flip());
- }
- buf.putShort(1, (short) (buf.position() - 3));
- session.queue((ByteBuffer) buf.flip());
- }
-
- /**
- * Adds the world status on the packet.
- * @param buffer The current packet.
- */
- private static void putPlayerInfo(IoBuffer buffer) {
- for (GameServer server : DATABASE) {
- if (server != null) {
- WorldInfo w = server.getInfo();
- buffer.putSmart(w.getWorldId());
- buffer.putShort(server.isActive() ? server.getPlayerAmount() : -1);
- }
- }
- }
-
- /**
- * Sets the countries for each world.
- * @param buffer The current packet.
- */
- private static void putCountryInfo(IoBuffer buffer) {
- for (CountryFlag country : CountryFlag.values()) {
- buffer.putSmart(country.getId());
- buffer.putJagString(capitalize(country.name().toLowerCase()));
- }
- }
-
- /**
- * Converts a string to a capitalized string
- * @param name
- * @return
- */
- private static String capitalize(String name) {
- if (name == null || name.length() == 0) {
- return name;
- } else {
- char[] chars = name.toCharArray();
- chars[0] = Character.toUpperCase(chars[0]);
- return new String(chars);
- }
- }
-
- /**
- * Adds the world configuration on the packet.
- * @param buffer The current packet.
- */
- private static void putWorldListinfo(IoBuffer buffer) {
- buffer.putSmart(CountryFlag.values().length);
- putCountryInfo(buffer);
- buffer.putSmart(0);
- buffer.putSmart(DATABASE.length);
- buffer.putSmart(getRegisteredAmount());
- for (GameServer server : DATABASE) {
- if (server != null) {
- WorldInfo w = server.getInfo();
- buffer.putSmart(w.getWorldId());
- buffer.put(w.getCountry().ordinal());
- buffer.putInt(w.getSettings());
- buffer.putJagString(w.getActivity());
- buffer.putJagString(w.getAddress());
- }
- }
- buffer.putInt((int) updateStamp);
- }
-
- /**
- * Gets the amount of worlds registered.
- * @return The amount of worlds registered.
- */
- public static int getRegisteredAmount() {
- int count = 0;
- for (GameServer server : DATABASE) {
- if (server != null) {
- count++;
- }
- }
- return count;
- }
-
- /**
- * Registers a game server.
- * @param info The game world info.
- */
- public static GameServer register(WorldInfo info) {
- GameServer server = DATABASE[info.getWorldId()];
- if (server != null && server.getSession().isActive() && !server.getSession().getAddress().equals(info.getAddress())) {
- throw new IllegalStateException("World " + info.getWorldId() + " is already registered!");
- }
- flagUpdate();
- MSLogger.logInfo("Registered world - [id=" + info.getWorldId() + ", ip=" + info.getAddress() + ", country=" + info.getCountry().name().toLowerCase() + ", revision=" + info.getRevision() + "]!");
- return DATABASE[info.getWorldId()] = new GameServer(info);
- }
-
- public static void unRegister(GameServer server){
- int index = -1;
- for(int i = 0; i < DATABASE.length; i++){
- GameServer s = DATABASE[i];
- if(s == server){
- index = i;
- break;
- }
- }
- if(index != -1){
- DATABASE[index] = null;
- WorldInfo info = server.getInfo();
- MSLogger.logInfo("Unregistered world - [id=" + info.getWorldId() + ", ip=" + info.getAddress() + ", country=" + info.getCountry().name().toLowerCase() + ", revision=" + info.getRevision() + "]!");
- }
- }
-
- /**
- * Gets the world id of the player.
- * @param username The username of the player.
- * @return The world id.
- */
- public static int getWorldId(String username) {
- return getWorldId(getPlayer(username));
- }
-
- /**
- * Gets the world id of the player.
- * @param player The player.
- * @return The world id.
- */
- public static int getWorldId(PlayerSession player) {
- if (player == null || !player.isActive()) {
- return 0;
- }
- return player.getWorldId();
- }
-
- /**
- * Checks if the game world is active.
- * @param worldId The world id.
- * @return {@code True} if so.
- */
- public static boolean isActive(int worldId) {
- GameServer server = get(worldId);
- return server != null && server.isActive();
- }
-
- /**
- * Checks if the player session for the given name is active.
- * @param username The player's username.
- * @return {@code True} if so.
- */
- public static boolean isActivePlayer(String username) {
- PlayerSession session = getPlayer(username);
- return session != null && session.isActive();
- }
-
- /**
- * Gets the player session for the given name.
- * @param username The player's username.
- * @return The player session.
- */
- public static PlayerSession getPlayer(String username) {
- return getPlayer(username, false);
- }
-
- /**
- * Gets the player session for the given name.
- * @param username The player's username.
- * @param load If we load the users data.
- * @return The player session.
- */
- public static PlayerSession getPlayer(String username, boolean load) {
- for (GameServer server : DATABASE) {
- if (server != null && server.isActive()) {
- PlayerSession player = server.getPlayers().get(username);
- if (player != null) {
- return player;
- }
- }
- }
- if (load) {
- return PlayerSession.get(username);
- }
- return null;
- }
-
- /**
- * Gets the game server for the given world id.
- * @param worldId The world id.
- * @return The game server.
- */
- public static GameServer get(int worldId) {
- return DATABASE[worldId];
- }
-
- /**
- * Gets all the game servers.
- * @return The list of game servers.
- */
- public static GameServer[] getWorlds() {
- return DATABASE;
- }
-
- /**
- * Gets the updateStamp.
- * @return the updateStamp
- */
- public static long getUpdateStamp() {
- return updateStamp;
- }
-
- /**
- * Sets the updateStamp.
- * @param updateStamp the updateStamp to set.
- */
- public static void flagUpdate() {
- WorldDatabase.updateStamp = System.currentTimeMillis();
- }
-}
\ No newline at end of file
diff --git a/Management-Server/src/main/java/ms/world/info/CountryFlag.java b/Management-Server/src/main/java/ms/world/info/CountryFlag.java
deleted file mode 100644
index f59a31a26..000000000
--- a/Management-Server/src/main/java/ms/world/info/CountryFlag.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package ms.world.info;
-
-/**
- * The country flags.
- * @author Emperor
- *
- */
-public enum CountryFlag {
-
- /**
- * Belgium
- */
- BELGIUM(22),
-
- /**
- * Canada.
- */
- CANADA(38),
-
- /**
- * The united kingdom.
- */
- UNITED_KINGDOM(77),
-
- /**
- * Netherlands
- */
- NETHERLANDS(161),
-
- /**
- * Sweden
- */
- SWEDEN(191),
-
- /**
- * Finland
- */
- FINLAND(69),
-
- /**
- * Australia.
- */
- AUSTRALIA(16),
-
- /**
- * America (USA)
- */
- UNITED_STATES_OF_AMERICA(225),
-
- /**
- * Norway
- */
- NORWAY(162),
-
- /**
- * Ireland
- */
- IRELAND(101),
-
- /**
- * DENMARK
- */
- DENMARK(58),
-
- /**
- * Brazil
- */
- BRAZIL(31),
-
- /**
- * Mexico
- */
- MEXICO(152),
-
- ;
-
- /**
- * The flag id.
- */
- private final int id;
-
- /**
- * Constructs a new {@code CountryFlag} {@code Object}.
- * @param id The flag id.
- */
- private CountryFlag(int id) {
- this.id = id;
- }
-
- /**
- * @return the id
- */
- public int getId() {
- return id;
- }
-}
\ No newline at end of file
diff --git a/Management-Server/src/main/java/ms/world/info/Response.java b/Management-Server/src/main/java/ms/world/info/Response.java
deleted file mode 100644
index 7d8ae0c73..000000000
--- a/Management-Server/src/main/java/ms/world/info/Response.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package ms.world.info;
-
-/**
- * Holds the response codes during the attempt to login.
- * @author Emperor
- */
-public enum Response {
-
- /**
- * An unexpected server response occurred.
- */
- UNEXPECTED_RESPONSE(0),
-
- /**
- * Could not display advertisement video, logging in in x seconds.
- */
- COULD_NOT_DISPLAY_AD(1),
-
- /**
- * A successful login.
- */
- SUCCESSFUL(2),
-
- /**
- * Invalid username or password has been entered.
- */
- INVALID_CREDENTIALS(3),
-
- /**
- * This account is banned.
- */
- ACCOUNT_DISABLED(4),
-
- /**
- * This account is already logged in.
- */
- ALREADY_ONLINE(5),
-
- /**
- * We have updated and client needs to be reloaded.
- */
- UPDATED(6),
-
- /**
- * The world is full.
- */
- FULL_WORLD(7),
-
- /**
- * Login server is offline.
- */
- LOGIN_SERVER_OFFLINE(8),
-
- /**
- * The login limit has been exceeded.
- */
- LOGIN_LIMIT_EXCEEDED(9),
-
- /**
- * The session key was invalid.
- */
- BAD_SESSION_ID(10),
-
- /**
- * The password is too weak, and should be improved.
- */
- WEAK_PASSWORD(11),
-
- /**
- * When trying to connect to a members world while being f2p.
- */
- MEMBERS_WORLD(12),
-
- /**
- * Could not login.
- */
- COULD_NOT_LOGIN(13),
-
- /**
- * The server is currently updating.
- */
- UPDATING(14),
-
- /**
- * Too many incorrect login attempts from your address.
- */
- TOO_MANY_INCORRECT_LOGINS(16),
-
- /**
- * When logging on a free world while standing in members area.
- */
- STANDING_IN_MEMBER(17),
-
- /**
- * This account is locked as it might have been stolen.
- */
- LOCKED(18),
-
- /**
- * Closed beta going on.
- */
- CLOSED_BETA(19),
-
- /**
- * The login server connected to is invalid.
- */
- INVALID_LOGIN_SERVER(20),
-
- /**
- * Moving from another world...
- */
- MOVING_WORLD(21),
-
- /**
- * When the player's saved file exists, but is unable to be loaded.
- */
- ERROR_LOADING_PROFILE(24),
-
- /**
- * This computer address is disabled as it was used to break our rules.
- */
- BANNED(26);
-
- /**
- * The buffer.
- */
- private final int opcode;
-
- /**
- * Constructs a new {@code Response} {@code Object}.
- * @param opcode The login response opcode.
- */
- Response(int opcode) {
- this.opcode = opcode;
- }
-
- /**
- * Gets the opcode.
- * @return The opcode.
- */
- public int opcode() {
- return opcode;
- }
-}
\ No newline at end of file
diff --git a/Management-Server/src/main/java/ms/world/info/UIDInfo.java b/Management-Server/src/main/java/ms/world/info/UIDInfo.java
deleted file mode 100644
index 3bcf2d9d6..000000000
--- a/Management-Server/src/main/java/ms/world/info/UIDInfo.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package ms.world.info;
-
-import java.nio.ByteBuffer;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.StringTokenizer;
-
-import ms.system.util.ByteBufferUtils;
-
-/**
- * The unique info of a player.
- * @author Vexia
- *
- */
-public class UIDInfo {
-
- /**
- * The ip address.
- */
- private String ip;
-
- /**
- * The computer name.
- */
- private String compName;
-
- /**
- * The mac-address.
- */
- private String mac;
-
- /**
- * The motherboard serial of the user.
- */
- private String serial;
-
-
- /**
- * Constructs a new {@code UIDInfo} {@code Object}
- */
- public UIDInfo() {
- /*
- * empty.
- */
- }
-
- /**
- * Constructs a new {@code UIDInfo} {@code Object}
- * @param ip the ip.
- * @param compName the computer name.
- * @param mac the mac.
- * @param serial the serial.
- */
- public UIDInfo(String ip, String compName, String mac, String serial) {
- this.ip = ip;
- this.compName = compName;
- this.mac = mac;
- this.serial = serial;
- }
-
- /**
- * Parses the data from a prepared statement.
- * @param set The result set
- * @throws SQLException The exception if thrown.
- */
- public void parse(ResultSet set) throws SQLException {
- setIp(parseFormat(set.getString("ip")));
- setCompName(parseFormat(set.getString("computerName")));
- setMac(parseFormat(set.getString("mac")));
- setSerial(parseFormat(set.getString("serial")));
- }
-
- /**
- * Saves the UID data on the buffer.
- * @param buffer The buffer.
- */
- public void save(ByteBuffer buffer) {
- save(buffer, ip, 1);
- save(buffer, compName, 2);
- save(buffer, mac, 3);
- save(buffer, serial, 4);
- buffer.put((byte) 0);
- }
-
- /**
- * Parses the UID data from the buffer.
- * @param buffer The buffer.
- */
- public void parse(ByteBuffer buffer) {
- int opcode;
- while ((opcode = buffer.get()) != 0) {
- switch (opcode) {
- case 1:
- ip = ByteBufferUtils.getString(buffer);
- break;
- case 2:
- compName = ByteBufferUtils.getString(buffer);
- break;
- case 3:
- mac = ByteBufferUtils.getString(buffer);
- break;
- case 4:
- serial = ByteBufferUtils.getString(buffer);
- break;
- default:
- break;
- }
- }
- }
-
- /**
- * Parses a string with a certain format.
- * @param string the string.
- * @return the string.
- */
- private String parseFormat(String string) {
- if (string == null || string.equals("")) {
- return null;
- }
- StringTokenizer token = new StringTokenizer(string, "|");
- String s = "";
- int t = token.countTokens();
- for (int i = 0; i < t; i++) {
- s = token.nextToken();
- }
- return s;
- }
-
- /**
- * Saves a string value to the buffer.
- * @param buffer the buffer.
- * @param value the value.
- * @param opcode the opcode.
- */
- private void save(ByteBuffer buffer, String value, int opcode) {
- if (value == null) {
- return;
- }
- ByteBufferUtils.putString(value, buffer.put((byte) opcode));
- }
-
- /**
- * Converts a to string in format mode for an admin or mod.
- * @param admin the admin.
- * @return the string.
- */
- public String toString(boolean admin) {
- String format = toString();
- if (!admin) {//formats for non-admins
- String[] tokens = format.split("serial=");
- format = format.replace("serial=", "uid=").replace(tokens[tokens.length - 1], "*****");
- }
- return format;
- }
-
- /**
- * Gets the compName.
- * @return the compName
- */
- public String getCompName() {
- return compName;
- }
-
- /**
- * Gets the ip.
- * @return the ip
- */
- public String getIp() {
- return ip;
- }
-
- /**
- * Gets the mac.
- * @return the mac
- */
- public String getMac() {
- return mac;
- }
-
- /**
- * Gets the serial.
- * @return the serial
- */
- public String getSerial() {
- return serial;
- }
-
- /**
- * Sets the ip.
- * @param ip the ip to set.
- */
- public void setIp(String ip) {
- this.ip = ip;
- }
-
- /**
- * Sets the compName.
- * @param compName the compName to set.
- */
- public void setCompName(String compName) {
- this.compName = compName;
- }
-
- /**
- * Sets the mac.
- * @param mac the mac to set.
- */
- public void setMac(String mac) {
- this.mac = mac;
- }
-
- /**
- * Sets the serial.
- * @param serial the serial to set.
- */
- public void setSerial(String serial) {
- this.serial = serial;
- }
-
- @Override
- public String toString() {
- return "[ip=" + ip + ", compName=" + compName + ", mac=" + mac + ", serial=" + serial + "]";
- }
-}
diff --git a/Management-Server/src/main/java/ms/world/info/WorldInfo.java b/Management-Server/src/main/java/ms/world/info/WorldInfo.java
deleted file mode 100644
index 74c4d743d..000000000
--- a/Management-Server/src/main/java/ms/world/info/WorldInfo.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package ms.world.info;
-
-/**
- * Holds the info of a world server.
- * @author Emperor
- *
- */
-public final class WorldInfo {
-
- /**
- * The world id.
- */
- private final int worldId;
-
- /**
- * The IP-address.
- */
- private final String address;
-
- /**
- * The revision of the world.
- */
- private final int revision;
-
- /**
- * The country this world is located in.
- */
- private final CountryFlag country;
-
- /**
- * The world activity.
- */
- private final String activity;
-
- /**
- * If the world is members only.
- */
- private final boolean members;
-
- /**
- * If the world is a PvP world.
- */
- private final boolean pvp;
-
- /**
- * If the world is a quick chat only world.
- */
- private final boolean quickChat;
-
- /**
- * If the world has lootshare option enabled.
- */
- private final boolean lootshare;
-
- /**
- * Constructs a new {@code WorldInfo} {@code Object}.
- * @param id The world id.
- * @param address The address.
- * @param country The country flag.
- * @param members If the world is members only.
- */
- public WorldInfo(int id, String address, int revision, CountryFlag country, String activity, boolean members, boolean pvp, boolean quickChat, boolean lootshare) {
- this.worldId = id;
- this.address = address;
- this.revision = revision;
- this.country = country;
- this.activity = activity;
- this.members = members;
- this.pvp = pvp;
- this.quickChat = quickChat;
- this.lootshare = lootshare;
- }
-
- /**
- * Gets the settings hash.
- * @return The settings hash.
- */
- public int getSettings() {
- int settings = 0;
- if (members) {
- settings |= 0x1;
- }
- if (quickChat) {
- settings |= 0x2;
- }
- if (pvp) {
- settings |= 0x4;
- }
- if (lootshare) {
- settings |= 0x8;
- }
- return settings;
- }
-
- /**
- * @return the worldId
- */
- public int getWorldId() {
- return worldId;
- }
-
- /**
- * @return the address
- */
- public String getAddress() {
- return address;
- }
-
- /**
- * @return the country
- */
- public CountryFlag getCountry() {
- return country;
- }
-
- /**
- * Gets the members value.
- * @return The members.
- */
- public boolean isMembers() {
- return members;
- }
-
- /**
- * Gets the activity value.
- * @return The activity.
- */
- public String getActivity() {
- return activity;
- }
-
- /**
- * Gets the pvp value.
- * @return The pvp.
- */
- public boolean isPvp() {
- return pvp;
- }
-
- /**
- * Gets the quickChat value.
- * @return The quickChat.
- */
- public boolean isQuickChat() {
- return quickChat;
- }
-
- /**
- * Gets the lootshare value.
- * @return The lootshare.
- */
- public boolean isLootshare() {
- return lootshare;
- }
-
- /**
- * Gets the revision.
- * @return the revision.
- */
- public int getRevision() {
- return revision;
- }
-}
\ No newline at end of file
diff --git a/Management-Server/src/main/kotlin/ms09/MSLogger.kt b/Management-Server/src/main/kotlin/ms09/MSLogger.kt
deleted file mode 100644
index 5bd7a7b7f..000000000
--- a/Management-Server/src/main/kotlin/ms09/MSLogger.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package ms09
-
-import com.github.ajalt.mordant.rendering.TextColors
-import com.github.ajalt.mordant.terminal.Terminal
-import java.io.BufferedWriter
-import java.io.Writer
-import java.text.SimpleDateFormat
-import java.util.*
-
-object MSLogger {
- val t = Terminal()
- var tradeLog: Writer? = null
- var tradeLogWriter: BufferedWriter? = null
-
-
- fun getTime(): String{
- val formatter = SimpleDateFormat("HH:mm:ss")
- return "[" + formatter.format(Date(System.currentTimeMillis())) +"]"
- }
-
- @JvmStatic
- fun logInfo(vararg messages: String){
- for(m in messages){
- if(m.isNotBlank()) t.println("${getTime()}: [INFO] $m")
- }
- }
-
- @JvmStatic
- fun logErr(message: String){
- if(message.isNotBlank()) t.println("${getTime()}: ${TextColors.brightRed("[ ERR] $message")}")
- }
-
- @JvmStatic
- fun logWarn(message: String){
- if(message.isNotBlank()) t.println("${getTime()}: ${TextColors.yellow("[WARN] $message")}")
- }
-}
\ No newline at end of file
diff --git a/Server/pom.xml b/Server/pom.xml
index fa45ae164..188230d74 100644
--- a/Server/pom.xml
+++ b/Server/pom.xml
@@ -242,6 +242,10 @@
maven-surefire-plugin
+
+ false
+ false
+
2.22.0
diff --git a/Server/src/main/java/core/cache/Cache.java b/Server/src/main/java/core/cache/Cache.java
index 0194eb874..d4733986d 100644
--- a/Server/src/main/java/core/cache/Cache.java
+++ b/Server/src/main/java/core/cache/Cache.java
@@ -48,7 +48,7 @@ public final class Cache {
* @throws Throwable When an exception occurs.
*/
public static void init(String path) throws Throwable {
- SystemLogger.logInfo("Initializing cache...");
+ SystemLogger.logInfo(Cache.class, "Initializing cache...");
byte[] cacheFileBuffer = new byte[520];
RandomAccessFile containersInformFile = new RandomAccessFile(path + File.separator + "main_file_cache.idx255", "r");
RandomAccessFile dataFile = new RandomAccessFile(path + File.separator + "main_file_cache.dat2", "r");
@@ -61,7 +61,7 @@ public final class Cache {
CacheFile cacheFile = new CacheFile(i, new RandomAccessFile(f, "r"), dataFile, 1000000, cacheFileBuffer);
cacheFileManagers[i] = new CacheFileManager(cacheFile, true);
if (cacheFileManagers[i].getInformation() == null) {
- SystemLogger.logErr("Error loading cache index " + i + ": no information.");
+ SystemLogger.logErr(Cache.class, "Error loading cache index " + i + ": no information.");
cacheFileManagers[i] = null;
}
}
@@ -93,7 +93,7 @@ public final class Cache {
public static ByteBuffer getArchiveData(int index, int archive, boolean priority, int encryptionValue) {
byte[] data = index == 255 ? referenceFile.getContainerData(archive) : cacheFileManagers[index].getCacheFile().getContainerData(archive);
if (data == null || data.length < 1) {
- SystemLogger.logErr("Invalid JS-5 request - " + index + ", " + archive + ", " + priority + ", " + encryptionValue + "!");
+ SystemLogger.logErr(Cache.class, "Invalid JS-5 request - " + index + ", " + archive + ", " + priority + ", " + encryptionValue + "!");
return null;
}
int compression = data[0] & 0xff;
diff --git a/Server/src/main/java/core/cache/def/impl/DataMap.java b/Server/src/main/java/core/cache/def/impl/DataMap.java
index f00e921d2..40fe2694c 100644
--- a/Server/src/main/java/core/cache/def/impl/DataMap.java
+++ b/Server/src/main/java/core/cache/def/impl/DataMap.java
@@ -40,7 +40,7 @@ public class DataMap {
public int getInt(int key){
if(!dataStore.containsKey(key)){
- SystemLogger.logErr("Invalid value passed for key: " + key + " map: " + id);
+ SystemLogger.logErr(this.getClass(), "Invalid value passed for key: " + key + " map: " + id);
return -1;
}
return (int) dataStore.get(key);
diff --git a/Server/src/main/java/core/cache/def/impl/ItemDefinition.java b/Server/src/main/java/core/cache/def/impl/ItemDefinition.java
index 4958dfaa5..72a7ac3da 100644
--- a/Server/src/main/java/core/cache/def/impl/ItemDefinition.java
+++ b/Server/src/main/java/core/cache/def/impl/ItemDefinition.java
@@ -294,7 +294,7 @@ public class ItemDefinition extends Definition- {
}
ItemDefinition def = ItemDefinition.parseDefinition(itemId, ByteBuffer.wrap(data));
if (def == null) {
- SystemLogger.logErr("Could not load item definitions for id " + itemId + " - no definitions found!");
+ SystemLogger.logErr(ItemDefinition.class, "Could not load item definitions for id " + itemId + " - no definitions found!");
return ;
}
if(itemId == 14958)
@@ -1530,7 +1530,7 @@ public class ItemDefinition extends Definition
- {
ItemDefinition def = forId(nodeId);
if (def == null) {
if (nodeId == 22937)
- SystemLogger.logErr("[ItemDefinition] No definition for item id " + nodeId + "!");
+ SystemLogger.logErr(ItemDefinition.class, "[ItemDefinition] No definition for item id " + nodeId + "!");
return null;
}
OptionHandler handler = def.getConfiguration("option:" + name);
diff --git a/Server/src/main/java/core/cache/def/impl/RenderAnimationDefinition.java b/Server/src/main/java/core/cache/def/impl/RenderAnimationDefinition.java
index 08d1c97bc..d9f9363a5 100644
--- a/Server/src/main/java/core/cache/def/impl/RenderAnimationDefinition.java
+++ b/Server/src/main/java/core/cache/def/impl/RenderAnimationDefinition.java
@@ -72,7 +72,7 @@ public class RenderAnimationDefinition {
if (data != null) {
defs.parse(ByteBuffer.wrap(data));
} else {
- SystemLogger.logErr("No definitions found for render animation " + animId + ", size=" + Cache.getIndexes()[2].getFilesSize(32) + "!");
+ SystemLogger.logErr(RenderAnimationDefinition.class, "No definitions found for render animation " + animId + ", size=" + Cache.getIndexes()[2].getFilesSize(32) + "!");
}
return defs;
}
diff --git a/Server/src/main/java/core/cache/def/impl/SceneryDefinition.java b/Server/src/main/java/core/cache/def/impl/SceneryDefinition.java
index 26f05fd90..77838d2db 100644
--- a/Server/src/main/java/core/cache/def/impl/SceneryDefinition.java
+++ b/Server/src/main/java/core/cache/def/impl/SceneryDefinition.java
@@ -615,7 +615,7 @@ public class SceneryDefinition extends Definition {
// SystemLogger.logErr("----------------------------------------------------\n\n\n");
while (true) {
if (!buffer.hasRemaining()) {
- SystemLogger.logErr("[ObjectDefinition] Buffer empty for " + objectId);
+ SystemLogger.logErr(SceneryDefinition.class, "Buffer empty for " + objectId);
break;
}
int opcode = buffer.get() & 0xFF;
@@ -801,7 +801,7 @@ public class SceneryDefinition extends Definition {
}
} else {
if (opcode != 0) {
- SystemLogger.logErr("Unhandled object definition opcode: " + opcode);
+ SystemLogger.logErr(SceneryDefinition.class, "Unhandled object definition opcode: " + opcode);
}
break;
}
diff --git a/Server/src/main/java/core/cache/def/impl/Struct.java b/Server/src/main/java/core/cache/def/impl/Struct.java
index 968cb5e19..06a0bfeb6 100644
--- a/Server/src/main/java/core/cache/def/impl/Struct.java
+++ b/Server/src/main/java/core/cache/def/impl/Struct.java
@@ -30,7 +30,7 @@ public class Struct {
public int getInt(int key){
if(!dataStore.containsKey(key)){
- SystemLogger.logErr("Invalid value passed for key: " + key + " struct: " + id);
+ SystemLogger.logErr(this.getClass(), "Invalid value passed for key: " + key + " struct: " + id);
return -1;
}
return (int) dataStore.get(key);
diff --git a/Server/src/main/java/core/game/component/AccessMaskBuilder.java b/Server/src/main/java/core/game/component/AccessMaskBuilder.java
deleted file mode 100644
index a3ce053e4..000000000
--- a/Server/src/main/java/core/game/component/AccessMaskBuilder.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package core.game.component;
-
-/**
- * Used to generate component option settings.
- * @author Mangis
- */
-public final class AccessMaskBuilder {
-
- /**
- * Contains the value which should be sent in access mask packet.
- */
- private int value;
-
- /**
- * Sets default option setting.
- * @param allowed If the packet for the default option should be sent to the
- * server.
- */
- public void allowDefaultOption(boolean allowed) {
- value &= ~(0x1);
- if (allowed) {
- value |= 0x1;
- }
- }
-
- /**
- * Sets right click option settings. If specified option is not allowed, it
- * will not appear in right click menu and the packet will not be send to
- * server when clicked.
- * @param optionId The option index.
- * @param show If the option is allowed.
- */
- public void showMenuOption(int optionId, boolean show) {
- if (optionId < 0 || optionId > 9) {
- throw new IllegalArgumentException("Option index must be 0-9.");
- }
- value &= ~(0x1 << (optionId + 1));
- if (show) {
- value |= (0x1 << (optionId + 1));
- }
- }
-
- /**
- * Sets use on option settings. If nothing is allowed then 'use' option will
- * not appear in right click menu.
- */
- public void setUseOnSettings(boolean groundItems, boolean npcs, boolean objects, boolean otherPlayer, boolean selfPlayer, boolean component) {
- int useFlag = 0;
- if (groundItems) {
- useFlag |= 0x1;
- }
- if (npcs) {
- useFlag |= 0x2;
- }
- if (objects) {
- useFlag |= 0x4;
- }
- if (otherPlayer) {
- useFlag |= 0x8;
- }
- if (selfPlayer) {
- useFlag |= 0x10;
- }
- if (component) {
- useFlag |= 0x20;
- }
- value &= ~(127 << 7); // disable
- value |= useFlag << 7;
- }
-
- /**
- * Sets interface events depth. For example, we have inventory interface
- * which is opened on gameframe interface (548) If depth is 1, then the
- * clicks in inventory will also invoke click event handler scripts on
- * gameframe interface.
- * @param depth The depth value.
- */
- public void setInterfaceEventsDepth(int depth) {
- if (depth < 0 || depth > 7) {
- throw new IllegalArgumentException("depth must be 0-7.");
- }
- value &= ~(0x7 << 18);
- value |= (depth << 18);
- }
-
- /**
- * Flags other component options being allowed to be used on this component.
- * @param allow If an option can be used on this component.
- */
- public void allowUsage(boolean allow) {
- value &= ~(1 << 22);
- if (allow) {
- value |= (1 << 22);
- }
- }
-
- /**
- * Gets the current value.
- * @return The value.
- */
- public int getValue() {
- return value;
- }
-}
\ No newline at end of file
diff --git a/Server/src/main/java/core/game/container/access/BitregisterAssembler.java b/Server/src/main/java/core/game/container/access/BitregisterAssembler.java
deleted file mode 100644
index a16a79440..000000000
--- a/Server/src/main/java/core/game/container/access/BitregisterAssembler.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package core.game.container.access;
-
-import core.game.node.entity.player.Player;
-
-/**
- * Contains the mask value methods. The 'access mask' is actually just a bit
- * register that contains permissions for a specific interface (@Peterbjornx)
- * @date 5/02/2013
- * @author Stacx
- * @author Emperor
- * @deprecated This is a really bad way of doing what this class needs to do. Please use {@link api.IfaceSettingsBuilder}.
- */
-@Deprecated()
-public final class BitregisterAssembler {
-
- /**
- * The register size.
- */
- public static final int SIZE = 32 - 1;
-
- /**
- * Examine option.
- */
- public static final int EXAMINE_OPT = 9;
-
- /**
- * Allow dragging.
- */
- public static final int DRAGABLE = 17;
-
- /**
- * Allow switching item slots.
- */
- public static final int SLOT_SWITCH = 20;
-
- /**
- * The flags.
- */
- private boolean[] permissions = new boolean[SIZE];
-
- /**
- * Constructs a new {@code BitregisterAssembler} {@code Object}.
- * @param permissions The permissions.
- */
- public BitregisterAssembler(int... permissions) {
- for (int i : permissions) {
- this.permissions[i] = true;
- }
- }
-
- /**
- * Constructs a new {@code BitregisterAssembler} {@code Object}.
- */
- public BitregisterAssembler(String[] options) {
- enableOptions(options);
- }
-
- /**
- * Enables the given options ({@code null} options will remain disabled).
- * @param options The options.
- */
- public void enableOptions(String...options) {
- if (options.length > 9) {
- throw new IllegalStateException("Too many options specified - maximum 9 allowed!");
- }
- for (int i = 0; i < options.length; i++) {
- if (options[i] != null && !options[i].equals("null")) {
- permissions[i] = true;
- }
- }
- }
-
- /**
- * Enables the examine option.
- */
- public void enableExamineOption() {
- permissions[EXAMINE_OPT] = true;
- }
-
- /**
- * Enables items being dragged.
- */
- public void enableDragging() {
- permissions[DRAGABLE] = true;
- }
-
- /**
- * Enables item switching slots (& dragging).
- */
- public void enableSlotSwitch() {
- enableDragging();
- permissions[SLOT_SWITCH] = true;
- }
-
- /**
- * Send and assemble a bit register for our
- * @param player , the player instance
- * @param interfaceIndex , the interface index
- * @param childIndex , the child index for our interface
- * @param offset , the offset for the loop in client
- * @param length , the length of our loop
- */
- public static void send(Player player, int interfaceIndex, int childIndex, int offset, int length, BitregisterAssembler assembler) {
- if (offset >= length) {
- throw new RuntimeException("Offset cannot excess length. length = " + length);
- }
- player.getPacketDispatch().sendIfaceSettings(assembler.calculateRegister(), childIndex, interfaceIndex, offset, length);
- }
-
- /**
- * Calculates the register.
- * @return The value.
- */
- public int calculateRegister() {
- int value = 0;
- for (int i = 0; i < SIZE; i++) {
- if (permissions[i]) {
- value |= 2 << i;
- }
- }
- return value;
- }
-
-}
diff --git a/Server/src/main/java/core/game/container/access/InterfaceContainer.java b/Server/src/main/java/core/game/container/access/InterfaceContainer.java
index 713b72eda..1a17e7a63 100644
--- a/Server/src/main/java/core/game/container/access/InterfaceContainer.java
+++ b/Server/src/main/java/core/game/container/access/InterfaceContainer.java
@@ -1,5 +1,6 @@
package core.game.container.access;
+import api.IfaceSettingsBuilder;
import core.game.node.entity.player.Player;
import core.game.node.item.Item;
import core.net.packet.PacketRepository;
@@ -37,14 +38,16 @@ public class InterfaceContainer {
private static int generate(Player player, Item[] itemArray, String[] options, int interfaceIndex, int childIndex, int x, int y, int key) {
Object[] clientScript = new Object[options.length + 7];
player.getPacketDispatch().sendRunScript(CLIENT_SCRIPT_INDEX, generateScriptArguments(options.length), populateScript(clientScript, options, interfaceIndex << 16 | childIndex, x, y, key));
- BitregisterAssembler.send(player, interfaceIndex, childIndex, 0, itemArray.length, new BitregisterAssembler(options));
+ int settings = new IfaceSettingsBuilder().enableAllOptions().build();
+ player.getPacketDispatch().sendIfaceSettings(settings, childIndex, interfaceIndex, 0, itemArray.length);
PacketRepository.send(ContainerPacket.class, new ContainerContext(player, -1, -2, key, itemArray, itemArray.length, false));
return increment();
}
public static int generateOptions(Player player, String[] options, int interfaceIndex, int childIndex, int x, int y, int key){
player.getPacketDispatch().sendRunScript(CLIENT_SCRIPT_INDEX, generateScriptArguments(options.length), populateScript(new Object[options.length + 7],options,interfaceIndex << 16 | childIndex, x, y, key));
- BitregisterAssembler.send(player,interfaceIndex,childIndex,0,28,new BitregisterAssembler(options));
+ int settings = new IfaceSettingsBuilder().enableAllOptions().build();
+ player.getPacketDispatch().sendIfaceSettings(settings, childIndex, interfaceIndex, 0, 28);
return increment();
}
@@ -76,7 +79,8 @@ public class InterfaceContainer {
int key = increment();
Object[] clientScript = new Object[options.length + 7];
player.getPacketDispatch().sendRunScript(CLIENT_SCRIPT_INDEX, generateScriptArguments(options.length), populateScript(clientScript, options, interfaceId << 16 | childId, x, y, key));
- BitregisterAssembler.send(player, interfaceId, childId, 0, itemLength, new BitregisterAssembler(options));
+ int settings = new IfaceSettingsBuilder().enableAllOptions().build();
+ player.getPacketDispatch().sendIfaceSettings(settings, childId, interfaceId, 0, itemLength);
return key;
}
@@ -125,7 +129,6 @@ public class InterfaceContainer {
/**
* Default method to generate and send an item array for the client.
* @return The container key.
- * @see {@link InterfaceContainer.generate}
*/
public static int generateItems(Player player, Item[] itemArray, String[] options, int interfaceIndex, int childIndex) {
return generateItems(player, itemArray, options, interfaceIndex, childIndex, 7, 3, increment());
@@ -134,7 +137,6 @@ public class InterfaceContainer {
/**
* Default method to generate and send an item array for the client.
* @return The container key.
- * @see {@link InterfaceContainer.generate}
*/
public static int generateItems(Player player, Item[] itemArray, String[] options, int interfaceIndex, int childIndex, int key) {
return generateItems(player, itemArray, options, interfaceIndex, childIndex, 7, 3, key);
diff --git a/Server/src/main/java/core/game/container/impl/BankContainer.java b/Server/src/main/java/core/game/container/impl/BankContainer.java
index ca3b3ceb2..0ee28da7b 100644
--- a/Server/src/main/java/core/game/container/impl/BankContainer.java
+++ b/Server/src/main/java/core/game/container/impl/BankContainer.java
@@ -1,11 +1,12 @@
package core.game.container.impl;
+import api.IfaceSettingsBuilder;
import core.game.container.access.InterfaceContainer;
+import kotlin.ranges.IntRange;
import org.rs09.consts.Vars;
import rs09.ServerConstants;
import core.game.component.Component;
import core.game.container.*;
-import core.game.container.access.BitregisterAssembler;
import core.game.node.entity.player.Player;
import core.game.node.entity.player.link.IronmanMode;
import core.game.node.item.Item;
@@ -128,10 +129,8 @@ public final class BankContainer extends Container {
player.getInventory().getListeners().add(listener);
player.getInventory().refresh();
player.varpManager.get(1249).setVarbit(0,lastAmountX).send(player);
- BitregisterAssembler assembly = new BitregisterAssembler(0, 1, 2, 3, 4, 5);
- assembly.enableExamineOption();
- assembly.enableSlotSwitch();
- player.getPacketDispatch().sendIfaceSettings(assembly.calculateRegister(), 0, 763, 0, 27);
+ int settings = new IfaceSettingsBuilder().enableOptions(new IntRange(0, 5)).enableExamine().enableSlotSwitch().build();
+ player.getPacketDispatch().sendIfaceSettings(settings, 0, 763, 0, 27);
player.getPacketDispatch().sendRunScript(1451, "");
open = true;
setTabConfigurations();
@@ -159,10 +158,8 @@ public final class BankContainer extends Container {
player.getInventory().refresh();
player.varpManager.get(1249).setVarbit(0,lastAmountX).send(player);
player.getPacketDispatch().sendIfaceSettings(1278, 73, 762, 0, SIZE);
- BitregisterAssembler assembly = new BitregisterAssembler(0, 1, 2, 3, 4, 5);
- assembly.enableExamineOption();
- assembly.enableSlotSwitch();
- player.getPacketDispatch().sendIfaceSettings(assembly.calculateRegister(), 0, 763, 0, 27);
+ int settings = new IfaceSettingsBuilder().enableOptions(new IntRange(0,5)).enableExamine().enableSlotSwitch().build();
+ player.getPacketDispatch().sendIfaceSettings(settings, 0, 763, 0, 27);
player.getPacketDispatch().sendRunScript(1451, "");
open = true;
this.player.getBank().setTabConfigurations(player);
diff --git a/Server/src/main/java/core/game/content/activity/ActivityManager.java b/Server/src/main/java/core/game/content/activity/ActivityManager.java
index 700a369d8..402764870 100644
--- a/Server/src/main/java/core/game/content/activity/ActivityManager.java
+++ b/Server/src/main/java/core/game/content/activity/ActivityManager.java
@@ -50,7 +50,7 @@ public final class ActivityManager {
ActivityPlugin plugin = ACTIVITIES.get(name);
if (plugin == null) {
if (GameWorld.getSettings().isDevMode()) {
- SystemLogger.logErr("Unhandled activity - " + name + "!");
+ SystemLogger.logErr(ActivityManager.class, "Unhandled activity - " + name + "!");
}
return false;
}
diff --git a/Server/src/main/java/core/game/content/activity/gwd/GodwarsMapzone.java b/Server/src/main/java/core/game/content/activity/gwd/GodwarsMapzone.java
index 3997c896c..5052a1e52 100644
--- a/Server/src/main/java/core/game/content/activity/gwd/GodwarsMapzone.java
+++ b/Server/src/main/java/core/game/content/activity/gwd/GodwarsMapzone.java
@@ -368,7 +368,7 @@ public final class GodwarsMapzone extends MapZone implements Plugin