Skip to content

Commit

Permalink
✨ last bonsai
Browse files Browse the repository at this point in the history
  • Loading branch information
@LocusAzzurro
LocusAzzurro committed Sep 27, 2023
1 parent 86204d8 commit eb38d6a
Show file tree
Hide file tree
Showing 18 changed files with 1,458 additions and 2 deletions.
8 changes: 7 additions & 1 deletion src/generated/resources/.cache/cache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
19 changes: 19 additions & 0 deletions src/generated/resources/assets/ultramarine/blockstates/large_greeting_pine_bonsai.json
View file
Original file line number Diff line number Diff line change
@@ -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
}
}
}
19 changes: 19 additions & 0 deletions src/generated/resources/assets/ultramarine/blockstates/medium_greeting_pine_bonsai.json
View file
Original file line number Diff line number Diff line change
@@ -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
}
}
}
126 changes: 126 additions & 0 deletions ...generated/resources/assets/ultramarine/blockstates/small_white_porcelain_vase_bonsai.json
View file
Original file line number Diff line number Diff line change
@@ -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
}
}
}
3 changes: 3 additions & 0 deletions src/generated/resources/assets/ultramarine/models/item/large_greeting_pine_bonsai.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "ultramarine:block/large_greeting_pine_bonsai"
}
3 changes: 3 additions & 0 deletions src/generated/resources/assets/ultramarine/models/item/medium_greeting_pine_bonsai.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "ultramarine:block/medium_greeting_pine_bonsai"
}
3 changes: 3 additions & 0 deletions ...generated/resources/assets/ultramarine/models/item/small_white_porcelain_vase_bonsai.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "ultramarine:block/small_white_porcelain_vase_bonsai"
}
3 changes: 3 additions & 0 deletions src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/voxelutopia/ultramarine/client/event/ModClientRenderEventHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());
});
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -764,6 +764,12 @@ public class BlockRegistry {
() -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_14).directional().diagonallyPlaceable().noCollision().build());
public static final RegistryObject<Block> 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<Block> 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<Block> 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<Block> MEDIUM_GREETING_PINE_BONSAI = BLOCKS.register("medium_greeting_pine_bonsai",
() -> DecorativeBlock.with(BaseBlockProperty.PORCELAIN).shaped(DecorativeBlock.FULL_14).directional().noCollision().noOcclusion().build());

/**
* LAMPS
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,9 @@ public class ItemRegistry {
public static final RegistryObject<Item> SMALL_GREEN_PORCELAIN_VASE_BONSAI = fromBlock(BlockRegistry.SMALL_GREEN_PORCELAIN_VASE_BONSAI, ModCreativeTab.PLANTS);
public static final RegistryObject<Item> MEDIUM_WHITE_PORCELAIN_VASE_BONSAI = fromBlock(BlockRegistry.MEDIUM_WHITE_PORCELAIN_VASE_BONSAI, ModCreativeTab.PLANTS);
public static final RegistryObject<Item> LARGE_WHITE_PORCELAIN_VASE_BONSAI = fromBlock(BlockRegistry.LARGE_WHITE_PORCELAIN_VASE_BONSAI, ModCreativeTab.PLANTS);
public static final RegistryObject<Item> LARGE_GREETING_PINE_BONSAI = fromBlock(BlockRegistry.LARGE_GREETING_PINE_BONSAI, ModCreativeTab.PLANTS);
public static final RegistryObject<Item> SMALL_WHITE_PORCELAIN_VASE_BONSAI = fromBlock(BlockRegistry.SMALL_WHITE_PORCELAIN_VASE_BONSAI, ModCreativeTab.PLANTS);
public static final RegistryObject<Item> MEDIUM_GREETING_PINE_BONSAI = fromBlock(BlockRegistry.MEDIUM_GREETING_PINE_BONSAI, ModCreativeTab.PLANTS);

/**
* LAMPS
Expand Down
Loading

0 comments on commit eb38d6a

Please sign in to comment.