Browse Source

BETA: Removing localization for SQL Account Manager, it wasn't working since a long time and since there wasn't any reports we have decided to remove it (seems no one uses it), one less dependence for L2j.
* Also fixing delete account function it was broken (keep in mind it wont delete the gameserver data for the deleted account).
* Reviewed by: Zoey76

Nos 11 years ago
parent
commit
0472222093

+ 0 - 1
L2J_Server_BETA/.classpath

@@ -4,7 +4,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
 	<classpathentry kind="lib" path="dist/libs/c3p0-0.9.2.1.jar" />
 	<classpathentry kind="lib" path="dist/libs/javolution-5.5.1.jar" sourcepath="dist/libs/javolution-5.5.1-src.zip" />
-	<classpathentry kind="lib" path="dist/libs/jna-4.0.0.jar" />
 	<classpathentry kind="lib" path="dist/libs/jython.jar" />
 	<classpathentry kind="lib" path="dist/libs/jython-engine-2.2.1.jar" />
 	<classpathentry kind="lib" path="dist/libs/mail-1.5.0.jar" />

+ 0 - 504
L2J_Server_BETA/dist/doc/3rdPartyLicenses/jna.txt

@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-

BIN
L2J_Server_BETA/dist/libs/jna-4.0.0.jar


+ 1 - 1
L2J_Server_BETA/dist/login/startSQLAccountManager.bat

@@ -1,7 +1,7 @@
 @echo off
 title L2J - SQL Account Manager
 color 17
