Compare commits
No commits in common. "master" and "why-do-I-need-to-make-a-branch-already" have entirely different histories.
master
...
why-do-I-n
19 changed files with 643 additions and 1077 deletions
14
.gitignore
vendored
14
.gitignore
vendored
|
|
@ -1,17 +1,3 @@
|
||||||
*.class
|
|
||||||
|
|
||||||
# Mobile Tools for Java (J2ME)
|
|
||||||
.mtj.tmp/
|
|
||||||
|
|
||||||
# Package Files #
|
|
||||||
*.jar
|
|
||||||
*.war
|
|
||||||
*.ear
|
|
||||||
|
|
||||||
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
|
|
||||||
hs_err_pid*
|
|
||||||
|
|
||||||
/bin/
|
/bin/
|
||||||
.classpath
|
.classpath
|
||||||
*.classpath
|
*.classpath
|
||||||
/target/
|
|
||||||
|
|
|
||||||
6
.project
6
.project
|
|
@ -10,14 +10,8 @@
|
||||||
<arguments>
|
<arguments>
|
||||||
</arguments>
|
</arguments>
|
||||||
</buildCommand>
|
</buildCommand>
|
||||||
<buildCommand>
|
|
||||||
<name>org.eclipse.m2e.core.maven2Builder</name>
|
|
||||||
<arguments>
|
|
||||||
</arguments>
|
|
||||||
</buildCommand>
|
|
||||||
</buildSpec>
|
</buildSpec>
|
||||||
<natures>
|
<natures>
|
||||||
<nature>org.eclipse.m2e.core.maven2Nature</nature>
|
|
||||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||||
</natures>
|
</natures>
|
||||||
</projectDescription>
|
</projectDescription>
|
||||||
|
|
|
||||||
|
|
@ -8,5 +8,4 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
|
||||||
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
|
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
|
||||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
|
||||||
org.eclipse.jdt.core.compiler.source=1.8
|
org.eclipse.jdt.core.compiler.source=1.8
|
||||||
|
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
activeProfiles=
|
|
||||||
eclipse.preferences.version=1
|
|
||||||
resolveWorkspaceProjects=true
|
|
||||||
version=1
|
|
||||||
674
LICENSE
674
LICENSE
|
|
@ -1,674 +0,0 @@
|
||||||
GNU GENERAL PUBLIC LICENSE
|
|
||||||
Version 3, 29 June 2007
|
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
Preamble
|
|
||||||
|
|
||||||
The GNU General Public License is a free, copyleft license for
|
|
||||||
software and other kinds of works.
|
|
||||||
|
|
||||||
The licenses for most software and other practical works are designed
|
|
||||||
to take away your freedom to share and change the works. By contrast,
|
|
||||||
the GNU General Public License is intended to guarantee your freedom to
|
|
||||||
share and change all versions of a program--to make sure it remains free
|
|
||||||
software for all its users. We, the Free Software Foundation, use the
|
|
||||||
GNU General Public License for most of our software; it applies also to
|
|
||||||
any other work released this way by its authors. You can apply it to
|
|
||||||
your programs, too.
|
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
|
||||||
have the freedom to distribute copies of free software (and charge for
|
|
||||||
them if you wish), that you receive source code or can get it if you
|
|
||||||
want it, that you can change the software or use pieces of it in new
|
|
||||||
free programs, and that you know you can do these things.
|
|
||||||
|
|
||||||
To protect your rights, we need to prevent others from denying you
|
|
||||||
these rights or asking you to surrender the rights. Therefore, you have
|
|
||||||
certain responsibilities if you distribute copies of the software, or if
|
|
||||||
you modify it: responsibilities to respect the freedom of others.
|
|
||||||
|
|
||||||
For example, if you distribute copies of such a program, whether
|
|
||||||
gratis or for a fee, you must pass on to the recipients the same
|
|
||||||
freedoms that you received. You must make sure that they, too, receive
|
|
||||||
or can get the source code. And you must show them these terms so they
|
|
||||||
know their rights.
|
|
||||||
|
|
||||||
Developers that use the GNU GPL protect your rights with two steps:
|
|
||||||
(1) assert copyright on the software, and (2) offer you this License
|
|
||||||
giving you legal permission to copy, distribute and/or modify it.
|
|
||||||
|
|
||||||
For the developers' and authors' protection, the GPL clearly explains
|
|
||||||
that there is no warranty for this free software. For both users' and
|
|
||||||
authors' sake, the GPL requires that modified versions be marked as
|
|
||||||
changed, so that their problems will not be attributed erroneously to
|
|
||||||
authors of previous versions.
|
|
||||||
|
|
||||||
Some devices are designed to deny users access to install or run
|
|
||||||
modified versions of the software inside them, although the manufacturer
|
|
||||||
can do so. This is fundamentally incompatible with the aim of
|
|
||||||
protecting users' freedom to change the software. The systematic
|
|
||||||
pattern of such abuse occurs in the area of products for individuals to
|
|
||||||
use, which is precisely where it is most unacceptable. Therefore, we
|
|
||||||
have designed this version of the GPL to prohibit the practice for those
|
|
||||||
products. If such problems arise substantially in other domains, we
|
|
||||||
stand ready to extend this provision to those domains in future versions
|
|
||||||
of the GPL, as needed to protect the freedom of users.
|
|
||||||
|
|
||||||
Finally, every program is threatened constantly by software patents.
|
|
||||||
States should not allow patents to restrict development and use of
|
|
||||||
software on general-purpose computers, but in those that do, we wish to
|
|
||||||
avoid the special danger that patents applied to a free program could
|
|
||||||
make it effectively proprietary. To prevent this, the GPL assures that
|
|
||||||
patents cannot be used to render the program non-free.
|
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
|
||||||
modification follow.
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
0. Definitions.
|
|
||||||
|
|
||||||
"This License" refers to version 3 of the GNU General Public License.
|
|
||||||
|
|
||||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
|
||||||
works, such as semiconductor masks.
|
|
||||||
|
|
||||||
"The Program" refers to any copyrightable work licensed under this
|
|
||||||
License. Each licensee is addressed as "you". "Licensees" and
|
|
||||||
"recipients" may be individuals or organizations.
|
|
||||||
|
|
||||||
To "modify" a work means to copy from or adapt all or part of the work
|
|
||||||
in a fashion requiring copyright permission, other than the making of an
|
|
||||||
exact copy. The resulting work is called a "modified version" of the
|
|
||||||
earlier work or a work "based on" the earlier work.
|
|
||||||
|
|
||||||
A "covered work" means either the unmodified Program or a work based
|
|
||||||
on the Program.
|
|
||||||
|
|
||||||
To "propagate" a work means to do anything with it that, without
|
|
||||||
permission, would make you directly or secondarily liable for
|
|
||||||
infringement under applicable copyright law, except executing it on a
|
|
||||||
computer or modifying a private copy. Propagation includes copying,
|
|
||||||
distribution (with or without modification), making available to the
|
|
||||||
public, and in some countries other activities as well.
|
|
||||||
|
|
||||||
To "convey" a work means any kind of propagation that enables other
|
|
||||||
parties to make or receive copies. Mere interaction with a user through
|
|
||||||
a computer network, with no transfer of a copy, is not conveying.
|
|
||||||
|
|
||||||
An interactive user interface displays "Appropriate Legal Notices"
|
|
||||||
to the extent that it includes a convenient and prominently visible
|
|
||||||
feature that (1) displays an appropriate copyright notice, and (2)
|
|
||||||
tells the user that there is no warranty for the work (except to the
|
|
||||||
extent that warranties are provided), that licensees may convey the
|
|
||||||
work under this License, and how to view a copy of this License. If
|
|
||||||
the interface presents a list of user commands or options, such as a
|
|
||||||
menu, a prominent item in the list meets this criterion.
|
|
||||||
|
|
||||||
1. Source Code.
|
|
||||||
|
|
||||||
The "source code" for a work means the preferred form of the work
|
|
||||||
for making modifications to it. "Object code" means any non-source
|
|
||||||
form of a work.
|
|
||||||
|
|
||||||
A "Standard Interface" means an interface that either is an official
|
|
||||||
standard defined by a recognized standards body, or, in the case of
|
|
||||||
interfaces specified for a particular programming language, one that
|
|
||||||
is widely used among developers working in that language.
|
|
||||||
|
|
||||||
The "System Libraries" of an executable work include anything, other
|
|
||||||
than the work as a whole, that (a) is included in the normal form of
|
|
||||||
packaging a Major Component, but which is not part of that Major
|
|
||||||
Component, and (b) serves only to enable use of the work with that
|
|
||||||
Major Component, or to implement a Standard Interface for which an
|
|
||||||
implementation is available to the public in source code form. A
|
|
||||||
"Major Component", in this context, means a major essential component
|
|
||||||
(kernel, window system, and so on) of the specific operating system
|
|
||||||
(if any) on which the executable work runs, or a compiler used to
|
|
||||||
produce the work, or an object code interpreter used to run it.
|
|
||||||
|
|
||||||
The "Corresponding Source" for a work in object code form means all
|
|
||||||
the source code needed to generate, install, and (for an executable
|
|
||||||
work) run the object code and to modify the work, including scripts to
|
|
||||||
control those activities. However, it does not include the work's
|
|
||||||
System Libraries, or general-purpose tools or generally available free
|
|
||||||
programs which are used unmodified in performing those activities but
|
|
||||||
which are not part of the work. For example, Corresponding Source
|
|
||||||
includes interface definition files associated with source files for
|
|
||||||
the work, and the source code for shared libraries and dynamically
|
|
||||||
linked subprograms that the work is specifically designed to require,
|
|
||||||
such as by intimate data communication or control flow between those
|
|
||||||
subprograms and other parts of the work.
|
|
||||||
|
|
||||||
The Corresponding Source need not include anything that users
|
|
||||||
can regenerate automatically from other parts of the Corresponding
|
|
||||||
Source.
|
|
||||||
|
|
||||||
The Corresponding Source for a work in source code form is that
|
|
||||||
same work.
|
|
||||||
|
|
||||||
2. Basic Permissions.
|
|
||||||
|
|
||||||
All rights granted under this License are granted for the term of
|
|
||||||
copyright on the Program, and are irrevocable provided the stated
|
|
||||||
conditions are met. This License explicitly affirms your unlimited
|
|
||||||
permission to run the unmodified Program. The output from running a
|
|
||||||
covered work is covered by this License only if the output, given its
|
|
||||||
content, constitutes a covered work. This License acknowledges your
|
|
||||||
rights of fair use or other equivalent, as provided by copyright law.
|
|
||||||
|
|
||||||
You may make, run and propagate covered works that you do not
|
|
||||||
convey, without conditions so long as your license otherwise remains
|
|
||||||
in force. You may convey covered works to others for the sole purpose
|
|
||||||
of having them make modifications exclusively for you, or provide you
|
|
||||||
with facilities for running those works, provided that you comply with
|
|
||||||
the terms of this License in conveying all material for which you do
|
|
||||||
not control copyright. Those thus making or running the covered works
|
|
||||||
for you must do so exclusively on your behalf, under your direction
|
|
||||||
and control, on terms that prohibit them from making any copies of
|
|
||||||
your copyrighted material outside their relationship with you.
|
|
||||||
|
|
||||||
Conveying under any other circumstances is permitted solely under
|
|
||||||
the conditions stated below. Sublicensing is not allowed; section 10
|
|
||||||
makes it unnecessary.
|
|
||||||
|
|
||||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
|
||||||
|
|
||||||
No covered work shall be deemed part of an effective technological
|
|
||||||
measure under any applicable law fulfilling obligations under article
|
|
||||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
|
||||||
similar laws prohibiting or restricting circumvention of such
|
|
||||||
measures.
|
|
||||||
|
|
||||||
When you convey a covered work, you waive any legal power to forbid
|
|
||||||
circumvention of technological measures to the extent such circumvention
|
|
||||||
is effected by exercising rights under this License with respect to
|
|
||||||
the covered work, and you disclaim any intention to limit operation or
|
|
||||||
modification of the work as a means of enforcing, against the work's
|
|
||||||
users, your or third parties' legal rights to forbid circumvention of
|
|
||||||
technological measures.
|
|
||||||
|
|
||||||
4. Conveying Verbatim Copies.
|
|
||||||
|
|
||||||
You may convey verbatim copies of the Program's source code as you
|
|
||||||
receive it, in any medium, provided that you conspicuously and
|
|
||||||
appropriately publish on each copy an appropriate copyright notice;
|
|
||||||
keep intact all notices stating that this License and any
|
|
||||||
non-permissive terms added in accord with section 7 apply to the code;
|
|
||||||
keep intact all notices of the absence of any warranty; and give all
|
|
||||||
recipients a copy of this License along with the Program.
|
|
||||||
|
|
||||||
You may charge any price or no price for each copy that you convey,
|
|
||||||
and you may offer support or warranty protection for a fee.
|
|
||||||
|
|
||||||
5. Conveying Modified Source Versions.
|
|
||||||
|
|
||||||
You may convey a work based on the Program, or the modifications to
|
|
||||||
produce it from the Program, in the form of source code under the
|
|
||||||
terms of section 4, provided that you also meet all of these conditions:
|
|
||||||
|
|
||||||
a) The work must carry prominent notices stating that you modified
|
|
||||||
it, and giving a relevant date.
|
|
||||||
|
|
||||||
b) The work must carry prominent notices stating that it is
|
|
||||||
released under this License and any conditions added under section
|
|
||||||
7. This requirement modifies the requirement in section 4 to
|
|
||||||
"keep intact all notices".
|
|
||||||
|
|
||||||
c) You must license the entire work, as a whole, under this
|
|
||||||
License to anyone who comes into possession of a copy. This
|
|
||||||
License will therefore apply, along with any applicable section 7
|
|
||||||
additional terms, to the whole of the work, and all its parts,
|
|
||||||
regardless of how they are packaged. This License gives no
|
|
||||||
permission to license the work in any other way, but it does not
|
|
||||||
invalidate such permission if you have separately received it.
|
|
||||||
|
|
||||||
d) If the work has interactive user interfaces, each must display
|
|
||||||
Appropriate Legal Notices; however, if the Program has interactive
|
|
||||||
interfaces that do not display Appropriate Legal Notices, your
|
|
||||||
work need not make them do so.
|
|
||||||
|
|
||||||
A compilation of a covered work with other separate and independent
|
|
||||||
works, which are not by their nature extensions of the covered work,
|
|
||||||
and which are not combined with it such as to form a larger program,
|
|
||||||
in or on a volume of a storage or distribution medium, is called an
|
|
||||||
"aggregate" if the compilation and its resulting copyright are not
|
|
||||||
used to limit the access or legal rights of the compilation's users
|
|
||||||
beyond what the individual works permit. Inclusion of a covered work
|
|
||||||
in an aggregate does not cause this License to apply to the other
|
|
||||||
parts of the aggregate.
|
|
||||||
|
|
||||||
6. Conveying Non-Source Forms.
|
|
||||||
|
|
||||||
You may convey a covered work in object code form under the terms
|
|
||||||
of sections 4 and 5, provided that you also convey the
|
|
||||||
machine-readable Corresponding Source under the terms of this License,
|
|
||||||
in one of these ways:
|
|
||||||
|
|
||||||
a) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by the
|
|
||||||
Corresponding Source fixed on a durable physical medium
|
|
||||||
customarily used for software interchange.
|
|
||||||
|
|
||||||
b) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by a
|
|
||||||
written offer, valid for at least three years and valid for as
|
|
||||||
long as you offer spare parts or customer support for that product
|
|
||||||
model, to give anyone who possesses the object code either (1) a
|
|
||||||
copy of the Corresponding Source for all the software in the
|
|
||||||
product that is covered by this License, on a durable physical
|
|
||||||
medium customarily used for software interchange, for a price no
|
|
||||||
more than your reasonable cost of physically performing this
|
|
||||||
conveying of source, or (2) access to copy the
|
|
||||||
Corresponding Source from a network server at no charge.
|
|
||||||
|
|
||||||
c) Convey individual copies of the object code with a copy of the
|
|
||||||
written offer to provide the Corresponding Source. This
|
|
||||||
alternative is allowed only occasionally and noncommercially, and
|
|
||||||
only if you received the object code with such an offer, in accord
|
|
||||||
with subsection 6b.
|
|
||||||
|
|
||||||
d) Convey the object code by offering access from a designated
|
|
||||||
place (gratis or for a charge), and offer equivalent access to the
|
|
||||||
Corresponding Source in the same way through the same place at no
|
|
||||||
further charge. You need not require recipients to copy the
|
|
||||||
Corresponding Source along with the object code. If the place to
|
|
||||||
copy the object code is a network server, the Corresponding Source
|
|
||||||
may be on a different server (operated by you or a third party)
|
|
||||||
that supports equivalent copying facilities, provided you maintain
|
|
||||||
clear directions next to the object code saying where to find the
|
|
||||||
Corresponding Source. Regardless of what server hosts the
|
|
||||||
Corresponding Source, you remain obligated to ensure that it is
|
|
||||||
available for as long as needed to satisfy these requirements.
|
|
||||||
|
|
||||||
e) Convey the object code using peer-to-peer transmission, provided
|
|
||||||
you inform other peers where the object code and Corresponding
|
|
||||||
Source of the work are being offered to the general public at no
|
|
||||||
charge under subsection 6d.
|
|
||||||
|
|
||||||
A separable portion of the object code, whose source code is excluded
|
|
||||||
from the Corresponding Source as a System Library, need not be
|
|
||||||
included in conveying the object code work.
|
|
||||||
|
|
||||||
A "User Product" is either (1) a "consumer product", which means any
|
|
||||||
tangible personal property which is normally used for personal, family,
|
|
||||||
or household purposes, or (2) anything designed or sold for incorporation
|
|
||||||
into a dwelling. In determining whether a product is a consumer product,
|
|
||||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
|
||||||
product received by a particular user, "normally used" refers to a
|
|
||||||
typical or common use of that class of product, regardless of the status
|
|
||||||
of the particular user or of the way in which the particular user
|
|
||||||
actually uses, or expects or is expected to use, the product. A product
|
|
||||||
is a consumer product regardless of whether the product has substantial
|
|
||||||
commercial, industrial or non-consumer uses, unless such uses represent
|
|
||||||
the only significant mode of use of the product.
|
|
||||||
|
|
||||||
"Installation Information" for a User Product means any methods,
|
|
||||||
procedures, authorization keys, or other information required to install
|
|
||||||
and execute modified versions of a covered work in that User Product from
|
|
||||||
a modified version of its Corresponding Source. The information must
|
|
||||||
suffice to ensure that the continued functioning of the modified object
|
|
||||||
code is in no case prevented or interfered with solely because
|
|
||||||
modification has been made.
|
|
||||||
|
|
||||||
If you convey an object code work under this section in, or with, or
|
|
||||||
specifically for use in, a User Product, and the conveying occurs as
|
|
||||||
part of a transaction in which the right of possession and use of the
|
|
||||||
User Product is transferred to the recipient in perpetuity or for a
|
|
||||||
fixed term (regardless of how the transaction is characterized), the
|
|
||||||
Corresponding Source conveyed under this section must be accompanied
|
|
||||||
by the Installation Information. But this requirement does not apply
|
|
||||||
if neither you nor any third party retains the ability to install
|
|
||||||
modified object code on the User Product (for example, the work has
|
|
||||||
been installed in ROM).
|
|
||||||
|
|
||||||
The requirement to provide Installation Information does not include a
|
|
||||||
requirement to continue to provide support service, warranty, or updates
|
|
||||||
for a work that has been modified or installed by the recipient, or for
|
|
||||||
the User Product in which it has been modified or installed. Access to a
|
|
||||||
network may be denied when the modification itself materially and
|
|
||||||
adversely affects the operation of the network or violates the rules and
|
|
||||||
protocols for communication across the network.
|
|
||||||
|
|
||||||
Corresponding Source conveyed, and Installation Information provided,
|
|
||||||
in accord with this section must be in a format that is publicly
|
|
||||||
documented (and with an implementation available to the public in
|
|
||||||
source code form), and must require no special password or key for
|
|
||||||
unpacking, reading or copying.
|
|
||||||
|
|
||||||
7. Additional Terms.
|
|
||||||
|
|
||||||
"Additional permissions" are terms that supplement the terms of this
|
|
||||||
License by making exceptions from one or more of its conditions.
|
|
||||||
Additional permissions that are applicable to the entire Program shall
|
|
||||||
be treated as though they were included in this License, to the extent
|
|
||||||
that they are valid under applicable law. If additional permissions
|
|
||||||
apply only to part of the Program, that part may be used separately
|
|
||||||
under those permissions, but the entire Program remains governed by
|
|
||||||
this License without regard to the additional permissions.
|
|
||||||
|
|
||||||
When you convey a copy of a covered work, you may at your option
|
|
||||||
remove any additional permissions from that copy, or from any part of
|
|
||||||
it. (Additional permissions may be written to require their own
|
|
||||||
removal in certain cases when you modify the work.) You may place
|
|
||||||
additional permissions on material, added by you to a covered work,
|
|
||||||
for which you have or can give appropriate copyright permission.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, for material you
|
|
||||||
add to a covered work, you may (if authorized by the copyright holders of
|
|
||||||
that material) supplement the terms of this License with terms:
|
|
||||||
|
|
||||||
a) Disclaiming warranty or limiting liability differently from the
|
|
||||||
terms of sections 15 and 16 of this License; or
|
|
||||||
|
|
||||||
b) Requiring preservation of specified reasonable legal notices or
|
|
||||||
author attributions in that material or in the Appropriate Legal
|
|
||||||
Notices displayed by works containing it; or
|
|
||||||
|
|
||||||
c) Prohibiting misrepresentation of the origin of that material, or
|
|
||||||
requiring that modified versions of such material be marked in
|
|
||||||
reasonable ways as different from the original version; or
|
|
||||||
|
|
||||||
d) Limiting the use for publicity purposes of names of licensors or
|
|
||||||
authors of the material; or
|
|
||||||
|
|
||||||
e) Declining to grant rights under trademark law for use of some
|
|
||||||
trade names, trademarks, or service marks; or
|
|
||||||
|
|
||||||
f) Requiring indemnification of licensors and authors of that
|
|
||||||
material by anyone who conveys the material (or modified versions of
|
|
||||||
it) with contractual assumptions of liability to the recipient, for
|
|
||||||
any liability that these contractual assumptions directly impose on
|
|
||||||
those licensors and authors.
|
|
||||||
|
|
||||||
All other non-permissive additional terms are considered "further
|
|
||||||
restrictions" within the meaning of section 10. If the Program as you
|
|
||||||
received it, or any part of it, contains a notice stating that it is
|
|
||||||
governed by this License along with a term that is a further
|
|
||||||
restriction, you may remove that term. If a license document contains
|
|
||||||
a further restriction but permits relicensing or conveying under this
|
|
||||||
License, you may add to a covered work material governed by the terms
|
|
||||||
of that license document, provided that the further restriction does
|
|
||||||
not survive such relicensing or conveying.
|
|
||||||
|
|
||||||
If you add terms to a covered work in accord with this section, you
|
|
||||||
must place, in the relevant source files, a statement of the
|
|
||||||
additional terms that apply to those files, or a notice indicating
|
|
||||||
where to find the applicable terms.
|
|
||||||
|
|
||||||
Additional terms, permissive or non-permissive, may be stated in the
|
|
||||||
form of a separately written license, or stated as exceptions;
|
|
||||||
the above requirements apply either way.
|
|
||||||
|
|
||||||
8. Termination.
|
|
||||||
|
|
||||||
You may not propagate or modify a covered work except as expressly
|
|
||||||
provided under this License. Any attempt otherwise to propagate or
|
|
||||||
modify it is void, and will automatically terminate your rights under
|
|
||||||
this License (including any patent licenses granted under the third
|
|
||||||
paragraph of section 11).
|
|
||||||
|
|
||||||
However, if you cease all violation of this License, then your
|
|
||||||
license from a particular copyright holder is reinstated (a)
|
|
||||||
provisionally, unless and until the copyright holder explicitly and
|
|
||||||
finally terminates your license, and (b) permanently, if the copyright
|
|
||||||
holder fails to notify you of the violation by some reasonable means
|
|
||||||
prior to 60 days after the cessation.
|
|
||||||
|
|
||||||
Moreover, your license from a particular copyright holder is
|
|
||||||
reinstated permanently if the copyright holder notifies you of the
|
|
||||||
violation by some reasonable means, this is the first time you have
|
|
||||||
received notice of violation of this License (for any work) from that
|
|
||||||
copyright holder, and you cure the violation prior to 30 days after
|
|
||||||
your receipt of the notice.
|
|
||||||
|
|
||||||
Termination of your rights under this section does not terminate the
|
|
||||||
licenses of parties who have received copies or rights from you under
|
|
||||||
this License. If your rights have been terminated and not permanently
|
|
||||||
reinstated, you do not qualify to receive new licenses for the same
|
|
||||||
material under section 10.
|
|
||||||
|
|
||||||
9. Acceptance Not Required for Having Copies.
|
|
||||||
|
|
||||||
You are not required to accept this License in order to receive or
|
|
||||||
run a copy of the Program. Ancillary propagation of a covered work
|
|
||||||
occurring solely as a consequence of using peer-to-peer transmission
|
|
||||||
to receive a copy likewise does not require acceptance. However,
|
|
||||||
nothing other than this License grants you permission to propagate or
|
|
||||||
modify any covered work. These actions infringe copyright if you do
|
|
||||||
not accept this License. Therefore, by modifying or propagating a
|
|
||||||
covered work, you indicate your acceptance of this License to do so.
|
|
||||||
|
|
||||||
10. Automatic Licensing of Downstream Recipients.
|
|
||||||
|
|
||||||
Each time you convey a covered work, the recipient automatically
|
|
||||||
receives a license from the original licensors, to run, modify and
|
|
||||||
propagate that work, subject to this License. You are not responsible
|
|
||||||
for enforcing compliance by third parties with this License.
|
|
||||||
|
|
||||||
An "entity transaction" is a transaction transferring control of an
|
|
||||||
organization, or substantially all assets of one, or subdividing an
|
|
||||||
organization, or merging organizations. If propagation of a covered
|
|
||||||
work results from an entity transaction, each party to that
|
|
||||||
transaction who receives a copy of the work also receives whatever
|
|
||||||
licenses to the work the party's predecessor in interest had or could
|
|
||||||
give under the previous paragraph, plus a right to possession of the
|
|
||||||
Corresponding Source of the work from the predecessor in interest, if
|
|
||||||
the predecessor has it or can get it with reasonable efforts.
|
|
||||||
|
|
||||||
You may not impose any further restrictions on the exercise of the
|
|
||||||
rights granted or affirmed under this License. For example, you may
|
|
||||||
not impose a license fee, royalty, or other charge for exercise of
|
|
||||||
rights granted under this License, and you may not initiate litigation
|
|
||||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
|
||||||
any patent claim is infringed by making, using, selling, offering for
|
|
||||||
sale, or importing the Program or any portion of it.
|
|
||||||
|
|
||||||
11. Patents.
|
|
||||||
|
|
||||||
A "contributor" is a copyright holder who authorizes use under this
|
|
||||||
License of the Program or a work on which the Program is based. The
|
|
||||||
work thus licensed is called the contributor's "contributor version".
|
|
||||||
|
|
||||||
A contributor's "essential patent claims" are all patent claims
|
|
||||||
owned or controlled by the contributor, whether already acquired or
|
|
||||||
hereafter acquired, that would be infringed by some manner, permitted
|
|
||||||
by this License, of making, using, or selling its contributor version,
|
|
||||||
but do not include claims that would be infringed only as a
|
|
||||||
consequence of further modification of the contributor version. For
|
|
||||||
purposes of this definition, "control" includes the right to grant
|
|
||||||
patent sublicenses in a manner consistent with the requirements of
|
|
||||||
this License.
|
|
||||||
|
|
||||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
|
||||||
patent license under the contributor's essential patent claims, to
|
|
||||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
|
||||||
propagate the contents of its contributor version.
|
|
||||||
|
|
||||||
In the following three paragraphs, a "patent license" is any express
|
|
||||||
agreement or commitment, however denominated, not to enforce a patent
|
|
||||||
(such as an express permission to practice a patent or covenant not to
|
|
||||||
sue for patent infringement). To "grant" such a patent license to a
|
|
||||||
party means to make such an agreement or commitment not to enforce a
|
|
||||||
patent against the party.
|
|
||||||
|
|
||||||
If you convey a covered work, knowingly relying on a patent license,
|
|
||||||
and the Corresponding Source of the work is not available for anyone
|
|
||||||
to copy, free of charge and under the terms of this License, through a
|
|
||||||
publicly available network server or other readily accessible means,
|
|
||||||
then you must either (1) cause the Corresponding Source to be so
|
|
||||||
available, or (2) arrange to deprive yourself of the benefit of the
|
|
||||||
patent license for this particular work, or (3) arrange, in a manner
|
|
||||||
consistent with the requirements of this License, to extend the patent
|
|
||||||
license to downstream recipients. "Knowingly relying" means you have
|
|
||||||
actual knowledge that, but for the patent license, your conveying the
|
|
||||||
covered work in a country, or your recipient's use of the covered work
|
|
||||||
in a country, would infringe one or more identifiable patents in that
|
|
||||||
country that you have reason to believe are valid.
|
|
||||||
|
|
||||||
If, pursuant to or in connection with a single transaction or
|
|
||||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
|
||||||
covered work, and grant a patent license to some of the parties
|
|
||||||
receiving the covered work authorizing them to use, propagate, modify
|
|
||||||
or convey a specific copy of the covered work, then the patent license
|
|
||||||
you grant is automatically extended to all recipients of the covered
|
|
||||||
work and works based on it.
|
|
||||||
|
|
||||||
A patent license is "discriminatory" if it does not include within
|
|
||||||
the scope of its coverage, prohibits the exercise of, or is
|
|
||||||
conditioned on the non-exercise of one or more of the rights that are
|
|
||||||
specifically granted under this License. You may not convey a covered
|
|
||||||
work if you are a party to an arrangement with a third party that is
|
|
||||||
in the business of distributing software, under which you make payment
|
|
||||||
to the third party based on the extent of your activity of conveying
|
|
||||||
the work, and under which the third party grants, to any of the
|
|
||||||
parties who would receive the covered work from you, a discriminatory
|
|
||||||
patent license (a) in connection with copies of the covered work
|
|
||||||
conveyed by you (or copies made from those copies), or (b) primarily
|
|
||||||
for and in connection with specific products or compilations that
|
|
||||||
contain the covered work, unless you entered into that arrangement,
|
|
||||||
or that patent license was granted, prior to 28 March 2007.
|
|
||||||
|
|
||||||
Nothing in this License shall be construed as excluding or limiting
|
|
||||||
any implied license or other defenses to infringement that may
|
|
||||||
otherwise be available to you under applicable patent law.
|
|
||||||
|
|
||||||
12. No Surrender of Others' Freedom.
|
|
||||||
|
|
||||||
If conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot convey a
|
|
||||||
covered work so as to satisfy simultaneously your obligations under this
|
|
||||||
License and any other pertinent obligations, then as a consequence you may
|
|
||||||
not convey it at all. For example, if you agree to terms that obligate you
|
|
||||||
to collect a royalty for further conveying from those to whom you convey
|
|
||||||
the Program, the only way you could satisfy both those terms and this
|
|
||||||
License would be to refrain entirely from conveying the Program.
|
|
||||||
|
|
||||||
13. Use with the GNU Affero General Public License.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, you have
|
|
||||||
permission to link or combine any covered work with a work licensed
|
|
||||||
under version 3 of the GNU Affero General Public License into a single
|
|
||||||
combined work, and to convey the resulting work. The terms of this
|
|
||||||
License will continue to apply to the part which is the covered work,
|
|
||||||
but the special requirements of the GNU Affero General Public License,
|
|
||||||
section 13, concerning interaction through a network will apply to the
|
|
||||||
combination as such.
|
|
||||||
|
|
||||||
14. Revised Versions of this License.
|
|
||||||
|
|
||||||
The Free Software Foundation may publish revised and/or new versions of
|
|
||||||
the GNU General Public License from time to time. Such new versions will
|
|
||||||
be similar in spirit to the present version, but may differ in detail to
|
|
||||||
address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the
|
|
||||||
Program specifies that a certain numbered version of the GNU General
|
|
||||||
Public License "or any later version" applies to it, you have the
|
|
||||||
option of following the terms and conditions either of that numbered
|
|
||||||
version or of any later version published by the Free Software
|
|
||||||
Foundation. If the Program does not specify a version number of the
|
|
||||||
GNU General Public License, you may choose any version ever published
|
|
||||||
by the Free Software Foundation.
|
|
||||||
|
|
||||||
If the Program specifies that a proxy can decide which future
|
|
||||||
versions of the GNU General Public License can be used, that proxy's
|
|
||||||
public statement of acceptance of a version permanently authorizes you
|
|
||||||
to choose that version for the Program.
|
|
||||||
|
|
||||||
Later license versions may give you additional or different
|
|
||||||
permissions. However, no additional obligations are imposed on any
|
|
||||||
author or copyright holder as a result of your choosing to follow a
|
|
||||||
later version.
|
|
||||||
|
|
||||||
15. Disclaimer of Warranty.
|
|
||||||
|
|
||||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
|
||||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
|
||||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
|
||||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
||||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
|
||||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
|
||||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
|
||||||
|
|
||||||
16. Limitation of Liability.
|
|
||||||
|
|
||||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
|
||||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
|
||||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
|
||||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
|
||||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
|
||||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
|
||||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
|
||||||
SUCH DAMAGES.
|
|
||||||
|
|
||||||
17. Interpretation of Sections 15 and 16.
|
|
||||||
|
|
||||||
If the disclaimer of warranty and limitation of liability provided
|
|
||||||
above cannot be given local legal effect according to their terms,
|
|
||||||
reviewing courts shall apply local law that most closely approximates
|
|
||||||
an absolute waiver of all civil liability in connection with the
|
|
||||||
Program, unless a warranty or assumption of liability accompanies a
|
|
||||||
copy of the Program in return for a fee.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest
|
|
||||||
to attach them to the start of each source file to most effectively
|
|
||||||
state the exclusion of warranty; and each file should have at least
|
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
{one line to give the program's name and a brief idea of what it does.}
|
|
||||||
Copyright (C) {year} {name of author}
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
|
||||||
|
|
||||||
If the program does terminal interaction, make it output a short
|
|
||||||
notice like this when it starts in an interactive mode:
|
|
||||||
|
|
||||||
{project} Copyright (C) {year} {fullname}
|
|
||||||
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
|
|
||||||
<http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
The GNU General Public License does not permit incorporating your program
|
|
||||||
into proprietary programs. If your program is a subroutine library, you
|
|
||||||
may consider it more useful to permit linking proprietary applications with
|
|
||||||
the library. If this is what you want to do, use the GNU Lesser General
|
|
||||||
Public License instead of this License. But first, please read
|
|
||||||
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
# Entire-World-Loader
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
finished worlds, fully saved:
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
name: Entire-World-Loader
|
|
||||||
main: iieLoadSaveEntireWorld.Main
|
|
||||||
version: 4.0
|
|
||||||
author: TBMCPlugins
|
|
||||||
commands:
|
|
||||||
beginfullmapload:
|
|
||||||
description: ''
|
|
||||||
stopfullmapload:
|
|
||||||
description: loads and saves the entire map, in 32x32 chunk sections
|
|
||||||
55
pom.xml
55
pom.xml
|
|
@ -1,55 +0,0 @@
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<groupId>com.github.TBMCPlugins</groupId>
|
|
||||||
<artifactId>Entire-World-Loader</artifactId>
|
|
||||||
<version>master-SNAPSHOT</version>
|
|
||||||
<build>
|
|
||||||
<sourceDirectory>src</sourceDirectory>
|
|
||||||
<resources>
|
|
||||||
<resource>
|
|
||||||
<directory>src</directory>
|
|
||||||
<excludes>
|
|
||||||
<exclude>**/*.java</exclude>
|
|
||||||
</excludes>
|
|
||||||
</resource>
|
|
||||||
<resource>
|
|
||||||
<directory>.</directory>
|
|
||||||
<includes>
|
|
||||||
<include>*.properties</include>
|
|
||||||
<include>*.yml</include>
|
|
||||||
<include>*.csv</include>
|
|
||||||
<include>*.txt</include>
|
|
||||||
</includes>
|
|
||||||
<filtering>true</filtering>
|
|
||||||
</resource>
|
|
||||||
</resources>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
|
||||||
<version>3.5.1</version>
|
|
||||||
<configuration>
|
|
||||||
<source>1.8</source>
|
|
||||||
<target>1.8</target>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
<repositories>
|
|
||||||
<repository>
|
|
||||||
<id>spigot-repo</id>
|
|
||||||
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
|
|
||||||
</repository>
|
|
||||||
<repository>
|
|
||||||
<id>jitpack.io</id>
|
|
||||||
<url>https://jitpack.io/</url>
|
|
||||||
</repository>
|
|
||||||
</repositories>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.spigotmc</groupId>
|
|
||||||
<artifactId>spigot-api</artifactId>
|
|
||||||
<version>1.11-R0.1-SNAPSHOT</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</project>
|
|
||||||
31
src/iieLoadSaveEntireWorld/ChunkLoaderAPI.java
Normal file
31
src/iieLoadSaveEntireWorld/ChunkLoaderAPI.java
Normal file
|
|
@ -0,0 +1,31 @@
|
||||||
|
package iieLoadSaveEntireWorld;
|
||||||
|
|
||||||
|
import org.bukkit.Location;
|
||||||
|
|
||||||
|
public class ChunkLoaderAPI {
|
||||||
|
/**This method loads a chunk if the chunk isn't loaded already.
|
||||||
|
* @param locationToLoad
|
||||||
|
* @return True if chunk was already loaded, False if chunk wasn't already loaded
|
||||||
|
*/
|
||||||
|
public static boolean loadChunk(Location locationToLoad){
|
||||||
|
if(!(locationToLoad.getBlock().getChunk().isLoaded())){
|
||||||
|
locationToLoad.getBlock().getChunk().load();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**This method loads a chunk if the chunk isn't loaded already.
|
||||||
|
* @param locationToLoad
|
||||||
|
* @return True if chunk was already unloaded, False if chunk wasn't already unloaded
|
||||||
|
*/
|
||||||
|
public static boolean unloadChunk(Location locationToUnload){
|
||||||
|
if (locationToUnload.getBlock().getChunk().isLoaded()){
|
||||||
|
locationToUnload.getBlock().getChunk().unload();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -1,98 +1,58 @@
|
||||||
package iieLoadSaveEntireWorld;
|
package iieLoadSaveEntireWorld;
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.configuration.file.FileConfiguration;
|
import org.bukkit.configuration.file.FileConfiguration;
|
||||||
|
|
||||||
public class ConfigProcess implements Runnable {
|
public class ConfigProcess implements Runnable {
|
||||||
|
|
||||||
//================================STATIC================================
|
//STATIC
|
||||||
static Main plugin;
|
private static final Main plugin = new Main();
|
||||||
static FileConfiguration config;
|
private static final FileConfiguration config = plugin.getConfig();
|
||||||
//----------------------------------------------------------------------
|
|
||||||
static final boolean isNew(String name)
|
static final boolean isNew(String name)
|
||||||
{
|
{
|
||||||
return !config.contains(name);
|
return !config.contains(name);
|
||||||
}
|
}
|
||||||
static final void addNew(String name, WorldObj newWorld)
|
static final WorldObject getUnfinished(String name)
|
||||||
{
|
{
|
||||||
config.set(name + ".total", newWorld.total);
|
return new WorldObject
|
||||||
config.set(name + ".currentRegion.x", newWorld.current[0]);
|
|
||||||
config.set(name + ".currentRegion.z", newWorld.current[1]);
|
|
||||||
config.set(name + ".n", 1);
|
|
||||||
config.set(name + ".c", 1);
|
|
||||||
config.set(name + ".s", 1);
|
|
||||||
config.set(name + ".d", 0);
|
|
||||||
config.set(name + ".B", false);
|
|
||||||
plugin.saveConfig();
|
|
||||||
}
|
|
||||||
static final WorldObj getUnfinished(String name)
|
|
||||||
{
|
|
||||||
return new WorldObj
|
|
||||||
(
|
(
|
||||||
config.getInt(name + ".total"),
|
config.getInt(name + ".width"),
|
||||||
new int[]
|
new int[]
|
||||||
{
|
{
|
||||||
config.getInt(name + ".currentRegion.x"),
|
config.getInt(name + ".currentRegion.x"),
|
||||||
config.getInt(name + ".currentRegion.z")
|
config.getInt(name + ".currentRegion.z")
|
||||||
},
|
},
|
||||||
|
new int[]
|
||||||
|
{
|
||||||
|
config.getInt(name + ".lowerleft.x"),
|
||||||
|
config.getInt(name + ".lowerleft.z")
|
||||||
|
},
|
||||||
config.getInt(name + ".n"),
|
config.getInt(name + ".n"),
|
||||||
config.getInt(name + ".c"),
|
config.getInt(name + ".c"),
|
||||||
config.getInt(name + ".s"),
|
config.getInt(name + ".D"),
|
||||||
config.getInt(name + ".d"),
|
config.getInt(name + ".d"),
|
||||||
config.getBoolean(name + ".B")
|
config.getInt(name + ".B") == 1
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
static final boolean crashResume()
|
|
||||||
{
|
|
||||||
return config.contains("@ CRASH RESUME");
|
|
||||||
}
|
|
||||||
static final String getCrashResume()
|
|
||||||
{
|
|
||||||
return config.getString("@ CRASH RESUME");
|
|
||||||
}
|
|
||||||
|
|
||||||
//===============================INSTANCE===============================
|
|
||||||
final String name;
|
//INSTANCE
|
||||||
//----------------------------------------------------------------------
|
private final String name = TaskManager.loadProcess.worldname;
|
||||||
ConfigProcess(String name)
|
|
||||||
{
|
|
||||||
this.name = name;
|
|
||||||
config.set("@ CRASH RESUME", name);
|
|
||||||
}
|
|
||||||
public final void run()
|
public final void run()
|
||||||
{
|
{
|
||||||
config.set(name + ".currentRegion.x", TaskManager.loadProcess.currentRegion[0]);
|
config.set(".currentRegion.x", TaskManager.loadProcess.currentRegion[0]);
|
||||||
config.set(name + ".currentRegion.z", TaskManager.loadProcess.currentRegion[1]);
|
config.set(".currentRegion.z", TaskManager.loadProcess.currentRegion[1]);
|
||||||
config.set(name + ".n", TaskManager.loadProcess.n);
|
config.set(".n", TaskManager.loadProcess.n);
|
||||||
config.set(name + ".c", TaskManager.loadProcess.c);
|
config.set(".c", TaskManager.loadProcess.c);
|
||||||
config.set(name + ".s", TaskManager.loadProcess.s);
|
config.set(".D", TaskManager.loadProcess.D);
|
||||||
config.set(name + ".d", TaskManager.loadProcess.d);
|
config.set(".d", TaskManager.loadProcess.d);
|
||||||
config.set(name + ".B", TaskManager.loadProcess.B);
|
config.set(".B", TaskManager.loadProcess.B ? 1 : 0);
|
||||||
plugin.saveConfig();
|
plugin.saveConfig();
|
||||||
Bukkit.getLogger().info
|
|
||||||
(
|
|
||||||
"Saving world-load progress: " + name
|
|
||||||
+ "["
|
|
||||||
+ TaskManager.loadProcess.currentRegion[0] + ","
|
|
||||||
+ TaskManager.loadProcess.currentRegion[1]
|
|
||||||
+ "]"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
final void stop()
|
|
||||||
{
|
|
||||||
run();
|
|
||||||
config.set("@ CRASH RESUME", null);
|
|
||||||
plugin.saveConfig();
|
|
||||||
Bukkit.getLogger()
|
|
||||||
.info("...stopping world-load");
|
|
||||||
}
|
}
|
||||||
final void finish()
|
final void finish()
|
||||||
{
|
{
|
||||||
config.set("@ FINISHED WORLDS", name);
|
config.set("finished", name);
|
||||||
config.set("@ CRASH RESUME", null);
|
|
||||||
config.set(name, null);
|
config.set(name, null);
|
||||||
plugin.saveConfig();
|
plugin.saveConfig();
|
||||||
Bukkit.getLogger()
|
|
||||||
.info("...finished!");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,78 +5,47 @@ import org.bukkit.World;
|
||||||
|
|
||||||
public class LoadProcess implements Runnable
|
public class LoadProcess implements Runnable
|
||||||
{
|
{
|
||||||
//================================VALUES================================
|
//=================================INIT=================================
|
||||||
|
|
||||||
private final World world;
|
final World world;
|
||||||
final int totalRegions;
|
final String worldname;
|
||||||
int[] currentRegion;
|
final int totalRegions;
|
||||||
|
int[] currentRegion;
|
||||||
//see setNextRegion()
|
|
||||||
int n;
|
|
||||||
int c;
|
|
||||||
int s;
|
|
||||||
int d;
|
|
||||||
boolean B;
|
|
||||||
|
|
||||||
|
|
||||||
//=============================CONSTRUCTORS=============================
|
LoadProcess(String name, WorldObject newWorld)
|
||||||
|
|
||||||
LoadProcess(String name) //resume from stored
|
|
||||||
{
|
{
|
||||||
Bukkit.getLogger().info("resuming stored world-load process");
|
world = Bukkit.getWorld(name);
|
||||||
|
worldname = name;
|
||||||
|
|
||||||
WorldObj unfinishedworld = ConfigProcess.getUnfinished(name);
|
totalRegions = newWorld.width * newWorld.width;
|
||||||
|
currentRegion = newWorld.current;
|
||||||
|
|
||||||
|
this.lowerleft = newWorld.lowerleft;
|
||||||
|
allChunkCoords = generateAllChunkCoords(newWorld.width, newWorld.lowerleft);
|
||||||
|
}
|
||||||
|
LoadProcess(String name)
|
||||||
|
{
|
||||||
|
final WorldObject unfinished = ConfigProcess.getUnfinished(name);
|
||||||
|
|
||||||
world = Bukkit.getWorld(name);
|
world = Bukkit.getWorld(name);
|
||||||
totalRegions = unfinishedworld.total;
|
worldname = name;
|
||||||
currentRegion = unfinishedworld.current;
|
|
||||||
|
|
||||||
n = unfinishedworld.n;
|
totalRegions = unfinished.width * unfinished.width;
|
||||||
c = unfinishedworld.c;
|
currentRegion = unfinished.current;
|
||||||
s = unfinishedworld.s;
|
|
||||||
d = unfinishedworld.d;
|
|
||||||
B = unfinishedworld.B;
|
|
||||||
}
|
|
||||||
LoadProcess(String name, WorldObj newworld) //new process
|
|
||||||
{
|
|
||||||
Bukkit.getLogger().info("new world-load process");
|
|
||||||
|
|
||||||
ConfigProcess.addNew(name, newworld);
|
this.lowerleft = unfinished.lowerleft;
|
||||||
|
allChunkCoords = generateAllChunkCoords(unfinished.width, unfinished.lowerleft);
|
||||||
|
|
||||||
world = Bukkit.getWorld(name);
|
this.n = unfinished.n;
|
||||||
totalRegions = newworld.total;
|
this.c = unfinished.c;
|
||||||
currentRegion = newworld.current;
|
this.D = unfinished.D;
|
||||||
|
this.d = unfinished.d;
|
||||||
n = 1;
|
this.B = unfinished.B;
|
||||||
c = 1;
|
|
||||||
s = 1;
|
|
||||||
d = 0;
|
|
||||||
B = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//==============================GET CHUNKS==============================
|
//===============================PATTERN================================
|
||||||
|
|
||||||
private final int[][][] getChunksCurrentRegion()
|
|
||||||
{
|
|
||||||
final int[][][] chunks = new int[32][32][2];
|
|
||||||
int xR = currentRegion[0] * 32;
|
|
||||||
int zR = currentRegion[1] * 32;
|
|
||||||
int z;
|
|
||||||
for (int x = 0; x < 32; x++)
|
|
||||||
{
|
|
||||||
z = 0;
|
|
||||||
for (; z < 32; z++)
|
|
||||||
{
|
|
||||||
chunks[x][z][0] = xR + x;
|
|
||||||
chunks[x][z][1] = zR + z;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return chunks;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//===========================SET NEXT REGION============================
|
|
||||||
|
|
||||||
/* The pattern:
|
/* The pattern:
|
||||||
*
|
*
|
||||||
|
|
@ -94,40 +63,91 @@ public class LoadProcess implements Runnable
|
||||||
* +-----------------------
|
* +-----------------------
|
||||||
* -2 -1 X 1 2 3
|
* -2 -1 X 1 2 3
|
||||||
* etc.
|
* etc.
|
||||||
*
|
|
||||||
* n how many regions have been saved already
|
|
||||||
* c direction of travel: E,N,W,S - 1,2,3,4
|
|
||||||
* s side: distance to travel (side-length)
|
|
||||||
* d side: distance already traveled
|
|
||||||
* B OK to increase distance?
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
private final boolean setNextRegion()
|
int n = 1; //number
|
||||||
|
int c = 1; //direction of travel: E,N,W,S - 1,2,3,4
|
||||||
|
int D = 1; //distance to travel
|
||||||
|
int d = 0; //distance already traveled
|
||||||
|
boolean B = false; //OK to change direction?
|
||||||
|
|
||||||
|
private final void setNextRegion()
|
||||||
{
|
{
|
||||||
if (n == totalRegions) return false;
|
|
||||||
if (d == s)
|
|
||||||
{
|
|
||||||
d = 1;
|
|
||||||
if (B) s++;
|
|
||||||
B = !B;
|
|
||||||
c = c == 4 ? 1 : c + 1;
|
|
||||||
}
|
|
||||||
else d++;
|
|
||||||
switch (c)
|
|
||||||
{
|
|
||||||
case 1 : currentRegion[0]++; break;
|
|
||||||
case 2 : currentRegion[1]++; break;
|
|
||||||
case 3 : currentRegion[0]--; break;
|
|
||||||
case 4 : currentRegion[1]--; break;
|
|
||||||
}
|
|
||||||
n++;
|
n++;
|
||||||
return true;
|
if (d != D) d++;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
d = 0;
|
||||||
|
D++;
|
||||||
|
switch (c){
|
||||||
|
case 1 : currentRegion[0]++;
|
||||||
|
case 2 : currentRegion[1]++;
|
||||||
|
case 3 : currentRegion[0]--;
|
||||||
|
case 4 :
|
||||||
|
currentRegion[1]--;
|
||||||
|
c = B ? 1 : c + 1;
|
||||||
|
}
|
||||||
|
B = !B;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
final boolean isFinished(){
|
||||||
|
return n == totalRegions;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//===============================CHUNK MAP==============================
|
||||||
|
|
||||||
|
private final int[] lowerleft;
|
||||||
|
private final int[][][][][] allChunkCoords;
|
||||||
|
private final int[][][][][] generateAllChunkCoords(int w,int[] lowerleft)
|
||||||
|
{
|
||||||
|
int[][][][][] allChunkCoords = new int[w][w][32][32][2];
|
||||||
|
|
||||||
|
int regionX = lowerleft[0];
|
||||||
|
int regionZ = lowerleft[1];
|
||||||
|
boolean negX = true;
|
||||||
|
boolean negZ = true;
|
||||||
|
int chunkX = 0;
|
||||||
|
int chunkZ = 0;
|
||||||
|
for (int[][][][] xRowRegions : allChunkCoords)
|
||||||
|
{
|
||||||
|
regionZ = lowerleft[1];
|
||||||
|
negZ = true;
|
||||||
|
for (int[][][] region : xRowRegions)
|
||||||
|
{
|
||||||
|
chunkX = 0;
|
||||||
|
for (int[][] xRowChunks : region)
|
||||||
|
{
|
||||||
|
chunkZ = 0;
|
||||||
|
for (int[] chunk : xRowChunks)
|
||||||
|
{
|
||||||
|
chunk[0] = (regionX * 32) + (negX ? 0 - chunkX : chunkX);
|
||||||
|
chunk[1] = (regionZ * 32) + (negZ ? 0 - chunkZ : chunkZ);
|
||||||
|
chunkZ++;
|
||||||
|
}
|
||||||
|
chunkX++;
|
||||||
|
}
|
||||||
|
regionZ++;
|
||||||
|
if (negZ)
|
||||||
|
negZ = regionZ < 0;
|
||||||
|
}
|
||||||
|
regionX++;
|
||||||
|
if (negX)
|
||||||
|
negX = regionX < 0;
|
||||||
|
}
|
||||||
|
return allChunkCoords;
|
||||||
|
}
|
||||||
|
private final int[][][] getChunksCurrentRegion(){
|
||||||
|
return
|
||||||
|
allChunkCoords
|
||||||
|
[ currentRegion[0] - lowerleft[0] ]
|
||||||
|
[ currentRegion[1] - lowerleft[1] ];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//==================================RUN=================================
|
//==================================RUN=================================
|
||||||
|
|
||||||
private volatile boolean ready = true;
|
boolean ready = true;
|
||||||
public final void run()
|
public final void run()
|
||||||
{
|
{
|
||||||
if (!ready) return;
|
if (!ready) return;
|
||||||
|
|
@ -139,13 +159,12 @@ public class LoadProcess implements Runnable
|
||||||
for (int[] chunk : xRow)
|
for (int[] chunk : xRow)
|
||||||
{
|
{
|
||||||
world.loadChunk(chunk[0], chunk[1], true);
|
world.loadChunk(chunk[0], chunk[1], true);
|
||||||
world.unloadChunkRequest(chunk[0], chunk[1]);
|
world.unloadChunk(chunk[0], chunk[1]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!setNextRegion())
|
setNextRegion();
|
||||||
{
|
|
||||||
TaskManager.finish();
|
if (isFinished()) TaskManager.finish();
|
||||||
}
|
else ready = true;
|
||||||
ready = true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
package iieLoadSaveEntireWorld;
|
package iieLoadSaveEntireWorld;
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.plugin.java.JavaPlugin;
|
import org.bukkit.plugin.java.JavaPlugin;
|
||||||
|
|
||||||
public class Main extends JavaPlugin {
|
public class Main extends JavaPlugin {
|
||||||
|
|
@ -10,21 +9,5 @@ public class Main extends JavaPlugin {
|
||||||
saveDefaultConfig();
|
saveDefaultConfig();
|
||||||
getCommand("beginfullmapload").setExecutor(new TaskManager.StartCommand());
|
getCommand("beginfullmapload").setExecutor(new TaskManager.StartCommand());
|
||||||
getCommand("stopfullmapload").setExecutor(new TaskManager.StopCommand());
|
getCommand("stopfullmapload").setExecutor(new TaskManager.StopCommand());
|
||||||
|
|
||||||
ConfigProcess.plugin = this;
|
|
||||||
ConfigProcess.config = getConfig();
|
|
||||||
|
|
||||||
if (ConfigProcess.crashResume())
|
|
||||||
{
|
|
||||||
Bukkit.getScheduler().runTaskLater(this, new CrashResume(), 600);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
private static final class CrashResume implements Runnable
|
|
||||||
{
|
|
||||||
public final void run()
|
|
||||||
{
|
|
||||||
Bukkit.getLogger().info("...resuming from crash");
|
|
||||||
TaskManager.resume(ConfigProcess.getCrashResume());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,23 +9,25 @@ import org.bukkit.scheduler.BukkitTask;
|
||||||
|
|
||||||
public class TaskManager {
|
public class TaskManager {
|
||||||
|
|
||||||
private static boolean inProgress = false;
|
private static final Main plugin = new Main();
|
||||||
|
|
||||||
static LoadProcess loadProcess;
|
static boolean inProgress = false;
|
||||||
static ConfigProcess configProcess;
|
static LoadProcess loadProcess;
|
||||||
private static BukkitTask loadTask;
|
static ConfigProcess configProcess;
|
||||||
private static BukkitTask configTask;
|
static BukkitTask loadTask;
|
||||||
|
static BukkitTask configTask;
|
||||||
|
|
||||||
|
//===================================CONTROLS===================================
|
||||||
//=====================================UTIL====================================
|
private static final void start(LoadProcess loadProcess)
|
||||||
|
|
||||||
private static final void schedule()
|
|
||||||
{
|
{
|
||||||
loadTask = Bukkit.getScheduler().runTaskTimer(ConfigProcess.plugin, loadProcess, 0, 300);
|
inProgress = true;
|
||||||
configTask = Bukkit.getScheduler().runTaskTimer(ConfigProcess.plugin, configProcess, 150, 300);
|
TaskManager.loadProcess = loadProcess;
|
||||||
|
TaskManager.loadTask = Bukkit.getScheduler().runTaskTimer( plugin, loadProcess, 0, 10 );
|
||||||
|
TaskManager.configTask = Bukkit.getScheduler().runTaskTimer( plugin, new ConfigProcess(), 0, 200 );
|
||||||
}
|
}
|
||||||
private static final void closedown()
|
static final void finish()
|
||||||
{
|
{
|
||||||
|
configProcess.finish();
|
||||||
loadTask.cancel();
|
loadTask.cancel();
|
||||||
configTask.cancel();
|
configTask.cancel();
|
||||||
|
|
||||||
|
|
@ -36,86 +38,70 @@ public class TaskManager {
|
||||||
|
|
||||||
inProgress = false;
|
inProgress = false;
|
||||||
}
|
}
|
||||||
|
static final boolean stop()
|
||||||
|
{
|
||||||
|
if (inProgress)
|
||||||
|
{
|
||||||
|
if (loadProcess.isFinished()) finish();
|
||||||
|
else
|
||||||
|
{
|
||||||
|
loadTask.cancel();
|
||||||
|
configTask.cancel();
|
||||||
|
configProcess.run();
|
||||||
|
|
||||||
//===================================CONTROLS==================================
|
loadProcess = null;
|
||||||
|
configProcess = null;
|
||||||
|
loadTask = null;
|
||||||
|
configTask = null;
|
||||||
|
|
||||||
private static final boolean start_or_resume(String[] args, String name)
|
inProgress = false;
|
||||||
{
|
}
|
||||||
boolean isNew;
|
return true;
|
||||||
if (isNew = ConfigProcess.isNew(name))
|
|
||||||
{
|
|
||||||
loadProcess = new LoadProcess(name, WorldObj.generate(args));
|
|
||||||
}
|
}
|
||||||
else
|
return false;
|
||||||
{
|
|
||||||
loadProcess = new LoadProcess(name);
|
|
||||||
}
|
|
||||||
configProcess = new ConfigProcess(name);
|
|
||||||
schedule();
|
|
||||||
return isNew;
|
|
||||||
}
|
|
||||||
static final void resume(String name)
|
|
||||||
{
|
|
||||||
loadProcess = new LoadProcess(name);
|
|
||||||
configProcess = new ConfigProcess(name);
|
|
||||||
schedule();
|
|
||||||
}
|
|
||||||
private static final boolean stop_or_finish()
|
|
||||||
{
|
|
||||||
boolean isFin;
|
|
||||||
if (isFin = loadProcess.n == loadProcess.totalRegions)
|
|
||||||
{
|
|
||||||
configProcess.finish();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
configProcess.stop();
|
|
||||||
}
|
|
||||||
closedown();
|
|
||||||
return isFin;
|
|
||||||
}
|
|
||||||
static final void finish()
|
|
||||||
{
|
|
||||||
configProcess.finish();
|
|
||||||
closedown();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//===================================COMMANDS===================================
|
//===================================COMMANDS===================================
|
||||||
|
|
||||||
static final class StopCommand implements CommandExecutor
|
|
||||||
{
|
|
||||||
public final boolean onCommand(CommandSender sender, Command label, String command, String[] args)
|
|
||||||
{
|
|
||||||
if (inProgress)
|
|
||||||
{
|
|
||||||
sender.sendMessage
|
|
||||||
(
|
|
||||||
stop_or_finish() ?
|
|
||||||
"it just finished!" :
|
|
||||||
"stopping..."
|
|
||||||
);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
static final class StartCommand implements CommandExecutor
|
static final class StartCommand implements CommandExecutor
|
||||||
{
|
{
|
||||||
|
@Override
|
||||||
public final boolean onCommand(CommandSender sender, Command label, String command, String[] args)
|
public final boolean onCommand(CommandSender sender, Command label, String command, String[] args)
|
||||||
{
|
{
|
||||||
|
String name = ((Player)sender).getWorld().getName();
|
||||||
if (inProgress)
|
if (inProgress)
|
||||||
{
|
{
|
||||||
sender.sendMessage("already loading " + configProcess.name + ". /StopFullMapLoad to stop.");
|
sender.sendMessage("a process is already running (" + name + "). /StopLoadSave to stop.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
inProgress = true;
|
else inProgress = true;
|
||||||
sender.sendMessage
|
|
||||||
(
|
if (ConfigProcess.isNew(name))
|
||||||
start_or_resume(args,((Player)sender).getWorld().getName()) ?
|
{
|
||||||
"starting..." :
|
sender.sendMessage("starting...");
|
||||||
"resuming..."
|
start(new LoadProcess(name, WorldObject.generate(args)));
|
||||||
);
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sender.sendMessage("resuming...");
|
||||||
|
start(new LoadProcess(name));
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
static final class StopCommand implements CommandExecutor
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public final boolean onCommand(CommandSender sender, Command label, String command, String[] args)
|
||||||
|
{
|
||||||
|
if (stop())
|
||||||
|
{
|
||||||
|
sender.sendMessage("stopped.");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
sender.sendMessage("nothing to stop.");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,77 +1,65 @@
|
||||||
package iieLoadSaveEntireWorld;
|
package iieLoadSaveEntireWorld;
|
||||||
|
|
||||||
public class WorldObj {
|
public class WorldObject {
|
||||||
|
|
||||||
private static final int dWidth = 44; //default
|
final int width;
|
||||||
private static final int dTotal = dWidth * dWidth;
|
final int[] lowerleft;
|
||||||
|
int[] current;
|
||||||
final int total;
|
|
||||||
int[] current;
|
|
||||||
int n;
|
int n;
|
||||||
int c;
|
int c;
|
||||||
int s;
|
int D;
|
||||||
int d;
|
int d;
|
||||||
boolean B;
|
boolean B;
|
||||||
|
|
||||||
WorldObj()
|
WorldObject()
|
||||||
{
|
{
|
||||||
total = dTotal;
|
width = 44;
|
||||||
|
lowerleft = new int[] { -22, -22 };
|
||||||
current = new int[] { -1, -1 };
|
current = new int[] { -1, -1 };
|
||||||
}
|
}
|
||||||
WorldObj(int total, int[] center)
|
WorldObject(int width, int[] lowerleft, int[] center)
|
||||||
{
|
{
|
||||||
this.total = total;
|
this.width = width;
|
||||||
|
this.lowerleft = lowerleft;
|
||||||
this.current = center;
|
this.current = center;
|
||||||
}
|
}
|
||||||
WorldObj(int total, int[] current,
|
WorldObject(
|
||||||
int n, int c, int s, int d, boolean B)
|
int width, int[] lowerleft, int[] current,
|
||||||
|
int n, int c, int D, int d, boolean B
|
||||||
|
)
|
||||||
{
|
{
|
||||||
this.total = total;
|
this.width = width;
|
||||||
|
this.lowerleft = lowerleft;
|
||||||
this.current = current;
|
this.current = current;
|
||||||
this.n = n;
|
this.n = n;
|
||||||
this.c = c;
|
this.c = c;
|
||||||
this.s = s;
|
this.D = D;
|
||||||
this.d = d;
|
this.D = d;
|
||||||
this.B = B;
|
this.B = B;
|
||||||
}
|
}
|
||||||
|
|
||||||
static final WorldObj generate(String[] args)
|
static final WorldObject generate(String[] args)
|
||||||
{
|
{
|
||||||
if (args.length == 0)
|
if (args.length == 0)
|
||||||
{
|
{
|
||||||
return new WorldObj();
|
return new WorldObject();
|
||||||
}
|
}
|
||||||
|
|
||||||
int[] bounds = regionBounds(new ParsedArgs(args));
|
int[] bounds = regionBounds(new ParsedArgs(args));
|
||||||
|
|
||||||
return new WorldObj
|
return new WorldObject(
|
||||||
(
|
bounds[2] - bounds[0],
|
||||||
(bounds[2] - bounds[0]) * (bounds[2] - bounds[0]),//width ^ 2
|
new int[]{ bounds[0], bounds[2] },
|
||||||
new int[]
|
new int[]{
|
||||||
{
|
bounds[0] - 1 + (bounds[1]-bounds[0] + 1)/2,
|
||||||
bounds[0] - 1 + (bounds[1]-bounds[0] + 1)/2,
|
bounds[2] - 1 + (bounds[3]-bounds[2] + 1)/2
|
||||||
bounds[2] - 1 + (bounds[3]-bounds[2] + 1)/2
|
}
|
||||||
}
|
);
|
||||||
);
|
|
||||||
|
|
||||||
/* for even widths, the math above returns the
|
|
||||||
* minimum center not the maximum center. So:
|
|
||||||
*
|
|
||||||
* * * * *
|
|
||||||
* * X X *
|
|
||||||
* * O X *
|
|
||||||
* * * * *
|
|
||||||
*
|
|
||||||
* the spiral pattern used in LoadProcess rotates
|
|
||||||
* east north west south, so it must begin at minimum
|
|
||||||
* center.
|
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
//==============================================================================
|
//==============================================================================
|
||||||
private static final class ParsedArgs
|
private static final class ParsedArgs
|
||||||
{
|
{
|
||||||
private static final int dRadius = dWidth/2 * 512 - 512;
|
private static final int defaultRadius = 11264;
|
||||||
private static final int[] dCenter = new int[]{0,0};
|
private static final int[] defaultCenter = new int[]{0,0};
|
||||||
|
|
||||||
final int radius;
|
final int radius;
|
||||||
final int[] center;
|
final int[] center;
|
||||||
|
|
@ -83,7 +71,7 @@ public class WorldObj {
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
radius = dRadius;
|
radius = defaultRadius;
|
||||||
}
|
}
|
||||||
if (args.length > 2 && isInt(args[1]) && isInt(args[2]))
|
if (args.length > 2 && isInt(args[1]) && isInt(args[2]))
|
||||||
{
|
{
|
||||||
|
|
@ -92,7 +80,7 @@ public class WorldObj {
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
center = dCenter;
|
center = defaultCenter;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private static final boolean isInt(String arg)
|
private static final boolean isInt(String arg)
|
||||||
|
|
@ -118,15 +106,14 @@ public class WorldObj {
|
||||||
{
|
{
|
||||||
int[] bounds = new int[]
|
int[] bounds = new int[]
|
||||||
{
|
{
|
||||||
|
// [ get region ] [ get block ]
|
||||||
Math.floorDiv( a.center[0] - a.radius, 512 ),
|
Math.floorDiv( a.center[0] - a.radius, 512 ),
|
||||||
Math.floorDiv( a.center[0] + a.radius, 512 ),
|
Math.floorDiv( a.center[0] + a.radius, 512 ),
|
||||||
Math.floorDiv( a.center[1] - a.radius, 512 ),
|
Math.floorDiv( a.center[1] - a.radius, 512 ),
|
||||||
Math.floorDiv( a.center[1] + a.radius, 512 )
|
Math.floorDiv( a.center[1] + a.radius, 512 )
|
||||||
};
|
};
|
||||||
|
|
||||||
//--------------------------------------------------------------------------
|
//add margins------------
|
||||||
//ADD MARGINS:
|
|
||||||
//--------------------------------------------------------------------------
|
|
||||||
|
|
||||||
final int[] edges = new int[4];
|
final int[] edges = new int[4];
|
||||||
final int[] radii = new int[4];
|
final int[] radii = new int[4];
|
||||||
|
|
@ -144,7 +131,7 @@ public class WorldObj {
|
||||||
radii[2] = Math.abs(a.center[1] - edges[2]);
|
radii[2] = Math.abs(a.center[1] - edges[2]);
|
||||||
radii[3] = Math.abs(a.center[1] - edges[3]);
|
radii[3] = Math.abs(a.center[1] - edges[3]);
|
||||||
|
|
||||||
//compare to original block radius: if difference < 64 blocks add a region width
|
//compare to original block radius, if difference is < 4 chunks add a region width
|
||||||
if (radii[0] - a.radius < 64) { bounds[0] -= 1; margin[0] = true; }
|
if (radii[0] - a.radius < 64) { bounds[0] -= 1; margin[0] = true; }
|
||||||
if (radii[1] - a.radius < 64) { bounds[1] += 1; margin[1] = true; }
|
if (radii[1] - a.radius < 64) { bounds[1] += 1; margin[1] = true; }
|
||||||
if (radii[2] - a.radius < 64) { bounds[2] -= 1; margin[2] = true; }
|
if (radii[2] - a.radius < 64) { bounds[2] -= 1; margin[2] = true; }
|
||||||
123
src/unused/CacheOld.java
Normal file
123
src/unused/CacheOld.java
Normal file
|
|
@ -0,0 +1,123 @@
|
||||||
|
package unused;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
import iieLoadSaveEntireWorld.Main;
|
||||||
|
|
||||||
|
public class CacheOld
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
|
||||||
|
private static int maxNameLength;
|
||||||
|
private static char[][] listUnfinished;
|
||||||
|
private static Map<String,WorldStatus> cacheUnfinished;
|
||||||
|
static void generate()
|
||||||
|
{
|
||||||
|
maxNameLength = Main.config.getInt("max name length");
|
||||||
|
Set<String> set = Main.unfinished.getKeys(false);
|
||||||
|
populateList(set);
|
||||||
|
populateCache(set);
|
||||||
|
}
|
||||||
|
static void addWorld()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
static void saveProgress()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
static void finish(String name)
|
||||||
|
{
|
||||||
|
//TODO
|
||||||
|
}
|
||||||
|
static void addUnfinished(int width, int[] center, int[] lowerleft, String name)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
static boolean isUnfinished(String name){
|
||||||
|
int i = 0;
|
||||||
|
boolean match = true;
|
||||||
|
for (char[] world : listUnfinished)
|
||||||
|
{
|
||||||
|
for (char c : name.toCharArray())
|
||||||
|
{
|
||||||
|
if (c != world[i]){ match = false; break; }
|
||||||
|
}
|
||||||
|
if (match) break;
|
||||||
|
i = 0;
|
||||||
|
match = true;
|
||||||
|
}
|
||||||
|
return match;
|
||||||
|
}
|
||||||
|
private static void populateList(Set<String> set)
|
||||||
|
{
|
||||||
|
char[][] listUnfinished = new char[set.size()][maxNameLength];
|
||||||
|
int i = 0;
|
||||||
|
int ii = 0;
|
||||||
|
for (String name : set)
|
||||||
|
{
|
||||||
|
for (char c : name.toCharArray())
|
||||||
|
{
|
||||||
|
listUnfinished[i][ii] = c;
|
||||||
|
ii++;
|
||||||
|
}
|
||||||
|
i++;
|
||||||
|
ii = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
private static void populateCache(Set<String> set)
|
||||||
|
{
|
||||||
|
String path;
|
||||||
|
for (String name : set){
|
||||||
|
path = "unfinishedWorlds." + name + ".";
|
||||||
|
cacheUnfinished.put(
|
||||||
|
name,
|
||||||
|
new WorldStatus(
|
||||||
|
Main.config.getInt(path + "width"),
|
||||||
|
new int[]{
|
||||||
|
Main.config.getInt(path + "lowerleft.x"),
|
||||||
|
Main.config.getInt(path + "lowerleft.z")},
|
||||||
|
new int[]{
|
||||||
|
Main.config.getInt(path + "currentRegion.x"),
|
||||||
|
Main.config.getInt(path + "currentRegion.z")},
|
||||||
|
Main.config.getInt(path + "n"),
|
||||||
|
Main.config.getInt(path + "c"),
|
||||||
|
Main.config.getInt(path + "D"),
|
||||||
|
Main.config.getInt(path + "d"),
|
||||||
|
Main.config.getBoolean(path + "B")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
static final class WorldStatus
|
||||||
|
{
|
||||||
|
final int width;
|
||||||
|
final int[] lowerleft;
|
||||||
|
int[] currentRegion;
|
||||||
|
int n = 1;
|
||||||
|
int c = 1;
|
||||||
|
int D = 1;
|
||||||
|
int d = 0;
|
||||||
|
boolean B = false;
|
||||||
|
WorldStatus(int width, int[] lowerleft, int[]center)
|
||||||
|
{
|
||||||
|
this.width = width;
|
||||||
|
this.lowerleft = lowerleft;
|
||||||
|
currentRegion = center;
|
||||||
|
}
|
||||||
|
WorldStatus(
|
||||||
|
int width, int[] lowerleft,
|
||||||
|
int[] current, int n, int c, int D, int d, boolean B)
|
||||||
|
{
|
||||||
|
this.width = width;
|
||||||
|
this.lowerleft = lowerleft;
|
||||||
|
currentRegion = current;
|
||||||
|
this.n = n;
|
||||||
|
this.c = c;
|
||||||
|
this.D = D;
|
||||||
|
this.d = d;
|
||||||
|
this.B = B;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
}
|
||||||
236
src/unused/LoadSaveProcessOld.java
Normal file
236
src/unused/LoadSaveProcessOld.java
Normal file
|
|
@ -0,0 +1,236 @@
|
||||||
|
package unused;
|
||||||
|
|
||||||
|
import org.bukkit.scheduler.BukkitTask;
|
||||||
|
|
||||||
|
public class LoadSaveProcessOld {
|
||||||
|
|
||||||
|
/* the contents of this class are static because
|
||||||
|
* loading and saving an entire world is an intensive process,
|
||||||
|
* and only one save process should be running at a time.
|
||||||
|
*
|
||||||
|
* so only one save process should be TRACKED at a time.
|
||||||
|
*/
|
||||||
|
|
||||||
|
//=============================STATIC FIELDS============================
|
||||||
|
|
||||||
|
static BukkitTask task;
|
||||||
|
|
||||||
|
static int[] startRegion;
|
||||||
|
|
||||||
|
static int[] currentRegion;
|
||||||
|
|
||||||
|
static TranslatedCoordinates savedRegions;
|
||||||
|
|
||||||
|
static int[][][][][] allChunkCoords;
|
||||||
|
|
||||||
|
static RegionPattern regionPattern;
|
||||||
|
|
||||||
|
//INITIALIZE FIELDS
|
||||||
|
static void init(int width, int x, int z){
|
||||||
|
boolean even = width % 2 == 0;
|
||||||
|
int radius = Math.floorDiv(width,2);
|
||||||
|
if (even) radius -=1 ;
|
||||||
|
int lowX = x-radius;
|
||||||
|
int lowZ = z-radius;
|
||||||
|
|
||||||
|
startRegion = new int[] {x,z};
|
||||||
|
currentRegion = startRegion;
|
||||||
|
savedRegions = new TranslatedCoordinates(width,lowX,lowZ);
|
||||||
|
generateAllChunkCoords(width,lowX,lowZ);
|
||||||
|
if (even) regionPattern = new OutwardSpiralPattern();
|
||||||
|
else regionPattern = new CardinalPointsPattern();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//===============================PATTERNS===============================
|
||||||
|
|
||||||
|
//ABSTRACT PARENT CLASS
|
||||||
|
static abstract class RegionPattern {
|
||||||
|
static int n = 1; //iteration number
|
||||||
|
abstract void reset(); //reset fields
|
||||||
|
abstract void setNextRegion();
|
||||||
|
}
|
||||||
|
|
||||||
|
//EVEN DIAMETER: OUTWARD SPIRAL PATTERN
|
||||||
|
private static class OutwardSpiralPattern extends RegionPattern {
|
||||||
|
|
||||||
|
/* The pattern:
|
||||||
|
*
|
||||||
|
* 3 | 36 35 34 33 32 31
|
||||||
|
* |
|
||||||
|
* 2 | 17 16 15 14 13 30
|
||||||
|
* |
|
||||||
|
* 1 | 18 05 04 03 12 29
|
||||||
|
* |
|
||||||
|
* Z | 19 06 01 02 11 28
|
||||||
|
* |
|
||||||
|
* -1 | 20 07 08 09 10 27
|
||||||
|
* |
|
||||||
|
* -2 | 21 22 23 24 25 26
|
||||||
|
* +-----------------------
|
||||||
|
* -2 -1 X 1 2 3
|
||||||
|
* etc.
|
||||||
|
*/
|
||||||
|
|
||||||
|
static int c; //direction of travel: E,N,W,S - 1,2,3,4
|
||||||
|
static int D; //distance to travel
|
||||||
|
static int d; //distance already traveled
|
||||||
|
static boolean B; //OK to change direction?
|
||||||
|
|
||||||
|
OutwardSpiralPattern(){
|
||||||
|
c = 1;
|
||||||
|
D = 1;
|
||||||
|
d = 0;
|
||||||
|
B = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//interface methods
|
||||||
|
public void reset() {
|
||||||
|
|
||||||
|
}
|
||||||
|
public void setNextRegion() {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//ODD DIAMETER: CARDINAL POINTS PATTERN
|
||||||
|
private static class CardinalPointsPattern extends RegionPattern {
|
||||||
|
|
||||||
|
/* The pattern:
|
||||||
|
*
|
||||||
|
* 2 | 23 18 10 14 22
|
||||||
|
* |
|
||||||
|
* 1 | 15 07 02 06 21
|
||||||
|
* |
|
||||||
|
* Z | 11 03 01 05 13
|
||||||
|
* |
|
||||||
|
* -1 | 19 08 04 09 17
|
||||||
|
* |
|
||||||
|
* -2 | 24 16 12 20 25
|
||||||
|
* +-------------------
|
||||||
|
* -2 -1 X 1 2
|
||||||
|
* etc.
|
||||||
|
*/
|
||||||
|
|
||||||
|
private static int[] cardinalPoints; //midpoint of each side
|
||||||
|
|
||||||
|
private static int c; //side: N,W,S,E = 1,2,3,4
|
||||||
|
private static int r; //radius from square center
|
||||||
|
|
||||||
|
private static int d; //distance from cardinal point
|
||||||
|
private static boolean B; //direction from cardinal point
|
||||||
|
|
||||||
|
private static void expR(){ //expand radius, cardinal points
|
||||||
|
r++;
|
||||||
|
cardinalPoints[0]++;
|
||||||
|
cardinalPoints[1]--;
|
||||||
|
cardinalPoints[2]--;
|
||||||
|
cardinalPoints[4]++;
|
||||||
|
}
|
||||||
|
|
||||||
|
CardinalPointsPattern(){
|
||||||
|
reset();
|
||||||
|
}
|
||||||
|
|
||||||
|
//interface methods
|
||||||
|
void reset(){
|
||||||
|
cardinalPoints = new int[] { //each cardinal point contains
|
||||||
|
startRegion[1]+1, //only the dimension that moves
|
||||||
|
startRegion[0]-1,
|
||||||
|
startRegion[1]-1,
|
||||||
|
startRegion[0]+1
|
||||||
|
};
|
||||||
|
n = 1;
|
||||||
|
c = 1;
|
||||||
|
r = 1;
|
||||||
|
d = 0;
|
||||||
|
B = false;
|
||||||
|
}
|
||||||
|
void setNextRegion(){
|
||||||
|
n++;
|
||||||
|
switch (c){
|
||||||
|
case 1 :
|
||||||
|
if (B) currentRegion = new int[] {startRegion[0] + d, cardinalPoints[0]};
|
||||||
|
else; currentRegion = new int[] {startRegion[0] - d, cardinalPoints[0]};
|
||||||
|
case 2 :
|
||||||
|
if (B) currentRegion = new int[] {cardinalPoints[1], startRegion[0] + d};
|
||||||
|
else; currentRegion = new int[] {cardinalPoints[1], startRegion[0] - d};
|
||||||
|
case 3 :
|
||||||
|
if (B) currentRegion = new int[] {startRegion[0] - d, cardinalPoints[2]};
|
||||||
|
else; currentRegion = new int[] {startRegion[0] + d, cardinalPoints[2]};
|
||||||
|
case 4 :
|
||||||
|
if (B) currentRegion = new int[] {cardinalPoints[3], startRegion[0] - d};
|
||||||
|
else; currentRegion = new int[] {cardinalPoints[3], startRegion[0] + d};
|
||||||
|
|
||||||
|
if (r == d) { expR(); d = 0; c = 1; }
|
||||||
|
else { d++; c++; B = !B; }
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//=================================UTIL=================================
|
||||||
|
|
||||||
|
//CUSTOM MAP CLASS FOR TRACKING SAVED REGIONS
|
||||||
|
static class TranslatedCoordinates {
|
||||||
|
|
||||||
|
int xAdjust;
|
||||||
|
int zAdjust;
|
||||||
|
boolean[][] savemap;
|
||||||
|
public TranslatedCoordinates(int w, int lowX, int lowZ)
|
||||||
|
{
|
||||||
|
xAdjust = 0 - lowX;
|
||||||
|
zAdjust = 0 - lowZ;
|
||||||
|
savemap = new boolean[w][w];
|
||||||
|
}
|
||||||
|
int x(int x){ return x + xAdjust; }
|
||||||
|
int z(int z){ return z + zAdjust; }
|
||||||
|
|
||||||
|
void save(int x, int z) { savemap[x(x)][z(z)] = true; }
|
||||||
|
boolean isSaved(int x, int z) { return savemap[x(x)][z(z)]; }
|
||||||
|
|
||||||
|
boolean allSaved(){
|
||||||
|
for (boolean[] xRow : savemap){
|
||||||
|
for (boolean region : xRow){
|
||||||
|
if (!region) return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//GENERATE ALL CHUNK COORDINATES
|
||||||
|
private static void generateAllChunkCoords(int d, int lowX, int lowZ) {
|
||||||
|
allChunkCoords = new int[d][d][32][32][2];
|
||||||
|
int regionX = lowX;
|
||||||
|
boolean negX = true;
|
||||||
|
for (int[][][][] xRowRegions : allChunkCoords){
|
||||||
|
int regionZ = lowZ;
|
||||||
|
boolean negZ = true;
|
||||||
|
for (int[][][] region : xRowRegions){
|
||||||
|
int chunkX = 0;
|
||||||
|
for (int[][] xRowChunks : region){
|
||||||
|
int chunkZ = 0;
|
||||||
|
for (int[] chunk : xRowChunks){
|
||||||
|
chunk[0] = (regionX * 32) + (negX ? 0 - chunkX : chunkX);
|
||||||
|
chunk[1] = (regionZ * 32) + (negZ ? 0 - chunkZ : chunkZ);
|
||||||
|
chunkZ++;
|
||||||
|
}
|
||||||
|
chunkX++;
|
||||||
|
}
|
||||||
|
regionZ++;
|
||||||
|
if (negZ)
|
||||||
|
negZ = regionZ < 0;
|
||||||
|
}
|
||||||
|
regionX++;
|
||||||
|
if (negX)
|
||||||
|
negX = regionX < 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
0
target/config.yml
Normal file
0
target/config.yml
Normal file
6
target/plugin.yml
Normal file
6
target/plugin.yml
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
main: iieLoadSaveEntireWorld.Main
|
||||||
|
version: 1.0.0
|
||||||
|
name: LoadSaveEntireWorld
|
||||||
|
commands:
|
||||||
|
loadsaveentireworld:
|
||||||
|
description: loads and saves the entire map, in 32x32 chunk sections
|
||||||
Loading…
Reference in a new issue