diff --git a/LICENSE b/LICENSE index 0e259d4..9865f8e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,121 +1,18 @@ -Creative Commons Legal Code +Copyright 2020 Jottyfan -CC0 1.0 Universal +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: - 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. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. -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. +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..33c437c 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,3 @@ -# Fabric Example Mod +# Quickiefabric -## 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. +A small mod to speed up daily work in Minecraft (this is the fabric version). diff --git a/gradle.properties b/gradle.properties index eb2774e..90bb373 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,9 +8,9 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.8.8+build.202 # Mod Properties - mod_version = 1.0.0 - maven_group = net.fabricmc - archives_base_name = fabric-example-mod + mod_version = 1.16.1.0 + maven_group = de.jottyfan.minecraft + archives_base_name = quickiefabric # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/QuickieFabric.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/QuickieFabric.java new file mode 100644 index 0000000..cbf4db3 --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/QuickieFabric.java @@ -0,0 +1,18 @@ +package de.jottyfan.minecraft.quickiefabric; + +import de.jottyfan.minecraft.quickiefabric.init.RegistryManager; +import net.fabricmc.api.ModInitializer; + +/** + * + * @author jotty + * + */ +public class QuickieFabric implements ModInitializer { + + @Override + public void onInitialize() { + RegistryManager.registerItems(); + } + +} diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java new file mode 100644 index 0000000..3fba586 --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -0,0 +1,22 @@ +package de.jottyfan.minecraft.quickiefabric.init; + +import de.jottyfan.minecraft.quickiefabric.items.ItemSpeedpowder; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; + +/** + * + * @author jotty + * + */ +public class RegistryManager { + + public static final ItemSpeedpowder ITEM_SPEEDPOWDER = new ItemSpeedpowder(new Item.Settings().group(ItemGroup.REDSTONE)); + + public static final void registerItems() { + Registry.register(Registry.ITEM, new Identifier("quickiefabric", "speedpowder"), ITEM_SPEEDPOWDER); + } + +} diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSpeedpowder.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSpeedpowder.java new file mode 100644 index 0000000..705055b --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSpeedpowder.java @@ -0,0 +1,14 @@ +package de.jottyfan.minecraft.quickiefabric.items; + +import net.minecraft.item.Item; + +/** + * + * @author jotty + * + */ +public class ItemSpeedpowder extends Item { + public ItemSpeedpowder(Settings settings) { + super(settings); + } +} diff --git a/src/main/java/net/fabricmc/example/ExampleMod.java b/src/main/java/net/fabricmc/example/ExampleMod.java deleted file mode 100644 index e5ed082..0000000 --- a/src/main/java/net/fabricmc/example/ExampleMod.java +++ /dev/null @@ -1,14 +0,0 @@ -package net.fabricmc.example; - -import net.fabricmc.api.ModInitializer; - -public class ExampleMod implements ModInitializer { - @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. - - System.out.println("Hello Fabric world!"); - } -} diff --git a/src/main/java/net/fabricmc/example/mixin/ExampleMixin.java b/src/main/java/net/fabricmc/example/mixin/ExampleMixin.java deleted file mode 100644 index 83ee1a8..0000000 --- a/src/main/java/net/fabricmc/example/mixin/ExampleMixin.java +++ /dev/null @@ -1,15 +0,0 @@ -package net.fabricmc.example.mixin; - -import net.minecraft.client.gui.screen.TitleScreen; -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(TitleScreen.class) -public class ExampleMixin { - @Inject(at = @At("HEAD"), method = "init()V") - private void init(CallbackInfo info) { - System.out.println("This line is printed by an example mod mixin!"); - } -} diff --git a/src/main/resources/assets/lang/de_de.json b/src/main/resources/assets/lang/de_de.json new file mode 100644 index 0000000..55c3530 --- /dev/null +++ b/src/main/resources/assets/lang/de_de.json @@ -0,0 +1,43 @@ +{ + "item.quickie.speedpowderaxe": "Fluchtpulveraxt", + "item.quickie.speedpowderpickaxe": "Fluchtpulverspitzhacke", + "item.quickie.speedpowdershovel": "Fluchtpulverschaufel", + "item.quickie.speedpowder": "Fluchtpulver", + "item.quickie.sulphor": "Schwefel", + "item.quickie.salpeter": "Salpeter", + "item.quickie.construction0": "leerer Bauplan", + "item.quickie.construction1": "begonnener Bauplan", + "item.quickie.construction2": "fertiger Bauplan", + "item.quickie.pencil": "Bleistift", + "item.quickie.levelup": "Aufwerter", + "block.quickie.orenethersulphor": "Nether-Schwefel", + "block.quickie.oresalpeter": "Salpetererz", + "block.quickie.oresandsalpeter": "Salpetergestein", + "block.quickie.oresulphor": "Schwefelgestein", + "block.quickie.dirtsalpeter": "Salpetererde", + "block.quickie.sandsalpeter": "Salpetersand", + "block.quickie.constructionborder": "Bauplangrenzblock", + "block.quickie.rotateclockwise": "im Urzeigersinn Bauplandreher", + "block.quickie.rotatecounterclockwise": "gegen den Urzeigersinn Bauplandreher", + "block.quickie.mirrorhorizontal": "horizontaler Bauplanspiegler", + "block.quickie.mirrorvertical": "vertikaler Bauplanspiegler", + "block.quickie.moveup": "Höhenpositionsaddierer", + "block.quickie.movedown": "Höhenpositionssubtrahierer", + "block.quickie.menu": "Bauplanwerkbank", + "block.quickie.lavahoarder": "Lavasauger", + "block.quickie.itemhoarder": "Itemsauger", + "msg.buildingplan.start": "beginne Konstruktionsaufnahme bei %s,%s,%s", + "msg.buildingplan.end": "beende Konstruktionsaufnahme bei %s,%s,%s", + "msg.buildingplan.null": "Der Bauplan ist kaputt.", + "msg.buildingplan.missing": "Zum Bauen fehlt noch: %s", + "msg.buildingplan.rotateclockwise": "Der Bauplan wurde im Uhrzeigersinn gedreht.", + "msg.buildingplan.rotatecounterclockwise": "Der Bauplan wurde gegen den Uhrzeigersinn gedreht.", + "msg.buildingplan.mirrorhorizontal": "Der Bauplan wurde horizontal gespiegelt.", + "msg.buildingplan.mirrorvertical": "Der Bauplan wurde vertikal gespiegelt.", + "msg.buildingplan.move": "Der Bauplan wurde in der Höhe um %s Blöcke verschoben.", + "msg.buildingplan.failonblock": "Der Bau wurde abgelehnt, es ist im Weg: %s", + "msg.buildingplan.failonplayer": "Der Bau wurde abgelehnt, um Spieler %s nicht zu gefährden.", + "msg.itemhoarder.summary": "Der Itemsauger enthält: %s", + "msg.notyetimplemented": "leider noch nicht verfügbar", + "error.unleveling.inventory.full": "Es ist kein Platz mehr frei, um die Aufwertungen abzulegen." +} diff --git a/src/main/resources/assets/lang/en_us.json b/src/main/resources/assets/lang/en_us.json new file mode 100644 index 0000000..7cb1dc9 --- /dev/null +++ b/src/main/resources/assets/lang/en_us.json @@ -0,0 +1,43 @@ +{ + "item.quickie.speedpowderaxe": "speedpowder axe", + "item.quickie.speedpowderpickaxe": "speedpowder pickaxe", + "item.quickie.speedpowdershovel": "speedpowder shovel", + "item.quickie.speedpowder": "speedpowder", + "item.quickie.sulphor": "sulfur", + "item.quickie.salpeter": "salpeter", + "item.quickie.construction0": "empty building plan", + "item.quickie.construction1": "started building plan", + "item.quickie.construction2": "finished building plan", + "item.quickie.pencil": "pencil", + "item.quickie.levelup": "level up", + "block.quickie.orenethersulphor": "nether sulfur", + "block.quickie.oresalpeter": "salpeter ore", + "block.quickie.oresandsalpeter": "salpeter stone", + "block.quickie.oresulphor": "sulfur stone", + "block.quickie.dirtsalpeter": "salpeter dirt", + "block.quickie.sandsalpeter": "salpeter sand", + "block.quickie.constructionborder": "building plan border block", + "block.quickie.rotateclockwise": "rotate clockwise building plan", + "block.quickie.rotatecounterclockwise": "rotate counterclockwise building plan", + "block.quickie.mirrorhorizontal": "horizontal building plan mirror", + "block.quickie.mirrorvertical": "vertical building plan mirror", + "block.quickie.moveup": "height position adder", + "block.quickie.movedown": "height position substractor", + "block.quickie.menu": "building plan crafting table", + "block.quickie.lavahoarder": "lava hoarder", + "block.quickie.itemhoarder": "item hoarder", + "msg.buildingplan.start": "started recording of construction at %s,%s,%s", + "msg.buildingplan.end": "finished recording of construction at %s,%s,%s", + "msg.buildingplan.null": "The building plan is damaged.", + "msg.buildingplan.missing": "Cannot complete until you deliver %s", + "msg.buildingplan.rotateclockwise": "Rotated the building plan clockwise", + "msg.buildingplan.rotatecounterclockwise": "Rotated the building plan counterclockwise", + "msg.buildingplan.mirrorhorizontal": "Mirrored the building plan horizontally", + "msg.buildingplan.mirrorvertical": "Mirrored the building plan vertically", + "msg.buildingplan.move": "The building plan has been moved in height for %s blocks.", + "msg.buildingplan.failonblock": "The building execution was rejected because of %s", + "msg.buildingplan.failonplayer": "The building execution was rejected because of %s who could be injured.", + "msg.itemhoarder.summary": "The item hoarder contains: %s", + "msg.notyetimplemented": "not yet implemented", + "error.unleveling.inventory.full": "There is no free stack in your inventory for the level ups." +} diff --git a/src/main/resources/assets/quickiefabric/models/item/speedpowder.json b/src/main/resources/assets/quickiefabric/models/item/speedpowder.json new file mode 100644 index 0000000..02ba701 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/speedpowder.json @@ -0,0 +1,6 @@ +{ + "parent": "item/coal", + "textures": { + "layer0": "quickiefabric:item/speedpowder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/textures/item/speedpowder.png b/src/main/resources/assets/quickiefabric/textures/item/speedpowder.png new file mode 100644 index 0000000..a096fe3 Binary files /dev/null and b/src/main/resources/assets/quickiefabric/textures/item/speedpowder.png differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 3762966..877803d 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -3,29 +3,25 @@ "id": "modid", "version": "${version}", - "name": "Example Mod", - "description": "This is an example description! Tell everyone what your mod is about!", + "name": "quickiefabric", + "description": "Quickiefabric is the fabric implementation of Quickie, a mot to speed up daily work in Minecraft.", "authors": [ - "Me!" + "Jottyfan" ], "contact": { - "homepage": "https://fabricmc.net/", - "sources": "https://github.com/FabricMC/fabric-example-mod" + "homepage": "https://gitlab.com/jottyfan/quickiefabric", + "sources": "https://gitlab.com/jottyfan/quickiefabric" }, - "license": "CC0-1.0", + "license": "MIT", "icon": "assets/modid/icon.png", "environment": "*", "entrypoints": { "main": [ - "net.fabricmc.example.ExampleMod" + "de.jottyfan.minecraft.quickiefabric.QuickieFabric" ] }, - "mixins": [ - "modid.mixins.json" - ], - "depends": { "fabricloader": ">=0.7.4", "fabric": "*", diff --git a/src/main/resources/modid.mixins.json b/src/main/resources/modid.mixins.json deleted file mode 100644 index 21fe73a..0000000 --- a/src/main/resources/modid.mixins.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "net.fabricmc.example.mixin", - "compatibilityLevel": "JAVA_8", - "mixins": [ - ], - "client": [ - "ExampleMixin" - ], - "injectors": { - "defaultRequire": 1 - } -}