diff --git a/LICENSE b/LICENSE index 1625c17..eb1818a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,121 +1,58 @@ -Creative Commons Legal Code - -CC0 1.0 Universal - - 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 - -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"). - -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. - -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. - -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: - - 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. - -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. - -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. - -4. Limitations and Disclaimers. - - 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. \ No newline at end of file +Lily License + +Copyright (c) 2023 Provismet + +0. Definitions + - Software + - Source and binary forms of this software. Including configuration files, source code, binary executables. + Includes associated documentation. + + - Assets + - Any images or audio included in the Software. + + - Modified-Software + - A copy of the Software that has been modified. Including modifications for the purpose of maintenance. + +1. Permission is hereby granted, free of charge, to any person obtaining a copy of the Software to use, + modify and compile the Software, contribute source or Assets to the Software, include the Software as + part of a larger work such as a "modpack", subject to the following conditions: + + a) The Software may not be redistributed. + i) If a larger work includes or depends on the Software, then the installation or use of said larger + work must include or require obtaining a copy of the Software from the copyright holder. + + b) Assets may not be redistributed or used in contexts unrelated to the Software. + i) Assets are permitted to be used in Modified-Software. + + c) The copyright holder retains the right to grant exceptions to these conditions to individuals or + entities. + +2. Distribution of Modified-Software is permitted, subject to the following conditions: + a) The Modified-Software must contain prominent notices that it has been modified from the original + Software, on both: + i) Within the Modified-Software itself. + ii) On any webpage where the source or binary of the Modified-Software are distributed or hosted. + + b) Any attribution notices within the Software must remain in the Modified-Software. + + c) Webpages hosting the Modified-Software must contain a prominent hyperlink leading to a webpage + (posted or owned by the copyright holder) hosting the Software. + + d) The copyright holder retains the right to grant exceptions to these conditions to individuals or + entities. + + e) In the interest of preventing theft, fraud, or otherwise malicious activity, the copyright holder + retains the right to revoke this permission from individuals or entities at any time. + +The above permissions and exemptions do not apply to files prominently noted as being exempt from these permissions +or are held under a different license. +Prominent notices for this purpose include comments at the head of a source file, or a list of exempt file names +located in a NOTICE or README. + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of +the Software. + +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 OR COPYRIGHT HOLDERS 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. diff --git a/README.md b/README.md index fd96346..bb9ec72 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,2 @@ -# Fabric Example Mod - -## Setup - -For setup instructions please see the [fabric wiki page](https://fabricmc.net/wiki/tutorial:setup) that relates to the IDE that you are using. - -## License - -This template is available under the CC0 license. Feel free to learn from it and incorporate it in your own projects. +# Additional Armoury +WIP \ No newline at end of file diff --git a/build.gradle b/build.gradle index 910521d..d697b63 100644 --- a/build.gradle +++ b/build.gradle @@ -11,23 +11,7 @@ base { } repositories { - // Add repositories to retrieve artifacts from in here. - // You should only use this when depending on other mods because - // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. - // See https://docs.gradle.org/current/userguide/declaring_repositories.html - // for more information about repositories. -} - -loom { - splitEnvironmentSourceSets() - - mods { - "modid" { - sourceSet sourceSets.main - sourceSet sourceSets.client - } - } - + maven { url "https://jitpack.io" } } dependencies { @@ -39,10 +23,7 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - // Uncomment the following line to enable the deprecated Fabric API modules. - // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time. - - // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" + modImplementation "com.github.Provismet:combatplus-core:${project.combatplus_version}" } processResources { diff --git a/gradle.properties b/gradle.properties index aa21e94..7ec1f02 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,15 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.4 -yarn_mappings=1.20.4+build.1 -loader_version=0.15.0 +minecraft_version=1.20.1 +yarn_mappings=1.20.1+build.10 +loader_version=0.15.3 # Mod Properties mod_version=1.0.0 -maven_group=com.example -archives_base_name=modid +maven_group=com.provismet +archives_base_name=additional-armoury -# Dependencies -fabric_version=0.91.1+1.20.4 \ No newline at end of file +#Fabric api +fabric_version=0.91.0+1.20.1 +combatplus_version=0.1.0-mc1.20.1 \ No newline at end of file diff --git a/src/client/java/com/example/ExampleModClient.java b/src/client/java/com/example/ExampleModClient.java deleted file mode 100644 index e2b0436..0000000 --- a/src/client/java/com/example/ExampleModClient.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.example; - -import net.fabricmc.api.ClientModInitializer; - -public class ExampleModClient implements ClientModInitializer { - @Override - public void onInitializeClient() { - // This entrypoint is suitable for setting up client-specific logic, such as rendering. - } -} \ No newline at end of file diff --git a/src/client/java/com/example/mixin/client/ExampleClientMixin.java b/src/client/java/com/example/mixin/client/ExampleClientMixin.java deleted file mode 100644 index 061b0ef..0000000 --- a/src/client/java/com/example/mixin/client/ExampleClientMixin.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.example.mixin.client; - -import net.minecraft.client.MinecraftClient; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(MinecraftClient.class) -public class ExampleClientMixin { - @Inject(at = @At("HEAD"), method = "run") - private void run(CallbackInfo info) { - // This code is injected into the start of MinecraftClient.run()V - } -} \ No newline at end of file diff --git a/src/client/resources/modid.client.mixins.json b/src/client/resources/modid.client.mixins.json deleted file mode 100644 index 21b0fc1..0000000 --- a/src/client/resources/modid.client.mixins.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "required": true, - "package": "com.example.mixin.client", - "compatibilityLevel": "JAVA_17", - "client": [ - "ExampleClientMixin" - ], - "injectors": { - "defaultRequire": 1 - } -} \ No newline at end of file diff --git a/src/main/java/com/example/ExampleMod.java b/src/main/java/com/example/ExampleMod.java deleted file mode 100644 index f97cce9..0000000 --- a/src/main/java/com/example/ExampleMod.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.example; - -import net.fabricmc.api.ModInitializer; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class ExampleMod implements ModInitializer { - // This logger is used to write text to the console and the log file. - // It is considered best practice to use your mod id as the logger's name. - // That way, it's clear which mod wrote info, warnings, and errors. - public static final Logger LOGGER = LoggerFactory.getLogger("modid"); - - @Override - public void onInitialize() { - // This code runs as soon as Minecraft is in a mod-load-ready state. - // However, some things (like resources) may still be uninitialized. - // Proceed with mild caution. - - LOGGER.info("Hello Fabric world!"); - } -} \ No newline at end of file diff --git a/src/main/java/com/example/mixin/ExampleMixin.java b/src/main/java/com/example/mixin/ExampleMixin.java deleted file mode 100644 index 3c4212c..0000000 --- a/src/main/java/com/example/mixin/ExampleMixin.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.example.mixin; - -import net.minecraft.server.MinecraftServer; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(MinecraftServer.class) -public class ExampleMixin { - @Inject(at = @At("HEAD"), method = "loadWorld") - private void init(CallbackInfo info) { - // This code is injected into the start of MinecraftServer.loadWorld()V - } -} \ No newline at end of file diff --git a/src/main/java/com/provismet/AdditionalArmoury/AdditionalArmouryMain.java b/src/main/java/com/provismet/AdditionalArmoury/AdditionalArmouryMain.java new file mode 100644 index 0000000..5f62a14 --- /dev/null +++ b/src/main/java/com/provismet/AdditionalArmoury/AdditionalArmouryMain.java @@ -0,0 +1,25 @@ +package com.provismet.AdditionalArmoury; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.provismet.AdditionalArmoury.registries.AAEnchantments; +import com.provismet.AdditionalArmoury.registries.AAItems; + +import net.fabricmc.api.ModInitializer; +import net.minecraft.util.Identifier; + +public class AdditionalArmouryMain implements ModInitializer { + public static final String MODID = "additional-armoury"; + public static final Logger LOGGER = LoggerFactory.getLogger(MODID); + + public static Identifier identifier (String path) { + return Identifier.of(MODID, path); + } + + @Override + public void onInitialize () { + AAItems.register(); + AAEnchantments.register(); + } +} diff --git a/src/main/java/com/provismet/AdditionalArmoury/registries/AAEnchantments.java b/src/main/java/com/provismet/AdditionalArmoury/registries/AAEnchantments.java new file mode 100644 index 0000000..81a1926 --- /dev/null +++ b/src/main/java/com/provismet/AdditionalArmoury/registries/AAEnchantments.java @@ -0,0 +1,7 @@ +package com.provismet.AdditionalArmoury.registries; + +public class AAEnchantments { + public static void register () { + + } +} diff --git a/src/main/java/com/provismet/AdditionalArmoury/registries/AAItems.java b/src/main/java/com/provismet/AdditionalArmoury/registries/AAItems.java new file mode 100644 index 0000000..d504047 --- /dev/null +++ b/src/main/java/com/provismet/AdditionalArmoury/registries/AAItems.java @@ -0,0 +1,7 @@ +package com.provismet.AdditionalArmoury.registries; + +public class AAItems { + public static void register () { + + } +} diff --git a/src/main/resources/modid.mixins.json b/src/main/resources/additional-armoury.mixins.json similarity index 67% rename from src/main/resources/modid.mixins.json rename to src/main/resources/additional-armoury.mixins.json index 166e787..329f107 100644 --- a/src/main/resources/modid.mixins.json +++ b/src/main/resources/additional-armoury.mixins.json @@ -1,9 +1,9 @@ { "required": true, - "package": "com.example.mixin", + "package": "com.provismet.AdditionalArmoury.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ - "ExampleMixin" + ], "injectors": { "defaultRequire": 1 diff --git a/src/main/resources/assets/modid/icon.png b/src/main/resources/assets/additional-armoury/icon.png similarity index 100% rename from src/main/resources/assets/modid/icon.png rename to src/main/resources/assets/additional-armoury/icon.png diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index dc5a234..85d9793 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,41 +1,32 @@ { "schemaVersion": 1, - "id": "modid", + "id": "additional-armoury", "version": "${version}", - "name": "Example mod", - "description": "This is an example description! Tell everyone what your mod is about!", + "name": "Additional Armoury", + "description": "Extends your armour and weapons.", "authors": [ - "Me!" + "Provismet" ], "contact": { "homepage": "https://fabricmc.net/", - "sources": "https://github.com/FabricMC/fabric-example-mod" + "sources": "https://github.com/Provismet/Additional-Armoury" }, - "license": "CC0-1.0", - "icon": "assets/modid/icon.png", + "license": "Lily License", + "icon": "assets/additional-armoury/icon.png", "environment": "*", "entrypoints": { "main": [ - "com.example.ExampleMod" - ], - "client": [ - "com.example.ExampleModClient" + "com.provismet.AdditionalArmoury.AdditionalArmouryMain" ] }, "mixins": [ - "modid.mixins.json", - { - "config": "modid.client.mixins.json", - "environment": "client" - } + "additional-armoury.mixins.json" ], "depends": { - "fabricloader": ">=0.15.0", - "minecraft": "~1.20.4", + "fabricloader": ">=0.14.0", + "minecraft": "~1.20", "java": ">=17", - "fabric-api": "*" - }, - "suggests": { - "another-mod": "*" + "fabric-api": "*", + "combat-plus": "*" } } \ No newline at end of file