From 9128923bbad990d9d1a55114e87091f79c3aa689 Mon Sep 17 00:00:00 2001 From: Agatha Rose Date: Thu, 12 Nov 2020 01:22:11 +0200 Subject: [PATCH] Initial commit uwu --- LICENSE | 121 ------------------ README.md | 9 -- build.gradle | 15 +++ gradle.properties | 13 +- .../dev/agatharose/asbestos/Asbestos.java | 33 +++++ .../java/net/fabricmc/example/ExampleMod.java | 14 -- .../fabricmc/example/mixin/ExampleMixin.java | 15 --- .../asbestos/blockstates/asbestos_block.json | 7 + src/main/resources/assets/asbestos/icon.png | Bin 0 -> 465 bytes .../resources/assets/asbestos/lang/en_us.json | 4 + .../asbestos/models/block/asbestos_block.json | 6 + .../asbestos/models/item/asbestos_block.json | 3 + .../asbestos/models/item/asbestos_fibers.json | 6 + .../textures/block/asbestos_block.png | Bin 0 -> 350 bytes .../textures/item/asbestos_fibers.png | Bin 0 -> 318 bytes src/main/resources/assets/modid/icon.png | Bin 453 -> 0 bytes .../loot_tables/blocks/asbestos_block.json | 34 +++++ .../data/asbestos/recipes/asbestos_block.json | 15 +++ src/main/resources/fabric.mod.json | 22 ++-- 19 files changed, 139 insertions(+), 178 deletions(-) delete mode 100644 LICENSE delete mode 100644 README.md create mode 100644 src/main/java/dev/agatharose/asbestos/Asbestos.java delete mode 100644 src/main/java/net/fabricmc/example/ExampleMod.java delete mode 100644 src/main/java/net/fabricmc/example/mixin/ExampleMixin.java create mode 100644 src/main/resources/assets/asbestos/blockstates/asbestos_block.json create mode 100644 src/main/resources/assets/asbestos/icon.png create mode 100644 src/main/resources/assets/asbestos/lang/en_us.json create mode 100644 src/main/resources/assets/asbestos/models/block/asbestos_block.json create mode 100644 src/main/resources/assets/asbestos/models/item/asbestos_block.json create mode 100644 src/main/resources/assets/asbestos/models/item/asbestos_fibers.json create mode 100644 src/main/resources/assets/asbestos/textures/block/asbestos_block.png create mode 100644 src/main/resources/assets/asbestos/textures/item/asbestos_fibers.png delete mode 100644 src/main/resources/assets/modid/icon.png create mode 100644 src/main/resources/data/asbestos/loot_tables/blocks/asbestos_block.json create mode 100644 src/main/resources/data/asbestos/recipes/asbestos_block.json diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 0e259d4..0000000 --- a/LICENSE +++ /dev/null @@ -1,121 +0,0 @@ -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. diff --git a/README.md b/README.md deleted file mode 100644 index fd96346..0000000 --- a/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# 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. diff --git a/build.gradle b/build.gradle index 220d900..bb4584d 100644 --- a/build.gradle +++ b/build.gradle @@ -10,6 +10,16 @@ archivesBaseName = project.archives_base_name version = project.mod_version group = project.maven_group +repositories { + maven { + url "https://maven.fabricmc.net/io/github/prospector/modmenu/" + } + maven { + url "https://jitpack.io" + } +} + + dependencies { //to change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" @@ -19,6 +29,11 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + // ModMenu + modApi("io.github.prospector:modmenu:${modmenu_version}") { + exclude(group: "net.fabricmc.fabric-api") + } + // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs. // You may need to force-disable transitiveness on them. } diff --git a/gradle.properties b/gradle.properties index 50867ca..a64d398 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use minecraft_version=1.16.3 - yarn_mappings=1.16.3+build.17 - loader_version=0.10.0+build.208 + yarn_mappings=1.16.3+build.47 + loader_version=0.10.6+build.214 # Mod Properties - mod_version = 1.0.0 - maven_group = net.fabricmc - archives_base_name = fabric-example-mod + mod_version = 0.0.1 + maven_group = dev.agatharose + archives_base_name = asbestos # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api - fabric_version=0.22.0+build.408-1.16 + fabric_version=0.25.1+build.416-1.16 + modmenu_version=1.14.6+build.31 diff --git a/src/main/java/dev/agatharose/asbestos/Asbestos.java b/src/main/java/dev/agatharose/asbestos/Asbestos.java new file mode 100644 index 0000000..4fbf171 --- /dev/null +++ b/src/main/java/dev/agatharose/asbestos/Asbestos.java @@ -0,0 +1,33 @@ +package dev.agatharose.asbestos; + +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; +import net.minecraft.block.Block; +import net.minecraft.block.Material; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; + +public class Asbestos implements ModInitializer { + + public static final Item ASBESTOS_FIBERS = new Item(new FabricItemSettings().group(ItemGroup.MATERIALS)); + + public static final Block ASBESTOS_BLOCK = new Block(FabricBlockSettings.of(Material.WOOL) + .breakByTool(FabricToolTags.AXES).hardness(0.3f).sounds(BlockSoundGroup.WOOL)); + + @Override + public void onInitialize() { + // asbestos fibers item registration + Registry.register(Registry.ITEM, new Identifier("asbestos", "asbestos_fibers"), ASBESTOS_FIBERS); + + // asbestos block registration + Registry.register(Registry.BLOCK, new Identifier("asbestos", "asbestos_block"), ASBESTOS_BLOCK); + Registry.register(Registry.ITEM, new Identifier("asbestos", "asbestos_block"), + new BlockItem(ASBESTOS_BLOCK, new Item.Settings().group(ItemGroup.BUILDING_BLOCKS))); + } +} \ No newline at end of file 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/asbestos/blockstates/asbestos_block.json b/src/main/resources/assets/asbestos/blockstates/asbestos_block.json new file mode 100644 index 0000000..0f5be9d --- /dev/null +++ b/src/main/resources/assets/asbestos/blockstates/asbestos_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "asbestos:block/asbestos_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/asbestos/icon.png b/src/main/resources/assets/asbestos/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5cac336f5950633320fbf3d66c7e058af118760a GIT binary patch literal 465 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|5(0ceT-|kT z;>?_@T)Y-U2k)b(9w$u4z4XITrj!s{IMPPzkTg` z{ZZr0eang!mhKgnhTdTgDShreXA>s>U$^bc7U?f_($75fR$5y(6-@CD$$swGybR=u zk|4iehX44%q*-grfNDQ`x;Tbd^zIFg&O2vMSFtcpbgQ`Y|DA=o z&t5J({_VnJ(}9lHG-g?+jXMmo3t)o$|+f&EX3ob7ZD6@IT*HR-Iyc!GF)?DV32m i2iw2?N&Iv37bE`;nI@YQdo`f<89ZJ6T-G@yGywqOcGd9! literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/asbestos/lang/en_us.json b/src/main/resources/assets/asbestos/lang/en_us.json new file mode 100644 index 0000000..86f4d95 --- /dev/null +++ b/src/main/resources/assets/asbestos/lang/en_us.json @@ -0,0 +1,4 @@ +{ + "block.asbestos.asbestos_block": "Asbestos Block", + "item.asbestos.asbestos_fibers": "Asbests Fibers" +} \ No newline at end of file diff --git a/src/main/resources/assets/asbestos/models/block/asbestos_block.json b/src/main/resources/assets/asbestos/models/block/asbestos_block.json new file mode 100644 index 0000000..311abbd --- /dev/null +++ b/src/main/resources/assets/asbestos/models/block/asbestos_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "asbestos:block/asbestos_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/asbestos/models/item/asbestos_block.json b/src/main/resources/assets/asbestos/models/item/asbestos_block.json new file mode 100644 index 0000000..89f96b7 --- /dev/null +++ b/src/main/resources/assets/asbestos/models/item/asbestos_block.json @@ -0,0 +1,3 @@ +{ + "parent": "asbestos:block/asbestos_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/asbestos/models/item/asbestos_fibers.json b/src/main/resources/assets/asbestos/models/item/asbestos_fibers.json new file mode 100644 index 0000000..ad33dd8 --- /dev/null +++ b/src/main/resources/assets/asbestos/models/item/asbestos_fibers.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "asbestos:item/asbestos_fibers" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/asbestos/textures/block/asbestos_block.png b/src/main/resources/assets/asbestos/textures/block/asbestos_block.png new file mode 100644 index 0000000000000000000000000000000000000000..5e7f33126389cac3240cda1d1a3c3da892cbd12d GIT binary patch literal 350 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1IggaDrqS9e{T zI5X!e7q11;!TT#C-Yrb{a%SPSt2TwJOf0KiY$C%9bo8QvgKG;47fkLue{9G7Z(qA! zf7Cd0-?CzbrF(^?p?8==N}qer*@Vge*KPZ$I4c1ebp(V_9K~j>)W13uICfaa=J|~$+8cTEGdd@V@sa?=!%Z7 z@q;fPc$Yaz2gdzS-aN>%rc)56UL|ezitgM09&{RECg7x^2wgtPg%Vrry>_7`K)V<`UHx3vIVCg!00w%Ho&W#< literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/modid/icon.png b/src/main/resources/assets/modid/icon.png deleted file mode 100644 index 047b91f2347de5cf95f23284476fddbe21ba23fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 453 zcmV;$0XqJPP)QAFYGys`80vegN0XDFh0OXKz&i8?Le#x7{1X)R+00000NkvXXu0mjf73i~T diff --git a/src/main/resources/data/asbestos/loot_tables/blocks/asbestos_block.json b/src/main/resources/data/asbestos/loot_tables/blocks/asbestos_block.json new file mode 100644 index 0000000..e499206 --- /dev/null +++ b/src/main/resources/data/asbestos/loot_tables/blocks/asbestos_block.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "asbestos:asbestos_block", + "weight": 10 + }, + { + "type": "minecraft:item", + "name": "asbestos:asbestos_fibers", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 4 + } + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/asbestos/recipes/asbestos_block.json b/src/main/resources/data/asbestos/recipes/asbestos_block.json new file mode 100644 index 0000000..02c93c4 --- /dev/null +++ b/src/main/resources/data/asbestos/recipes/asbestos_block.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AA", + "AA" + ], + "key": { + "A": { + "item": "asbestos:asbestos_fibers" + } + }, + "result": { + "item": "asbestos:asbestos_block" + } +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 3762966..8576792 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,37 +1,33 @@ { "schemaVersion": 1, - "id": "modid", + "id": "asbestos", "version": "${version}", - - "name": "Example Mod", - "description": "This is an example description! Tell everyone what your mod is about!", + "name": "Asbestos", + "description": "Ever wanted to experience \u00A7oM e s o t h e l i o m a?", "authors": [ - "Me!" + "AgathaSorceress" ], "contact": { - "homepage": "https://fabricmc.net/", + "homepage": "https://agatharose.dev", "sources": "https://github.com/FabricMC/fabric-example-mod" }, - "license": "CC0-1.0", - "icon": "assets/modid/icon.png", - + "icon": "assets/asbestos/icon.png", "environment": "*", "entrypoints": { "main": [ - "net.fabricmc.example.ExampleMod" + "dev.agatharose.asbestos.Asbestos" ] }, "mixins": [ "modid.mixins.json" ], - "depends": { "fabricloader": ">=0.7.4", "fabric": "*", "minecraft": "1.16.x" }, "suggests": { - "flamingo": "*" + "modmenu": "*" } -} +} \ No newline at end of file