-java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*;l2jlogin.jar com.l2jserver.tools.accountmanager.SQLAccountManager 2> NUL
+java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*;l2jlogin.jar com.l2jserver.tools.accountmanager.SQLAccountManager
 if %errorlevel% == 0 (
 echo.
 echo Execution successful

+ 143 - 375
L2J_Server_BETA/java/com/l2jserver/tools/accountmanager/SQLAccountManager.java

@@ -18,28 +18,21 @@
  */
 package com.l2jserver.tools.accountmanager;
 
-import java.io.IOException;
 import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.Locale;
-
-import javolution.util.FastList;
+import java.util.Scanner;
 
 import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.Server;
-import com.l2jserver.tools.ngl.ConsoleLocalizator;
-import com.l2jserver.tools.ngl.LocaleCodes;
 import com.l2jserver.util.Base64;
 
 /**
  * This class SQL Account Manager
  * @author netimperia
- * @version $Revision: 2.3.2.1.2.3 $ $Date: 2005/08/08 22:47:12 $
  */
 public class SQLAccountManager
 {
@@ -47,129 +40,117 @@ public class SQLAccountManager
 	private static String _pass = "";
 	private static String _level = "";
 	private static String _mode = "";
-	private static ConsoleLocalizator cl;
 	
-	public static void main(String[] args) throws SQLException, IOException, NoSuchAlgorithmException
+	public static void main(String[] args)
 	{
 		Server.serverMode = Server.MODE_LOGINSERVER;
 		Config.load();
-		if (args.length > 0)
-		{
-			if (LocaleCodes.getInstance().getLanguage(args[0]) != null)
-			{
-				cl = new ConsoleLocalizator("accountmanager", "SQLAccountManager", LocaleCodes.getInstance().getLanguage(args[0]));
-			}
-			else
-			{
-				cl = new ConsoleLocalizator("accountmanager", "SQLAccountManager", args[0]);
-			}
-		}
-		else
-		{
-			cl = new ConsoleLocalizator("accountmanager", "SQLAccountManager", Locale.getDefault());
-		}
 		
-		while (true)
+		try (Scanner _scn = new Scanner(System.in))
 		{
-			cl.println("functChooser");
-			cl.println();
-			cl.println("functCreateAccount");
-			cl.println("functAccessLevel");
-			cl.println("functDeleteAccount");
-			cl.println("functListAccount");
-			cl.println("functExit");
-			while (!(_mode.equals("1") || _mode.equals("2") || _mode.equals("3") || _mode.equals("4") || _mode.equals("5")))
+			while (true)
 			{
-				_mode = cl.inputString("inputChoice");
-			}
-			
-			if (_mode.equals("1") || _mode.equals("2") || _mode.equals("3"))
-			{
-				if (_mode.equals("1") || _mode.equals("2"))
+				System.out.println("Please choose an option");
+				System.out.println();
+				System.out.println("1 - Create new account or update existing one (change pass and access level)");
+				System.out.println("2 - Change access level");
+				System.out.println("3 - Delete existing account");
+				System.out.println("4 - List accounts and access levels");
+				System.out.println("5 - Exit");
+				while (!(_mode.equals("1") || _mode.equals("2") || _mode.equals("3") || _mode.equals("4") || _mode.equals("5")))
 				{
-					while (_uname.trim().length() == 0)
-					{
-						_uname = cl.inputString("inputUsername").toLowerCase();
-					}
+					System.out.print("Your choice: ");
+					_mode = _scn.next();
 				}
-				else if (_mode.equals("3"))
+				
+				if (_mode.equals("1") || _mode.equals("2") || _mode.equals("3"))
 				{
 					while (_uname.trim().length() == 0)
 					{
-						_uname = cl.inputString("inputUsername").toLowerCase();
+						System.out.print("Username: ");
+						_uname = _scn.next().toLowerCase();
+					}
+					
+					if (_mode.equals("1"))
+					{
+						while (_pass.trim().length() == 0)
+						{
+							System.out.print("Password: ");
+							_pass = _scn.next();
+						}
+					}
+					
+					if (_mode.equals("1") || _mode.equals("2"))
+					{
+						while (_level.trim().length() == 0)
+						{
+							System.out.print("Access level: ");
+							_level = _scn.next();
+						}
 					}
 				}
+				
 				if (_mode.equals("1"))
 				{
-					while (_pass.trim().length() == 0)
-					{
-						_pass = cl.inputString("inputPassword");
-					}
+					// Add or Update
+					addOrUpdateAccount(_uname.trim(), _pass.trim(), _level.trim());
 				}
-				if (_mode.equals("1") || _mode.equals("2"))
+				else if (_mode.equals("2"))
+				{
+					// Change Level
+					changeAccountLevel(_uname.trim(), _level.trim());
+				}
+				else if (_mode.equals("3"))
 				{
-					while (_level.trim().length() == 0)
+					// Delete
+					System.out.print("WARNING: This will not delete the gameserver data (characters, items, etc..)");
+					System.out.print(" it will only delete the account login server data.");
+					System.out.println();
+					System.out.print("Do you really want to delete this account? Y/N: ");
+					String yesno = _scn.next();
+					if ((yesno != null) && yesno.equalsIgnoreCase("Y"))
 					{
-						_level = cl.inputString("inputAccessLevel");
+						deleteAccount(_uname.trim());
+					}
+					else
+					{
+						System.out.println("Deletion cancelled.");
 					}
 				}
-			}
-			
-			if (_mode.equals("1"))
-			{
-				// Add or Update
-				addOrUpdateAccount(_uname.trim(), _pass.trim(), _level.trim());
-			}
-			else if (_mode.equals("2"))
-			{
-				// Change Level
-				changeAccountLevel(_uname.trim(), _level.trim());
-			}
-			else if (_mode.equals("3"))
-			{
-				// Delete
-				String yesno = cl.inputString("functDeleteAccountConfirm");
-				if ((yesno != null) && yesno.equalsIgnoreCase(cl.getString("yesChar")))
+				else if (_mode.equals("4"))
 				{
-					deleteAccount(_uname.trim());
+					// List
+					_mode = "";
+					System.out.println();
+					System.out.println("Please choose a listing mode");
+					System.out.println();
+					System.out.println("1 - Banned accounts only (accessLevel < 0)");
+					System.out.println("2 - GM/privileged accounts (accessLevel > 0");
+					System.out.println("3 - Regular accounts only (accessLevel = 0)");
+					System.out.println("4 - List all");
+					while (!(_mode.equals("1") || _mode.equals("2") || _mode.equals("3") || _mode.equals("4")))
+					{
+						System.out.print("Your choice: ");
+						_mode = _scn.next();
+					}
+					System.out.println();
+					printAccInfo(_mode);
 				}
-				else
+				else if (_mode.equals("5"))
 				{
-					cl.println("functDeleteAccountCancel");
+					System.exit(0);
 				}
-			}
-			else if (_mode.equals("4"))
-			{
-				// List
+				
+				_uname = "";
+				_pass = "";
+				_level = "";
 				_mode = "";
-				cl.println();
-				cl.println("functListAccountChooser");
-				cl.println();
-				cl.println("functListAccountBanned");
-				cl.println("functListAccountPrivileged");
-				cl.println("functListAccountRegular");
-				cl.println("functListAccountAll");
-				while (!(_mode.equals("1") || _mode.equals("2") || _mode.equals("3") || _mode.equals("4")))
-				{
-					_mode = cl.inputString("inputChoice");
-				}
-				cl.println();
-				printAccInfo(_mode);
-			}
-			else if (_mode.equals("5"))
-			{
-				System.exit(0);
+				System.out.println();
 			}
-			
-			_uname = "";
-			_pass = "";
-			_level = "";
-			_mode = "";
-			cl.println();
 		}
 	}
 	
-	private static void printAccInfo(String m) throws SQLException
+	private static void printAccInfo(String m)
 	{
 		int count = 0;
 		String q = "SELECT login, accessLevel FROM accounts ";
@@ -188,311 +169,98 @@ public class SQLAccountManager
 		q = q.concat(" ORDER BY login ASC");
 		
 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement = con.prepareStatement(q);
-			ResultSet rset = statement.executeQuery())
+			PreparedStatement ps = con.prepareStatement(q);
+			ResultSet rset = ps.executeQuery())
 		{
 			while (rset.next())
 			{
 				System.out.println(rset.getString("login") + " -> " + rset.getInt("accessLevel"));
 				count++;
 			}
+			
+			System.out.println("Displayed accounts: " + count);
+		}
+		catch (SQLException e)
+		{
+			System.out.println("There was error while displaying accounts:");
+			System.out.println(e.getMessage());
 		}
-		cl.println("functListAccountDisplayed", count);
 	}
 	
