diff --git a/.gitignore b/.gitignore
index 7bb75f6..7bbb6a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1,24 @@
-*.class
-*.jar
-*.war
-*.ear
-/bin
-/lib
-*.db
-.svn
-.svn
-.project
-/nbproject/private/
-/dist/
-/build/
-/testDBs
-/.settings
-/doc
-*.dll
-*.exe
-*.so
-COMMIT_EDITMSG
-.DS_Store
-/target
-/build/output
+*.class
+*.jar
+*.war
+*.ear
+/bin
+/lib
+*.db
+.svn
+.svn
+.project
+/nbproject/private/
+/dist/
+/build/
+/testDBs
+/.settings
+/doc
+*.dll
+*.exe
+*.so
+COMMIT_EDITMSG
+.DS_Store
+/target
+/build/output
/data/worlds
\ No newline at end of file
diff --git a/.project b/.project
index b62a758..736836c 100644
--- a/.project
+++ b/.project
@@ -1,33 +1,33 @@
-
-
- MossTest
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- com.stateofflow.eclipse.metrics.MetricsBuilder
-
-
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
-
-
- org.eclipse.m2e.core.maven2Nature
- fr.obeo.dsl.viewpoint.nature.modelingproject
- org.eclipse.jdt.core.javanature
- com.stateofflow.eclipse.metrics.MetricsNature
-
-
-
-
-
+
+
+ MossTest
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ com.stateofflow.eclipse.metrics.MetricsBuilder
+
+
+
+
+ org.eclipse.m2e.core.maven2Builder
+
+
+
+
+
+ org.eclipse.m2e.core.maven2Nature
+ fr.obeo.dsl.viewpoint.nature.modelingproject
+ org.eclipse.jdt.core.javanature
+ com.stateofflow.eclipse.metrics.MetricsNature
+
+
+
+
+
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index dea3f4c..32eba80 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,22 +1,22 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
+eclipse.preferences.version=1
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
index ecaf918..b4c59dd 100644
--- a/.settings/org.eclipse.jdt.ui.prefs
+++ b/.settings/org.eclipse.jdt.ui.prefs
@@ -1,6 +1,6 @@
-cleanup_settings_version=2
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
+cleanup_settings_version=2
+eclipse.preferences.version=1
+org.eclipse.jdt.ui.exception.name=e
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
diff --git a/COPYING b/COPYING
index 20d40b6..3d90694 100644
--- a/COPYING
+++ b/COPYING
@@ -1,674 +1,674 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc.
- 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.
-
-
- Copyright (C)
-
- 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 .
-
-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:
-
- Copyright (C)
- 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
-.
-
- 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
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ 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.
+
+
+ Copyright (C)
+
+ 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 .
+
+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:
+
+ Copyright (C)
+ 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
+.
+
+ 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
.
\ No newline at end of file
diff --git a/README.md b/README.md
index 4fdd9ac..63ffe00 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
-mosstest
-========
-
-Open-source Minetest clone. Refer to wiki for details.
-
-Pull requesters:
-Don't touch the thread pool or the scripting interface.
-Electrocution, drowning, or security bots attacking you may occur.
-
-pom.xml refers to non-maven jars in a custom jMonkey reporitory. Please hold as our server will have that repository available for download soon.
+mosstest
+========
+
+Open-source Minetest clone. Refer to wiki for details.
+
+Pull requesters:
+Don't touch the thread pool or the scripting interface.
+Electrocution, drowning, or security bots attacking you may occur.
+
+pom.xml refers to non-maven jars in a custom jMonkey reporitory. Please hold as our server will have that repository available for download soon.
diff --git a/ant/javadoc.xml b/ant/javadoc.xml
index d426125..1e31218 100644
--- a/ant/javadoc.xml
+++ b/ant/javadoc.xml
@@ -1,8 +1,8 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/assignments.txt b/assignments.txt
index 681710b..1fd7c97 100644
--- a/assignments.txt
+++ b/assignments.txt
@@ -1,18 +1,18 @@
-Assignments:
-
-===ACh===
-Renderer
-Formspecs
-Inventory
-
-===MR===
-JS scipts
-
-===AA===
-Script API
-Event Processor Thread Pool
-Node cache
-File cache
-Mapgen
-DB
-Mapchunk handling
+Assignments:
+
+===ACh===
+Renderer
+Formspecs
+Inventory
+
+===MR===
+JS scipts
+
+===AA===
+Script API
+Event Processor Thread Pool
+Node cache
+File cache
+Mapgen
+DB
+Mapchunk handling
diff --git a/build.xml b/build.xml
index 5e202c7..f37f891 100644
--- a/build.xml
+++ b/build.xml
@@ -1,143 +1,143 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/global.conf b/global.conf
index 6e72ca8..cfffba5 100644
--- a/global.conf
+++ b/global.conf
@@ -1,58 +1,58 @@
-#Mosstest default settings. Categories are [server] and [client]. Names not case-sensitive.
-[server-global]
-
-#Sets server name
-serverId=New Mosstest Server
-#Sets server failover cluster. Blank for no failover. NOT IMPLEMENTED YET.
-failoverCluster=
-#Sets in-cluster identifier. 0 for no cluster support. NOT IMPLEMENTED YET.
-replicationId
-
- #port number
- port=16511
- #UDP support. Set to 0 to disable UDP.
- udpport=16511
- #Maximum number of players
- maxplayers=256
- #Maximum number of half-open connections
- maxhalfopen=16
- #Max upstream bandwidth
- maxupxmit=16K
- #maximum downstream bandwidth
- maxdownstream=64K
-
- #Enable rollback
- rollback=false
- #Enable smartban
- smartban=true
-
- #Performance settings
- #Maximum chunks loaded. Remember that a chunk is roughly 16KiB. The setting 16394 equates to just under 300MB of RAM.
- maxLoadedChunks=16384
- #Maximum number of events queued for processing. Beyond this events will be dropped.
- eventQueueCapacity=40
-
- #number of event processor threads at start
- initialEventThreads=8
- #maximum number of event threads
- maxEventThreads=8
- #How often the event system is checked for load, in milliseconds.
- eventQueueTuneSampleInterval=100
- #How many event queue checks are in one round
- eventQueueTuneSamples=100
- #for how many samples the queue must be busy for a new thread to start
- eventQueueTuneUpshift=90
- #How many idle samples are needed before a thread is shut down
- eventQueueTuneDownshift=10
-
- #Central authentication server, for user trust. Connection to this server is NOT needed for gameplay, and this field may be blank.
- authserver=auth.mosstest.net
-
- #Easter eggs
- enableEasterEggs=true
-
- #How hard the server insists ITS textures are used over the client's.
- texPackInsistence=0
-
-
+#Mosstest default settings. Categories are [server] and [client]. Names not case-sensitive.
+[server-global]
+
+#Sets server name
+serverId=New Mosstest Server
+#Sets server failover cluster. Blank for no failover. NOT IMPLEMENTED YET.
+failoverCluster=
+#Sets in-cluster identifier. 0 for no cluster support. NOT IMPLEMENTED YET.
+replicationId
+
+ #port number
+ port=16511
+ #UDP support. Set to 0 to disable UDP.
+ udpport=16511
+ #Maximum number of players
+ maxplayers=256
+ #Maximum number of half-open connections
+ maxhalfopen=16
+ #Max upstream bandwidth
+ maxupxmit=16K
+ #maximum downstream bandwidth
+ maxdownstream=64K
+
+ #Enable rollback
+ rollback=false
+ #Enable smartban
+ smartban=true
+
+ #Performance settings
+ #Maximum chunks loaded. Remember that a chunk is roughly 16KiB. The setting 16394 equates to just under 300MB of RAM.
+ maxLoadedChunks=16384
+ #Maximum number of events queued for processing. Beyond this events will be dropped.
+ eventQueueCapacity=40
+
+ #number of event processor threads at start
+ initialEventThreads=8
+ #maximum number of event threads
+ maxEventThreads=8
+ #How often the event system is checked for load, in milliseconds.
+ eventQueueTuneSampleInterval=100
+ #How many event queue checks are in one round
+ eventQueueTuneSamples=100
+ #for how many samples the queue must be busy for a new thread to start
+ eventQueueTuneUpshift=90
+ #How many idle samples are needed before a thread is shut down
+ eventQueueTuneDownshift=10
+
+ #Central authentication server, for user trust. Connection to this server is NOT needed for gameplay, and this field may be blank.
+ authserver=auth.mosstest.net
+
+ #Easter eggs
+ enableEasterEggs=true
+
+ #How hard the server insists ITS textures are used over the client's.
+ texPackInsistence=0
+
+
\ No newline at end of file
diff --git a/lib/.gitignore b/lib/.gitignore
index 43e58b9..037b046 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -1 +1 @@
-/com
+/com
diff --git a/manifest.mf b/manifest.mf
index 328e8e5..1574df4 100644
--- a/manifest.mf
+++ b/manifest.mf
@@ -1,3 +1,3 @@
-Manifest-Version: 1.0
-X-COMMENT: Main-Class will be added automatically by build
-
+Manifest-Version: 1.0
+X-COMMENT: Main-Class will be added automatically by build
+
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 3e88383..0badc8f 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -1,1381 +1,1381 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set src.dir
- Must set build.dir
- Must set dist.dir
- Must set build.classes.dir
- Must set dist.javadoc.dir
- Must set build.test.classes.dir
- Must set build.test.results.dir
- Must set build.classes.excludes
- Must set dist.jar
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- No tests executed.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set JVM to use for profiling in profiler.info.jvm
- Must set profiler agent JVM arguments in profiler.info.jvmargs.agent
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- To run this application from the command line without Ant, try:
-
-
-
-
-
-
- java -cp "${run.classpath.with.dist.jar}" ${main.class}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- To run this application from the command line without Ant, try:
-
- java -jar "${dist.jar.resolved}"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set debug.class
-
-
-
-
- Must select one file in the IDE or set debug.class
-
-
-
-
- Must set fix.includes
-
-
-
-
-
-
-
-
-
- This target only works when run from inside the NetBeans IDE.
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set profile.class
- This target only works when run from inside the NetBeans IDE.
-
-
-
-
-
-
-
-
- This target only works when run from inside the NetBeans IDE.
-
-
-
-
-
-
-
-
-
-
-
-
- This target only works when run from inside the NetBeans IDE.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
-
-
- Must select some files in the IDE or set test.includes
-
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
-
- Must select one file in the IDE or set applet.url
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Some tests failed; see details above.
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set test.includes
-
-
-
- Some tests failed; see details above.
-
-
-
- Must select some files in the IDE or set test.class
- Must select some method in the IDE or set test.method
-
-
-
- Some tests failed; see details above.
-
-
-
-
- Must select one file in the IDE or set test.class
-
-
-
- Must select one file in the IDE or set test.class
- Must select some method in the IDE or set test.method
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set applet.url
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set applet.url
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set src.dir
+ Must set build.dir
+ Must set dist.dir
+ Must set build.classes.dir
+ Must set dist.javadoc.dir
+ Must set build.test.classes.dir
+ Must set build.test.results.dir
+ Must set build.classes.excludes
+ Must set dist.jar
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set javac.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ No tests executed.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set JVM to use for profiling in profiler.info.jvm
+ Must set profiler agent JVM arguments in profiler.info.jvmargs.agent
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select some files in the IDE or set javac.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ To run this application from the command line without Ant, try:
+
+
+
+
+
+
+ java -cp "${run.classpath.with.dist.jar}" ${main.class}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ To run this application from the command line without Ant, try:
+
+ java -jar "${dist.jar.resolved}"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set run.class
+
+
+
+ Must select one file in the IDE or set run.class
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set debug.class
+
+
+
+
+ Must select one file in the IDE or set debug.class
+
+
+
+
+ Must set fix.includes
+
+
+
+
+
+
+
+
+
+ This target only works when run from inside the NetBeans IDE.
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set profile.class
+ This target only works when run from inside the NetBeans IDE.
+
+
+
+
+
+
+
+
+ This target only works when run from inside the NetBeans IDE.
+
+
+
+
+
+
+
+
+
+
+
+
+ This target only works when run from inside the NetBeans IDE.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set run.class
+
+
+
+
+
+ Must select some files in the IDE or set test.includes
+
+
+
+
+ Must select one file in the IDE or set run.class
+
+
+
+
+ Must select one file in the IDE or set applet.url
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select some files in the IDE or set javac.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Some tests failed; see details above.
+
+
+
+
+
+
+
+
+ Must select some files in the IDE or set test.includes
+
+
+
+ Some tests failed; see details above.
+
+
+
+ Must select some files in the IDE or set test.class
+ Must select some method in the IDE or set test.method
+
+
+
+ Some tests failed; see details above.
+
+
+
+
+ Must select one file in the IDE or set test.class
+
+
+
+ Must select one file in the IDE or set test.class
+ Must select some method in the IDE or set test.method
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set applet.url
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set applet.url
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nbproject/configs/MapDatabase.properties b/nbproject/configs/MapDatabase.properties
index 634bbb0..c541371 100644
--- a/nbproject/configs/MapDatabase.properties
+++ b/nbproject/configs/MapDatabase.properties
@@ -1 +1 @@
-main.class=org.nodetest.servercore.EventProcessor
+main.class=org.nodetest.servercore.EventProcessor
diff --git a/nbproject/configs/ScriptEnv.properties b/nbproject/configs/ScriptEnv.properties
index 729f06e..ea66e7a 100644
--- a/nbproject/configs/ScriptEnv.properties
+++ b/nbproject/configs/ScriptEnv.properties
@@ -1 +1 @@
-main.class=org.nodetest.common.ScriptEnv
+main.class=org.nodetest.common.ScriptEnv
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index d188cbb..b7e4237 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=23062b59
-build.xml.script.CRC32=9ea92df2
-build.xml.stylesheet.CRC32=28e38971@1.53.1.46
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=23062b59
-nbproject/build-impl.xml.script.CRC32=3b7463a5
-nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46
+build.xml.data.CRC32=23062b59
+build.xml.script.CRC32=9ea92df2
+build.xml.stylesheet.CRC32=28e38971@1.53.1.46
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=23062b59
+nbproject/build-impl.xml.script.CRC32=3b7463a5
+nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 410b232..848cc4c 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,83 +1,83 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.processor.options=
-annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-auxiliary.org-netbeans-modules-projectimport-eclipse-core.key=src=src;file=lib/commons-cli-1.2.jar;file=lib/js-14.jar;file=lib/commons-cli-1.2-sources.jar;file=lib/db4o-8.0.249.16098-all-java5.jar;output=bin;
-auxiliary.org-netbeans-modules-projectimport-eclipse-core.project=.
-auxiliary.org-netbeans-modules-projectimport-eclipse-core.timestamp=1370875172897
-auxiliary.org-netbeans-modules-projectimport-eclipse-core.workspace=C:\\Users\\Alexander\\workspace
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
- ${run.classpath}
-debug.test.classpath=\
- ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/MossTest.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-excludes=
-file.reference.commons-cli-1.2-sources.jar=lib/commons-cli-1.2-sources.jar
-file.reference.commons-cli-1.2.jar=lib/commons-cli-1.2.jar
-file.reference.db4o-8.0.249.16098-all-java5.jar=lib/db4o-8.0.249.16098-all-java5.jar
-file.reference.js-14.jar=lib/js-14.jar
-file.reference.mosstest-src=src
-includes=**
-jar.compress=false
-javac.classpath=\
- ${file.reference.commons-cli-1.2.jar}:\
- ${file.reference.js-14.jar}:\
- ${file.reference.commons-cli-1.2-sources.jar}:\
- ${file.reference.db4o-8.0.249.16098-all-java5.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.processorpath=\
- ${javac.classpath}
-javac.source=1.7
-javac.target=1.7
-javac.test.classpath=\
- ${javac.classpath}:\
- ${build.classes.dir}
-javac.test.processorpath=\
- ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=true
-platform.active=default_platform
-run.classpath=\
- ${javac.classpath}:\
- ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project.
-# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
-# To set system properties for unit tests define test-sys-prop.name=value:
-run.jvmargs=
-run.test.classpath=\
- ${javac.test.classpath}:\
- ${build.test.classes.dir}
-source.encoding=UTF-8
-source.reference.commons-cli-1.2.jar=lib/commons-cli-1.2-sources.jar
-src.dir=${file.reference.mosstest-src}
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.processor.options=
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+auxiliary.org-netbeans-modules-projectimport-eclipse-core.key=src=src;file=lib/commons-cli-1.2.jar;file=lib/js-14.jar;file=lib/commons-cli-1.2-sources.jar;file=lib/db4o-8.0.249.16098-all-java5.jar;output=bin;
+auxiliary.org-netbeans-modules-projectimport-eclipse-core.project=.
+auxiliary.org-netbeans-modules-projectimport-eclipse-core.timestamp=1370875172897
+auxiliary.org-netbeans-modules-projectimport-eclipse-core.workspace=C:\\Users\\Alexander\\workspace
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+ ${run.classpath}
+debug.test.classpath=\
+ ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/MossTest.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+excludes=
+file.reference.commons-cli-1.2-sources.jar=lib/commons-cli-1.2-sources.jar
+file.reference.commons-cli-1.2.jar=lib/commons-cli-1.2.jar
+file.reference.db4o-8.0.249.16098-all-java5.jar=lib/db4o-8.0.249.16098-all-java5.jar
+file.reference.js-14.jar=lib/js-14.jar
+file.reference.mosstest-src=src
+includes=**
+jar.compress=false
+javac.classpath=\
+ ${file.reference.commons-cli-1.2.jar}:\
+ ${file.reference.js-14.jar}:\
+ ${file.reference.commons-cli-1.2-sources.jar}:\
+ ${file.reference.db4o-8.0.249.16098-all-java5.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.processorpath=\
+ ${javac.classpath}
+javac.source=1.7
+javac.target=1.7
+javac.test.classpath=\
+ ${javac.classpath}:\
+ ${build.classes.dir}
+javac.test.processorpath=\
+ ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=true
+platform.active=default_platform
+run.classpath=\
+ ${javac.classpath}:\
+ ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project.
+# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
+# To set system properties for unit tests define test-sys-prop.name=value:
+run.jvmargs=
+run.test.classpath=\
+ ${javac.test.classpath}:\
+ ${build.test.classes.dir}
+source.encoding=UTF-8
+source.reference.commons-cli-1.2.jar=lib/commons-cli-1.2-sources.jar
+src.dir=${file.reference.mosstest-src}
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 807c653..f50124b 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -1,13 +1,13 @@
-
-
- org.netbeans.modules.java.j2seproject
-
-
- MossTest
-
-
-
-
-
-
-
+
+
+ org.netbeans.modules.java.j2seproject
+
+
+ MossTest
+
+
+
+
+
+
+
diff --git a/planning/threadTree.txt b/planning/threadTree.txt
index 0852865..45ab8bb 100644
--- a/planning/threadTree.txt
+++ b/planning/threadTree.txt
@@ -1,28 +1,28 @@
-Main
- Net
- inBandUDP
- OutOFBandUDP
- TCPNet
- MapManager
- Mapgen(Pool?)
- MapLookup(Pool?)
- Player
- PEvents(Pool?)
- BlockChange
- Movement
- Entities
- EntActions
- EntPathfindingAI
- Scripting
- ScriptMgr
- Administrator
- Logging
- UserMgmt
- Ban/anti-attack
- Maintenance
- DBManager
- DeadlockWatchdog-This shall be simple and never rely on blocked methods
- DB
- DatabaseAccessors
- LoadBalancer
- LBCommunicator
+Main
+ Net
+ inBandUDP
+ OutOFBandUDP
+ TCPNet
+ MapManager
+ Mapgen(Pool?)
+ MapLookup(Pool?)
+ Player
+ PEvents(Pool?)
+ BlockChange
+ Movement
+ Entities
+ EntActions
+ EntPathfindingAI
+ Scripting
+ ScriptMgr
+ Administrator
+ Logging
+ UserMgmt
+ Ban/anti-attack
+ Maintenance
+ DBManager
+ DeadlockWatchdog-This shall be simple and never rely on blocked methods
+ DB
+ DatabaseAccessors
+ LoadBalancer
+ LBCommunicator
diff --git a/src/net/mosstest/sandbox/SandboxClass.java b/src/net/mosstest/sandbox/SandboxClass.java
index cc09fc6..717020c 100644
--- a/src/net/mosstest/sandbox/SandboxClass.java
+++ b/src/net/mosstest/sandbox/SandboxClass.java
@@ -1,75 +1,75 @@
-package net.mosstest.sandbox;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-public class SandboxClass {
- Class clazz;
- final boolean allowStatic, instantiable, deny, iface;
-
- public SandboxClass(Class clazz, boolean allowStatic,
- boolean instantiable, boolean deny, boolean iface) {
- this.clazz = clazz;
- this.allowStatic = allowStatic;
- this.instantiable = instantiable;
- this.deny = deny;
- this.iface = iface;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result
- + ((this.clazz == null) ? 0 : this.clazz.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (!(obj instanceof SandboxClass)) {
- return false;
- }
- SandboxClass> other = (SandboxClass>) obj;
- if (this.clazz == null) {
- if (other.clazz != null) {
- return false;
- }
- } else if (!this.clazz.equals(other.clazz)) {
- return false;
- }
- return true;
- }
-
- public Object invokeStatic(String method, Object... params)
- throws NoSuchMethodException, SecurityException,
- IllegalAccessException, IllegalArgumentException,
- InvocationTargetException {
- Class>[] clazzes = new Class>[params.length];
- for (int i = 0; i < params.length; i++) {
- clazzes[i] = params[i].getClass();
- }
- Method mth = this.clazz.getMethod(method, clazzes);
- return mth.invoke(null);
-
- }
-
- public T getInstance(Object... params) throws NoSuchMethodException,
- SecurityException, InstantiationException, IllegalAccessException,
- IllegalArgumentException, InvocationTargetException {
- Class>[] clazzes = new Class>[params.length];
- for (int i = 0; i < params.length; i++) {
- clazzes[i] = params[i].getClass();
- }
- Constructor constr = this.clazz.getConstructor(clazzes);
- return constr.newInstance(params);
- }
-
-}
+package net.mosstest.sandbox;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+public class SandboxClass {
+ Class clazz;
+ final boolean allowStatic, instantiable, deny, iface;
+
+ public SandboxClass(Class clazz, boolean allowStatic,
+ boolean instantiable, boolean deny, boolean iface) {
+ this.clazz = clazz;
+ this.allowStatic = allowStatic;
+ this.instantiable = instantiable;
+ this.deny = deny;
+ this.iface = iface;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result
+ + ((this.clazz == null) ? 0 : this.clazz.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (!(obj instanceof SandboxClass)) {
+ return false;
+ }
+ SandboxClass> other = (SandboxClass>) obj;
+ if (this.clazz == null) {
+ if (other.clazz != null) {
+ return false;
+ }
+ } else if (!this.clazz.equals(other.clazz)) {
+ return false;
+ }
+ return true;
+ }
+
+ public Object invokeStatic(String method, Object... params)
+ throws NoSuchMethodException, SecurityException,
+ IllegalAccessException, IllegalArgumentException,
+ InvocationTargetException {
+ Class>[] clazzes = new Class>[params.length];
+ for (int i = 0; i < params.length; i++) {
+ clazzes[i] = params[i].getClass();
+ }
+ Method mth = this.clazz.getMethod(method, clazzes);
+ return mth.invoke(null);
+
+ }
+
+ public T getInstance(Object... params) throws NoSuchMethodException,
+ SecurityException, InstantiationException, IllegalAccessException,
+ IllegalArgumentException, InvocationTargetException {
+ Class>[] clazzes = new Class>[params.length];
+ for (int i = 0; i < params.length; i++) {
+ clazzes[i] = params[i].getClass();
+ }
+ Constructor constr = this.clazz.getConstructor(clazzes);
+ return constr.newInstance(params);
+ }
+
+}
diff --git a/src/net/mosstest/sandbox/lang/Runtime.java b/src/net/mosstest/sandbox/lang/Runtime.java
index cebe6d9..3a5900e 100644
--- a/src/net/mosstest/sandbox/lang/Runtime.java
+++ b/src/net/mosstest/sandbox/lang/Runtime.java
@@ -1,28 +1,28 @@
-package net.mosstest.sandbox.lang;
-
-public class Runtime {
- private java.lang.Runtime runtime = java.lang.Runtime.getRuntime();
-
- public int availableProcessors() {
- return this.runtime.availableProcessors();
- }
-
- public long freeMemory() {
- return this.runtime.freeMemory();
- }
-
- public long totalMemory() {
- return this.runtime.totalMemory();
- }
-
- public long maxMemory() {
- return this.runtime.maxMemory();
- }
- public void gc() {
- this.runtime.gc();
- return;
- }
-
- public Runtime() {
- }
-}
+package net.mosstest.sandbox.lang;
+
+public class Runtime {
+ private java.lang.Runtime runtime = java.lang.Runtime.getRuntime();
+
+ public int availableProcessors() {
+ return this.runtime.availableProcessors();
+ }
+
+ public long freeMemory() {
+ return this.runtime.freeMemory();
+ }
+
+ public long totalMemory() {
+ return this.runtime.totalMemory();
+ }
+
+ public long maxMemory() {
+ return this.runtime.maxMemory();
+ }
+ public void gc() {
+ this.runtime.gc();
+ return;
+ }
+
+ public Runtime() {
+ }
+}
diff --git a/src/net/mosstest/sandbox/lang/System.java b/src/net/mosstest/sandbox/lang/System.java
index a18c397..e4f46a9 100644
--- a/src/net/mosstest/sandbox/lang/System.java
+++ b/src/net/mosstest/sandbox/lang/System.java
@@ -1,38 +1,38 @@
-package net.mosstest.sandbox.lang;
-
-import java.io.InputStream;
-import java.io.PrintStream;
-
-public final class System {
- private System() {
- };
-
- public static final PrintStream err = java.lang.System.err;
- public static final PrintStream out = java.lang.System.out;
- public static final InputStream in = java.lang.System.in;
-
- public static void arraycopy(Object src, int srcPos, Object dest,
- int destPos, int length) {
- java.lang.System.arraycopy(src, srcPos, dest, destPos, length);
- }
-
- public static long currentTimeMillis() {
- return java.lang.System.currentTimeMillis();
- }
-
- public static void gc() {
- java.lang.System.gc();
- }
-
- public static int identityHashCode(Object o) {
- return java.lang.System.identityHashCode(o);
- }
-
- public static String lineSeparator() {
- return java.lang.System.lineSeparator();
- }
-
- public static long nanoTime() {
- return java.lang.System.nanoTime();
- }
-}
+package net.mosstest.sandbox.lang;
+
+import java.io.InputStream;
+import java.io.PrintStream;
+
+public final class System {
+ private System() {
+ };
+
+ public static final PrintStream err = java.lang.System.err;
+ public static final PrintStream out = java.lang.System.out;
+ public static final InputStream in = java.lang.System.in;
+
+ public static void arraycopy(Object src, int srcPos, Object dest,
+ int destPos, int length) {
+ java.lang.System.arraycopy(src, srcPos, dest, destPos, length);
+ }
+
+ public static long currentTimeMillis() {
+ return java.lang.System.currentTimeMillis();
+ }
+
+ public static void gc() {
+ java.lang.System.gc();
+ }
+
+ public static int identityHashCode(Object o) {
+ return java.lang.System.identityHashCode(o);
+ }
+
+ public static String lineSeparator() {
+ return java.lang.System.lineSeparator();
+ }
+
+ public static long nanoTime() {
+ return java.lang.System.nanoTime();
+ }
+}
diff --git a/src/net/mosstest/sandbox/lang/Thread.java b/src/net/mosstest/sandbox/lang/Thread.java
index 6cd4051..670aade 100644
--- a/src/net/mosstest/sandbox/lang/Thread.java
+++ b/src/net/mosstest/sandbox/lang/Thread.java
@@ -1,9 +1,9 @@
-package net.mosstest.sandbox.lang;
-
-import net.mosstest.scripting.ScriptRunnable;
-
-public class Thread {
- static void spawnThread(ScriptRunnable r) {
- //todo todo
- }
-}
+package net.mosstest.sandbox.lang;
+
+import net.mosstest.scripting.ScriptRunnable;
+
+public class Thread {
+ static void spawnThread(ScriptRunnable r) {
+ //todo todo
+ }
+}
diff --git a/src/net/mosstest/sandbox/lang/ThreadGroup.java b/src/net/mosstest/sandbox/lang/ThreadGroup.java
index a12a614..182bbaa 100644
--- a/src/net/mosstest/sandbox/lang/ThreadGroup.java
+++ b/src/net/mosstest/sandbox/lang/ThreadGroup.java
@@ -1,5 +1,5 @@
-package net.mosstest.sandbox.lang;
-
-public class ThreadGroup {
- //todo sandbox
-}
+package net.mosstest.sandbox.lang;
+
+public class ThreadGroup {
+ //todo sandbox
+}
diff --git a/src/net/mosstest/sandbox/lang/ThreadLocal.java b/src/net/mosstest/sandbox/lang/ThreadLocal.java
index a583d93..89504ed 100644
--- a/src/net/mosstest/sandbox/lang/ThreadLocal.java
+++ b/src/net/mosstest/sandbox/lang/ThreadLocal.java
@@ -1,5 +1,5 @@
-package net.mosstest.sandbox.lang;
-
-public class ThreadLocal {
- //todo sandbox--probably discard, in fact.
-}
+package net.mosstest.sandbox.lang;
+
+public class ThreadLocal {
+ //todo sandbox--probably discard, in fact.
+}
diff --git a/src/net/mosstest/sandbox/util/Collections.java b/src/net/mosstest/sandbox/util/Collections.java
index 9791d82..be6175b 100644
--- a/src/net/mosstest/sandbox/util/Collections.java
+++ b/src/net/mosstest/sandbox/util/Collections.java
@@ -1,5 +1,5 @@
-package net.mosstest.sandbox.util;
-
-public class Collections {
- //todo sandbox
-}
+package net.mosstest.sandbox.util;
+
+public class Collections {
+ //todo sandbox
+}
diff --git a/src/net/mosstest/sandbox/util/Enumeration.java b/src/net/mosstest/sandbox/util/Enumeration.java
index af6be4b..a5525c8 100644
--- a/src/net/mosstest/sandbox/util/Enumeration.java
+++ b/src/net/mosstest/sandbox/util/Enumeration.java
@@ -1,5 +1,5 @@
-package net.mosstest.sandbox.util;
-
-public class Enumeration {
- //todo sandbox
-}
+package net.mosstest.sandbox.util;
+
+public class Enumeration {
+ //todo sandbox
+}
diff --git a/src/net/mosstest/sandbox/util/ResourceBundle.java b/src/net/mosstest/sandbox/util/ResourceBundle.java
index 7faac03..3f3578d 100644
--- a/src/net/mosstest/sandbox/util/ResourceBundle.java
+++ b/src/net/mosstest/sandbox/util/ResourceBundle.java
@@ -1,5 +1,5 @@
-package net.mosstest.sandbox.util;
-
-public class ResourceBundle {
- //todo sandbox
-}
+package net.mosstest.sandbox.util;
+
+public class ResourceBundle {
+ //todo sandbox
+}
diff --git a/src/net/mosstest/sandbox/util/concurrent/atomic/AtomicReferenceFieldUpdater.java b/src/net/mosstest/sandbox/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
index 6d05d49..9231782 100644
--- a/src/net/mosstest/sandbox/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
+++ b/src/net/mosstest/sandbox/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
@@ -1,5 +1,5 @@
-package net.mosstest.sandbox.util.concurrent.atomic;
-
-public class AtomicReferenceFieldUpdater {
- //todo sandbox
-}
+package net.mosstest.sandbox.util.concurrent.atomic;
+
+public class AtomicReferenceFieldUpdater {
+ //todo sandbox
+}
diff --git a/src/net/mosstest/scripting/AntiCheatController.java b/src/net/mosstest/scripting/AntiCheatController.java
index e23cb25..fb93a40 100644
--- a/src/net/mosstest/scripting/AntiCheatController.java
+++ b/src/net/mosstest/scripting/AntiCheatController.java
@@ -1,131 +1,131 @@
-package net.mosstest.scripting;
-
-import java.util.ArrayList;
-import java.util.Random;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import net.mosstest.servercore.SessionManager;
-
-public class AntiCheatController {
- protected ArrayList checks = new ArrayList<>();
- protected ArrayList handlers = new ArrayList<>();
- protected MossScriptEnv env;
- protected SessionManager sess;
- protected volatile boolean run = false;
- protected AtomicInteger needDeathsFrom = new AtomicInteger(0);
-
- public AntiCheatController(MossScriptEnv env, SessionManager sess) {
- this.env = env;
- this.sess = sess;
- }
-
- public void registerCheck(AntiCheatCheck chk) {
- synchronized (this.checks) {
- this.checks.add(chk);
- }
- }
-
- public void registerHandler(AntiCheatHandler hdl) {
- synchronized (this.handlers) {
- this.handlers.add(hdl);
- }
- }
-
- private ArrayList threads = new ArrayList<>();
-
- public void startThreads(int threads, int priority) {
- this.run = true;
- for (int i = 0; i < threads; i++) {
- Thread cThread = new Thread(new AntiCheatRunnable(), "anticheat"
- + new Random().nextInt());
- this.threads.add(cThread);
- cThread.start();
- cThread.setPriority(priority);
- }
- }
-
- public void killThreads(int threads) {
-
- this.needDeathsFrom.addAndGet(threads);
-
- }
-
- public static interface AntiCheatCheck {
- /**
- * Check that a player is compliant with this anti-cheat check. This
- * method is not guaranteed to be called, especially if system resources
- * are low.
- *
- * @param p
- * The player to check. The volatile fields xpos, ypos, zpos,
- * oldx, oldy, oldz, lastAntiCheatMillis may prove
- * particularly useful.
- * @param env
- * The MossScriptEnv that may be used in case
- * moss is not available in javascript global
- * scope.
- * @return Value representing a violation level. Recommended values are
- * 0 for all-OK to 100 for the most severe cheating.
- */
- public int check(Player p, MossScriptEnv env);
- }
-
- public static interface AntiCheatHandler {
-
- /**
- * Called if a violation is detected by any check. This method is
- * guaranteed to be called upon any violation being detected.
- *
- * @param p
- * The player with a violation.
- * @param severity
- * Value representing a violation level. Recommended values
- * are 0 for all-OK to 100 for the most severe cheating.
- * @param env
- * The MossScriptEnv that may be used in case
- * moss is not available in javascript global
- * scope.
- */
- public void handleViolation(Player p, int severity, MossScriptEnv env);
- }
-
- private class AntiCheatRunnable implements Runnable {
-
- @Override
- public void run() {
-
- runLoop: while (AntiCheatController.this.run) {
- int needDeaths;
- if ((needDeaths = AntiCheatController.this.needDeathsFrom.get()) > 0) {
- if (AntiCheatController.this.needDeathsFrom.compareAndSet(
- needDeaths, needDeaths - 1))
- break runLoop;
- }
-
- try {
- for (Player player : AntiCheatController.this.sess.playerSessions
- .keySet()) {
- for (AntiCheatCheck chk : AntiCheatController.this.checks) {
- int severity;
- if ((severity = chk.check(player,
- AntiCheatController.this.env)) > 0) {
- for (AntiCheatHandler hdl : AntiCheatController.this.handlers) {
- hdl.handleViolation(player, severity,
- AntiCheatController.this.env);
- }
- }
- }
- }
- } catch (Exception e) {
- // pass for possible ConcurrentModificationException
- }
- try {
- Thread.sleep(100);
- } catch (InterruptedException e) {
- // pass
- }
- }
-
- }
- }
-}
+package net.mosstest.scripting;
+
+import java.util.ArrayList;
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import net.mosstest.servercore.SessionManager;
+
+public class AntiCheatController {
+ protected ArrayList checks = new ArrayList<>();
+ protected ArrayList handlers = new ArrayList<>();
+ protected MossScriptEnv env;
+ protected SessionManager sess;
+ protected volatile boolean run = false;
+ protected AtomicInteger needDeathsFrom = new AtomicInteger(0);
+
+ public AntiCheatController(MossScriptEnv env, SessionManager sess) {
+ this.env = env;
+ this.sess = sess;
+ }
+
+ public void registerCheck(AntiCheatCheck chk) {
+ synchronized (this.checks) {
+ this.checks.add(chk);
+ }
+ }
+
+ public void registerHandler(AntiCheatHandler hdl) {
+ synchronized (this.handlers) {
+ this.handlers.add(hdl);
+ }
+ }
+
+ private ArrayList threads = new ArrayList<>();
+
+ public void startThreads(int threads, int priority) {
+ this.run = true;
+ for (int i = 0; i < threads; i++) {
+ Thread cThread = new Thread(new AntiCheatRunnable(), "anticheat"
+ + new Random().nextInt());
+ this.threads.add(cThread);
+ cThread.start();
+ cThread.setPriority(priority);
+ }
+ }
+
+ public void killThreads(int threads) {
+
+ this.needDeathsFrom.addAndGet(threads);
+
+ }
+
+ public static interface AntiCheatCheck {
+ /**
+ * Check that a player is compliant with this anti-cheat check. This
+ * method is not guaranteed to be called, especially if system resources
+ * are low.
+ *
+ * @param p
+ * The player to check. The volatile fields xpos, ypos, zpos,
+ * oldx, oldy, oldz, lastAntiCheatMillis may prove
+ * particularly useful.
+ * @param env
+ * The MossScriptEnv that may be used in case
+ * moss is not available in javascript global
+ * scope.
+ * @return Value representing a violation level. Recommended values are
+ * 0 for all-OK to 100 for the most severe cheating.
+ */
+ public int check(Player p, MossScriptEnv env);
+ }
+
+ public static interface AntiCheatHandler {
+
+ /**
+ * Called if a violation is detected by any check. This method is
+ * guaranteed to be called upon any violation being detected.
+ *
+ * @param p
+ * The player with a violation.
+ * @param severity
+ * Value representing a violation level. Recommended values
+ * are 0 for all-OK to 100 for the most severe cheating.
+ * @param env
+ * The MossScriptEnv that may be used in case
+ * moss is not available in javascript global
+ * scope.
+ */
+ public void handleViolation(Player p, int severity, MossScriptEnv env);
+ }
+
+ private class AntiCheatRunnable implements Runnable {
+
+ @Override
+ public void run() {
+
+ runLoop: while (AntiCheatController.this.run) {
+ int needDeaths;
+ if ((needDeaths = AntiCheatController.this.needDeathsFrom.get()) > 0) {
+ if (AntiCheatController.this.needDeathsFrom.compareAndSet(
+ needDeaths, needDeaths - 1))
+ break runLoop;
+ }
+
+ try {
+ for (Player player : AntiCheatController.this.sess.playerSessions
+ .keySet()) {
+ for (AntiCheatCheck chk : AntiCheatController.this.checks) {
+ int severity;
+ if ((severity = chk.check(player,
+ AntiCheatController.this.env)) > 0) {
+ for (AntiCheatHandler hdl : AntiCheatController.this.handlers) {
+ hdl.handleViolation(player, severity,
+ AntiCheatController.this.env);
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ // pass for possible ConcurrentModificationException
+ }
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ // pass
+ }
+ }
+
+ }
+ }
+}
diff --git a/src/net/mosstest/scripting/Entity.java b/src/net/mosstest/scripting/Entity.java
index c2f56c0..988718a 100644
--- a/src/net/mosstest/scripting/Entity.java
+++ b/src/net/mosstest/scripting/Entity.java
@@ -1,15 +1,15 @@
-package net.mosstest.scripting;
-
-public class Entity {
- int id;
- public String name;
- int hp;
- int maxHealth;
- public void destroy() {
- // TODO Auto-generated method stub
-
- }
- protected Entity(String name, int maxHealth) {
- //TODO DB lookup for entities
- }
-}
+package net.mosstest.scripting;
+
+public class Entity {
+ int id;
+ public String name;
+ int hp;
+ int maxHealth;
+ public void destroy() {
+ // TODO Auto-generated method stub
+
+ }
+ protected Entity(String name, int maxHealth) {
+ //TODO DB lookup for entities
+ }
+}
diff --git a/src/net/mosstest/scripting/EventProcessingCompletedSignal.java b/src/net/mosstest/scripting/EventProcessingCompletedSignal.java
index 506f38f..b1f6ec8 100644
--- a/src/net/mosstest/scripting/EventProcessingCompletedSignal.java
+++ b/src/net/mosstest/scripting/EventProcessingCompletedSignal.java
@@ -1,5 +1,5 @@
-package net.mosstest.scripting;
-
-public class EventProcessingCompletedSignal extends Throwable {
-
-}
+package net.mosstest.scripting;
+
+public class EventProcessingCompletedSignal extends Throwable {
+
+}
diff --git a/src/net/mosstest/scripting/Face.java b/src/net/mosstest/scripting/Face.java
index 63a7649..57ca19b 100644
--- a/src/net/mosstest/scripting/Face.java
+++ b/src/net/mosstest/scripting/Face.java
@@ -1,5 +1,5 @@
-package net.mosstest.scripting;
-
-public enum Face {
- TOP, BOTTOM, N, S, E, W
-}
+package net.mosstest.scripting;
+
+public enum Face {
+ TOP, BOTTOM, N, S, E, W
+}
diff --git a/src/net/mosstest/scripting/IMapGenerator.java b/src/net/mosstest/scripting/IMapGenerator.java
index 3752911..21a4110 100644
--- a/src/net/mosstest/scripting/IMapGenerator.java
+++ b/src/net/mosstest/scripting/IMapGenerator.java
@@ -1,51 +1,51 @@
-package net.mosstest.scripting;
-
-import net.mosstest.servercore.MapGeneratorException;
-import net.mosstest.servercore.NodeManager;
-
-public interface IMapGenerator {
-
- void init(long seed, NodeManager nm, Object... params) throws MapGeneratorException;
-
- public MapChunk generateChunk(Position pos) throws MapGeneratorException;
-
- /**
- * Fills in a chunk as an array of light nodes, where 0 values require
- * filling.
- *
- * @param lightNodes
- * A reference to the array that must be updated.
- * @param pos
- * The position corresponding to the chunk to be filled in.
- * @throws MapGeneratorException
- * Thrown in case the map generator encounters an inconsistency
- * it cannot recover from.
- */
- public void fillInChunk(int[][][] lightNodes, Position pos)
- throws MapGeneratorException;
-
- /**
- * Register an ore for future generation of chunks. The values given here
- * are hints to the map generator and need not be exact.
- *
- * @param oreNode
- * The ore to generate.
- * @param minDepth
- * The minimum depth(as a positive integer number of nodes below
- * sea level.
- * @param rarity
- * How rare the ore should be. Rarity 1 corresponds to virtually
- * every ore-containing node, and rarity 100 would correspond to
- * approximately one out of 100 nodes being this ore.
- * @param clumping
- * Defines how clumped the ore should be. Generally corresponds
- * to 0=uniform and 1=most strongly clumped(solid spheres of ore
- * clumps to meet rarity goal)
- * @param params
- * Miscellaneous params for the map generator.
- */
- public void registerOre(MapNode oreNode, double minDepth, double rarity,
- double clumping, int seed, Object... params);
-
-
-}
+package net.mosstest.scripting;
+
+import net.mosstest.servercore.MapGeneratorException;
+import net.mosstest.servercore.NodeManager;
+
+public interface IMapGenerator {
+
+ void init(long seed, NodeManager nm, Object... params) throws MapGeneratorException;
+
+ public MapChunk generateChunk(Position pos) throws MapGeneratorException;
+
+ /**
+ * Fills in a chunk as an array of light nodes, where 0 values require
+ * filling.
+ *
+ * @param lightNodes
+ * A reference to the array that must be updated.
+ * @param pos
+ * The position corresponding to the chunk to be filled in.
+ * @throws MapGeneratorException
+ * Thrown in case the map generator encounters an inconsistency
+ * it cannot recover from.
+ */
+ public void fillInChunk(int[][][] lightNodes, Position pos)
+ throws MapGeneratorException;
+
+ /**
+ * Register an ore for future generation of chunks. The values given here
+ * are hints to the map generator and need not be exact.
+ *
+ * @param oreNode
+ * The ore to generate.
+ * @param minDepth
+ * The minimum depth(as a positive integer number of nodes below
+ * sea level.
+ * @param rarity
+ * How rare the ore should be. Rarity 1 corresponds to virtually
+ * every ore-containing node, and rarity 100 would correspond to
+ * approximately one out of 100 nodes being this ore.
+ * @param clumping
+ * Defines how clumped the ore should be. Generally corresponds
+ * to 0=uniform and 1=most strongly clumped(solid spheres of ore
+ * clumps to meet rarity goal)
+ * @param params
+ * Miscellaneous params for the map generator.
+ */
+ public void registerOre(MapNode oreNode, double minDepth, double rarity,
+ double clumping, int seed, Object... params);
+
+
+}
diff --git a/src/net/mosstest/scripting/INodeParams.java b/src/net/mosstest/scripting/INodeParams.java
index 94a12a2..2e02545 100644
--- a/src/net/mosstest/scripting/INodeParams.java
+++ b/src/net/mosstest/scripting/INodeParams.java
@@ -1,224 +1,224 @@
-package net.mosstest.scripting;
-
-/**
- * Interface to specify handlers to be called when various actions are taken by
- * players directed at a node. These handlers are called after the ones defined
- * in {@link MossScriptEnv} but before the default handlers. Handlers have a
- * chance to throw {@link EventProcessingCompletedSignal} to bypass the default
- * handler.
- *
- * @author rarkenin
- *
- */
-public interface INodeParams {
- /**
- * Function that is called when a node is punched.
- *
- * @param player
- * The player punching the node.
- * @param tool
- * The tool being used to punch the node.
- * @param target
- * The position of the targeted node.
- * @param punchedFace
- * The face being punched.
- */
- public abstract void onPunch(Player player, MossItem tool,
- NodePosition target, Face punchedFace)
- throws EventProcessingCompletedSignal;
-
- /**
- * Determines if a fall should continue
- *
- * @param player
- * The player.
- * @param height
- * The height.
- * @return A boolean representing whether the fall should continue or be
- * marked as a fall.
- */
- public abstract boolean shouldContinueFall(Player player, double height);
-
- /**
- * Called when a node is fully dug.
- *
- * @param player
- * The player digging the node.
- * @param tool
- * The tool used to dig the node.
- * @param target
- * The position of the node that has been dug.
- * @param punchedFace
- * The face on which the the tool was pointed when digging was
- * complete. Note that if a dig begins on one face but the player
- * moves the aim to another face the onPunch handler may receive
- * a different face than this handler.
- * @throws EventProcessingCompletedSignal
- */
- public abstract void onDig(Player player, MossItem tool,
- NodePosition target, Face punchedFace)
- throws EventProcessingCompletedSignal;
-
- /**
- * Called when a node is placed directly above, below, left, right, in front
- * of, or behind this node.
- *
- * @param player
- * The player placing the node.
- * @param target
- * @param placed
- * @throws EventProcessingCompletedSignal
- */
- public abstract void onPlaceNextTo(Player player, NodePosition target,
- NodePosition placed) throws EventProcessingCompletedSignal;
-
- /**
- * Called when a right-click is done on a node. Note that this is called
- * even if no node is placed, such as if the player is not holding anything,
- * or is holding a tool.
- *
- * @param player
- * Player performing the action.
- * @param tool
- * Tool held by user in active slot during this action.
- * @param target
- * Position of targeted node
- * @param clickedFace
- * Face which was right-clicked.
- * @throws EventProcessingCompletedSignal
- */
- public abstract void onRightClick(Player player, MossItem tool,
- NodePosition target, Face clickedFace)
- throws EventProcessingCompletedSignal;
-
- /**
- * Called when a player steps on a node either from jumping, falling, or
- * walking forward.
- *
- * @param player
- * Player that steps on this node.
- * @param pos
- * Position of node that is stepped on.
- * @return Currently unused.
- * @throws EventProcessingCompletedSignal
- */
- public abstract boolean onStepOn(Player player, NodePosition pos)
- throws EventProcessingCompletedSignal;
-
- /**
- * Calculates the height a player may jump off of this node. One node is
- * equal to 1.0.
- *
- * @param player
- * @return The height the player may jump off this node.
- */
- public abstract double jumpOffHeight(Player player);
-
- /**
- * Calculates the height a player will bounce when landing on this node.
- *
- * @param player
- * @param fallheight
- * The height from which the player has fallen.
- * @return A double value representing the height the player is to bounce.
- */
- public abstract double calcBounceHeight(Player player, double fallheight);
-
- /**
- * Calculates at which rate a player will sink in after landing on this
- * node.
- *
- * @param player
- * The player to calculate sink for.
- * @param fallheight
- * The height from which they have fallen. 0 if the player walks
- * onto the node without jumping or falling.
- * @return The rate for the player to sink.
- */
- public abstract double calcSinkIn(Player player, double fallheight);
-
- /**
- * Calculates at which rate a player will sink in if they are holding the
- * key to actively descend.
- *
- * @param player
- * The player to calculate sink for.
- * @param fallheight
- * The height from which they have fallen. 0 if the player walks
- * onto the node without jumping or falling(feet at surface), or
- * negative if they have already sunk in partially.
- * @return The rate for the player to sink.
- */
- public abstract double calcSinkActive(Player player, double fallheight);
-
- /**
- * Calculates the rate at which a player will rise out of this node if they
- * have sunk in and are pressing the jump key. If the player is in multiple
- * node the lowermost node at the player's horizontal center is considered.
- *
- * @param player
- * The player to perform the calculation for.
- * @param sinkheight
- * The depth to which the player has sunk. 0 is the surface at
- * the player's feet. 1 corresponds to the player's feet being at
- * the bottom of the node, and 2 or more is if the player is
- * submerged in multiple nodes.
- * @return The rate at which the player should rise when they hold the key
- * corresponding to jumping, in nodes per second.
- */
- public abstract double calcSinkEscape(Player player, double sinkheight);
-
- /**
- * Calculates the speed at which a player will move across this node when
- * walking.
- *
- * @param player
- * The player for which the walk rate is being calculated.
- * @return The rate in nodes/second at which the player should walk.
- */
- public abstract double calcWalkSpeed(Player player);
-
- /**
- * Calculates the speed at which a player will move across this node when
- * sprinting.
- *
- * @param player
- * The player for which the sprint rate is being calculated.
- * @return The rate in nodes/second at which the player should sprint.
- */
- public abstract double calcSprintSpeed(Player player);
-
- /**
- * Calculates the damage a player will take when falling onto this node.
- *
- * @param player
- * The player falling onto this node.
- * @param height
- * The fall height.
- * @return The damage to be given to the player. A player has a default
- * health of 64 units.
- */
- public abstract double calcFallDamage(Player player, double height);
-
- /**
- * Calculate whether a ray aimed from the crosshairs should stop at this
- * node.
- *
- * @param player
- * The player.
- * @param distance
- * The distance from the camera to the node.
- * @return
- */
- public abstract boolean shouldHitAimRay(Player player, double distance);
-
- /**
- * Calculate a dig property. These are generally 0 for inability to dig to 1
- * for digging the node in one second.
- *
- * @param key
- * @return
- */
- public abstract double calcInteractProperties(MossTool.InteractType key);
-
-}
+package net.mosstest.scripting;
+
+/**
+ * Interface to specify handlers to be called when various actions are taken by
+ * players directed at a node. These handlers are called after the ones defined
+ * in {@link MossScriptEnv} but before the default handlers. Handlers have a
+ * chance to throw {@link EventProcessingCompletedSignal} to bypass the default
+ * handler.
+ *
+ * @author rarkenin
+ *
+ */
+public interface INodeParams {
+ /**
+ * Function that is called when a node is punched.
+ *
+ * @param player
+ * The player punching the node.
+ * @param tool
+ * The tool being used to punch the node.
+ * @param target
+ * The position of the targeted node.
+ * @param punchedFace
+ * The face being punched.
+ */
+ public abstract void onPunch(Player player, MossItem tool,
+ NodePosition target, Face punchedFace)
+ throws EventProcessingCompletedSignal;
+
+ /**
+ * Determines if a fall should continue
+ *
+ * @param player
+ * The player.
+ * @param height
+ * The height.
+ * @return A boolean representing whether the fall should continue or be
+ * marked as a fall.
+ */
+ public abstract boolean shouldContinueFall(Player player, double height);
+
+ /**
+ * Called when a node is fully dug.
+ *
+ * @param player
+ * The player digging the node.
+ * @param tool
+ * The tool used to dig the node.
+ * @param target
+ * The position of the node that has been dug.
+ * @param punchedFace
+ * The face on which the the tool was pointed when digging was
+ * complete. Note that if a dig begins on one face but the player
+ * moves the aim to another face the onPunch handler may receive
+ * a different face than this handler.
+ * @throws EventProcessingCompletedSignal
+ */
+ public abstract void onDig(Player player, MossItem tool,
+ NodePosition target, Face punchedFace)
+ throws EventProcessingCompletedSignal;
+
+ /**
+ * Called when a node is placed directly above, below, left, right, in front
+ * of, or behind this node.
+ *
+ * @param player
+ * The player placing the node.
+ * @param target
+ * @param placed
+ * @throws EventProcessingCompletedSignal
+ */
+ public abstract void onPlaceNextTo(Player player, NodePosition target,
+ NodePosition placed) throws EventProcessingCompletedSignal;
+
+ /**
+ * Called when a right-click is done on a node. Note that this is called
+ * even if no node is placed, such as if the player is not holding anything,
+ * or is holding a tool.
+ *
+ * @param player
+ * Player performing the action.
+ * @param tool
+ * Tool held by user in active slot during this action.
+ * @param target
+ * Position of targeted node
+ * @param clickedFace
+ * Face which was right-clicked.
+ * @throws EventProcessingCompletedSignal
+ */
+ public abstract void onRightClick(Player player, MossItem tool,
+ NodePosition target, Face clickedFace)
+ throws EventProcessingCompletedSignal;
+
+ /**
+ * Called when a player steps on a node either from jumping, falling, or
+ * walking forward.
+ *
+ * @param player
+ * Player that steps on this node.
+ * @param pos
+ * Position of node that is stepped on.
+ * @return Currently unused.
+ * @throws EventProcessingCompletedSignal
+ */
+ public abstract boolean onStepOn(Player player, NodePosition pos)
+ throws EventProcessingCompletedSignal;
+
+ /**
+ * Calculates the height a player may jump off of this node. One node is
+ * equal to 1.0.
+ *
+ * @param player
+ * @return The height the player may jump off this node.
+ */
+ public abstract double jumpOffHeight(Player player);
+
+ /**
+ * Calculates the height a player will bounce when landing on this node.
+ *
+ * @param player
+ * @param fallheight
+ * The height from which the player has fallen.
+ * @return A double value representing the height the player is to bounce.
+ */
+ public abstract double calcBounceHeight(Player player, double fallheight);
+
+ /**
+ * Calculates at which rate a player will sink in after landing on this
+ * node.
+ *
+ * @param player
+ * The player to calculate sink for.
+ * @param fallheight
+ * The height from which they have fallen. 0 if the player walks
+ * onto the node without jumping or falling.
+ * @return The rate for the player to sink.
+ */
+ public abstract double calcSinkIn(Player player, double fallheight);
+
+ /**
+ * Calculates at which rate a player will sink in if they are holding the
+ * key to actively descend.
+ *
+ * @param player
+ * The player to calculate sink for.
+ * @param fallheight
+ * The height from which they have fallen. 0 if the player walks
+ * onto the node without jumping or falling(feet at surface), or
+ * negative if they have already sunk in partially.
+ * @return The rate for the player to sink.
+ */
+ public abstract double calcSinkActive(Player player, double fallheight);
+
+ /**
+ * Calculates the rate at which a player will rise out of this node if they
+ * have sunk in and are pressing the jump key. If the player is in multiple
+ * node the lowermost node at the player's horizontal center is considered.
+ *
+ * @param player
+ * The player to perform the calculation for.
+ * @param sinkheight
+ * The depth to which the player has sunk. 0 is the surface at
+ * the player's feet. 1 corresponds to the player's feet being at
+ * the bottom of the node, and 2 or more is if the player is
+ * submerged in multiple nodes.
+ * @return The rate at which the player should rise when they hold the key
+ * corresponding to jumping, in nodes per second.
+ */
+ public abstract double calcSinkEscape(Player player, double sinkheight);
+
+ /**
+ * Calculates the speed at which a player will move across this node when
+ * walking.
+ *
+ * @param player
+ * The player for which the walk rate is being calculated.
+ * @return The rate in nodes/second at which the player should walk.
+ */
+ public abstract double calcWalkSpeed(Player player);
+
+ /**
+ * Calculates the speed at which a player will move across this node when
+ * sprinting.
+ *
+ * @param player
+ * The player for which the sprint rate is being calculated.
+ * @return The rate in nodes/second at which the player should sprint.
+ */
+ public abstract double calcSprintSpeed(Player player);
+
+ /**
+ * Calculates the damage a player will take when falling onto this node.
+ *
+ * @param player
+ * The player falling onto this node.
+ * @param height
+ * The fall height.
+ * @return The damage to be given to the player. A player has a default
+ * health of 64 units.
+ */
+ public abstract double calcFallDamage(Player player, double height);
+
+ /**
+ * Calculate whether a ray aimed from the crosshairs should stop at this
+ * node.
+ *
+ * @param player
+ * The player.
+ * @param distance
+ * The distance from the camera to the node.
+ * @return
+ */
+ public abstract boolean shouldHitAimRay(Player player, double distance);
+
+ /**
+ * Calculate a dig property. These are generally 0 for inability to dig to 1
+ * for digging the node in one second.
+ *
+ * @param key
+ * @return
+ */
+ public abstract double calcInteractProperties(MossTool.InteractType key);
+
+}
diff --git a/src/net/mosstest/scripting/JavaApi.java b/src/net/mosstest/scripting/JavaApi.java
index ff5156c..bb28875 100644
--- a/src/net/mosstest/scripting/JavaApi.java
+++ b/src/net/mosstest/scripting/JavaApi.java
@@ -1,235 +1,235 @@
-package net.mosstest.scripting;
-
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Dimension2D;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.Path2D;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.awt.geom.RectangularShape;
-import java.lang.ref.PhantomReference;
-import java.lang.ref.Reference;
-import java.lang.ref.SoftReference;
-import java.lang.ref.WeakReference;
-import java.lang.reflect.InvocationTargetException;
-import java.math.BigInteger;
-import java.math.RoundingMode;
-import java.util.AbstractCollection;
-import java.util.AbstractList;
-import java.util.AbstractMap;
-import java.util.AbstractSequentialList;
-import java.util.AbstractSet;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.BitSet;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Currency;
-import java.util.Date;
-import java.util.Deque;
-import java.util.Dictionary;
-import java.util.EmptyStackException;
-import java.util.EnumMap;
-import java.util.EventListener;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.NavigableMap;
-import java.util.Properties;
-import java.util.Queue;
-import java.util.Random;
-import java.util.RandomAccess;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.Stack;
-import java.util.StringTokenizer;
-import java.util.TimeZone;
-import java.util.TreeSet;
-import java.util.Vector;
-import java.util.WeakHashMap;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.locks.AbstractOwnableSynchronizer;
-import java.util.concurrent.locks.AbstractQueuedSynchronizer;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-import java.util.regex.MatchResult;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import net.mosstest.sandbox.SandboxClass;
-import net.mosstest.sandbox.lang.Runtime;
-import net.mosstest.sandbox.lang.System;
-import net.mosstest.sandbox.lang.Thread;
-import net.mosstest.sandbox.lang.ThreadGroup;
-import net.mosstest.sandbox.lang.ThreadLocal;
-import net.mosstest.sandbox.util.Enumeration;
-import net.mosstest.sandbox.util.ResourceBundle;
-import net.mosstest.sandbox.util.concurrent.atomic.AtomicReferenceFieldUpdater;
-
-/**
- * Class for scripts to instantiate and access the static methods of various approved classes.
- * @author rarkenin
- *
- */
-public class JavaApi {
-
- private static final HashMap qualifiedClasses=new HashMap(){{
- put("java.lang.Object", new SandboxClass