From 1a7e5ca02a8bdd69158b849cf7922fa319f98774 Mon Sep 17 00:00:00 2001 From: jottyfan Date: Thu, 22 Oct 2020 22:14:38 +0200 Subject: [PATCH] added kelpstack --- gradle.properties | 2 +- .../quickiefabric/blocks/BlockKelpstack.java | 32 ++++++++++++++++++ .../quickiefabric/blocks/QuickieBlocks.java | 1 + .../quickiefabric/init/RegistryManager.java | 2 ++ .../quickiefabric/blockstates/kelpstack.json | 7 ++++ .../assets/quickiefabric/lang/de_de.json | 1 + .../assets/quickiefabric/lang/en_us.json | 1 + .../quickiefabric/models/block/kelpstack.json | 25 ++++++++++++++ .../quickiefabric/models/item/kelpstack.json | 10 ++++++ .../textures/block/kelpstack_bottom.png | Bin 0 -> 1986 bytes .../textures/block/kelpstack_side.png | Bin 0 -> 1898 bytes .../textures/block/kelpstack_top.png | Bin 0 -> 1991 bytes .../dried_kelpblock_from_campfire.json | 9 +++++ .../recipes/dried_kelpblock_from_oven.json | 9 +++++ .../recipes/kelpstack_from_kelp.json | 17 ++++++++++ 15 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockKelpstack.java create mode 100644 src/main/resources/assets/quickiefabric/blockstates/kelpstack.json create mode 100644 src/main/resources/assets/quickiefabric/models/block/kelpstack.json create mode 100644 src/main/resources/assets/quickiefabric/models/item/kelpstack.json create mode 100644 src/main/resources/assets/quickiefabric/textures/block/kelpstack_bottom.png create mode 100644 src/main/resources/assets/quickiefabric/textures/block/kelpstack_side.png create mode 100644 src/main/resources/assets/quickiefabric/textures/block/kelpstack_top.png create mode 100644 src/main/resources/data/quickiefabric/recipes/dried_kelpblock_from_campfire.json create mode 100644 src/main/resources/data/quickiefabric/recipes/dried_kelpblock_from_oven.json create mode 100644 src/main/resources/data/quickiefabric/recipes/kelpstack_from_kelp.json diff --git a/gradle.properties b/gradle.properties index d12481c..f3e8644 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.9.3+build.207 # Mod Properties - mod_version = 1.16.3.4 + mod_version = 1.16.3.5 maven_group = de.jottyfan.minecraft archives_base_name = quickiefabric diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockKelpstack.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockKelpstack.java new file mode 100644 index 0000000..9b8cf59 --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockKelpstack.java @@ -0,0 +1,32 @@ +package de.jottyfan.minecraft.quickiefabric.blocks; + +import java.util.Arrays; +import java.util.List; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.BlockState; +import net.minecraft.block.GravelBlock; +import net.minecraft.block.Material; +import net.minecraft.block.MaterialColor; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.sound.BlockSoundGroup; + +/** + * + * @author jotty + * + */ +public class BlockKelpstack extends GravelBlock { + + public BlockKelpstack() { + super(FabricBlockSettings.of(Material.SOLID_ORGANIC, MaterialColor.GREEN).hardness(0.1f).slipperiness(1.0f) + .breakInstantly().sounds(BlockSoundGroup.WET_GRASS)); + } + + @Override + public List getDroppedStacks(BlockState blockState, Builder builder) { + return Arrays.asList(new ItemStack[] { new ItemStack(Items.KELP, 9) }); + } +} diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java index 007ded3..09f1b2d 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java @@ -15,4 +15,5 @@ public class QuickieBlocks { public static final BlockLavahoarder LAVAHOARDER = new BlockLavahoarder(); public static final BlockItemhoarder ITEMHOARDER = new BlockItemhoarder(); public static final BlockMonsterhoarder MONSTERHOARDER = new BlockMonsterhoarder(); + public static final BlockKelpstack KELPSTACK = new BlockKelpstack(); } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java index 58e5ea8..26a6025 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -115,6 +115,7 @@ public class RegistryManager { stacks.add(new ItemStack(QuickieBlocks.LAVAHOARDER)); stacks.add(new ItemStack(QuickieBlocks.ITEMHOARDER)); stacks.add(new ItemStack(QuickieBlocks.MONSTERHOARDER)); + stacks.add(new ItemStack(QuickieBlocks.KELPSTACK)); }).build(); private static final void registerBlock(Block block, String name) { @@ -147,6 +148,7 @@ public class RegistryManager { registerBlock(QuickieBlocks.LAVAHOARDER, "lavahoarder"); registerBlock(QuickieBlocks.ITEMHOARDER, "itemhoarder"); registerBlock(QuickieBlocks.MONSTERHOARDER, "monsterhoarder"); + registerBlock(QuickieBlocks.KELPSTACK, "kelpstack"); } public static final void registerItems() { diff --git a/src/main/resources/assets/quickiefabric/blockstates/kelpstack.json b/src/main/resources/assets/quickiefabric/blockstates/kelpstack.json new file mode 100644 index 0000000..d57c7aa --- /dev/null +++ b/src/main/resources/assets/quickiefabric/blockstates/kelpstack.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quickiefabric:block/kelpstack" + } + } +} diff --git a/src/main/resources/assets/quickiefabric/lang/de_de.json b/src/main/resources/assets/quickiefabric/lang/de_de.json index 2b547e3..6bdabdb 100644 --- a/src/main/resources/assets/quickiefabric/lang/de_de.json +++ b/src/main/resources/assets/quickiefabric/lang/de_de.json @@ -38,6 +38,7 @@ "block.quickiefabric.lavahoarder": "Lavasauger", "block.quickiefabric.itemhoarder": "Itemsauger", "block.quickiefabric.monsterhoarder": "Monstersauger", + "block.quickiefabric.kelpstack": "Seegrassbündel", "container.quickiefabric.backpack": "Rucksack", "msg.buildingplan.start": "beginne Konstruktionsaufnahme bei %s,%s,%s", "msg.buildingplan.end": "beende Konstruktionsaufnahme bei %s,%s,%s", diff --git a/src/main/resources/assets/quickiefabric/lang/en_us.json b/src/main/resources/assets/quickiefabric/lang/en_us.json index eedcf39..a12e209 100644 --- a/src/main/resources/assets/quickiefabric/lang/en_us.json +++ b/src/main/resources/assets/quickiefabric/lang/en_us.json @@ -38,6 +38,7 @@ "block.quickiefabric.lavahoarder": "lava hoarder", "block.quickiefabric.itemhoarder": "item hoarder", "block.quickiefabric.monsterhoarder": "monster hoarder", + "block.quickiefabric.kelpstack": "kelp bundle", "container.quickiefabric.backpack": "backpack", "msg.buildingplan.start": "started recording of construction at %s,%s,%s", "msg.buildingplan.end": "finished recording of construction at %s,%s,%s", diff --git a/src/main/resources/assets/quickiefabric/models/block/kelpstack.json b/src/main/resources/assets/quickiefabric/models/block/kelpstack.json new file mode 100644 index 0000000..891721b --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/block/kelpstack.json @@ -0,0 +1,25 @@ +{ + "parent": "block/block", + "textures": { + "particle": "quickiefabric:block/kelpstack_side", + "down": "quickiefabric:block/kelpstack_bottom", + "up": "quickiefabric:block/kelpstack_top", + "north": "quickiefabric:block/kelpstack_side", + "east": "quickiefabric:block/kelpstack_side", + "south": "quickiefabric:block/kelpstack_side", + "west": "quickiefabric:block/kelpstack_side" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "texture": "#down", "cullface": "down" }, + "up": { "texture": "#up", "cullface": "up" }, + "north": { "texture": "#north", "cullface": "north" }, + "south": { "uv": [16, 0, 0, 16], "texture": "#south", "cullface": "south" }, + "west": { "texture": "#west", "cullface": "west" }, + "east": { "uv": [16, 0, 0, 16], "texture": "#east", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/quickiefabric/models/item/kelpstack.json b/src/main/resources/assets/quickiefabric/models/item/kelpstack.json new file mode 100644 index 0000000..2fd191f --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/kelpstack.json @@ -0,0 +1,10 @@ +{ + "parent": "quickiefabric:block/kelpstack", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/textures/block/kelpstack_bottom.png b/src/main/resources/assets/quickiefabric/textures/block/kelpstack_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..d9b32b500c549aadcfc34298fb84a15c64d9785c GIT binary patch literal 1986 zcmV;z2R- zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1b>vhykq{Ld<835cgy4$rFD!Cn3|AloFz-i>UtBzlZu4KE`UNoR1t*2pS)kTrwFA*88)cq}{s94}CR0`qllypv&TE z_s`J9KBM111EQ1u^4YIqm3deuqI=@?v2*3w7CV-Stl9k}zg3cP*&W-Fuc4aum1Foow}P};N7h+>~xlX`w4~8K@7qd zM$%9ItKZ(sm~Ymul|NqetfM|Z2X@LiWW;zl3DBA;P4VP$0aPo}SpUi)RZvkL=ewH7GWj01#nq4`;}N0UgMC z3Z$bkkq9_4_{s3xSZ4|tAn#2hHNcIv0pzfmYhz5LWox|I-H;X#;gKj2)FhihmUABQ z6CERlvbWwT?|tymvrj$;8(i=qgcznqIkLo zy6>UK&OP-!5NpE@H~a`A4jyUbn>AtelQsHc?swKmSeuNwWfvdT&>iD71x-2elQS@8 z9D(sT89+dr$(d$y&P?VeXF8cFRR*k)pX4-}jDbPd$@oDxcMo&F@}|7|TfCV+F{dVV z{{(YtQYXy)6H{#mgbhPE8_pwHTeH!#ZE_86I8OjVb1SQ_pcI*9 z3gu4gWvDKtWv6^})X5zQ)^ulVJy2~HZBb{S$sZV3rU(Nw|YA?K*6WW>hRe- zJ{OH}$$QLn+5R_|i;5dcxb(ntSsL+*fw$Z9Ac>ACkExXV*e>mMn{`*i(? zPS)u-MA#Mu)40y0gKHjU#;58~!?-EH+qv300^TcvZ=OFc( z83`ogz4=ZC~82!z2P_ zZqn{Ib~gY~_kvNgG!T#>h^jerq~#F`mv^;E%%aFjvc&tXnxu>BRb08)O7goTi137R zMHJ*QUy6fren*!S8HICrm1HY81^cqaifC2S@l}GJK0;%?yVL)mE!1CKebLq{wyq#V15dl?gy>|l|p@#ia(dF@2Yi% z|AI^{%q-nd9b)v99qIBjza+grI9dgADdKiIIEX^qa}I`&)eX9;9sZ(0hmNAyi|mFf zPG;&Y7+>`1_Yi^5saxru_&zpz$3)%q;2+EZD3kHbDk7LwHRnE&YU|Kjk#p*gAl0LJxTw^rLn4*&oF24YJ` zL;(B%umCWZ0LY&J000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jmJC4kHszO88>{ z00A;dL_t(2&vlYLPQySDg+H%sVq$EBVv)i{?tlah1r=xD3fuuHx1i++h>LIoBuL@H zkyFHG6FZIw#jJl~#Z%4BzIpTJ$GUr=+Te_dW&pV+ONnN@KaC#W$}FX^AjJ1jL5MR3 zm|invK}Zl9jPgAbO_s+wMb*s_*w;5o2t-W7C$`%jJ;hXmYf2g2WuM+8$U|t7<%tFa zAZmRN)zvN4_C*`n7w807*qoM6N<$f(szLV*mgE literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/quickiefabric/textures/block/kelpstack_side.png b/src/main/resources/assets/quickiefabric/textures/block/kelpstack_side.png new file mode 100644 index 0000000000000000000000000000000000000000..7e604016c7201e9a7d99f492091dad5d01f24943 GIT binary patch literal 1898 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 Z3BS)Odh2E{i~Rrq002ovPDHLkV1h1MwVnU~ literal 0 HcmV?d00001 diff --git a/src/main/resources/data/quickiefabric/recipes/dried_kelpblock_from_campfire.json b/src/main/resources/data/quickiefabric/recipes/dried_kelpblock_from_campfire.json new file mode 100644 index 0000000..dbba95b --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/dried_kelpblock_from_campfire.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:campfire_cooking", + "ingredient": { + "item": "quickiefabric:kelpstack" + }, + "result": "minecraft:dried_kelp_block", + "experience": 0.9, + "cookingtime": 615 +} diff --git a/src/main/resources/data/quickiefabric/recipes/dried_kelpblock_from_oven.json b/src/main/resources/data/quickiefabric/recipes/dried_kelpblock_from_oven.json new file mode 100644 index 0000000..a5f09f8 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/dried_kelpblock_from_oven.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smoking", + "ingredient": { + "item": "quickiefabric:kelpstack" + }, + "result": "minecraft:dried_kelp_block", + "experience": 0, + "cookingtime": 100 +} diff --git a/src/main/resources/data/quickiefabric/recipes/kelpstack_from_kelp.json b/src/main/resources/data/quickiefabric/recipes/kelpstack_from_kelp.json new file mode 100644 index 0000000..abb3709 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/kelpstack_from_kelp.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "kkk", + "kkk", + "kkk" + ], + "key": { + "k": { + "item": "minecraft:kelp" + } + }, + "result": { + "item": "quickiefabric:kelpstack", + "count": 1 + } +} \ No newline at end of file