-	private static void addOrUpdateAccount(String account, String password, String level) throws IOException, SQLException, NoSuchAlgorithmException
+	private static void addOrUpdateAccount(String account, String password, String level)
 	{
-		// Encode Password
-		MessageDigest md = MessageDigest.getInstance("SHA");
-		byte[] newpass;
-		newpass = password.getBytes("UTF-8");
-		newpass = md.digest(newpass);
-		
-		// Add to Base
 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement = con.prepareStatement("REPLACE accounts (login, password, accessLevel) VALUES (?,?,?)"))
+			PreparedStatement ps = con.prepareStatement("REPLACE accounts(login, password, accessLevel) VALUES (?, ?, ?)"))
 		{
-			statement.setString(1, account);
-			statement.setString(2, Base64.encodeBytes(newpass));
-			statement.setString(3, level);
-			statement.executeUpdate();
+			MessageDigest md = MessageDigest.getInstance("SHA");
+			byte[] newPassword;
+			newPassword = password.getBytes("UTF-8");
+			newPassword = md.digest(newPassword);
+			
+			ps.setString(1, account);
+			ps.setString(2, Base64.encodeBytes(newPassword));
+			ps.setString(3, level);
+			if (ps.executeUpdate() > 0)
+			{
+				
+				System.out.println("Account " + account + " has been created or updated");
+			}
+			else
+			{
+				System.out.println("Account " + account + " does not exist");
+			}
+		}
+		catch (Exception e)
+		{
+			System.out.println("There was error while adding/updating account:");
+			System.out.println(e.getMessage());
 		}
 	}
 	
