From e3385c78974da112d4510e8f153eb1a645fbd4e3 Mon Sep 17 00:00:00 2001 From: iie Date: Fri, 23 Jun 2017 18:12:19 +0200 Subject: [PATCH 01/26] Updated to 1.12 This is code is amazingly short --- .classpath | 26 ++++++++ .gitignore | 1 + .project | 23 +++++++ .settings/org.eclipse.core.resources.prefs | 4 ++ .settings/org.eclipse.jdt.core.prefs | 5 ++ .settings/org.eclipse.m2e.core.prefs | 4 ++ pom.xml | 62 +++++++++++++++++++ .../java/buttondevteam/ChunkArchive/Main.java | 41 ++++++++++++ .../buttondevteam/ChunkArchive/AppTest.java | 38 ++++++++++++ 9 files changed, 204 insertions(+) create mode 100644 .classpath create mode 100644 .gitignore create mode 100644 .project create mode 100644 .settings/org.eclipse.core.resources.prefs create mode 100644 .settings/org.eclipse.jdt.core.prefs create mode 100644 .settings/org.eclipse.m2e.core.prefs create mode 100644 pom.xml create mode 100644 src/main/java/buttondevteam/ChunkArchive/Main.java create mode 100644 src/test/java/buttondevteam/ChunkArchive/AppTest.java diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..0a1dadd --- /dev/null +++ b/.classpath @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/.project b/.project new file mode 100644 index 0000000..fe72bb0 --- /dev/null +++ b/.project @@ -0,0 +1,23 @@ + + + ChunkArchive + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..f9fe345 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/test/java=UTF-8 +encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..abec6ca --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..c6d52f7 --- /dev/null +++ b/pom.xml @@ -0,0 +1,62 @@ + + 4.0.0 + + buttondevteam + ChunkArchive + 0.0.1-SNAPSHOT + jar + + + + src + + **/*.java + + + + . + + + + + maven-compiler-plugin + 3.5.1 + + 1.8 + 1.8 + + + + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + jitpack.io + https://jitpack.io/ + + + + + org.spigotmc + spigot-api + 1.12-R0.1-SNAPSHOT + provided + + + org.bukkit + craftbukkit + 1.12-R0.1-SNAPSHOT + provided + + + junit + junit + 3.8.1 + test + + + diff --git a/src/main/java/buttondevteam/ChunkArchive/Main.java b/src/main/java/buttondevteam/ChunkArchive/Main.java new file mode 100644 index 0000000..6d81faf --- /dev/null +++ b/src/main/java/buttondevteam/ChunkArchive/Main.java @@ -0,0 +1,41 @@ +package buttondevteam.ChunkArchive; + +import java.io.IOException; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_12_R1.CraftChunk; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.world.ChunkPopulateEvent; +import org.bukkit.plugin.java.JavaPlugin; + +import net.minecraft.server.v1_12_R1.ChunkRegionLoader; +import net.minecraft.server.v1_12_R1.ExceptionWorldConflict; + +public class Main extends JavaPlugin implements Listener +{ + public void onEnable() + { + getServer().getPluginManager().registerEvents(this, this); + } + /*------------------------------------------------------------*/ + + private final ChunkRegionLoader chunkRegionLoader = + + new ChunkRegionLoader(this.getDataFolder(), ((CraftServer) Bukkit.getServer()) + .getServer() + .dataConverterManager); + + /*------------------------------------------------------------*/ + + @EventHandler + public void onChunkPopulate(ChunkPopulateEvent event) throws IOException, + ExceptionWorldConflict + { + if (event.getWorld().getName().equals("world")) + chunkRegionLoader.a(((CraftWorld) event.getWorld()).getHandle(), + ((CraftChunk) event.getChunk()).getHandle()); + } +} diff --git a/src/test/java/buttondevteam/ChunkArchive/AppTest.java b/src/test/java/buttondevteam/ChunkArchive/AppTest.java new file mode 100644 index 0000000..4a413d6 --- /dev/null +++ b/src/test/java/buttondevteam/ChunkArchive/AppTest.java @@ -0,0 +1,38 @@ +package buttondevteam.ChunkArchive; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} From 21eefcec45782489192376e51fa60110c32f80ac Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Fri, 23 Jun 2017 18:14:04 +0200 Subject: [PATCH 02/26] Initial commit --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 2 + 2 files changed, 676 insertions(+) create mode 100644 LICENSE create mode 100644 README.md diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..9cecc1d --- /dev/null +++ b/LICENSE @@ -0,0 +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. + + {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 . + +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 +. + + 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 +. diff --git a/README.md b/README.md new file mode 100644 index 0000000..94056ea --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# ChunkArchive +Archives chunks as they're populated From 606263622ed9d0818e022d8faa4916d5f2ed5b00 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Fri, 23 Jun 2017 18:23:55 +0200 Subject: [PATCH 03/26] Added project --- .classpath | 5 +++++ .project | 17 +++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 .classpath create mode 100644 .project diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..ac37fb2 --- /dev/null +++ b/.classpath @@ -0,0 +1,5 @@ + + + + + diff --git a/.project b/.project new file mode 100644 index 0000000..5efd3de --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + ChunkArchive + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + From 8724a1f5dd9fa3b137067d8a9e8e6c0bdca82e36 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Fri, 23 Jun 2017 18:52:14 +0200 Subject: [PATCH 04/26] Fixed project and added plugin.yml --- .classpath | 35 +++++----------------- .project | 25 +--------------- .settings/org.eclipse.core.resources.prefs | 4 --- .settings/org.eclipse.jdt.core.prefs | 6 ++-- pom.xml | 5 +--- src/main/resources/plugin.yml | 3 ++ 6 files changed, 15 insertions(+), 63 deletions(-) delete mode 100644 .settings/org.eclipse.core.resources.prefs create mode 100644 src/main/resources/plugin.yml diff --git a/.classpath b/.classpath index 50e093c..072d3d9 100644 --- a/.classpath +++ b/.classpath @@ -12,38 +12,17 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + diff --git a/.project b/.project index d771fdf..c6fed75 100644 --- a/.project +++ b/.project @@ -17,30 +17,7 @@ - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - - - - ChunkArchive - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index f9fe345..0000000 --- a/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/test/java=UTF-8 -encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index abec6ca..714351a 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/pom.xml b/pom.xml index c6d52f7..4418119 100644 --- a/pom.xml +++ b/pom.xml @@ -9,14 +9,11 @@ - src + src/main/resources **/*.java - - . - diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml new file mode 100644 index 0000000..005942c --- /dev/null +++ b/src/main/resources/plugin.yml @@ -0,0 +1,3 @@ +name: ChunkArchive +main: buttondevteam.ChunkArcive.Main +version: 4.0 From 9475b30f3ebcfbf3a229b6e8d01cd69103d38eeb Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Sun, 25 Jun 2017 22:22:28 +0200 Subject: [PATCH 05/26] Adding Travis file with caching --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..cd7dadc --- /dev/null +++ b/.travis.yml @@ -0,0 +1,4 @@ +cache: + directories: + - $HOME/.m2/repository/org/bukkit/craftbukkit +# before_install: - Wget BuildTools and run if cached folder not found From e4813e08fe3a4f00ff2121e2fb1e240bdd46c2c0 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Sun, 25 Jun 2017 22:24:58 +0200 Subject: [PATCH 06/26] Fixed typo... --- src/main/resources/plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 005942c..a032bcc 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,3 +1,3 @@ name: ChunkArchive -main: buttondevteam.ChunkArcive.Main +main: buttondevteam.ChunkArchive.Main version: 4.0 From 313a568304933fe099a6b0123b5880bdd27ede0f Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Mon, 26 Jun 2017 17:04:34 +0200 Subject: [PATCH 07/26] FInished Travis config to download BuildTools --- .travis.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cd7dadc..8e6f3a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,12 @@ cache: directories: - $HOME/.m2/repository/org/bukkit/craftbukkit -# before_install: - Wget BuildTools and run if cached folder not found +before_install: # Wget BuildTools and run if cached folder not found + - if [ ! -d "$HOME/.m2/repository/org/bukkit/craftbukkit" ]; then + - wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar + - java -jar BuildTools.jar + - fi + +language: java +jdk: + - oraclejdk8 From d6c3ec7c7e67c27141cfe61e1a15c65c8d51d0c5 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Mon, 26 Jun 2017 17:14:45 +0200 Subject: [PATCH 08/26] Apparently it doesn't work like that --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8e6f3a1..60f6662 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,9 @@ cache: directories: - $HOME/.m2/repository/org/bukkit/craftbukkit before_install: # Wget BuildTools and run if cached folder not found - - if [ ! -d "$HOME/.m2/repository/org/bukkit/craftbukkit" ]; then + - if [ -d "$HOME/.m2/repository/org/bukkit/craftbukkit" ]; then exit 0; fi - wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar - java -jar BuildTools.jar - - fi language: java jdk: From c2d13a5fc8c6e8376a6a9a1e1edbed3ce024e4c8 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Mon, 26 Jun 2017 17:35:46 +0200 Subject: [PATCH 09/26] It doesn't work that way either --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 60f6662..fb99c2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,11 @@ cache: directories: - $HOME/.m2/repository/org/bukkit/craftbukkit -before_install: # Wget BuildTools and run if cached folder not found - - if [ -d "$HOME/.m2/repository/org/bukkit/craftbukkit" ]; then exit 0; fi - - wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar - - java -jar BuildTools.jar +before_install: | # Wget BuildTools and run if cached folder not found + if [ ! -d "$HOME/.m2/repository/org/bukkit/craftbukkit/1.12-R0.1-SNAPSHOT" ]; then + wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar + java -jar BuildTools.jar --rev 1.12 + fi language: java jdk: From 995357d1ee7ecf5364ff0ad8a3e579315f52d9f7 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Mon, 26 Jun 2017 22:51:58 +0200 Subject: [PATCH 10/26] I hope it works this way --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index fb99c2f..4309bb3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,3 +10,4 @@ before_install: | # Wget BuildTools and run if cached folder not found language: java jdk: - oraclejdk8 +sudo: true From 6cb1112e2f24ef336466d26916907bba7b4c78f2 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Mon, 26 Jun 2017 23:16:32 +0200 Subject: [PATCH 11/26] This should work as well, now it has CraftBukkit --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4309bb3..3f21043 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,4 +10,4 @@ before_install: | # Wget BuildTools and run if cached folder not found language: java jdk: - oraclejdk8 -sudo: true +sudo: false # Enable after each server update From 3a836aae15e9654dbb921e8873b9aa394c26edbc Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Tue, 27 Jun 2017 10:47:23 +0200 Subject: [PATCH 12/26] Let's try this again --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3f21043..d763c81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,3 +11,7 @@ language: java jdk: - oraclejdk8 sudo: false # Enable after each server update +addons: + apt: + packages: + - oracle-java8-installer From c939d1e7527ae33e8451b0b08dc62cd13a415db1 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Tue, 27 Jun 2017 11:14:20 +0200 Subject: [PATCH 13/26] Tesring cache --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index d763c81..9759717 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,4 @@ before_install: | # Wget BuildTools and run if cached folder not found language: java jdk: - oraclejdk8 -sudo: false # Enable after each server update -addons: - apt: - packages: - - oracle-java8-installer +sudo: true # Enable after each server update From aaa7e7b7ee66bd0743059d6ae2ec794672e2229b Mon Sep 17 00:00:00 2001 From: BuildTools Date: Wed, 28 Jun 2017 17:20:15 +0200 Subject: [PATCH 14/26] Added deploy script --- .gitignore | 1 + .travis.yml | 13 ++++++++++++- deploy.sh | 9 +++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 deploy.sh diff --git a/.gitignore b/.gitignore index b83d222..a17d8c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /target/ +upload_key diff --git a/.travis.yml b/.travis.yml index 9759717..a965def 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,4 +10,15 @@ before_install: | # Wget BuildTools and run if cached folder not found language: java jdk: - oraclejdk8 -sudo: true # Enable after each server update +sudo: true +deploy: + # deploy develop to the staging environment + - provider: script + script: deploy.sh staging + on: + branch: dev + # deploy master to production + - provider: script + script: deploy.sh production + on: + branch: master diff --git a/deploy.sh b/deploy.sh new file mode 100644 index 0000000..812e12a --- /dev/null +++ b/deploy.sh @@ -0,0 +1,9 @@ +#!/bin/sh +FILENAME=$(find target/ ! -name '*original*' -name '*.jar') +echo Found file: $FILENAME + +if [ $1 = 'production' ]; then +echo Production mode +echo $UPLOAD_KEY > upload_key +scp -i upload_key $FILENAME travis@server.figytuna.com:/minecraft/main/plugins +fi From 2f712a6ce5a65378b9977ba14508642ed8658fa1 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Wed, 28 Jun 2017 17:25:49 +0200 Subject: [PATCH 15/26] Of course forgot skip_cleanup --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index a965def..ff29d5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ jdk: - oraclejdk8 sudo: true deploy: + skip_cleanup: true # deploy develop to the staging environment - provider: script script: deploy.sh staging From 6fefbe6362624fe90fa905e9a4753800eb548a34 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Wed, 28 Jun 2017 17:28:49 +0200 Subject: [PATCH 16/26] Ehm --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ff29d5e..b1ef7cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,14 +12,15 @@ jdk: - oraclejdk8 sudo: true deploy: - skip_cleanup: true # deploy develop to the staging environment - provider: script script: deploy.sh staging on: branch: dev + skip_cleanup: true # deploy master to production - provider: script script: deploy.sh production on: branch: master + skip_cleanup: true From cbc0a40733716ec444b0d6f2653b04222e293924 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Wed, 28 Jun 2017 17:34:06 +0200 Subject: [PATCH 17/26] Uhm --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b1ef7cf..9a1e8d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,13 +14,13 @@ sudo: true deploy: # deploy develop to the staging environment - provider: script - script: deploy.sh staging + script: ./deploy.sh staging on: branch: dev skip_cleanup: true # deploy master to production - provider: script - script: deploy.sh production + script: ./deploy.sh production on: branch: master skip_cleanup: true From 1943f7ce0cf11b9be7341e3eaf17b26871eb05f3 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Wed, 28 Jun 2017 17:52:39 +0200 Subject: [PATCH 18/26] Trying all the solutions I found --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9a1e8d9..fb3af76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,13 +14,13 @@ sudo: true deploy: # deploy develop to the staging environment - provider: script - script: ./deploy.sh staging + script: chmod +x deploy.sh && sh deploy.sh staging on: branch: dev skip_cleanup: true # deploy master to production - provider: script - script: ./deploy.sh production + script: chmod +x deploy.sh && sh deploy.sh production on: branch: master skip_cleanup: true From 765610e6e3a5784449818b9ca5fec73c7368429c Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Wed, 28 Jun 2017 18:02:27 +0200 Subject: [PATCH 19/26] Using the yes command to answer everything --- deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.sh b/deploy.sh index 812e12a..62364e1 100644 --- a/deploy.sh +++ b/deploy.sh @@ -5,5 +5,5 @@ echo Found file: $FILENAME if [ $1 = 'production' ]; then echo Production mode echo $UPLOAD_KEY > upload_key -scp -i upload_key $FILENAME travis@server.figytuna.com:/minecraft/main/plugins +yes | scp -i upload_key $FILENAME travis@server.figytuna.com:/minecraft/main/plugins fi From 39ee9ba498096008f6cd815b026b64b59c08faca Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Wed, 28 Jun 2017 18:12:24 +0200 Subject: [PATCH 20/26] That didn't work so try this --- deploy.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deploy.sh b/deploy.sh index 62364e1..0637548 100644 --- a/deploy.sh +++ b/deploy.sh @@ -5,5 +5,6 @@ echo Found file: $FILENAME if [ $1 = 'production' ]; then echo Production mode echo $UPLOAD_KEY > upload_key -yes | scp -i upload_key $FILENAME travis@server.figytuna.com:/minecraft/main/plugins +yes | scp -B -i upload_key -o StrictHostKeyChecking=no $FILENAME travis@server.figytuna.com:/minecraft/main/plugins fi + From 6006e995b96f089ae70054eb0bd2cda4022ab7db Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Wed, 28 Jun 2017 18:20:48 +0200 Subject: [PATCH 21/26] That kinda worked but need to make the key private --- deploy.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy.sh b/deploy.sh index 0637548..636c48d 100644 --- a/deploy.sh +++ b/deploy.sh @@ -5,6 +5,7 @@ echo Found file: $FILENAME if [ $1 = 'production' ]; then echo Production mode echo $UPLOAD_KEY > upload_key +chmod 400 upload_key yes | scp -B -i upload_key -o StrictHostKeyChecking=no $FILENAME travis@server.figytuna.com:/minecraft/main/plugins fi From 0899205dcb132566b736acbe45bf2231b9e94837 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Mon, 30 Oct 2017 13:24:49 +0100 Subject: [PATCH 22/26] Fixed error on 1.12.2 --- .classpath | 2 +- pom.xml | 2 +- src/main/java/buttondevteam/ChunkArchive/Main.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.classpath b/.classpath index 072d3d9..89a8c06 100644 --- a/.classpath +++ b/.classpath @@ -22,7 +22,7 @@ - + diff --git a/pom.xml b/pom.xml index 4418119..ebaf017 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ org.bukkit craftbukkit - 1.12-R0.1-SNAPSHOT + 1.12.2-R0.1-SNAPSHOT provided diff --git a/src/main/java/buttondevteam/ChunkArchive/Main.java b/src/main/java/buttondevteam/ChunkArchive/Main.java index 6d81faf..7ed3c87 100644 --- a/src/main/java/buttondevteam/ChunkArchive/Main.java +++ b/src/main/java/buttondevteam/ChunkArchive/Main.java @@ -35,7 +35,7 @@ public class Main extends JavaPlugin implements Listener ExceptionWorldConflict { if (event.getWorld().getName().equals("world")) - chunkRegionLoader.a(((CraftWorld) event.getWorld()).getHandle(), + chunkRegionLoader.saveChunk(((CraftWorld) event.getWorld()).getHandle(), ((CraftChunk) event.getChunk()).getHandle()); } } From e25b3740b6ee5c1429be1286b63557c353b527e5 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Mon, 30 Oct 2017 13:33:23 +0100 Subject: [PATCH 23/26] Updated Travis config --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index fb3af76..a4cab27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,11 @@ cache: directories: - - $HOME/.m2/repository/org/bukkit/craftbukkit + - $HOME/.m2/repository/org before_install: | # Wget BuildTools and run if cached folder not found - if [ ! -d "$HOME/.m2/repository/org/bukkit/craftbukkit/1.12-R0.1-SNAPSHOT" ]; then + if [ ! -d "$HOME/.m2/repository/org/bukkit/craftbukkit/1.12.2-R0.1-SNAPSHOT" ]; then wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar - java -jar BuildTools.jar --rev 1.12 + # grep so that download counts don't appear in log files + java -jar BuildTools.jar --rev 1.12.2 | grep -vE "[^/ ]*/[^/ ]*\s*KB\s*$" | grep -v "^\s*$" fi language: java From 509fe99294442b9c784824862e7692f6e1b1bdc5 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Mon, 8 Jan 2018 21:48:45 +0100 Subject: [PATCH 24/26] Fixed for Spigot, added error reporting --- pom.xml | 124 +++++++++--------- .../java/buttondevteam/ChunkArchive/Main.java | 26 ++-- 2 files changed, 77 insertions(+), 73 deletions(-) diff --git a/pom.xml b/pom.xml index ebaf017..7fe8fcb 100644 --- a/pom.xml +++ b/pom.xml @@ -1,59 +1,65 @@ - - 4.0.0 - - buttondevteam - ChunkArchive - 0.0.1-SNAPSHOT - jar - - - - src/main/resources - - **/*.java - - - - - - maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - jitpack.io - https://jitpack.io/ - - - - - org.spigotmc - spigot-api - 1.12-R0.1-SNAPSHOT - provided - - - org.bukkit - craftbukkit - 1.12.2-R0.1-SNAPSHOT - provided - - - junit - junit - 3.8.1 - test - - - + + 4.0.0 + + buttondevteam + ChunkArchive + 0.0.1-SNAPSHOT + jar + + + + src/main/resources + + **/*.java + + + + + + maven-compiler-plugin + 3.5.1 + + 1.8 + 1.8 + + + + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + jitpack.io + https://jitpack.io/ + + + + + org.spigotmc + spigot-api + 1.12.2-R0.1-SNAPSHOT + provided + + + org.spigotmc + spigot + 1.12.2-R0.1-SNAPSHOT + provided + + + com.github.TBMCPlugins.ButtonCore + ButtonCore + master-SNAPSHOT + provided + + + junit + junit + 3.8.1 + test + + + diff --git a/src/main/java/buttondevteam/ChunkArchive/Main.java b/src/main/java/buttondevteam/ChunkArchive/Main.java index 7ed3c87..f98e526 100644 --- a/src/main/java/buttondevteam/ChunkArchive/Main.java +++ b/src/main/java/buttondevteam/ChunkArchive/Main.java @@ -11,31 +11,29 @@ import org.bukkit.event.Listener; import org.bukkit.event.world.ChunkPopulateEvent; import org.bukkit.plugin.java.JavaPlugin; +import buttondevteam.lib.TBMCCoreAPI; import net.minecraft.server.v1_12_R1.ChunkRegionLoader; import net.minecraft.server.v1_12_R1.ExceptionWorldConflict; -public class Main extends JavaPlugin implements Listener -{ - public void onEnable() - { - getServer().getPluginManager().registerEvents(this, this); +public class Main extends JavaPlugin implements Listener { + public void onEnable() { + TBMCCoreAPI.RegisterEventsForExceptions(this, this); } /*------------------------------------------------------------*/ - - private final ChunkRegionLoader chunkRegionLoader = - - new ChunkRegionLoader(this.getDataFolder(), ((CraftServer) Bukkit.getServer()) - .getServer() - .dataConverterManager); - + + private final ChunkRegionLoader chunkRegionLoader = + + new ChunkRegionLoader(this.getDataFolder(), + ((CraftServer) Bukkit.getServer()).getServer().dataConverterManager); + /*------------------------------------------------------------*/ - + @EventHandler public void onChunkPopulate(ChunkPopulateEvent event) throws IOException, ExceptionWorldConflict { if (event.getWorld().getName().equals("world")) chunkRegionLoader.saveChunk(((CraftWorld) event.getWorld()).getHandle(), - ((CraftChunk) event.getChunk()).getHandle()); + ((CraftChunk) event.getChunk()).getHandle(), false); } } From 945151518a946a68caed04cbafc8702bcb1571ab Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Tue, 9 Jan 2018 21:05:46 +0100 Subject: [PATCH 25/26] Using Travis config from DiscordPlugin Not sure what causes the issue... --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a4cab27..808d9b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,12 @@ cache: directories: - - $HOME/.m2/repository/org + - $HOME/.m2/repository/org/ before_install: | # Wget BuildTools and run if cached folder not found - if [ ! -d "$HOME/.m2/repository/org/bukkit/craftbukkit/1.12.2-R0.1-SNAPSHOT" ]; then + if [ ! -d "$HOME/.m2/repository/org/spigotmc/spigot/1.12.2-R0.1-SNAPSHOT" ]; then wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar # grep so that download counts don't appear in log files java -jar BuildTools.jar --rev 1.12.2 | grep -vE "[^/ ]*/[^/ ]*\s*KB\s*$" | grep -v "^\s*$" fi - language: java jdk: - oraclejdk8 From ca80b3f5355b9150784ef09191766556299e9190 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Tue, 9 Jan 2018 21:43:01 +0100 Subject: [PATCH 26/26] Removing the filter to see if that gives something --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 808d9b0..4bec77a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ before_install: | # Wget BuildTools and run if cached folder not found if [ ! -d "$HOME/.m2/repository/org/spigotmc/spigot/1.12.2-R0.1-SNAPSHOT" ]; then wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar # grep so that download counts don't appear in log files - java -jar BuildTools.jar --rev 1.12.2 | grep -vE "[^/ ]*/[^/ ]*\s*KB\s*$" | grep -v "^\s*$" + java -jar BuildTools.jar --rev 1.12.2 # | grep -vE "[^/ ]*/[^/ ]*\s*KB\s*$" | grep -v "^\s*$" fi language: java jdk: