diff options
-rw-r--r-- | .SRCINFO | 48 | ||||
-rw-r--r-- | .gitignore | 15 | ||||
-rw-r--r-- | LICENSE-fml.txt | 491 | ||||
-rw-r--r-- | LICENSE-new.txt | 483 | ||||
-rw-r--r-- | MinecraftForge-License.txt | 70 | ||||
-rw-r--r-- | PKGBUILD | 190 | ||||
-rw-r--r-- | forge-server-1.11.2.install | 35 | ||||
-rw-r--r-- | forge-server.install | 55 | ||||
-rw-r--r-- | forged-backup.service (renamed from forge-1.11.2d-backup.service) | 6 | ||||
-rw-r--r-- | forged-backup.timer (renamed from forge-1.11.2d-backup.timer) | 0 | ||||
-rw-r--r-- | forged.conf (renamed from forge-1.11.2d.conf) | 12 | ||||
-rw-r--r-- | forged.service (renamed from forge-1.11.2d.service) | 8 | ||||
-rwxr-xr-x | forged.sh (renamed from forge-1.11.2d.sh) | 19 |
13 files changed, 249 insertions, 1183 deletions
@@ -1,9 +1,9 @@ pkgbase = forge-server-1.11.2 - pkgdesc = Minecraft Forge server unit files, script, and jar + pkgdesc = Minecraft Forge server unit files, script and jar pkgver = 1.11.2_13.20.1.2386 - pkgrel = 3 - url = https://minecraftforge.net/ - install = forge-server-1.11.2.install + pkgrel = 4 + url = https://minecraftforge.net + install = forge-server.install arch = any license = custom depends = java-runtime-headless=8 @@ -14,26 +14,32 @@ pkgbase = forge-server-1.11.2 depends = sed optdepends = tar: needed in order to create world backups optdepends = netcat: required in order to suspend an idle server - noextract = forge-1.11.2-1.11.2-13.20.1.2386-installer.jar - backup = etc/conf.d/forge-1.11.2 - source = forge-1.11.2-1.11.2-13.20.1.2386-installer.jar::https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.11.2-13.20.1.2386/forge-1.11.2-13.20.1.2386-installer.jar - source = forge-1.11.2d-backup.service - source = forge-1.11.2d-backup.timer - source = forge-1.11.2d.service - source = forge-1.11.2d.conf - source = forge-1.11.2d.sh - source = LICENSE-fml.txt - source = LICENSE-new.txt - source = MinecraftForge-License.txt - sha512sums = 4eef89201fb6f8662912a5ceb3cfaa0c68da6ca874e403b02f40afa7132f48c339815b987dc190903e4053531957c009f46d388b88083f54f349a3dd6ad26b42 - sha512sums = 70d7f3855ada6bd06ed707d99d2bc782c8da2f79d236e4d3e0d95ab12e675c8a39d85cd21df8313cd32b00a0227f020c31ab8f77a572d9cf590cbf75655ee426 + provides = forge-server=1.11.2_13.20.1.2386 + conflicts = forge-server + noextract = forge-1.11.2-13.20.1.2386.jar + backup = etc/conf.d/forge + source = forged-backup.service + source = forged-backup.timer + source = forged.service + source = forged.conf + source = forged.sh + source = forge-1.11.2-13.20.1.2386-installer.jar::https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.11.2-13.20.1.2386/forge-1.11.2-13.20.1.2386-installer.jar + source = MinecraftForge-License-forge-server-1.11.2-1.11.2-13.20.1.2386.txt::https://raw.githubusercontent.com/MinecraftForge/MinecraftForge/1.11.x/MinecraftForge-License.txt + source = Paulscode%20IBXM%20Library%20License-forge-server-1.11.2-1.11.2-13.20.1.2386.txt::https://raw.githubusercontent.com/MinecraftForge/MinecraftForge/1.11.x/Paulscode%20IBXM%20Library%20License.txt + source = Paulscode%20SoundSystem%20CodecIBXM%20License-forge-server-1.11.2-1.11.2-13.20.1.2386.txt::https://raw.githubusercontent.com/MinecraftForge/MinecraftForge/1.11.x/Paulscode%20SoundSystem%20CodecIBXM%20License.txt + source = LICENSE-fml-forge-server-1.11.2-1.11.2-13.20.1.2386.txt::https://raw.githubusercontent.com/MinecraftForge/MinecraftForge/1.11.x/LICENSE-fml.txt + source = LICENSE-new-forge-server-1.11.2-1.11.2-13.20.1.2386.txt::https://raw.githubusercontent.com/MinecraftForge/MinecraftForge/1.11.x/LICENSE-new.txt + sha512sums = e9a391a330320a7aea127a3e8ad399d8d6e3c926eac2c0df7a4e550ba61cc13fec737f7e984bd98b9e1f9f9d5a654ee241eeef6a2e433ec845e300ef29405f62 sha512sums = a47b5a9e2262877008a5dcae3a833fe99f911631d6fdbe97b95e0451e1dd2b5a26b6f7b843dd6a8ccd4f663cf5c3bca53a89a1d3aabb363281ab6c6fb19e41a4 - sha512sums = e3810d59408b303601c9fae95cafaa140019b214b452d36b0ce6017f5724f3c35d8b7f8c06c2c20118ddffeb7faa70ddea09de62e60ab12ddbc2d9e875a68421 - sha512sums = c765776ade02eab1a5b2a56b7848f36b7a2e4523e3e753c9a18223bef7307240d867782aa0a4aca9697efd9615fa48cdb8cafdf86d4e344560128abde30c310f - sha512sums = d92dc4745fd335d4c755c9a672741e3c10582a60cf0c81fa74e2f8ae0377c7310c8787cd11dc15d3667703829f12cd3dd9fd288fc8d047d1037ca2333719f05e + sha512sums = d6bde61a7aa479b85e35b4a3eccb9b3237a6c97f8919b3d704434f1df15672b74c7ae9ca9473eea6a0593e6e80892a2510782115185c1b7fe332720ccb78a7bd + sha512sums = 6c82f776e337d8c5eca11fea87ce6f6cfe4a5e881db947336d9c8605bd36a4ce0b7b8811e11d79285dd855cd2bdc3f65526b7aaa8d47cb14a7b8cf452462329c + sha512sums = 2a9a911e9290573718d7cf00a834e4dc0211c63a2de4d132c0b6c418d2616084dee68b934ae6e6554a0f6a037e35620d2df8b8d736acbd2fe8f71e0656c3ea46 + sha512sums = 4eef89201fb6f8662912a5ceb3cfaa0c68da6ca874e403b02f40afa7132f48c339815b987dc190903e4053531957c009f46d388b88083f54f349a3dd6ad26b42 + sha512sums = dedd8e121e79bdd39c824a2d4acbc231ae6339cfd29894c4e7299359d23bc92423f4a865865372745be996b0bc14f5777e06baae8b1f4e5c302eadeac5aecf15 + sha512sums = 7f158bed6957e5285ce45a480f6a222065af5427bd48481ef24eb770ff540aa67b2d1c1ed976d216db94323017f7c7ee1dfe16e3f222b14189f9823e0b49f0f3 + sha512sums = 2c9bdefe7d022be139e7aec2e5f1cc1f83ea9d35d2c945e26422e140027b5107ce32c56f0b97e7dbf6b6edb282075df4a18c156a6ed6b064bcb10a3b4481a9aa sha512sums = 07860198b7d40726e9597f9ac748904a8e27bdcf87151f0b1c8c2ade024ad16aa83d412b70f900a7de3f58773f325ee45eb6c30cb1395e45a4d8092a19b4f845 sha512sums = 7fe8163f3f1bb86e59508aff851eb571e280da36c24a6faf49ae51d6a000282bac8c388ac1c0c1208220b3f8fb62466285a306213f5a014faa1b619f4c48bf9b - sha512sums = dedd8e121e79bdd39c824a2d4acbc231ae6339cfd29894c4e7299359d23bc92423f4a865865372745be996b0bc14f5777e06baae8b1f4e5c302eadeac5aecf15 pkgname = forge-server-1.11.2 diff --git a/.gitignore b/.gitignore index bf81220a8e2c..c0d97599f6ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,10 @@ * -!forge-server-1.11.2.install -!forge-1.11.2d-backup.service -!forge-1.11.2d-backup.timer -!forge-1.11.2d.conf -!forge-1.11.2d.service -!forge-1.11.2d.sh -!LICENSE-fml.txt -!LICENSE-new.txt -!MinecraftForge-License.txt +!forged-backup.service +!forged-backup.timer +!forged.conf +!forged.service +!forged.sh +!forge-server.install !PKGBUILD !.gitignore !.SRCINFO diff --git a/LICENSE-fml.txt b/LICENSE-fml.txt deleted file mode 100644 index 26cca072ea03..000000000000 --- a/LICENSE-fml.txt +++ /dev/null @@ -1,491 +0,0 @@ -This minecraft mod, Forge Mod Loader, including all parts herein except as noted below, -is licensed under the GNU LGPL v2.1 or later. - -Homepage: https://github.com/MinecraftForge/FML - -This software includes portions from the Apache Maven project at -http://maven.apache.org/ specifically the ComparableVersion.java code. It is -included based on guidelines at -http://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html -with notices intact. The only change is a non-functional change of package name. - -This software contains a partial repackaging of javaxdelta, a BSD licensed program for generating -binary differences and applying them, sourced from the subversion at http://sourceforge.net/projects/javaxdelta/ -authored by genman, heikok, pivot. -The only changes are to replace some Trove collection types with standard Java collections, and repackaged. - - -=== MCP Data === -This software includes data from the Minecraft Coder Pack (MCP), with kind permission -from them. The license to MCP data is not transitive - distribution of this data by -third parties requires independent licensing from the MCP team. This data is not -redistributable without permission from the MCP team. - -=== Sharing === -I grant permission for some parts of FML to be redistributed outside the terms of the LGPL, for the benefit of -the minecraft modding community. All contributions to these parts should be licensed under the same additional grant. - --- Runtime patcher -- -License is granted to redistribute the runtime patcher code (common/cpw/mods/fml/patcher and subdirectories) under -any alternative open source license as classified by the OSI (http://opensource.org/licenses) - --- ASM transformers -- -License is granted to redistribute the ASM transformer code (common/cpw/mods/fml/common/asm/ and subdirectories) -under any alternative open source license as classified by the OSI (http://opensource.org/licenses) - -======== - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -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 this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -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 -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser 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 Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "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 -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY 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 -LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS diff --git a/LICENSE-new.txt b/LICENSE-new.txt deleted file mode 100644 index be2c9e66dcc8..000000000000 --- a/LICENSE-new.txt +++ /dev/null @@ -1,483 +0,0 @@ -Minecraft Forge is licensed under the terms of the LGPL 2.1 found -here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and copied -below. - -A note on authorship: -All source artifacts are property of their original author, with -the exclusion of the contents of the patches directory and others -copied from it from time to time. Authorship of the contents of -the patches directory is retained by the Minecraft Forge project. -This is because the patches are partially machine generated -artifacts, and are changed heavily due to the way forge works. -Individual attribution within them is impossible. - -Consent: -All contributions to Forge must consent to the release of any -patch content to the Forge project. - -A note on infectivity: -The LGPL is chosen specifically so that projects may depend on Forge -features without being infected with its license. That is the -purpose of the LGPL. Mods and others using this code via ordinary -Java mechanics for referencing libraries are specifically not bound -by Forge's license for the Mod code. - - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -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 this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -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 -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser 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 Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "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 -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY 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 -LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS diff --git a/MinecraftForge-License.txt b/MinecraftForge-License.txt deleted file mode 100644 index 1cc2a3e9dcf1..000000000000 --- a/MinecraftForge-License.txt +++ /dev/null @@ -1,70 +0,0 @@ -Minecraft Forge Public Licence -============================== - -Version 1.0 - -0. Definitions --------------- - -Minecraft: Denotes a copy of the Minecraft game licensed by Mojang AB - -User: Anybody that interract with the software in one of the following ways: - - play - - decompile - - recompile or compile - - modify - -Minecraft Forge: The Minecraft Forge code, in source form, class file form, as -obtained in a standalone fashion or as part of a wider distribution. - -Dependency: Code required to have Minecraft Forge working properly. That can -include dependencies required to compile the code as well as modifications in -the Minecraft sources that are required to have Minecraft Forge working. - -1. Scope --------- - -The present license is granted to any user of Minecraft Forge, for all files included -unless stated otherwise in the file itself. As a prerequisite, a user of Minecraft -Forge must own a legally aquired copy of Minecraft. - -2. Play rights --------------- - -The user of Minecraft Forge is allowed to install the software on a client or -a server and to play it without restriction. - -3. Modification rights ----------------------- - -The user has the right to decompile the source code, look at either the -decompiled version or the original source code, and to modify it. - -4. Derivation rights --------------------- - -The user has the rights to derive code from Minecraft Forge, that is to say to -write code that either extends Minecraft Forge class and interfaces, -instantiate the objects declared or calls the functions. This code is known as -"derived" code, and can be licensed with conditions different from Minecraft -Forge. - - -5. Distribution rights ----------------------- - -The user of Minecraft Forge is allowed to redistribute Minecraft Forge in -partially, in totallity, or included in a distribution. When distributing -binaries or class files, the user must provide means to obtain the sources of -the distributed version of Minecraft Forge at no costs. This includes the -files as well as any dependency that the code may rely on, including patches to -minecraft original sources. - -Modification of Minecraft Forge as well as dependencies, including patches to -minecraft original sources, has to remain under the terms of the present -license. - -The right to distribute Minecraft Forge does not extend to the right to distribute -MCP data files included within Minecraft Forge. These are the property of the MCP -project and should be removed from any customized distribution of Minecraft Forge -or permission sought separately from the MCP team. @@ -5,70 +5,156 @@ ## Contributor: Philip Abernethy <chais.z3r0@gmail.com> ## Contributor: sowieso <sowieso@dukun.de> -_game="forge-1.11.2" -_server_root="/srv/forge-1.11.2" +[ -z "$FORGE_SRV_PKGVER" ] && FORGE_SRV_PKGVER="1.11.2_13.20.1.2386-4" +[ -z "$FORGE_SRV_MCVER_LATEST" ] && FORGE_SRV_MCVER_LATEST="1.14.4" -_minecraft_ver=1.11.2 -_pkgver=${_minecraft_ver}-13.20.1.2386 +IFS="-" read -ra _ver_temp <<< "$FORGE_SRV_PKGVER" +IFS="_" read -ra _pkgver_temp <<< "${_ver_temp[0]}" +IFS="." read -ra _minecraft_ver_temp <<< "${_pkgver_temp[0]}" -pkgname=forge-server-1.11.2 +_minecraft_ver=${_pkgver_temp[0]} +_minecraft_ver_major=${_minecraft_ver_temp[0]:-0} +_minecraft_ver_minor=${_minecraft_ver_temp[1]:-0} +_minecraft_ver_patch=${_minecraft_ver_temp[2]:-0} +_forge_ver=${_pkgver_temp[1]} + +_pkgver="${_minecraft_ver}-${_forge_ver}" + +[ "$_minecraft_ver" = "$FORGE_SRV_MCVER_LATEST" ] && pkgname="forge-server" || pkgname="forge-server-${_minecraft_ver}" pkgver=${_pkgver//-/_} -pkgrel=3 -pkgdesc="Minecraft Forge server unit files, script, and jar" -arch=('any') -url="https://minecraftforge.net/" -license=('custom') -depends=('java-runtime-headless=8' 'screen' 'sudo' 'bash' 'awk' 'sed') +pkgrel=${_ver_temp[1]} +pkgdesc="Minecraft Forge server unit files, script and jar" +arch=("any") +url="https://minecraftforge.net" +license=("custom") +depends=("java-runtime-headless=8" "screen" "sudo" "bash" "awk" "sed") optdepends=("tar: needed in order to create world backups" "netcat: required in order to suspend an idle server") -backup=("etc/conf.d/${_game}") -install="${pkgname}.install" -source=("${_game}-${_pkgver}-installer.jar"::"https://files.minecraftforge.net/maven/net/minecraftforge/forge/${_pkgver}/forge-${_pkgver}-installer.jar" - "${_game}d-backup.service" - "${_game}d-backup.timer" - "${_game}d.service" - "${_game}d.conf" - "${_game}d.sh" - "LICENSE-fml.txt" - "LICENSE-new.txt" - "MinecraftForge-License.txt") -noextract=("${_game}-${_pkgver}-installer.jar") -sha512sums=('4eef89201fb6f8662912a5ceb3cfaa0c68da6ca874e403b02f40afa7132f48c339815b987dc190903e4053531957c009f46d388b88083f54f349a3dd6ad26b42' - '70d7f3855ada6bd06ed707d99d2bc782c8da2f79d236e4d3e0d95ab12e675c8a39d85cd21df8313cd32b00a0227f020c31ab8f77a572d9cf590cbf75655ee426' +provides=("forge-server=${pkgver}") +conflicts=("forge-server") +backup=("etc/conf.d/forge") +[ "$FORGE_SRV_PKGVER" = "1.11.2_13.20.1.2386-4" ] && install="forge-server.install" || install="forge-server-custom.install" +source=("forged-backup.service" + "forged-backup.timer" + "forged.service" + "forged.conf" + "forged.sh") +noextract=("forge-${_pkgver}.jar") +sha512sums=('e9a391a330320a7aea127a3e8ad399d8d6e3c926eac2c0df7a4e550ba61cc13fec737f7e984bd98b9e1f9f9d5a654ee241eeef6a2e433ec845e300ef29405f62' 'a47b5a9e2262877008a5dcae3a833fe99f911631d6fdbe97b95e0451e1dd2b5a26b6f7b843dd6a8ccd4f663cf5c3bca53a89a1d3aabb363281ab6c6fb19e41a4' - 'e3810d59408b303601c9fae95cafaa140019b214b452d36b0ce6017f5724f3c35d8b7f8c06c2c20118ddffeb7faa70ddea09de62e60ab12ddbc2d9e875a68421' - 'c765776ade02eab1a5b2a56b7848f36b7a2e4523e3e753c9a18223bef7307240d867782aa0a4aca9697efd9615fa48cdb8cafdf86d4e344560128abde30c310f' - 'd92dc4745fd335d4c755c9a672741e3c10582a60cf0c81fa74e2f8ae0377c7310c8787cd11dc15d3667703829f12cd3dd9fd288fc8d047d1037ca2333719f05e' + 'd6bde61a7aa479b85e35b4a3eccb9b3237a6c97f8919b3d704434f1df15672b74c7ae9ca9473eea6a0593e6e80892a2510782115185c1b7fe332720ccb78a7bd' + '6c82f776e337d8c5eca11fea87ce6f6cfe4a5e881db947336d9c8605bd36a4ce0b7b8811e11d79285dd855cd2bdc3f65526b7aaa8d47cb14a7b8cf452462329c' + '2a9a911e9290573718d7cf00a834e4dc0211c63a2de4d132c0b6c418d2616084dee68b934ae6e6554a0f6a037e35620d2df8b8d736acbd2fe8f71e0656c3ea46' + '4eef89201fb6f8662912a5ceb3cfaa0c68da6ca874e403b02f40afa7132f48c339815b987dc190903e4053531957c009f46d388b88083f54f349a3dd6ad26b42' + 'dedd8e121e79bdd39c824a2d4acbc231ae6339cfd29894c4e7299359d23bc92423f4a865865372745be996b0bc14f5777e06baae8b1f4e5c302eadeac5aecf15' + '7f158bed6957e5285ce45a480f6a222065af5427bd48481ef24eb770ff540aa67b2d1c1ed976d216db94323017f7c7ee1dfe16e3f222b14189f9823e0b49f0f3' + '2c9bdefe7d022be139e7aec2e5f1cc1f83ea9d35d2c945e26422e140027b5107ce32c56f0b97e7dbf6b6edb282075df4a18c156a6ed6b064bcb10a3b4481a9aa' '07860198b7d40726e9597f9ac748904a8e27bdcf87151f0b1c8c2ade024ad16aa83d412b70f900a7de3f58773f325ee45eb6c30cb1395e45a4d8092a19b4f845' - '7fe8163f3f1bb86e59508aff851eb571e280da36c24a6faf49ae51d6a000282bac8c388ac1c0c1208220b3f8fb62466285a306213f5a014faa1b619f4c48bf9b' - 'dedd8e121e79bdd39c824a2d4acbc231ae6339cfd29894c4e7299359d23bc92423f4a865865372745be996b0bc14f5777e06baae8b1f4e5c302eadeac5aecf15') + '7fe8163f3f1bb86e59508aff851eb571e280da36c24a6faf49ae51d6a000282bac8c388ac1c0c1208220b3f8fb62466285a306213f5a014faa1b619f4c48bf9b') + +# -- Forge Installer -- # +if [ "$_minecraft_ver_minor" = 7 ]; then + source+=("forge-${_pkgver}-installer.jar"::"https://files.minecraftforge.net/maven/net/minecraftforge/forge/${_pkgver}-${_minecraft_ver}/forge-${_pkgver}-${_minecraft_ver}-installer.jar") +else + source+=("forge-${_pkgver}-installer.jar"::"https://files.minecraftforge.net/maven/net/minecraftforge/forge/${_pkgver}/forge-${_pkgver}-installer.jar") +fi + +[ "$_minecraft_ver_minor" = 5 ] && source+=("https://files.minecraftforge.net/fmllibs/fml_libs15.zip") && noextract+=("fml_libs15.zip") +# -- /Forge Installer -- # + +# -- Licenses -- # +_licenses=() +_license_suffix="-${pkgname}-${_pkgver}.txt" + +if [ "$_minecraft_ver_minor" -ge 9 ]; then + _branch="${_minecraft_ver_major}.${_minecraft_ver_minor}.x" +elif [ "$_minecraft_ver_minor" -ge 7 ]; then + _branch="$_minecraft_ver" +elif [ "$_minecraft_ver_minor" = 6 ]; then + _branch="1.6" +else + _branch="v7.9" +fi + +_add_license() { + _path=$1 + _repo=${2:-MinecraftForge} + _github_branch=${3:-"$_branch"} + _filename="$(basename "$_path")${_license_suffix}" + + _licenses+=("$_filename") + source+=("$_filename"::"https://raw.githubusercontent.com/MinecraftForge/${_repo}/${_github_branch}/${_path}.txt") +} + +if [ "$_minecraft_ver_minor" -ge 13 ]; then + _add_license "LICENSE" +elif [ "$_minecraft_ver_minor" = 12 ]; then + _add_license "LICENSE-Paulscode%20IBXM%20Library" + _add_license "LICENSE-Paulscode%20SoundSystem%20CodecIBXM" + _add_license "LICENSE" +elif [ "$_minecraft_ver_minor" -ge 7 ]; then + _add_license "MinecraftForge-License" + _add_license "Paulscode%20IBXM%20Library%20License" + _add_license "Paulscode%20SoundSystem%20CodecIBXM%20License" + + case "$_minecraft_ver_minor" in + 8) _add_license "LICENSE-fml";; + 7) _add_license "fml/LICENSE-fml";; + *) _add_license "LICENSE-fml" && _add_license "LICENSE-new";; + esac +elif [ "$_minecraft_ver_minor" = 6 ]; then + _add_license "install/MinecraftForge-License" + _add_license "install/Paulscode%20IBXM%20Library%20License" + _add_license "install/Paulscode%20SoundSystem%20CodecIBXM%20License" + _add_license "LICENSE-fml" "FML" "902772ed0cb6c22c4cd7ad9b0ec7a02961b5e016" +else + _add_license "LICENSE-fml" +fi +# -- /Licenses -- # prepare() { - java -jar "${_game}-${_pkgver}-installer.jar" --installServer + [ "$_minecraft_ver_minor" = 10 ] && mkdir mods + [ "$_minecraft_ver_minor" = 5 ] && unzip fml_libs15.zip -d lib + java -jar "forge-${_pkgver}-installer.jar" --installServer } package() { - install -Dm644 "LICENSE-fml.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-fml.txt" - install -Dm644 "LICENSE-new.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-new.txt" - install -Dm644 "MinecraftForge-License.txt" "${pkgdir}/usr/share/licenses/${pkgname}/MinecraftForge-License.txt" - - install -Dm644 "${_game}d.conf" "${pkgdir}/etc/conf.d/${_game}" - install -Dm755 "${_game}d.sh" "${pkgdir}/usr/bin/${_game}d" - install -Dm644 "${_game}d.service" "${pkgdir}/usr/lib/systemd/system/${_game}d.service" - install -Dm644 "${_game}d-backup.service" "${pkgdir}/usr/lib/systemd/system/${_game}d-backup.service" - install -Dm644 "${_game}d-backup.timer" "${pkgdir}/usr/lib/systemd/system/${_game}d-backup.timer" - install -Dm644 "forge-${_pkgver}-universal.jar" "${pkgdir}${_server_root}/${_game}-${_pkgver}.jar" - install -Dm644 "minecraft_server.${_minecraft_ver}.jar" "${pkgdir}${_server_root}/minecraft_server.${_minecraft_ver}.jar" - ln -s "${_game}-${_pkgver}.jar" "${pkgdir}${_server_root}/${_game}.jar" - - # Install libraries - find libraries -type f -print0 | xargs -0 -i@ install -Dm644 '@' "${pkgdir}${_server_root}/@" - - # Link the log files + # Install forged + install -Dm644 "forged-backup.service" "${pkgdir}/usr/lib/systemd/system/forged-backup.service" + install -Dm644 "forged-backup.timer" "${pkgdir}/usr/lib/systemd/system/forged-backup.timer" + install -Dm644 "forged.service" "${pkgdir}/usr/lib/systemd/system/forged.service" + install -Dm644 "forged.conf" "${pkgdir}/etc/conf.d/forge" + install -Dm755 "forged.sh" "${pkgdir}/usr/bin/forged" + + # Install Forge + _forge_jar="forge-${_pkgver}.jar" + [ "$_minecraft_ver_minor" -le 12 ] && _forge_jar="forge-${_pkgver}-universal.jar" + [ "$_minecraft_ver_minor" = 7 ] && _forge_jar="forge-${_pkgver}-${_minecraft_ver}-universal.jar" + [ "$_minecraft_ver_minor" -le 6 ] && _forge_jar="minecraftforge-universal-${_pkgver}.jar" + + install -Dm644 "$_forge_jar" "${pkgdir}/srv/forge/$_forge_jar" + ln -s "$_forge_jar" "${pkgdir}/srv/forge/forge.jar" + find libraries -type f -print0 | xargs -0 -i@ install -Dm644 "@" "${pkgdir}/srv/forge/@" + [ "$_minecraft_ver_minor" = 5 ] && find lib -type f -print0 | xargs -0 -i@ install -Dm644 "@" "${pkgdir}/srv/forge/@" + + # Install Minecraft Server (for 1.12.2 or lower) + if [ "$_minecraft_ver_minor" = 5 ]; then + install -Dm644 "minecraft_server.${_minecraft_ver}.jar" "${pkgdir}/srv/forge/minecraft_server.jar" + elif [ "$_minecraft_ver_minor" -le 12 ]; then + install -Dm644 "minecraft_server.${_minecraft_ver}.jar" "${pkgdir}/srv/forge/minecraft_server.${_minecraft_ver}.jar" + fi + + # Link log files mkdir -p "${pkgdir}/var/log/" - install -dm2755 "${pkgdir}/${_server_root}/logs" - ln -s "${_server_root}/logs" "${pkgdir}/var/log/${_game}" + install -dm2755 "${pkgdir}/srv/forge/logs" + ln -s "/srv/forge/logs" "${pkgdir}/var/log/forge" + + # Install licenses + for _license in "${_licenses[@]}"; do + _filename="$(basename "$_license" "$_license_suffix").txt" + _filename="${_filename//\%20/ }" + install -Dm644 "$_filename" "${pkgdir}/usr/share/licenses/${pkgname}/$_filename" + done - # Give the group write permissions and set user or group ID on execution - chmod g+ws "${pkgdir}${_server_root}" + chmod g+ws "${pkgdir}/srv/forge" } diff --git a/forge-server-1.11.2.install b/forge-server-1.11.2.install deleted file mode 100644 index 5856c930e774..000000000000 --- a/forge-server-1.11.2.install +++ /dev/null @@ -1,35 +0,0 @@ -_game="forge-1.11.2" -_user="forge-1-11-2" -_server_root="/srv/forge-1.11.2" - -post_install() { - getent group "${_user}" &>/dev/null - if [ $? -ne 0 ]; then - echo "Adding ${_user} system group..." - groupadd -r ${_user} 1>/dev/null - fi - - getent passwd "${_user}" &>/dev/null - if [ $? -ne 0 ]; then - echo "Adding ${_user} system user..." - useradd -r -g ${_user} -d "${_server_root}" ${_user} 1>/dev/null - fi - - chown -R ${_user}:${_user} "${_server_root}" - - echo "The world data is stored under ${_server_root} and the server runs as ${_user} user to increase security." - echo "Use the ${_game} script under /usr/bin/${_game}d to start, stop or backup the server." - echo "Adjust the configuration file under /etc/conf.d/${_game} to your liking." - echo "For the server to start you have to accept the EULA in ${_server_root}/eula.txt !" - echo "The EULA file is generated after the first server start." -} - -post_upgrade() { - chown -R ${_user}:${_user} "${_server_root}" -} - -post_remove() { - # Notifying the user of kept dirs - [[ -d "${_server_root}" ]] && echo "Game saves in ${_server_root} were kept on your system." - echo "The ${_user} user was preserved on your system." -} diff --git a/forge-server.install b/forge-server.install new file mode 100644 index 000000000000..43347ea8b4a0 --- /dev/null +++ b/forge-server.install @@ -0,0 +1,55 @@ +_good_ver="1.11.2_13.20.1.2386-4" + +post_install() { + if ! getent group "forge" &>/dev/null; then + echo "Adding forge system group..." + groupadd -r forge 1>/dev/null + fi + + if ! getent passwd "forge" &>/dev/null; then + echo "Adding forge system user..." + useradd -r -g forge -d /srv/forge forge 1>/dev/null + fi + + chown -R forge:forge /srv/forge + + echo "The world data is stored under /srv/forge and the server runs as the forge user to increase security." + echo "Use the forged script under /usr/bin/forged to start, stop or backup the server." + echo "Adjust the configuration file under /etc/conf.d/forge to your liking." + echo "Make sure to change the SERVER_START_CMD variable if you want to use a JVM other than OpenJDK 8." + echo "Please note that you need Java 8 in order to run Forge." + echo "For the server to start you have to accept the EULA in /srv/forge/eula.txt!" + echo "The EULA file is generated after the first server start." +} + +post_upgrade() { + if [ "$(vercmp "$2" "$_good_ver")" -lt 0 ]; then + post_install + + IFS="_" read -ra _good_ver_temp <<< "$_good_ver" + _minecraft_ver=${_good_ver_temp[0]} + _old_name="forge-${_minecraft_ver}" + + echo "==> NOTICE: All filenames have been changed from \"${_old_name}d\" to \"forged\"!" + echo "==> For example:" + echo "==> /usr/lib/systemd/system/${_old_name}d.service -> /usr/lib/systemd/system/forged.service" + echo "==> /usr/bin/${_old_name}d -> /usr/bin/forged" + echo "==> /srv/${_old_name} -> /srv/forge" + + if [ -d "/srv/${_old_name}" ]; then + find "/srv/${_old_name}" -mindepth 1 -maxdepth 1 | while read -r _file; do + mv "$_file" "/srv/forge${_file#"/srv/${_old_name}"}" + done + rm -rf "/srv/${_old_name}" + echo "==> Game saves in /srv/${_old_name} were moved to /srv/forge." + fi + + echo "==> The ${_old_name//./-} user was preserved on your system." + fi + chown -R forge:forge /srv/forge +} + +post_remove() { + [ -d "/srv/forge" ] && echo "Game saves in /srv/forge were kept on your system." + echo "The forge user was preserved on your system." +} diff --git a/forge-1.11.2d-backup.service b/forged-backup.service index 1ae94ae4e139..d4bc5a9f0fc5 100644 --- a/forge-1.11.2d-backup.service +++ b/forged-backup.service @@ -4,9 +4,9 @@ After=local-fs.target [Service] Type=forking -ExecStart=/usr/bin/forge-1.11.2d backup -User=forge-1-11-2 -Group=forge-1-11-2 +ExecStart=/usr/bin/forged backup +User=forge +Group=forge [Install] WantedBy=multi-user.target diff --git a/forge-1.11.2d-backup.timer b/forged-backup.timer index 882aa3bcbcd3..882aa3bcbcd3 100644 --- a/forge-1.11.2d-backup.timer +++ b/forged-backup.timer diff --git a/forge-1.11.2d.conf b/forged.conf index 44004dde9293..50b475e4ab09 100644 --- a/forge-1.11.2d.conf +++ b/forged.conf @@ -2,19 +2,19 @@ # Variables are interpreted in bash. Simply using bash-syntax is sufficient. # General parameters -SERVER_ROOT="/srv/forge-1.11.2" -BACKUP_DEST="/srv/forge-1.11.2/backup" +SERVER_ROOT="/srv/forge" +BACKUP_DEST="/srv/forge/backup" BACKUP_PATHS="world" # World paths separated by spaces relative to SERVER_ROOT KEEP_BACKUPS="10" -GAME_USER="forge-1-11-2" -MAIN_EXECUTABLE="forge-1.11.2.jar" -SESSION_NAME="forge-1.11.2" +GAME_USER="forge" +MAIN_EXECUTABLE="forge.jar" +SESSION_NAME="forge" # System parameters for java # -Xms sets the intial heap size (must be a multiple of 1024 and greater than 2MB, no spaces!) # -Xmx sets the maximum heap size (must be a multiple of 1024 and greater than 2MB, no spaces!) # -XX:ParallelGCThreads defines the number of threads the server may use -SERVER_START_CMD="java -Xms512M -Xmx1024M -XX:ParallelGCThreads=1 -jar './${MAIN_EXECUTABLE}' nogui" +SERVER_START_CMD="/usr/lib/jvm/java-8-openjdk/jre/bin/java -Xms512M -Xmx1024M -XX:ParallelGCThreads=1 -jar './${MAIN_EXECUTABLE}' nogui" # System parameters for the actual game server # Describes whether a daemon process which stops the server if it is not used by a player diff --git a/forge-1.11.2d.service b/forged.service index c40262f97a7f..091d37b68866 100644 --- a/forge-1.11.2d.service +++ b/forged.service @@ -4,10 +4,10 @@ After=local-fs.target network.target multi-user.target [Service] Type=forking -ExecStart=/usr/bin/forge-1.11.2d start -ExecStop=/usr/bin/forge-1.11.2d stop -User=forge-1-11-2 -Group=forge-1-11-2 +ExecStart=/usr/bin/forged start +ExecStop=/usr/bin/forged stop +User=forge +Group=forge [Install] WantedBy=multi-user.target diff --git a/forge-1.11.2d.sh b/forged.sh index 222a01ce3f2b..a7e1be5c0fe3 100755 --- a/forge-1.11.2d.sh +++ b/forged.sh @@ -1,8 +1,8 @@ #!/bin/bash # The actual program name -declare -r myname="forge-1.11.2d" -declare -r game="forge-1.11.2" +declare -r myname="forged" +declare -r game="forge" # General rule for the variable-naming-schema: # Variables in capital letters may be passed through the command line others not. @@ -13,12 +13,12 @@ declare -r game="forge-1.11.2" [[ -n "${BACKUP_DEST}" ]] && declare -r BACKUP_DEST=${BACKUP_DEST} || BACKUP_DEST="/srv/${game}/backup" [[ -n "${BACKUP_PATHS}" ]] && declare -r BACKUP_PATHS=${BACKUP_PATHS} || BACKUP_PATHS="world" [[ -n "${KEEP_BACKUPS}" ]] && declare -r KEEP_BACKUPS=${KEEP_BACKUPS} || KEEP_BACKUPS="10" -[[ -n "${GAME_USER}" ]] && declare -r GAME_USER=${GAME_USER} || GAME_USER="forge-1-11-2" -[[ -n "${MAIN_EXECUTABLE}" ]] && declare -r MAIN_EXECUTABLE=${MAIN_EXECUTABLE} || MAIN_EXECUTABLE="forge-1.11.2.jar" +[[ -n "${GAME_USER}" ]] && declare -r GAME_USER=${GAME_USER} || GAME_USER="forge" +[[ -n "${MAIN_EXECUTABLE}" ]] && declare -r MAIN_EXECUTABLE=${MAIN_EXECUTABLE} || MAIN_EXECUTABLE="forge.jar" [[ -n "${SESSION_NAME}" ]] && declare -r SESSION_NAME=${SESSION_NAME} || SESSION_NAME="${game}" # Command and parameter declaration with which to start the server -[[ -n "${SERVER_START_CMD}" ]] && declare -r SERVER_START_CMD=${SERVER_START_CMD} || SERVER_START_CMD="java -Xms512M -Xmx1024M -XX:ParallelGCThreads=1 -jar './${MAIN_EXECUTABLE}' nogui" +[[ -n "${SERVER_START_CMD}" ]] && declare -r SERVER_START_CMD=${SERVER_START_CMD} || SERVER_START_CMD="/usr/lib/jvm/java-8-openjdk/jre/bin/java -Xms512M -Xmx1024M -XX:ParallelGCThreads=1 -jar './${MAIN_EXECUTABLE}' nogui" # System parameters for the control script [[ -n "${IDLE_SERVER}" ]] && tmp_IDLE_SERVER=${IDLE_SERVER} || IDLE_SERVER="false" @@ -30,6 +30,7 @@ declare -r game="forge-1.11.2" # Additional configuration options which only few may need to alter [[ -n "${GAME_COMMAND_DUMP}" ]] && declare -r GAME_COMMAND_DUMP=${GAME_COMMAND_DUMP} || GAME_COMMAND_DUMP="/tmp/${myname}_${SESSION_NAME}_command_dump.txt" +# shellcheck source=forged.conf # Variables passed over the command line will always override the one from a config file source /etc/conf.d/"${game}" 2>/dev/null || >&2 echo "Could not source /etc/conf.d/${game}" @@ -83,10 +84,10 @@ game_command() { is_player_online() { response="$(sleep_time=0.6 return_stdout=true game_command list)" # Delete leading line and free response string from fancy characters - response="$(echo "${response}" | sed -r -e '$!d' -e 's/\x1B\[([0-9]{1,2}(;[0-9]{1,2})*)?[JKmsuG]//g')" + response="$(echo "${response}" | sed -r -e 's/\x1B\[([0-9]{1,2}(;[0-9]{1,2})*)?[JKmsuG]//g')" # The list command prints a line containing the usernames after the last occurrence of ": " # and since playernames may not contain this string the clean player-list can easily be retrieved. - # Otherwiese check the first digit after the last occurrence of "There are". If it is 0 then there + # Otherwise check the first digit after the last occurrence of "There are". If it is 0 then there # are no players on the server. Should this test fail as well. Assume that a player is online. if [[ $(echo "${response}" | grep ":" | sed -e 's/.*\: //' | tr -d '\n' | wc -c) -le 1 ]]; then # No player is online @@ -189,7 +190,7 @@ server_start() { sleep 0.1 done else - echo -en "Starting idle server daeomon..." + echo -en "Starting idle server daemon..." ${SUDO_CMD} screen -dmS "${IDLE_SESSION_NAME}" /bin/bash -c "${myname} idle_server_daemon" echo -e "\e[39;1m done\e[0m" fi @@ -473,7 +474,7 @@ case "${1:-}" in ;; idle_server_daemon) - # This shell be a hidden function which should only be invoced internally + # This shall be a hidden function which should only be invoced internally idle_server_daemon ;; |