-	private static void changeAccountLevel(String account, String level) throws SQLException
+	private static void changeAccountLevel(String account, String level)
 	{
 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement ps1 = con.prepareStatement("SELECT COUNT(*) FROM accounts WHERE login=?;"))
+			PreparedStatement ps = con.prepareStatement("UPDATE accounts SET accessLevel = ? WHERE login = ?"))
 		{
-			ps1.setString(1, account);
-			try (ResultSet rs = ps1.executeQuery())
+			ps.setString(1, level);
+			ps.setString(2, account);
+			if (ps.executeUpdate() > 0)
 			{
-				if (!rs.next())
-				{
-					cl.println("falseString");
-				}
-				else if (rs.getInt(1) > 0)
-				{
-					// Exist
-					// Update
-					try (PreparedStatement ps2 = con.prepareStatement("UPDATE accounts SET accessLevel=? WHERE login=?;"))
-					{
-						ps2.setEscapeProcessing(true);
-						ps2.setString(1, level);
-						ps2.setString(2, account);
-						ps2.executeUpdate();
-					}
-					cl.println("functAccessLevelUpdated", account);
-				}
-				else
-				{
-					// Not Exist
-					cl.println("functAccessLevelNotExist", account);
-				}
+				
+				System.out.println("Account " + account + " has been updated");
 			}
+			else
+			{
+				System.out.println("Account " + account + " does not exist");
+			}
+		}
+		catch (SQLException e)
+		{
+			System.out.println("There was error while updating account:");
+			System.out.println(e.getMessage());
 		}
 	}
 	
