Merge branch 'akashic' into akashic
This commit is contained in:
petrak@
GitHub
commit
9b30618974
28 changed files with 118 additions and 129 deletions
|
|
@ -1,18 +1,18 @@
|
|||
af43d61eaafd9f26205cb25f7ce773a71359d258 assets/hexcasting/blockstates/akashic_bookshelf.json
|
||||
a5072772ae25262cabaef2f0624641eef2eadc61 assets/hexcasting/blockstates/akashic_connector.json
|
||||
91f208585023b29e8830e2d922958317a923875c assets/hexcasting/blockstates/akashic_connector.json
|
||||
26bf6d61bd1e94ca75c58743eb7fc7494c98f6e4 assets/hexcasting/blockstates/akashic_door.json
|
||||
9d665f36929469cbe57274871afdc166d506d44c assets/hexcasting/blockstates/akashic_leaves1.json
|
||||
58deb1bad40d9f917fa99c96f06da4b848a607c2 assets/hexcasting/blockstates/akashic_leaves2.json
|
||||
f285b00cfa627d07f8ba6eb28d6ad3c4d696128c assets/hexcasting/blockstates/akashic_leaves3.json
|
||||
5b2bf8785f62edf2408c11e7c573746d409843a7 assets/hexcasting/blockstates/akashic_log.json
|
||||
8d71659359295860f68e4443f9cef7baddc12b59 assets/hexcasting/blockstates/akashic_log_stripped.json
|
||||
f8d4d7c59d2005233cd4fa1e4ca4affb927cb103 assets/hexcasting/blockstates/akashic_panel.json
|
||||
4f44283439e7d014764ca0c11eb260813950a6d6 assets/hexcasting/blockstates/akashic_planks.json
|
||||
baecc6fe7cbade45febab7d8738b9c5530ea16f6 assets/hexcasting/blockstates/akashic_record.json
|
||||
77b08b6a5c256015001d542017db9c501110d891 assets/hexcasting/blockstates/akashic_tile.json
|
||||
384a9b1f499e42e7521b2152abd9b6dbb57c7e3e assets/hexcasting/blockstates/akashic_panel.json
|
||||
bb73faa9d55b67fdb02debffaae62416598e40a7 assets/hexcasting/blockstates/akashic_planks.json
|
||||
ea33831e4b98afbde82a2f82ce8851b026ba2770 assets/hexcasting/blockstates/akashic_record.json
|
||||
3b6141e92e099e2ba73f31915e5c76ea35c92564 assets/hexcasting/blockstates/akashic_tile.json
|
||||
760234cb7550850a909444ac36da0ce1c850e007 assets/hexcasting/blockstates/akashic_trapdoor.json
|
||||
9fb9fd04e230728514130747d042d300acbcc061 assets/hexcasting/blockstates/akashic_wood.json
|
||||
5586d7e89dd43ed2607d239597ac2e776491b707 assets/hexcasting/blockstates/akashic_wood_stripped.json
|
||||
1633eb43059b740bdc8790dfd0b23fd8e172ac06 assets/hexcasting/blockstates/akashic_wood.json
|
||||
fad16f4762ede9660433702101f7d2f294e624ad assets/hexcasting/blockstates/akashic_wood_stripped.json
|
||||
6467be85f85137aa17be8b03ee96c224839a9e25 assets/hexcasting/blockstates/amethyst_dust_block.json
|
||||
1d17548d44b3169d43663d1cbc7699d75ccc8a54 assets/hexcasting/blockstates/amethyst_sconce.json
|
||||
aed50918bad8a7b00cd26e45d67eb509a04c9f6c assets/hexcasting/blockstates/amethyst_tiles.json
|
||||
|
|
@ -28,41 +28,36 @@ aed50918bad8a7b00cd26e45d67eb509a04c9f6c assets/hexcasting/blockstates/amethyst_
|
|||
77e723163f415795437b810fe87c348c96a989be assets/hexcasting/blockstates/scroll_paper_lantern.json
|
||||
5cb63493ae07f5ab5d8f686e3553c97a85105931 assets/hexcasting/blockstates/slate.json
|
||||
043abd5bbfd1186415049d24d185d4e4395320f9 assets/hexcasting/blockstates/slate_block.json
|
||||
a38a867ae86bc5da5e7abb668e6a92a7e2628279 assets/hexcasting/models/akashic/connector.json
|
||||
ae64faa4b9e60f27d1df999748d3bae5bacc2518 assets/hexcasting/models/akashic/log.json
|
||||
db390313c28127d1437d7bb0cd4a0d7d1bb68c68 assets/hexcasting/models/akashic/log_stripped.json
|
||||
1c54badd0919b1f314f24d011c295607a7fe01cc assets/hexcasting/models/akashic/panel.json
|
||||
3b7be04ca6d862ff1301460bb6faf766552d63ff assets/hexcasting/models/akashic/record.json
|
||||
9da23f6064ce94f3fc98586c0e3967f542a19623 assets/hexcasting/models/akashic/tile.json
|
||||
2d15e34158cece647d497ef88e463487359f75eb assets/hexcasting/models/block/akashic_bookshelf_double0.json
|
||||
632d2cddba9c17b1580d50e1995de3c44d31f542 assets/hexcasting/models/block/akashic_bookshelf_double1.json
|
||||
c96c914adc33e0aede5e65c157b86d712c93fe3c assets/hexcasting/models/block/akashic_bookshelf_double2.json
|
||||
d450489f48e120d19ace98d6419c30bf6d2abf57 assets/hexcasting/models/block/akashic_bookshelf_double3.json
|
||||
7f0443e9859e339695dc51a17999ba464cfafd10 assets/hexcasting/models/block/akashic_bookshelf_empty0.json
|
||||
697e3e12fad2fa3cbcaf65ec9e8730796762d761 assets/hexcasting/models/block/akashic_bookshelf_entity0.json
|
||||
4afa26f463c514c93a7faa86834515769d14fae3 assets/hexcasting/models/block/akashic_bookshelf_entity1.json
|
||||
726d6db36ec79c44c21bcb9e726ccd45d3f7603c assets/hexcasting/models/block/akashic_bookshelf_entity2.json
|
||||
4eb78401ba6018230d7f2f15a4604f7f82e10288 assets/hexcasting/models/block/akashic_bookshelf_entity3.json
|
||||
4160204476c68c89f49862b1239feaab7efc82af assets/hexcasting/models/block/akashic_bookshelf_list0.json
|
||||
30b2da2b25229646729fc6a60bca939b17a301cb assets/hexcasting/models/block/akashic_bookshelf_list1.json
|
||||
d820a4698ed10673f83fd5d3d2ba51831eed1719 assets/hexcasting/models/block/akashic_bookshelf_list2.json
|
||||
16a4ac20b3342fc0551c7819f4b588f834b05240 assets/hexcasting/models/block/akashic_bookshelf_list3.json
|
||||
a2c05476f6876e1d3933fbf24c7ebee6a817e4e7 assets/hexcasting/models/block/akashic_bookshelf_other0.json
|
||||
e4f5dd9d9c18e8864bdb8089c5c027b961840c71 assets/hexcasting/models/block/akashic_bookshelf_other1.json
|
||||
a0648b0b707cb71302c0b4c5c1d1850700049f0b assets/hexcasting/models/block/akashic_bookshelf_other2.json
|
||||
da0b58413ccbe244395e576374eabf9f7f77cff5 assets/hexcasting/models/block/akashic_bookshelf_other3.json
|
||||
46f14c543f573d17ce88586994b5190d49aa82e0 assets/hexcasting/models/block/akashic_bookshelf_pattern0.json
|
||||
d35301dcfa6113bf18d93e3390e4f41ba82fc496 assets/hexcasting/models/block/akashic_bookshelf_pattern1.json
|
||||
4fcce7cb268762cefc7aeb23857f4a8f9dd27cea assets/hexcasting/models/block/akashic_bookshelf_pattern2.json
|
||||
05a5db451083e351663a3e8543de96387ccb0019 assets/hexcasting/models/block/akashic_bookshelf_pattern3.json
|
||||
b40c007e6445c3651fb862a717ffcae71fa5b134 assets/hexcasting/models/block/akashic_bookshelf_vec0.json
|
||||
0e5e5980be796fed69121b5afbb345a7e7f5e232 assets/hexcasting/models/block/akashic_bookshelf_vec1.json
|
||||
cbda1ba469c679566ad913d02a2aa6b82d581469 assets/hexcasting/models/block/akashic_bookshelf_vec2.json
|
||||
4ecb317c7f0844878ef3e507ea40fb5c02ad9325 assets/hexcasting/models/block/akashic_bookshelf_vec3.json
|
||||
2430f9dcaf51c86d3413ebfc6834e3ca91e5f4aa assets/hexcasting/models/block/akashic_bookshelf_widget0.json
|
||||
94e79ebb6e73ef89ec6a20d11b7ea242e6f387c3 assets/hexcasting/models/block/akashic_bookshelf_widget1.json
|
||||
3b411abf79de1e2bed972a40c3338e4584719b54 assets/hexcasting/models/block/akashic_bookshelf_widget2.json
|
||||
6363ddafca13522e33c94656f05d381d8cdf286f assets/hexcasting/models/block/akashic_bookshelf_widget3.json
|
||||
866dc8bd766571aec33394b4af1e6b28ceef36cb assets/hexcasting/models/block/akashic_bookshelf_double0.json
|
||||
b582e7eb88a4e7cf258b903d2ba282bfa5770deb assets/hexcasting/models/block/akashic_bookshelf_double1.json
|
||||
06ec37e0e3edc576713e60ea3670f208ddef8335 assets/hexcasting/models/block/akashic_bookshelf_double2.json
|
||||
fa7df33096483b43d2fd5e663576d0ed6c77fd00 assets/hexcasting/models/block/akashic_bookshelf_double3.json
|
||||
2fb789e8f932dff33b9dffef66a6c570cd09e593 assets/hexcasting/models/block/akashic_bookshelf_empty0.json
|
||||
1bf1773a6224537b0d1cdb5ed98300094763b35e assets/hexcasting/models/block/akashic_bookshelf_entity0.json
|
||||
fb06e1af5d79feae6f8826bba0fc6c57f95f32eb assets/hexcasting/models/block/akashic_bookshelf_entity1.json
|
||||
cc2a9bb3c959ad313431c1476f6f3a4410aaf4d5 assets/hexcasting/models/block/akashic_bookshelf_entity2.json
|
||||
339d944a1604a0949e836a412b192ef5f18a31de assets/hexcasting/models/block/akashic_bookshelf_entity3.json
|
||||
609195285d8672221f3bf5d6196e2536a29e3a36 assets/hexcasting/models/block/akashic_bookshelf_list0.json
|
||||
66bb6f23b7d5fdcd1bfd45cbba00c082bf328d6d assets/hexcasting/models/block/akashic_bookshelf_list1.json
|
||||
8e9fabc624bd4a9171f326d1b116ddce0ac03936 assets/hexcasting/models/block/akashic_bookshelf_list2.json
|
||||
b6722e6b1ed5bae988152579f925562e05c0e7ce assets/hexcasting/models/block/akashic_bookshelf_list3.json
|
||||
450c52b84d0ce8db6bca9bcb0f401e4c0f64d56e assets/hexcasting/models/block/akashic_bookshelf_other0.json
|
||||
c45373e6acfe8e02b892cf79b0ab90b20505a403 assets/hexcasting/models/block/akashic_bookshelf_other1.json
|
||||
0bd6a902d935c54f95c403fe987d6d1d8fd4b037 assets/hexcasting/models/block/akashic_bookshelf_other2.json
|
||||
df0eff5d064b1344c16a25b1f61ed8e0d1d9e93d assets/hexcasting/models/block/akashic_bookshelf_other3.json
|
||||
f012cc73e966263135581f6b5559573d7027d161 assets/hexcasting/models/block/akashic_bookshelf_pattern0.json
|
||||
1b0fa714816106bf800346a47558f808b614f20e assets/hexcasting/models/block/akashic_bookshelf_pattern1.json
|
||||
c87db8396d3aff9de54bceaaf7005e99bc11e941 assets/hexcasting/models/block/akashic_bookshelf_pattern2.json
|
||||
c97f68bfea418fc1e71e801ddb408456aaf2709b assets/hexcasting/models/block/akashic_bookshelf_pattern3.json
|
||||
daa7c03501b6c416e292ee81a1086777374fb65f assets/hexcasting/models/block/akashic_bookshelf_vec0.json
|
||||
77a385aef36d9ff1b8ee8c3257cf0a131c7a00bc assets/hexcasting/models/block/akashic_bookshelf_vec1.json
|
||||
088749fa83b9eab81e572b93833ab31166cf54aa assets/hexcasting/models/block/akashic_bookshelf_vec2.json
|
||||
2d9880c0a28e90e030b920426443e69e4bbda3d1 assets/hexcasting/models/block/akashic_bookshelf_vec3.json
|
||||
2d66d2d958325c5e8afd8ded4e413a0a29d004cf assets/hexcasting/models/block/akashic_bookshelf_widget0.json
|
||||
8eb8b14eb801739687ac4cdf29b959dce0b206f3 assets/hexcasting/models/block/akashic_bookshelf_widget1.json
|
||||
2ceccf7ebfad7517a476978b7110875f05569506 assets/hexcasting/models/block/akashic_bookshelf_widget2.json
|
||||
4511f440c9f25f6daa2bf352f192beef3088faf2 assets/hexcasting/models/block/akashic_bookshelf_widget3.json
|
||||
a38a867ae86bc5da5e7abb668e6a92a7e2628279 assets/hexcasting/models/block/akashic_connector.json
|
||||
f3a7403c673a4816d421f22e69a5458670694aac assets/hexcasting/models/block/akashic_door_bottom.json
|
||||
8e33c5d50ab94c4996522cce88b70e5c317a3635 assets/hexcasting/models/block/akashic_door_bottom_hinge.json
|
||||
7501cab8a6dcdbe4b82230ead8c6b2c08281446a assets/hexcasting/models/block/akashic_door_top.json
|
||||
|
|
@ -70,13 +65,16 @@ f3a7403c673a4816d421f22e69a5458670694aac assets/hexcasting/models/block/akashic_
|
|||
b2ac7229c89bd2d8dd8f6e42e18bab1d993b38e3 assets/hexcasting/models/block/akashic_leaves1.json
|
||||
998f003703e97667a90603ac4c8436e7c9e4c8de assets/hexcasting/models/block/akashic_leaves2.json
|
||||
edb9388b709f0494414fe19ae334e82d0a7df706 assets/hexcasting/models/block/akashic_leaves3.json
|
||||
fe031acc66f113fee6f1c62ed96b1856c3f590c5 assets/hexcasting/models/block/akashic_log.json
|
||||
a6e381a6feacb382c09726c14722af6a2956a4c5 assets/hexcasting/models/block/akashic_log.json
|
||||
127bd87945186bd50ce30120d595f76e1cca0050 assets/hexcasting/models/block/akashic_log_horizontal.json
|
||||
2ce7f7607c05d0f74a599558ec6d627126f9224e assets/hexcasting/models/block/akashic_log_stripped.json
|
||||
5be06a63f9dc170b4296171e08bdab34ab4d7fa6 assets/hexcasting/models/block/akashic_log_stripped.json
|
||||
a8b318998bccc81362a2a6c3c8fccc5723edd1ca assets/hexcasting/models/block/akashic_log_stripped_horizontal.json
|
||||
1c54badd0919b1f314f24d011c295607a7fe01cc assets/hexcasting/models/block/akashic_panel.json
|
||||
a5bea93e08e787b2c8cdce00c78b79a8d0eccb23 assets/hexcasting/models/block/akashic_planks1.json
|
||||
27e9cab01d45b5c03ccd49e97a4147b853b6257f assets/hexcasting/models/block/akashic_planks2.json
|
||||
9281b13a476ff68a90893e25253d5a3d1180a214 assets/hexcasting/models/block/akashic_planks3.json
|
||||
3b7be04ca6d862ff1301460bb6faf766552d63ff assets/hexcasting/models/block/akashic_record.json
|
||||
9da23f6064ce94f3fc98586c0e3967f542a19623 assets/hexcasting/models/block/akashic_tile.json
|
||||
ca9e25d900c15888fa6562091f265db0e7cb0866 assets/hexcasting/models/block/akashic_trapdoor_bottom.json
|
||||
c4ac5b4b39c0c364a783c22eccb3d71cc911b3e5 assets/hexcasting/models/block/akashic_trapdoor_open.json
|
||||
7dd49520e7b38c676a4b91bb4aad88267e01bb81 assets/hexcasting/models/block/akashic_trapdoor_top.json
|
||||
|
|
@ -167,20 +165,20 @@ b153bbd2773f0c7f114106170163530ebd28c440 assets/hexcasting/models/block/scroll_p
|
|||
d51541b464840530f4e734db1f67ed20e811ad14 assets/hexcasting/models/block/slate_block.json
|
||||
60c0f39882d22c2634cf738b0fe4e956eaa2adbe assets/hexcasting/models/item/abacus.json
|
||||
eba0bb8d1b28802748d98383d010615891489987 assets/hexcasting/models/item/akashic_bookshelf.json
|
||||
d692f7464f0ab040727326aa0e2d2b51d5c6add7 assets/hexcasting/models/item/akashic_connector.json
|
||||
1fc62f356e3ee458a60ffdec7f4947cbf5aa8882 assets/hexcasting/models/item/akashic_connector.json
|
||||
c3d001dd9f5fda8958b8658fee2626bd32e2571d assets/hexcasting/models/item/akashic_door.json
|
||||
3667e8e2b4fa549fe72e25a0ce462e3833dd48a5 assets/hexcasting/models/item/akashic_leaves1.json
|
||||
5e92997c8938217690e8cba195cd252065b6f0f1 assets/hexcasting/models/item/akashic_leaves2.json
|
||||
7a791df627b6b765e0106d32caffe12e4bb6ffa1 assets/hexcasting/models/item/akashic_leaves3.json
|
||||
b95575de749522d9e11a5dfcfaf4799b49726f77 assets/hexcasting/models/item/akashic_log.json
|
||||
8f7fc27acc16f720f4ce202fd640ef5a21f838e1 assets/hexcasting/models/item/akashic_log_stripped.json
|
||||
154eb8e5ba53831899ea09934687fc50324a2539 assets/hexcasting/models/item/akashic_panel.json
|
||||
f86e2b4c4ecb5bd62cebdc369ea8fb292abd1b60 assets/hexcasting/models/item/akashic_log.json
|
||||
ea8dc7e5d852da7fa0da886ddca0bfd279ead164 assets/hexcasting/models/item/akashic_log_stripped.json
|
||||
b83654f1ca1b5805d88d93045590ab562ebfd0c6 assets/hexcasting/models/item/akashic_panel.json
|
||||
d10518ab5c588c8e3fe03ecdcf69f2eb8c35fe3a assets/hexcasting/models/item/akashic_planks.json
|
||||
cf97257967c0d98fcf125c50f69941a4ca67e082 assets/hexcasting/models/item/akashic_record.json
|
||||
c202deb1f7d250666f13a0353c71d7e9e92c6fc6 assets/hexcasting/models/item/akashic_tile.json
|
||||
ce08b3ce6036801a9a6dc76d0cdea9aac3e44778 assets/hexcasting/models/item/akashic_trapdoor.json
|
||||
23a5302144a90bc608c1afadda63b6b8e91639ac assets/hexcasting/models/item/akashic_wood.json
|
||||
b04b63c5a6008a4a233a9352c024dd44c544d0a2 assets/hexcasting/models/item/akashic_wood_stripped.json
|
||||
d904d1cbd8ea36d41ef8a53cfbbe77646f3b12f4 assets/hexcasting/models/item/akashic_record.json
|
||||
e740b40ab8a69f564abb708f256f2ef71157d15a assets/hexcasting/models/item/akashic_tile.json
|
||||
a63540e7a9f733c3e1f01532651b4d169b205641 assets/hexcasting/models/item/akashic_trapdoor.json
|
||||
f86e2b4c4ecb5bd62cebdc369ea8fb292abd1b60 assets/hexcasting/models/item/akashic_wood.json
|
||||
ea8dc7e5d852da7fa0da886ddca0bfd279ead164 assets/hexcasting/models/item/akashic_wood_stripped.json
|
||||
eb78f6a2b68dd772a5016fc5a3db10488a65abfa assets/hexcasting/models/item/amethyst_dust.json
|
||||
6a60e6e92414f63e7e045f2893e5cd7b503d08dd assets/hexcasting/models/item/amethyst_dust_block.json
|
||||
0d0695c9a96cadec55d905a42d0ba966f8697c41 assets/hexcasting/models/item/amethyst_sconce.json
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"variants": {
|
||||
"": {
|
||||
"model": "hexcasting:akashic/connector"
|
||||
"model": "hexcasting:block/akashic_connector"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"variants": {
|
||||
"": {
|
||||
"model": "hexcasting:akashic/panel"
|
||||
"model": "hexcasting:block/akashic_panel"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +1,17 @@
|
|||
{
|
||||
"variants": {
|
||||
"": {
|
||||
"model": "hexcasting:block/akashic_planks3"
|
||||
}
|
||||
"": [
|
||||
{
|
||||
"model": "hexcasting:block/akashic_planks1",
|
||||
"weight": 3
|
||||
},
|
||||
{
|
||||
"model": "hexcasting:block/akashic_planks2",
|
||||
"weight": 3
|
||||
},
|
||||
{
|
||||
"model": "hexcasting:block/akashic_planks3"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"variants": {
|
||||
"": {
|
||||
"model": "hexcasting:akashic/record"
|
||||
"model": "hexcasting:block/akashic_record"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"variants": {
|
||||
"": {
|
||||
"model": "hexcasting:akashic/tile"
|
||||
"model": "hexcasting:block/akashic_tile"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"variants": {
|
||||
"": {
|
||||
"model": "hexcasting:akashic/log"
|
||||
"model": "hexcasting:block/akashic_log"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"variants": {
|
||||
"": {
|
||||
"model": "hexcasting:akashic/log_stripped"
|
||||
"model": "hexcasting:block/akashic_log_stripped"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"all": "hexcasting:block/akashic/log"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"all": "hexcasting:block/akashic/log_stripped"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +1,8 @@
|
|||
{
|
||||
"parent": "minecraft:block/cube_column",
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"side": "hexcasting:block/akashic/log",
|
||||
"end": "hexcasting:block/akashic/log_end"
|
||||
"end": "hexcasting:block/akashic/log_end",
|
||||
"all": "hexcasting:block/akashic/log"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +1,8 @@
|
|||
{
|
||||
"parent": "minecraft:block/cube_column",
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"side": "hexcasting:block/akashic/log_stripped",
|
||||
"end": "hexcasting:block/akashic/log_end_stripped"
|
||||
"end": "hexcasting:block/akashic/log_end_stripped",
|
||||
"all": "hexcasting:block/akashic/log_stripped"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
"parent": "hexcasting:akashic/connector"
|
||||
"parent": "hexcasting:block/akashic_connector"
|
||||
}
|
||||
|
|
@ -1,7 +1,3 @@
|
|||
{
|
||||
"parent": "hexcasting:item/akashic_log",
|
||||
"textures": {
|
||||
"side": "hexcasting:block/akashic/log",
|
||||
"end": "hexcasting:block/akashic/log_end"
|
||||
}
|
||||
"parent": "hexcasting:block/akashic_log"
|
||||
}
|
||||
|
|
@ -1,7 +1,3 @@
|
|||
{
|
||||
"parent": "hexcasting:item/akashic_log_stripped",
|
||||
"textures": {
|
||||
"side": "hexcasting:block/akashic/log_stripped",
|
||||
"end": "hexcasting:block/akashic/log_end_stripped"
|
||||
}
|
||||
"parent": "hexcasting:block/akashic_log_stripped"
|
||||
}
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
"parent": "hexcasting:akashic/panel"
|
||||
"parent": "hexcasting:block/akashic_panel"
|
||||
}
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
"parent": "hexcasting:akashic/record"
|
||||
"parent": "hexcasting:block/akashic_record"
|
||||
}
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
"parent": "hexcasting:akashic/tile"
|
||||
"parent": "hexcasting:block/akashic_tile"
|
||||
}
|
||||
|
|
@ -1,6 +1,3 @@
|
|||
{
|
||||
"parent": "hexcasting:item/akashic_trapdoor",
|
||||
"textures": {
|
||||
"texture": "hexcasting:block/akashic/trapdoor"
|
||||
}
|
||||
"parent": "hexcasting:block/akashic_trapdoor_bottom"
|
||||
}
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
"parent": "hexcasting:akashic/log"
|
||||
"parent": "hexcasting:block/akashic_log"
|
||||
}
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
"parent": "hexcasting:akashic/log_stripped"
|
||||
"parent": "hexcasting:block/akashic_log_stripped"
|
||||
}
|
||||
|
|
@ -36,10 +36,10 @@ public class AkashicTreeGrower extends AbstractTreeGrower {
|
|||
new TreeConfiguration.TreeConfigurationBuilder(
|
||||
BlockStateProvider.simple(HexBlocks.AKASHIC_LOG.get()),
|
||||
// baseHeight, heightRandA, heightRandB
|
||||
new FancyTrunkPlacer(8, 9, 11),
|
||||
new FancyTrunkPlacer(3, 5, 2),
|
||||
BlockStateProvider.simple(leaves[i]),
|
||||
// radius, offset, height
|
||||
new FancyFoliagePlacer(ConstantInt.of(2), ConstantInt.of(5), 7),
|
||||
new FancyFoliagePlacer(ConstantInt.of(1), ConstantInt.of(5), 5),
|
||||
// limit, lower size, upper size, minclippedheight
|
||||
new TwoLayersFeatureSize(0, 0, 0, OptionalInt.of(6))
|
||||
).build());
|
||||
|
|
|
|||
|
|
@ -120,8 +120,10 @@ public class HexBlockStatesAndModels extends PaucalBlockStateAndModelProvider {
|
|||
.build();
|
||||
});
|
||||
|
||||
cubeBlockAndItem(HexBlocks.AKASHIC_RECORD.get(), "akashic/record");
|
||||
cubeBlockAndItem(HexBlocks.AKASHIC_CONNECTOR.get(), "akashic/connector");
|
||||
blockAndItem(HexBlocks.AKASHIC_RECORD.get(),
|
||||
models().cubeAll("akashic_record", modLoc("block/akashic/record")));
|
||||
blockAndItem(HexBlocks.AKASHIC_CONNECTOR.get(),
|
||||
models().cubeAll("akashic_connector", modLoc("block/akashic/connector")));
|
||||
|
||||
getVariantBuilder(HexBlocks.AKASHIC_BOOKSHELF.get()).forAllStates(bs -> {
|
||||
var type = bs.getValue(BlockAkashicBookshelf.DATUM_TYPE);
|
||||
|
|
@ -179,23 +181,15 @@ public class HexBlockStatesAndModels extends PaucalBlockStateAndModelProvider {
|
|||
modLoc("block/ancient_scroll_paper_lantern_bottom"),
|
||||
modLoc("block/ancient_scroll_paper_lantern_top")));
|
||||
|
||||
ResourceLocation logSide = modLoc("block/akashic/log");
|
||||
ResourceLocation logEnd = modLoc("block/akashic/log_end");
|
||||
axisBlock(HexBlocks.AKASHIC_LOG.get(), logSide, logEnd);
|
||||
simpleBlockItem(HexBlocks.AKASHIC_LOG.get(),
|
||||
itemModels().cubeColumn("akashic_log", logSide, logEnd));
|
||||
|
||||
ResourceLocation logStrippedSide = modLoc("block/akashic/log_stripped");
|
||||
ResourceLocation logStrippedEnd = modLoc("block/akashic/log_end_stripped");
|
||||
axisBlock(HexBlocks.AKASHIC_LOG_STRIPPED.get(), logStrippedSide, logStrippedEnd);
|
||||
simpleBlockItem(HexBlocks.AKASHIC_LOG_STRIPPED.get(),
|
||||
itemModels().cubeColumn("akashic_log_stripped", logStrippedSide, logStrippedEnd));
|
||||
|
||||
cubeBlockAndItem(HexBlocks.AKASHIC_WOOD.get(), "akashic/log");
|
||||
cubeBlockAndItem(HexBlocks.AKASHIC_WOOD_STRIPPED.get(), "akashic/log_stripped");
|
||||
cubeBlockAndItem(HexBlocks.AKASHIC_PANEL.get(), "akashic/panel");
|
||||
cubeBlockAndItem(HexBlocks.AKASHIC_TILE.get(), "akashic/tile");
|
||||
axisBlock(HexBlocks.AKASHIC_LOG.get(), modLoc("block/akashic/log"), modLoc("block/akashic/log_end"));
|
||||
axisBlock(HexBlocks.AKASHIC_LOG_STRIPPED.get(), modLoc("block/akashic/log_stripped"),
|
||||
modLoc("block/akashic/log_end_stripped"));
|
||||
|
||||
blockAndItem(HexBlocks.AKASHIC_WOOD.get(), models().cubeAll("akashic_log", modLoc("block/akashic/log")));
|
||||
blockAndItem(HexBlocks.AKASHIC_WOOD_STRIPPED.get(),
|
||||
models().cubeAll("akashic_log_stripped", modLoc("block/akashic/log_stripped")));
|
||||
blockAndItem(HexBlocks.AKASHIC_PANEL.get(), models().cubeAll("akashic_panel", modLoc("block/akashic/panel")));
|
||||
blockAndItem(HexBlocks.AKASHIC_TILE.get(), models().cubeAll("akashic_tile", modLoc("block/akashic/tile")));
|
||||
|
||||
ResourceLocation leavesParent = new ResourceLocation("block/leaves");
|
||||
blockAndItem(HexBlocks.AKASHIC_LEAVES1.get(),
|
||||
|
|
@ -211,18 +205,19 @@ public class HexBlockStatesAndModels extends PaucalBlockStateAndModelProvider {
|
|||
doorBlock(HexBlocks.AKASHIC_DOOR.get(), modLoc("block/akashic/door_lower"), modLoc("block/akashic/door_upper"));
|
||||
// door model via the given texture
|
||||
trapdoorBlock(HexBlocks.AKASHIC_TRAPDOOR.get(), modLoc("block/akashic/trapdoor"), true);
|
||||
simpleBlockItem(HexBlocks.AKASHIC_TRAPDOOR.get(),
|
||||
itemModels().trapdoorOrientableTop("akashic_trapdoor", modLoc("block/akashic/trapdoor")));
|
||||
|
||||
var planksBuilder = ConfiguredModel.builder();
|
||||
for (int i = 1; i <= 3; i++) {
|
||||
var model = models().cubeAll("akashic_planks" + i, modLoc("block/akashic/planks" + i));
|
||||
if (i == 1) {
|
||||
simpleBlockItem(HexBlocks.AKASHIC_PLANKS.get(), model);
|
||||
}
|
||||
planksBuilder.modelFile(model);
|
||||
}
|
||||
simpleBlock(HexBlocks.AKASHIC_PLANKS.get(), planksBuilder.build());
|
||||
|
||||
simpleBlock(HexBlocks.AKASHIC_PLANKS.get(), ConfiguredModel.builder()
|
||||
.modelFile(models().cubeAll("akashic_planks1", modLoc("block/akashic/planks1")))
|
||||
.weight(3)
|
||||
.nextModel()
|
||||
.modelFile(models().cubeAll("akashic_planks2", modLoc("block/akashic/planks2")))
|
||||
.weight(3)
|
||||
.nextModel()
|
||||
.modelFile(models().cubeAll("akashic_planks3", modLoc("block/akashic/planks3")))
|
||||
.build());
|
||||
simpleBlockItem(HexBlocks.AKASHIC_PLANKS.get(),
|
||||
models().cubeAll("akashic_planks1", modLoc("block/akashic/planks1")));
|
||||
|
||||
var sconceModel = models().getExistingFile(modLoc("amethyst_sconce"));
|
||||
simpleBlock(HexBlocks.SCONCE.get(), sconceModel);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
package at.petrak.hexcasting.datagen;
|
||||
|
||||
import at.petrak.hexcasting.HexMod;
|
||||
import at.petrak.hexcasting.common.blocks.HexBlocks;
|
||||
import at.petrak.hexcasting.common.items.HexItems;
|
||||
import at.petrak.hexcasting.common.items.ItemFocus;
|
||||
import at.petrak.hexcasting.common.items.ItemScroll;
|
||||
|
|
@ -129,5 +130,11 @@ public class HexItemModels extends PaucalItemModelProvider {
|
|||
.end();
|
||||
|
||||
simpleItem(modLoc("akashic_door"));
|
||||
getBuilder(HexBlocks.AKASHIC_TRAPDOOR.getId().getPath()).parent(
|
||||
new ModelFile.UncheckedModelFile(modLoc("block/akashic_trapdoor_bottom")));
|
||||
getBuilder(HexBlocks.AKASHIC_LOG.getId().getPath()).parent(
|
||||
new ModelFile.UncheckedModelFile(modLoc("block/akashic_log")));
|
||||
getBuilder(HexBlocks.AKASHIC_LOG_STRIPPED.getId().getPath()).parent(
|
||||
new ModelFile.UncheckedModelFile(modLoc("block/akashic_log_stripped")));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue