diff --git a/src/main/java/xyz/limepot/roses_mod/RosesMod.java b/src/main/java/xyz/limepot/roses_mod/RosesMod.java index d413753..79a4598 100644 --- a/src/main/java/xyz/limepot/roses_mod/RosesMod.java +++ b/src/main/java/xyz/limepot/roses_mod/RosesMod.java @@ -34,6 +34,8 @@ public class RosesMod implements ModInitializer { //Cyan Rose public static final Block CYAN_ROSE = new FlowerBlock(StatusEffects.NAUSEA, 8, QuiltBlockSettings.copyOf(Blocks.POPPY).nonOpaque()); public static final Block POTTED_CYAN = new FlowerPotBlock(CYAN_ROSE, QuiltBlockSettings.copyOf(Blocks.POTTED_POPPY)); + //Cyan Rose Bush + public static final Block CYAN_ROSE_BUSH = new TallPlantBlock(QuiltBlockSettings.copyOf(Blocks.LARGE_FERN)); @Override @@ -52,7 +54,9 @@ public class RosesMod implements ModInitializer { Registry.register(Registries.ITEM, new Identifier(MOD_ID, "cyan_rose"), new BlockItem(CYAN_ROSE, new QuiltItemSettings())); //POTTED CYAN ROSE Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "potted_cyan"), POTTED_CYAN); - + //CYAN ROSE BUSH + Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "cyan_rose_bush"), CYAN_ROSE_BUSH); + Registry.register(Registries.ITEM, new Identifier(MOD_ID, "cyan_rose_bush"), new BlockItem(CYAN_ROSE_BUSH, new QuiltItemSettings())); //CREATIVE TABS ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register(content -> { @@ -61,6 +65,9 @@ public class RosesMod implements ModInitializer { ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register(content -> { content.addAfter(Items.BLUE_ORCHID, CYAN_ROSE); }); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register(content -> { + content.addAfter(Items.ROSE_BUSH, CYAN_ROSE_BUSH); + }); //LOOT TABLES @@ -73,6 +80,7 @@ public class RosesMod implements ModInitializer { }); + //INIT LOGGER.info("Hello Quilt world from {}!", mod.metadata().name()); } diff --git a/src/main/java/xyz/limepot/roses_mod/RosesModClient.java b/src/main/java/xyz/limepot/roses_mod/RosesModClient.java index e6f6ae8..626a1b7 100644 --- a/src/main/java/xyz/limepot/roses_mod/RosesModClient.java +++ b/src/main/java/xyz/limepot/roses_mod/RosesModClient.java @@ -15,5 +15,8 @@ public class RosesModClient implements ClientModInitializer { //CYAN ROSE BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(), RosesMod.POTTED_CYAN); BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(), RosesMod.CYAN_ROSE); + + //CYAN ROSE BUSH + BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(), RosesMod.CYAN_ROSE_BUSH); } } diff --git a/src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json b/src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json new file mode 100644 index 0000000..eaf06c4 --- /dev/null +++ b/src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json @@ -0,0 +1,10 @@ +{ + "variants": { + "half=lower": { + "model": "roses_mod:block/cyan_rose_bush_bottom" + }, + "half=upper": { + "model": "roses_mod:block/cyan_rose_bush_top" + } + } +} diff --git a/src/main/resources/assets/roses_mod/lang/en_us.json b/src/main/resources/assets/roses_mod/lang/en_us.json index 08f6134..3c022ca 100644 --- a/src/main/resources/assets/roses_mod/lang/en_us.json +++ b/src/main/resources/assets/roses_mod/lang/en_us.json @@ -2,5 +2,6 @@ "block.roses_mod.rose_flower": "Rose", "block.roses_mod.potted_rose": "Potted Rose", "block.roses_mod.cyan_rose": "Cyan Rose", - "block.roses_mod.potted_cyan": "Potted Cyan Rose" + "block.roses_mod.potted_cyan": "Potted Cyan Rose", + "block.roses_mod.cyan_rose_bush": "Cyan Rose Bush" } diff --git a/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_bottom.json b/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_bottom.json new file mode 100644 index 0000000..95d7c86 --- /dev/null +++ b/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "roses_mod:block/cyan_rose_bush_bottom" + } +} diff --git a/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_top.json b/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_top.json new file mode 100644 index 0000000..24e8cb0 --- /dev/null +++ b/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "roses_mod:block/cyan_rose_bush_top" + } +} diff --git a/src/main/resources/assets/roses_mod/models/item/cyan_rose_bush.json b/src/main/resources/assets/roses_mod/models/item/cyan_rose_bush.json new file mode 100644 index 0000000..423fb79 --- /dev/null +++ b/src/main/resources/assets/roses_mod/models/item/cyan_rose_bush.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "roses_mod:block/cyan_rose_bush_top" + } +} diff --git a/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_bottom.png b/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_bottom.png new file mode 100644 index 0000000..882a660 Binary files /dev/null and b/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_bottom.png differ diff --git a/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_top.png b/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_top.png new file mode 100644 index 0000000..cfe9caa Binary files /dev/null and b/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_top.png differ diff --git a/src/main/resources/data/minecraft/tags/blocks/tall_flowers.json b/src/main/resources/data/minecraft/tags/blocks/tall_flowers.json new file mode 100644 index 0000000..ad83bf8 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/tall_flowers.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "roses_mod:cyan_rose_bush" + ] +} diff --git a/src/main/resources/data/minecraft/tags/items/tall_flowers.json b/src/main/resources/data/minecraft/tags/items/tall_flowers.json new file mode 100644 index 0000000..ad83bf8 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/tall_flowers.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "roses_mod:cyan_rose_bush" + ] +} diff --git a/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json b/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json new file mode 100644 index 0000000..9e19db2 --- /dev/null +++ b/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 2, + "entries": [ + { + "type": "minecraft:item", + "name": "roses_mod:cyan_rose" + } + ] + } + ] +}