-	private static void deleteAccount(String account) throws SQLException
+	private static void deleteAccount(String account)
 	{
-		// Check Account Exist
-		try (Connection con = L2DatabaseFactory.getInstance().getConnection())
+		try (Connection con = L2DatabaseFactory.getInstance().getConnection();
+			PreparedStatement ps = con.prepareStatement("DELETE FROM accounts WHERE login = ?"))
 		{
-			PreparedStatement statement = con.prepareStatement("SELECT COUNT(*) FROM accounts WHERE login=?;");
-			statement.setString(1, account);
-			ResultSet rset = statement.executeQuery();
-			if (!rset.next())
+			ps.setString(1, account);
+			if (ps.executeUpdate() > 0)
 			{
-				cl.println("falseString");
-				rset.close();
-			}
-			else if (rset.getInt(1) > 0)
-			{
-				rset.close();
-				// Account exist
-				// Get Accounts ID
-				ResultSet rcln;
-				statement = con.prepareStatement("SELECT charId, char_name, clanid FROM characters WHERE account_name=?;");
-				statement.setEscapeProcessing(true);
-				statement.setString(1, account);
-				rset = statement.executeQuery();
-				
-				FastList<String> objIds = new FastList<>();
-				FastList<String> charNames = new FastList<>();
-				FastList<String> clanIds = new FastList<>();
-				
-				while (rset.next())
-				{
-					objIds.add(rset.getString("charId"));
-					charNames.add(rset.getString("char_name"));
-					clanIds.add(rset.getString("clanid"));
-				}
-				rset.close();
-				
-				for (int index = 0; index < objIds.size(); index++)
-				{
-					cl.println("functDeleteAccountChar", charNames.get(index));
-					
-					// Check If clan leader Remove Clan and remove all from it
-					statement.close();
-					statement = con.prepareStatement("SELECT COUNT(*) FROM clan_data WHERE leader_id=?;");
-					statement.setString(1, clanIds.get(index));
-					rcln = statement.executeQuery();
-					rcln.next();
-					if (rcln.getInt(1) > 0)
-					{
-						rcln.close();
-						// Clan Leader
-						
-						// Get Clan Name
-						statement.close();
-						statement = con.prepareStatement("SELECT clan_name FROM clan_data WHERE leader_id=?;");
-						statement.setString(1, clanIds.get(index));
-						rcln = statement.executeQuery();
-						rcln.next();
-						
-						String clanName = rcln.getString("clan_name");
-						
-						cl.println("functDeleteAccountClan", clanName);
-						
-						// Delete Clan Wars
-						statement.close();
-						statement = con.prepareStatement("DELETE FROM clan_wars WHERE clan1=? OR clan2=?;");
-						statement.setEscapeProcessing(true);
-						statement.setString(1, clanName);
-						statement.setString(2, clanName);
-						statement.executeUpdate();
-						
-						rcln.close();
-						
-						// Remove All From clan
-						statement.close();
-						statement = con.prepareStatement("UPDATE characters SET clanid=0 WHERE clanid=?;");
-						statement.setString(1, clanIds.get(index));
-						statement.executeUpdate();
-						// Free Clan Halls
-						statement.close();
-						statement = con.prepareStatement("UPDATE clanhall SET ownerId=0, paidUntil=0, paid=0 WHERE ownerId=?;");
-						statement.setString(1, clanIds.get(index));
-						statement.executeUpdate();
-						// Delete Clan
-						statement.close();
-						statement = con.prepareStatement("DELETE FROM clan_data WHERE clan_id=?;");
-						statement.setString(1, clanIds.get(index));
-						statement.executeUpdate();
-						// Clan privileges
-						statement.close();
-						statement = con.prepareStatement("DELETE FROM clan_privs WHERE clan_id=?;");
-						statement.setString(1, clanIds.get(index));
-						statement.executeUpdate();
-						// Clan subpledges
-						statement.close();
-						statement = con.prepareStatement("DELETE FROM clan_subpledges WHERE clan_id=?;");
-						statement.setString(1, clanIds.get(index));
-						statement.executeUpdate();
-						// Clan skills
-						statement.close();
-						statement = con.prepareStatement("DELETE FROM clan_skills WHERE clan_id=?;");
-						statement.setString(1, clanIds.get(index));
-						statement.executeUpdate();
-						
-					}
-					else
-					{
-						rcln.close();
-					}
-					
-					// skills
-					statement.close();
-					statement = con.prepareStatement("DELETE FROM character_skills WHERE charId=?;");
-					statement.setString(1, objIds.get(index));
-					statement.executeUpdate();
-					
-					// skills save
-					statement.close();
-					statement = con.prepareStatement("DELETE FROM character_skills_save WHERE charId=?;");
-					statement.setString(1, objIds.get(index));
-					statement.executeUpdate();
-					
-					// subclasses
-					statement.close();
-					statement = con.prepareStatement("DELETE FROM character_subclasses WHERE charId=?;");
-					statement.setString(1, objIds.get(index));
-					statement.executeUpdate();
-					
-					// shortcuts
-					statement.close();
-					statement = con.prepareStatement("DELETE FROM character_shortcuts WHERE charId=?;");
-					statement.setString(1, objIds.get(index));
-					statement.executeUpdate();
-					
-					// items
-					statement.close();
-					statement = con.prepareStatement("DELETE FROM items WHERE owner_id=?;");
-					statement.setString(1, objIds.get(index));
-					statement.executeUpdate();
-					
-					// recipebook
-					statement.close();
-					statement = con.prepareStatement("DELETE FROM character_recipebook WHERE charId=?;");
-					statement.setString(1, objIds.get(index));
-					statement.executeUpdate();
-					
-					// quests
-					statement.close();
-					statement = con.prepareStatement("DELETE FROM character_quests WHERE charId=?;");
-					statement.setString(1, objIds.get(index));
-					statement.executeUpdate();
-					
-					// macroses
-					statement.close();
-					statement = con.prepareStatement("DELETE FROM character_macroses WHERE charId=?;");
-					statement.setString(1, objIds.get(index));
-					statement.executeUpdate();
-					
-					// contacts
-					statement.close();
-					statement = con.prepareStatement("DELETE FROM character_contacts WHERE charId=? OR contactId=?;");
-					statement.setString(1, objIds.get(index));
-					statement.setString(2, objIds.get(index));
-					statement.executeUpdate();
-					
-					// friends
-					statement.close();
-					statement = con.prepareStatement("DELETE FROM character_friends WHERE charId=? OR friendId=?;");
-					statement.setString(1, objIds.get(index));
-					statement.setString(2, objIds.get(index));
-					statement.executeUpdate();
-					
-					// merchant_lease
-					statement.close();
-					statement = con.prepareStatement("DELETE FROM merchant_lease WHERE player_id=?;");
-					statement.setString(1, objIds.get(index));
-					statement.executeUpdate();
-					
-					// boxaccess
-					statement.close();
-					statement = con.prepareStatement("DELETE FROM boxaccess WHERE charname=?;");
-					statement.setString(1, charNames.get(index));
-					statement.executeUpdate();
-					
-					// hennas
-					statement.close();
-					statement = con.prepareStatement("DELETE FROM character_hennas WHERE charId=?;");
-					statement.setString(1, objIds.get(index));
-					statement.executeUpdate();
-					
-					// recommends
-					statement.close();
-					statement = con.prepareStatement("DELETE FROM character_reco_bonus WHERE charId=?;");
-					statement.setString(1, objIds.get(index));
-					statement.executeUpdate();
-					
-					// ui categories
-					statement.close();
-					statement = con.prepareStatement("DELETE FROM character_ui_categories WHERE charId=?;");
-					statement.setString(1, objIds.get(index));
-					statement.executeUpdate();
-					
-					// ui keys
-					statement.close();
-					statement = con.prepareStatement("DELETE FROM character_ui_keys WHERE charId=?;");
-					statement.setString(1, objIds.get(index));
-					statement.executeUpdate();
-					
-					// characters
-					statement.close();
-					statement = con.prepareStatement("DELETE FROM characters WHERE charId=?;");
-					statement.setString(1, objIds.get(index));
-					statement.executeUpdate();
-					
-					// TODO: delete pets, olympiad/noble/hero stuff
-				}
-				
-				// characters
-				statement.close();
-				statement = con.prepareStatement("DELETE FROM account_gsdata WHERE account_name=?;");
-				statement.setString(1, account);
-				statement.executeUpdate();
 				
-				// Delete Account
-				statement.close();
-				statement = con.prepareStatement("DELETE FROM accounts WHERE login=?;");
-				statement.setEscapeProcessing(true);
-				statement.setString(1, account);
-				statement.executeUpdate();
-				
-				cl.println("functDeleteAccountComplete", account);
+				System.out.println("Account " + account + " has been deleted");
 			}
 			else
 			{
-				// Not Exist
-				cl.println("functDeleteAccountNotExist", account);
+				System.out.println("Account " + account + " does not exist");
 			}
-			
-			// Close Connection
-			statement.close();
+		}
+		catch (SQLException e)
+		{
+			System.out.println("There was error while deleting account:");
+			System.out.println(e.getMessage());
 		}
 	}
