From 8572dd67c0c21c9f21518153248bbdce2c017077 Mon Sep 17 00:00:00 2001 From: LocusAzzurro Date: Tue, 26 Sep 2023 22:41:35 +0200 Subject: [PATCH] :sparkles: leaf piles --- src/generated/resources/.cache/cache | 11 ++- .../blockstates/large_leaf_pile.json | 19 +++++ .../blockstates/medium_leaf_pile.json | 19 +++++ .../blockstates/small_leaf_pile.json | 19 +++++ .../models/item/large_leaf_pile.json | 3 + .../models/item/medium_leaf_pile.json | 3 + .../models/item/small_leaf_pile.json | 3 + .../minecraft/tags/blocks/mineable/hoe.json | 5 +- .../loot_tables/blocks/large_leaf_pile.json | 16 +++++ .../loot_tables/blocks/medium_leaf_pile.json | 16 +++++ .../loot_tables/blocks/small_leaf_pile.json | 16 +++++ .../event/ModClientRenderEventHandler.java | 3 + .../data/registry/BlockRegistry.java | 9 +++ .../data/registry/ItemRegistry.java | 5 ++ .../models/block/large_green_ivy.json | 2 +- .../models/block/large_leaf_pile.json | 68 ++++++++++++++++++ .../models/block/medium_green_ivy.json | 2 +- .../models/block/medium_leaf_pile.json | 68 ++++++++++++++++++ .../models/block/small_green_ivy.json | 2 +- .../models/block/small_leaf_pile.json | 68 ++++++++++++++++++ .../textures/block/large_leaf_pile.png | Bin 0 -> 230 bytes .../textures/block/medium_leaf_pile.png | Bin 0 -> 185 bytes .../textures/block/small_leaf_pile.png | Bin 0 -> 188 bytes 23 files changed, 352 insertions(+), 5 deletions(-) create mode 100644 src/generated/resources/assets/ultramarine/blockstates/large_leaf_pile.json create mode 100644 src/generated/resources/assets/ultramarine/blockstates/medium_leaf_pile.json create mode 100644 src/generated/resources/assets/ultramarine/blockstates/small_leaf_pile.json create mode 100644 src/generated/resources/assets/ultramarine/models/item/large_leaf_pile.json create mode 100644 src/generated/resources/assets/ultramarine/models/item/medium_leaf_pile.json create mode 100644 src/generated/resources/assets/ultramarine/models/item/small_leaf_pile.json create mode 100644 src/generated/resources/data/ultramarine/loot_tables/blocks/large_leaf_pile.json create mode 100644 src/generated/resources/data/ultramarine/loot_tables/blocks/medium_leaf_pile.json create mode 100644 src/generated/resources/data/ultramarine/loot_tables/blocks/small_leaf_pile.json create mode 100644 src/main/resources/assets/ultramarine/models/block/large_leaf_pile.json create mode 100644 src/main/resources/assets/ultramarine/models/block/medium_leaf_pile.json create mode 100644 src/main/resources/assets/ultramarine/models/block/small_leaf_pile.json create mode 100644 src/main/resources/assets/ultramarine/textures/block/large_leaf_pile.png create mode 100644 src/main/resources/assets/ultramarine/textures/block/medium_leaf_pile.png create mode 100644 src/main/resources/assets/ultramarine/textures/block/small_leaf_pile.png diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 885644f2..1e011d57 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -231,6 +231,7 @@ eb6ac4e0a7f6bfdbfb820d49e901601463a2b297 assets/ultramarine/blockstates/knife_re fd82b5b2893049ddfbe86d838d7fe6d12fbee6a9 assets/ultramarine/blockstates/large_green_ivy.json 76ce341f0561b2b880f01c1d364edd7848a819fc assets/ultramarine/blockstates/large_green_su_style_caihua.json 7ae819f4a682d49fb0c7084d41798f10f7d0ad39 assets/ultramarine/blockstates/large_landscape_painting_screen.json +2cf875379aa548939c93b21e8140ba6f99e6728a assets/ultramarine/blockstates/large_leaf_pile.json 9a871c98279ee6cc34e131ea09e43f4ec62cce49 assets/ultramarine/blockstates/large_lotus_leaf.json 0e2192dd7a28ff87e231cbdf768b979d6a585542 assets/ultramarine/blockstates/large_red_ivy.json 3b3461e874000b370852c48b63607b236c6c27ee assets/ultramarine/blockstates/large_rosewood_panel.json @@ -260,6 +261,7 @@ ef83556914bdb117c363066b5c8ad007f3f060d1 assets/ultramarine/blockstates/lotus_bu de2ef08ba562cad26ba62896ad83bbf03c48220b assets/ultramarine/blockstates/magnesite_ore.json c3c5093ae280e3e7832e78b5124bd4a9f7a79b1e assets/ultramarine/blockstates/medium_blue_curtain.json 5393b9276ade7fdc6a80e18d31c186c9f03ccd00 assets/ultramarine/blockstates/medium_green_ivy.json +d6c679f778a1e86abd6e024cbaa8dd8bba2f4069 assets/ultramarine/blockstates/medium_leaf_pile.json 8773b80446f00adbe5b40b6fbcf7a3691a76bcdc assets/ultramarine/blockstates/medium_lotus.json 1f0bb097db64da5ca832791f64884f60ca8b2648 assets/ultramarine/blockstates/medium_lotus_leaf.json 01100c1b939190383aa0f570af38525147ebe1db assets/ultramarine/blockstates/medium_lotus_leaf_cluster.json @@ -343,6 +345,7 @@ c62d1bb08ff4cc084073d4dc4a349757bbb19a58 assets/ultramarine/blockstates/small_bl 636a9f6b8f5fe9d362d3debe6ec8c344f791c927 assets/ultramarine/blockstates/small_green_glazed_guardian_lion.json 5ffc82c31bbfdb49e42fdc5e1b0a08506ec67762 assets/ultramarine/blockstates/small_green_ivy.json f9841cdf4e395a7e0d88cfaff72dc12ecb8683cd assets/ultramarine/blockstates/small_jade_guardian_lion.json +1911db693316bd1643ddc2a6f51a57753c7ad3c2 assets/ultramarine/blockstates/small_leaf_pile.json 936e4fb9e01d1a415035cc4f6cd6fa813db9922f assets/ultramarine/blockstates/small_lotus_leaf.json ba7e28e8dcef18e65e01091ae2bb4ef3605194d2 assets/ultramarine/blockstates/small_lotus_leaf_cluster.json 5b2c5c483ef9e0f65040e570a5a3c976b9a1a15c assets/ultramarine/blockstates/small_red_ivy.json @@ -987,6 +990,7 @@ d808bff570c0f456141266911b8c6e171cf5dfd5 assets/ultramarine/models/item/large_gr 745f31f2ca1d5ab45d7c923bd00d5122b041da65 assets/ultramarine/models/item/large_green_ivy.json 3bf171aa0b64059be4825c2af537aabdd0ff4648 assets/ultramarine/models/item/large_green_su_style_caihua.json c4ee5c3e33c6dbe20d83300c78060b5553e03733 assets/ultramarine/models/item/large_landscape_painting_screen.json +6bd7f6505445ac02342bc9771f83341fc10224df assets/ultramarine/models/item/large_leaf_pile.json e5d3856435aae424d9881344f19eb6c9d5ee8c75 assets/ultramarine/models/item/large_lotus_leaf.json 465c1f3b61b3dd3c5701efa6847d7fbf66c5e8ac assets/ultramarine/models/item/large_red_ivy.json 4b77957b4cdd09bdcb7c749fb9710948fce03e9a assets/ultramarine/models/item/large_rosewood_panel.json @@ -1018,6 +1022,7 @@ b4d3176457ddfb95af0c379bceaaa3a3f81108a8 assets/ultramarine/models/item/magnesit ff866531331de28904c8bc3de6a5aee2b76925e1 assets/ultramarine/models/item/magnesite_ore.json 6060863e5fc9052f6119bf39cb86900da858d0c7 assets/ultramarine/models/item/medium_blue_curtain.json ef6ca3418a927c38b5b243d61c5eb3b525088b08 assets/ultramarine/models/item/medium_green_ivy.json +0bc6d4256526ff1110688f09434ca731ee5c52f6 assets/ultramarine/models/item/medium_leaf_pile.json f46f77eba02b6cc1a4cdb3a026b8e7e5e5c22b30 assets/ultramarine/models/item/medium_lotus.json 277f706d0eb7305c852a38bd97581466dca03b2a assets/ultramarine/models/item/medium_lotus_leaf.json e2981cb7007ec60bc26395b4a8be6b126e658680 assets/ultramarine/models/item/medium_lotus_leaf_cluster.json @@ -1118,6 +1123,7 @@ e09cf14f696d27b2ca1f4dd128b320f295bc0e83 assets/ultramarine/models/item/small_da d07d5653adf8ba8d09314d98e6c7db4218064ca2 assets/ultramarine/models/item/small_green_glazed_guardian_lion.json 6c3b98a02ecbfeec52a3ffce21d59137e50ee086 assets/ultramarine/models/item/small_green_ivy.json 3382ef82d1ea835a0d845fad04d6139973e5c424 assets/ultramarine/models/item/small_jade_guardian_lion.json +63c59f127aa18c2ab77993778911612cddd499fb assets/ultramarine/models/item/small_leaf_pile.json 31d3a6908b76b0446562c09fd68e6edc69f4e78b assets/ultramarine/models/item/small_lotus_leaf.json a4cf39fe76e7f5316a7a7d29fe6ea6f67ff627d3 assets/ultramarine/models/item/small_lotus_leaf_cluster.json 2f2b3e148786b434948a95270a1add54c6674f50 assets/ultramarine/models/item/small_red_ivy.json @@ -1219,7 +1225,7 @@ e48e56ce7a08d5506893c975360626e425e808ea assets/ultramarine/models/item/yellow_s 645284c5035f3bb0e95477cf7f70b5a9a5d5ac32 data/minecraft/recipes/white_candle.json bb3cff8ef2b03825fc5bbeffb336436d70edcaa4 data/minecraft/tags/blocks/fences.json 82d6e6cfa5277af14e962ba26c3f95f28d32126e data/minecraft/tags/blocks/mineable/axe.json -ef4301406263e8f22bc87755761776f9bf5ad896 data/minecraft/tags/blocks/mineable/hoe.json +f322d81978eac3de4a54e222a418652bf27462bb data/minecraft/tags/blocks/mineable/hoe.json 360e5afdaf90d3cd866696c8d1e83179505464c7 data/minecraft/tags/blocks/mineable/pickaxe.json 17545dd0c9613eb0477c89b2b64307a497bc1d58 data/minecraft/tags/blocks/needs_iron_tool.json 9a78734519a787b16bc1a768f35bcbf3e480d116 data/minecraft/tags/blocks/needs_stone_tool.json @@ -1575,6 +1581,7 @@ f156f9000638d646d1b5efd5eb9faae72277695f data/ultramarine/loot_tables/blocks/jad 877e7f4ce1f82a950437929cb093b423e7027e14 data/ultramarine/loot_tables/blocks/large_green_ivy.json 23caf0887067fd555bc484e4a0f910c3cfd2217b data/ultramarine/loot_tables/blocks/large_green_su_style_caihua.json a71909cfdf6e4e8894455273f0465937160644dd data/ultramarine/loot_tables/blocks/large_landscape_painting_screen.json +7440f2812f0565a2463e77b55fc4b0edbfa16bab data/ultramarine/loot_tables/blocks/large_leaf_pile.json e5d7b4ce1a0c2ca9708ece1c44fadd2f7764a0ee data/ultramarine/loot_tables/blocks/large_lotus_leaf.json abdeeef42c447763f587eeb844ef9ad6f0693b54 data/ultramarine/loot_tables/blocks/large_red_ivy.json 0ad44be9269006659a9cfadb2b9483fcea255a57 data/ultramarine/loot_tables/blocks/large_rosewood_panel.json @@ -1604,6 +1611,7 @@ bc6ba4d5d13b2e361b38e66a2d9fbb483d9bee4a data/ultramarine/loot_tables/blocks/lot 2114a76b69b7936384dc8501f263c9f24956ac8d data/ultramarine/loot_tables/blocks/magnesite_ore.json 75a4fd41a89209ddba84d96312993fe73451a857 data/ultramarine/loot_tables/blocks/medium_blue_curtain.json 6ad86855fe6c26db9983411bc2f1a99b428b733b data/ultramarine/loot_tables/blocks/medium_green_ivy.json +8b1abd539a773f66e87057d3b44cb1703c99dd6c data/ultramarine/loot_tables/blocks/medium_leaf_pile.json e1a8d05eb319756294c1148de8b4d9a559731da5 data/ultramarine/loot_tables/blocks/medium_lotus.json 15ba12546fe6c480d60d8ff783626b8af29204a4 data/ultramarine/loot_tables/blocks/medium_lotus_leaf.json e1bbd8497a8097a83ea283423ff9719a0b3ad194 data/ultramarine/loot_tables/blocks/medium_lotus_leaf_cluster.json @@ -1677,6 +1685,7 @@ a514f1d738ee55651b67c03e9a7d59f6f951170e data/ultramarine/loot_tables/blocks/sma 243225f7bc55a7856dbcc0b0d9b0d2fed3f0a9f7 data/ultramarine/loot_tables/blocks/small_green_glazed_guardian_lion.json f3178e1714119764bc215a7afe1da9c1ed2287d7 data/ultramarine/loot_tables/blocks/small_green_ivy.json 0840b27a30767c92301e662c959217f4187ccd00 data/ultramarine/loot_tables/blocks/small_jade_guardian_lion.json +ab54ef1a21e0dc66948bcb6d10d1aecf9838d444 data/ultramarine/loot_tables/blocks/small_leaf_pile.json 9f53e30fb08a59436fbed3b89f7d0bf3c5cecf3c data/ultramarine/loot_tables/blocks/small_lotus_leaf.json 3cbd59b480bede98aac11f8d35ceade24bac4ccd data/ultramarine/loot_tables/blocks/small_lotus_leaf_cluster.json 09e567372027ad6e0da19c9146dcb3ab682bcee9 data/ultramarine/loot_tables/blocks/small_red_ivy.json diff --git a/src/generated/resources/assets/ultramarine/blockstates/large_leaf_pile.json b/src/generated/resources/assets/ultramarine/blockstates/large_leaf_pile.json new file mode 100644 index 00000000..952fecdb --- /dev/null +++ b/src/generated/resources/assets/ultramarine/blockstates/large_leaf_pile.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "ultramarine:block/large_leaf_pile", + "y": 180 + }, + "facing=south": { + "model": "ultramarine:block/large_leaf_pile" + }, + "facing=west": { + "model": "ultramarine:block/large_leaf_pile", + "y": 90 + }, + "facing=east": { + "model": "ultramarine:block/large_leaf_pile", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/blockstates/medium_leaf_pile.json b/src/generated/resources/assets/ultramarine/blockstates/medium_leaf_pile.json new file mode 100644 index 00000000..2646cb80 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/blockstates/medium_leaf_pile.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "ultramarine:block/medium_leaf_pile", + "y": 180 + }, + "facing=south": { + "model": "ultramarine:block/medium_leaf_pile" + }, + "facing=west": { + "model": "ultramarine:block/medium_leaf_pile", + "y": 90 + }, + "facing=east": { + "model": "ultramarine:block/medium_leaf_pile", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/blockstates/small_leaf_pile.json b/src/generated/resources/assets/ultramarine/blockstates/small_leaf_pile.json new file mode 100644 index 00000000..31bae1fe --- /dev/null +++ b/src/generated/resources/assets/ultramarine/blockstates/small_leaf_pile.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "ultramarine:block/small_leaf_pile", + "y": 180 + }, + "facing=south": { + "model": "ultramarine:block/small_leaf_pile" + }, + "facing=west": { + "model": "ultramarine:block/small_leaf_pile", + "y": 90 + }, + "facing=east": { + "model": "ultramarine:block/small_leaf_pile", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/large_leaf_pile.json b/src/generated/resources/assets/ultramarine/models/item/large_leaf_pile.json new file mode 100644 index 00000000..1a136c21 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/large_leaf_pile.json @@ -0,0 +1,3 @@ +{ + "parent": "ultramarine:block/large_leaf_pile" +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/medium_leaf_pile.json b/src/generated/resources/assets/ultramarine/models/item/medium_leaf_pile.json new file mode 100644 index 00000000..d9909869 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/medium_leaf_pile.json @@ -0,0 +1,3 @@ +{ + "parent": "ultramarine:block/medium_leaf_pile" +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/small_leaf_pile.json b/src/generated/resources/assets/ultramarine/models/item/small_leaf_pile.json new file mode 100644 index 00000000..0b59b1d4 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/small_leaf_pile.json @@ -0,0 +1,3 @@ +{ + "parent": "ultramarine:block/small_leaf_pile" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/hoe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/hoe.json index f4f369e5..bd7e21e0 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/hoe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/hoe.json @@ -27,6 +27,9 @@ "ultramarine:large_yellow_ivy", "ultramarine:small_green_ivy", "ultramarine:medium_green_ivy", - "ultramarine:large_green_ivy" + "ultramarine:large_green_ivy", + "ultramarine:small_leaf_pile", + "ultramarine:medium_leaf_pile", + "ultramarine:large_leaf_pile" ] } \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/loot_tables/blocks/large_leaf_pile.json b/src/generated/resources/data/ultramarine/loot_tables/blocks/large_leaf_pile.json new file mode 100644 index 00000000..0576bd2a --- /dev/null +++ b/src/generated/resources/data/ultramarine/loot_tables/blocks/large_leaf_pile.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "large_leaf_pile", + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "ultramarine:large_leaf_pile" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/loot_tables/blocks/medium_leaf_pile.json b/src/generated/resources/data/ultramarine/loot_tables/blocks/medium_leaf_pile.json new file mode 100644 index 00000000..b0d9281e --- /dev/null +++ b/src/generated/resources/data/ultramarine/loot_tables/blocks/medium_leaf_pile.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "medium_leaf_pile", + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "ultramarine:medium_leaf_pile" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/loot_tables/blocks/small_leaf_pile.json b/src/generated/resources/data/ultramarine/loot_tables/blocks/small_leaf_pile.json new file mode 100644 index 00000000..aed30cca --- /dev/null +++ b/src/generated/resources/data/ultramarine/loot_tables/blocks/small_leaf_pile.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "small_leaf_pile", + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "ultramarine:small_leaf_pile" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/java/com/voxelutopia/ultramarine/client/event/ModClientRenderEventHandler.java b/src/main/java/com/voxelutopia/ultramarine/client/event/ModClientRenderEventHandler.java index 2122840d..92417645 100644 --- a/src/main/java/com/voxelutopia/ultramarine/client/event/ModClientRenderEventHandler.java +++ b/src/main/java/com/voxelutopia/ultramarine/client/event/ModClientRenderEventHandler.java @@ -144,6 +144,9 @@ private static void setRenderLayers(FMLClientSetupEvent e) { ItemBlockRenderTypes.setRenderLayer(BlockRegistry.SMALL_GREEN_IVY.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(BlockRegistry.MEDIUM_GREEN_IVY.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(BlockRegistry.LARGE_GREEN_IVY.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(BlockRegistry.SMALL_LEAF_PILE.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(BlockRegistry.MEDIUM_LEAF_PILE.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(BlockRegistry.LARGE_LEAF_PILE.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(BlockRegistry.WOODWORKING_WORKBENCH.get(), RenderType.cutout()); }); } diff --git a/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java b/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java index 6bbe986e..ff5fda54 100644 --- a/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java +++ b/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java @@ -729,6 +729,15 @@ public class BlockRegistry { public static final RegistryObject LARGE_GREEN_IVY = BLOCKS.register("large_green_ivy", () -> new WallSideBlock(BaseBlockProperty.PLANT)); + // LEAVES + + public static final RegistryObject SMALL_LEAF_PILE = BLOCKS.register("small_leaf_pile", + () -> DecorativeBlock.with(BaseBlockProperty.PLANT).shaped(DecorativeBlock.FLAT_16).directional().noCollision().noOcclusion().build()); + public static final RegistryObject MEDIUM_LEAF_PILE = BLOCKS.register("medium_leaf_pile", + () -> DecorativeBlock.with(BaseBlockProperty.PLANT).shaped(DecorativeBlock.FLAT_16).directional().noCollision().noOcclusion().build()); + public static final RegistryObject LARGE_LEAF_PILE = BLOCKS.register("large_leaf_pile", + () -> DecorativeBlock.with(BaseBlockProperty.PLANT).shaped(DecorativeBlock.FLAT_16).directional().noCollision().noOcclusion().build()); + /** * LAMPS */ diff --git a/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java b/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java index 37f68423..0ce53b46 100644 --- a/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java +++ b/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java @@ -581,6 +581,11 @@ public class ItemRegistry { public static final RegistryObject MEDIUM_GREEN_IVY = fromBlock(BlockRegistry.MEDIUM_GREEN_IVY, ModCreativeTab.PLANTS); public static final RegistryObject LARGE_GREEN_IVY = fromBlock(BlockRegistry.LARGE_GREEN_IVY, ModCreativeTab.PLANTS); + // LEAVES + + public static final RegistryObject SMALL_LEAF_PILE = fromBlock(BlockRegistry.SMALL_LEAF_PILE, ModCreativeTab.PLANTS); + public static final RegistryObject MEDIUM_LEAF_PILE = fromBlock(BlockRegistry.MEDIUM_LEAF_PILE, ModCreativeTab.PLANTS); + public static final RegistryObject LARGE_LEAF_PILE = fromBlock(BlockRegistry.LARGE_LEAF_PILE, ModCreativeTab.PLANTS); /** * LAMPS diff --git a/src/main/resources/assets/ultramarine/models/block/large_green_ivy.json b/src/main/resources/assets/ultramarine/models/block/large_green_ivy.json index b8ca0427..b4aabace 100644 --- a/src/main/resources/assets/ultramarine/models/block/large_green_ivy.json +++ b/src/main/resources/assets/ultramarine/models/block/large_green_ivy.json @@ -2,6 +2,6 @@ "parent": "ultramarine:block/large_ivy", "textures": { "1": "ultramarine:block/large_green_ivy", - "particle": "minecraft:block/spruce_leaves" + "particle": "block/moss_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/ultramarine/models/block/large_leaf_pile.json b/src/main/resources/assets/ultramarine/models/block/large_leaf_pile.json new file mode 100644 index 00000000..55cbce7d --- /dev/null +++ b/src/main/resources/assets/ultramarine/models/block/large_leaf_pile.json @@ -0,0 +1,68 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [64, 64], + "render_type": "cutout", + "textures": { + "2": "ultramarine:block/large_leaf_pile", + "particle": "block/moss_block" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 0.25, 16], + "faces": { + "north": {"uv": [4.25, 0, 8.25, 0.25], "texture": "#2"}, + "east": {"uv": [4.25, 0.5, 8.25, 0.75], "texture": "#2"}, + "south": {"uv": [4.25, 1, 8.25, 1.25], "texture": "#2"}, + "west": {"uv": [4.25, 1.5, 8.25, 1.75], "texture": "#2"}, + "up": {"uv": [4, 4, 0, 0], "texture": "#2"}, + "down": {"uv": [0, 0, 4, 4], "texture": "#2"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 3.5], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 3.5], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "translation": [0, 5, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 45, 0], + "translation": [0, 5, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 45, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "translation": [0, 14.5, 0] + }, + "fixed": { + "rotation": [0, 20.5, 0], + "translation": [0, -16.25, -80] + } + }, + "groups": [ + { + "name": "group", + "origin": [7, 0.94181, 5.74025], + "color": 0, + "children": [0] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ultramarine/models/block/medium_green_ivy.json b/src/main/resources/assets/ultramarine/models/block/medium_green_ivy.json index c4814f85..f14bb90d 100644 --- a/src/main/resources/assets/ultramarine/models/block/medium_green_ivy.json +++ b/src/main/resources/assets/ultramarine/models/block/medium_green_ivy.json @@ -2,6 +2,6 @@ "parent": "ultramarine:block/medium_ivy", "textures": { "1": "ultramarine:block/medium_green_ivy", - "particle": "minecraft:block/spruce_leaves" + "particle": "block/moss_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/ultramarine/models/block/medium_leaf_pile.json b/src/main/resources/assets/ultramarine/models/block/medium_leaf_pile.json new file mode 100644 index 00000000..392eb98b --- /dev/null +++ b/src/main/resources/assets/ultramarine/models/block/medium_leaf_pile.json @@ -0,0 +1,68 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [64, 64], + "render_type": "cutout", + "textures": { + "0": "ultramarine:block/medium_leaf_pile", + "particle": "block/moss_block" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 0.25, 16], + "faces": { + "north": {"uv": [4, 4, 8, 4], "texture": "#0"}, + "east": {"uv": [0, 4, 4, 4], "texture": "#0"}, + "south": {"uv": [12, 4, 16, 4], "texture": "#0"}, + "west": {"uv": [8, 4, 12, 4], "texture": "#0"}, + "up": {"uv": [8, 4, 4, 0], "texture": "#0"}, + "down": {"uv": [4, 0, 8, 4], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 3.5], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 3.5], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "translation": [0, 5, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 45, 0], + "translation": [0, 5, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 45, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "translation": [0, 14.5, 0] + }, + "fixed": { + "rotation": [0, 20.5, 0], + "translation": [0, -16.25, -80] + } + }, + "groups": [ + { + "name": "group", + "origin": [7, 0.94181, 5.74025], + "color": 0, + "children": [0] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ultramarine/models/block/small_green_ivy.json b/src/main/resources/assets/ultramarine/models/block/small_green_ivy.json index 6c377df5..2f81e252 100644 --- a/src/main/resources/assets/ultramarine/models/block/small_green_ivy.json +++ b/src/main/resources/assets/ultramarine/models/block/small_green_ivy.json @@ -2,6 +2,6 @@ "parent": "ultramarine:block/small_ivy", "textures": { "1": "ultramarine:block/small_green_ivy", - "particle": "minecraft:block/spruce_leaves" + "particle": "block/moss_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/ultramarine/models/block/small_leaf_pile.json b/src/main/resources/assets/ultramarine/models/block/small_leaf_pile.json new file mode 100644 index 00000000..275b7ebb --- /dev/null +++ b/src/main/resources/assets/ultramarine/models/block/small_leaf_pile.json @@ -0,0 +1,68 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [64, 64], + "render_type": "cutout", + "textures": { + "2": "ultramarine:block/small_leaf_pile", + "particle": "block/moss_block" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 0.25, 16], + "faces": { + "north": {"uv": [4.25, 0, 8.25, 0.25], "texture": "#2"}, + "east": {"uv": [4.25, 0.5, 8.25, 0.75], "texture": "#2"}, + "south": {"uv": [4.25, 1, 8.25, 1.25], "texture": "#2"}, + "west": {"uv": [4.25, 1.5, 8.25, 1.75], "texture": "#2"}, + "up": {"uv": [4, 4, 0, 0], "texture": "#2"}, + "down": {"uv": [0, 0, 4, 4], "texture": "#2"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 3.5], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 3.5], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "translation": [0, 5, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 45, 0], + "translation": [0, 5, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 45, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "translation": [0, 14.5, 0] + }, + "fixed": { + "rotation": [0, 20.5, 0], + "translation": [0, -16.25, -80] + } + }, + "groups": [ + { + "name": "group", + "origin": [7, 0.94181, 5.74025], + "color": 0, + "children": [0] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ultramarine/textures/block/large_leaf_pile.png b/src/main/resources/assets/ultramarine/textures/block/large_leaf_pile.png new file mode 100644 index 0000000000000000000000000000000000000000..66038f570cc8ae879d57203940ee3ad040842e98 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Ydu{YLn`LHy>XE9kb?ljfy+^! zIG3>huY59{?UL`T4dSaOOkh(AD6w?Q_btzHEVibVqxm` z*|Ycc#&&GFeN^v&aTl{m?e0~c8*57sTKL@Wc)Z{CT}5Dc@ruq1Uvk&9yl?fhoBm^# z)PvhLa~iH*dOBH;UvlC4Bbq7(2-!! baDErltpJ<<*Xqjtg9JQX{an^LB{Ts5_;+NN literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ultramarine/textures/block/medium_leaf_pile.png b/src/main/resources/assets/ultramarine/textures/block/medium_leaf_pile.png new file mode 100644 index 0000000000000000000000000000000000000000..a7ebff2c273f8328e69a0563101b6a342a9e258f GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=4W2HJAr*7pUOvcq$U%Vh0%t_C zsD_XS|IX?UY0NK=sa^73#i7XCk-%!XhTU4=8tp*=D~ zX(O|3tF``w+&wJ24OqK2F?1ba5n1M)+Q}x^xnFz#ulm2IKP_jO9ph~s=a>85rp(wc z{pjKJWvmPgKdg6($CtNt%F8or{=1bG*J#9CC<}ts!etW~2>?+%N h`_Hih?FNG%>&)9bmD$B?4ujmu;OXk;vd$@?2>`FaMu-3a literal 0 HcmV?d00001