diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 2193aff54..47e1978e9 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1,12 +1,12 @@ ad5241a0fb20fbe1d724786a426855ab0ec07b39 assets/actuallyadditions/blockstates/atomic_reconstructor.json dd693edf46ec7e4423ccb6afeacd866ed2bafe14 assets/actuallyadditions/blockstates/battery_box.json f4b3482fd851ad2e0071caf4aedbd7ee45fe0a31 assets/actuallyadditions/blockstates/black_quartz_block.json -34149701048c649099766e007482c213634b64ff assets/actuallyadditions/blockstates/black_quartz_brick.json -b6cf9dd9e5cb8d0fd77eae1bdacdbd2e6784b1ff assets/actuallyadditions/blockstates/black_quartz_brick_slab.json +6c1294add602decc8439b820042d721b4790e428 assets/actuallyadditions/blockstates/black_quartz_brick_block.json +c35de34900af2424569caedd4d331e4fbca086df assets/actuallyadditions/blockstates/black_quartz_brick_slab.json 7ddec82b65e9ded21ce7660667de04d57d4aee2e assets/actuallyadditions/blockstates/black_quartz_brick_stair.json 25d8557a7efa16df9937a8716bf92587a96fef3f assets/actuallyadditions/blockstates/black_quartz_brick_wall.json -7bfcbabb2be2ce988d2c6295b64c610ac86b0e5a assets/actuallyadditions/blockstates/black_quartz_pillar.json -8a921ee2bc1aa5915edd66f74be65f3aa19aa335 assets/actuallyadditions/blockstates/black_quartz_pillar_slab.json +31b696d84e073be37ae3ce210463fd1568cdce47 assets/actuallyadditions/blockstates/black_quartz_pillar_block.json +f89956366d02b0f1e5122ea0fdb23813ebac8858 assets/actuallyadditions/blockstates/black_quartz_pillar_slab.json 73a53fb6db64ec85e180e9d493f7dca51d29da62 assets/actuallyadditions/blockstates/black_quartz_pillar_stair.json c93b89c4b673b6063148666b2eb13dec98918532 assets/actuallyadditions/blockstates/black_quartz_pillar_wall.json 93fa4eb3c85c9d1abade9e6aa46ff60d28b37e7e assets/actuallyadditions/blockstates/black_quartz_slab.json @@ -15,8 +15,8 @@ ac5d75bda4dc24894fb380d5e3ec751a0aa5c498 assets/actuallyadditions/blockstates/bl 5dea2f0e554a5ecb9b7f547526d745ff85353a40 assets/actuallyadditions/blockstates/breaker.json 48eb2c3f1180c04e668046abc65dbadeaaf3aed6 assets/actuallyadditions/blockstates/canola.json 5101139337dd4e5a057333e9e424df47f7138c93 assets/actuallyadditions/blockstates/canola_press.json -fa4b0e570d8e71600fbe11c00a0ab6dc8b5f4c1d assets/actuallyadditions/blockstates/chiseled_black_quartz.json -7173f8b9f82b20c0b85480c86a875536dec2dc14 assets/actuallyadditions/blockstates/chiseled_black_quartz_slab.json +998b11d1f63e153ab2f8bd11830405611c8886a2 assets/actuallyadditions/blockstates/chiseled_black_quartz_block.json +84525ecc49bdb7285b34ff5028fc25c198f03ccd assets/actuallyadditions/blockstates/chiseled_black_quartz_slab.json c2fe87cf0b2fea00b52ab59cd6a90d3d876b1218 assets/actuallyadditions/blockstates/chiseled_black_quartz_stair.json 72431d7f0f3e60f7c9f4b7d611f8bea899be67e2 assets/actuallyadditions/blockstates/chiseled_black_quartz_wall.json c1000550e4021ad6cc2aabcc1f3ecf8abfdd8f8e assets/actuallyadditions/blockstates/coal_generator.json @@ -108,8 +108,8 @@ d89ce6c2187bf08f01097ce02c32aeacfb467bbf assets/actuallyadditions/blockstates/re 3c9ed33d3ed07283e498550cd6a1a2f08511dee9 assets/actuallyadditions/blockstates/restonia_crystal_cluster.json 52881b57e3b0b26b6db676d80d4baa99f2123a5a assets/actuallyadditions/blockstates/rice.json 32b6a5617cdd7da766baf9493225b5c7e23b9379 assets/actuallyadditions/blockstates/shock_suppressor.json -3ced2b46b1ff173f301c3b974c8e3c0daf1cbb74 assets/actuallyadditions/blockstates/smooth_black_quartz.json -70261df033eb7c5df7a6af6712edc3f591887a5d assets/actuallyadditions/blockstates/smooth_black_quartz_slab.json +33fb8c960fa03e6276404529e2f3ed8b33758bbb assets/actuallyadditions/blockstates/smooth_black_quartz_block.json +5181efc30c831609b06eff4e433518da7d778f7e assets/actuallyadditions/blockstates/smooth_black_quartz_slab.json 2c9ae5d0f4abad246bd917ba75f590cf2450a64e assets/actuallyadditions/blockstates/smooth_black_quartz_stair.json f3eed009d0b974f21e8b7d451db6781d425d7a77 assets/actuallyadditions/blockstates/smooth_black_quartz_wall.json 31c02c33e5dd66cec77d882380ad6ab9b065a50b assets/actuallyadditions/blockstates/tiny_torch.json @@ -118,23 +118,23 @@ f3eed009d0b974f21e8b7d451db6781d425d7a77 assets/actuallyadditions/blockstates/sm 29f829ee8c128ac0d280a77754529d956ae3fb23 assets/actuallyadditions/blockstates/void_crystal_cluster.json 955f5fa11ac48e71a3052082b293e8b01d428b74 assets/actuallyadditions/blockstates/wood_casing.json 244e220702a65c286381d576de62772c2d509cc5 assets/actuallyadditions/blockstates/xp_solidifier.json -603fde57b4e160224a172864ddf8ee00d64faef9 assets/actuallyadditions/models/block/black_quartz_brick.json -9de75c982f9e22d12e1add84cb0a80379b690859 assets/actuallyadditions/models/block/black_quartz_brick_slab.json -fd3bb42a0c872fd5bb153a8efb173f5a69717bdd assets/actuallyadditions/models/block/black_quartz_brick_slab_top.json -86d0fcfa3d838ecba3b69d2622ee9a65a1fc0761 assets/actuallyadditions/models/block/black_quartz_brick_stair.json -c63316f946b8ec3036a8b1aa6275878aa09bf075 assets/actuallyadditions/models/block/black_quartz_brick_stair_inner.json -00251523c9f345b1288ec82d887a5f2a5d0bba7f assets/actuallyadditions/models/block/black_quartz_brick_stair_outer.json -53c838ff2493574ced216e12b8bc21bb6eba220f assets/actuallyadditions/models/block/black_quartz_brick_wall_post.json -e2b29160c0875094eb2dfc4f5ccb3e1509b2997c assets/actuallyadditions/models/block/black_quartz_brick_wall_side.json -d0d4a1df5593fb0edd5a988a39833d8e1ecd6d95 assets/actuallyadditions/models/block/black_quartz_brick_wall_side_tall.json -5138a829ec40fac555efd3f5943be0f212914358 assets/actuallyadditions/models/block/black_quartz_pillar_slab.json -997d0e7a44b4b2c72f489f4b447e4acfff71f0cc assets/actuallyadditions/models/block/black_quartz_pillar_slab_top.json -76d19965d724cc5b75afdd033aebcf77d6fc73ca assets/actuallyadditions/models/block/black_quartz_pillar_stair.json -64d5c9b8977648377998475ffc7f1a0dfe33b1f5 assets/actuallyadditions/models/block/black_quartz_pillar_stair_inner.json -c194df4a08122824f1ec1f22e349e786b1d5de81 assets/actuallyadditions/models/block/black_quartz_pillar_stair_outer.json -962a6f9757de4118b2982024ca95e2bc9c5dbfe4 assets/actuallyadditions/models/block/black_quartz_pillar_wall_post.json -50a8ef9032b881e812fc538aac95a3c099d6b9ed assets/actuallyadditions/models/block/black_quartz_pillar_wall_side.json -7aea68d951b2e5a517ee58eedb8e75cb194077e6 assets/actuallyadditions/models/block/black_quartz_pillar_wall_side_tall.json +81329915bef4e65eb630fc601897e56b1fc5292c assets/actuallyadditions/models/block/black_quartz_brick_block.json +997ea09e934d491608895093fc7ba8d2022a50f5 assets/actuallyadditions/models/block/black_quartz_brick_slab.json +fa8ed5a44ee7475368eaa6c8afcd2fdcc0342a4f assets/actuallyadditions/models/block/black_quartz_brick_slab_top.json +00fe865b4ff89f2a82cc40bf11c806fd5ef22130 assets/actuallyadditions/models/block/black_quartz_brick_stair.json +580f25f9337bb254a0b8196d1c5dfb606982cf74 assets/actuallyadditions/models/block/black_quartz_brick_stair_inner.json +1184939a1b76e16190f1c4c5014be5b61253830c assets/actuallyadditions/models/block/black_quartz_brick_stair_outer.json +49ac4ea10c1957475125ded8689aae1f03399514 assets/actuallyadditions/models/block/black_quartz_brick_wall_post.json +6ecc97ef2aa8e958f1c21a67e54fc4516087bba7 assets/actuallyadditions/models/block/black_quartz_brick_wall_side.json +f783b35710afcb46e17bf5d5c02025910cc35b3a assets/actuallyadditions/models/block/black_quartz_brick_wall_side_tall.json +0c025b6788abd7f33eb7a15cac85933dbe119596 assets/actuallyadditions/models/block/black_quartz_pillar_slab.json +b87c74333526c7b52df48a4a09591f6116fe4b03 assets/actuallyadditions/models/block/black_quartz_pillar_slab_top.json +480c94b0c400ccea983bac8d23662fb8cbe84da2 assets/actuallyadditions/models/block/black_quartz_pillar_stair.json +a1c50e555b7742b8215806214ceb6bfc5b728155 assets/actuallyadditions/models/block/black_quartz_pillar_stair_inner.json +d229a8d1ae3e1644d83c85ef1edafb7a0d923e70 assets/actuallyadditions/models/block/black_quartz_pillar_stair_outer.json +5e370e4176e71c8755c84c9b0cd3ae4994501aac assets/actuallyadditions/models/block/black_quartz_pillar_wall_post.json +b89da02bf59fe8c49c1fdbc436219bfc202151f9 assets/actuallyadditions/models/block/black_quartz_pillar_wall_side.json +a4dfc98dbd73ba2759b0cd6f20d7e21eb9d0ee0a assets/actuallyadditions/models/block/black_quartz_pillar_wall_side_tall.json 83d41e95a7d032dc6ce960ebbaa9d808a1d44126 assets/actuallyadditions/models/block/black_quartz_slab.json 02b5f964815edb299171a220b104042fe793a837 assets/actuallyadditions/models/block/black_quartz_slab_top.json 7f3141ee52fe873a17a5d0210a43d4a94fb3465a assets/actuallyadditions/models/block/black_quartz_stair.json @@ -144,14 +144,14 @@ f277709029801d7292d300b13876189a32d1b3a4 assets/actuallyadditions/models/block/b 1c617e7845d3211b4f7cda38a9bee59208de8c23 assets/actuallyadditions/models/block/black_quartz_wall_side.json 46c7aa812a7af600d4f927eba5fa3f5b4956fa28 assets/actuallyadditions/models/block/black_quartz_wall_side_tall.json e3b1972935fa68ca5feaad8f7412530df5d6b8a2 assets/actuallyadditions/models/block/canola.json -0f10e216760d0486bb96135d7f9f6cf043aabfc1 assets/actuallyadditions/models/block/chiseled_black_quartz_slab.json -531ab67be58317af9c825dfddae341bdf9594559 assets/actuallyadditions/models/block/chiseled_black_quartz_slab_top.json -921666f37a35e41a86a97db1791e73fb10cdb899 assets/actuallyadditions/models/block/chiseled_black_quartz_stair.json -0761912fe476a7beef25ebe2acf7e560290fde3d assets/actuallyadditions/models/block/chiseled_black_quartz_stair_inner.json -5698b2dc95f254164cb6ffebd6ee00f8f8db7f41 assets/actuallyadditions/models/block/chiseled_black_quartz_stair_outer.json -f1e3a970c9a627406f694f7f3c8769aee11d7215 assets/actuallyadditions/models/block/chiseled_black_quartz_wall_post.json -329adb1f0248bf54da90529d2629b2b35831afde assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side.json -07a54dd9c6927fe523bfa05c2bbca3fda34ec67e assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side_tall.json +48a6232ced27b9a35fc236705adb2ea817a03b3f assets/actuallyadditions/models/block/chiseled_black_quartz_slab.json +85a969896c0aad4f70878d4c075c6c0885a5ade4 assets/actuallyadditions/models/block/chiseled_black_quartz_slab_top.json +f0ee4cd74049c6a00f62166335348602f7b8972d assets/actuallyadditions/models/block/chiseled_black_quartz_stair.json +111946795395d1dbfc9c5ed736891cecff7e699d assets/actuallyadditions/models/block/chiseled_black_quartz_stair_inner.json +ff558f957d7dbfd96dd849bb28da1c837dcb96f8 assets/actuallyadditions/models/block/chiseled_black_quartz_stair_outer.json +de346812e4c3b3101fdd0f8e47d411bf716a69c3 assets/actuallyadditions/models/block/chiseled_black_quartz_wall_post.json +e21749906643418a3d104ce1482cdff1b746d009 assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side.json +a9c4dc2850881cc15ab026c279af5caf35458971 assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side_tall.json b68aaef024c240ac11ad9b7848fe1eef745f0ffc assets/actuallyadditions/models/block/coffee.json f24ca8230a335b41da86c330f3336f13fcdf4d4d assets/actuallyadditions/models/block/diamatine_crystal_block.json bc00149f995b4169127b072a2a123a2c8d747d8e assets/actuallyadditions/models/block/emeradic_crystal_block.json @@ -203,15 +203,15 @@ e48e76012740860d213f33ecffc49317f18a42e1 assets/actuallyadditions/models/block/l fa0040bf5801821cde761a2b959235756aa004e9 assets/actuallyadditions/models/block/palis_crystal_block.json 0d22ae782351d009d7329ba954e54921a207a64b assets/actuallyadditions/models/block/restonia_crystal_block.json bf348e13cbaf0532bc254c9efa92350ae8b0023c assets/actuallyadditions/models/block/rice.json -e88af7a450835bf59c7618e6e64095bbd6a192b3 assets/actuallyadditions/models/block/smooth_black_quartz.json -6f0b096436e8b9e003547eac6c861550661a641b assets/actuallyadditions/models/block/smooth_black_quartz_slab.json -551424ae87c25a50448c996bc735443507d275d8 assets/actuallyadditions/models/block/smooth_black_quartz_slab_top.json -358aaeefc2a03eb2d8f0bfe0aefdf81571c01a2f assets/actuallyadditions/models/block/smooth_black_quartz_stair.json -0d98e67cd664880c1c7f092cc075e3463890605c assets/actuallyadditions/models/block/smooth_black_quartz_stair_inner.json -f7ba92a8150edfb218926e69620e24e1a87312e0 assets/actuallyadditions/models/block/smooth_black_quartz_stair_outer.json -b27eedd1eff8bb30aa06ff25c1887a2420d7cc2e assets/actuallyadditions/models/block/smooth_black_quartz_wall_post.json -cd7a27e47f23d69f2f2da86731b19a2241983cd5 assets/actuallyadditions/models/block/smooth_black_quartz_wall_side.json -f8941eef6c901c52753ca1872fee30ac3c2d3d92 assets/actuallyadditions/models/block/smooth_black_quartz_wall_side_tall.json +e664e958458c70f8235a5369c0534d0860b94e12 assets/actuallyadditions/models/block/smooth_black_quartz_block.json +82e69d1c8d5124e946d3e7db204cf3cd4696e52e assets/actuallyadditions/models/block/smooth_black_quartz_slab.json +d28a3773b87ec0ca47945be824c9845155dfad36 assets/actuallyadditions/models/block/smooth_black_quartz_slab_top.json +b9c799b04f8eabe14f89f8574deb24c573c2384f assets/actuallyadditions/models/block/smooth_black_quartz_stair.json +b86c520299c25758ca9d1be94b38ad02c72a5344 assets/actuallyadditions/models/block/smooth_black_quartz_stair_inner.json +c6e95a88b55f955ef55942b19ab04421bf21d3c3 assets/actuallyadditions/models/block/smooth_black_quartz_stair_outer.json +6f3932add3be23b8d6b9fb7a748df0c7225aa71c assets/actuallyadditions/models/block/smooth_black_quartz_wall_post.json +ec9fa5a527a295dff5372ebd0df98372874c77fe assets/actuallyadditions/models/block/smooth_black_quartz_wall_side.json +5781b830bc868540f74c86eb65b792afaa06495e assets/actuallyadditions/models/block/smooth_black_quartz_wall_side_tall.json 292e546009c16dc7d5e38b4faa8ce84baaaa2242 assets/actuallyadditions/models/block/void_crystal_block.json 83da16f21abc2ec8361ecc3b1bda2852d48dbd97 assets/actuallyadditions/models/block/wood_casing.json 0753c814deb4cc275d0fce0b87ec12ba1b12c0eb assets/actuallyadditions/models/item/advanced_coil.json @@ -223,26 +223,26 @@ bbd32f2ac5a2a55332aa9b73fd06aa1462fdd29a assets/actuallyadditions/models/item/ba 44c0a208ef528d296e7532a834d6563d7cd90922 assets/actuallyadditions/models/item/bio_reactor.json 08f5dfde00eed3a0686cfd09efae9b08c3d1a28a assets/actuallyadditions/models/item/black_quartz.json 37d49b21bf16128d58a5d63d742508891a114ece assets/actuallyadditions/models/item/black_quartz_block.json -70442a5aa4ab7106269725fac9ca1a1a9fc48189 assets/actuallyadditions/models/item/black_quartz_brick.json +2c92f3fcba4b43cd015e324afede794b6f4935a0 assets/actuallyadditions/models/item/black_quartz_brick_block.json 14391f4c4d029a354d40a7aa26af4f279dba6684 assets/actuallyadditions/models/item/black_quartz_brick_slab.json c3cf76ca67515c059d3eaf6b70369151a4f29831 assets/actuallyadditions/models/item/black_quartz_brick_stair.json -d461cc6c1a14ba13d5de7c3dfa0f3af8d0dc414d assets/actuallyadditions/models/item/black_quartz_brick_wall.json -cdb50a0d9a8401414d51902b8832f55779e28d2a assets/actuallyadditions/models/item/black_quartz_pillar.json +fb3f2411b48e77c8230b9c9316ac7d214e505032 assets/actuallyadditions/models/item/black_quartz_brick_wall.json +50075e8e8b428b161113d45d583f6eae5e8360f3 assets/actuallyadditions/models/item/black_quartz_pillar_block.json 5614453539110f6214c52d47c12aa1ce05447d53 assets/actuallyadditions/models/item/black_quartz_pillar_slab.json 3bd2d755493ff85b07dff3cb31d0cc040e6150c5 assets/actuallyadditions/models/item/black_quartz_pillar_stair.json -af5c7ad8debbfecef494103c8655e5edf7e40bf9 assets/actuallyadditions/models/item/black_quartz_pillar_wall.json +9d655753b4257e272902c27c2bb92706b0663a2c assets/actuallyadditions/models/item/black_quartz_pillar_wall.json dfb8604b25fc7a671c371a81e3384410c69cc7b1 assets/actuallyadditions/models/item/black_quartz_slab.json ea2f5b2bf99670f4df05889ab67c73686a26a58b assets/actuallyadditions/models/item/black_quartz_stair.json -51bf433ed582a704fd504132a59f02fc08e780e9 assets/actuallyadditions/models/item/black_quartz_wall.json +be227e074a54982e1e9f9f304e63df3095006955 assets/actuallyadditions/models/item/black_quartz_wall.json 3679056a9aee03821a997a2616b8808af7bfe4b7 assets/actuallyadditions/models/item/breaker.json f3282e55e71d26a32cee1287881ac2d5e91c30a8 assets/actuallyadditions/models/item/canola.json 08c70d561c219bb4c6d21b5f56192df81f054e0a assets/actuallyadditions/models/item/canola_press.json 0507025fadef30e363cbc825265576c782880f7b assets/actuallyadditions/models/item/canola_seeds.json b0f7c3915b646ccd27ca6ff40517e19e2a0fb7ef assets/actuallyadditions/models/item/canolaoil.json -8a56761a86355ab762cc1b878b2759ce79b5a2bd assets/actuallyadditions/models/item/chiseled_black_quartz.json +36179c5cc77dc38364a1931f2fabbf846ef9c39d assets/actuallyadditions/models/item/chiseled_black_quartz_block.json 27c8ed9e39b600161a6a327db0ac53e10acc13bb assets/actuallyadditions/models/item/chiseled_black_quartz_slab.json 0b574626d1648584c3afa6ee0ccc974fb68bb425 assets/actuallyadditions/models/item/chiseled_black_quartz_stair.json -59e1e2bddb67512960f5011fa4926d0dcd32b58c assets/actuallyadditions/models/item/chiseled_black_quartz_wall.json +6147bc1e58f6080c8e7c47452a98fcd9ef7b187d assets/actuallyadditions/models/item/chiseled_black_quartz_wall.json bbf723238f6536295339f0b0b5b052cf89b92d5b assets/actuallyadditions/models/item/coal_generator.json 73511866d0c115d75f18e160ba5a09e714bd4769 assets/actuallyadditions/models/item/coffee.json 1d676d4abc4c67c3da2d15499ecb585f436f3893 assets/actuallyadditions/models/item/coffee_beans.json @@ -353,11 +353,11 @@ a159872078f26db6fe09c7e09b8caa3e892f4294 assets/actuallyadditions/models/item/en 547a18a0434aa8526dce6ab2727bc05674480611 assets/actuallyadditions/models/item/ethetic_green_block.json 29c5b35219bfb4bb1276297b0c92d235a39c9d2b assets/actuallyadditions/models/item/ethetic_green_slab.json 661f1b449d78ea517012204f1c2a47bd0f892fca assets/actuallyadditions/models/item/ethetic_green_stairs.json -7ece175db08374aa44ba1c7a0ed6ff45fa942856 assets/actuallyadditions/models/item/ethetic_green_wall.json +56919d344146f4336492c723c9a9c89943d5197f assets/actuallyadditions/models/item/ethetic_green_wall.json 95e377e9e9d0b78ef9e122f9f9d3aa80334014b0 assets/actuallyadditions/models/item/ethetic_white_block.json 506ffae6797b6088f902adbc787e2b4c80468b3c assets/actuallyadditions/models/item/ethetic_white_slab.json 894f042b3426007d2c87e4ccc9002dc2bac48801 assets/actuallyadditions/models/item/ethetic_white_stairs.json -67dd4dc1ce36811dfa9857a3f887c0964aa6a90a assets/actuallyadditions/models/item/ethetic_white_wall.json +a8a6a7b651721f6218ae46ec272961b2c0941bfa assets/actuallyadditions/models/item/ethetic_white_wall.json 8bcb533ef0b7c42b3218e2cf52c752fef283c267 assets/actuallyadditions/models/item/farmer.json d4338f09f71dd9bc75babcb7cebba80ab57eee01 assets/actuallyadditions/models/item/feeder.json bb4fc4a881ec4b949fb657b112826731988cdaf8 assets/actuallyadditions/models/item/fermenting_barrel.json @@ -483,10 +483,10 @@ c48d9fe3a0051a30496348f7dc22dc142be3a063 assets/actuallyadditions/models/item/ri 6d2c70e9d473147c72b70fbea292f90dd50ab5c2 assets/actuallyadditions/models/item/ring_of_magnetizing.json 8334f0d8c5364b930a8d674cfe86f8b4461b03f3 assets/actuallyadditions/models/item/shock_suppressor.json ef7f9a92f8b47c3de7f732172f7bb0d996b38718 assets/actuallyadditions/models/item/single_battery.json -843e08a0ce8c30af2b87afb105ce8e37e82b5e53 assets/actuallyadditions/models/item/smooth_black_quartz.json +9f4437d75b9112335d96ca928da9d4e73a573f50 assets/actuallyadditions/models/item/smooth_black_quartz_block.json 8c66fd0c6618256da1e66524ebb1261f3ec34faa assets/actuallyadditions/models/item/smooth_black_quartz_slab.json db82f63202197fa244540886e29d283df392afee assets/actuallyadditions/models/item/smooth_black_quartz_stair.json -1888c23243844ba23e9e979737cf8e302ee7d24c assets/actuallyadditions/models/item/smooth_black_quartz_wall.json +5c2c9f1f8d8d7a58b3aa3f66f11a85e2f649a602 assets/actuallyadditions/models/item/smooth_black_quartz_wall.json 90f07fa285908351a3a486bcab320352b4697500 assets/actuallyadditions/models/item/solidified_experience.json 1ba6c5a40ec762bae26cbca11afea7a76a24f85c assets/actuallyadditions/models/item/stone_aiot.json 1905e7a72f7b8dfebbe177105540c57d9b365385 assets/actuallyadditions/models/item/teleport_staff.json @@ -521,16 +521,16 @@ f657eabc7321de0b05cf92d9ebdd6f5215a685b5 assets/actuallyadditions/models/item/wo a91ac0f76c7b325ac3ef0eefe5614d17f1f533d3 data/actuallyadditions/recipes/atomic_reconstructor.json 3d899eb727ee209cce77eae52985ea8ed1fc2455 data/actuallyadditions/recipes/basic_coil.json a4b4ff66a1d3387791b1bd72e461cdc62558a054 data/actuallyadditions/recipes/battery_box.json -055626518ac34b3b4bcc958d57b54742cb998b6d data/actuallyadditions/recipes/black_quartz_pillar_slab.json -8b516024aa00d646c0ca68d7a11cf19cb7d2157e data/actuallyadditions/recipes/black_quartz_pillar_stair.json -84ec8503325e4d25c2daa3e0cd6e6d257f054714 data/actuallyadditions/recipes/black_quartz_pillar_wall.json -40ebb6a5ceb6261718bbc743b008d0d9a0b19a62 data/actuallyadditions/recipes/black_quartz_slab.json -3a1ca20a2a34773cf870a19cefcfcbd1ecace4ea data/actuallyadditions/recipes/black_quartz_stair.json -fdb7147cb436f86110f14f47c64e5b2f7752ff73 data/actuallyadditions/recipes/black_quartz_wall.json +5ba46742bff7dbc31c3ef64a4b3ab021df4e1c79 data/actuallyadditions/recipes/black_quartz_pillar_slab.json +141bfc11e38b358e2c53f59e816509a25b61bccd data/actuallyadditions/recipes/black_quartz_pillar_stair.json +c6cb7541b7390b0af525b3b6854a943e461b1a03 data/actuallyadditions/recipes/black_quartz_pillar_wall.json +6c045ca364ea3483083fe3be01f15508d485402a data/actuallyadditions/recipes/black_quartz_slab.json +f1d41941b332faf0b495353f27ea83287643e044 data/actuallyadditions/recipes/black_quartz_stair.json +c9fc3f11f3bf5a928ea9f5900c344461d61fe9e5 data/actuallyadditions/recipes/black_quartz_wall.json 398ad1cb070aa294671f0294515fc7695042fd05 data/actuallyadditions/recipes/booklet.json -7368949cc578346218a12dfa5a7b7aa1417b29f5 data/actuallyadditions/recipes/chiseled_black_quartz_slab.json -8f87f77de99044dd191ec3ce41cdbdf7e4fd8b6e data/actuallyadditions/recipes/chiseled_black_quartz_stair.json -98edded65a2b79858892885d6c4a70a3e530dc79 data/actuallyadditions/recipes/chiseled_black_quartz_wall.json +7dc02da1ff58eb4ff48e305437d4857c31cbd5c9 data/actuallyadditions/recipes/chiseled_black_quartz_slab.json +bf1b5de98f29c2dabe25a143c8e63d2c0cd6ea72 data/actuallyadditions/recipes/chiseled_black_quartz_stair.json +9d779585266046738b4bcf7447b918ec09b65f95 data/actuallyadditions/recipes/chiseled_black_quartz_wall.json 160466dfd10fafc2ae4b4130ca35220d4c2d2342 data/actuallyadditions/recipes/crate_keeper.json b76b843a60a1c456a11d3bb932a93ab3753d6f58 data/actuallyadditions/recipes/crushing/bone_crusher.json bbd4aaaa994eadfc1a6e9dff8ae1f3b39ed3bcf8 data/actuallyadditions/recipes/diamatine_aiot.json @@ -706,3 +706,4 @@ e70c181f8b01b51148f00cb8cb943a40ceb01dd1 data/actuallyadditions/recipes/void_swo a18f00e11fa55ff1b767eeab7a4756c2e0e93429 data/actuallyadditions/tags/items/coffee_beans.json 2290b1829e049ab3002f3576379ad58f6d7b6ace data/actuallyadditions/tags/items/drills.json 8c1e24d7377b6bdf64c13643d94c3826ac925c25 data/actuallyadditions/tags/items/tiny_coals.json +84fb4202cf40368e8c1a1d36bca0a4952aa05866 data/minecraft/tags/blocks/walls.json diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_brick.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_brick.json deleted file mode 100644 index 64daac4d6..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_brick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/black_quartz_brick" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_brick_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_brick_block.json new file mode 100644 index 000000000..8f4e2ff89 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_brick_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/black_quartz_brick_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_brick_slab.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_brick_slab.json index eb1779f75..b5dba9e6d 100644 --- a/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_brick_slab.json +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_brick_slab.json @@ -7,7 +7,7 @@ "model": "actuallyadditions:block/black_quartz_brick_slab" }, "type=double": { - "model": "actuallyadditions:block/black_quartz_brick" + "model": "actuallyadditions:block/black_quartz_brick_block" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar.json deleted file mode 100644 index 2a83b088a..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/black_quartz_pillar" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar_block.json new file mode 100644 index 000000000..906f79fe1 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/black_quartz_pillar_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar_slab.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar_slab.json index 4d4ebcddd..0757c73f5 100644 --- a/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar_slab.json +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar_slab.json @@ -7,7 +7,7 @@ "model": "actuallyadditions:block/black_quartz_pillar_slab" }, "type=double": { - "model": "actuallyadditions:block/black_quartz_pillar" + "model": "actuallyadditions:block/black_quartz_pillar_block" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz.json b/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz.json deleted file mode 100644 index 419093ec1..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/chiseled_black_quartz" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz_block.json new file mode 100644 index 000000000..998349201 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/chiseled_black_quartz_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz_slab.json b/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz_slab.json index c75ca35df..b9dfe36c2 100644 --- a/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz_slab.json +++ b/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz_slab.json @@ -7,7 +7,7 @@ "model": "actuallyadditions:block/chiseled_black_quartz_slab" }, "type=double": { - "model": "actuallyadditions:block/chiseled_black_quartz" + "model": "actuallyadditions:block/chiseled_black_quartz_block" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz.json b/src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz.json deleted file mode 100644 index 2acc1d4b2..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/smooth_black_quartz" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz_block.json new file mode 100644 index 000000000..a456ddda3 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/smooth_black_quartz_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz_slab.json b/src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz_slab.json index f8d20f048..dc1de80ac 100644 --- a/src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz_slab.json +++ b/src/generated/resources/assets/actuallyadditions/blockstates/smooth_black_quartz_slab.json @@ -7,7 +7,7 @@ "model": "actuallyadditions:block/smooth_black_quartz_slab" }, "type=double": { - "model": "actuallyadditions:block/smooth_black_quartz" + "model": "actuallyadditions:block/smooth_black_quartz_block" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_block.json similarity index 50% rename from src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_block.json index 81cb145a9..13a9ee6e5 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/black_quartz_brick" + "all": "actuallyadditions:block/black_quartz_brick_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_slab.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_slab.json index cc1759b34..16d7dd727 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_slab.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "actuallyadditions:block/black_quartz_brick", - "bottom": "actuallyadditions:block/black_quartz_brick", - "top": "actuallyadditions:block/black_quartz_brick" + "side": "actuallyadditions:block/black_quartz_brick_block", + "bottom": "actuallyadditions:block/black_quartz_brick_block", + "top": "actuallyadditions:block/black_quartz_brick_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_slab_top.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_slab_top.json index 4093d46bc..7a52803ea 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_slab_top.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "actuallyadditions:block/black_quartz_brick", - "bottom": "actuallyadditions:block/black_quartz_brick", - "top": "actuallyadditions:block/black_quartz_brick" + "side": "actuallyadditions:block/black_quartz_brick_block", + "bottom": "actuallyadditions:block/black_quartz_brick_block", + "top": "actuallyadditions:block/black_quartz_brick_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_stair.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_stair.json index bd48b6011..76679fb66 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_stair.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_stair.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "actuallyadditions:block/black_quartz_brick", - "bottom": "actuallyadditions:block/black_quartz_brick", - "top": "actuallyadditions:block/black_quartz_brick" + "side": "actuallyadditions:block/black_quartz_brick_block", + "bottom": "actuallyadditions:block/black_quartz_brick_block", + "top": "actuallyadditions:block/black_quartz_brick_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_stair_inner.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_stair_inner.json index 8805d863c..91e453290 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_stair_inner.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_stair_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "actuallyadditions:block/black_quartz_brick", - "bottom": "actuallyadditions:block/black_quartz_brick", - "top": "actuallyadditions:block/black_quartz_brick" + "side": "actuallyadditions:block/black_quartz_brick_block", + "bottom": "actuallyadditions:block/black_quartz_brick_block", + "top": "actuallyadditions:block/black_quartz_brick_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_stair_outer.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_stair_outer.json index deecb1f70..9a2fc0826 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_stair_outer.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_stair_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "actuallyadditions:block/black_quartz_brick", - "bottom": "actuallyadditions:block/black_quartz_brick", - "top": "actuallyadditions:block/black_quartz_brick" + "side": "actuallyadditions:block/black_quartz_brick_block", + "bottom": "actuallyadditions:block/black_quartz_brick_block", + "top": "actuallyadditions:block/black_quartz_brick_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_wall_post.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_wall_post.json index 77bda8c10..97fd553c1 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_wall_post.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_wall_post.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_post", "textures": { - "wall": "actuallyadditions:block/black_quartz_brick" + "wall": "actuallyadditions:block/black_quartz_brick_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_wall_side.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_wall_side.json index 7e39a7de7..d5b886ab8 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_wall_side.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_wall_side.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_side", "textures": { - "wall": "actuallyadditions:block/black_quartz_brick" + "wall": "actuallyadditions:block/black_quartz_brick_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_wall_side_tall.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_wall_side_tall.json index 1de5432c5..e95884ad2 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_wall_side_tall.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_wall_side_tall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_side_tall", "textures": { - "wall": "actuallyadditions:block/black_quartz_brick" + "wall": "actuallyadditions:block/black_quartz_brick_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_slab.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_slab.json index 531391d31..0a0f23623 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_slab.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "actuallyadditions:block/black_quartz_pillar", - "bottom": "actuallyadditions:block/black_quartz_pillar", - "top": "actuallyadditions:block/black_quartz_pillar" + "side": "actuallyadditions:block/black_quartz_pillar_block", + "bottom": "actuallyadditions:block/black_quartz_pillar_block", + "top": "actuallyadditions:block/black_quartz_pillar_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_slab_top.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_slab_top.json index 424dad4dd..d78688a40 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_slab_top.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "actuallyadditions:block/black_quartz_pillar", - "bottom": "actuallyadditions:block/black_quartz_pillar", - "top": "actuallyadditions:block/black_quartz_pillar" + "side": "actuallyadditions:block/black_quartz_pillar_block", + "bottom": "actuallyadditions:block/black_quartz_pillar_block", + "top": "actuallyadditions:block/black_quartz_pillar_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_stair.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_stair.json index 4dec46f22..4f2d05ff7 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_stair.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_stair.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "actuallyadditions:block/black_quartz_pillar", - "bottom": "actuallyadditions:block/black_quartz_pillar", - "top": "actuallyadditions:block/black_quartz_pillar" + "side": "actuallyadditions:block/black_quartz_pillar_block", + "bottom": "actuallyadditions:block/black_quartz_pillar_block", + "top": "actuallyadditions:block/black_quartz_pillar_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_stair_inner.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_stair_inner.json index 48de63295..9260827f8 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_stair_inner.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_stair_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "actuallyadditions:block/black_quartz_pillar", - "bottom": "actuallyadditions:block/black_quartz_pillar", - "top": "actuallyadditions:block/black_quartz_pillar" + "side": "actuallyadditions:block/black_quartz_pillar_block", + "bottom": "actuallyadditions:block/black_quartz_pillar_block", + "top": "actuallyadditions:block/black_quartz_pillar_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_stair_outer.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_stair_outer.json index 5b4fd6a02..8f066f932 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_stair_outer.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_stair_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "actuallyadditions:block/black_quartz_pillar", - "bottom": "actuallyadditions:block/black_quartz_pillar", - "top": "actuallyadditions:block/black_quartz_pillar" + "side": "actuallyadditions:block/black_quartz_pillar_block", + "bottom": "actuallyadditions:block/black_quartz_pillar_block", + "top": "actuallyadditions:block/black_quartz_pillar_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_post.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_post.json index 7abcae3cf..5a2062f9b 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_post.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_post.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_post", "textures": { - "wall": "actuallyadditions:block/black_quartz_pillar" + "wall": "actuallyadditions:block/black_quartz_pillar_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_side.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_side.json index 3e7017a58..98be3ea92 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_side.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_side.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_side", "textures": { - "wall": "actuallyadditions:block/black_quartz_pillar" + "wall": "actuallyadditions:block/black_quartz_pillar_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_side_tall.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_side_tall.json index 1d1d14067..76f000e96 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_side_tall.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_side_tall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_side_tall", "textures": { - "wall": "actuallyadditions:block/black_quartz_pillar" + "wall": "actuallyadditions:block/black_quartz_pillar_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_slab.json b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_slab.json index 51832ce3d..4acb79c05 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_slab.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "actuallyadditions:block/chiseled_black_quartz", - "bottom": "actuallyadditions:block/chiseled_black_quartz", - "top": "actuallyadditions:block/chiseled_black_quartz" + "side": "actuallyadditions:block/chiseled_black_quartz_block", + "bottom": "actuallyadditions:block/chiseled_black_quartz_block", + "top": "actuallyadditions:block/chiseled_black_quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_slab_top.json b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_slab_top.json index 904944ed8..97343517e 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_slab_top.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "actuallyadditions:block/chiseled_black_quartz", - "bottom": "actuallyadditions:block/chiseled_black_quartz", - "top": "actuallyadditions:block/chiseled_black_quartz" + "side": "actuallyadditions:block/chiseled_black_quartz_block", + "bottom": "actuallyadditions:block/chiseled_black_quartz_block", + "top": "actuallyadditions:block/chiseled_black_quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_stair.json b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_stair.json index d6e8fdced..f9f82578b 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_stair.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_stair.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "actuallyadditions:block/chiseled_black_quartz", - "bottom": "actuallyadditions:block/chiseled_black_quartz", - "top": "actuallyadditions:block/chiseled_black_quartz" + "side": "actuallyadditions:block/chiseled_black_quartz_block", + "bottom": "actuallyadditions:block/chiseled_black_quartz_block", + "top": "actuallyadditions:block/chiseled_black_quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_stair_inner.json b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_stair_inner.json index c2680cabb..cda22aea8 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_stair_inner.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_stair_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "actuallyadditions:block/chiseled_black_quartz", - "bottom": "actuallyadditions:block/chiseled_black_quartz", - "top": "actuallyadditions:block/chiseled_black_quartz" + "side": "actuallyadditions:block/chiseled_black_quartz_block", + "bottom": "actuallyadditions:block/chiseled_black_quartz_block", + "top": "actuallyadditions:block/chiseled_black_quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_stair_outer.json b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_stair_outer.json index 5ac4ac4f8..e01f27b15 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_stair_outer.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_stair_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "actuallyadditions:block/chiseled_black_quartz", - "bottom": "actuallyadditions:block/chiseled_black_quartz", - "top": "actuallyadditions:block/chiseled_black_quartz" + "side": "actuallyadditions:block/chiseled_black_quartz_block", + "bottom": "actuallyadditions:block/chiseled_black_quartz_block", + "top": "actuallyadditions:block/chiseled_black_quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_wall_post.json b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_wall_post.json index 3e7808955..21ffe8de8 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_wall_post.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_wall_post.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_post", "textures": { - "wall": "actuallyadditions:block/chiseled_black_quartz" + "wall": "actuallyadditions:block/chiseled_black_quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side.json b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side.json index e40c35eff..9fa570856 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_side", "textures": { - "wall": "actuallyadditions:block/chiseled_black_quartz" + "wall": "actuallyadditions:block/chiseled_black_quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side_tall.json b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side_tall.json index d4d8bdc0a..eb7e6ab32 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side_tall.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side_tall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_side_tall", "textures": { - "wall": "actuallyadditions:block/chiseled_black_quartz" + "wall": "actuallyadditions:block/chiseled_black_quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz.json b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_block.json similarity index 50% rename from src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz.json rename to src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_block.json index 4b724432b..0c34df5dc 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/smooth_black_quartz" + "all": "actuallyadditions:block/smooth_black_quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_slab.json b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_slab.json index d5a67a154..6ef3169dc 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_slab.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "actuallyadditions:block/smooth_black_quartz", - "bottom": "actuallyadditions:block/smooth_black_quartz", - "top": "actuallyadditions:block/smooth_black_quartz" + "side": "actuallyadditions:block/smooth_black_quartz_block", + "bottom": "actuallyadditions:block/smooth_black_quartz_block", + "top": "actuallyadditions:block/smooth_black_quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_slab_top.json b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_slab_top.json index 7ef97175b..e6a94c73a 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_slab_top.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "actuallyadditions:block/smooth_black_quartz", - "bottom": "actuallyadditions:block/smooth_black_quartz", - "top": "actuallyadditions:block/smooth_black_quartz" + "side": "actuallyadditions:block/smooth_black_quartz_block", + "bottom": "actuallyadditions:block/smooth_black_quartz_block", + "top": "actuallyadditions:block/smooth_black_quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_stair.json b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_stair.json index ef8375af0..48446ef11 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_stair.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_stair.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "actuallyadditions:block/smooth_black_quartz", - "bottom": "actuallyadditions:block/smooth_black_quartz", - "top": "actuallyadditions:block/smooth_black_quartz" + "side": "actuallyadditions:block/smooth_black_quartz_block", + "bottom": "actuallyadditions:block/smooth_black_quartz_block", + "top": "actuallyadditions:block/smooth_black_quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_stair_inner.json b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_stair_inner.json index cacfaa886..d8ca26a30 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_stair_inner.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_stair_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "actuallyadditions:block/smooth_black_quartz", - "bottom": "actuallyadditions:block/smooth_black_quartz", - "top": "actuallyadditions:block/smooth_black_quartz" + "side": "actuallyadditions:block/smooth_black_quartz_block", + "bottom": "actuallyadditions:block/smooth_black_quartz_block", + "top": "actuallyadditions:block/smooth_black_quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_stair_outer.json b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_stair_outer.json index a17c19ead..2dfbc6bf3 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_stair_outer.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_stair_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "actuallyadditions:block/smooth_black_quartz", - "bottom": "actuallyadditions:block/smooth_black_quartz", - "top": "actuallyadditions:block/smooth_black_quartz" + "side": "actuallyadditions:block/smooth_black_quartz_block", + "bottom": "actuallyadditions:block/smooth_black_quartz_block", + "top": "actuallyadditions:block/smooth_black_quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_wall_post.json b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_wall_post.json index ffc29ad77..9d42dd071 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_wall_post.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_wall_post.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_post", "textures": { - "wall": "actuallyadditions:block/smooth_black_quartz" + "wall": "actuallyadditions:block/smooth_black_quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_wall_side.json b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_wall_side.json index a29498efe..a70dd1e0f 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_wall_side.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_wall_side.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_side", "textures": { - "wall": "actuallyadditions:block/smooth_black_quartz" + "wall": "actuallyadditions:block/smooth_black_quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_wall_side_tall.json b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_wall_side_tall.json index 90c03b46c..bfbe89256 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_wall_side_tall.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/smooth_black_quartz_wall_side_tall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_side_tall", "textures": { - "wall": "actuallyadditions:block/smooth_black_quartz" + "wall": "actuallyadditions:block/smooth_black_quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick.json deleted file mode 100644 index 6e8c04eba..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/black_quartz_brick" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick_block.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick_block.json new file mode 100644 index 000000000..0b42fa600 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_quartz_brick_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick_wall.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick_wall.json index 4854dcf32..27948e0f9 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick_wall.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_brick_wall.json @@ -1,3 +1,6 @@ { - "parent": "actuallyadditions:block/black_quartz_brick_wall" + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "actuallyadditions:block/black_quartz_brick_block" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar.json deleted file mode 100644 index 712bc01d0..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/black_quartz_pillar" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_block.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_block.json new file mode 100644 index 000000000..f87890559 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_quartz_pillar_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_wall.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_wall.json index 7ad8c7c16..dc8ae07d0 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_wall.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_wall.json @@ -1,3 +1,6 @@ { - "parent": "actuallyadditions:block/black_quartz_pillar_wall" + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "actuallyadditions:block/black_quartz_pillar_block" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_wall.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_wall.json index af3903a16..4a49b222b 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_wall.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_wall.json @@ -1,3 +1,6 @@ { - "parent": "actuallyadditions:block/black_quartz_wall" + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "actuallyadditions:block/black_quartz_block" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz.json b/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz.json deleted file mode 100644 index eecad923e..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/chiseled_black_quartz" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_block.json b/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_block.json new file mode 100644 index 000000000..1653c3b8f --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/chiseled_black_quartz_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_wall.json b/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_wall.json index 8ee1e84e1..3e01a4b0b 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_wall.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_wall.json @@ -1,3 +1,6 @@ { - "parent": "actuallyadditions:block/chiseled_black_quartz_wall" + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "actuallyadditions:block/chiseled_black_quartz_block" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ethetic_green_wall.json b/src/generated/resources/assets/actuallyadditions/models/item/ethetic_green_wall.json index 47c04c998..566c5b01a 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/ethetic_green_wall.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/ethetic_green_wall.json @@ -1,3 +1,6 @@ { - "parent": "actuallyadditions:block/ethetic_green_wall" + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "actuallyadditions:block/ethetic_green_block" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ethetic_white_wall.json b/src/generated/resources/assets/actuallyadditions/models/item/ethetic_white_wall.json index b5a7cf8fe..7e6d70d71 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/ethetic_white_wall.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/ethetic_white_wall.json @@ -1,3 +1,6 @@ { - "parent": "actuallyadditions:block/ethetic_white_wall" + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "actuallyadditions:block/ethetic_white_block" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz.json b/src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz.json deleted file mode 100644 index 2c415bf81..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/smooth_black_quartz" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz_block.json b/src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz_block.json new file mode 100644 index 000000000..2708f2776 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/smooth_black_quartz_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz_wall.json b/src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz_wall.json index 5c371ec64..9eb3dbebc 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz_wall.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/smooth_black_quartz_wall.json @@ -1,3 +1,6 @@ { - "parent": "actuallyadditions:block/smooth_black_quartz_wall" + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "actuallyadditions:block/smooth_black_quartz_block" + } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/black_quartz_pillar_slab.json b/src/generated/resources/data/actuallyadditions/recipes/black_quartz_pillar_slab.json index 5808354cd..6f4b41881 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/black_quartz_pillar_slab.json +++ b/src/generated/resources/data/actuallyadditions/recipes/black_quartz_pillar_slab.json @@ -5,7 +5,7 @@ ], "key": { "Q": { - "item": "actuallyadditions:black_quartz_pillar" + "item": "actuallyadditions:black_quartz_pillar_block" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/black_quartz_pillar_stair.json b/src/generated/resources/data/actuallyadditions/recipes/black_quartz_pillar_stair.json index 06450e120..9de42d733 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/black_quartz_pillar_stair.json +++ b/src/generated/resources/data/actuallyadditions/recipes/black_quartz_pillar_stair.json @@ -7,7 +7,7 @@ ], "key": { "Q": { - "item": "actuallyadditions:black_quartz_pillar" + "item": "actuallyadditions:black_quartz_pillar_block" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/black_quartz_pillar_wall.json b/src/generated/resources/data/actuallyadditions/recipes/black_quartz_pillar_wall.json index 21bca3d17..1a17d094c 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/black_quartz_pillar_wall.json +++ b/src/generated/resources/data/actuallyadditions/recipes/black_quartz_pillar_wall.json @@ -6,7 +6,7 @@ ], "key": { "Q": { - "item": "actuallyadditions:black_quartz_pillar" + "item": "actuallyadditions:black_quartz_pillar_block" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/black_quartz_slab.json b/src/generated/resources/data/actuallyadditions/recipes/black_quartz_slab.json index 36874093a..fb023fef0 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/black_quartz_slab.json +++ b/src/generated/resources/data/actuallyadditions/recipes/black_quartz_slab.json @@ -5,7 +5,7 @@ ], "key": { "Q": { - "item": "actuallyadditions:black_quartz_pillar" + "item": "actuallyadditions:black_quartz_pillar_block" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/black_quartz_stair.json b/src/generated/resources/data/actuallyadditions/recipes/black_quartz_stair.json index cf380801d..0e99ba405 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/black_quartz_stair.json +++ b/src/generated/resources/data/actuallyadditions/recipes/black_quartz_stair.json @@ -7,7 +7,7 @@ ], "key": { "Q": { - "item": "actuallyadditions:black_quartz_pillar" + "item": "actuallyadditions:black_quartz_pillar_block" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/black_quartz_wall.json b/src/generated/resources/data/actuallyadditions/recipes/black_quartz_wall.json index d68eb69b7..b5c296669 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/black_quartz_wall.json +++ b/src/generated/resources/data/actuallyadditions/recipes/black_quartz_wall.json @@ -6,7 +6,7 @@ ], "key": { "Q": { - "item": "actuallyadditions:black_quartz_pillar" + "item": "actuallyadditions:black_quartz_pillar_block" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/chiseled_black_quartz_slab.json b/src/generated/resources/data/actuallyadditions/recipes/chiseled_black_quartz_slab.json index 7bbc2d90b..b10a9b2d0 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/chiseled_black_quartz_slab.json +++ b/src/generated/resources/data/actuallyadditions/recipes/chiseled_black_quartz_slab.json @@ -5,7 +5,7 @@ ], "key": { "Q": { - "item": "actuallyadditions:chiseled_black_quartz" + "item": "actuallyadditions:chiseled_black_quartz_block" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/chiseled_black_quartz_stair.json b/src/generated/resources/data/actuallyadditions/recipes/chiseled_black_quartz_stair.json index 4f4469597..55547f6d9 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/chiseled_black_quartz_stair.json +++ b/src/generated/resources/data/actuallyadditions/recipes/chiseled_black_quartz_stair.json @@ -7,7 +7,7 @@ ], "key": { "Q": { - "item": "actuallyadditions:chiseled_black_quartz" + "item": "actuallyadditions:chiseled_black_quartz_block" } }, "result": { diff --git a/src/generated/resources/data/actuallyadditions/recipes/chiseled_black_quartz_wall.json b/src/generated/resources/data/actuallyadditions/recipes/chiseled_black_quartz_wall.json index 9fd615239..4834620a2 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/chiseled_black_quartz_wall.json +++ b/src/generated/resources/data/actuallyadditions/recipes/chiseled_black_quartz_wall.json @@ -6,7 +6,7 @@ ], "key": { "Q": { - "item": "actuallyadditions:chiseled_black_quartz" + "item": "actuallyadditions:chiseled_black_quartz_block" } }, "result": { diff --git a/src/generated/resources/data/minecraft/tags/blocks/walls.json b/src/generated/resources/data/minecraft/tags/blocks/walls.json new file mode 100644 index 000000000..0a338cef4 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/walls.json @@ -0,0 +1,12 @@ +{ + "replace": false, + "values": [ + "actuallyadditions:ethetic_white_wall", + "actuallyadditions:ethetic_green_wall", + "actuallyadditions:black_quartz_wall", + "actuallyadditions:smooth_black_quartz_wall", + "actuallyadditions:black_quartz_pillar_wall", + "actuallyadditions:chiseled_black_quartz_wall", + "actuallyadditions:black_quartz_brick_wall" + ] +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java index 4146ac0d6..620b9e7fc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java @@ -140,28 +140,28 @@ public class BlockStateGenerator extends BlockStateProvider { // Walls wallBlock((WallBlock) ActuallyBlocks.BLACK_QUARTZ_WALL.get(), modLoc("block/black_quartz_block")); - wallBlock((WallBlock) ActuallyBlocks.SMOOTH_BLACK_QUARTZ_WALL.get(), modLoc("block/smooth_black_quartz")); - wallBlock((WallBlock) ActuallyBlocks.CHISELED_BLACK_QUARTZ_WALL.get(), modLoc("block/chiseled_black_quartz")); - wallBlock((WallBlock) ActuallyBlocks.BLACK_QUARTZ_PILLAR_WALL.get(), modLoc("block/black_quartz_pillar")); - wallBlock((WallBlock) ActuallyBlocks.BLACK_QUARTZ_BRICK_WALL.get(), modLoc("block/black_quartz_brick")); + wallBlock((WallBlock) ActuallyBlocks.SMOOTH_BLACK_QUARTZ_WALL.get(), modLoc("block/smooth_black_quartz_block")); + wallBlock((WallBlock) ActuallyBlocks.CHISELED_BLACK_QUARTZ_WALL.get(), modLoc("block/chiseled_black_quartz_block")); + wallBlock((WallBlock) ActuallyBlocks.BLACK_QUARTZ_PILLAR_WALL.get(), modLoc("block/black_quartz_pillar_block")); + wallBlock((WallBlock) ActuallyBlocks.BLACK_QUARTZ_BRICK_WALL.get(), modLoc("block/black_quartz_brick_block")); wallBlock((WallBlock) ActuallyBlocks.ETHETIC_GREEN_WALL.get(), modLoc("block/ethetic_green_block")); wallBlock((WallBlock) ActuallyBlocks.ETHETIC_WHITE_WALL.get(), modLoc("block/ethetic_white_block")); // Stairs stairsBlock((StairsBlock) ActuallyBlocks.BLACK_QUARTZ_STAIR.get(), modLoc("block/black_quartz_block")); - stairsBlock((StairsBlock) ActuallyBlocks.SMOOTH_BLACK_QUARTZ_STAIR.get(), modLoc("block/smooth_black_quartz")); - stairsBlock((StairsBlock) ActuallyBlocks.CHISELED_BLACK_QUARTZ_STAIR.get(), modLoc("block/chiseled_black_quartz")); - stairsBlock((StairsBlock) ActuallyBlocks.BLACK_QUARTZ_PILLAR_STAIR.get(), modLoc("block/black_quartz_pillar")); - stairsBlock((StairsBlock) ActuallyBlocks.BLACK_QUARTZ_BRICK_STAIR.get(), modLoc("block/black_quartz_brick")); + stairsBlock((StairsBlock) ActuallyBlocks.SMOOTH_BLACK_QUARTZ_STAIR.get(), modLoc("block/smooth_black_quartz_block")); + stairsBlock((StairsBlock) ActuallyBlocks.CHISELED_BLACK_QUARTZ_STAIR.get(), modLoc("block/chiseled_black_quartz_block")); + stairsBlock((StairsBlock) ActuallyBlocks.BLACK_QUARTZ_PILLAR_STAIR.get(), modLoc("block/black_quartz_pillar_block")); + stairsBlock((StairsBlock) ActuallyBlocks.BLACK_QUARTZ_BRICK_STAIR.get(), modLoc("block/black_quartz_brick_block")); stairsBlock((StairsBlock) ActuallyBlocks.ETHETIC_GREEN_STAIRS.get(), modLoc("block/ethetic_green_block")); stairsBlock((StairsBlock) ActuallyBlocks.ETHETIC_WHITE_STAIRS.get(), modLoc("block/ethetic_white_block")); // Slabs slabBlock((SlabBlock) ActuallyBlocks.BLACK_QUARTZ_SLAB.get(), modLoc("block/black_quartz_block"), modLoc("block/black_quartz_block")); - slabBlock((SlabBlock) ActuallyBlocks.SMOOTH_BLACK_QUARTZ_SLAB.get(), modLoc("block/smooth_black_quartz"), modLoc("block/smooth_black_quartz")); - slabBlock((SlabBlock) ActuallyBlocks.CHISELED_BLACK_QUARTZ_SLAB.get(), modLoc("block/chiseled_black_quartz"), modLoc("block/chiseled_black_quartz")); - slabBlock((SlabBlock) ActuallyBlocks.BLACK_QUARTZ_PILLAR_SLAB.get(), modLoc("block/black_quartz_pillar"), modLoc("block/black_quartz_pillar")); - slabBlock((SlabBlock) ActuallyBlocks.BLACK_QUARTZ_BRICK_SLAB.get(), modLoc("block/black_quartz_brick"), modLoc("block/black_quartz_brick")); + slabBlock((SlabBlock) ActuallyBlocks.SMOOTH_BLACK_QUARTZ_SLAB.get(), modLoc("block/smooth_black_quartz_block"), modLoc("block/smooth_black_quartz_block")); + slabBlock((SlabBlock) ActuallyBlocks.CHISELED_BLACK_QUARTZ_SLAB.get(), modLoc("block/chiseled_black_quartz_block"), modLoc("block/chiseled_black_quartz_block")); + slabBlock((SlabBlock) ActuallyBlocks.BLACK_QUARTZ_PILLAR_SLAB.get(), modLoc("block/black_quartz_pillar_block"), modLoc("block/black_quartz_pillar_block")); + slabBlock((SlabBlock) ActuallyBlocks.BLACK_QUARTZ_BRICK_SLAB.get(), modLoc("block/black_quartz_brick_block"), modLoc("block/black_quartz_brick_block")); slabBlock((SlabBlock) ActuallyBlocks.ETHETIC_GREEN_SLAB.get(), modLoc("block/ethetic_green_block"), modLoc("block/ethetic_green_block")); slabBlock((SlabBlock) ActuallyBlocks.ETHETIC_WHITE_SLAB.get(), modLoc("block/ethetic_white_block"), modLoc("block/ethetic_white_block")); diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/BlockTagsGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/BlockTagsGenerator.java index 75bff660f..9e40e3d3e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/BlockTagsGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/BlockTagsGenerator.java @@ -1,8 +1,10 @@ package de.ellpeck.actuallyadditions.data; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks; import net.minecraft.data.BlockTagsProvider; import net.minecraft.data.DataGenerator; +import net.minecraft.tags.BlockTags; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.data.ExistingFileHelper; @@ -16,15 +18,15 @@ public class BlockTagsGenerator extends BlockTagsProvider { @Override public void addTags() { - // getOrCreateBuilder(BlockTags.WALLS).add( - // ActuallyBlocks.WHITE_WALL.get(), - // ActuallyBlocks.GREEN_WALL.get(), - // ActuallyBlocks.BLACK_QUARTZ_WALL.get(), - // ActuallyBlocks.BLACK_SMOOTH_QUARTZ_WALL.get(), - // ActuallyBlocks.BLACK_PILLAR_QUARTZ_WALL.get(), - // ActuallyBlocks.BLACK_CHISELED_QUARTZ_WALL.get(), - // ActuallyBlocks.BLACK_BRICK_QUARTZ_WALL.get() - // ); + tag(BlockTags.WALLS).add( + ActuallyBlocks.ETHETIC_WHITE_WALL.get(), + ActuallyBlocks.ETHETIC_GREEN_WALL.get(), + ActuallyBlocks.BLACK_QUARTZ_WALL.get(), + ActuallyBlocks.SMOOTH_BLACK_QUARTZ_WALL.get(), + ActuallyBlocks.BLACK_QUARTZ_PILLAR_WALL.get(), + ActuallyBlocks.CHISELED_BLACK_QUARTZ_WALL.get(), + ActuallyBlocks.BLACK_QUARTZ_BRICK_WALL.get() + ); } /** diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ItemModelGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/ItemModelGenerator.java index 4ef968758..11f2223d0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ItemModelGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ItemModelGenerator.java @@ -4,8 +4,10 @@ import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks; import de.ellpeck.actuallyadditions.mod.items.ActuallyItems; import net.minecraft.block.Block; +import net.minecraft.block.WallBlock; import net.minecraft.data.DataGenerator; import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.generators.ItemModelProvider; import net.minecraftforge.client.model.generators.ModelFile; import net.minecraftforge.common.data.ExistingFileHelper; @@ -38,17 +40,15 @@ public class ItemModelGenerator extends ItemModelProvider { } private void registerBlockModel(RegistryObject block) { -/* String path = block.get().getRegistryName().getPath(); + String path = block.get().getRegistryName().getPath(); if (block.get() instanceof WallBlock) { String name = path; - path = "block/" + path.replace("wall_", ""); + path = "block/" + path.replace("_wall", "_block"); withExistingParent(name, new ResourceLocation("block/wall_inventory")) .texture("wall", modLoc(path)); return; } - getBuilder(path).parent(new ModelFile.UncheckedModelFile(modLoc("block/" + path)));*/ - String path = block.get().getRegistryName().getPath(); - getBuilder(path).parent(new ModelFile.UncheckedModelFile(modLoc("block/"+path))); + getBuilder(path).parent(new ModelFile.UncheckedModelFile(modLoc("block/" + path))); } private void simpleItem(Supplier item) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java index cd2e64413..47047016f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java @@ -214,10 +214,10 @@ public final class ActuallyBlocks { //Black Quartz public static final AABlockReg BLACK_QUARTZ = new AABlockReg<>("black_quartz_block", () -> new ActuallyBlock(miscBlockProperties), (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg BLACK_QUARTZ_PILLAR = new AABlockReg<>("black_quartz_pillar", () -> new ActuallyBlock(miscBlockProperties), (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg CHISELED_BLACK_QUARTZ = new AABlockReg<>("chiseled_black_quartz", () -> new ActuallyBlock(miscBlockProperties), (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg SMOOTH_BLACK_QUARTZ = new AABlockReg<>("smooth_black_quartz", () -> new ActuallyBlock(miscBlockProperties), (b) -> new AABlockItem(b, defaultBlockItemProperties)); - public static final AABlockReg BLACK_QUARTZ_BRICK = new AABlockReg<>("black_quartz_brick", () -> new ActuallyBlock(miscBlockProperties), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg BLACK_QUARTZ_PILLAR = new AABlockReg<>("black_quartz_pillar_block", () -> new ActuallyBlock(miscBlockProperties), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg CHISELED_BLACK_QUARTZ = new AABlockReg<>("chiseled_black_quartz_block", () -> new ActuallyBlock(miscBlockProperties), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg SMOOTH_BLACK_QUARTZ = new AABlockReg<>("smooth_black_quartz_block", () -> new ActuallyBlock(miscBlockProperties), (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg BLACK_QUARTZ_BRICK = new AABlockReg<>("black_quartz_brick_block", () -> new ActuallyBlock(miscBlockProperties), (b) -> new AABlockItem(b, defaultBlockItemProperties)); //Walls public static final AABlockReg ETHETIC_GREEN_WALL = new AABlockReg<>("ethetic_green_wall", () -> new WallBlock(AbstractBlock.Properties.copy(ETHETIC_GREEN_BLOCK.get())), (b) -> new AABlockItem(b, defaultBlockItemProperties)); diff --git a/src/main/resources/assets/actuallyadditions/models/block/black_quartz_pillar.json b/src/main/resources/assets/actuallyadditions/models/block/black_quartz_pillar.json deleted file mode 100644 index 880b4d5b8..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/black_quartz_pillar.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "actuallyadditions:block/black_quartz_pillar_top", - "side": "actuallyadditions:block/black_quartz_pillar" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/black_quartz_pillar_block.json b/src/main/resources/assets/actuallyadditions/models/block/black_quartz_pillar_block.json new file mode 100644 index 000000000..723f2a268 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/black_quartz_pillar_block.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "actuallyadditions:block/black_quartz_pillar_block_top", + "side": "actuallyadditions:block/black_quartz_pillar_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/chiseled_black_quartz.json b/src/main/resources/assets/actuallyadditions/models/block/chiseled_black_quartz.json deleted file mode 100644 index b08bd38ab..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/chiseled_black_quartz.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "actuallyadditions:block/chiseled_black_quartz_top", - "side": "actuallyadditions:block/chiseled_black_quartz" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_block.json b/src/main/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_block.json new file mode 100644 index 000000000..2f5230838 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_block.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "actuallyadditions:block/chiseled_black_quartz_block_top", + "side": "actuallyadditions:block/chiseled_black_quartz_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_brick.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_brick_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/black_quartz_brick.png rename to src/main/resources/assets/actuallyadditions/textures/block/black_quartz_brick_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_pillar.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_pillar_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/black_quartz_pillar.png rename to src/main/resources/assets/actuallyadditions/textures/block/black_quartz_pillar_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_pillar_top.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_pillar_block_top.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/black_quartz_pillar_top.png rename to src/main/resources/assets/actuallyadditions/textures/block/black_quartz_pillar_block_top.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/chiseled_black_quartz_block.png b/src/main/resources/assets/actuallyadditions/textures/block/chiseled_black_quartz_block.png new file mode 100644 index 000000000..152e927bc Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/block/chiseled_black_quartz_block.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/chiseled_black_quartz_block_top.png b/src/main/resources/assets/actuallyadditions/textures/block/chiseled_black_quartz_block_top.png new file mode 100644 index 000000000..969df9c52 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/block/chiseled_black_quartz_block_top.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/smooth_black_quartz.png b/src/main/resources/assets/actuallyadditions/textures/block/smooth_black_quartz_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/smooth_black_quartz.png rename to src/main/resources/assets/actuallyadditions/textures/block/smooth_black_quartz_block.png