From eb38d6a38b492a700bf1aa5846381f9db98e3cfc Mon Sep 17 00:00:00 2001 From: LocusAzzurro Date: Wed, 27 Sep 2023 20:09:27 +0200 Subject: [PATCH] :sparkles: last bonsai --- src/generated/resources/.cache/cache | 8 +- .../large_greeting_pine_bonsai.json | 19 + .../medium_greeting_pine_bonsai.json | 19 + .../small_white_porcelain_vase_bonsai.json | 126 +++ .../item/large_greeting_pine_bonsai.json | 3 + .../item/medium_greeting_pine_bonsai.json | 3 + .../small_white_porcelain_vase_bonsai.json | 3 + .../tags/blocks/mineable/pickaxe.json | 3 + .../event/ModClientRenderEventHandler.java | 4 +- .../data/registry/BlockRegistry.java | 6 + .../data/registry/ItemRegistry.java | 3 + .../block/large_greeting_pine_bonsai.json | 742 ++++++++++++++++++ .../block/medium_greeting_pine_bonsai.json | 316 ++++++++ .../small_white_porcelain_vase_bonsai.json | 101 +++ ..._white_porcelain_vase_bonsai_diagonal.json | 104 +++ .../block/large_greeting_pine_bonsai.png | Bin 0 -> 3587 bytes .../block/medium_greeting_pine_bonsai.png | Bin 0 -> 2763 bytes .../small_white_porcelain_vase_bonsai.png | Bin 0 -> 740 bytes 18 files changed, 1458 insertions(+), 2 deletions(-) create mode 100644 src/generated/resources/assets/ultramarine/blockstates/large_greeting_pine_bonsai.json create mode 100644 src/generated/resources/assets/ultramarine/blockstates/medium_greeting_pine_bonsai.json create mode 100644 src/generated/resources/assets/ultramarine/blockstates/small_white_porcelain_vase_bonsai.json create mode 100644 src/generated/resources/assets/ultramarine/models/item/large_greeting_pine_bonsai.json create mode 100644 src/generated/resources/assets/ultramarine/models/item/medium_greeting_pine_bonsai.json create mode 100644 src/generated/resources/assets/ultramarine/models/item/small_white_porcelain_vase_bonsai.json create mode 100644 src/main/resources/assets/ultramarine/models/block/large_greeting_pine_bonsai.json create mode 100644 src/main/resources/assets/ultramarine/models/block/medium_greeting_pine_bonsai.json create mode 100644 src/main/resources/assets/ultramarine/models/block/small_white_porcelain_vase_bonsai.json create mode 100644 src/main/resources/assets/ultramarine/models/block/small_white_porcelain_vase_bonsai_diagonal.json create mode 100644 src/main/resources/assets/ultramarine/textures/block/large_greeting_pine_bonsai.png create mode 100644 src/main/resources/assets/ultramarine/textures/block/medium_greeting_pine_bonsai.png create mode 100644 src/main/resources/assets/ultramarine/textures/block/small_white_porcelain_vase_bonsai.png diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 440416eb..b8116b39 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -233,6 +233,7 @@ e652c000ee9a3bea845e3aa61844bb08acf45a11 assets/ultramarine/blockstates/large_bo 8000ceb3443097bcf1bca6114ab2440d14411975 assets/ultramarine/blockstates/large_gray_su_style_caihua.json fd82b5b2893049ddfbe86d838d7fe6d12fbee6a9 assets/ultramarine/blockstates/large_green_ivy.json 76ce341f0561b2b880f01c1d364edd7848a819fc assets/ultramarine/blockstates/large_green_su_style_caihua.json +1bd6885e858b4f39a3a51f23f3c822828984eb8c assets/ultramarine/blockstates/large_greeting_pine_bonsai.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 @@ -266,6 +267,7 @@ de2ef08ba562cad26ba62896ad83bbf03c48220b assets/ultramarine/blockstates/magnesit c3c5093ae280e3e7832e78b5124bd4a9f7a79b1e assets/ultramarine/blockstates/medium_blue_curtain.json 72265c17e6cc04727e62a80ef5997e3913a92cf4 assets/ultramarine/blockstates/medium_bonsai.json 5393b9276ade7fdc6a80e18d31c186c9f03ccd00 assets/ultramarine/blockstates/medium_green_ivy.json +ba7c71526a051b152fbf109005707e9caa53bdd0 assets/ultramarine/blockstates/medium_greeting_pine_bonsai.json d6c679f778a1e86abd6e024cbaa8dd8bba2f4069 assets/ultramarine/blockstates/medium_leaf_pile.json 8773b80446f00adbe5b40b6fbcf7a3691a76bcdc assets/ultramarine/blockstates/medium_lotus.json 1f0bb097db64da5ca832791f64884f60ca8b2648 assets/ultramarine/blockstates/medium_lotus_leaf.json @@ -363,6 +365,7 @@ ba7e28e8dcef18e65e01091ae2bb4ef3605194d2 assets/ultramarine/blockstates/small_lo bbb634ead8373625affefa96de93fe10d94ab3d8 assets/ultramarine/blockstates/small_standing_lamp.json 4ef16bdea156eb4c12703944f7d5982001f3b490 assets/ultramarine/blockstates/small_stone_guardian_lion.json 979eece63bbe6cca6ff0276065997a91f6221a78 assets/ultramarine/blockstates/small_table.json +e9a79acb89ca30b3a9a5b4f0a8e582d305c81441 assets/ultramarine/blockstates/small_white_porcelain_vase_bonsai.json aa1a1f976bfa72fcc0c3254541c1c2018fd561cf assets/ultramarine/blockstates/small_wooden_guardian_lion.json 412bc1187d70841a0f9da34a0972b20c9fac74ce assets/ultramarine/blockstates/small_yellow_glazed_guardian_lion.json 261e9ca908796aa80b462b405966b739b3d216a8 assets/ultramarine/blockstates/small_yellow_ivy.json @@ -1004,6 +1007,7 @@ da8bb89178f57d9ade835f30e1386a96571ffc60 assets/ultramarine/models/item/large_bl d808bff570c0f456141266911b8c6e171cf5dfd5 assets/ultramarine/models/item/large_gray_su_style_caihua.json 745f31f2ca1d5ab45d7c923bd00d5122b041da65 assets/ultramarine/models/item/large_green_ivy.json 3bf171aa0b64059be4825c2af537aabdd0ff4648 assets/ultramarine/models/item/large_green_su_style_caihua.json +b731116c19030c0c3db4cd2461efbd28be582aaa assets/ultramarine/models/item/large_greeting_pine_bonsai.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 @@ -1039,6 +1043,7 @@ ff866531331de28904c8bc3de6a5aee2b76925e1 assets/ultramarine/models/item/magnesit 6060863e5fc9052f6119bf39cb86900da858d0c7 assets/ultramarine/models/item/medium_blue_curtain.json 04dfd353bb9c847e2e0a00789f2fab3c5506e2a8 assets/ultramarine/models/item/medium_bonsai.json ef6ca3418a927c38b5b243d61c5eb3b525088b08 assets/ultramarine/models/item/medium_green_ivy.json +86290986491b39eee1a763ac1ac98921eccb7695 assets/ultramarine/models/item/medium_greeting_pine_bonsai.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 @@ -1153,6 +1158,7 @@ a4cf39fe76e7f5316a7a7d29fe6ea6f67ff627d3 assets/ultramarine/models/item/small_lo 3be3b3d1953ed40db057816485e1d58cde6e50b7 assets/ultramarine/models/item/small_standing_lamp.json f1837523fb77d76788bbcd7ccae015421aefd71a assets/ultramarine/models/item/small_stone_guardian_lion.json 747166a53666ebec86ca1784ba85f9584e768682 assets/ultramarine/models/item/small_table.json +1548008148b75023dd2cd6c664b7c0a02c00fc88 assets/ultramarine/models/item/small_white_porcelain_vase_bonsai.json 64408b2be280234afb1d46b7ec6d1c900ea88dd6 assets/ultramarine/models/item/small_wooden_guardian_lion.json d1fa040f0d534ca3ce2a889fc1d2ff845a4118b4 assets/ultramarine/models/item/small_yellow_glazed_guardian_lion.json 6a87828da0146bcfd869761e3b78491fa7057c52 assets/ultramarine/models/item/small_yellow_ivy.json @@ -1250,7 +1256,7 @@ e48e56ce7a08d5506893c975360626e425e808ea assets/ultramarine/models/item/yellow_s bb3cff8ef2b03825fc5bbeffb336436d70edcaa4 data/minecraft/tags/blocks/fences.json 82d6e6cfa5277af14e962ba26c3f95f28d32126e data/minecraft/tags/blocks/mineable/axe.json f322d81978eac3de4a54e222a418652bf27462bb data/minecraft/tags/blocks/mineable/hoe.json -b14a1cd2208f34f70a0f186dfa0afb8a4da5223b data/minecraft/tags/blocks/mineable/pickaxe.json +e200c3ca77fbf5a4d4544d7c8c7d569d68f047fc 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 3186ba1b362c329daa8cf80a8536319b79fa838a data/minecraft/tags/blocks/planks.json diff --git a/src/generated/resources/assets/ultramarine/blockstates/large_greeting_pine_bonsai.json b/src/generated/resources/assets/ultramarine/blockstates/large_greeting_pine_bonsai.json new file mode 100644 index 00000000..e7a1dd45 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/blockstates/large_greeting_pine_bonsai.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "ultramarine:block/large_greeting_pine_bonsai", + "y": 180 + }, + "facing=south": { + "model": "ultramarine:block/large_greeting_pine_bonsai" + }, + "facing=west": { + "model": "ultramarine:block/large_greeting_pine_bonsai", + "y": 90 + }, + "facing=east": { + "model": "ultramarine:block/large_greeting_pine_bonsai", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/blockstates/medium_greeting_pine_bonsai.json b/src/generated/resources/assets/ultramarine/blockstates/medium_greeting_pine_bonsai.json new file mode 100644 index 00000000..f1af7d18 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/blockstates/medium_greeting_pine_bonsai.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "ultramarine:block/medium_greeting_pine_bonsai", + "y": 180 + }, + "facing=south": { + "model": "ultramarine:block/medium_greeting_pine_bonsai" + }, + "facing=west": { + "model": "ultramarine:block/medium_greeting_pine_bonsai", + "y": 90 + }, + "facing=east": { + "model": "ultramarine:block/medium_greeting_pine_bonsai", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/blockstates/small_white_porcelain_vase_bonsai.json b/src/generated/resources/assets/ultramarine/blockstates/small_white_porcelain_vase_bonsai.json new file mode 100644 index 00000000..02fc46a6 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/blockstates/small_white_porcelain_vase_bonsai.json @@ -0,0 +1,126 @@ +{ + "variants": { + "diagonal=false,facing=north,facing_shift=north": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai", + "y": 180 + }, + "diagonal=true,facing=north,facing_shift=north": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai_diagonal", + "y": -90 + }, + "diagonal=false,facing=south,facing_shift=north": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai" + }, + "diagonal=true,facing=south,facing_shift=north": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai_diagonal", + "y": -90 + }, + "diagonal=false,facing=west,facing_shift=north": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai", + "y": 90 + }, + "diagonal=true,facing=west,facing_shift=north": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai_diagonal", + "y": 180 + }, + "diagonal=false,facing=east,facing_shift=north": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai", + "y": 270 + }, + "diagonal=true,facing=east,facing_shift=north": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai_diagonal", + "y": -90 + }, + "diagonal=false,facing=north,facing_shift=south": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai", + "y": 180 + }, + "diagonal=true,facing=north,facing_shift=south": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai_diagonal", + "y": -90 + }, + "diagonal=false,facing=south,facing_shift=south": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai" + }, + "diagonal=true,facing=south,facing_shift=south": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai_diagonal", + "y": -90 + }, + "diagonal=false,facing=west,facing_shift=south": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai", + "y": 90 + }, + "diagonal=true,facing=west,facing_shift=south": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai_diagonal", + "y": 90 + }, + "diagonal=false,facing=east,facing_shift=south": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai", + "y": 270 + }, + "diagonal=true,facing=east,facing_shift=south": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai_diagonal" + }, + "diagonal=false,facing=north,facing_shift=west": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai", + "y": 180 + }, + "diagonal=true,facing=north,facing_shift=west": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai_diagonal", + "y": 180 + }, + "diagonal=false,facing=south,facing_shift=west": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai" + }, + "diagonal=true,facing=south,facing_shift=west": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai_diagonal", + "y": 90 + }, + "diagonal=false,facing=west,facing_shift=west": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai", + "y": 90 + }, + "diagonal=true,facing=west,facing_shift=west": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai_diagonal", + "y": -90 + }, + "diagonal=false,facing=east,facing_shift=west": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai", + "y": 270 + }, + "diagonal=true,facing=east,facing_shift=west": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai_diagonal", + "y": -90 + }, + "diagonal=false,facing=north,facing_shift=east": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai", + "y": 180 + }, + "diagonal=true,facing=north,facing_shift=east": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai_diagonal", + "y": -90 + }, + "diagonal=false,facing=south,facing_shift=east": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai" + }, + "diagonal=true,facing=south,facing_shift=east": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai_diagonal" + }, + "diagonal=false,facing=west,facing_shift=east": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai", + "y": 90 + }, + "diagonal=true,facing=west,facing_shift=east": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai_diagonal", + "y": -90 + }, + "diagonal=false,facing=east,facing_shift=east": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai", + "y": 270 + }, + "diagonal=true,facing=east,facing_shift=east": { + "model": "ultramarine:block/small_white_porcelain_vase_bonsai_diagonal", + "y": -90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/large_greeting_pine_bonsai.json b/src/generated/resources/assets/ultramarine/models/item/large_greeting_pine_bonsai.json new file mode 100644 index 00000000..c512cf8a --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/large_greeting_pine_bonsai.json @@ -0,0 +1,3 @@ +{ + "parent": "ultramarine:block/large_greeting_pine_bonsai" +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/medium_greeting_pine_bonsai.json b/src/generated/resources/assets/ultramarine/models/item/medium_greeting_pine_bonsai.json new file mode 100644 index 00000000..08a0ef94 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/medium_greeting_pine_bonsai.json @@ -0,0 +1,3 @@ +{ + "parent": "ultramarine:block/medium_greeting_pine_bonsai" +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/small_white_porcelain_vase_bonsai.json b/src/generated/resources/assets/ultramarine/models/item/small_white_porcelain_vase_bonsai.json new file mode 100644 index 00000000..19522c1a --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/small_white_porcelain_vase_bonsai.json @@ -0,0 +1,3 @@ +{ + "parent": "ultramarine:block/small_white_porcelain_vase_bonsai" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 5ef9a88a..327918d9 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -128,6 +128,9 @@ "ultramarine:small_green_porcelain_vase_bonsai", "ultramarine:medium_white_porcelain_vase_bonsai", "ultramarine:large_white_porcelain_vase_bonsai", + "ultramarine:large_greeting_pine_bonsai", + "ultramarine:small_white_porcelain_vase_bonsai", + "ultramarine:medium_greeting_pine_bonsai", "ultramarine:stone_lamp", "ultramarine:tricolor_candlestick", "ultramarine:jade_candlestick", 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 c384f8a6..63476e04 100644 --- a/src/main/java/com/voxelutopia/ultramarine/client/event/ModClientRenderEventHandler.java +++ b/src/main/java/com/voxelutopia/ultramarine/client/event/ModClientRenderEventHandler.java @@ -155,10 +155,12 @@ private static void setRenderLayers(FMLClientSetupEvent e) { ItemBlockRenderTypes.setRenderLayer(BlockRegistry.GREEN_PORCELAIN_VASE_BONSAI.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(BlockRegistry.LARGE_BONSAI.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(BlockRegistry.MEDIUM_BONSAI.get(), RenderType.cutout()); - ItemBlockRenderTypes.setRenderLayer(BlockRegistry.SMALL_GREEN_PORCELAIN_VASE_BONSAI.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(BlockRegistry.MEDIUM_WHITE_PORCELAIN_VASE_BONSAI.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(BlockRegistry.LARGE_WHITE_PORCELAIN_VASE_BONSAI.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(BlockRegistry.LARGE_GREETING_PINE_BONSAI.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(BlockRegistry.SMALL_WHITE_PORCELAIN_VASE_BONSAI.get(), RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(BlockRegistry.MEDIUM_GREETING_PINE_BONSAI.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 66f05b78..c1fb1b17 100644 --- a/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java +++ b/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java @@ -764,6 +764,12 @@ public class BlockRegistry { () -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_14).directional().diagonallyPlaceable().noCollision().build()); public static final RegistryObject LARGE_WHITE_PORCELAIN_VASE_BONSAI = BLOCKS.register("large_white_porcelain_vase_bonsai", () -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_14).directional().diagonallyPlaceable().noCollision().noOcclusion().build()); + public static final RegistryObject LARGE_GREETING_PINE_BONSAI = BLOCKS.register("large_greeting_pine_bonsai", + () -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_14).directional().placeOffset(Direction.UP).noCollision().noOcclusion().build()); + public static final RegistryObject SMALL_WHITE_PORCELAIN_VASE_BONSAI = BLOCKS.register("small_white_porcelain_vase_bonsai", + () -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_10).directional().diagonallyPlaceable().noCollision().build()); + public static final RegistryObject MEDIUM_GREETING_PINE_BONSAI = BLOCKS.register("medium_greeting_pine_bonsai", + () -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_14).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 dc9e5228..982cda68 100644 --- a/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java +++ b/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java @@ -601,6 +601,9 @@ public class ItemRegistry { public static final RegistryObject SMALL_GREEN_PORCELAIN_VASE_BONSAI = fromBlock(BlockRegistry.SMALL_GREEN_PORCELAIN_VASE_BONSAI, ModCreativeTab.PLANTS); public static final RegistryObject MEDIUM_WHITE_PORCELAIN_VASE_BONSAI = fromBlock(BlockRegistry.MEDIUM_WHITE_PORCELAIN_VASE_BONSAI, ModCreativeTab.PLANTS); public static final RegistryObject LARGE_WHITE_PORCELAIN_VASE_BONSAI = fromBlock(BlockRegistry.LARGE_WHITE_PORCELAIN_VASE_BONSAI, ModCreativeTab.PLANTS); + public static final RegistryObject LARGE_GREETING_PINE_BONSAI = fromBlock(BlockRegistry.LARGE_GREETING_PINE_BONSAI, ModCreativeTab.PLANTS); + public static final RegistryObject SMALL_WHITE_PORCELAIN_VASE_BONSAI = fromBlock(BlockRegistry.SMALL_WHITE_PORCELAIN_VASE_BONSAI, ModCreativeTab.PLANTS); + public static final RegistryObject MEDIUM_GREETING_PINE_BONSAI = fromBlock(BlockRegistry.MEDIUM_GREETING_PINE_BONSAI, ModCreativeTab.PLANTS); /** * LAMPS diff --git a/src/main/resources/assets/ultramarine/models/block/large_greeting_pine_bonsai.json b/src/main/resources/assets/ultramarine/models/block/large_greeting_pine_bonsai.json new file mode 100644 index 00000000..c87d0a09 --- /dev/null +++ b/src/main/resources/assets/ultramarine/models/block/large_greeting_pine_bonsai.json @@ -0,0 +1,742 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [128, 128], + "ambientocclusion": false, + "render_type": "cutout", + "textures": { + "1": "ultramarine:block/large_greeting_pine_bonsai", + "particle": "block/spruce_log" + }, + "elements": [ + { + "from": [11, -16, 3], + "to": [12, 8, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -17, 8]}, + "faces": { + "north": {"uv": [1.125, 10, 1.25, 13], "texture": "#1"}, + "east": {"uv": [1.375, 10, 1.5, 13], "texture": "#1"}, + "south": {"uv": [1.625, 10, 1.75, 13], "texture": "#1"}, + "west": {"uv": [1.875, 10, 2, 13], "texture": "#1"}, + "up": {"uv": [10.625, 2.5, 10.5, 2.375], "texture": "#1"}, + "down": {"uv": [10.75, 11.375, 10.625, 11.5], "texture": "#1"} + } + }, + { + "from": [4, -16, 3], + "to": [5, 8, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -17, 8]}, + "faces": { + "north": {"uv": [2.125, 10, 2.25, 13], "texture": "#1"}, + "east": {"uv": [2.375, 10, 2.5, 13], "texture": "#1"}, + "south": {"uv": [2.625, 10, 2.75, 13], "texture": "#1"}, + "west": {"uv": [2.875, 10, 3, 13], "texture": "#1"}, + "up": {"uv": [11.625, 5.375, 11.5, 5.25], "texture": "#1"}, + "down": {"uv": [11.625, 5.5, 11.5, 5.625], "texture": "#1"} + } + }, + { + "from": [11, -16, 10], + "to": [12, 8, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -17, 8]}, + "faces": { + "north": {"uv": [3.125, 10, 3.25, 13], "texture": "#1"}, + "east": {"uv": [3.375, 10, 3.5, 13], "texture": "#1"}, + "south": {"uv": [3.625, 10, 3.75, 13], "texture": "#1"}, + "west": {"uv": [3.875, 10, 4, 13], "texture": "#1"}, + "up": {"uv": [11.625, 5.875, 11.5, 5.75], "texture": "#1"}, + "down": {"uv": [11.625, 6, 11.5, 6.125], "texture": "#1"} + } + }, + { + "from": [4, -16, 10], + "to": [5, 8, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -17, 8]}, + "faces": { + "north": {"uv": [4.125, 10, 4.25, 13], "texture": "#1"}, + "east": {"uv": [4.375, 10, 4.5, 13], "texture": "#1"}, + "south": {"uv": [4.625, 10, 4.75, 13], "texture": "#1"}, + "west": {"uv": [4.875, 10, 5, 13], "texture": "#1"}, + "up": {"uv": [11.625, 6.375, 11.5, 6.25], "texture": "#1"}, + "down": {"uv": [11.625, 6.5, 11.5, 6.625], "texture": "#1"} + } + }, + { + "from": [4, 7, 3], + "to": [12, 8, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -17, 8]}, + "faces": { + "north": {"uv": [10.75, 1, 11.75, 1.125], "texture": "#1"}, + "east": {"uv": [10.75, 3.375, 11.75, 3.5], "texture": "#1"}, + "south": {"uv": [10.875, 10.5, 11.875, 10.625], "texture": "#1"}, + "west": {"uv": [10.875, 10.75, 11.875, 10.875], "texture": "#1"}, + "up": {"uv": [9.125, 9.25, 8.125, 8.25], "texture": "#1"}, + "down": {"uv": [1, 8.5, 0, 9.5], "texture": "#1"} + } + }, + { + "from": [5, -14, 3], + "to": [11, -13, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -16, 8]}, + "faces": { + "north": {"uv": [5.625, 11.125, 6.375, 11.25], "texture": "#1"}, + "east": {"uv": [11.5, 11.25, 11.625, 11.375], "texture": "#1"}, + "south": {"uv": [6.5, 11.125, 7.25, 11.25], "texture": "#1"}, + "west": {"uv": [11.5, 11.5, 11.625, 11.625], "texture": "#1"}, + "up": {"uv": [8.125, 11.25, 7.375, 11.125], "texture": "#1"}, + "down": {"uv": [9, 11.125, 8.25, 11.25], "texture": "#1"} + } + }, + { + "from": [5, -14, 10], + "to": [11, -13, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -16, 6]}, + "faces": { + "north": {"uv": [9.125, 11.125, 9.875, 11.25], "texture": "#1"}, + "east": {"uv": [5.625, 11.625, 5.75, 11.75], "texture": "#1"}, + "south": {"uv": [11.125, 9.375, 11.875, 9.5], "texture": "#1"}, + "west": {"uv": [5.875, 11.625, 6, 11.75], "texture": "#1"}, + "up": {"uv": [11.875, 9.75, 11.125, 9.625], "texture": "#1"}, + "down": {"uv": [10.75, 11.125, 10, 11.25], "texture": "#1"} + } + }, + { + "from": [4, -14, 4], + "to": [5, -13, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -16, 8]}, + "faces": { + "north": {"uv": [6.125, 11.625, 6.25, 11.75], "texture": "#1"}, + "east": {"uv": [11.125, 11, 11.875, 11.125], "texture": "#1"}, + "south": {"uv": [6.375, 11.625, 6.5, 11.75], "texture": "#1"}, + "west": {"uv": [0, 11.25, 0.75, 11.375], "texture": "#1"}, + "up": {"uv": [1, 12, 0.875, 11.25], "texture": "#1"}, + "down": {"uv": [11.375, 3.625, 11.25, 4.375], "texture": "#1"} + } + }, + { + "from": [11, -14, 4], + "to": [12, -13, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -16, 8]}, + "faces": { + "north": {"uv": [6.625, 11.625, 6.75, 11.75], "texture": "#1"}, + "east": {"uv": [11.25, 4.5, 12, 4.625], "texture": "#1"}, + "south": {"uv": [11.625, 7.25, 11.75, 7.375], "texture": "#1"}, + "west": {"uv": [11.25, 4.75, 12, 4.875], "texture": "#1"}, + "up": {"uv": [11.375, 5.75, 11.25, 5], "texture": "#1"}, + "down": {"uv": [11.375, 5.875, 11.25, 6.625], "texture": "#1"} + } + }, + { + "from": [5, 8.5, 4], + "to": [11, 9.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -17, 8]}, + "faces": { + "north": {"uv": [11.25, 6.75, 12, 6.875], "texture": "#1"}, + "east": {"uv": [11.375, 2, 12, 2.125], "texture": "#1"}, + "south": {"uv": [11.25, 7, 12, 7.125], "texture": "#1"}, + "west": {"uv": [11.375, 2.25, 12, 2.375], "texture": "#1"}, + "up": {"uv": [10.375, 1.875, 9.625, 1.25], "texture": "#1"}, + "down": {"uv": [10.375, 2, 9.625, 2.625], "texture": "#1"} + } + }, + { + "from": [4.75, 8, 3.75], + "to": [5.75, 9, 4.75], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -17, 8]}, + "faces": { + "north": {"uv": [11.625, 7.5, 11.75, 7.625], "texture": "#1"}, + "east": {"uv": [7.625, 11.625, 7.75, 11.75], "texture": "#1"}, + "south": {"uv": [11.625, 7.75, 11.75, 7.875], "texture": "#1"}, + "west": {"uv": [7.875, 11.625, 8, 11.75], "texture": "#1"}, + "up": {"uv": [11.75, 8.125, 11.625, 8], "texture": "#1"}, + "down": {"uv": [8.25, 11.625, 8.125, 11.75], "texture": "#1"} + } + }, + { + "from": [10.25, 8, 3.75], + "to": [11.25, 9, 4.75], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -17, 8]}, + "faces": { + "north": {"uv": [11.625, 8.25, 11.75, 8.375], "texture": "#1"}, + "east": {"uv": [8.375, 11.625, 8.5, 11.75], "texture": "#1"}, + "south": {"uv": [11.625, 8.5, 11.75, 8.625], "texture": "#1"}, + "west": {"uv": [8.625, 11.625, 8.75, 11.75], "texture": "#1"}, + "up": {"uv": [11.75, 8.875, 11.625, 8.75], "texture": "#1"}, + "down": {"uv": [9, 11.625, 8.875, 11.75], "texture": "#1"} + } + }, + { + "from": [4.75, 8, 8.25], + "to": [5.75, 9, 9.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -17, 6]}, + "faces": { + "north": {"uv": [11.625, 9, 11.75, 9.125], "texture": "#1"}, + "east": {"uv": [9.125, 11.625, 9.25, 11.75], "texture": "#1"}, + "south": {"uv": [9.375, 11.625, 9.5, 11.75], "texture": "#1"}, + "west": {"uv": [9.625, 11.625, 9.75, 11.75], "texture": "#1"}, + "up": {"uv": [10, 11.75, 9.875, 11.625], "texture": "#1"}, + "down": {"uv": [11.75, 9.875, 11.625, 10], "texture": "#1"} + } + }, + { + "from": [10.25, 8, 8.25], + "to": [11.25, 9, 9.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -17, 6]}, + "faces": { + "north": {"uv": [11.625, 10.125, 11.75, 10.25], "texture": "#1"}, + "east": {"uv": [10.625, 11.625, 10.75, 11.75], "texture": "#1"}, + "south": {"uv": [0, 11.75, 0.125, 11.875], "texture": "#1"}, + "west": {"uv": [11.75, 0, 11.875, 0.125], "texture": "#1"}, + "up": {"uv": [0.375, 11.875, 0.25, 11.75], "texture": "#1"}, + "down": {"uv": [11.875, 0.25, 11.75, 0.375], "texture": "#1"} + } + }, + { + "from": [4.5, 9, 3.5], + "to": [11.5, 10.5, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -17, 8]}, + "faces": { + "north": {"uv": [10.5, 1.25, 11.375, 1.5], "texture": "#1"}, + "east": {"uv": [8.25, 4, 9, 4.25], "texture": "#1"}, + "south": {"uv": [10.5, 1.625, 11.375, 1.875], "texture": "#1"}, + "west": {"uv": [10.5, 2, 11.25, 2.25], "texture": "#1"}, + "up": {"uv": [10, 4.75, 9.125, 4], "texture": "#1"}, + "down": {"uv": [10, 4.875, 9.125, 5.625], "texture": "#1"} + } + }, + { + "from": [1.2879, 18.37082, 6.5], + "to": [4.2879, 19.37082, 7.5], + "rotation": {"angle": -22.5, "axis": "z", "origin": [3.7879, 16.37082, 7]}, + "faces": { + "north": {"uv": [9.625, 3.75, 10, 3.875], "texture": "#1"}, + "east": {"uv": [0.5, 11.75, 0.625, 11.875], "texture": "#1"}, + "south": {"uv": [7.625, 11.375, 8, 11.5], "texture": "#1"}, + "west": {"uv": [11.75, 0.5, 11.875, 0.625], "texture": "#1"}, + "up": {"uv": [8.5, 11.5, 8.125, 11.375], "texture": "#1"}, + "down": {"uv": [9, 11.375, 8.625, 11.5], "texture": "#1"} + } + }, + { + "from": [5.20124, 13.54879, 6], + "to": [7.20124, 16.79879, 8], + "rotation": {"angle": 22.5, "axis": "z", "origin": [6.20124, 15.54879, 7]}, + "faces": { + "north": {"uv": [7.125, 4.5, 7.375, 4.875], "texture": "#1"}, + "east": {"uv": [9.125, 5.75, 9.375, 6.125], "texture": "#1"}, + "south": {"uv": [11.25, 7.25, 11.5, 7.625], "texture": "#1"}, + "west": {"uv": [11.25, 7.75, 11.5, 8.125], "texture": "#1"}, + "up": {"uv": [11.625, 2.75, 11.375, 2.5], "texture": "#1"}, + "down": {"uv": [11.625, 2.875, 11.375, 3.125], "texture": "#1"} + } + }, + { + "from": [6.25, 10.75, 5.5], + "to": [9, 14.75, 8.5], + "rotation": {"angle": 22.5, "axis": "z", "origin": [8, 8, 7]}, + "faces": { + "north": {"uv": [5.125, 10.5, 5.5, 11], "texture": "#1"}, + "east": {"uv": [5.625, 10.5, 6, 11], "texture": "#1"}, + "south": {"uv": [6.125, 10.5, 6.5, 11], "texture": "#1"}, + "west": {"uv": [6.625, 10.5, 7, 11], "texture": "#1"}, + "up": {"uv": [1, 11.125, 0.625, 10.75], "texture": "#1"}, + "down": {"uv": [11.125, 10, 10.75, 10.375], "texture": "#1"} + } + }, + { + "from": [3.25, 9, 5], + "to": [7.25, 12, 9], + "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 7]}, + "faces": { + "north": {"uv": [7.5, 6.25, 8, 6.625], "texture": "#1"}, + "east": {"uv": [10.5, 9.5, 11, 9.875], "texture": "#1"}, + "south": {"uv": [10.625, 5.75, 11.125, 6.125], "texture": "#1"}, + "west": {"uv": [10.625, 6.25, 11.125, 6.625], "texture": "#1"}, + "up": {"uv": [10.875, 8.75, 10.375, 8.25], "texture": "#1"}, + "down": {"uv": [10.875, 8.875, 10.375, 9.375], "texture": "#1"} + } + }, + { + "from": [5.75, 11.25, 5.75], + "to": [10, 12.25, 8.25], + "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 8, 7]}, + "faces": { + "north": {"uv": [5.625, 11.375, 6.125, 11.5], "texture": "#1"}, + "east": {"uv": [9.125, 11.375, 9.5, 11.5], "texture": "#1"}, + "south": {"uv": [6.25, 11.375, 6.75, 11.5], "texture": "#1"}, + "west": {"uv": [9.625, 11.375, 10, 11.5], "texture": "#1"}, + "up": {"uv": [11.125, 7.125, 10.625, 6.75], "texture": "#1"}, + "down": {"uv": [7.625, 10.625, 7.125, 11], "texture": "#1"} + } + }, + { + "from": [-1.81227, 10.56464, 7], + "to": [19.18773, 30.56464, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [7.18773, 13.56464, 6]}, + "faces": { + "north": {"uv": [3, 0, 5.625, 2.5], "texture": "#1"}, + "east": {"uv": [0.75, 11.75, 0.75, 14.25], "texture": "#1"}, + "south": {"uv": [3, 2.625, 5.625, 5.125], "texture": "#1"}, + "west": {"uv": [6.875, 11.75, 6.875, 14.25], "texture": "#1"}, + "up": {"uv": [13.875, 9.25, 11.25, 9.25], "texture": "#1"}, + "down": {"uv": [13.875, 10.375, 11.25, 10.375], "texture": "#1"} + } + }, + { + "from": [7.42033, 11.91992, 4.5], + "to": [8.92033, 14.91992, 6], + "rotation": {"angle": 22.5, "axis": "z", "origin": [7.92033, 13.54492, 4.25]}, + "faces": { + "north": {"uv": [11.25, 8.25, 11.5, 8.625], "texture": "#1"}, + "east": {"uv": [11.25, 8.75, 11.5, 9.125], "texture": "#1"}, + "south": {"uv": [11.25, 9.875, 11.5, 10.25], "texture": "#1"}, + "west": {"uv": [11.125, 11.25, 11.375, 11.625], "texture": "#1"}, + "up": {"uv": [7.125, 11.625, 6.875, 11.375], "texture": "#1"}, + "down": {"uv": [7.5, 11.375, 7.25, 11.625], "texture": "#1"} + } + }, + { + "from": [7.83218, 11.25284, 4], + "to": [9.33218, 14.00284, 5], + "rotation": {"angle": -22.5, "axis": "z", "origin": [8.58218, 12.62784, 4]}, + "faces": { + "north": {"uv": [11.375, 0, 11.625, 0.375], "texture": "#1"}, + "east": {"uv": [10.125, 11.375, 10.25, 11.75], "texture": "#1"}, + "south": {"uv": [11.375, 0.5, 11.625, 0.875], "texture": "#1"}, + "west": {"uv": [10.375, 11.375, 10.5, 11.75], "texture": "#1"}, + "up": {"uv": [7.375, 5.125, 7.125, 5], "texture": "#1"}, + "down": {"uv": [0.75, 11.5, 0.5, 11.625], "texture": "#1"} + } + }, + { + "from": [10.74645, 13.43517, 3.40625], + "to": [13.99645, 14.43517, 4.40625], + "rotation": {"angle": -22.5, "axis": "z", "origin": [11.38953, 13.00743, 5.05198]}, + "faces": { + "north": {"uv": [0, 11.5, 0.375, 11.625], "texture": "#1"}, + "east": {"uv": [11.75, 0.75, 11.875, 0.875], "texture": "#1"}, + "south": {"uv": [11.5, 1.25, 11.875, 1.375], "texture": "#1"}, + "west": {"uv": [11.75, 2.5, 11.875, 2.625], "texture": "#1"}, + "up": {"uv": [11.875, 1.625, 11.5, 1.5], "texture": "#1"}, + "down": {"uv": [11.875, 1.75, 11.5, 1.875], "texture": "#1"} + } + }, + { + "from": [9.09499, 13.52622, 3.65625], + "to": [11.34499, 14.52622, 4.65625], + "rotation": {"angle": 0, "axis": "y", "origin": [11.38953, 13.00743, 5.05198]}, + "faces": { + "north": {"uv": [11.5, 3.625, 11.75, 3.75], "texture": "#1"}, + "east": {"uv": [11.75, 2.75, 11.875, 2.875], "texture": "#1"}, + "south": {"uv": [11.5, 3.875, 11.75, 4], "texture": "#1"}, + "west": {"uv": [11.75, 3, 11.875, 3.125], "texture": "#1"}, + "up": {"uv": [11.75, 4.25, 11.5, 4.125], "texture": "#1"}, + "down": {"uv": [11.75, 5, 11.5, 5.125], "texture": "#1"} + } + }, + { + "from": [14.76418, 4.91131, 3.05221], + "to": [15.76418, 12.91131, 4.05221], + "rotation": {"angle": 22.5, "axis": "z", "origin": [13.76418, 9.91131, 4.05221]}, + "faces": { + "north": {"uv": [11, 8.25, 11.125, 9.25], "texture": "#1"}, + "east": {"uv": [10.875, 11, 11, 12], "texture": "#1"}, + "south": {"uv": [5.125, 11.125, 5.25, 12.125], "texture": "#1"}, + "west": {"uv": [5.375, 11.125, 5.5, 12.125], "texture": "#1"}, + "up": {"uv": [11.875, 5.375, 11.75, 5.25], "texture": "#1"}, + "down": {"uv": [11.875, 5.5, 11.75, 5.625], "texture": "#1"} + } + }, + { + "from": [3.22985, -7.95055, 1.43089], + "to": [26.22985, 12.04945, 1.43089], + "rotation": {"angle": -22.5, "axis": "y", "origin": [10.89091, 4.52926, -1.32429]}, + "faces": { + "north": {"uv": [0, 0, 2.875, 2.5], "texture": "#1"}, + "east": {"uv": [7, 11.75, 7, 14.25], "texture": "#1"}, + "south": {"uv": [0, 2.625, 2.875, 5.125], "texture": "#1"}, + "west": {"uv": [7.125, 11.75, 7.125, 14.25], "texture": "#1"}, + "up": {"uv": [14.25, 3.25, 11.375, 3.25], "texture": "#1"}, + "down": {"uv": [14.375, 4.375, 11.5, 4.375], "texture": "#1"} + } + }, + { + "from": [8, 22, 5], + "to": [18, 27, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -13, 35]}, + "faces": { + "north": {"uv": [5.75, 4.5, 7, 5.125], "texture": "#1"}, + "east": {"uv": [1.125, 9.25, 2, 9.875], "texture": "#1"}, + "south": {"uv": [1.125, 8.5, 2.375, 9.125], "texture": "#1"}, + "west": {"uv": [2.125, 9.25, 3, 9.875], "texture": "#1"}, + "up": {"uv": [9.375, 7.125, 8.125, 6.25], "texture": "#1"}, + "down": {"uv": [9.375, 7.25, 8.125, 8.125], "texture": "#1"} + } + }, + { + "from": [4, 20, 8], + "to": [23, 31, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -13, 35]}, + "faces": { + "north": {"uv": [0, 5.25, 2.375, 6.625], "texture": "#1"}, + "east": {"uv": [7.25, 11.75, 7.25, 13.125], "texture": "#1"}, + "south": {"uv": [2.5, 5.25, 4.875, 6.625], "texture": "#1"}, + "west": {"uv": [7.375, 11.75, 7.375, 13.125], "texture": "#1"}, + "up": {"uv": [14.125, 5.75, 11.75, 5.75], "texture": "#1"}, + "down": {"uv": [14.125, 5.875, 11.75, 5.875], "texture": "#1"} + } + }, + { + "from": [-7, 16, 5], + "to": [3, 21, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [-7, -19, 35]}, + "faces": { + "north": {"uv": [2.5, 8.5, 3.75, 9.125], "texture": "#1"}, + "east": {"uv": [3.125, 9.25, 4, 9.875], "texture": "#1"}, + "south": {"uv": [3.875, 8.5, 5.125, 9.125], "texture": "#1"}, + "west": {"uv": [4.125, 9.25, 5, 9.875], "texture": "#1"}, + "up": {"uv": [9.5, 0.875, 8.25, 0], "texture": "#1"}, + "down": {"uv": [9.5, 1, 8.25, 1.875], "texture": "#1"} + } + }, + { + "from": [-8, 14, 8], + "to": [11, 25, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [-7, -19, 35]}, + "faces": { + "north": {"uv": [5, 5.25, 7.375, 6.625], "texture": "#1"}, + "east": {"uv": [7.5, 11.75, 7.5, 13.125], "texture": "#1"}, + "south": {"uv": [5.75, 0, 8.125, 1.375], "texture": "#1"}, + "west": {"uv": [11.125, 11.75, 11.125, 13.125], "texture": "#1"}, + "up": {"uv": [14.125, 6, 11.75, 6], "texture": "#1"}, + "down": {"uv": [14.125, 6.125, 11.75, 6.125], "texture": "#1"} + } + }, + { + "from": [17, 5, 2], + "to": [25, 8, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [1, -19, 4]}, + "faces": { + "north": {"uv": [9.625, 2.75, 10.625, 3.125], "texture": "#1"}, + "east": {"uv": [10.625, 7.25, 11.125, 7.625], "texture": "#1"}, + "south": {"uv": [9.625, 3.25, 10.625, 3.625], "texture": "#1"}, + "west": {"uv": [7.75, 10.625, 8.25, 11], "texture": "#1"}, + "up": {"uv": [10.25, 8.75, 9.25, 8.25], "texture": "#1"}, + "down": {"uv": [10.25, 8.875, 9.25, 9.375], "texture": "#1"} + } + }, + { + "from": [15, 4, 4], + "to": [27, 10, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [1, -19, 4]}, + "faces": { + "north": {"uv": [0, 6.75, 1.5, 7.5], "texture": "#1"}, + "east": {"uv": [8, 8.5, 8, 9.25], "texture": "#1"}, + "south": {"uv": [1.625, 6.75, 3.125, 7.5], "texture": "#1"}, + "west": {"uv": [11.25, 11.75, 11.25, 12.5], "texture": "#1"}, + "up": {"uv": [13.25, 6.25, 11.75, 6.25], "texture": "#1"}, + "down": {"uv": [13.25, 6.375, 11.75, 6.375], "texture": "#1"} + } + }, + { + "from": [-4, -3, -3], + "to": [4, 0, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [-20, -27, 1]}, + "faces": { + "north": {"uv": [5.125, 10, 6.125, 10.375], "texture": "#1"}, + "east": {"uv": [10.625, 7.75, 11.125, 8.125], "texture": "#1"}, + "south": {"uv": [6.25, 10, 7.25, 10.375], "texture": "#1"}, + "west": {"uv": [8.375, 10.625, 8.875, 11], "texture": "#1"}, + "up": {"uv": [8.125, 9.875, 7.125, 9.375], "texture": "#1"}, + "down": {"uv": [10.5, 5.75, 9.5, 6.25], "texture": "#1"} + } + }, + { + "from": [-6, -4, 0], + "to": [6, 2, 0], + "rotation": {"angle": 0, "axis": "y", "origin": [-20, -27, 1]}, + "faces": { + "north": {"uv": [3.25, 6.75, 4.75, 7.5], "texture": "#1"}, + "east": {"uv": [11.75, 11.25, 11.75, 12], "texture": "#1"}, + "south": {"uv": [4.875, 6.75, 6.375, 7.5], "texture": "#1"}, + "west": {"uv": [11.375, 11.75, 11.375, 12.5], "texture": "#1"}, + "up": {"uv": [13.25, 6.5, 11.75, 6.5], "texture": "#1"}, + "down": {"uv": [13.25, 6.625, 11.75, 6.625], "texture": "#1"} + } + }, + { + "from": [13.25, 11, 0.75], + "to": [21.25, 14, 4.75], + "rotation": {"angle": 0, "axis": "y", "origin": [-2.75, -13, 2.75]}, + "faces": { + "north": {"uv": [10.125, 3.75, 11.125, 4.125], "texture": "#1"}, + "east": {"uv": [9, 10.625, 9.5, 11], "texture": "#1"}, + "south": {"uv": [10.125, 4.25, 11.125, 4.625], "texture": "#1"}, + "west": {"uv": [9.625, 10.625, 10.125, 11], "texture": "#1"}, + "up": {"uv": [10.5, 6.875, 9.5, 6.375], "texture": "#1"}, + "down": {"uv": [10.5, 7, 9.5, 7.5], "texture": "#1"} + } + }, + { + "from": [11.25, 10, 2.75], + "to": [23.25, 16, 2.75], + "rotation": {"angle": 0, "axis": "y", "origin": [-2.75, -13, 2.75]}, + "faces": { + "north": {"uv": [6.5, 6.75, 8, 7.5], "texture": "#1"}, + "east": {"uv": [11.5, 11.75, 11.5, 12.5], "texture": "#1"}, + "south": {"uv": [7.5, 4.5, 9, 5.25], "texture": "#1"}, + "west": {"uv": [11.625, 11.75, 11.625, 12.5], "texture": "#1"}, + "up": {"uv": [13.375, 1, 11.875, 1], "texture": "#1"}, + "down": {"uv": [13.375, 1.125, 11.875, 1.125], "texture": "#1"} + } + }, + { + "from": [7, 5, -1], + "to": [15, 8, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [-9, -19, 1]}, + "faces": { + "north": {"uv": [10.125, 4.75, 11.125, 5.125], "texture": "#1"}, + "east": {"uv": [10.25, 10.625, 10.75, 11], "texture": "#1"}, + "south": {"uv": [10.125, 5.25, 11.125, 5.625], "texture": "#1"}, + "west": {"uv": [0, 10.75, 0.5, 11.125], "texture": "#1"}, + "up": {"uv": [10.5, 8.125, 9.5, 7.625], "texture": "#1"}, + "down": {"uv": [9.25, 9.5, 8.25, 10], "texture": "#1"} + } + }, + { + "from": [5, 4, 1], + "to": [17, 10, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [-9, -19, 1]}, + "faces": { + "north": {"uv": [7.5, 5.375, 9, 6.125], "texture": "#1"}, + "east": {"uv": [11.875, 3.375, 11.875, 4.125], "texture": "#1"}, + "south": {"uv": [0, 7.625, 1.5, 8.375], "texture": "#1"}, + "west": {"uv": [5.625, 11.875, 5.625, 12.625], "texture": "#1"}, + "up": {"uv": [13.375, 4.25, 11.875, 4.25], "texture": "#1"}, + "down": {"uv": [13.375, 5, 11.875, 5], "texture": "#1"} + } + }, + { + "from": [-7, -7, -5], + "to": [3, -2, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [-7, -42, 26]}, + "faces": { + "north": {"uv": [5.25, 8.5, 6.5, 9.125], "texture": "#1"}, + "east": {"uv": [5.125, 9.25, 6, 9.875], "texture": "#1"}, + "south": {"uv": [6.625, 8.5, 7.875, 9.125], "texture": "#1"}, + "west": {"uv": [6.125, 9.25, 7, 9.875], "texture": "#1"}, + "up": {"uv": [9.5, 2.875, 8.25, 2], "texture": "#1"}, + "down": {"uv": [9.5, 3, 8.25, 3.875], "texture": "#1"} + } + }, + { + "from": [-8, -9, -2], + "to": [11, 2, -2], + "rotation": {"angle": 0, "axis": "y", "origin": [-7, -42, 26]}, + "faces": { + "north": {"uv": [5.75, 1.5, 8.125, 2.875], "texture": "#1"}, + "east": {"uv": [5.75, 11.875, 5.75, 13.25], "texture": "#1"}, + "south": {"uv": [5.75, 3, 8.125, 4.375], "texture": "#1"}, + "west": {"uv": [5.875, 11.875, 5.875, 13.25], "texture": "#1"}, + "up": {"uv": [14.25, 5.125, 11.875, 5.125], "texture": "#1"}, + "down": {"uv": [14.25, 7.25, 11.875, 7.25], "texture": "#1"} + } + }, + { + "from": [7.25, 25.5, 3.75], + "to": [15.25, 28.5, 7.75], + "rotation": {"angle": 0, "axis": "y", "origin": [-8.75, 1.5, 6.75]}, + "faces": { + "north": {"uv": [7.375, 10.125, 8.375, 10.5], "texture": "#1"}, + "east": {"uv": [10.75, 0, 11.25, 0.375], "texture": "#1"}, + "south": {"uv": [8.5, 10.125, 9.5, 10.5], "texture": "#1"}, + "west": {"uv": [10.75, 0.5, 11.25, 0.875], "texture": "#1"}, + "up": {"uv": [10.375, 10, 9.375, 9.5], "texture": "#1"}, + "down": {"uv": [1, 9.625, 0, 10.125], "texture": "#1"} + } + }, + { + "from": [5.25, 24.5, 5.75], + "to": [17.25, 30.5, 5.75], + "rotation": {"angle": 0, "axis": "y", "origin": [-8.75, 1.5, 6.75]}, + "faces": { + "north": {"uv": [1.625, 7.625, 3.125, 8.375], "texture": "#1"}, + "east": {"uv": [6, 11.875, 6, 12.625], "texture": "#1"}, + "south": {"uv": [3.25, 7.625, 4.75, 8.375], "texture": "#1"}, + "west": {"uv": [6.125, 11.875, 6.125, 12.625], "texture": "#1"}, + "up": {"uv": [13.375, 7.375, 11.875, 7.375], "texture": "#1"}, + "down": {"uv": [13.375, 7.5, 11.875, 7.5], "texture": "#1"} + } + }, + { + "from": [-8, 20.72428, 10.4793], + "to": [0, 23.72428, 14.4793], + "rotation": {"angle": 0, "axis": "y", "origin": [-24.9197, -3.27572, 13.4793]}, + "faces": { + "north": {"uv": [9.625, 10.125, 10.625, 10.5], "texture": "#1"}, + "east": {"uv": [10.75, 2.375, 11.25, 2.75], "texture": "#1"}, + "south": {"uv": [0, 10.25, 1, 10.625], "texture": "#1"}, + "west": {"uv": [10.75, 2.875, 11.25, 3.25], "texture": "#1"}, + "up": {"uv": [10.625, 0.5, 9.625, 0], "texture": "#1"}, + "down": {"uv": [10.625, 0.625, 9.625, 1.125], "texture": "#1"} + } + }, + { + "from": [-8, 19.72428, 12.4793], + "to": [4, 25.72428, 12.4793], + "rotation": {"angle": 0, "axis": "y", "origin": [-24.9197, -3.27572, 13.4793]}, + "faces": { + "north": {"uv": [4.875, 7.625, 6.375, 8.375], "texture": "#1"}, + "east": {"uv": [6.25, 11.875, 6.25, 12.625], "texture": "#1"}, + "south": {"uv": [6.5, 7.625, 8, 8.375], "texture": "#1"}, + "west": {"uv": [6.375, 11.875, 6.375, 12.625], "texture": "#1"}, + "up": {"uv": [9.125, 11.875, 7.625, 11.875], "texture": "#1"}, + "down": {"uv": [13.375, 7.625, 11.875, 7.625], "texture": "#1"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2, 2.25], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2, 2.25], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, -45, 0], + "translation": [0, 2, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, -45, 0], + "translation": [0, 2, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 135, 0], + "scale": [0.3, 0.3, 0.3] + }, + "head": { + "translation": [0, 7.5, 0] + }, + "fixed": { + "translation": [0, 0, 0.75], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "bone", + "origin": [0, -17, 1], + "color": 0, + "children": [ + { + "name": "bone2", + "origin": [0, -17, 1], + "color": 7, + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8] + }, + { + "name": "bone3", + "origin": [0, -17, 1], + "color": 0, + "children": [ + 9, + 10, + 11, + 12, + 13, + 14, + { + "name": "bone4", + "origin": [-0.81227, 13.56464, 0], + "color": 0, + "children": [ + 15, + 16, + 17, + 18, + 19, + 20, + { + "name": "bone5", + "origin": [2.51552, 11.32722, -3.05], + "color": 0, + "children": [21, 22, 23, 24, 25, 26] + } + ] + } + ] + }, + { + "name": "bone7", + "origin": [0, -17, 0], + "color": 0, + "children": [ + { + "name": "bone6", + "origin": [5.25, 25, 1.25], + "color": 0, + "children": [27, 28] + }, + { + "name": "bone8", + "origin": [-9.75, 19, 1.25], + "color": 0, + "children": [29, 30] + }, + { + "name": "bone10", + "origin": [-7, -19, -3], + "color": 0, + "children": [31, 32] + }, + { + "name": "bone9", + "origin": [-8, -1.25, -7], + "color": 0, + "children": [33, 34] + }, + { + "name": "bone11", + "origin": [9.25, 12.75, -5.25], + "color": 0, + "children": [35, 36] + }, + { + "name": "bone12", + "origin": [3, 6.75, -7], + "color": 0, + "children": [37, 38] + }, + { + "name": "bone13", + "origin": [-9.75, -4, -7.75], + "color": 0, + "children": [39, 40] + }, + { + "name": "bone14", + "origin": [10.25, 12.25, -1.25], + "color": 0, + "children": [41, 42] + }, + { + "name": "bone15", + "origin": [-12.9197, 22.47428, 5.4793], + "color": 0, + "children": [43, 44] + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ultramarine/models/block/medium_greeting_pine_bonsai.json b/src/main/resources/assets/ultramarine/models/block/medium_greeting_pine_bonsai.json new file mode 100644 index 00000000..82f8e10f --- /dev/null +++ b/src/main/resources/assets/ultramarine/models/block/medium_greeting_pine_bonsai.json @@ -0,0 +1,316 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [64, 64], + "ambientocclusion": false, + "render_type": "cutout", + "textures": { + "1": "ultramarine:block/medium_greeting_pine_bonsai", + "particle": "block/spruce_log" + }, + "elements": [ + { + "from": [3, 1, 3], + "to": [13, 4, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [6, 10, 8.5, 10.75], "texture": "#1"}, + "east": {"uv": [8.5, 10.25, 11, 11], "texture": "#1"}, + "south": {"uv": [6, 10.75, 8.5, 11.5], "texture": "#1"}, + "west": {"uv": [2, 11, 4.5, 11.75], "texture": "#1"}, + "up": {"uv": [11.5, 2.5, 9, 0], "texture": "#1"}, + "down": {"uv": [11.5, 2.5, 9, 5], "texture": "#1"} + } + }, + { + "from": [4, 0, 4], + "to": [12, 1, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [11.5, 4.75, 13.5, 5], "texture": "#1"}, + "east": {"uv": [12.25, 8.75, 14.25, 9], "texture": "#1"}, + "south": {"uv": [12.5, 0.75, 14.5, 1], "texture": "#1"}, + "west": {"uv": [1.75, 12.5, 3.75, 12.75], "texture": "#1"}, + "up": {"uv": [11, 7, 9, 5], "texture": "#1"}, + "down": {"uv": [11, 7, 9, 9], "texture": "#1"} + } + }, + { + "from": [-6, 4, 8], + "to": [30, 24, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 9, 5], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 5], "texture": "#1"}, + "south": {"uv": [0, 5, 9, 10], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 5], "texture": "#1"}, + "up": {"uv": [9, 0, 0, 0], "texture": "#1"}, + "down": {"uv": [9, 0, 0, 0], "texture": "#1"} + } + }, + { + "from": [22, 9, 6], + "to": [27, 12, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [11.5, 1, 12.75, 1.75], "texture": "#1"}, + "east": {"uv": [5, 12, 6, 12.75], "texture": "#1"}, + "south": {"uv": [11.5, 1.75, 12.75, 2.5], "texture": "#1"}, + "west": {"uv": [12, 9, 13, 9.75], "texture": "#1"}, + "up": {"uv": [12.25, 9, 11, 8], "texture": "#1"}, + "down": {"uv": [9.75, 11, 8.5, 12], "texture": "#1"} + } + }, + { + "from": [13, 11, 6], + "to": [19, 15, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [4.5, 11, 6, 12], "texture": "#1"}, + "east": {"uv": [10.75, 11.25, 11.75, 12.25], "texture": "#1"}, + "south": {"uv": [11, 5, 12.5, 6], "texture": "#1"}, + "west": {"uv": [11.5, 0, 12.5, 1], "texture": "#1"}, + "up": {"uv": [12.5, 7, 11, 6], "texture": "#1"}, + "down": {"uv": [12.5, 7, 11, 8], "texture": "#1"} + } + }, + { + "from": [4, 18, 6], + "to": [12, 23, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [9, 9, 11, 10.25], "texture": "#1"}, + "east": {"uv": [11, 9, 12, 10.25], "texture": "#1"}, + "south": {"uv": [0, 10, 2, 11.25], "texture": "#1"}, + "west": {"uv": [9.75, 11, 10.75, 12.25], "texture": "#1"}, + "up": {"uv": [4, 11, 2, 10], "texture": "#1"}, + "down": {"uv": [6, 10, 4, 11], "texture": "#1"} + } + }, + { + "from": [-4.25, 12, 6], + "to": [0.75, 15, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [11.5, 2.5, 12.75, 3.25], "texture": "#1"}, + "east": {"uv": [11.75, 12, 12.75, 12.75], "texture": "#1"}, + "south": {"uv": [11.5, 3.25, 12.75, 4], "texture": "#1"}, + "west": {"uv": [0, 12.25, 1, 13], "texture": "#1"}, + "up": {"uv": [12.25, 11.25, 11, 10.25], "texture": "#1"}, + "down": {"uv": [1.25, 11.25, 0, 12.25], "texture": "#1"} + } + }, + { + "from": [-1, 17, 6.5], + "to": [4, 20, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [11.5, 4, 12.75, 4.75], "texture": "#1"}, + "east": {"uv": [6, 12.25, 6.75, 13], "texture": "#1"}, + "south": {"uv": [6, 11.5, 7.25, 12.25], "texture": "#1"}, + "west": {"uv": [6.75, 12.25, 7.5, 13], "texture": "#1"}, + "up": {"uv": [8.5, 12.25, 7.25, 11.5], "texture": "#1"}, + "down": {"uv": [2.5, 11.75, 1.25, 12.5], "texture": "#1"} + } + }, + { + "from": [12, 18, 6.5], + "to": [17, 21, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [2.5, 11.75, 3.75, 12.5], "texture": "#1"}, + "east": {"uv": [7.5, 12.25, 8.25, 13], "texture": "#1"}, + "south": {"uv": [11.75, 11.25, 13, 12], "texture": "#1"}, + "west": {"uv": [12.25, 8, 13, 8.75], "texture": "#1"}, + "up": {"uv": [5, 12.75, 3.75, 12], "texture": "#1"}, + "down": {"uv": [9.75, 12, 8.5, 12.75], "texture": "#1"} + } + }, + { + "from": [10, 10, 6.5], + "to": [13, 13, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [9.75, 12.25, 10.5, 13], "texture": "#1"}, + "east": {"uv": [12.25, 9.75, 13, 10.5], "texture": "#1"}, + "south": {"uv": [10.5, 12.25, 11.25, 13], "texture": "#1"}, + "west": {"uv": [12.25, 10.5, 13, 11.25], "texture": "#1"}, + "up": {"uv": [13.25, 0.75, 12.5, 0], "texture": "#1"}, + "down": {"uv": [1.75, 12.5, 1, 13.25], "texture": "#1"} + } + }, + { + "from": [27, 9, 7], + "to": [29, 11, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [1.25, 11.25, 1.75, 11.75], "texture": "#1"}, + "east": {"uv": [12.75, 2.5, 13.25, 3], "texture": "#1"}, + "south": {"uv": [2.75, 12.75, 3.25, 13.25], "texture": "#1"}, + "west": {"uv": [12.75, 3, 13.25, 3.5], "texture": "#1"}, + "up": {"uv": [3.75, 13.25, 3.25, 12.75], "texture": "#1"}, + "down": {"uv": [13.25, 3.5, 12.75, 4], "texture": "#1"} + } + }, + { + "from": [1.3024, 11.72973, 7.25], + "to": [2.8024, 13.22973, 8.75], + "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3.75, 12.75, 4.25, 13.25], "texture": "#1"}, + "east": {"uv": [12.75, 4, 13.25, 4.5], "texture": "#1"}, + "south": {"uv": [4.25, 12.75, 4.75, 13.25], "texture": "#1"}, + "west": {"uv": [4.75, 12.75, 5.25, 13.25], "texture": "#1"}, + "up": {"uv": [5.75, 13.25, 5.25, 12.75], "texture": "#1"}, + "down": {"uv": [8.75, 12.75, 8.25, 13.25], "texture": "#1"} + } + }, + { + "from": [2.17369, 8.49298, 7.5], + "to": [3.17369, 12.49298, 8.5], + "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [5.75, 12.75, 6, 13.75], "texture": "#1"}, + "east": {"uv": [8.75, 12.75, 9, 13.75], "texture": "#1"}, + "south": {"uv": [9, 12.75, 9.25, 13.75], "texture": "#1"}, + "west": {"uv": [9.25, 12.75, 9.5, 13.75], "texture": "#1"}, + "up": {"uv": [8.75, 10.25, 8.5, 10], "texture": "#1"}, + "down": {"uv": [9, 10, 8.75, 10.25], "texture": "#1"} + } + }, + { + "from": [2.10896, 7.18853, 7], + "to": [3.85896, 8.93853, 9], + "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [11.75, 12.75, 12.25, 13.25], "texture": "#1"}, + "east": {"uv": [12.75, 12, 13.25, 12.5], "texture": "#1"}, + "south": {"uv": [12.25, 12.75, 12.75, 13.25], "texture": "#1"}, + "west": {"uv": [12.75, 12.5, 13.25, 13], "texture": "#1"}, + "up": {"uv": [0.5, 13.5, 0, 13], "texture": "#1"}, + "down": {"uv": [1, 13, 0.5, 13.5], "texture": "#1"} + } + }, + { + "from": [3.3024, 7.72973, 7.25], + "to": [5.0524, 9.22973, 8.75], + "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [13, 5, 13.5, 5.5], "texture": "#1"}, + "east": {"uv": [13, 5.5, 13.5, 6], "texture": "#1"}, + "south": {"uv": [6, 13, 6.5, 13.5], "texture": "#1"}, + "west": {"uv": [13, 6, 13.5, 6.5], "texture": "#1"}, + "up": {"uv": [7, 13.5, 6.5, 13], "texture": "#1"}, + "down": {"uv": [13.5, 6.5, 13, 7], "texture": "#1"} + } + }, + { + "from": [5.25, 5, 6.9], + "to": [7.25, 9, 9.1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [11.25, 12.25, 11.75, 13.25], "texture": "#1"}, + "east": {"uv": [12.5, 5, 13, 6], "texture": "#1"}, + "south": {"uv": [12.5, 6, 13, 7], "texture": "#1"}, + "west": {"uv": [12.5, 7, 13, 8], "texture": "#1"}, + "up": {"uv": [7.5, 13.5, 7, 13], "texture": "#1"}, + "down": {"uv": [13.5, 7, 13, 7.5], "texture": "#1"} + } + }, + { + "from": [7.60896, 3.06147, 7], + "to": [9.60896, 6.06147, 9], + "rotation": {"angle": 22.5, "axis": "z", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [12.75, 1, 13.25, 1.75], "texture": "#1"}, + "east": {"uv": [1.75, 12.75, 2.25, 13.5], "texture": "#1"}, + "south": {"uv": [12.75, 1.75, 13.25, 2.5], "texture": "#1"}, + "west": {"uv": [2.25, 12.75, 2.75, 13.5], "texture": "#1"}, + "up": {"uv": [8, 13.5, 7.5, 13], "texture": "#1"}, + "down": {"uv": [13.5, 7.5, 13, 8], "texture": "#1"} + } + }, + { + "from": [4.25, 3.9, 7.25], + "to": [6.25, 5.9, 8.75], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [13, 8, 13.5, 8.5], "texture": "#1"}, + "east": {"uv": [13, 9, 13.5, 9.5], "texture": "#1"}, + "south": {"uv": [9.5, 13, 10, 13.5], "texture": "#1"}, + "west": {"uv": [13, 9.5, 13.5, 10], "texture": "#1"}, + "up": {"uv": [10.5, 13.5, 10, 13], "texture": "#1"}, + "down": {"uv": [13.5, 10, 13, 10.5], "texture": "#1"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 1.5, 2], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 1.5, 2], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, -45, 0], + "translation": [0, 1.75, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, -45, 0], + "translation": [0, 1.75, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, -135, 0], + "translation": [1, -1.25, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "rotation": [0, 36.75, 0], + "translation": [0, 32, 17.5], + "scale": [2, 2, 2] + } + }, + "groups": [ + { + "name": "group", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "group", + "origin": [8, 0, 8], + "color": 0, + "children": [0, 1] + }, + { + "name": "group", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "group", + "origin": [0, 0, 1], + "color": 0, + "children": [2, 3, 4, 5, 6, 7, 8, 9, 10] + }, + { + "name": "group", + "origin": [8, 0, 8], + "color": 0, + "children": [11, 12, 13, 14, 15, 16, 17] + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ultramarine/models/block/small_white_porcelain_vase_bonsai.json b/src/main/resources/assets/ultramarine/models/block/small_white_porcelain_vase_bonsai.json new file mode 100644 index 00000000..65743bb8 --- /dev/null +++ b/src/main/resources/assets/ultramarine/models/block/small_white_porcelain_vase_bonsai.json @@ -0,0 +1,101 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [64, 64], + "render_type": "cutout", + "textures": { + "2": "ultramarine:block/small_white_porcelain_vase_bonsai", + "particle": "block/white_concrete" + }, + "elements": [ + { + "from": [5, 0, 5], + "to": [11, 4, 11], + "faces": { + "north": {"uv": [1.75, 6.5, 3.25, 7.5], "texture": "#2"}, + "east": {"uv": [6.5, 1.75, 8, 2.75], "texture": "#2"}, + "south": {"uv": [6.5, 3, 8, 4], "texture": "#2"}, + "west": {"uv": [3.5, 6.5, 5, 7.5], "texture": "#2"}, + "up": {"uv": [1.5, 8, 0, 6.5], "texture": "#2"}, + "down": {"uv": [8, 0, 6.5, 1.5], "texture": "#2"} + } + }, + { + "from": [6, 4, 6], + "to": [10, 5, 10], + "faces": { + "north": {"uv": [6.5, 5.5, 7.5, 5.75], "texture": "#2"}, + "east": {"uv": [6.5, 6, 7.5, 6.25], "texture": "#2"}, + "south": {"uv": [6.5, 6.5, 7.5, 6.75], "texture": "#2"}, + "west": {"uv": [6.5, 7, 7.5, 7.25], "texture": "#2"}, + "up": {"uv": [7.5, 5.25, 6.5, 4.25], "texture": "#2"}, + "down": {"uv": [6.25, 6.5, 5.25, 7.5], "texture": "#2"} + } + }, + { + "from": [2, 5, 8], + "to": [14, 17, 8], + "faces": { + "north": {"uv": [0, 0, 3, 3], "texture": "#2"}, + "east": {"uv": [6.5, 7.5, 6.5, 10.5], "texture": "#2"}, + "south": {"uv": [0, 3.25, 3, 6.25], "texture": "#2"}, + "west": {"uv": [6.75, 7.5, 6.75, 10.5], "texture": "#2"}, + "up": {"uv": [10, 7.5, 7, 7.5], "texture": "#2"}, + "down": {"uv": [4.75, 7.75, 1.75, 7.75], "texture": "#2"} + } + }, + { + "from": [8, 5, 2], + "to": [8, 17, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, + "faces": { + "north": {"uv": [7.75, 4.25, 7.75, 7.25], "texture": "#2"}, + "east": {"uv": [3.25, 0, 6.25, 3], "texture": "#2"}, + "south": {"uv": [5, 7.75, 5, 10.75], "texture": "#2"}, + "west": {"uv": [3.25, 3.25, 6.25, 6.25], "texture": "#2"}, + "up": {"uv": [5.25, 10.75, 5.25, 7.75], "texture": "#2"}, + "down": {"uv": [5.5, 7.75, 5.5, 10.75], "texture": "#2"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2, 2.25], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2, 2.25], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "translation": [0, 3, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 45, 0], + "translation": [0, 3, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 30, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "translation": [0, 14.25, 0] + } + }, + "groups": [ + { + "name": "group", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1, 2, 3] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ultramarine/models/block/small_white_porcelain_vase_bonsai_diagonal.json b/src/main/resources/assets/ultramarine/models/block/small_white_porcelain_vase_bonsai_diagonal.json new file mode 100644 index 00000000..0cfbd28c --- /dev/null +++ b/src/main/resources/assets/ultramarine/models/block/small_white_porcelain_vase_bonsai_diagonal.json @@ -0,0 +1,104 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [64, 64], + "render_type": "cutout", + "textures": { + "2": "ultramarine:block/small_white_porcelain_vase_bonsai", + "particle": "block/white_concrete" + }, + "elements": [ + { + "from": [5, 0, 5], + "to": [11, 4, 11], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [1.75, 6.5, 3.25, 7.5], "texture": "#2"}, + "east": {"uv": [6.5, 1.75, 8, 2.75], "texture": "#2"}, + "south": {"uv": [6.5, 3, 8, 4], "texture": "#2"}, + "west": {"uv": [3.5, 6.5, 5, 7.5], "texture": "#2"}, + "up": {"uv": [1.5, 8, 0, 6.5], "texture": "#2"}, + "down": {"uv": [8, 0, 6.5, 1.5], "texture": "#2"} + } + }, + { + "from": [6, 4, 6], + "to": [10, 5, 10], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [6.5, 5.5, 7.5, 5.75], "texture": "#2"}, + "east": {"uv": [6.5, 6, 7.5, 6.25], "texture": "#2"}, + "south": {"uv": [6.5, 6.5, 7.5, 6.75], "texture": "#2"}, + "west": {"uv": [6.5, 7, 7.5, 7.25], "texture": "#2"}, + "up": {"uv": [7.5, 5.25, 6.5, 4.25], "texture": "#2"}, + "down": {"uv": [6.25, 6.5, 5.25, 7.5], "texture": "#2"} + } + }, + { + "from": [2, 5, 8], + "to": [14, 17, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 3, 3], "texture": "#2"}, + "east": {"uv": [6.5, 7.5, 6.5, 10.5], "texture": "#2"}, + "south": {"uv": [0, 3.25, 3, 6.25], "texture": "#2"}, + "west": {"uv": [6.75, 7.5, 6.75, 10.5], "texture": "#2"}, + "up": {"uv": [10, 7.5, 7, 7.5], "texture": "#2"}, + "down": {"uv": [4.75, 7.75, 1.75, 7.75], "texture": "#2"} + } + }, + { + "from": [8, 5, 2], + "to": [8, 17, 14], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [7.75, 4.25, 7.75, 7.25], "texture": "#2"}, + "east": {"uv": [3.25, 0, 6.25, 3], "texture": "#2"}, + "south": {"uv": [5, 7.75, 5, 10.75], "texture": "#2"}, + "west": {"uv": [3.25, 3.25, 6.25, 6.25], "texture": "#2"}, + "up": {"uv": [5.25, 10.75, 5.25, 7.75], "texture": "#2"}, + "down": {"uv": [5.5, 7.75, 5.5, 10.75], "texture": "#2"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2, 2.25], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2, 2.25], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "translation": [0, 3, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 45, 0], + "translation": [0, 3, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 30, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "translation": [0, 14.25, 0] + } + }, + "groups": [ + { + "name": "group", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1, 2, 3] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ultramarine/textures/block/large_greeting_pine_bonsai.png b/src/main/resources/assets/ultramarine/textures/block/large_greeting_pine_bonsai.png new file mode 100644 index 0000000000000000000000000000000000000000..0ca0159de810f5ebca3dbf0d8b077b3f875830d7 GIT binary patch literal 3587 zcmai1c{J4T_kWLd3K7PXU5jLrJv(DbVk}vru}gMMN>pYTvK3KTvaeyR*`_qs>=BVA zj6n!vYsSu4zVrFx_xJCQ*S+`LbDnda^SZBlpZmNrGr7fan*THa035ds^vvlV`yaq8 zblaxs+)K~*+}6{!e3r468R8+>1?g&r`6rhp%+ETh_@(KHea!Wp&@w!c04FM#*GU-I zEdnuJ1UfU%2Rj0N-v&y6S6&kTM`)ea@<}uqN@(vFN;}nSR$gYLhZXPRw-T z?XMB5{Z+>!$s#?reSLlF{p)?6?xvfebL#=_?jb+YmE=)V>CD$4>hgydhTi=QeI?5R z>{Ij7ryrp>VXn0E!0Lh3Ydq?V5;t;CU zYgeY9+Y(6UcA$}Vp2pmkTrQ!{AaB8thc>Q?4()mzGe+i2Sm77qNW=zm9vU>+Sq_*MuLWSvignpDfnzrF}La7ktZRs3UD#vPox@>%SvErzNP&fZ6r6p>GvPSNUi;Tq6u|d={zt= z2oR9+6_~{MX8NY6AIe8T_g;96R7%(~6uI@Q5fnj?z2P6vi_n4Nq~o4HA133LkU9~L zF+ww&z1ENR<3rj;OiyA?4v$J``-dA40JdwGO_9j2SzDh5FKjCPJ6NBl6E0+*4gjcz;|f29v!}fHybAb0$}+N@ zxXg9o$#wqdB_#~Db8YaJb~@7r5)Lg1U`WcUmy`^^=G@5G*&&egW?`M+VZ1+bV*FQYp=k>=EOnqPCRJ`zv;TrvVxd!ac;x3kE z+pJ^T8=B%Ypj6xm!g`j+pw{SI@jTm5QHF%hfJR*=mHA`a8A?4{2o5)h7Jik%f#8-4 zYMwsCLM4xZJ07+7MxGkewZAcUQ~ZW*iOwijm|6EumrG5&fR;O#gYBh3Em2+$u?_~p zEWw*1-TbK#zZl5UhIllU4}lXqqk;m@q^a(R@Nq7z+(6g?_N}Y z5SZ$DdOY|p@)?#q9@B(Z>=wW^RN7IqFN7?eJ8qa&eD;Q6mM^wMvjsUEJUCvHJn=J- zshE%9n|2Pmyud@W1WyYGAEyyx0{Aotf z-O)zCOq-09d5!p%Cxp#0$-auYZVIAo;9jYQnwJ*E^{>n^-d7Lg=uNBS?V{Z_G z^H~6ZQ4Ea1IgJIU&L|xfE0Lv|ZFlfP=}pCoMKMY8_diIw4f5Gc@Wh05Y`G=HPas$? z4Qqve;kmI`6Cbqq*-G=R3#Cuc@o%heZYjP1b?D+ydejCJS8Y_S_L?0*W+K?kzX6 zuuXA2rl2()+EgrlwiSW$ZZT6MP-Wkht`U6p3bU@TYwO6;XXD-=%S>}+;$>&O=k~FK zda`dKWs}7JsKb@ju+vX_R3p$KEo1NC<&F17$d*I>`NT7#_17JMYmw$Z$Mya6%sy>; zh>>*(5?$rAFOfGU-dRCn$=3tn!#(LY0MvglPPT8Z{{~T!P$3?J^f_glJ6^3*x!;&YK=@D zS(^3_Qfu1TyRW>nb4tl2n)4R)C8EPmv(YVns?epUSN3_@QJJ}|@Hm5P#;az}aoEV7 zzjbp;+vi(K`A?p}ToPefZ3^Qx+d#z4^53jgJz~S zG=S0w5$0ojrOOgj#C8ViLs(#UJs9Jx519#gkrlGzxpP=!S`&&8p^H6qINrw4LZUXzn&gBgp$>=MVS@ocuA19DZ8T06ITHl%rnx_F-Qr?{{osu`6T zQ#Aut7VNB8aVkkAONt|H1r*q7E+fAEur7@C&NEH{>YwL5r8B&3=ZN>18J4wef z-jwcNofvdR3IWcW;{o2VeZyu${u6RUjnbx>2&R_V)Lvbmvx-$l6Oh6l+;}(+3vQlL zT1)r~-K9G0Q-xYZ9h)n)#V)ar3+Y~KR_ona@2zR1ZTuI;BBe!_Iy>p+9Gl`znOTANrYm0i7s=#g;rYigKbGx$Ar?o8-ai~0T3MRx=mgJf; zpCV=})y~9SWjID(MD>M~avrZ9&07#B72p&@djiu{AI*XY)^${Z0@e~hl&HYB5rU}b zT#O{_DVh6H5?Zg&U0SvFF76!oP;Q+uGQ+FzXa5f`LD5YMQaU_i)4cLdlUip)QTSU1n$e+RcZV77mEHc2s2 zmKcX=p%EkJw)A-pc7k$(Y1L|xHr_AtgN_S2>fd6${H}WJVt2sEr$NUc?T)wdlilqrVUMMTs$t%GB>K!X} z>hO2yoBxdrqWDpGm0rEr%NzE!*bX5u9|cpKa@}yAa$NJJ2uP7|Cheip_B&ffv#dJjRFt zCCB@%{5}m_-k+_TO88syIH$=@JU%10J8R))=e=h+&F+?sJCF@vsS1Nb5|>)V+Re4f zfU+n5hfzI1IM}sx)SnMy!{JnAbB!;i!{z^X@6C=m@A2T-c@Vl9^v@k|`=*Irg^p9$ F{{V#W2}}S0 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ultramarine/textures/block/medium_greeting_pine_bonsai.png b/src/main/resources/assets/ultramarine/textures/block/medium_greeting_pine_bonsai.png new file mode 100644 index 0000000000000000000000000000000000000000..c0b0bd2b5ebeb0fe3c35c083381ce8af612e789b GIT binary patch literal 2763 zcmV;+3N-bJP)lAA!7p?n-EqeK&scnD@#`cUcTUFvG zA;vRr=DqKG-~aDPI7dv)^|R3%^OF9$82bDBnX0Nq$GBWBR9{Ua(C!2Pc)d2HQpcDW zS(3)5d)UOtQptG;Rb~f@7@zK8X2yvGn;{+mR8>X0vktWnsQjwz1)%0D!mBV5An|aG13_>#)7O3jkAJbwIGqVohIyrBFx>UhE%mk=GMX z5<%~dPxr9Jl{D_&OTgo6h23tqv<6EI5DiQu=w{-75&C$z#0OWLB_)Z(|JC6k z>gwy!*x<-x&eU8#n;2P=hKB-(&1{yXnwDQ8(Gzzs5_Gd@d`Aimwy|dU2)q7T`1~#; z@5=xHZ`COIv8D>nF9dk|ER?Rr9fUFk<4Ira#fm|>t_`+f_md5TG~R0 z#&@J>d`A)qHX^=I%s@JAhIjzz?ef6uwV}7mgV10bTU<%wqgx?#-n?q+eL@}sjKrH3 zO@W6Q(054ZLxXKBG}y)l#yX2eYF0eV;!2ud_jPwbkyWHp$4DeIrq>DR7*I&et%R2Y zW1U=GVl$gkB%E0v8FonP?oz9+-h5tGIhF0RUK7UIPVLVsK;zroF)G z?WYJ0wlUK6Lat4b)x2k^Y>unPooGxVqUk%GH?JZ#vng4P;mPW!QpfQ5U8ZvlJuD{> zk)WF$9>2!kH^+Fgbs&WX+gNO7Qz~ZgtQf;^IBZG{T0T5MZ5}-`ldVBDir=at!$b8*14*{;!675Yy)L} zR252Pt(C$EmKZ?EkWnd2Oq9gul~xT>%S1ABD)X~i5CuxO!AQ`}cKx-6^)@0h8sCvB zDe9%%pe)Oh-ZqU-_psI5PxHo^4T=maHb%Sl>qv-wy|ICMTQzDTJ}9zUGW0BmF{J__ z$^j?}B)opShwFh3uK#5-pcJeoJXTSR0g9sF`Sa%zWsagNta-Et0K6=2mI0>Rponrr zy^<;-R*z=i{O;@Sz-mq@@uo4VfWlGS!txqMZ_G>7d3o?ztY9Um81CLnRLmPt&QEnl z;B1DLO8`}N=%dZ@5u$HudM8l@F%qe`Hl7GFGkITkN5#AWWvXPD$ESN(Uv~#*?&|HQ zI6QuB`g>J?MuceTV>6o)=@8ZP#FrvLH=7t)lJtg15Aqb1bcLepD`c>pjhFPd3Zfzl ziv-;)mCd0#d>MddkuSevv(%vhwB6nQTTQ{|ilX3`<5vKH#{uLH309e1)Cd-XSS|y! z_LnE8_3ggI9v(i+NW>Vu*AS~mVq0x?a#ae4!%R_%8#K)@J9!Kso((XHBZ}1q&MX0X zwHC-F{_E& zR9mMsv$xArwCpu8vLuCmYQvq|YncBk!xvAn1c~bFryf%aVb8Uie$AUg2LRlP{tG_g zx6kh?C;^0APU~Sj**YjVMg$LhNYu#q0LW`S0dI3~I-|F^l7=FyTr^`do08b!QDhbS z@me%BHI-b5%jGIL1^|BalhcN8V62moeXwc+s%WQ3#E2-p1c=wv%cr1(c14sBv9D07 zgq_W1vA(_zRaHy=(fss(V62n%c6kt+*^~n9PQ$>h7&!M7S;hO2cTWu#@q zKk_cu@zERelHc!VW(WXWJThBYUPDUQooqH+a%US_!HE}*oLKrM!bfk+=e6~FyF7q_ z(KdrTBS>7N-?Nje5`~tf2>9I>Kj2MDv0^hk6yRr!L?cQ&NV`iupCoX0a+OOGy-xfIz#G6H74zF(Z{arlJLUyF7V^8tD1N$dc68 z-2tE9mA4tgLjgWc)c2F9g5-UfyTCxZ^OSU&1vgr;nN5C8+~1Ga7Jd1>K?f&R3`z=} z)DpY7wDU%;i_}Rkb##y7{evHVhf74D-N`$|Rh-l&2NUO|v1OeQF=Bu? zQ8~>9g81!1jL@GmA_fqFM&tf(V06^37^v@P^}P#R-~t!8zy&UFfeVy@{{qXpME;}8 RSFHd5002ovPDHLkV1h%dB1-@O literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ultramarine/textures/block/small_white_porcelain_vase_bonsai.png b/src/main/resources/assets/ultramarine/textures/block/small_white_porcelain_vase_bonsai.png new file mode 100644 index 0000000000000000000000000000000000000000..45e5b324abf2081dff730307ab122bac27e0a55a GIT binary patch literal 740 zcmVF->?#>ZEJ2+7)9L3qe3GeP4#rC-iel9#Zpmacc&|&N6_n8J-Kfj0ep!1-!nFpl< z0055XrwhNuRiT<~S-vWS4rnzSTrBs7-ok7i&rf0ZaGwDH>>lnj+2G#LWAYfKX>(SDFieKAo~o8 z^5QtUvouSh@{a4L4r)pL`Xi5T83q6VjDsMofB&YT*D>h0KAX|ICt5V<-Sy=$8 zOb{#!9rn8lr32C=HZo}vsLBMvJc&(v&|zJOcAB<9P&M0m@9}cKJZbfVpfWg3Vv{5z z*7Zjozqq{#pMTf7U~J3ewq)|Z)#z%%#u?05hP10jM$dRqjCs&-|MmhloWLgRsrP}z)xFQiR)LX74Sd7@KQ1k z0@yN)@V#B%WN{f>Qk(cEQFUb*m4%w9JeKi&HJJb!DHGSGLKlN&YB=jr$ZcW<7uP0J zi4`Cdm%(Mt?sPF&W@&FCx++{WYgzU&K@bE%5ClOG1VIo4K@bE%5ClOG1VIo)75M{U WPoOTNdcSZ00000