-	
 }

+ 0 - 236
L2J_Server_BETA/java/com/l2jserver/tools/ngl/ConsoleLocalizator.java

@@ -1,236 +0,0 @@
-/*
- * Copyright (C) 2004-2013 L2J Server
- * 
- * This file is part of L2J Server.
- * 
- * L2J Server is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * L2J Server is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jserver.tools.ngl;
-
-import java.io.PrintStream;
-import java.io.UnsupportedEncodingException;
-import java.util.Formatter;
-import java.util.Locale;
-import java.util.Scanner;
-
-import com.l2jserver.util.osnative.CodePage;
-import com.l2jserver.util.osnative.WinConsole;
-import com.sun.jna.Platform;
-import com.sun.jna.Pointer;
-import com.sun.jna.ptr.IntByReference;
-
-/**
- * @author mrTJO
- */
-public class ConsoleLocalizator extends LocalizationParser
-{
-	public static final String EOL = System.getProperty("line.separator");
-	
-	private WinConsole _wcon;
-	private Pointer _stdout;
-	private static PrintStream _out;
-	
-	Scanner _scn = new Scanner(System.in);
-	String _baseName = "NGLConsole";
-	
-	/**
-	 * Load ConsoleLocalizator by using Default Locale
-	 * @param dir
-	 * @param baseName
-	 */
-	public ConsoleLocalizator(String dir, String baseName)
-	{
-		this(dir, baseName, Locale.getDefault());
-	}
-	
-	/**
-	 * Load ConsoleLocalizator by using a specified Locale
-	 * @param dir
-	 * @param baseName
-	 * @param locale
-	 */
-	public ConsoleLocalizator(String dir, String baseName, Locale locale)
-	{
-		super(dir, baseName, locale);
-		loadConsole();
-	}
-	
-	/**
-	 * Load ConsoleLocalizator by using a custom xml file ../languages/<dir>/<baseName>_<locale>.xml
-	 * @param dir
-	 * @param baseName
-	 * @param locale
-	 */
-	public ConsoleLocalizator(String dir, String baseName, String locale)
-	{
-		super(dir, baseName, locale);
-		loadConsole();
-	}
-	
-	/**
-	 * Choose the appropriate output stream for console
-	 */
-	private void loadConsole()
-	{
-		if (Platform.isWindows())
-		{
-			try
-			{
-				_wcon = WinConsole.INSTANCE;
-				
-				if (_wcon.GetConsoleOutputCP() != 0)
-				{
-					// Set Console Output to UTF8
-					_wcon.SetConsoleOutputCP(CodePage.CP_UTF8);
-					
-					// Set Output to STDOUT
-					_stdout = _wcon.GetStdHandle(-11);
-				}
-				else
-				{
-					// Not running from windows console
-					_wcon = null;
-				}
-			}
-			catch (Exception e)
-			{
-				// Missing function in Kernel32
-				_wcon = null;
-			}
-		}
-		
-		if (_wcon == null) // Not running windows console
-		{
-			try
-			{
-				// UTF-8 Print Stream
-				_out = new PrintStream(System.out, true, "UTF-8");
-			}
-			catch (UnsupportedEncodingException e)
-			{
-				// UTF-8 Not Supported
-				_out = new PrintStream(System.out, true);
-				directPrint("Your system doesn't support UTF-8 encoding" + EOL);
-			}
-		}
-	}
-	
-	/**
-	 * Get string from translation, add arguments and write it to console.
-	 * @param id
-	 * @param args
-	 */
-	public void print(String id, Object... args)
-	{
-		String msg = getStringFromId(id);
-		if (msg == null)
-		{
-			msg = formatText("Untranslated id: %s", id);
-		}
-		else
-		{
-			msg = formatText(msg, args);
-		}
-		directPrint(msg);
-	}
-	
-	/**
-	 * Write a new line
-	 */
-	public void println()
-	{
-		directPrint(EOL);
-	}
-	
-	/**
-	 * Get string from translation, add arguments and write it to console with a newline at the end of string.
-	 * @param id
-	 * @param args
-	 */
-	public void println(String id, Object... args)
-	{
-		String msg = getStringFromId(id);
-		if (msg == null)
-		{
-			msg = formatText("Untranslated id: %s" + EOL, id);
-		}
-		else
-		{
-			msg = formatText(msg + EOL, args);
-		}
-		directPrint(msg);
-	}
-	
-	/**
-	 * Get string from translation, add arguments and write it to console. Wait for an input and return in form of string.
-	 * @param id
-	 * @param args
-	 * @return Input String
-	 */
-	public String inputString(String id, Object... args)
-	{
-		print(id, args);
-		directPrint(": ");
-		String ret = _scn.next();
-		return ret;
-	}
-	
-	/**
-	 * Read string from translation file and append arguments.
-	 * @param id
-	 * @param args
-	 * @return
-	 */
-	public String getString(String id, Object... args)
-	{
-		String msg = getStringFromId(id);
-		if (msg == null)
-		{
-			return formatText("Untranslated id: %s", id);
-		}
-		return formatText(msg, args);
-	}
-	
-	/**
-	 * Append arguments to specified string.
-	 * @param text
-	 * @param args
-	 * @return
-	 */
-	private String formatText(String text, Object... args)
-	{
-		String formattedText = null;
-		try (Formatter form = new Formatter())
-		{
-			formattedText = form.format(text, args).toString();
-		}
-		return formattedText;
-	}
-	
-	/**
-	 * Write the text into console by using UTF-8 PrintStream under UNIX environment, and Kernel32.dll under Windows.
-	 * @param message
-	 */
-	private void directPrint(String message)
-	{
-		if (_wcon == null)
-		{
-			_out.print(message);
-		}
-		else
-		{
-			_wcon.WriteConsoleW(_stdout, message.toCharArray(), message.length(), new IntByReference(), null);
-		}
-	}
-}

