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 0000000..d9b32b5 Binary files /dev/null and b/src/main/resources/assets/quickiefabric/textures/block/kelpstack_bottom.png differ 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 0000000..7e60401 Binary files /dev/null and b/src/main/resources/assets/quickiefabric/textures/block/kelpstack_side.png differ diff --git a/src/main/resources/assets/quickiefabric/textures/block/kelpstack_top.png b/src/main/resources/assets/quickiefabric/textures/block/kelpstack_top.png new file mode 100644 index 0000000..cba95e6 Binary files /dev/null and b/src/main/resources/assets/quickiefabric/textures/block/kelpstack_top.png differ 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