diff --git a/CREDITS b/CREDITS deleted file mode 100644 index 7643da2..0000000 --- a/CREDITS +++ /dev/null @@ -1,55 +0,0 @@ -## module-spongemixins - -Source: https://github.com/GTNewHorizons/GTNHMixins/tree/73e389805d2343e7a000f40879dbe232e53c08f1 - -Classes used: - -ru.timeconqueror.spongemixins.* -com.gtnewhorizon.gtnhmixins.GTNHMixins (modified to not have @Mod annotation) - -License: LGPL3 (see LICENSE.LGPLv3) - - -## module-gtnhmixins - -Source: https://github.com/GTNewHorizons/GTNHMixins/tree/73e389805d2343e7a000f40879dbe232e53c08f1 - -Classes used: - -com.gtnewhorizon.gtnhmixins.* - -Modifications: -- removed Mixin environment initialization in GTNHMixinsCore -- added Mixin 0.7 support - - made MixinExtras initialization get suppressed if Mixin version is below 0.8.5 - - made reflection support Mixin 0.7.11 - -License: LGPL3 (see LICENSE.LGPLv3) - - -## module-mixingasm - -Source: https://github.com/makamys/Mixingasm/tree/v0.2.2 - -Classes used: - -* - -Modifications: -- removed update check in MixingasmMod - -License: Unlicense (see LICENSE.UNLICENSE) - -## module-mixinbooterlegacy - -Source: https://github.com/tox1cozZ/mixin-booter-legacy/tree/1.2.0 - -Classes used: - -* - -Modifications: -- Replaced mod container with a @Mod annotation -- Changed shaded ASM package name to legacy one - -License: LGPL 2.1 (see LICENSE.LGPLv2.1) diff --git a/LICENSE b/LICENSE index 6fd6117..d3a9ad1 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,3 @@ -The project as a whole is licensed under the GNU LGPL v3, as specified in -LICENSE.LGPLv3. - -See CREDITS for a full list of projects UniMixins borrows code from and -their respective licenses. +UniMixins is licensed under the Unlicense, as specified in LICENSE.UNLICENSE, +with the exception of some modules, which are licensed under different terms. +See CREDITS for a full list of these. diff --git a/README.md b/README.md index 002a6c0..5e4551a 100644 --- a/README.md +++ b/README.md @@ -95,4 +95,4 @@ A rough roadmap of the project is available [here](https://gist.github.com/makam ## License -UniMixins is licensed under the LGPL v3. See [LICENSE](LICENSE) for the full details. +UniMixins is licensed under the Unlicense, with the exception of some modules. See [LICENSE](LICENSE) for the full details. diff --git a/build.gradle b/build.gradle index 380b563..4a16ba2 100644 --- a/build.gradle +++ b/build.gradle @@ -42,4 +42,16 @@ allprojects { artifacts { archives sourcesJar } + + // Put license, credits and readme in jar + + delete "$projectDir/build/tmp/license" + + copy { + from "$projectDir" + into "$projectDir/build/tmp/license" + include "CREDITS", "LICENSE", "README*" + } + + sourceSets.main.resources.srcDir("build/tmp/license") } diff --git a/module-all/build.gradle b/module-all/build.gradle index fa169a7..c97cd9f 100644 --- a/module-all/build.gradle +++ b/module-all/build.gradle @@ -3,8 +3,12 @@ archivesBaseName = archivesBaseName.replace("-1.7.10", "-all-1.7.10") // The order of these determines the order embedded core plugins get initialized in ext.moduleNames = ["module-mixin", "module-compat", "module-mixingasm", "module-spongemixins", "module-mixinbooterlegacy", "module-gtnhmixins"] +def getModuleJar(name) { + return tasks.getByPath(":$name:jar").getOutputs().getFiles().getSingleFile() +} + def getModuleJars() { - return moduleNames.collect { it -> tasks.getByPath(":$it:jar").getOutputs().getFiles().getSingleFile() } + return moduleNames.collect { getModuleJar(it) } } import java.util.jar.Manifest; @@ -56,10 +60,19 @@ jar { dependsOn tasks.createMergedMcmodInfo dependsOn tasks.createEmbeddedCorePluginsFile - getModuleJars().each { - j -> from zipTree(j).matching { + moduleNames.each { + def name = it + def j = getModuleJar(it) + into "" + from(zipTree(j)){ exclude 'mcmod.info' exclude 'META-INF/MANIFEST.MF' + exclude 'CREDITS', 'LICENSE*', 'README*' + into("") + } + from(zipTree(j)){ + include 'CREDITS', 'LICENSE*', 'README*' + into("META-INF/licenses/$name") } } diff --git a/module-all/src/main/resources/CREDITS b/module-all/src/main/resources/CREDITS new file mode 100644 index 0000000..69eb9b3 --- /dev/null +++ b/module-all/src/main/resources/CREDITS @@ -0,0 +1,5 @@ +This jar is a composite of multiple modules which are licensed under different +terms. + +The license of each module can be found in META-INF/licenses/module-* + diff --git a/module-compat/LICENSE b/module-compat/LICENSE new file mode 100644 index 0000000..68a49da --- /dev/null +++ b/module-compat/LICENSE @@ -0,0 +1,24 @@ +This is free and unencumbered software released into the public domain. + +Anyone is free to copy, modify, publish, use, compile, sell, or +distribute this software, either in source code form or as a compiled +binary, for any purpose, commercial or non-commercial, and by any +means. + +In jurisdictions that recognize copyright laws, the author or authors +of this software dedicate any and all copyright interest in the +software to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and +successors. We intend this dedication to be an overt act of +relinquishment in perpetuity of all present and future rights to this +software under copyright law. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +For more information, please refer to diff --git a/module-gtnhmixins/CREDITS b/module-gtnhmixins/CREDITS new file mode 100644 index 0000000..f5879b1 --- /dev/null +++ b/module-gtnhmixins/CREDITS @@ -0,0 +1,13 @@ +Source: https://github.com/GTNewHorizons/GTNHMixins/tree/73e389805d2343e7a000f40879dbe232e53c08f1 + +Classes used: + +com.gtnewhorizon.gtnhmixins.* + +Modifications: +- removed Mixin environment initialization in GTNHMixinsCore +- added Mixin 0.7 support + - made MixinExtras initialization get suppressed if Mixin version is below 0.8.5 + - made reflection support Mixin 0.7.11 + +License: LGPL3 (see LICENSE) diff --git a/LICENSE.LGPLv3 b/module-gtnhmixins/LICENSE similarity index 100% rename from LICENSE.LGPLv3 rename to module-gtnhmixins/LICENSE diff --git a/module-mixin/build.gradle b/module-mixin/build.gradle index dddd172..2b088c4 100644 --- a/module-mixin/build.gradle +++ b/module-mixin/build.gradle @@ -117,8 +117,7 @@ if(mixinSource == "fabric" || mixinSource == "spongepowered" || mixinSource == " exclude 'META-INF/services/cpw.mods.modlauncher.serviceapi.ILaunchPluginService' // Exclude jar-specific stuff - - exclude 'LICENSE.txt' + exclude 'META-INF/MUMFREY*' } diff --git a/module-mixinbooterlegacy/CREDITS b/module-mixinbooterlegacy/CREDITS new file mode 100644 index 0000000..04bbf01 --- /dev/null +++ b/module-mixinbooterlegacy/CREDITS @@ -0,0 +1,11 @@ +Source: https://github.com/tox1cozZ/mixin-booter-legacy/tree/1.2.0 + +Classes used: + +* + +Modifications: +- Replaced mod container with a @Mod annotation +- Changed shaded ASM package name to legacy one + +License: LGPL 2.1 (see LICENSE) diff --git a/LICENSE.LGPLv2.1 b/module-mixinbooterlegacy/LICENSE similarity index 100% rename from LICENSE.LGPLv2.1 rename to module-mixinbooterlegacy/LICENSE diff --git a/module-mixingasm/CREDITS b/module-mixingasm/CREDITS new file mode 100644 index 0000000..98cf58f --- /dev/null +++ b/module-mixingasm/CREDITS @@ -0,0 +1,10 @@ +Source: https://github.com/makamys/Mixingasm/tree/v0.2.2 + +Classes used: + +* + +Modifications: +- removed update check in MixingasmMod + +License: Unlicense (see LICENSE) diff --git a/module-mixingasm/LICENSE b/module-mixingasm/LICENSE new file mode 100644 index 0000000..68a49da --- /dev/null +++ b/module-mixingasm/LICENSE @@ -0,0 +1,24 @@ +This is free and unencumbered software released into the public domain. + +Anyone is free to copy, modify, publish, use, compile, sell, or +distribute this software, either in source code form or as a compiled +binary, for any purpose, commercial or non-commercial, and by any +means. + +In jurisdictions that recognize copyright laws, the author or authors +of this software dedicate any and all copyright interest in the +software to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and +successors. We intend this dedication to be an overt act of +relinquishment in perpetuity of all present and future rights to this +software under copyright law. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +For more information, please refer to diff --git a/module-mixingasm/licensee/CREDITS b/module-mixingasm/licensee/CREDITS new file mode 100644 index 0000000..98cf58f --- /dev/null +++ b/module-mixingasm/licensee/CREDITS @@ -0,0 +1,10 @@ +Source: https://github.com/makamys/Mixingasm/tree/v0.2.2 + +Classes used: + +* + +Modifications: +- removed update check in MixingasmMod + +License: Unlicense (see LICENSE) diff --git a/module-mixingasm/licensee/UNLICENSE b/module-mixingasm/licensee/UNLICENSE new file mode 100644 index 0000000..68a49da --- /dev/null +++ b/module-mixingasm/licensee/UNLICENSE @@ -0,0 +1,24 @@ +This is free and unencumbered software released into the public domain. + +Anyone is free to copy, modify, publish, use, compile, sell, or +distribute this software, either in source code form or as a compiled +binary, for any purpose, commercial or non-commercial, and by any +means. + +In jurisdictions that recognize copyright laws, the author or authors +of this software dedicate any and all copyright interest in the +software to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and +successors. We intend this dedication to be an overt act of +relinquishment in perpetuity of all present and future rights to this +software under copyright law. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +For more information, please refer to diff --git a/module-spongemixins/CREDITS b/module-spongemixins/CREDITS new file mode 100644 index 0000000..0a1e14f --- /dev/null +++ b/module-spongemixins/CREDITS @@ -0,0 +1,8 @@ +Source: https://github.com/GTNewHorizons/GTNHMixins/tree/73e389805d2343e7a000f40879dbe232e53c08f1 + +Classes used: + +ru.timeconqueror.spongemixins.* +com.gtnewhorizon.gtnhmixins.GTNHMixins (modified to not have @Mod annotation) + +License: LGPL3 (see LICENSE) diff --git a/module-spongemixins/LICENSE b/module-spongemixins/LICENSE new file mode 100644 index 0000000..02bbb60 --- /dev/null +++ b/module-spongemixins/LICENSE @@ -0,0 +1,165 @@ + GNU LESSER 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. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + 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 that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU 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 as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. \ No newline at end of file