+ 0 - 56
L2J_Server_BETA/java/com/l2jserver/util/osnative/CodePage.java

@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2004-2013 L2J Server
- * 
- * This file is part of L2J Server.
- * 
- * L2J Server is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * L2J Server is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jserver.util.osnative;
-
-/**
- * This class contains console code pages
- * @author mrTJO
- */
-public final class CodePage
-{
-	public static final int CP_OEM_US = 437;
-	public static final int CP_OEM_ARABIC = 720;
-	public static final int CP_OEM_GREEK = 737;
-	public static final int CP_OEM_BALTIC = 775;
-	public static final int CP_OEM_LATIN_I = 850;
-	public static final int CP_OEM_LATIN_II = 852;
-	public static final int CP_OEM_CYRILLIC = 855;
-	public static final int CP_OEM_TURKISH = 857;
-	public static final int CP_OEM_LATIN_EU = 858;
-	public static final int CP_OEM_HEBREW = 862;
-	public static final int CP_OEM_RUSSIAN = 866;
-	
-	public static final int CP_THAI = 874;
-	public static final int CP_JAPANESE = 932;
-	public static final int CP_SIMPL_CHINESE = 936;
-	public static final int CP_KOREAN = 949;
-	public static final int CP_TRAD_CHINESE = 950;
-	public static final int CP_CENTRAL_EU = 1250;
-	public static final int CP_CYRILLIC = 1251;
-	public static final int CP_LATIN_I = 1252;
-	public static final int CP_GREEK = 1253;
-	public static final int CP_TURKISH = 1254;
-	public static final int CP_HEBREW = 1255;
-	public static final int CP_ARABIC = 1256;
-	public static final int CP_BALTIC = 1257;
-	public static final int CP_VIETNAM = 1258;
-	
-	public static final int CP_UTF7 = 65000;
-	public static final int CP_UTF8 = 65001;
-}

+ 0 - 41
L2J_Server_BETA/java/com/l2jserver/util/osnative/WinConsole.java

@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2004-2013 L2J Server
- * 
- * This file is part of L2J Server.
- * 
- * L2J Server is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * L2J Server is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jserver.util.osnative;
-
-import com.sun.jna.Native;
-import com.sun.jna.Pointer;
-import com.sun.jna.ptr.IntByReference;
-import com.sun.jna.win32.StdCallLibrary;
-import com.sun.jna.win32.W32APIOptions;
-
-/**
- * @author mrTJO
- */
-public interface WinConsole extends StdCallLibrary
-{
-	WinConsole INSTANCE = (WinConsole) Native.loadLibrary("kernel32", WinConsole.class, W32APIOptions.UNICODE_OPTIONS);
-	
-	public boolean SetConsoleOutputCP(int codePage);
-	
-	public int GetConsoleOutputCP();
-	
-	public Pointer GetStdHandle(int stream);
-	
-	public boolean WriteConsoleW(Pointer stream, char[] text, int textLen, IntByReference caretPosition, Pointer reservedNull);
-}