diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 4cf55ac7c..2193aff54 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -2,9 +2,11 @@ ad5241a0fb20fbe1d724786a426855ab0ec07b39 assets/actuallyadditions/blockstates/at 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 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 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 @@ -14,6 +16,7 @@ ac5d75bda4dc24894fb380d5e3ec751a0aa5c498 assets/actuallyadditions/blockstates/bl 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 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 @@ -41,9 +44,11 @@ a3c46ac1c997e30f9fb4ecff56dbd573ddf8135d assets/actuallyadditions/blockstates/en ac4f3f406105875df9f544407fa90ea309b0fc0e assets/actuallyadditions/blockstates/enori_crystal_block.json 0c2bad99ce171f7d39b08337581622884fb4590c assets/actuallyadditions/blockstates/enori_crystal_cluster.json 35b61ff98befecc8b05f7dee0e637e826b84f7ed assets/actuallyadditions/blockstates/ethetic_green_block.json +846bf3588de509fc8a1a65d1e8a1776160437372 assets/actuallyadditions/blockstates/ethetic_green_slab.json ac57e23465b05691acc847791a842373d5dafdd9 assets/actuallyadditions/blockstates/ethetic_green_stairs.json 3130a8cd65712b849d65a7c5b8318ae700ff2a38 assets/actuallyadditions/blockstates/ethetic_green_wall.json 8cea4e84d6ef2a891eb674ea233483d6cfd7f489 assets/actuallyadditions/blockstates/ethetic_white_block.json +23a86c5593ed0b99cd817389d7d6ce27dc9fa199 assets/actuallyadditions/blockstates/ethetic_white_slab.json 14b1cd50b24403a138788acdaa712ac68d063ad9 assets/actuallyadditions/blockstates/ethetic_white_stairs.json 86182c30409bd728f24ea88329f7a336a37c5fe2 assets/actuallyadditions/blockstates/ethetic_white_wall.json 43d7b4a1155efbb3c3a12a93386acea7a478be7e assets/actuallyadditions/blockstates/farmer.json @@ -114,33 +119,39 @@ f3eed009d0b974f21e8b7d451db6781d425d7a77 assets/actuallyadditions/blockstates/sm 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 -083fb4bd3798638a201622c862de746c1cbc810d assets/actuallyadditions/models/block/black_quartz_slab.json -91ea14049fc7e62d2c856d8acbd19cd8b9212a2c assets/actuallyadditions/models/block/black_quartz_slab_top.json -ccd748ead38fa09fb686efa9cc193b5c61eaa629 assets/actuallyadditions/models/block/black_quartz_stair.json -0035d8f6fb226d91ab008cc525b559c72800f1fe assets/actuallyadditions/models/block/black_quartz_stair_inner.json -063d8b753fdef01c74084085796727c484838184 assets/actuallyadditions/models/block/black_quartz_stair_outer.json -6ea8cbda56da7effb30e981cf66c614ba69b3f58 assets/actuallyadditions/models/block/black_quartz_wall_post.json -aaae106f09e541df265e78675b8eb2a4be2f1199 assets/actuallyadditions/models/block/black_quartz_wall_side.json -a7af20db102a9197ff88f356b15031e3e9121df9 assets/actuallyadditions/models/block/black_quartz_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 +72d00d5d8723ec0d3b953a9ccac5f09e0ffedf4d assets/actuallyadditions/models/block/black_quartz_stair_inner.json +f277709029801d7292d300b13876189a32d1b3a4 assets/actuallyadditions/models/block/black_quartz_stair_outer.json +93b61ddd8e53f61ca25c4768de3a3b95a23297b4 assets/actuallyadditions/models/block/black_quartz_wall_post.json +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 -6e817718346f261ea91a10b0574d08b4096c02f5 assets/actuallyadditions/models/block/chiseled_black_quartz_stair.json -0804049dcbe7c278d49f693e67033afd74f60eb2 assets/actuallyadditions/models/block/chiseled_black_quartz_stair_inner.json -ae101e4ec80ab2b81df26df5df3bb6c0c08e9aad assets/actuallyadditions/models/block/chiseled_black_quartz_stair_outer.json -01e91c35e29cab6704384dfaede259571ada4f54 assets/actuallyadditions/models/block/chiseled_black_quartz_wall_post.json -81eb43a610c45715eab09a5783def0a8ad8b4cc1 assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side.json -97adebca5794224da6862e210cabdb18bd2662eb assets/actuallyadditions/models/block/chiseled_black_quartz_wall_side_tall.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 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 @@ -154,6 +165,8 @@ a45f3846f8637a6b66d613d5a185a792e25ac77d assets/actuallyadditions/models/block/e 3f86a2ce93e109ef575273c43edc075bc919de76 assets/actuallyadditions/models/block/ender_pearl_block.json 17e75d9c9dd4c1e5de89bbd69c8f145b7c05cec0 assets/actuallyadditions/models/block/enori_crystal_block.json 5b274d745475e1f01d9f0565531447e9da86ad6a assets/actuallyadditions/models/block/ethetic_green_block.json +4ad1c0a88d09f1f0dc670ba69b76ba0afea2ae94 assets/actuallyadditions/models/block/ethetic_green_slab.json +3c29a340cb62c56e786d8ec53e02f9a9013b48c6 assets/actuallyadditions/models/block/ethetic_green_slab_top.json f7bd1a7bd3e54ab93b91a2ea4dd597d6d032d3af assets/actuallyadditions/models/block/ethetic_green_stairs.json b032d447e7318be73e2bbbf9790a5cec7a493c92 assets/actuallyadditions/models/block/ethetic_green_stairs_inner.json bb8022c64188b68f86a6b2ff206c9587748f1626 assets/actuallyadditions/models/block/ethetic_green_stairs_outer.json @@ -161,6 +174,8 @@ c2e07fab2f2edc7480b34c34223f9579f810dcea assets/actuallyadditions/models/block/e e1973714592859182479b2789d30f6276db076ff assets/actuallyadditions/models/block/ethetic_green_wall_side.json abdea771a10db33f477bf3ff95ff323ae736d485 assets/actuallyadditions/models/block/ethetic_green_wall_side_tall.json 3f5f9a6ad3d87756e54af6a2bc0c8a44038343dc assets/actuallyadditions/models/block/ethetic_white_block.json +6397a5fc0bd16d484bc1e4faaf2f9f1e6db455eb assets/actuallyadditions/models/block/ethetic_white_slab.json +d66675857ded930ff3acde3f221bc5b83e5815ef assets/actuallyadditions/models/block/ethetic_white_slab_top.json 6e5a4afcbb86f14741d38bfc4310fa0ffe029b57 assets/actuallyadditions/models/block/ethetic_white_stairs.json 2dea7573ae915cac1e367f92ec9f55355394098f assets/actuallyadditions/models/block/ethetic_white_stairs_inner.json 35c33a1aa42722c645008f4d555aec476d910951 assets/actuallyadditions/models/block/ethetic_white_stairs_outer.json 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 new file mode 100644 index 000000000..eb1779f75 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "actuallyadditions:block/black_quartz_brick_slab_top" + }, + "type=bottom": { + "model": "actuallyadditions:block/black_quartz_brick_slab" + }, + "type=double": { + "model": "actuallyadditions:block/black_quartz_brick" + } + } +} \ 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 new file mode 100644 index 000000000..4d4ebcddd --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "actuallyadditions:block/black_quartz_pillar_slab_top" + }, + "type=bottom": { + "model": "actuallyadditions:block/black_quartz_pillar_slab" + }, + "type=double": { + "model": "actuallyadditions:block/black_quartz_pillar" + } + } +} \ 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 new file mode 100644 index 000000000..c75ca35df --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/chiseled_black_quartz_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "actuallyadditions:block/chiseled_black_quartz_slab_top" + }, + "type=bottom": { + "model": "actuallyadditions:block/chiseled_black_quartz_slab" + }, + "type=double": { + "model": "actuallyadditions:block/chiseled_black_quartz" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/ethetic_green_slab.json b/src/generated/resources/assets/actuallyadditions/blockstates/ethetic_green_slab.json new file mode 100644 index 000000000..2d48ddb62 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/ethetic_green_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "actuallyadditions:block/ethetic_green_slab_top" + }, + "type=bottom": { + "model": "actuallyadditions:block/ethetic_green_slab" + }, + "type=double": { + "model": "actuallyadditions:block/ethetic_green_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/ethetic_white_slab.json b/src/generated/resources/assets/actuallyadditions/blockstates/ethetic_white_slab.json new file mode 100644 index 000000000..198473a47 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/ethetic_white_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "actuallyadditions:block/ethetic_white_slab_top" + }, + "type=bottom": { + "model": "actuallyadditions:block/ethetic_white_slab" + }, + "type=double": { + "model": "actuallyadditions:block/ethetic_white_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 new file mode 100644 index 000000000..cc1759b34 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_slab.json @@ -0,0 +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" + } +} \ 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 new file mode 100644 index 000000000..4093d46bc --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_brick_slab_top.json @@ -0,0 +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" + } +} \ 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 new file mode 100644 index 000000000..531391d31 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_slab.json @@ -0,0 +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" + } +} \ 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 new file mode 100644 index 000000000..424dad4dd --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_slab_top.json @@ -0,0 +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" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_slab.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_slab.json index c39c24c48..10b5c29ff 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_slab.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "actuallyadditions:block/black_quartz", - "bottom": "actuallyadditions:block/black_quartz", - "top": "actuallyadditions:block/black_quartz" + "side": "actuallyadditions:block/black_quartz_block", + "bottom": "actuallyadditions:block/black_quartz_block", + "top": "actuallyadditions:block/black_quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_slab_top.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_slab_top.json index a51370a2c..b3c597dc9 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_slab_top.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "actuallyadditions:block/black_quartz", - "bottom": "actuallyadditions:block/black_quartz", - "top": "actuallyadditions:block/black_quartz" + "side": "actuallyadditions:block/black_quartz_block", + "bottom": "actuallyadditions:block/black_quartz_block", + "top": "actuallyadditions:block/black_quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair.json index 439761a31..285f6236b 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "actuallyadditions:block/black_quartz", - "bottom": "actuallyadditions:block/black_quartz", - "top": "actuallyadditions:block/black_quartz" + "side": "actuallyadditions:block/black_quartz_block", + "bottom": "actuallyadditions:block/black_quartz_block", + "top": "actuallyadditions:block/black_quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair_inner.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair_inner.json index de2846d66..ca5a0895d 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair_inner.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "actuallyadditions:block/black_quartz", - "bottom": "actuallyadditions:block/black_quartz", - "top": "actuallyadditions:block/black_quartz" + "side": "actuallyadditions:block/black_quartz_block", + "bottom": "actuallyadditions:block/black_quartz_block", + "top": "actuallyadditions:block/black_quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair_outer.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair_outer.json index aed4dac29..79039e653 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair_outer.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_stair_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "actuallyadditions:block/black_quartz", - "bottom": "actuallyadditions:block/black_quartz", - "top": "actuallyadditions:block/black_quartz" + "side": "actuallyadditions:block/black_quartz_block", + "bottom": "actuallyadditions:block/black_quartz_block", + "top": "actuallyadditions:block/black_quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_post.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_post.json index 7982914c1..f06e99665 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_post.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_post.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_post", "textures": { - "wall": "actuallyadditions:block/black_quartz" + "wall": "actuallyadditions:block/black_quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_side.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_side.json index 6c4f06cf0..9f888e2d2 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_side.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_side.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_side", "textures": { - "wall": "actuallyadditions:block/black_quartz" + "wall": "actuallyadditions:block/black_quartz_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_side_tall.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_side_tall.json index ebe6946f7..8040b4b2a 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_side_tall.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_wall_side_tall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_side_tall", "textures": { - "wall": "actuallyadditions:block/black_quartz" + "wall": "actuallyadditions:block/black_quartz_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 new file mode 100644 index 000000000..51832ce3d --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_slab.json @@ -0,0 +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" + } +} \ 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 new file mode 100644 index 000000000..904944ed8 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/chiseled_black_quartz_slab_top.json @@ -0,0 +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" + } +} \ 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 aa16cc03b..d6e8fdced 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/black_quartz_chiseled", - "bottom": "actuallyadditions:block/black_quartz_chiseled", - "top": "actuallyadditions:block/black_quartz_chiseled" + "side": "actuallyadditions:block/chiseled_black_quartz", + "bottom": "actuallyadditions:block/chiseled_black_quartz", + "top": "actuallyadditions:block/chiseled_black_quartz" } } \ 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 08e684389..c2680cabb 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/black_quartz_chiseled", - "bottom": "actuallyadditions:block/black_quartz_chiseled", - "top": "actuallyadditions:block/black_quartz_chiseled" + "side": "actuallyadditions:block/chiseled_black_quartz", + "bottom": "actuallyadditions:block/chiseled_black_quartz", + "top": "actuallyadditions:block/chiseled_black_quartz" } } \ 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 aa7b7fce1..5ac4ac4f8 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/black_quartz_chiseled", - "bottom": "actuallyadditions:block/black_quartz_chiseled", - "top": "actuallyadditions:block/black_quartz_chiseled" + "side": "actuallyadditions:block/chiseled_black_quartz", + "bottom": "actuallyadditions:block/chiseled_black_quartz", + "top": "actuallyadditions:block/chiseled_black_quartz" } } \ 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 4cc8739af..3e7808955 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/black_quartz_chiseled" + "wall": "actuallyadditions:block/chiseled_black_quartz" } } \ 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 f2787c3de..e40c35eff 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/black_quartz_chiseled" + "wall": "actuallyadditions:block/chiseled_black_quartz" } } \ 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 8b181631b..d4d8bdc0a 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/black_quartz_chiseled" + "wall": "actuallyadditions:block/chiseled_black_quartz" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_slab.json b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_slab.json new file mode 100644 index 000000000..35677cbb1 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "actuallyadditions:block/ethetic_green_block", + "bottom": "actuallyadditions:block/ethetic_green_block", + "top": "actuallyadditions:block/ethetic_green_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_slab_top.json b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_slab_top.json new file mode 100644 index 000000000..39853e55d --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_green_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "actuallyadditions:block/ethetic_green_block", + "bottom": "actuallyadditions:block/ethetic_green_block", + "top": "actuallyadditions:block/ethetic_green_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_slab.json b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_slab.json new file mode 100644 index 000000000..bd3ca18e8 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "actuallyadditions:block/ethetic_white_block", + "bottom": "actuallyadditions:block/ethetic_white_block", + "top": "actuallyadditions:block/ethetic_white_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_slab_top.json b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_slab_top.json new file mode 100644 index 000000000..f7d789668 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/ethetic_white_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "actuallyadditions:block/ethetic_white_block", + "bottom": "actuallyadditions:block/ethetic_white_block", + "top": "actuallyadditions:block/ethetic_white_block" + } +} \ 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 6073e2a68..4146ac0d6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java @@ -139,31 +139,31 @@ public class BlockStateGenerator extends BlockStateProvider { buildCubeAll(ActuallyBlocks.ETHETIC_WHITE_BLOCK); // Walls - wallBlock((WallBlock) ActuallyBlocks.BLACK_QUARTZ_WALL.get(), modLoc("block/black_quartz")); + 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/black_quartz_chiseled")); + 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.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")); + 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/black_quartz_chiseled")); + 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.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")); + 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/black_quartz_chiseled"), modLoc("block/black_quartz_chiseled")); - //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.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")); + 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.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")); } @@ -174,7 +174,7 @@ public class BlockStateGenerator extends BlockStateProvider { private void standardBlock(Supplier block) { ResourceLocation name = block.get().getRegistryName(); - ModelFile model = new ModelFile.UncheckedModelFile(modLoc("block/" + name.toString().split(":")[1])); + ModelFile model = new ModelFile.UncheckedModelFile(modLoc("block/" + name.getPath())); assert name != null; simpleBlock(block.get(), model); diff --git a/src/main/resources/assets/actuallyadditions/models/block/black_quartz_chiseled_block.json b/src/main/resources/assets/actuallyadditions/models/block/black_quartz_chiseled_block.json deleted file mode 100644 index d37689b8d..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/black_quartz_chiseled_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "actuallyadditions:block/black_quartz_chiseled_block_top", - "side": "actuallyadditions:block/black_quartz_chiseled_block" - } -} \ No newline at end of file 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 new file mode 100644 index 000000000..880b4d5b8 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/black_quartz_pillar.json @@ -0,0 +1,7 @@ +{ + "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 deleted file mode 100644 index 723f2a268..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/black_quartz_pillar_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 new file mode 100644 index 000000000..b08bd38ab --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/chiseled_black_quartz.json @@ -0,0 +1,7 @@ +{ + "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/textures/block/black_quartz.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz.png deleted file mode 100644 index fa809bd8e..000000000 Binary files a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz.png and /dev/null differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_chiseled.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_chiseled.png deleted file mode 100644 index 152e927bc..000000000 Binary files a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_chiseled.png and /dev/null differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_chiseled_top.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_chiseled_top.png deleted file mode 100644 index 969df9c52..000000000 Binary files a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_chiseled_top.png and /dev/null differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_top.png b/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_top.png deleted file mode 100644 index e86dedc20..000000000 Binary files a/src/main/resources/assets/actuallyadditions/textures/block/black_quartz_top.png and /dev/null differ