CLI options added: Address to broadcast games to (defaults to localhost) and port to run webserver on (defaults to 8333)

Improvements

.gitignore

@@ -0,0 +1,23 @@
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, 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
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state 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 program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program 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.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU 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 <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -0,0 +1,9 @@
+WC3Connect-Java
+===============
+
+This is a cross-platform Java version of WC3Connect.
+
+To compile:
+
+	$ ./launch.sh
+	$ ./package.sh

cls/static/index.html

@@ -2,9 +2,10 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8">
+		<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
-		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+		<link rel="stylesheet" href="bootstrap.css">
 		<link rel="stylesheet" href="style.css">
 
 		<title>WC3Connect</title>
@@ -31,8 +32,8 @@
 				</div>
 				<div class="form-group row">
 					<div class="offset-sm-2 col-sm-10">
-						<button type="submit" class="btn btn-primary">Login</button>
-						<button id="signup_btn" type="submit" class="btn btn-primary">Sign Up</button>
+						<button type="submit" class="btn btn-primary step1_btn">Login</button>
+						<button id="signup_btn" type="submit" class="btn btn-primary step1_btn">Sign Up</button>
 					</div>
 				</div>
 			</form>
@@ -41,6 +42,26 @@
 			<h2>WC3Connect</h2>
 			<div id="versiondiv" class="alert alert-danger" style="display:none"></div>
 			<div id="motddiv" class="alert alert-info" style="display:none"></div>
+			<div id="wc3backupdiv" class="alert alert-warning wc3alert" style="display:none">
+				We detected your 1.30.1 WC3 installation at <span id="wc3backup_src"></span>.
+				<br />We recommend creating a backup of this installation in case you want to try the 1.30.2 patch, or in case you accidentally upgrade.
+				<br />Pressing Backup My WC3 below will copy your installation to <span id="wc3backup_home"></span>\wc3.
+				<br /><button id="wc3backup_btn" class="btn btn-primary">Backup My WC3</button>
+			</div>
+			<div id="wc3bad1div" class="alert alert-warning wc3alert" style="display:none">
+				We detected your installation at <span id="wc3bad1_dir"></span>, but it doesn't seem to be on the 1.30.1 patch.
+				<br />We recommend creating a backup of your 1.30.1 WC3 installation in case you want to try the 1.30.2 patch, or in case you accidentally upgrade.
+				<br />If you copy your 1.30.1 WC3 installation to <span id="wc3bad1_home"></span>\wc3, then we'll automatically detect it.
+			</div>
+			<div id="wc3bad2div" class="alert alert-warning wc3alert" style="display:none">
+				We were unable to detect your WC3 installation directory.
+				<br />We recommend creating a backup of your 1.30.1 WC3 installation in case you want to try the 1.30.2 patch, or in case you accidentally upgrade.
+				<br />If you copy your 1.30.1 WC3 installation to <span id="wc3bad2_home"></span>\wc3, then we'll automatically detect it.
+			</div>
+			<div id="wc3gooddiv" class="alert alert-info wc3alert" style="display:none">
+				Press Start WC3 below to start your 1.30.1 WC3 installation at <span id="wc3good_dir"></span>.
+				<button id="wc3good_btn" class="btn btn-primary">Start WC3</button>
+			</div>
 			<p>Select a game below. Then, go to Local Area Network in Warcraft III and join it!</p>
 			<div role="navigation">
 				<ul id="mtab" class="nav nav-pills" role="tablist">
@@ -53,6 +74,9 @@
 					<li role="presentation">
 						<a id="others-tab" data-toggle="pill" href="#others" role="tab" aria-controls="others">Others</a>
 					</li>
+					<li role="presentation">
+						<a id="unmoderated-tab" data-toggle="pill" href="#unmoderated" role="tab" aria-controls="unmoderated">Unmoderated</a>
+					</li>
 					<li role="presentation">
 						<a id="settings-tab" data-toggle="pill" href="#settings" role="tab" aria-controls="settings">Settings</a>
 					</li>
@@ -101,12 +125,34 @@
 						<tbody id="others-tbody"></tbody>
 					</table>
 				</div>
