diff --git a/src/main/resources/assets/joymod/LICENSE b/src/main/resources/assets/joymod/LICENSE index 5d72aad..2c66ec6 100644 --- a/src/main/resources/assets/joymod/LICENSE +++ b/src/main/resources/assets/joymod/LICENSE @@ -1,4 +1,4 @@ -Attribution-NonCommercial-ShareAlike 4.0 International +Attribution-ShareAlike 4.0 International ======================================================================= @@ -54,18 +54,18 @@ exhaustive, and do not form part of our licenses. ======================================================================= -Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International -Public License +Creative Commons Attribution-ShareAlike 4.0 International Public +License By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons -Attribution-NonCommercial-ShareAlike 4.0 International Public License -("Public License"). To the extent this Public License may be -interpreted as a contract, You are granted the Licensed Rights in -consideration of Your acceptance of these terms and conditions, and the -Licensor grants You such rights in consideration of benefits the -Licensor receives from making the Licensed Material available under -these terms and conditions. +Attribution-ShareAlike 4.0 International Public License ("Public +License"). To the extent this Public License may be interpreted as a +contract, You are granted the Licensed Rights in consideration of Your +acceptance of these terms and conditions, and the Licensor grants You +such rights in consideration of benefits the Licensor receives from +making the Licensed Material available under these terms and +conditions. Section 1 -- Definitions. @@ -84,7 +84,7 @@ Section 1 -- Definitions. and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License. - c. BY-NC-SA Compatible License means a license listed at + c. BY-SA Compatible License means a license listed at creativecommons.org/compatiblelicenses, approved by Creative Commons as essentially the equivalent of this Public License. @@ -108,7 +108,7 @@ Section 1 -- Definitions. g. License Elements means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this - Public License are Attribution, NonCommercial, and ShareAlike. + Public License are Attribution and ShareAlike. h. Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public @@ -122,15 +122,7 @@ Section 1 -- Definitions. j. Licensor means the individual(s) or entity(ies) granting rights under this Public License. - k. NonCommercial means not primarily intended for or directed towards - commercial advantage or monetary compensation. For purposes of - this Public License, the exchange of the Licensed Material for - other material subject to Copyright and Similar Rights by digital - file-sharing or similar means is NonCommercial provided there is - no payment of monetary compensation in connection with the - exchange. - - l. Share means to provide material to the public by any means or + k. Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material @@ -138,13 +130,13 @@ Section 1 -- Definitions. public may access the material from a place and at a time individually chosen by them. - m. Sui Generis Database Rights means rights other than copyright + l. Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world. - n. You means the individual or entity exercising the Licensed Rights + m. You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning. @@ -158,10 +150,9 @@ Section 2 -- Scope. exercise the Licensed Rights in the Licensed Material to: a. reproduce and Share the Licensed Material, in whole or - in part, for NonCommercial purposes only; and + in part; and - b. produce, reproduce, and Share Adapted Material for - NonCommercial purposes only. + b. produce, reproduce, and Share Adapted Material. 2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public @@ -229,9 +220,7 @@ Section 2 -- Scope. Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly - reserves any right to collect such royalties, including when - the Licensed Material is used other than for NonCommercial - purposes. + reserves any right to collect such royalties. Section 3 -- License Conditions. @@ -276,6 +265,7 @@ following conditions. reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information. + 3. If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable. @@ -287,7 +277,7 @@ following conditions. 1. The Adapter's License You apply must be a Creative Commons license with the same License Elements, this version or - later, or a BY-NC-SA Compatible License. + later, or a BY-SA Compatible License. 2. You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition @@ -307,8 +297,7 @@ apply to Your use of the Licensed Material: a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial - portion of the contents of the database for NonCommercial purposes - only; + portion of the contents of the database; b. if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database @@ -415,9 +404,24 @@ Section 8 -- Interpretation. that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority. + ======================================================================= Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances -will be considered the “Licensor.” The +will be considered the “Licensor.” The text of the Creative Commons +public licenses is dedicated to the public domain under the CC0 Public +Domain Dedication. Except for the limited purpose of indicating that +material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the +public licenses. + +Creative Commons may be contacted at creativecommons.org. \ No newline at end of file diff --git a/src/main/resources/assets/joymod/LICENSE-MUSIC b/src/main/resources/assets/joymod/LICENSE-MUSIC new file mode 100644 index 0000000..d495cca --- /dev/null +++ b/src/main/resources/assets/joymod/LICENSE-MUSIC @@ -0,0 +1,7 @@ +The soundtrack for Joy are created by WorldWidePixel. + +Pridecraft Studios has full rights to use and profit off this music for any work created that may use this music, as authorised by WorldWidePixel. + +This music is not free, please contact WorldWidePixel for licensing, @worldwidepixel on Discord. + +Copyright (c) (2024 -) WorldWidePixel, All Rights Reserved. \ No newline at end of file diff --git a/src/main/resources/assets/joymod/icon-release.png b/src/main/resources/assets/joymod/icon-release.png new file mode 100644 index 0000000..a26e959 Binary files /dev/null and b/src/main/resources/assets/joymod/icon-release.png differ diff --git a/src/main/resources/assets/minecraft/textures/gui/title/background/panorama_0.png b/src/main/resources/assets/minecraft/textures/gui/title/background/panorama_0.png index 8f0ca74..7707d8e 100644 Binary files a/src/main/resources/assets/minecraft/textures/gui/title/background/panorama_0.png and b/src/main/resources/assets/minecraft/textures/gui/title/background/panorama_0.png differ diff --git a/src/main/resources/assets/minecraft/textures/gui/title/background/panorama_1.png b/src/main/resources/assets/minecraft/textures/gui/title/background/panorama_1.png index 19e3576..9ef1a9b 100644 Binary files a/src/main/resources/assets/minecraft/textures/gui/title/background/panorama_1.png and b/src/main/resources/assets/minecraft/textures/gui/title/background/panorama_1.png differ diff --git a/src/main/resources/assets/minecraft/textures/gui/title/background/panorama_2.png b/src/main/resources/assets/minecraft/textures/gui/title/background/panorama_2.png index aa3a51f..cbaac51 100644 Binary files a/src/main/resources/assets/minecraft/textures/gui/title/background/panorama_2.png and b/src/main/resources/assets/minecraft/textures/gui/title/background/panorama_2.png differ diff --git a/src/main/resources/assets/minecraft/textures/gui/title/background/panorama_3.png b/src/main/resources/assets/minecraft/textures/gui/title/background/panorama_3.png index 1b2b4d2..8aea367 100644 Binary files a/src/main/resources/assets/minecraft/textures/gui/title/background/panorama_3.png and b/src/main/resources/assets/minecraft/textures/gui/title/background/panorama_3.png differ diff --git a/src/main/resources/assets/minecraft/textures/gui/title/background/panorama_4.png b/src/main/resources/assets/minecraft/textures/gui/title/background/panorama_4.png index f0e7446..2adc5ae 100644 Binary files a/src/main/resources/assets/minecraft/textures/gui/title/background/panorama_4.png and b/src/main/resources/assets/minecraft/textures/gui/title/background/panorama_4.png differ diff --git a/src/main/resources/assets/minecraft/textures/gui/title/background/panorama_5.png b/src/main/resources/assets/minecraft/textures/gui/title/background/panorama_5.png index 7efaab8..c29c295 100644 Binary files a/src/main/resources/assets/minecraft/textures/gui/title/background/panorama_5.png and b/src/main/resources/assets/minecraft/textures/gui/title/background/panorama_5.png differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index ecf4681..8c494b9 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -2,7 +2,7 @@ "schemaVersion": 1, "id": "joymod", "version": "${version}", - "name": "JoyMod", + "name": "Joy", "description": "This is an LGBT pride-themed Fabric mod made by Pridecraft Studios.", "authors": [ "Pridecraft Studios", "Wolren", "Blurryface", "Sake", "Ampflower", "UnlikePaladin"