diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml index 86bb373..a7db3e4 100644 --- a/.idea/codeStyles/codeStyleConfig.xml +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f480c29..84dab75 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,24 +1,36 @@ -For those who are wanting to contribute, we fully encourage doing so. There are a few rules we require following when contributing however. +For those who are wanting to contribute, we fully encourage doing so. There are a few rules we require following when +contributing however. ## Steps + 1. Make an issue and get feedback. It's important to know if your idea will be accepted before writing any code. + - If it is a feature request, describe the feature and be extremely specific. - If it is a bug report, ensure you include how to reproduce the bug and the expected outcome - If it is an enhancement, describe your proposed changes. Ensure you are extremely specific. + 2. Fork this project -3. Create a new branch that describes the new feature, enhancement, or bug fix. For example, this is good: `feature/add-xyz`. This is bad: `fix-this-lol`. +3. Create a new branch that describes the new feature, enhancement, or bug fix. For example, this is + good: `feature/add-xyz`. This is bad: `fix-this-lol`. 4. Write the code that addresses your change. -- Keep in mind that it **must** be formatted correctly. If you are using IntelliJ, there is a `codeStyle.xml` file that tells IntelliJ how to format your code. Check this link for information on how to use the file: https://www.jetbrains.com/help/idea/configuring-code-style.html#import-export-schemes + +- Keep in mind that it **must** be formatted correctly. If you are using IntelliJ, there is a `codeStyle.xml` file that + tells IntelliJ how to format your code. Check this link for information on how to use the + file: https://www.jetbrains.com/help/idea/configuring-code-style.html#import-export-schemes - If you are not using IntelliJ, that is fine. We use Allman style so please format your code accordingly. + 6. Push your changes to your new branch and make a PR based off of that branch. ## Requirements for a PR + - The issue must be marked as approved - It must only address each specific issue. Don't make one PR for multiple issues. - Your PR must compile and work. If it does not compile or work, your PR will most likely be rejected. ## Code requirements -- Most importantly, your code must be efficient. Your pull request may be rejected if your code is deemed inefficient or sloppy. + +- Most importantly, your code must be efficient. Your pull request may be rejected if your code is deemed inefficient or + sloppy. - Do not repeat yourself. Create functions as needed if you're using large blocks of code over and over again. - Do not use an excessive amount of commits when making your PR. It makes the master branch look messy. - Your code must be consistent with Plex's codebase. If a function already exists, use it. diff --git a/LICENSE.md b/LICENSE.md index f288702..a28cee1 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,190 +1,190 @@ 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. +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 +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 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 +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 +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 +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 +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 +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 +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: +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 +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 +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 +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 +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 +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. +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 +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 +The precise terms and conditions for copying, distribution and modification follow. TERMS AND CONDITIONS - 0. Definitions. +0. Definitions. - "This License" refers to version 3 of the GNU General Public License. +"This License" refers to version 3 of the GNU General Public License. - "Copyright" also means copyright-like laws that apply to other kinds of +"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 +"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 +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 +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 +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 +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, +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 +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" +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 +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. +1. Source Code. - The "source code" for a work means the preferred form of the work +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 +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 +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 +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 "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 +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 +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 +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 +The Corresponding Source for a work in source code form is that same work. - 2. Basic Permissions. +2. Basic Permissions. - All rights granted under this License are granted for the term of +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 +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 +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 +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 +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 +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 +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. +3. Protecting Users' Legal Rights From Anti-Circumvention Law. - No covered work shall be deemed part of an effective technological +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 +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 @@ -192,9 +192,9 @@ 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. +4. Conveying Verbatim Copies. - You may convey verbatim copies of the Program's source code as you +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 @@ -202,12 +202,12 @@ 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, +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. +5. Conveying Modified Source Versions. - You may convey a work based on the Program, or the modifications to +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: @@ -232,19 +232,19 @@ terms of section 4, provided that you also meet all of these conditions: 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 +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 +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. +6. Conveying Non-Source Forms. - You may convey a covered work in object code form under the terms +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: @@ -290,75 +290,75 @@ in one of these ways: 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 +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 +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 +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 +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, +"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 +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 +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 +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 +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 +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, +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. +7. Additional Terms. - "Additional permissions" are terms that supplement the terms of this +"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 +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 +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 +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: @@ -385,74 +385,74 @@ that material) supplement the terms of this License with terms: 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 +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 +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 +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 +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. +8. Termination. - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or +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 +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 +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 +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 +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. +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 +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, +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 +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. +10. Automatic Licensing of Downstream Recipients. - Each time you convey a covered work, the recipient automatically +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 +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 +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 +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 @@ -460,43 +460,43 @@ 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 +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. +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 +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 +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 +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 +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 +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 +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, +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, @@ -510,7 +510,7 @@ 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 +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 @@ -518,10 +518,10 @@ 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 +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 +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 @@ -533,73 +533,73 @@ 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 +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. +12. No Surrender of Others' Freedom. - If conditions are imposed on you (whether by court order, agreement or +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 +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 +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. +13. Use with the GNU Affero General Public License. - Notwithstanding any other provision of this License, you have +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 +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. +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 +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 +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 +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 +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 +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. +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 +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 +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. +16. Limitation of Liability. - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +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 @@ -609,9 +609,9 @@ 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. +17. Interpretation of Sections 15 and 16. - If the disclaimer of warranty and limitation of liability provided +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 @@ -622,11 +622,11 @@ copy of the Program in return for a fee. How to Apply These Terms to Your New Programs - If you develop a new program, and you want it to be of the greatest +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 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. @@ -649,7 +649,7 @@ the "copyright" line and a pointer to where the full notice is found. Also add information on how to contact you by electronic and paper mail. - If the program does terminal interaction, make it output a short +If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: Copyright (C) @@ -658,17 +658,17 @@ notice like this when it starts in an interactive mode: 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 +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, +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 +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 +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/proxy/src/main/java/dev/plex/Plex.java b/proxy/src/main/java/dev/plex/Plex.java index 8a7c6fc..85d118f 100644 --- a/proxy/src/main/java/dev/plex/Plex.java +++ b/proxy/src/main/java/dev/plex/Plex.java @@ -4,8 +4,6 @@ import com.google.inject.Inject; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; import com.velocitypowered.api.plugin.Plugin; -import com.velocitypowered.api.plugin.PluginDescription; -import com.velocitypowered.api.plugin.PluginManager; import com.velocitypowered.api.plugin.annotation.DataDirectory; import com.velocitypowered.api.proxy.ProxyServer; import dev.plex.config.TomlConfig; diff --git a/proxy/src/main/java/dev/plex/command/PlexCommand.java b/proxy/src/main/java/dev/plex/command/PlexCommand.java index 2c57499..b048516 100644 --- a/proxy/src/main/java/dev/plex/command/PlexCommand.java +++ b/proxy/src/main/java/dev/plex/command/PlexCommand.java @@ -60,7 +60,7 @@ public abstract class PlexCommand implements SimpleCommand if (commandSource == RequiredCommandSource.CONSOLE && invocation.source() instanceof Player) { -// sender.sendMessage(messageComponent("noPermissionInGame")); + // sender.sendMessage(messageComponent("noPermissionInGame")); return; } @@ -68,7 +68,7 @@ public abstract class PlexCommand implements SimpleCommand { if (invocation.source() instanceof ConsoleCommandSource) { -// send(sender, messageComponent("noPermissionConsole")); + // send(sender, messageComponent("noPermissionConsole")); return; } } @@ -79,7 +79,7 @@ public abstract class PlexCommand implements SimpleCommand return; } } - Component component = this.execute(invocation.source(), invocation.source() instanceof ConsoleCommandSource ? null : (Player)invocation.source(), invocation.arguments()); + Component component = this.execute(invocation.source(), invocation.source() instanceof ConsoleCommandSource ? null : (Player) invocation.source(), invocation.arguments()); if (component != null) { send(invocation.source(), component); diff --git a/proxy/src/main/java/dev/plex/toml/ArrayValueReader.java b/proxy/src/main/java/dev/plex/toml/ArrayValueReader.java index 2b9d587..19decce 100644 --- a/proxy/src/main/java/dev/plex/toml/ArrayValueReader.java +++ b/proxy/src/main/java/dev/plex/toml/ArrayValueReader.java @@ -49,7 +49,7 @@ public class ArrayValueReader implements ValueReader Object converted = read(s, index, context); if (converted instanceof dev.plex.toml.Results.Errors) { - errors.add((dev.plex.toml.Results.Errors)converted); + errors.add((dev.plex.toml.Results.Errors) converted); } else if (!isHomogenousArray(converted, arrayItems)) { @@ -71,7 +71,7 @@ public class ArrayValueReader implements ValueReader Object converted = ValueReaders.VALUE_READERS.convert(s, index, context); if (converted instanceof dev.plex.toml.Results.Errors) { - errors.add((dev.plex.toml.Results.Errors)converted); + errors.add((dev.plex.toml.Results.Errors) converted); } else if (!isHomogenousArray(converted, arrayItems)) { diff --git a/proxy/src/main/java/dev/plex/toml/ArrayValueWriter.java b/proxy/src/main/java/dev/plex/toml/ArrayValueWriter.java index db54af4..a7184e6 100644 --- a/proxy/src/main/java/dev/plex/toml/ArrayValueWriter.java +++ b/proxy/src/main/java/dev/plex/toml/ArrayValueWriter.java @@ -49,7 +49,7 @@ public abstract class ArrayValueWriter implements dev.plex.toml.ValueWriter } else { - collection = (Collection)value; + collection = (Collection) value; } return collection; @@ -70,7 +70,7 @@ public abstract class ArrayValueWriter implements dev.plex.toml.ValueWriter } else { - Collection collection = (Collection)value; + Collection collection = (Collection) value; if (collection.size() > 0) { return collection.iterator().next(); diff --git a/proxy/src/main/java/dev/plex/toml/Container.java b/proxy/src/main/java/dev/plex/toml/Container.java index b147769..221e847 100644 --- a/proxy/src/main/java/dev/plex/toml/Container.java +++ b/proxy/src/main/java/dev/plex/toml/Container.java @@ -74,11 +74,11 @@ public abstract class Container { if (entry.getValue() instanceof Table) { - entry.setValue(((Table)entry.getValue()).consume()); + entry.setValue(((Table) entry.getValue()).consume()); } else if (entry.getValue() instanceof TableArray) { - entry.setValue(((TableArray)entry.getValue()).getValues()); + entry.setValue(((TableArray) entry.getValue()).getValues()); } } @@ -110,7 +110,7 @@ public abstract class Container @Override void put(String key, Object value) { - values.add((Table)value); + values.add((Table) value); } @Override diff --git a/proxy/src/main/java/dev/plex/toml/InlineTableValueReader.java b/proxy/src/main/java/dev/plex/toml/InlineTableValueReader.java index 13fa5cd..165a520 100644 --- a/proxy/src/main/java/dev/plex/toml/InlineTableValueReader.java +++ b/proxy/src/main/java/dev/plex/toml/InlineTableValueReader.java @@ -37,7 +37,7 @@ class InlineTableValueReader implements dev.plex.toml.ValueReader if (converted instanceof dev.plex.toml.Results.Errors) { - errors.add((dev.plex.toml.Results.Errors)converted); + errors.add((dev.plex.toml.Results.Errors) converted); return errors; } diff --git a/proxy/src/main/java/dev/plex/toml/MapValueWriter.java b/proxy/src/main/java/dev/plex/toml/MapValueWriter.java index 2a288ac..202cb7f 100644 --- a/proxy/src/main/java/dev/plex/toml/MapValueWriter.java +++ b/proxy/src/main/java/dev/plex/toml/MapValueWriter.java @@ -27,7 +27,7 @@ class MapValueWriter implements dev.plex.toml.ValueWriter file = context.file; } - Map from = (Map)value; + Map from = (Map) value; Toml toml = null; diff --git a/proxy/src/main/java/dev/plex/toml/Results.java b/proxy/src/main/java/dev/plex/toml/Results.java index b1d2969..64648ba 100644 --- a/proxy/src/main/java/dev/plex/toml/Results.java +++ b/proxy/src/main/java/dev/plex/toml/Results.java @@ -175,7 +175,7 @@ class Results startTables(dev.plex.toml.Identifier.from(path, null), line); } @SuppressWarnings("unchecked") - Map valueMap = (Map)value; + Map valueMap = (Map) value; for (Map.Entry entry : valueMap.entrySet()) { addValue(entry.getKey(), entry.getValue(), line); @@ -215,7 +215,7 @@ class Results if (currentContainer.get(tablePart) instanceof Container.TableArray) { - Container.TableArray currentTableArray = (Container.TableArray)currentContainer.get(tablePart); + Container.TableArray currentTableArray = (Container.TableArray) currentContainer.get(tablePart); stack.push(currentTableArray); if (i == tableParts.length - 1) @@ -228,7 +228,7 @@ class Results } else if (currentContainer.get(tablePart) instanceof Container.Table && i < tableParts.length - 1) { - Container nextTable = (Container)currentContainer.get(tablePart); + Container nextTable = (Container) currentContainer.get(tablePart); stack.push(nextTable); } else if (currentContainer.accepts(tablePart)) @@ -239,7 +239,7 @@ class Results if (newContainer instanceof Container.TableArray) { - stack.push(((Container.TableArray)newContainer).getCurrent()); + stack.push(((Container.TableArray) newContainer).getCurrent()); } } else @@ -266,7 +266,7 @@ class Results Container currentContainer = stack.peek(); if (currentContainer.get(tablePart) instanceof Container) { - Container nextTable = (Container)currentContainer.get(tablePart); + Container nextTable = (Container) currentContainer.get(tablePart); if (i == tableParts.length - 1 && !nextTable.isImplicit()) { errors.duplicateTable(tableName, line.get()); @@ -275,7 +275,7 @@ class Results stack.push(nextTable); if (stack.peek() instanceof Container.TableArray) { - stack.push(((Container.TableArray)stack.peek()).getCurrent()); + stack.push(((Container.TableArray) stack.peek()).getCurrent()); } } else if (currentContainer.accepts(tablePart)) @@ -298,7 +298,7 @@ class Results Container values = stack.getLast(); stack.clear(); - return ((Container.Table)values).consume(); + return ((Container.Table) values).consume(); } private Container startTable(String tableName, AtomicInteger line) @@ -332,7 +332,7 @@ class Results return null; } - Container.Table table = (Container.Table)next; + Container.Table table = (Container.Table) next; if (table.name == null) { diff --git a/proxy/src/main/java/dev/plex/toml/Toml.java b/proxy/src/main/java/dev/plex/toml/Toml.java index c80faae..b4e319a 100644 --- a/proxy/src/main/java/dev/plex/toml/Toml.java +++ b/proxy/src/main/java/dev/plex/toml/Toml.java @@ -168,7 +168,7 @@ public class Toml public String getString(String key) { - return (String)get(key); + return (String) get(key); } public String getString(String key, String defaultValue) @@ -179,7 +179,7 @@ public class Toml public Long getLong(String key) { - return (Long)get(key); + return (Long) get(key); } public Long getLong(String key, Long defaultValue) @@ -196,7 +196,7 @@ public class Toml public List getList(String key) { @SuppressWarnings("unchecked") - List list = (List)get(key); + List list = (List) get(key); return list; } @@ -216,7 +216,7 @@ public class Toml public Boolean getBoolean(String key) { - return (Boolean)get(key); + return (Boolean) get(key); } public Boolean getBoolean(String key, Boolean defaultValue) @@ -227,7 +227,7 @@ public class Toml public Date getDate(String key) { - return (Date)get(key); + return (Date) get(key); } public Date getDate(String key, Date defaultValue) @@ -238,7 +238,7 @@ public class Toml public Double getDouble(String key) { - return (Double)get(key); + return (Double) get(key); } public Double getDouble(String key, Double defaultValue) @@ -254,7 +254,7 @@ public class Toml @SuppressWarnings("unchecked") public Toml getTable(String key) { - Map map = (Map)get(key); + Map map = (Map) get(key); return map != null ? new Toml(null, map) : null; } @@ -266,7 +266,7 @@ public class Toml @SuppressWarnings("unchecked") public List getTables(String key) { - List> tableArray = (List>)get(key); + List> tableArray = (List>) get(key); if (tableArray == null) { @@ -402,7 +402,7 @@ public class Toml } else if (List.class.isAssignableFrom(entryClass)) { - List value = (List)entry.getValue(); + List value = (List) entry.getValue(); if (!value.isEmpty() && value.get(0) instanceof Map) { entries.add(new Entry(entry.getKey(), getTables(entry.getKey()))); @@ -466,21 +466,21 @@ public class Toml for (dev.plex.toml.Keys.Key k : keys) { - if (k.index == -1 && current instanceof Map && ((Map)current).containsKey(k.path)) + if (k.index == -1 && current instanceof Map && ((Map) current).containsKey(k.path)) { - return ((Map)current).get(k.path); + return ((Map) current).get(k.path); } - current = ((Map)current).get(k.name); + current = ((Map) current).get(k.name); if (k.index > -1 && current != null) { - if (k.index >= ((List)current).size()) + if (k.index >= ((List) current).size()) { return null; } - current = ((List)current).get(k.index); + current = ((List) current).get(k.index); } if (current == null) diff --git a/proxy/src/main/java/dev/plex/toml/TomlParser.java b/proxy/src/main/java/dev/plex/toml/TomlParser.java index 8192841..67a1117 100644 --- a/proxy/src/main/java/dev/plex/toml/TomlParser.java +++ b/proxy/src/main/java/dev/plex/toml/TomlParser.java @@ -66,7 +66,7 @@ class TomlParser if (value instanceof dev.plex.toml.Results.Errors) { - results.errors.add((dev.plex.toml.Results.Errors)value); + results.errors.add((dev.plex.toml.Results.Errors) value); } else { diff --git a/proxy/src/main/java/dev/plex/util/ReflectionsUtil.java b/proxy/src/main/java/dev/plex/util/ReflectionsUtil.java index 2e25a6a..2e6c948 100644 --- a/proxy/src/main/java/dev/plex/util/ReflectionsUtil.java +++ b/proxy/src/main/java/dev/plex/util/ReflectionsUtil.java @@ -49,7 +49,7 @@ public class ReflectionsUtil { if (clazz.getSuperclass() == subType || Arrays.asList(clazz.getInterfaces()).contains(subType)) { - classes.add((Class)clazz); + classes.add((Class) clazz); } }); return Collections.unmodifiableSet(classes); diff --git a/server/src/main/java/dev/plex/cache/PlayerCache.java b/server/src/main/java/dev/plex/cache/PlayerCache.java index 2b969c0..9d8323f 100644 --- a/server/src/main/java/dev/plex/cache/PlayerCache.java +++ b/server/src/main/java/dev/plex/cache/PlayerCache.java @@ -20,12 +20,12 @@ public class PlayerCache implements IPlayerCache /** * A key/value pair where the key is the unique ID of the Punished Player */ -// private static final Map punishedPlayerMap = Maps.newHashMap(); + // private static final Map punishedPlayerMap = Maps.newHashMap(); -// public static Map getPunishedPlayerMap() -// { -// return punishedPlayerMap; -// } + // public static Map getPunishedPlayerMap() + // { + // return punishedPlayerMap; + // } public Map getPlexPlayerMap() { return plexPlayerMap; diff --git a/server/src/main/java/dev/plex/command/PlexCommand.java b/server/src/main/java/dev/plex/command/PlexCommand.java index 731b0d8..75e3226 100644 --- a/server/src/main/java/dev/plex/command/PlexCommand.java +++ b/server/src/main/java/dev/plex/command/PlexCommand.java @@ -2,7 +2,6 @@ package dev.plex.command; import dev.plex.Plex; import dev.plex.cache.DataUtils; -import dev.plex.cache.PlayerCache; import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.exception.CommandFailException; @@ -202,7 +201,7 @@ public abstract class PlexCommand extends Command implements PluginIdentifiableC } try { - Component component = this.execute(sender, isConsole(sender) ? null : (Player)sender, args); + Component component = this.execute(sender, isConsole(sender) ? null : (Player) sender, args); if (component != null) { send(sender, component); @@ -288,7 +287,7 @@ public abstract class PlexCommand extends Command implements PluginIdentifiableC { if (!isConsole(sender)) { - return checkRank((Player)sender, rank, permission); + return checkRank((Player) sender, rank, permission); } if (!sender.getName().equalsIgnoreCase("console")) { @@ -383,7 +382,7 @@ public abstract class PlexCommand extends Command implements PluginIdentifiableC { if (!isConsole(sender)) { - return checkTab((Player)sender, rank, permission); + return checkTab((Player) sender, rank, permission); } return true; } diff --git a/server/src/main/java/dev/plex/command/impl/AdminCMD.java b/server/src/main/java/dev/plex/command/impl/AdminCMD.java index f5959cd..5a83549 100644 --- a/server/src/main/java/dev/plex/command/impl/AdminCMD.java +++ b/server/src/main/java/dev/plex/command/impl/AdminCMD.java @@ -85,7 +85,7 @@ public class AdminCMD extends PlexCommand throw new ConsoleOnlyException(); } -// UUID targetUUID = PlexUtils.getFromName(args[1]); + // UUID targetUUID = PlexUtils.getFromName(args[1]); if (!DataUtils.hasPlayedBefore(args[1])) { @@ -114,7 +114,7 @@ public class AdminCMD extends PlexCommand throw new ConsoleOnlyException(); } -// UUID targetUUID = PlexUtils.getFromName(args[1]); + // UUID targetUUID = PlexUtils.getFromName(args[1]); if (!DataUtils.hasPlayedBefore(args[1])) { diff --git a/server/src/main/java/dev/plex/command/impl/AdminChatCMD.java b/server/src/main/java/dev/plex/command/impl/AdminChatCMD.java index 05d0665..88c9767 100644 --- a/server/src/main/java/dev/plex/command/impl/AdminChatCMD.java +++ b/server/src/main/java/dev/plex/command/impl/AdminChatCMD.java @@ -1,6 +1,5 @@ package dev.plex.command.impl; -import dev.plex.cache.PlayerCache; import dev.plex.command.PlexCommand; import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandPermissions; diff --git a/server/src/main/java/dev/plex/hook/VaultHook.java b/server/src/main/java/dev/plex/hook/VaultHook.java index a346be1..665d91c 100644 --- a/server/src/main/java/dev/plex/hook/VaultHook.java +++ b/server/src/main/java/dev/plex/hook/VaultHook.java @@ -10,14 +10,18 @@ public class VaultHook private static Chat CHAT; private static Permission PERMISSIONS; - static { + static + { CHAT = setupChat(); PERMISSIONS = setupPermissions(); } private static Chat setupChat() { - if (!Bukkit.getPluginManager().isPluginEnabled("Vault")) return null; + if (!Bukkit.getPluginManager().isPluginEnabled("Vault")) + { + return null; + } RegisteredServiceProvider rsp = Bukkit.getServicesManager().getRegistration(Chat.class); if (rsp == null) { @@ -29,7 +33,10 @@ public class VaultHook private static Permission setupPermissions() { - if (!Bukkit.getPluginManager().isPluginEnabled("Vault")) return null; + if (!Bukkit.getPluginManager().isPluginEnabled("Vault")) + { + return null; + } RegisteredServiceProvider rsp = Bukkit.getServicesManager().getRegistration(Permission.class); if (rsp == null) { diff --git a/server/src/main/java/dev/plex/listener/impl/AdminListener.java b/server/src/main/java/dev/plex/listener/impl/AdminListener.java index 7969bae..df25529 100644 --- a/server/src/main/java/dev/plex/listener/impl/AdminListener.java +++ b/server/src/main/java/dev/plex/listener/impl/AdminListener.java @@ -17,7 +17,7 @@ public class AdminListener extends PlexListener public void onAdminAdd(AdminAddEvent event) { String userSender = event.getSender().getName(); - PlexPlayer target = (PlexPlayer)event.getPlexPlayer(); + PlexPlayer target = (PlexPlayer) event.getPlexPlayer(); if (target.getRankFromString().isAtLeast(Rank.ADMIN)) { PlexUtils.broadcast(messageComponent("adminReadded", userSender, target.getName(), target.getRankFromString().getReadable())); @@ -35,7 +35,7 @@ public class AdminListener extends PlexListener public void onAdminRemove(AdminRemoveEvent event) { String userSender = event.getSender().getName(); - PlexPlayer target = (PlexPlayer)event.getPlexPlayer(); + PlexPlayer target = (PlexPlayer) event.getPlexPlayer(); target.setAdminActive(false); DataUtils.update(target); PlexUtils.broadcast(messageComponent("adminRemoved", userSender, target.getName())); @@ -45,8 +45,8 @@ public class AdminListener extends PlexListener public void onAdminSetRank(AdminSetRankEvent event) { String userSender = event.getSender().getName(); - PlexPlayer target = (PlexPlayer)event.getPlexPlayer(); - Rank newRank = (Rank)event.getRank(); + PlexPlayer target = (PlexPlayer) event.getPlexPlayer(); + Rank newRank = (Rank) event.getRank(); target.setRank(newRank.name().toLowerCase()); DataUtils.update(target); PlexUtils.broadcast(messageComponent("adminSetRank", userSender, target.getName(), newRank.getReadable())); diff --git a/server/src/main/java/dev/plex/listener/impl/BlockListener.java b/server/src/main/java/dev/plex/listener/impl/BlockListener.java index d00acef..7430051 100644 --- a/server/src/main/java/dev/plex/listener/impl/BlockListener.java +++ b/server/src/main/java/dev/plex/listener/impl/BlockListener.java @@ -61,7 +61,7 @@ public class BlockListener extends PlexListener if (SIGNS.contains(block.getType())) { - Sign sign = (Sign)block.getState(); + Sign sign = (Sign) block.getState(); boolean anythingChanged = false; for (int i = 0; i < sign.lines().size(); i++) { diff --git a/server/src/main/java/dev/plex/listener/impl/BookListener.java b/server/src/main/java/dev/plex/listener/impl/BookListener.java index fa8f9be..77ab17e 100644 --- a/server/src/main/java/dev/plex/listener/impl/BookListener.java +++ b/server/src/main/java/dev/plex/listener/impl/BookListener.java @@ -24,6 +24,6 @@ public class BookListener extends PlexListener } - event.setNewBookMeta((BookMeta)event.getNewBookMeta().pages(pages)); + event.setNewBookMeta((BookMeta) event.getNewBookMeta().pages(pages)); } } diff --git a/server/src/main/java/dev/plex/listener/impl/ChatListener.java b/server/src/main/java/dev/plex/listener/impl/ChatListener.java index 41c62d8..543dfef 100644 --- a/server/src/main/java/dev/plex/listener/impl/ChatListener.java +++ b/server/src/main/java/dev/plex/listener/impl/ChatListener.java @@ -1,7 +1,6 @@ package dev.plex.listener.impl; import dev.plex.api.chat.IChatHandler; -import dev.plex.cache.PlayerCache; import dev.plex.listener.PlexListener; import dev.plex.listener.annotation.Toggleable; import dev.plex.player.PlexPlayer; @@ -9,6 +8,7 @@ import dev.plex.util.PlexUtils; import dev.plex.util.minimessage.SafeMiniMessage; import io.papermc.paper.chat.ChatRenderer; import io.papermc.paper.event.player.AsyncChatEvent; +import java.util.function.Supplier; import net.kyori.adventure.audience.Audience; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextReplacementConfig; @@ -17,13 +17,10 @@ import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import net.kyori.adventure.text.minimessage.tag.standard.StandardTags; -import org.apache.commons.lang.StringUtils; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.jetbrains.annotations.NotNull; -import java.util.function.Supplier; - @Toggleable("chat.enabled") public class ChatListener extends PlexListener { diff --git a/server/src/main/java/dev/plex/listener/impl/CommandListener.java b/server/src/main/java/dev/plex/listener/impl/CommandListener.java index e8c1bc6..d3af48e 100644 --- a/server/src/main/java/dev/plex/listener/impl/CommandListener.java +++ b/server/src/main/java/dev/plex/listener/impl/CommandListener.java @@ -1,7 +1,6 @@ package dev.plex.listener.impl; import dev.plex.cache.DataUtils; -import dev.plex.cache.PlayerCache; import dev.plex.command.blocking.BlockedCommand; import dev.plex.listener.PlexListener; import dev.plex.player.PlexPlayer; @@ -103,11 +102,13 @@ public class CommandListener extends PlexListener BlockedCommand cmd = cmdRef.get(); switch (cmd.getRequiredLevel().toLowerCase(Locale.ROOT)) { - case "e" -> { + case "e" -> + { event.setCancelled(true); event.getPlayer().sendMessage(cmd.getMessage()); } - case "a" -> { + case "a" -> + { if (plexPlayer.isAdminActive() && plexPlayer.getRankFromString().isAtLeast(Rank.ADMIN)) { return; @@ -115,7 +116,8 @@ public class CommandListener extends PlexListener event.setCancelled(true); event.getPlayer().sendMessage(cmd.getMessage()); } - case "s" -> { + case "s" -> + { if (plexPlayer.isAdminActive() && plexPlayer.getRankFromString().isAtLeast(Rank.SENIOR_ADMIN)) { return; diff --git a/server/src/main/java/dev/plex/listener/impl/PlayerListener.java b/server/src/main/java/dev/plex/listener/impl/PlayerListener.java index 0cbce25..08834cd 100644 --- a/server/src/main/java/dev/plex/listener/impl/PlayerListener.java +++ b/server/src/main/java/dev/plex/listener/impl/PlayerListener.java @@ -1,7 +1,6 @@ package dev.plex.listener.impl; import dev.plex.cache.DataUtils; -import dev.plex.cache.PlayerCache; import dev.plex.listener.PlexListener; import dev.plex.player.PlexPlayer; import dev.plex.storage.StorageType; diff --git a/server/src/main/java/dev/plex/listener/impl/SpawnListener.java b/server/src/main/java/dev/plex/listener/impl/SpawnListener.java index 97d1471..eb19014 100644 --- a/server/src/main/java/dev/plex/listener/impl/SpawnListener.java +++ b/server/src/main/java/dev/plex/listener/impl/SpawnListener.java @@ -56,7 +56,7 @@ public class SpawnListener extends PlexListener if (SPAWN_EGGS.contains(itemType)) { Block block = event.getBlock(); - Location blockLoc = BlockUtils.relative(block.getLocation(), ((Directional)block.getBlockData()).getFacing()).add(.5, 0, .5); + Location blockLoc = BlockUtils.relative(block.getLocation(), ((Directional) block.getBlockData()).getFacing()).add(.5, 0, .5); EntityType eggType = spawnEggToEntityType(itemType); if (eggType != null) { diff --git a/server/src/main/java/dev/plex/listener/impl/TabListener.java b/server/src/main/java/dev/plex/listener/impl/TabListener.java index 063d2e5..31c4cde 100644 --- a/server/src/main/java/dev/plex/listener/impl/TabListener.java +++ b/server/src/main/java/dev/plex/listener/impl/TabListener.java @@ -25,7 +25,7 @@ public class TabListener extends PlexListener @EventHandler(priority = EventPriority.HIGHEST) public void onAdminAdd(AdminAddEvent event) { - PlexPlayer plexPlayer = (PlexPlayer)event.getPlexPlayer(); + PlexPlayer plexPlayer = (PlexPlayer) event.getPlexPlayer(); Player player = event.getPlexPlayer().getPlayer(); if (player == null) { @@ -37,7 +37,7 @@ public class TabListener extends PlexListener @EventHandler(priority = EventPriority.HIGHEST) public void onAdminRemove(AdminRemoveEvent event) { - PlexPlayer plexPlayer = (PlexPlayer)event.getPlexPlayer(); + PlexPlayer plexPlayer = (PlexPlayer) event.getPlexPlayer(); Player player = event.getPlexPlayer().getPlayer(); if (player == null) { @@ -49,7 +49,7 @@ public class TabListener extends PlexListener @EventHandler(priority = EventPriority.HIGHEST) public void onAdminSetRank(AdminSetRankEvent event) { - PlexPlayer plexPlayer = (PlexPlayer)event.getPlexPlayer(); + PlexPlayer plexPlayer = (PlexPlayer) event.getPlexPlayer(); Player player = event.getPlexPlayer().getPlayer(); if (player == null) { diff --git a/server/src/main/java/dev/plex/listener/impl/WorldListener.java b/server/src/main/java/dev/plex/listener/impl/WorldListener.java index 6582b56..33a1922 100644 --- a/server/src/main/java/dev/plex/listener/impl/WorldListener.java +++ b/server/src/main/java/dev/plex/listener/impl/WorldListener.java @@ -2,7 +2,6 @@ package dev.plex.listener.impl; import dev.plex.Plex; import dev.plex.cache.DataUtils; -import dev.plex.cache.PlayerCache; import dev.plex.listener.PlexListener; import dev.plex.player.PlexPlayer; import dev.plex.rank.enums.Rank; @@ -79,8 +78,8 @@ public class WorldListener extends PlexListener if (command != null) { // This does check for aliases - boolean isWeCommand = command instanceof PluginIdentifiableCommand && ((PluginIdentifiableCommand)command).getPlugin().equals(Bukkit.getPluginManager().getPlugin("WorldEdit")); - boolean isFaweCommand = command instanceof PluginIdentifiableCommand && ((PluginIdentifiableCommand)command).getPlugin().equals(Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit")); + boolean isWeCommand = command instanceof PluginIdentifiableCommand && ((PluginIdentifiableCommand) command).getPlugin().equals(Bukkit.getPluginManager().getPlugin("WorldEdit")); + boolean isFaweCommand = command instanceof PluginIdentifiableCommand && ((PluginIdentifiableCommand) command).getPlugin().equals(Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit")); if (isWeCommand || isFaweCommand || EDIT_COMMANDS.contains(message.toLowerCase())) { event.getPlayer().sendMessage(Component.text("You do not have permission to use that command in this world.").color(NamedTextColor.RED)); diff --git a/server/src/main/java/dev/plex/menu/PunishedPlayerMenu.java b/server/src/main/java/dev/plex/menu/PunishedPlayerMenu.java index 6cb52b3..619dbb5 100644 --- a/server/src/main/java/dev/plex/menu/PunishedPlayerMenu.java +++ b/server/src/main/java/dev/plex/menu/PunishedPlayerMenu.java @@ -3,7 +3,6 @@ package dev.plex.menu; import com.google.common.collect.Lists; import dev.plex.Plex; import dev.plex.cache.DataUtils; -import dev.plex.cache.PlayerCache; import dev.plex.player.PlexPlayer; import dev.plex.punishment.Punishment; import dev.plex.util.PlexUtils; @@ -135,7 +134,7 @@ public class PunishedPlayerMenu extends AbstractMenu { return; } - openInv((Player)event.getWhoClicked(), getCurrentInventoryIndex(inv) + 1); + openInv((Player) event.getWhoClicked(), getCurrentInventoryIndex(inv) + 1); } else if (item.getItemMeta().displayName().equals(Component.text("Previous Page").color(NamedTextColor.LIGHT_PURPLE))) { @@ -151,18 +150,17 @@ public class PunishedPlayerMenu extends AbstractMenu { return; } - openInv((Player)event.getWhoClicked(), getCurrentInventoryIndex(inv) - 1); + openInv((Player) event.getWhoClicked(), getCurrentInventoryIndex(inv) - 1); } - } else if (item.getType() == Material.BARRIER) { - new PunishmentMenu().openInv((Player)event.getWhoClicked(), 0); + new PunishmentMenu().openInv((Player) event.getWhoClicked(), 0); } else if (item.getType() == Material.PLAYER_HEAD) { - SkullMeta meta = (SkullMeta)item.getItemMeta(); + SkullMeta meta = (SkullMeta) item.getItemMeta(); OfflinePlayer player = meta.getOwningPlayer(); assert player != null; PlexPlayer punishedPlayer = DataUtils.getPlayer(player.getUniqueId()) == null ? null : Plex.get().getPlayerCache().getPlexPlayer(player.getUniqueId()); diff --git a/server/src/main/java/dev/plex/menu/PunishmentMenu.java b/server/src/main/java/dev/plex/menu/PunishmentMenu.java index 311a4d7..c675f05 100644 --- a/server/src/main/java/dev/plex/menu/PunishmentMenu.java +++ b/server/src/main/java/dev/plex/menu/PunishmentMenu.java @@ -71,7 +71,7 @@ public class PunishmentMenu extends AbstractMenu ItemStack item = new ItemStack(Material.PLAYER_HEAD); - SkullMeta meta = (SkullMeta)item.getItemMeta(); + SkullMeta meta = (SkullMeta) item.getItemMeta(); meta.setOwningPlayer(players); meta.displayName(PlexUtils.mmDeserialize("" + players.getName())); item.setItemMeta(meta); @@ -121,7 +121,7 @@ public class PunishmentMenu extends AbstractMenu { return; } - openInv((Player)event.getWhoClicked(), getCurrentInventoryIndex(inv) + 1); + openInv((Player) event.getWhoClicked(), getCurrentInventoryIndex(inv) + 1); } else if (item.getItemMeta().displayName().equals(PlexUtils.mmDeserialize("Previous Page"))) { @@ -137,14 +137,13 @@ public class PunishmentMenu extends AbstractMenu { return; } - openInv((Player)event.getWhoClicked(), getCurrentInventoryIndex(inv) - 1); + openInv((Player) event.getWhoClicked(), getCurrentInventoryIndex(inv) - 1); } - } else if (item.getType() == Material.PLAYER_HEAD) { - SkullMeta meta = (SkullMeta)item.getItemMeta(); + SkullMeta meta = (SkullMeta) item.getItemMeta(); OfflinePlayer player = meta.getOwningPlayer(); assert player != null; PlexPlayer punishedPlayer = DataUtils.getPlayer(player.getUniqueId()); @@ -154,10 +153,9 @@ public class PunishmentMenu extends AbstractMenu event.getWhoClicked().closeInventory(); return; } - new PunishedPlayerMenu(punishedPlayer).openInv((Player)event.getWhoClicked(), 0); + new PunishedPlayerMenu(punishedPlayer).openInv((Player) event.getWhoClicked(), 0); } - } public int getCurrentInventoryIndex(Inventory inventory) diff --git a/server/src/main/java/dev/plex/module/ModuleManager.java b/server/src/main/java/dev/plex/module/ModuleManager.java index fae0e05..136cfe3 100644 --- a/server/src/main/java/dev/plex/module/ModuleManager.java +++ b/server/src/main/java/dev/plex/module/ModuleManager.java @@ -67,7 +67,7 @@ public class ModuleManager PlexModuleFile plexModuleFile = new PlexModuleFile(name, main, description, version); plexModuleFile.setLibraries(libraries); - Class module = (Class)Class.forName(main, true, loader); + Class module = (Class) Class.forName(main, true, loader); PlexModule plexModule = module.getConstructor().newInstance(); plexModule.setPlex(Plex.get()); @@ -97,7 +97,7 @@ public class ModuleManager { PlexLog.log("Loading module " + module.getPlexModuleFile().getName() + " with version " + module.getPlexModuleFile().getVersion()); module.load(); -// this.libraryLoader.createLoader(module, module.getPlexModuleFile()); + // this.libraryLoader.createLoader(module, module.getPlexModuleFile()); }); } @@ -142,7 +142,7 @@ public class ModuleManager { try { - ((URLClassLoader)module.getClass().getClassLoader()).close(); + ((URLClassLoader) module.getClass().getClassLoader()).close(); } catch (IOException e) { diff --git a/server/src/main/java/dev/plex/module/loader/LibraryLoader.java b/server/src/main/java/dev/plex/module/loader/LibraryLoader.java index 7e25f42..78d7404 100644 --- a/server/src/main/java/dev/plex/module/loader/LibraryLoader.java +++ b/server/src/main/java/dev/plex/module/loader/LibraryLoader.java @@ -105,7 +105,7 @@ public class LibraryLoader DependencyResult result; try { - result = repository.resolveDependencies(session, new DependencyRequest(new CollectRequest((Dependency)null, dependencies, repositories), null)); + result = repository.resolveDependencies(session, new DependencyRequest(new CollectRequest((Dependency) null, dependencies, repositories), null)); } catch (DependencyResolutionException ex) { @@ -161,8 +161,8 @@ public class LibraryLoader }*/ logger.log(Level.INFO, "Loaded {0} libraries for {1}", new Object[]{jarFiles.size(), moduleFile.getName()}); -// jarFiles.forEach(jar -> new CustomClassLoader(jar, Plex.class.getClassLoader())); -// jarFiles.forEach(jar -> new CustomClassLoader(jar, Plex.class.getClassLoader())); + // jarFiles.forEach(jar -> new CustomClassLoader(jar, Plex.class.getClassLoader())); + // jarFiles.forEach(jar -> new CustomClassLoader(jar, Plex.class.getClassLoader())); /*URLClassLoader loader = new URLClassLoader(jarFiles.toArray(URL[]::new), Plex.class.getClassLoader()); diff --git a/server/src/main/java/dev/plex/storage/player/MongoPlayerData.java b/server/src/main/java/dev/plex/storage/player/MongoPlayerData.java index aedaf18..5b2e8d2 100644 --- a/server/src/main/java/dev/plex/storage/player/MongoPlayerData.java +++ b/server/src/main/java/dev/plex/storage/player/MongoPlayerData.java @@ -6,7 +6,6 @@ import dev.morphia.query.Update; import dev.morphia.query.experimental.filters.Filters; import dev.morphia.query.experimental.updates.UpdateOperators; import dev.plex.Plex; -import dev.plex.cache.PlayerCache; import dev.plex.player.PlexPlayer; import java.util.Collections; import java.util.List; diff --git a/server/src/main/java/dev/plex/storage/player/SQLPlayerData.java b/server/src/main/java/dev/plex/storage/player/SQLPlayerData.java index eb0c3a0..87abe30 100644 --- a/server/src/main/java/dev/plex/storage/player/SQLPlayerData.java +++ b/server/src/main/java/dev/plex/storage/player/SQLPlayerData.java @@ -3,7 +3,6 @@ package dev.plex.storage.player; import com.google.common.reflect.TypeToken; import com.google.gson.Gson; import dev.plex.Plex; -import dev.plex.cache.PlayerCache; import dev.plex.player.PlexPlayer; import dev.plex.storage.StorageType; import dev.plex.util.PlexLog; diff --git a/server/src/main/java/dev/plex/util/GameRuleUtil.java b/server/src/main/java/dev/plex/util/GameRuleUtil.java index d407525..40a6bbb 100644 --- a/server/src/main/java/dev/plex/util/GameRuleUtil.java +++ b/server/src/main/java/dev/plex/util/GameRuleUtil.java @@ -27,8 +27,8 @@ public class GameRuleUtil private static void readGameRules(World world, String s) { String gameRule = s.split(";")[0]; - T value = (T)s.split(";")[1]; - GameRule rule = (GameRule)GameRule.getByName(gameRule); + T value = (T) s.split(";")[1]; + GameRule rule = (GameRule) GameRule.getByName(gameRule); if (rule != null && check(value).getClass().equals(rule.getType())) { world.setGameRule(rule, value); diff --git a/server/src/main/java/dev/plex/util/MojangUtils.java b/server/src/main/java/dev/plex/util/MojangUtils.java index 21a5fa4..d364477 100644 --- a/server/src/main/java/dev/plex/util/MojangUtils.java +++ b/server/src/main/java/dev/plex/util/MojangUtils.java @@ -38,7 +38,7 @@ public class MojangUtils return null; } client.close(); - AshconInfo ashconInfo = new GsonBuilder().registerTypeAdapter(ZonedDateTime.class, (JsonDeserializer)(json1, typeOfT, context) -> + AshconInfo ashconInfo = new GsonBuilder().registerTypeAdapter(ZonedDateTime.class, (JsonDeserializer) (json1, typeOfT, context) -> ZonedDateTime.ofInstant(Instant.from(DateTimeFormatter.ISO_INSTANT.parse(json1.getAsJsonPrimitive().getAsString())), ZoneId.of(Plex.get().config.getString("server.timezone")))).create().fromJson(json, AshconInfo.class); Arrays.sort(ashconInfo.getUsernameHistories(), (o1, o2) -> diff --git a/server/src/main/java/dev/plex/util/PlexLog.java b/server/src/main/java/dev/plex/util/PlexLog.java index f6d5f42..ea824b5 100644 --- a/server/src/main/java/dev/plex/util/PlexLog.java +++ b/server/src/main/java/dev/plex/util/PlexLog.java @@ -35,7 +35,7 @@ public class PlexLog } } Bukkit.getConsoleSender().sendMessage(PlexUtils.mmDeserialize("[Plex Error] " + message)); -// Bukkit.getConsoleSender().sendMessage(String.format(ChatColor.RED + "[Plex Error] " + ChatColor.GOLD + "%s", message)); + // Bukkit.getConsoleSender().sendMessage(String.format(ChatColor.RED + "[Plex Error] " + ChatColor.GOLD + "%s", message)); } public static void warn(String message, Object... strings) @@ -47,7 +47,7 @@ public class PlexLog message = message.replace("{" + i + "}", strings[i].toString()); } } -// Bukkit.getConsoleSender().sendMessage(String.format(ChatColor.YELLOW + "[Plex Warning] " + ChatColor.GOLD + "%s", message)); + // Bukkit.getConsoleSender().sendMessage(String.format(ChatColor.YELLOW + "[Plex Warning] " + ChatColor.GOLD + "%s", message)); Bukkit.getConsoleSender().sendMessage(PlexUtils.mmDeserialize("<#eb7c0e>[Plex Warning] " + message)); } @@ -63,7 +63,7 @@ public class PlexLog if (Plex.get().config.getBoolean("debug")) { Bukkit.getConsoleSender().sendMessage(PlexUtils.mmDeserialize("[Plex Debug] " + message)); -// Bukkit.getConsoleSender().sendMessage(String.format(ChatColor.DARK_PURPLE + "[Plex Debug] " + ChatColor.GOLD + "%s", message)); + // Bukkit.getConsoleSender().sendMessage(String.format(ChatColor.DARK_PURPLE + "[Plex Debug] " + ChatColor.GOLD + "%s", message)); } } } diff --git a/server/src/main/java/dev/plex/util/PlexUtils.java b/server/src/main/java/dev/plex/util/PlexUtils.java index a97986f..5e4d002 100644 --- a/server/src/main/java/dev/plex/util/PlexUtils.java +++ b/server/src/main/java/dev/plex/util/PlexUtils.java @@ -2,7 +2,6 @@ package dev.plex.util; import dev.plex.Plex; import dev.plex.PlexBase; -import dev.plex.cache.PlayerCache; import dev.plex.storage.StorageType; import java.sql.Connection; import java.sql.SQLException; @@ -174,7 +173,7 @@ public class PlexUtils implements PlexBase { try { - return ((TextComponent)component).content(); + return ((TextComponent) component).content(); } catch (Exception e) { diff --git a/server/src/main/java/dev/plex/util/ReflectionsUtil.java b/server/src/main/java/dev/plex/util/ReflectionsUtil.java index 2e25a6a..2e6c948 100644 --- a/server/src/main/java/dev/plex/util/ReflectionsUtil.java +++ b/server/src/main/java/dev/plex/util/ReflectionsUtil.java @@ -49,7 +49,7 @@ public class ReflectionsUtil { if (clazz.getSuperclass() == subType || Arrays.asList(clazz.getInterfaces()).contains(subType)) { - classes.add((Class)clazz); + classes.add((Class) clazz); } }); return Collections.unmodifiableSet(classes); diff --git a/server/src/main/java/dev/plex/util/UpdateChecker.java b/server/src/main/java/dev/plex/util/UpdateChecker.java index b047bbe..b46a7d2 100644 --- a/server/src/main/java/dev/plex/util/UpdateChecker.java +++ b/server/src/main/java/dev/plex/util/UpdateChecker.java @@ -46,7 +46,7 @@ public class UpdateChecker implements PlexBase { try { - HttpURLConnection connection = (HttpURLConnection)new URL("https://api.github.com/repos/" + repo + "/compare/" + branch + "..." + hash).openConnection(); + HttpURLConnection connection = (HttpURLConnection) new URL("https://api.github.com/repos/" + repo + "/compare/" + branch + "..." + hash).openConnection(); connection.connect(); if (connection.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) { diff --git a/server/src/main/java/dev/plex/util/WebUtils.java b/server/src/main/java/dev/plex/util/WebUtils.java index 7c202e4..5d13272 100644 --- a/server/src/main/java/dev/plex/util/WebUtils.java +++ b/server/src/main/java/dev/plex/util/WebUtils.java @@ -17,7 +17,7 @@ public class WebUtils try { URL u = new URL(url); - HttpURLConnection connection = (HttpURLConnection)u.openConnection(); + HttpURLConnection connection = (HttpURLConnection) u.openConnection(); connection.setRequestMethod("GET"); BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream())); String line; @@ -39,13 +39,13 @@ public class WebUtils public static UUID getFromName(String name) { JSONObject profile; - profile = (JSONObject)simpleGET("https://api.ashcon.app/mojang/v2/user/" + name); + profile = (JSONObject) simpleGET("https://api.ashcon.app/mojang/v2/user/" + name); if (profile == null) { PlexLog.error("Profile from Ashcon API returned null!"); return null; } - String uuidString = (String)profile.get("uuid"); + String uuidString = (String) profile.get("uuid"); return UUID.fromString(uuidString); } } diff --git a/server/src/main/java/dev/plex/world/NoiseChunkGenerator.java b/server/src/main/java/dev/plex/world/NoiseChunkGenerator.java index d2eeeb3..3182720 100644 --- a/server/src/main/java/dev/plex/world/NoiseChunkGenerator.java +++ b/server/src/main/java/dev/plex/world/NoiseChunkGenerator.java @@ -23,7 +23,7 @@ public abstract class NoiseChunkGenerator extends CustomChunkGenerator { for (int zz = 0; zz < 16; zz++) { - height = (int)generator.noise(options.getX(), options.getY(), options.getFrequency(), options.getAmplitude(), options.isNormalized()); + height = (int) generator.noise(options.getX(), options.getY(), options.getFrequency(), options.getAmplitude(), options.isNormalized()); createLoopChunkData(xx, height, zz, chunk); } } diff --git a/server/src/main/java/dev/plex/world/OctaveChunkGenerator.java b/server/src/main/java/dev/plex/world/OctaveChunkGenerator.java index 61b563e..e1a2729 100644 --- a/server/src/main/java/dev/plex/world/OctaveChunkGenerator.java +++ b/server/src/main/java/dev/plex/world/OctaveChunkGenerator.java @@ -24,7 +24,7 @@ public abstract class OctaveChunkGenerator extends CustomChunkGenerator { for (int zz = 0; zz < 16; zz++) { - height = (int)generator.noise(options.getX(), options.getY(), options.getFrequency(), options.getAmplitude(), options.isNormalized()); + height = (int) generator.noise(options.getX(), options.getY(), options.getFrequency(), options.getAmplitude(), options.isNormalized()); createLoopChunkData(xx, height, zz, chunk); } }