+				<div class="tab-pane" id="unmoderated" role="tabpanel" aria-labelledby="unmoderated-tab">
+					<table class="table table-sm">
+						<thead>
+							<tr>
+								<th>Location</th>
+								<th>Gamename</th>
+								<th>Map</th>
+								<th>Host</th>
+								<th>Slots</th>
+							</tr>
+						</thead>
+						<tbody id="unmoderated-tbody"></tbody>
+					</table>
+				</div>
 				<div class="tab-pane" id="settings" role="tabpanel" aria-labelledby="settings-tab">
 					<div id="settingsinfo" class="alert alert-info" style="display:none"></div>
 					<div class="form-check">
 						<input type="checkbox" class="form-check-input" id="cfgNoBroadcast">
 						<label class="form-check-label" for="cfgNoBroadcast">Don't broadcast games to 255.255.255.255 (check when multiple players are on the same LAN)</label>
 					</div>
+					<div class="form-check" style="display:none">
+						<input type="checkbox" class="form-check-input" id="cfgEnableLAN">
+						<label class="form-check-label" for="cfgEnableLAN">Enable hosting from LAN (you'll need to set up port forwarding)</label>
+					</div>
+					<div class="form-check" style="display:none">
+						<input type="checkbox" class="form-check-input" id="cfgDisableInGameRefresh">
+						<label class="form-check-label" for="cfgDisableInGameRefresh">Stop refreshing the gamelist when a game is in-progress (may alleviate bandwidth issues)</label>
+					</div>
 					<div>
 						<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#validateModal">
 							Validate
@@ -121,7 +167,7 @@
 				<div class="modal-content">
 					<div class="modal-header">
 						<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-						<h4 class="modal-title">Modal title</h4>
+						<h4 class="modal-title">Validate Account</h4>
 					</div>
 					<div class="modal-body">
 						<p>To validate your WC3Connect account with your entgaming.net forum account, enter the validation key below.</p>
@@ -141,8 +187,28 @@
 			</div>
 		</div>
 
-		<script src="https://code.jquery.com/jquery-1.12.4.min.js" crossorigin="anonymous"></script>
-		<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
-		<script src="index.js"></script>
+		<div class="modal" id="progressModal" tabindex="-1" role="dialog">
+			<div class="modal-dialog" role="document">
+				<div class="modal-content">
+					<div class="modal-header">
+						<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+						<h4 class="modal-title">In Progress</h4>
+					</div>
+					<div class="modal-body">
+						<div id="progresserror" class="alert alert-danger" style="display:none"></div>
+						<div id="progressprogress">
+							<p>Operation in progress...</p>
+							<img src="/loading.gif" />
+						</div>
+					</div>
+					<div class="modal-footer">
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<script src="jquery.js"></script>
+		<script src="bootstrap.js"></script>
+		<script src="index.js?v=2018101904"></script>
 	</body>
 </html>

cls/static/index.js

@@ -28,6 +28,7 @@ $(document).ready(function() {
 			'username': $('#username').val(),
 			'password': $('#password').val(),
 		};
+		$('.step1_btn').prop('disabled', true);
 		$.post('/login', params, function(data) {
 			$('#username').val('');
 			$('#password').val('');
@@ -39,7 +40,9 @@ $(document).ready(function() {
 				$('#step2').css('display', '');
 				onLogin(data.session_key);
 			}
-		}, 'json');
+		}, 'json').always(function() {
+			$('.step1_btn').prop('disabled', false);
+		});
 	});
 
 	$('#signup_btn').click(function(e) {
@@ -48,6 +51,7 @@ $(document).ready(function() {
 			'username': $('#username').val(),
 			'password': $('#password').val(),
 		};
+		$('.step1_btn').prop('disabled', true);
 		$.post('/signup', params, function(data) {
 			$('#username').val('');
 			$('#password').val('');
@@ -57,7 +61,9 @@ $(document).ready(function() {
 				showMsg('Your account has been created. You can now login below.');
 			}
 			$('#username').focus();
-		}, 'json');
+		}, 'json').always(function() {
+			$('.step1_btn').prop('disabled', false);
+		});
 	});
 
 	$('#username').keypress(function() {
@@ -90,6 +96,39 @@ var onLogin = function(sessionKey) {
 		if(data.no_broadcast) {
 			$('#cfgNoBroadcast').prop('checked', true);
 		}
+		if(data.enable_lan) {
+			$('#cfgEnableLAN').prop('checked', true);
+		}
+		if(data.disable_in_game_refresh) {
+			$('#cfgDisableInGameRefresh').prop('checked', true);
+		}
+	}, 'json');
+
+	var showWC3Alert = function(id) {
+		$('.wc3alert').css('display', 'none');
+		$('#' + id).css('display', '');
+	};
+
+	$.post('/wc3', function(data) {
+		if(data.installation && data.installation.correct_patch && data.installation.backup) {
+			$('#wc3good_dir').text(data.installation.path);
+			$('#wc3good_btn').data('path', data.installation.path)
+			showWC3Alert('wc3gooddiv');
+		} else if(data.home_dir) {
+			if(data.installation && data.installation.correct_patch) {
+				$('#wc3backup_src').text(data.installation.path);
+				$('#wc3backup_home').text(data.home_dir);
+				$('#wc3backup_btn').data('path', data.installation.path);
+				showWC3Alert('wc3backupdiv');
+			} else if(data.installation) {
+				$('#wc3bad1_dir').text(data.installation.path);
+				$('#wc3bad1_home').text(data.home_dir);
+				showWC3Alert('wc3bad1div');
+			} else {
+				$('#wc3bad2_home').text(data.home_dir);
+				showWC3Alert('wc3bad2div');
+			}
+		}
 	}, 'json');
 
 	var setGames = function(tbody, games) {
@@ -161,12 +200,26 @@ var onLogin = function(sessionKey) {
 		}
 	};
 
-	var getGames = function() {
+	var getRefreshTime = function(counter) {
+		if(counter && counter < 3) {
+			return 1000;
+		} else {
+			return 3000;
+		}
+	};
+
+	var getGames = function(counter) {
 		$.post('/games', function(data) {
 			setGames($('#public-tbody'), data.publicGames);
 			setGames($('#autohost-tbody'), data.autohostGames);
 			setGames($('#others-tbody'), data.otherGames);
-		}, 'json');
+			setGames($('#unmoderated-tbody'), data.unmoderatedGames);
+		}, 'json')
+			.always(function() {
+				setTimeout(function() {
+					getGames(counter + 1);
+				}, getRefreshTime(counter));
+			});
 	};
 	$('tbody').on('click', 'tr.game', function() {
 		$('tr.game.selected').removeClass('selected');
@@ -176,7 +229,6 @@ var onLogin = function(sessionKey) {
 		$.post('/show', {'uid': uid});
 
 		if($(this).data('gameid')) {
-			console.log('adding stuff');
 			var row = $('<tr>')
 				.addClass('gameinfo')
 				.data('gameid', $(this).data('gameid'));
@@ -185,33 +237,42 @@ var onLogin = function(sessionKey) {
 				.attr('colspan', 5);
 			row = row.append(col);
 			$(this).after(row);
-			refreshInfo();
+			refreshInfo(true);
 		}
 	});
 	$('tbody').on('click', 'tr.gameinfo a', function(e) {
 		e.preventDefault();
 	});
-	var refreshInfo = function() {
+	var refreshInfo = function(norefresh) {
 		var row = $('tr.gameinfo');
 		if(row.length == 0) {
+			setTimeout(function() {
+				refreshInfo();
+			}, getRefreshTime());
 			return;
 		}
 		var gameid = row.data('gameid');
-		$.post('/gameinfo', {'gameid': gameid}, function(data) {
+		var post = $.post('/gameinfo', {'gameid': gameid}, function(data) {
 			row.children().html(data);
 		});
+		if(!norefresh) {
+			post.always(function() {
+				setTimeout(function() {
+					refreshInfo();
+				}, getRefreshTime());
+			});
+		}
 	};
-	getGames();
-	setInterval(function() {
-		getGames();
-	}, 1000);
-	setInterval(function() {
+	getGames(1);
+	setTimeout(function() {
 		refreshInfo();
 	}, 3000);
 
 	var setConfig = function() {
 		var params = {
 			'no_broadcast': $('#cfgNoBroadcast').prop('checked') ? 'yes' : '',
+			'enable_lan': $('#cfgEnableLAN').prop('checked') ? 'yes' : '',
+			'disable_in_game_refresh': $('#cfgDisableInGameRefresh').prop('checked') ? 'yes' : '',
 		};
 		$.post('/set-config', params);
 	};
@@ -220,6 +281,14 @@ var onLogin = function(sessionKey) {
 		setConfig();
 	});
 
+	$('#cfgEnableLAN').change(function() {
+		setConfig();
+	});
+
+	$('#cfgDisableInGameRefresh').change(function() {
+		setConfig();
+	});
+
 	var showSettingsInfo = function(msg) {
 		$('#settingsinfo').text(msg);
 		$('#settingsinfo').css('display', '');
@@ -244,4 +313,30 @@ var onLogin = function(sessionKey) {
 		}, 'json');
 		$('#validateModal').modal('hide')
 	});
+
+	$('#wc3backup_btn').click(function(e) {
+		e.preventDefault();
+		$('#progresserror').css('display', 'none');
+		$('#progressprogress').css('display', '');
+		$('#progressModal').modal('show');
+		var path = $('#wc3backup_btn').data('path');
+		$.post('/wc3-backup', {'path': path}, function(data) {
+			if(data.error) {
+				$('#progresserror').text(data.error);
+				$('#progresserror').css('display', '');
+				$('#progressprogress').css('display', 'none');
+				return;
+			}
+			$('#progressModal').modal('hide');
+			$('#wc3good_dir').text(data.path);
+			$('#wc3good_btn').data('path', data.path);
+			showWC3Alert('wc3gooddiv');
+		}, 'json');
+	});
+
+	$('#wc3good_btn').click(function(e) {
+		e.preventDefault();
+		var path = $('#wc3good_btn').data('path');
+		$.post('/wc3-start', {'path': path});
+	});
 };

launch.sh

@@ -1,2 +1,2 @@
 rm cls/connect2/*.class
-javac -source 1.6 -target 1.6 -classpath src -d cls src/connect2/Main.java && java -classpath cls connect2.Main
+javac -source 1.8 -target 1.8 -classpath src -d cls src/connect2/Main.java && java -classpath cls connect2.Main $*

src/connect2/ECConnection.java

@@ -36,8 +36,10 @@ public class ECConnection {
 	Integer localSync;
 	DataOutputStream remoteOut;
 
+	long nameMismatchWarning = 0;
 	String name;
-	long sessionkey; //entry key to use to connect to server; GC uses spoofcheck so this should by 0
+	String lanUsername;
+	String sessionKey;
 	GameInfo gameInfo; //host's game information, includes host counter and GCloud bot ID
 
 	boolean terminated;
@@ -67,10 +69,10 @@ public class ECConnection {
 	int remotePort;
 	int remoteKey;
 
-	public ECConnection(ECHost host, Socket socket, String name, long sessionKey) {
+	public ECConnection(ECHost host, Socket socket, String name, String sessionKey) {
 		this.host = host;
 		this.localSocket = socket;
-		this.sessionkey = sessionKey;
+		this.sessionKey = sessionKey;
 		this.gproxyEnabled = true;
 		this.name = name;
 
@@ -90,6 +92,10 @@ public class ECConnection {
 		laggers = new ArrayList<Integer>();
 		localBuffer = new LinkedList<byte[]>();
 
+		try {
+			localSocket.setTcpNoDelay(true);
+		} catch(Exception e) {}
+
 		try {
 			localOut = new DataOutputStream(localSocket.getOutputStream());
 		} catch(IOException ioe) {
@@ -180,6 +186,9 @@ public class ECConnection {
 			try {
 				remoteSocket = new Socket();
 				remoteSocket.setSoTimeout(15000);
+				try {
+					remoteSocket.setTcpNoDelay(true);
+				} catch(Exception e) {}
 				InetSocketAddress remoteSocketAddress = new InetSocketAddress(remoteAddress, remotePort);
 				System.out.println("[ECConnection] Making direct connection (no proxy set)");
 				remoteSocket.connect(remoteSocketAddress, 15000);
@@ -348,9 +357,14 @@ public class ECConnection {
 				}
 			}
 
+			if(this.nameMismatchWarning != 0 && System.currentTimeMillis() - this.nameMismatchWarning > 1000) {
+				this.nameMismatchWarning = 0;
+				this.sendLocalChat("WC3Connect warning: your LAN username (" + this.lanUsername + ") doesn't match your WC3Connect username (" + this.name + "). This could cause desyncs on some maps. We recommend rejoining after correcting the LAN username.");
+			}
+
 			if(identifier == 4) { //SLOTINFOJOIN
 				if(len >= 2) {
-					int slotInfoSize = buf.get(0) + buf.get(1) * 256;
+					int slotInfoSize = Utils.unsignedByte(buf.get(0)) + Utils.unsignedByte(buf.get(1)) * 256;
 
 					if(len >= 3 + slotInfoSize) {
 						pid = buf.get(2 + slotInfoSize);
@@ -360,7 +374,7 @@ public class ECConnection {
 
 				Map<String, String> m = new HashMap<String, String>();
 				m.put("username", this.name);
-				m.put("sessionkey", "" + this.sessionkey);
+				m.put("sessionkey", this.sessionKey);
 				m.put("gamename", this.gameInfo.gamename);
 				try {
 					Utils.postForm("https://connect.entgaming.net/spoofcheck", m);
@@ -608,10 +622,15 @@ public class ECConnection {
 			}
 
 			int entryKey = buf.getInt();
+			if(entryKey != 0) {
+				// probably joining a game hosted from WC3 client, not host bot
+				this.gproxyEnabled = false;
+			}
 			byte unknown = buf.get();
 			short listenPort = buf.getShort();
 			int peerKey = buf.getInt();
 			String name = ECUtil.getTerminatedString(buf);
+			this.lanUsername = name;
 
 			int remainderLength = len - buf.position();
 
@@ -622,6 +641,8 @@ public class ECConnection {
 			if(rewrittenUsernameStr.equalsIgnoreCase(name)) {
 				rewrittenUsernameStr = name;
 				this.name = name; // make sure case is right for the spoofcheck via connect.entgaming.net
+			} else {
+				this.nameMismatchWarning = System.currentTimeMillis();
 			}
 
 			byte[] rewrittenUsername = ECUtil.strToBytes(rewrittenUsernameStr); //replace LAN name with actual GC name (but use LAN name case if they're the same)
@@ -634,7 +655,6 @@ public class ECConnection {
 			lbuf.putShort((short) rewrittenLength); //W3GS packet length must include header
 
 			lbuf.putInt(gameInfo.hostCounter);
-			//lbuf.putInt(sessionkey);
 			lbuf.putInt(entryKey);
 
 			lbuf.put(unknown);
@@ -654,6 +674,9 @@ public class ECConnection {
 			try {
 				System.out.println("[ECConnection] Found game: " + gameInfo.remoteAddress.getHostAddress() + ":" + gameInfo.remotePort + "; connecting");
 				remoteSocket = new Socket(remoteAddress, remotePort);
+				try {
+					remoteSocket.setTcpNoDelay(true);
+				} catch(Exception e) {}
 				remoteOut = new DataOutputStream(remoteSocket.getOutputStream());
 				new ECForward(this, true, remoteSocket);
 			} catch(IOException ioe) {

src/connect2/ECHost.java

@@ -33,24 +33,34 @@ public class ECHost implements Runnable {
 
 	int war3version;
 	String name;
-	long sessionKey;
+	String sessionKey;
 
 	int serverPort = 7112;
 	int counter = 0; //game counter
 
 	boolean terminated = false;
 
-	public ECHost(int war3Version, String name, long sessionKey) {
+	public ECHost(int war3Version, String name, String sessionKey)
+	{
+		this(war3Version, name, sessionKey, "");
+	}
+	public ECHost(int war3Version, String name, String sessionKey, String broadcastIp) {
 		this.war3version = war3Version;
 		this.name = name;
 		this.sessionKey = sessionKey;
 
 		udpTargets = new ArrayList<SocketAddress>();
-		try {
-			udpTargets.add(new InetSocketAddress(InetAddress.getLocalHost(), 6112));
-			udpTargets.add(new InetSocketAddress("255.255.255.255", 6112));
-		} catch(UnknownHostException uhe) {
-			System.out.println("[ECHost] UDP broadcast target error: " + uhe.getLocalizedMessage());
+		if (broadcastIp!="")
+		{
+			udpTargets.add(new InetSocketAddress(broadcastIp, 6112));
+		}
+		else
+		{
+			try {
+				udpTargets.add(new InetSocketAddress(InetAddress.getLocalHost(), 6112));
+			} catch(UnknownHostException uhe) {
+				System.out.println("[ECHost] UDP broadcast target error: " + uhe.getLocalizedMessage());
+			}
 		}
 
 		this.games = new HashMap<Integer, GameInfo>();
@@ -59,7 +69,7 @@ public class ECHost implements Runnable {
 		this.buf = ByteBuffer.allocate(65536);
 	}
 
-	public void update(int war3Version, String name, long sessionKey) {
+	public void update(int war3Version, String name, String sessionKey) {
 		synchronized(this) {
 			this.war3version = war3Version;
 			this.name = name;
@@ -205,6 +215,9 @@ public class ECHost implements Runnable {
 		int senderPort = ECUtil.unsignedShort(lbuf.getShort());
 		buf.putShort((short) serverPort); //port
 
+		// connect.entgaming.net adds username as extra field at the end
+		String extra = ECUtil.getTerminatedString(lbuf);
+
 		//assign length in little endian
 		int length = buf.position();
 		buf.putShort(2, (short) length);
@@ -215,7 +228,7 @@ public class ECHost implements Runnable {
 		buf.get(packetBytes);
 
 		//create new gameinfo
-		GameInfo game = new GameInfo(counter++, addr, senderPort, hostCounter, gamename, mapPath);
+		GameInfo game = new GameInfo(counter++, addr, senderPort, hostCounter, gamename, mapPath, extra);
 
 		synchronized(this.games) {
 			this.games.put(game.uid, game);

src/connect2/ECList.java

@@ -1,18 +1,10 @@
 package connect2;
 
-import java.awt.Color;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
 import org.json.JSONArray;
+
 import javax.net.ssl.HttpsURLConnection;
+import java.nio.ByteBuffer;
+import java.util.List;
 
 public class ECList implements Runnable {
 	ECHost host;

src/connect2/GameInfo.java

@@ -10,14 +10,16 @@ public class GameInfo {
 	int hostCounter;
 	String gamename;
 	String map;
+	String extra;
 	long millis;
 
-	public GameInfo(int uid, byte[] addr, int port, int hostCounter, String gamename, String map) {
+	public GameInfo(int uid, byte[] addr, int port, int hostCounter, String gamename, String map, String extra) {
 		this.uid = uid;
 		this.remotePort = port;
 		this.hostCounter = hostCounter;
 		this.gamename = gamename;
 		this.map = map;
+		this.extra = extra;
 		this.millis = System.currentTimeMillis();
 
 		try {

src/connect2/GuiApp.java

@@ -0,0 +1,57 @@
+package connect2;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.IOException;
+import java.net.URI;
+
+public class GuiApp implements ActionListener {
+	JButton launchBtn, exitBtn;
+	int port;
+
+	public GuiApp()
+	{
+		this(8333);
+	}
+	public GuiApp(int port)
+	{
+		this.port=port;
+		JFrame frame = new JFrame("WC3Connect-Java");
+		frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+		this.launchBtn = new JButton("Launch");
+		this.exitBtn = new JButton("Exit");
+		this.launchBtn.setFont(new Font("Arial", Font.PLAIN, 30));
+		this.exitBtn.setFont(new Font("Arial", Font.PLAIN, 30));
+		this.launchBtn.addActionListener(this);
+		this.exitBtn.addActionListener(this);
+
+		if(!Desktop.isDesktopSupported() || !Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)){
+			this.launchBtn.setEnabled(false);
+			this.launchBtn.setText("Open your webbrowser and go to: http://localhost:"+this.port+"/");
+		}
+
+		frame.getContentPane().add(this.launchBtn, BorderLayout.PAGE_START);
+		frame.getContentPane().add(this.exitBtn, BorderLayout.PAGE_END);
+		frame.pack();
+		frame.setLocationRelativeTo(null);
+		frame.setVisible(true);
+	}
+
+	private void launch(){
+		try {
+			Desktop.getDesktop().browse(URI.create("http://localhost:"+this.port+"/"));
+		} catch (IOException e1) {
+			e1.printStackTrace();
+		}
+	}
+
+	public void actionPerformed(ActionEvent e) {
+		if(e.getSource() == this.launchBtn) {
+			this.launch();
+		} else if(e.getSource() == this.exitBtn) {
+			System.exit(0);
+		}
+	}
+}

src/connect2/Main.java

@@ -1,41 +1,31 @@
 package connect2;
 
+import java.awt.*;
 import java.util.HashMap;
 import java.util.Map;
-import java.net.URI;
-import java.awt.BorderLayout;
-import java.awt.Desktop;
-import java.awt.Font;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import javax.swing.JButton;
-import javax.swing.JFrame;
 
 public class Main {
 	public static Map<String, String> ThirdPartyBotMap = new HashMap<String, String>();
 	public static boolean Debug = true;
+	public static int Version = 2018102602;
 
 	public static void main(String[] args) throws java.io.IOException {
+		int port;
+		String broadcastIp;
+		if (args.length<2) {broadcastIp="";} else {broadcastIp=args[1];}
+		if (args.length<1) {port=8333;} else {port=Integer.parseInt(args[0]);}
+
 		ThirdPartyBotMap.put("192.99.6.98", "MMH-USA");
 		ThirdPartyBotMap.put("85.10.199.252", "MMH-Euro");
 
 		new Thread(new LoadThirdPartyThread()).start();
+		new Web(port,broadcastIp);
 
-		Web web = new Web();
-
-		JFrame frame = new JFrame("WC3Connect-Java");
-		frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		JButton launch = new JButton("Launch");
-		JButton exit = new JButton("Exit");
-		launch.setFont(new Font("Arial", Font.PLAIN, 30));
-		exit.setFont(new Font("Arial", Font.PLAIN, 30));
-		launch.addActionListener(new LaunchListener());
-		exit.addActionListener(new ExitListener());
-		frame.getContentPane().add(launch, BorderLayout.PAGE_START);
-		frame.getContentPane().add(exit, BorderLayout.PAGE_END);
-		frame.pack();
-		frame.setVisible(true);
-		launch();
+		if(!GraphicsEnvironment.isHeadless()){
+			new GuiApp(port);
+		} else {
+			System.out.println("Open your web browser and go to: http://localhost:"+port+"/");
+		}
 	}
 
 	public static String GetThirdPartyBot(String ip) {
@@ -44,14 +34,6 @@ public class Main {
 		}
 	}
 
-	public static void launch() {
-		try {
-			Desktop.getDesktop().browse(new URI("http://127.0.0.1:8333"));
-		} catch(Exception e) {
-			e.printStackTrace();
-		}
-	}
-
 	static class LoadThirdPartyThread implements Runnable {
 		public void run() {
 			try {
@@ -71,16 +53,4 @@ public class Main {
 			}
 		}
 	}
-
-	static class LaunchListener implements ActionListener {
-		public void actionPerformed(ActionEvent e) {
-			Main.launch();
-		}
-	}
-
-	static class ExitListener implements ActionListener {
-		public void actionPerformed(ActionEvent e) {
-			System.exit(0);
-		}
-	}
 }

src/connect2/Utils.java

@@ -93,4 +93,8 @@ public class Utils {
 		obj.put("error", msg);
 		respondJSON(t, obj);
 	}
+
+	public static int unsignedByte(byte x) {
+		return ((int) x) & 0xFF;
+	}
 }

src/connect2/Web.java

@@ -24,7 +24,17 @@ public class Web {
 	private ECHost host = null;
 	private ECList list = null;
 
-	public Web() throws IOException {
+	public String broadcastIp;
+
+	public Web() throws IOException
+	{
+		this(8333);
+	}
+	public Web(int port) throws IOException
+	{
+		this(port,"");
+	}
+	public Web(int port, String broadcastIp) throws IOException {
 		if(Main.Debug) {
 			Logger logger = Logger.getLogger("com.sun.net.httpserver");
 			ConsoleHandler ch = new ConsoleHandler();
@@ -32,18 +42,21 @@ public class Web {
 			ch.setLevel(Level.FINER);
 			logger.addHandler(ch);
 		}
-		HttpServer server = HttpServer.create(new InetSocketAddress(8333), 0);
+		HttpServer server = HttpServer.create(new InetSocketAddress(port), 0);
 		server.createContext("/", new FileHandler());
 		server.createContext("/login", new LoginHandler(this));
 		server.createContext("/signup", new SignupHandler());
 		server.createContext("/games", new GamesHandler(this));
 		server.createContext("/motd", new MotdHandler());
+		server.createContext("/version", new VersionHandler());
 		server.createContext("/gameinfo", new GameInfoHandler());
 		server.createContext("/show", new ShowHandler(this));
 		server.createContext("/validate", new ValidateHandler(this));
 		server.setExecutor(null);
 		server.start();
-		System.out.println("[web] started on :8333");
+		System.out.println("[web] started on :"+port);
+
+		this.broadcastIp=broadcastIp;
 	}
 
 	static Map<String, String> getPostForm(HttpExchange httpExchange) throws IOException {
@@ -63,9 +76,9 @@ public class Web {
 	static class LoginResult {
 		int war3Version;
 		String name;
-		long sessionKey;
+		String sessionKey;
 
-		LoginResult(int war3Version, String name, long sessionKey) {
+		LoginResult(int war3Version, String name, String sessionKey) {
 			this.war3Version = war3Version;
 			this.name = name;
 			this.sessionKey = sessionKey;
@@ -163,11 +176,13 @@ public class Web {
 		List<WebGame> pub;
 		List<WebGame> autohost;
 		List<WebGame> others;
+		List<WebGame> unmoderated;
 
 		public WebGamelist() {
 			this.pub = new ArrayList<WebGame>();
 			this.autohost = new ArrayList<WebGame>();
 			this.others = new ArrayList<WebGame>();
+			this.unmoderated = new ArrayList<WebGame>();
 		}
 
 		static JSONArray encodeList(List<WebGame> l) {
@@ -183,6 +198,7 @@ public class Web {
 			obj.put("publicGames", WebGamelist.encodeList(this.pub));
 			obj.put("autohostGames", WebGamelist.encodeList(this.autohost));
 			obj.put("otherGames", WebGamelist.encodeList(this.others));
+			obj.put("unmoderatedGames", WebGamelist.encodeList(this.unmoderated));
 			return obj;
 		}
 	}
@@ -215,10 +231,11 @@ public class Web {
 		}
 
 		public void handle(HttpExchange t) throws IOException {
-			byte[] request = Utils.streamToByteArray(t.getRequestBody());
+			Map<String, String> postForm = Web.getPostForm(t);
+			postForm.put("version", "2");
 			String response;
 			try {
-				response = Utils.post("https://connect.entgaming.net/gwc-login", request);
+				response = Utils.postForm("https://connect.entgaming.net/gwc-login", postForm);
 			} catch(Exception e) {
 				Utils.respondError(t, "Error logging in: " + e.getMessage() + ".");
 				return;
@@ -232,9 +249,9 @@ public class Web {
 				return;
 			}
 			synchronized(web) {
-				web.loginResult = new LoginResult(obj.getInt("war3version"), obj.getString("name"), obj.getLong("session_key"));
+				web.loginResult = new LoginResult(obj.getInt("war3version"), obj.getString("name"), obj.getString("session_key2"));
 				if(web.host == null) {
-					web.host = new ECHost(web.loginResult.war3Version, web.loginResult.name, web.loginResult.sessionKey);
+					web.host = new ECHost(web.loginResult.war3Version, web.loginResult.name, web.loginResult.sessionKey, web.broadcastIp);
 					web.host.init();
 				} else {
 					web.host.update(web.loginResult.war3Version, web.loginResult.name, web.loginResult.sessionKey);
@@ -320,6 +337,9 @@ public class Web {
 					} else {
 						games.others.add(webGame);
 					}
+				} else if(game.extra.length() > 0) {
+					webGame.location = game.extra;
+					games.unmoderated.add(webGame);
 				} else {
 					System.out.println("[web] ignoring game with ip=" + webGame.ip);
 				}
@@ -328,6 +348,7 @@ public class Web {
 			Collections.sort(games.pub);
 			Collections.sort(games.autohost);
 			Collections.sort(games.others);
+			Collections.sort(games.unmoderated);
 			Utils.respondJSON(t, games.encode());
 		}
 	}
@@ -342,6 +363,16 @@ public class Web {
 		}
 	}
 
+	static class VersionHandler implements HttpHandler {
+		public void handle(HttpExchange t) throws IOException {
+			String versionStr = Utils.get("https://entgaming.net/entconnect/wc3connect_java_version.php");
+			Integer version = Integer.parseInt(versionStr.trim());
+			JSONObject obj = new JSONObject();
+			obj.put("up_to_date", version <= Main.Version);
+			Utils.respondJSON(t, obj);
+		}
+	}
+
 	static class GameInfoHandler implements HttpHandler {
 		public void handle(HttpExchange t) throws IOException {
 			Map<String, String> postForm = Web.getPostForm(t);
@@ -402,7 +433,7 @@ public class Web {
 			}
 			Map<String, String> m = new HashMap<String, String>();
 			m.put("username", loginResult.name);
-			m.put("sessionkey", "" + loginResult.sessionKey);
+			m.put("sessionkey", loginResult.sessionKey);
 			m.put("key", key);
 			JSONObject obj = new JSONObject(Utils.postForm("https://connect.entgaming.net/gwc-validate", m));
 			if(obj.has("error")) {