diff --git a/LICENSE b/LICENSE index 0e259d4..0a04128 100644 --- a/LICENSE +++ b/LICENSE @@ -1,121 +1,165 @@ -Creative Commons Legal Code + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 -CC0 1.0 Universal + 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. - CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE - LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN - ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS - INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES - REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS - PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM - THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED - HEREUNDER. -Statement of Purpose + 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. -The laws of most jurisdictions throughout the world automatically confer -exclusive Copyright and Related Rights (defined below) upon the creator -and subsequent owner(s) (each and all, an "owner") of an original work of -authorship and/or a database (each, a "Work"). + 0. Additional Definitions. -Certain owners wish to permanently relinquish those rights to a Work for -the purpose of contributing to a commons of creative, cultural and -scientific works ("Commons") that the public can reliably and without fear -of later claims of infringement build upon, modify, incorporate in other -works, reuse and redistribute as freely as possible in any form whatsoever -and for any purposes, including without limitation commercial purposes. -These owners may contribute to the Commons to promote the ideal of a free -culture and the further production of creative, cultural and scientific -works, or to gain reputation or greater distribution for their Work in -part through the use and efforts of others. + 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. -For these and/or other purposes and motivations, and without any -expectation of additional consideration or compensation, the person -associating CC0 with a Work (the "Affirmer"), to the extent that he or she -is an owner of Copyright and Related Rights in the Work, voluntarily -elects to apply CC0 to the Work and publicly distribute the Work under its -terms, with knowledge of his or her Copyright and Related Rights in the -Work and the meaning and intended legal effect of CC0 on those rights. + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. -1. Copyright and Related Rights. A Work made available under CC0 may be -protected by copyright and related or neighboring rights ("Copyright and -Related Rights"). Copyright and Related Rights include, but are not -limited to, the following: + 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. - i. the right to reproduce, adapt, distribute, perform, display, - communicate, and translate a Work; - ii. moral rights retained by the original author(s) and/or performer(s); -iii. publicity and privacy rights pertaining to a person's image or - likeness depicted in a Work; - iv. rights protecting against unfair competition in regards to a Work, - subject to the limitations in paragraph 4(a), below; - v. rights protecting the extraction, dissemination, use and reuse of data - in a Work; - vi. database rights (such as those arising under Directive 96/9/EC of the - European Parliament and of the Council of 11 March 1996 on the legal - protection of databases, and under any national implementation - thereof, including any amended or successor version of such - directive); and -vii. other similar, equivalent or corresponding rights throughout the - world based on applicable law or treaty, and any national - implementations thereof. + 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". -2. Waiver. To the greatest extent permitted by, but not in contravention -of, applicable law, Affirmer hereby overtly, fully, permanently, -irrevocably and unconditionally waives, abandons, and surrenders all of -Affirmer's Copyright and Related Rights and associated claims and causes -of action, whether now known or unknown (including existing as well as -future claims and causes of action), in the Work (i) in all territories -worldwide, (ii) for the maximum duration provided by applicable law or -treaty (including future time extensions), (iii) in any current or future -medium and for any number of copies, and (iv) for any purpose whatsoever, -including without limitation commercial, advertising or promotional -purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each -member of the public at large and to the detriment of Affirmer's heirs and -successors, fully intending that such Waiver shall not be subject to -revocation, rescission, cancellation, termination, or any other legal or -equitable action to disrupt the quiet enjoyment of the Work by the public -as contemplated by Affirmer's express Statement of Purpose. + 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. -3. Public License Fallback. Should any part of the Waiver for any reason -be judged legally invalid or ineffective under applicable law, then the -Waiver shall be preserved to the maximum extent permitted taking into -account Affirmer's express Statement of Purpose. In addition, to the -extent the Waiver is so judged Affirmer hereby grants to each affected -person a royalty-free, non transferable, non sublicensable, non exclusive, -irrevocable and unconditional license to exercise Affirmer's Copyright and -Related Rights in the Work (i) in all territories worldwide, (ii) for the -maximum duration provided by applicable law or treaty (including future -time extensions), (iii) in any current or future medium and for any number -of copies, and (iv) for any purpose whatsoever, including without -limitation commercial, advertising or promotional purposes (the -"License"). The License shall be deemed effective as of the date CC0 was -applied by Affirmer to the Work. Should any part of the License for any -reason be judged legally invalid or ineffective under applicable law, such -partial invalidity or ineffectiveness shall not invalidate the remainder -of the License, and in such case Affirmer hereby affirms that he or she -will not (i) exercise any of his or her remaining Copyright and Related -Rights in the Work or (ii) assert any associated claims and causes of -action with respect to the Work, in either case contrary to Affirmer's -express Statement of Purpose. + 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. -4. Limitations and Disclaimers. + 1. Exception to Section 3 of the GNU GPL. - a. No trademark or patent rights held by Affirmer are waived, abandoned, - surrendered, licensed or otherwise affected by this document. - b. Affirmer offers the Work as-is and makes no representations or - warranties of any kind concerning the Work, express, implied, - statutory or otherwise, including without limitation warranties of - title, merchantability, fitness for a particular purpose, non - infringement, or the absence of latent or other defects, accuracy, or - the present or absence of errors, whether or not discoverable, all to - the greatest extent permissible under applicable law. - c. Affirmer disclaims responsibility for clearing rights of other persons - that may apply to the Work or any use thereof, including without - limitation any person's Copyright and Related Rights in the Work. - Further, Affirmer disclaims responsibility for obtaining any necessary - consents, permissions or other rights required for any use of the - Work. - d. Affirmer understands and acknowledges that Creative Commons is not a - party to this document and has no duty or obligation with respect to - this CC0 or use of the Work. + 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. diff --git a/src/main/java/me/jonasjones/nec/item/ModItems.java b/src/main/java/me/jonasjones/nec/item/ModItems.java index 95c5156..35bb46b 100644 --- a/src/main/java/me/jonasjones/nec/item/ModItems.java +++ b/src/main/java/me/jonasjones/nec/item/ModItems.java @@ -19,6 +19,7 @@ public class ModItems { private static Item LETTER_ITEM; private static Item CHAINMAIL_ITEM; private static Item AK47_ITEM; + private static Item HELMET_ON_A_STICK_ITEM; public static void register() { TieredItem DIRT_SWORD = new SwordItem(DirtToolMaterial.INSTANCE, 1, -3.0F, new Item.Properties()); @@ -44,5 +45,9 @@ public class ModItems { Item AK47 = new Item(new FabricItemSettings()); AK47_ITEM = Registry.register(ITEM, new ResourceLocation(MOD_ID, "ak_47"), AK47); ModRegistries.register_item(AK47_ITEM); + + Item HELMET_ON_A_STICK = new Item(new FabricItemSettings()); + HELMET_ON_A_STICK_ITEM = Registry.register(ITEM, new ResourceLocation(MOD_ID, "helmet_on_a_stick"), HELMET_ON_A_STICK); + ModRegistries.register_item(HELMET_ON_A_STICK_ITEM); } } diff --git a/src/main/resources/assets/nec/lang/en_us.json b/src/main/resources/assets/nec/lang/en_us.json index 4e8b8c1..c43e79f 100644 --- a/src/main/resources/assets/nec/lang/en_us.json +++ b/src/main/resources/assets/nec/lang/en_us.json @@ -6,6 +6,10 @@ "advancements.nec.ak_47.title": "Congrats, You're f*cking useless!", "advancements.nec.dirt_sword.description": "Haha, get it? ... -_-", "advancements.nec.dirt_sword.title": "You are now dirty", + "advancements.nec.pocket_block.description": "Craft a Pocket Block", + "advancements.nec.pocket_block.title": "It's basically Bedrock", + "advancements.nec.java_block.description": "Craft a Java Block", + "advancements.nec.java_block.title": "You Idiot, this is wrong!", "advancements.nec.root.description": "uwu", "advancements.nec.root.title": "Not Enough Cursedness", @@ -22,6 +26,7 @@ "item.nec.ak_47": "AK-47", "item.nec.chainmail": "Chainmail", "item.nec.dirt_sword": "Dirt Sword", + "item.nec.helmet_on_a_stick": "Helmet on a Stick", "item.nec.letter": "Letter", "item.nec.negative_flint": "Negative Flint", "item.nec.steel": "Steel", diff --git a/src/main/resources/assets/nec/models/item/helmet_on_a_stick.json b/src/main/resources/assets/nec/models/item/helmet_on_a_stick.json new file mode 100644 index 0000000..9d1e1d2 --- /dev/null +++ b/src/main/resources/assets/nec/models/item/helmet_on_a_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "nec:item/helmet_on_a_stick" + } + } \ No newline at end of file diff --git a/src/main/resources/assets/nec/textures/item/helmet_on_a_stick.png b/src/main/resources/assets/nec/textures/item/helmet_on_a_stick.png new file mode 100644 index 0000000..5e27d68 Binary files /dev/null and b/src/main/resources/assets/nec/textures/item/helmet_on_a_stick.png differ diff --git a/src/main/resources/data/nec/advancements/java_block.json b/src/main/resources/data/nec/advancements/java_block.json new file mode 100644 index 0000000..c3a79b6 --- /dev/null +++ b/src/main/resources/data/nec/advancements/java_block.json @@ -0,0 +1,31 @@ +{ + "display": { + "icon": { + "item": "nec:java_block" + }, + "title": { + "translate": "advancements.nec.java_block.title" + }, + "description": { + "translate": "advancements.nec.java_block.description" + }, + "frame": "task", + "show_toast": true, + "annouce_to_chat": true + }, + "parent": "nec:nec", + "criteria": { + "requirement": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "nec:java_block" + ] + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/nec/advancements/pocket_block.json b/src/main/resources/data/nec/advancements/pocket_block.json new file mode 100644 index 0000000..460907d --- /dev/null +++ b/src/main/resources/data/nec/advancements/pocket_block.json @@ -0,0 +1,31 @@ +{ + "display": { + "icon": { + "item": "nec:pocket_block" + }, + "title": { + "translate": "advancements.nec.pocket_block.title" + }, + "description": { + "translate": "advancements.nec.pocket_block.description" + }, + "frame": "task", + "show_toast": true, + "annouce_to_chat": true + }, + "parent": "nec:nec", + "criteria": { + "requirement": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "nec:pocket_block" + ] + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/nec/recipes/bedrock.json b/src/main/resources/data/nec/recipes/bedrock.json new file mode 100644 index 0000000..6b9ffc0 --- /dev/null +++ b/src/main/resources/data/nec/recipes/bedrock.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "minecraft:beds" + }, + { + "item": "minecraft:stone" + } + ], + "result": { + "item": "minecraft:bedrock" + } +} diff --git a/src/main/resources/data/nec/recipes/deepslate_diamond_ore_ore.json b/src/main/resources/data/nec/recipes/deepslate_diamond_ore_ore.json new file mode 100644 index 0000000..99bf71f --- /dev/null +++ b/src/main/resources/data/nec/recipes/deepslate_diamond_ore_ore.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + "ABA", + "AAA" + ], + "key": { + "A": { + "item": "minecraft:deepslate" + }, + "B": { + "item": "minecraft:deepslate_diamond_ore" + } + }, + "result": { + "item": "nec:deepslate_diamond_ore_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/data/nec/recipes/diamond_ore_ore.json b/src/main/resources/data/nec/recipes/diamond_ore_ore.json new file mode 100644 index 0000000..6fad817 --- /dev/null +++ b/src/main/resources/data/nec/recipes/diamond_ore_ore.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + "ABA", + "AAA" + ], + "key": { + "A": { + "item": "minecraft:stone" + }, + "B": { + "item": "minecraft:diamond_ore" + } + }, + "result": { + "item": "nec:diamond_ore_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/data/nec/recipes/java_block.json b/src/main/resources/data/nec/recipes/java_block.json new file mode 100644 index 0000000..608a143 --- /dev/null +++ b/src/main/resources/data/nec/recipes/java_block.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "nec:pocket_block" + } + ], + "result": { + "item": "nec:java_block" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/resources/data/nec/recipes/netherite_chestplate.json b/src/main/resources/data/nec/recipes/netherite_chestplate.json new file mode 100644 index 0000000..1b6d6f6 --- /dev/null +++ b/src/main/resources/data/nec/recipes/netherite_chestplate.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "1": { + "item": "minecraft:golden_chestplate" + }, + "2": { + "item": "minecraft:leather_chestplate" + } + }, + "pattern": [ + "111", + "1 2", + "222" + ], + "result": { + "item": "minecraft:netherite_chestplate" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/resources/data/nec/recipes/pocket_block.json b/src/main/resources/data/nec/recipes/pocket_block.json new file mode 100644 index 0000000..03cbcc3 --- /dev/null +++ b/src/main/resources/data/nec/recipes/pocket_block.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "minecraft:bedrock" + } + ], + "result": { + "item": "nec:pocket_block" + }, + "show_notification": true +} \ No newline at end of file