From 3fc310bba6771684fcdc5aae0c323c34166a9546 Mon Sep 17 00:00:00 2001 From: Michael Hillcox Date: Sat, 28 Nov 2020 16:18:18 +0000 Subject: [PATCH] Fixed walls :D Thanks Ridanisaurus --- src/generated/resources/.cache/cache | 54 ++++++------------- ... => black_quartz_chiseled_wall_block.json} | 18 +++---- ...on => black_quartz_pillar_wall_block.json} | 18 +++---- .../blockstates/fishing_net_block.json | 7 --- .../blockstates/item_repairer_block.json | 7 --- .../blockstates/smiley_cloud_block.json | 7 --- .../blockstates/solar_panel_block.json | 7 --- .../blockstates/treasure_chest_block.json | 7 --- .../assets/actuallyadditions/lang/en_us.json | 9 +--- ...lack_quartz_chiseled_wall_block_post.json} | 0 ...lack_quartz_chiseled_wall_block_side.json} | 0 ...quartz_chiseled_wall_block_side_tall.json} | 0 ... black_quartz_pillar_wall_block_post.json} | 0 ... black_quartz_pillar_wall_block_side.json} | 0 ...k_quartz_pillar_wall_block_side_tall.json} | 0 .../models/block/fishing_net_block.json | 6 --- .../models/block/item_repairer_block.json | 6 --- .../models/block/smiley_cloud_block.json | 6 --- .../models/block/solar_panel_block.json | 6 --- .../models/block/treasure_chest_block.json | 6 --- .../black_chiseled_quartz_wall_block.json | 3 -- .../item/black_pillar_quartz_wall_block.json | 3 -- .../black_quartz_chiseled_wall_block.json | 6 +++ .../item/black_quartz_pillar_wall_block.json | 6 +++ .../models/item/black_quartz_wall_block.json | 5 +- .../models/item/fishing_net_block.json | 3 -- .../models/item/green_wall_block.json | 5 +- .../models/item/item_repairer_block.json | 3 -- .../models/item/smiley_cloud_block.json | 3 -- .../models/item/solar_panel_block.json | 3 -- .../models/item/treasure_chest_block.json | 3 -- .../models/item/white_wall_block.json | 5 +- ... => black_quartz_chiseled_wall_block.json} | 2 +- ...on => black_quartz_pillar_wall_block.json} | 2 +- .../loot_tables/blocks/fishing_net_block.json | 19 ------- .../blocks/item_repairer_block.json | 19 ------- .../blocks/smiley_cloud_block.json | 19 ------- .../loot_tables/blocks/solar_panel_block.json | 19 ------- .../blocks/treasure_chest_block.json | 19 ------- .../data/minecraft/tags/blocks/walls.json | 4 +- .../common/blocks/ActuallyBlocks.java | 4 +- .../common/items/ActuallyItems.java | 3 ++ .../data/GeneratorItemModels.java | 13 ++++- 43 files changed, 82 insertions(+), 253 deletions(-) rename src/generated/resources/assets/actuallyadditions/blockstates/{black_chiseled_quartz_wall_block.json => black_quartz_chiseled_wall_block.json} (68%) rename src/generated/resources/assets/actuallyadditions/blockstates/{black_pillar_quartz_wall_block.json => black_quartz_pillar_wall_block.json} (68%) delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/fishing_net_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/item_repairer_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/smiley_cloud_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/solar_panel_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/treasure_chest_block.json rename src/generated/resources/assets/actuallyadditions/models/block/{black_chiseled_quartz_wall_block_post.json => black_quartz_chiseled_wall_block_post.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{black_chiseled_quartz_wall_block_side.json => black_quartz_chiseled_wall_block_side.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{black_chiseled_quartz_wall_block_side_tall.json => black_quartz_chiseled_wall_block_side_tall.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{black_pillar_quartz_wall_block_post.json => black_quartz_pillar_wall_block_post.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{black_pillar_quartz_wall_block_side.json => black_quartz_pillar_wall_block_side.json} (100%) rename src/generated/resources/assets/actuallyadditions/models/block/{black_pillar_quartz_wall_block_side_tall.json => black_quartz_pillar_wall_block_side_tall.json} (100%) delete mode 100644 src/generated/resources/assets/actuallyadditions/models/block/fishing_net_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/block/item_repairer_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/block/smiley_cloud_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/block/solar_panel_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/block/treasure_chest_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/black_chiseled_quartz_wall_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/black_pillar_quartz_wall_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/black_quartz_chiseled_wall_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_wall_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/fishing_net_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/item_repairer_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/smiley_cloud_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/solar_panel_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/treasure_chest_block.json rename src/generated/resources/data/actuallyadditions/loot_tables/blocks/{black_chiseled_quartz_wall_block.json => black_quartz_chiseled_wall_block.json} (81%) rename src/generated/resources/data/actuallyadditions/loot_tables/blocks/{black_pillar_quartz_wall_block.json => black_quartz_pillar_wall_block.json} (80%) delete mode 100644 src/generated/resources/data/actuallyadditions/loot_tables/blocks/fishing_net_block.json delete mode 100644 src/generated/resources/data/actuallyadditions/loot_tables/blocks/item_repairer_block.json delete mode 100644 src/generated/resources/data/actuallyadditions/loot_tables/blocks/smiley_cloud_block.json delete mode 100644 src/generated/resources/data/actuallyadditions/loot_tables/blocks/solar_panel_block.json delete mode 100644 src/generated/resources/data/actuallyadditions/loot_tables/blocks/treasure_chest_block.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index e76ca2be2..7157a2e51 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -4,13 +4,13 @@ b25315def4a9ff486d8a564449764cfb76b00d78 assets/actuallyadditions/blockstates/bio_reactor_block.json eefccdcc7bb6e2e26af2195d266691148bb2c25b assets/actuallyadditions/blockstates/black_chiseled_quartz_slab_block.json c36a97288df2eea0cf76a32146fd7582e33e7022 assets/actuallyadditions/blockstates/black_chiseled_quartz_stair_block.json -d736c7c359adf5ff961898e55fea00e09aa00e2e assets/actuallyadditions/blockstates/black_chiseled_quartz_wall_block.json 3f625990d244d8be3e67729086769ca9f7724d63 assets/actuallyadditions/blockstates/black_pillar_quartz_slab_block.json 78807210fb5821006b8875abf1a9cbdcce39d69e assets/actuallyadditions/blockstates/black_pillar_quartz_stair_block.json -eec126e116a0cbee9def33009609a95d666dacf7 assets/actuallyadditions/blockstates/black_pillar_quartz_wall_block.json f4b3482fd851ad2e0071caf4aedbd7ee45fe0a31 assets/actuallyadditions/blockstates/black_quartz_block.json 51406ff61c7836448b670b144bcc5d6e9ad02e1d assets/actuallyadditions/blockstates/black_quartz_chiseled_block.json +c7ed88b04005444c92e52c99b814c761c6d61f78 assets/actuallyadditions/blockstates/black_quartz_chiseled_wall_block.json 31b696d84e073be37ae3ce210463fd1568cdce47 assets/actuallyadditions/blockstates/black_quartz_pillar_block.json +9ae4d34ff038759742f3dd254eecc1d6ff3328c9 assets/actuallyadditions/blockstates/black_quartz_pillar_wall_block.json bbf1deec87fd98d99d7049b8bad53811780f66f9 assets/actuallyadditions/blockstates/black_quartz_slab_block.json 927434c25a7630a6102159a781e9c70a0ec45472 assets/actuallyadditions/blockstates/black_quartz_stair_block.json 919cc431226ebfbaa8e4dda1c1a8b1460031747f assets/actuallyadditions/blockstates/black_quartz_wall_block.json @@ -58,7 +58,6 @@ ef7d485db00e32c6d5b25361f8976e24c3f86c27 assets/actuallyadditions/blockstates/fa 1d1dee2cead6c8e6ef8ac5caa60c5a828dfa31f4 assets/actuallyadditions/blockstates/feeder_block.json f194ac52c1183dcdd0746cd00145ce19ddcc2c20 assets/actuallyadditions/blockstates/fermenting_barrel_block.json a14d5a20522d4369cd53fa4bd52b211102312af5 assets/actuallyadditions/blockstates/firework_box_block.json -1251df42f08723e17161b42ad18c919d5f9aa4e7 assets/actuallyadditions/blockstates/fishing_net_block.json c3cb96f297ec4e3fd0571dcacc331883e56414f8 assets/actuallyadditions/blockstates/flax_block.json 6ab4ddadd6e44f4c6661ce2b8dd6a5dc78202554 assets/actuallyadditions/blockstates/fluid_collector_block.json 495c7ffb20099457fc8642c1450855d8673cd6f2 assets/actuallyadditions/blockstates/fluid_placer_block.json @@ -74,7 +73,6 @@ e2782f6ef5da9a08d2ca997dd0975ec1c70e4872 assets/actuallyadditions/blockstates/ir ca449143d056ad64729043ad10ac444169752574 assets/actuallyadditions/blockstates/iron_casing_snow_block.json 78319cb5664292f412af2ff5d5f99bed4b2f9d0d assets/actuallyadditions/blockstates/item_interface_block.json 66c2062159dfa7743d3f567439be26cb4c708582 assets/actuallyadditions/blockstates/item_laser_relay_block.json -d60404de40fab972c26afdf99c88847098b9553b assets/actuallyadditions/blockstates/item_repairer_block.json 49437918199e264073ac399ca343bb7e13473408 assets/actuallyadditions/blockstates/lamp_black_block.json 1182ed7e3470d500c8bc0d0f721ed29a5ab6886b assets/actuallyadditions/blockstates/lamp_blue_block.json dac6d62d802fe5289bc419ab1c40a1a599be51c9 assets/actuallyadditions/blockstates/lamp_brown_block.json @@ -111,17 +109,14 @@ b8427a1cca9f804adcc1a152431bab60bd567782 assets/actuallyadditions/blockstates/pl c3cf146fb712a6ab4476201a471ac14e47f90c67 assets/actuallyadditions/blockstates/ranged_collector_block.json 1a8b5eba2d9250f53a5cd6548921ee4881dac687 assets/actuallyadditions/blockstates/rice_block.json 735f788ce8087bd794ddb94041c3208cd641f860 assets/actuallyadditions/blockstates/shock_suppressor_block.json -58bfb26fb6c8c0692630e1af82a704c463e66926 assets/actuallyadditions/blockstates/smiley_cloud_block.json -0f310d143c8504d103ca060957a553bd58cf2259 assets/actuallyadditions/blockstates/solar_panel_block.json 5e4a1515853930ee4db617a7ebe2d81e8d00eac1 assets/actuallyadditions/blockstates/tiny_torch_block.json -bdf1cc88bd235a3ee9451feb8acc081f7b6745b7 assets/actuallyadditions/blockstates/treasure_chest_block.json e2c81adfe240117fa0ce2e3dfcfd04f4e1034153 assets/actuallyadditions/blockstates/white_block.json 26a953098e27b4043b5f4a98a63703dc6d4f36a4 assets/actuallyadditions/blockstates/white_slab_block.json 009f53924868e115c6bbe861a7922752261481dd assets/actuallyadditions/blockstates/white_stairs_block.json 3670535838b4c26d01afe7ee4807c53a6cbaba12 assets/actuallyadditions/blockstates/white_wall_block.json 78e89628e3c6e891f2994b2a1794672f69826516 assets/actuallyadditions/blockstates/wood_casing_block.json 207adf3d139369e983100a6002f6f77d36d40916 assets/actuallyadditions/blockstates/xp_solidifier_block.json -11dd201f6edd5443d6786cecc6704bda1651018c assets/actuallyadditions/lang/en_us.json +703fcdce606e15fec526dd1fe0958ae4e170bca6 assets/actuallyadditions/lang/en_us.json 8ce3f2af3288773fb581a3668c2cb90b64c9ee2f assets/actuallyadditions/models/block/advanced_item_laser_relay_block.json de74eda6290d47ef2b26961693e537d7b8795a06 assets/actuallyadditions/models/block/atomic_reconstructor_block.json 16a76926a07fc8fa10e4a3949d15ad2ca6920bb8 assets/actuallyadditions/models/block/battery_box_block.json @@ -131,20 +126,20 @@ bcae388ebbfa2b232ca846dc2716e3e5b80b76a8 assets/actuallyadditions/models/block/b 251b824d3db3f4b6386362169deaeae4b42fceb1 assets/actuallyadditions/models/block/black_chiseled_quartz_stair_block.json 0397bb0900c2097dd492b3a3baf6ca77d9052b85 assets/actuallyadditions/models/block/black_chiseled_quartz_stair_block_inner.json ebcbbd421acfefa3b558fa3bba1796ef06f1d659 assets/actuallyadditions/models/block/black_chiseled_quartz_stair_block_outer.json -b9d38b614addaf33c23103c63395b960b4797c27 assets/actuallyadditions/models/block/black_chiseled_quartz_wall_block_post.json -1cb145ca56e990192a6ccdc04f671c12747cfb53 assets/actuallyadditions/models/block/black_chiseled_quartz_wall_block_side.json -41b38f848e1ee3961822598df0fbac11142972e3 assets/actuallyadditions/models/block/black_chiseled_quartz_wall_block_side_tall.json 0c025b6788abd7f33eb7a15cac85933dbe119596 assets/actuallyadditions/models/block/black_pillar_quartz_slab_block.json b87c74333526c7b52df48a4a09591f6116fe4b03 assets/actuallyadditions/models/block/black_pillar_quartz_slab_block_top.json 480c94b0c400ccea983bac8d23662fb8cbe84da2 assets/actuallyadditions/models/block/black_pillar_quartz_stair_block.json a1c50e555b7742b8215806214ceb6bfc5b728155 assets/actuallyadditions/models/block/black_pillar_quartz_stair_block_inner.json d229a8d1ae3e1644d83c85ef1edafb7a0d923e70 assets/actuallyadditions/models/block/black_pillar_quartz_stair_block_outer.json -5e370e4176e71c8755c84c9b0cd3ae4994501aac assets/actuallyadditions/models/block/black_pillar_quartz_wall_block_post.json -b89da02bf59fe8c49c1fdbc436219bfc202151f9 assets/actuallyadditions/models/block/black_pillar_quartz_wall_block_side.json -a4dfc98dbd73ba2759b0cd6f20d7e21eb9d0ee0a assets/actuallyadditions/models/block/black_pillar_quartz_wall_block_side_tall.json dba6e3ace0c0ef6ef37e8dc67eaad506e77e2a64 assets/actuallyadditions/models/block/black_quartz_block.json 7f1737933224e107ccaa3341d622d3f5775de11a assets/actuallyadditions/models/block/black_quartz_chiseled_block.json +b9d38b614addaf33c23103c63395b960b4797c27 assets/actuallyadditions/models/block/black_quartz_chiseled_wall_block_post.json +1cb145ca56e990192a6ccdc04f671c12747cfb53 assets/actuallyadditions/models/block/black_quartz_chiseled_wall_block_side.json +41b38f848e1ee3961822598df0fbac11142972e3 assets/actuallyadditions/models/block/black_quartz_chiseled_wall_block_side_tall.json 109888f0b2c7bb052650228193e942e2e5c5ccf7 assets/actuallyadditions/models/block/black_quartz_pillar_block.json +5e370e4176e71c8755c84c9b0cd3ae4994501aac assets/actuallyadditions/models/block/black_quartz_pillar_wall_block_post.json +b89da02bf59fe8c49c1fdbc436219bfc202151f9 assets/actuallyadditions/models/block/black_quartz_pillar_wall_block_side.json +a4dfc98dbd73ba2759b0cd6f20d7e21eb9d0ee0a assets/actuallyadditions/models/block/black_quartz_pillar_wall_block_side_tall.json 83d41e95a7d032dc6ce960ebbaa9d808a1d44126 assets/actuallyadditions/models/block/black_quartz_slab_block.json 02b5f964815edb299171a220b104042fe793a837 assets/actuallyadditions/models/block/black_quartz_slab_block_top.json 7f3141ee52fe873a17a5d0210a43d4a94fb3465a assets/actuallyadditions/models/block/black_quartz_stair_block.json @@ -197,7 +192,6 @@ f1c3add14ec2f3623cc7ffb06e416212b5f251f5 assets/actuallyadditions/models/block/d 105e7c553b839ec8025a91e2a53d81ae06f8c88c assets/actuallyadditions/models/block/feeder_block.json 9e486c09965b04ce25ddc61415ba496b0a3e6abe assets/actuallyadditions/models/block/fermenting_barrel_block.json 7aaac2625165e6e5e8634af74f46000eb28112b4 assets/actuallyadditions/models/block/firework_box_block.json -5e00be17b500f760df74f8046256f00e4ed1b3ed assets/actuallyadditions/models/block/fishing_net_block.json 801e34d17405a20062b5c72d362b9ae8fa3bc0be assets/actuallyadditions/models/block/flax_block.json 992c7f7cd2fd6bb80e84eef60930090e88aa9fe0 assets/actuallyadditions/models/block/fluid_collector_block.json 6d67b2ecdbbb8be56db49d0d28369211d7ca1ea6 assets/actuallyadditions/models/block/fluid_placer_block.json @@ -218,7 +212,6 @@ d43971145be2910eefae6632306e4c36c1db54a5 assets/actuallyadditions/models/block/h 7f3c845740543bddc867ed2f047e866dfffc6697 assets/actuallyadditions/models/block/iron_casing_snow_block.json f7f5a6ea0e799648572bf20802c49f59555c74a5 assets/actuallyadditions/models/block/item_interface_block.json e4ed24c971e1758b3e580211ef42c1e23579de5e assets/actuallyadditions/models/block/item_laser_relay_block.json -c4900a07f08780d97dabb77c9de00d059afdf322 assets/actuallyadditions/models/block/item_repairer_block.json b867c090a5382962a8873532ea824645e279d1f1 assets/actuallyadditions/models/block/lamp_black_block.json 445ccde39132f123170cb5a7de0c30cf202f0c09 assets/actuallyadditions/models/block/lamp_blue_block.json c4e348b4ae72830389c1783dd6c56526d89c369c assets/actuallyadditions/models/block/lamp_brown_block.json @@ -255,10 +248,7 @@ d205a86ca92ffdd06b7ecc60ce18cf5de0a392c8 assets/actuallyadditions/models/block/p 22719a41dff1dad8c02ee7489142249c72d690b1 assets/actuallyadditions/models/block/ranged_collector_block.json 12b2c1647534d2cc5cb6df7446cf34377c56f64a assets/actuallyadditions/models/block/rice_block.json b3be81956ac79cbccc690e66589f362aecc7caf1 assets/actuallyadditions/models/block/shock_suppressor_block.json -4e64efe87f0364f0d94a94bda701673994825e1b assets/actuallyadditions/models/block/smiley_cloud_block.json -63f7b900998eb89aa4106c4daa8c03d34c9bb9f3 assets/actuallyadditions/models/block/solar_panel_block.json d4566284fbb72145915dd3c7804f674f8d1c98be assets/actuallyadditions/models/block/tiny_torch_block.json -18d7ca4ca3d062756fb9455258a070c4580413dc assets/actuallyadditions/models/block/treasure_chest_block.json 150a875c60a9879f00a192326fb9fded362e020e assets/actuallyadditions/models/block/white_block.json 844fb52aad24436d035706aa47a4712c50e4405c assets/actuallyadditions/models/block/white_slab_block.json c88728a8c7c69d41f9dddf90685a97a476053f85 assets/actuallyadditions/models/block/white_slab_block_top.json @@ -276,17 +266,17 @@ f8092e976c50d90ff29ca2dd4bccfd845ab299b7 assets/actuallyadditions/models/item/ad 07ad7900cb640f36da5a94953203d2ec1d9be705 assets/actuallyadditions/models/item/bio_reactor_block.json fa3f47abe215fc8df67a24b20294cc45fa9c9c32 assets/actuallyadditions/models/item/black_chiseled_quartz_slab_block.json 365764b67f52be3bad2f8bd5cc4704b643fb5f78 assets/actuallyadditions/models/item/black_chiseled_quartz_stair_block.json -7128592505005a4585b9c6a21a62cf609e1e3950 assets/actuallyadditions/models/item/black_chiseled_quartz_wall_block.json 641231a2f0637bd1ac45263e08583220e3f2fa7f assets/actuallyadditions/models/item/black_pillar_quartz_slab_block.json 95d32e4f070679e9425d1b99c158e1fbc4711671 assets/actuallyadditions/models/item/black_pillar_quartz_stair_block.json -672b0bfd546bda3aee14a59acd574dd7a272df6a assets/actuallyadditions/models/item/black_pillar_quartz_wall_block.json 08f5dfde00eed3a0686cfd09efae9b08c3d1a28a assets/actuallyadditions/models/item/black_quartz.json 37d49b21bf16128d58a5d63d742508891a114ece assets/actuallyadditions/models/item/black_quartz_block.json 914cf520c2529c678328aab983bf615657701404 assets/actuallyadditions/models/item/black_quartz_chiseled_block.json +bfef4185987e66e3c7c19369d3425381fc4d257d assets/actuallyadditions/models/item/black_quartz_chiseled_wall_block.json 50075e8e8b428b161113d45d583f6eae5e8360f3 assets/actuallyadditions/models/item/black_quartz_pillar_block.json +9d655753b4257e272902c27c2bb92706b0663a2c assets/actuallyadditions/models/item/black_quartz_pillar_wall_block.json 8526296e18863679e70ce91a57562ba547a6ddf2 assets/actuallyadditions/models/item/black_quartz_slab_block.json 0d6700a1829ebf2a89a748adfb2fa3c0ebf9dd10 assets/actuallyadditions/models/item/black_quartz_stair_block.json -25d3567ff6e7a1ec01a3d960780d71255aa89bea assets/actuallyadditions/models/item/black_quartz_wall_block.json +be227e074a54982e1e9f9f304e63df3095006955 assets/actuallyadditions/models/item/black_quartz_wall_block.json 0651f54c6f231fea74e3cc4c10a2c2a50019366e assets/actuallyadditions/models/item/booklet.json 10b81cec3e9c5beebb11ca22ef3f442746a75125 assets/actuallyadditions/models/item/breaker_block.json ee0b4baf15ba02b3be1c7ca35bce2f1643bdb4cb assets/actuallyadditions/models/item/canola_block.json @@ -366,7 +356,6 @@ a159872078f26db6fe09c7e09b8caa3e892f4294 assets/actuallyadditions/models/item/en 3960955f0e96a0088d4b48881d42182d2f0006c2 assets/actuallyadditions/models/item/feeder_block.json 83611e64f98be7713c8d59468143c2ec8468ae8e assets/actuallyadditions/models/item/fermenting_barrel_block.json 1d23b02005fe0d4049079b1089f8d35cf25abab6 assets/actuallyadditions/models/item/firework_box_block.json -6164286a73bb0febb257f13ccde6e7e7c5b5f414 assets/actuallyadditions/models/item/fishing_net_block.json 9473fbfc3050a9652a5aeeb5f85dab643ee0ce45 assets/actuallyadditions/models/item/flax_block.json 86dc57da732f6dccb9fbf215baef75a9fc2a35fd assets/actuallyadditions/models/item/fluid_collector_block.json e09bdbddcd177907aaed963f848dfa0f51271ed4 assets/actuallyadditions/models/item/fluid_placer_block.json @@ -375,7 +364,7 @@ ca0c27a6bbf80283389fa7522135af8f605e6fe7 assets/actuallyadditions/models/item/go b5c343509b6ae48e965a23cd5f3c74e85e4f7d64 assets/actuallyadditions/models/item/green_block.json 4c5a678dc881c854dcb2d6f2123ed5e459fb4856 assets/actuallyadditions/models/item/green_slab_block.json b25412614db4eb1b196fb8c1d29db3929506eaec assets/actuallyadditions/models/item/green_stairs_block.json -2eb66d4cffb3400d6aa08f21d0bb0bd2e762a628 assets/actuallyadditions/models/item/green_wall_block.json +c6073044af8a741e3a90c90622d6e1272dab9482 assets/actuallyadditions/models/item/green_wall_block.json 2cc84f5398d18cdbda0f283b0f9caf9b75493758 assets/actuallyadditions/models/item/greenhouse_glass_block.json 66471a00731b2df91c36c59827f9e07444c9c301 assets/actuallyadditions/models/item/heat_collector_block.json 76ed4ff443bb3a205e1548283fb32a7be5cefde9 assets/actuallyadditions/models/item/hopping_item_interface_block.json @@ -384,7 +373,6 @@ cc05fca55e55883f67ceac4cb3415f66d5781839 assets/actuallyadditions/models/item/ir 754a286167121413fb64334ef9735c108e43dfc8 assets/actuallyadditions/models/item/iron_paxel.json bd1cb3ca86dfb9dfe128e207c067e95417fe7acc assets/actuallyadditions/models/item/item_interface_block.json 681f91c05610fb0a9a0448ce97fd66b2bb4f6abf assets/actuallyadditions/models/item/item_laser_relay_block.json -35a21070654764edd4a7fe580be7e73fe64a4bdd assets/actuallyadditions/models/item/item_repairer_block.json a97d1910bf7d91d2740f4fb138303db13d6fb34a assets/actuallyadditions/models/item/lamp_black_block.json 46a815ab863a329716a5c56f72525940f45bb6ea assets/actuallyadditions/models/item/lamp_blue_block.json aff2bb271e9db49d31fca1ec20879682091acb41 assets/actuallyadditions/models/item/lamp_brown_block.json @@ -454,11 +442,8 @@ f10850d62ce98922b620a23ff83739c2507bc788 assets/actuallyadditions/models/item/re bb5a27e6545bd6d9e5935ea59b1fb59c640b4fd6 assets/actuallyadditions/models/item/restonia_sword.json 12fafb570deeab62b84d76b645f5eb79a1b65923 assets/actuallyadditions/models/item/rice_block.json a2d1eda557476e8f4a21ba40635949106b828b71 assets/actuallyadditions/models/item/shock_suppressor_block.json -ed85d0bf06c97604436d25c0f8167ffaa690342c assets/actuallyadditions/models/item/smiley_cloud_block.json -f9b2e4a02149284e112cf645c70404b55b1b75aa assets/actuallyadditions/models/item/solar_panel_block.json edba2bd7b919b51a66ccd29d8cc99d18999ad508 assets/actuallyadditions/models/item/stone_paxel.json 10bb7fb456cb1ce636b40844d607b617e43ee45a assets/actuallyadditions/models/item/tiny_torch_block.json -0443cb44ad47bce4b409577f727f7e61ed8ff748 assets/actuallyadditions/models/item/treasure_chest_block.json 861ae2abeaca3a3f16ceeffefc15764c6b845b60 assets/actuallyadditions/models/item/void_axe.json 2e765dce52513b9411e01d0ee5cb8e9003429b10 assets/actuallyadditions/models/item/void_boots.json 638ea6ecc2739a77198d1afe03f8eac9e70b751e assets/actuallyadditions/models/item/void_chest.json @@ -473,7 +458,7 @@ ee36da9a021297b34b30e4979c30eb63835b2a6b assets/actuallyadditions/models/item/vo bb3367e2a5b29e64ab8e0626603732152aec7d05 assets/actuallyadditions/models/item/white_block.json 18c64ee5cf2a0e93e561cb60e1203868dea6424e assets/actuallyadditions/models/item/white_slab_block.json ff80a66586e72226565ede5db5968bba67a09446 assets/actuallyadditions/models/item/white_stairs_block.json -2c72c538e9ad6eb2324833ae01c8a89f33e68173 assets/actuallyadditions/models/item/white_wall_block.json +7a7d0c69a1799c526d2765dc580b6524fc1c0f4c assets/actuallyadditions/models/item/white_wall_block.json 018d9aae3519daccd557d07e541686fcb2456b53 assets/actuallyadditions/models/item/wood_casing_block.json 174559d46dbaa07d49ceff6db3708b75e7ad62a4 assets/actuallyadditions/models/item/wooden_paxel.json 5ee8c662c6e0448c4b6a14c03456a9e68c4dd947 assets/actuallyadditions/models/item/xp_solidifier_block.json @@ -483,13 +468,13 @@ d5c713abb08903b0dbe44e8ec40d28178f7b6af3 data/actuallyadditions/loot_tables/bloc 22d4a4f89b800c8c44cf034d42da8a18e3a8f22a data/actuallyadditions/loot_tables/blocks/bio_reactor_block.json 205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/black_chiseled_quartz_slab_block.json 205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/black_chiseled_quartz_stair_block.json -cdd287279790e4f50a56847f2255f88177d5ff44 data/actuallyadditions/loot_tables/blocks/black_chiseled_quartz_wall_block.json 205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/black_pillar_quartz_slab_block.json 205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/black_pillar_quartz_stair_block.json -ded949b5adea73073626565f7c81a00d61b39c1f data/actuallyadditions/loot_tables/blocks/black_pillar_quartz_wall_block.json a1b62291e361451916e45a97bb499ecb1b6eb595 data/actuallyadditions/loot_tables/blocks/black_quartz_block.json 362e5acf99d6fd818735884a28322a8e91c8ba4b data/actuallyadditions/loot_tables/blocks/black_quartz_chiseled_block.json +48eac04ab390a96688de5a22cb741b347a79a712 data/actuallyadditions/loot_tables/blocks/black_quartz_chiseled_wall_block.json 284190bea6fa9fefeeb5aa942830fbd8999a4446 data/actuallyadditions/loot_tables/blocks/black_quartz_pillar_block.json +7425767821419cbc76822f15d5ece7d6bf10dd3b data/actuallyadditions/loot_tables/blocks/black_quartz_pillar_wall_block.json 205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/black_quartz_slab_block.json 205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/black_quartz_stair_block.json 88b25da9974bf7c4e70133fea626e8e38e5f5b2e data/actuallyadditions/loot_tables/blocks/black_quartz_wall_block.json @@ -529,7 +514,6 @@ f8ba606eb9b5ea140c0deefc742cc155c31ec0e3 data/actuallyadditions/loot_tables/bloc 83adfb0a8ccb5f16e40efdda0eaf1ded6a7a8685 data/actuallyadditions/loot_tables/blocks/feeder_block.json cd12bb6fd2bac95b52f499abff26176d816e769c data/actuallyadditions/loot_tables/blocks/fermenting_barrel_block.json 12d2da80ca911887fdadaf7abbfc528707edbefc data/actuallyadditions/loot_tables/blocks/firework_box_block.json -59f5d71fe907d9a24d6dc494c3e4d9a5028b91ee data/actuallyadditions/loot_tables/blocks/fishing_net_block.json 1a615dd9c8e7c7e02d93a81f78a6beb6e4416d76 data/actuallyadditions/loot_tables/blocks/fluid_collector_block.json 0c8d2932da0aa5f98bbc6866f9fce9f9fab1d0ca data/actuallyadditions/loot_tables/blocks/fluid_placer_block.json c7f9b70323a62adc32c0dfb510befdbd52308b84 data/actuallyadditions/loot_tables/blocks/fluids_laser_relay_block.json @@ -544,7 +528,6 @@ d4a0a25db99bf6e7cad5bb22cbaaa6396715d845 data/actuallyadditions/loot_tables/bloc 464799e55af9ab462d90de9747f6855ada8d49e6 data/actuallyadditions/loot_tables/blocks/iron_casing_snow_block.json 258c1b47250411a490856b24573f8305224d4674 data/actuallyadditions/loot_tables/blocks/item_interface_block.json cf55cc4a0cd4068930d9dba33bc90ff93ba9dbe7 data/actuallyadditions/loot_tables/blocks/item_laser_relay_block.json -7b6071d60030381bca4edf7521b62ff6a1d9de94 data/actuallyadditions/loot_tables/blocks/item_repairer_block.json 349b82741b9b3baecf9fca1ff472cf82364c8faa data/actuallyadditions/loot_tables/blocks/lamp_black_block.json 2d7cec08bc7860ca556d7592a4b88958282e3075 data/actuallyadditions/loot_tables/blocks/lamp_blue_block.json 680cf0457131cb18eed9c701362a2b62f80b6220 data/actuallyadditions/loot_tables/blocks/lamp_brown_block.json @@ -579,14 +562,11 @@ dd735b2eab966f00d7434f600e5e1d2962dbac88 data/actuallyadditions/loot_tables/bloc b08439c0add43d98f28d57ffbca09f738b791158 data/actuallyadditions/loot_tables/blocks/powered_furnace_block.json af7dc901bd5a58ee7f434e1da874f456fa18db81 data/actuallyadditions/loot_tables/blocks/ranged_collector_block.json 7a2c663f711b890668a6a5c120b47e254ccfcf35 data/actuallyadditions/loot_tables/blocks/shock_suppressor_block.json -c702c334fa2b4f9b1792c3705270a97cc88f45f5 data/actuallyadditions/loot_tables/blocks/smiley_cloud_block.json -b6481a83ef7dfc51a48b259ce5a70daf13ad135a data/actuallyadditions/loot_tables/blocks/solar_panel_block.json 66ef838b2229cbb1be9212d32abe64d64ce58e5e data/actuallyadditions/loot_tables/blocks/tiny_torch_block.json -167883807f8343417017260f3adb9124a5dd06d3 data/actuallyadditions/loot_tables/blocks/treasure_chest_block.json 75dfef891a53e3a69cb77123d097df207d3b312a data/actuallyadditions/loot_tables/blocks/white_block.json 205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/white_slab_block.json 205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/white_stairs_block.json 05edfaaa6f2af2eb141be1a879b9f793dcfff2b5 data/actuallyadditions/loot_tables/blocks/white_wall_block.json f50671e462968cd65feaba0bdb5bee54d14e4b24 data/actuallyadditions/loot_tables/blocks/wood_casing_block.json cb45575707d43736601e5dfa43ef83e413bc8f66 data/actuallyadditions/loot_tables/blocks/xp_solidifier_block.json -5239d485f4e09b7fcf806d00913183dbca09c2dd data/minecraft/tags/blocks/walls.json +47e2d9cd180c2160d834c9f60a9fe8a9a0053b92 data/minecraft/tags/blocks/walls.json diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/black_chiseled_quartz_wall_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_chiseled_wall_block.json similarity index 68% rename from src/generated/resources/assets/actuallyadditions/blockstates/black_chiseled_quartz_wall_block.json rename to src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_chiseled_wall_block.json index f1408fc76..d3699a332 100644 --- a/src/generated/resources/assets/actuallyadditions/blockstates/black_chiseled_quartz_wall_block.json +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_chiseled_wall_block.json @@ -5,7 +5,7 @@ "up": "true" }, "apply": { - "model": "actuallyadditions:block/black_chiseled_quartz_wall_block_post" + "model": "actuallyadditions:block/black_quartz_chiseled_wall_block_post" } }, { @@ -13,7 +13,7 @@ "east": "low" }, "apply": { - "model": "actuallyadditions:block/black_chiseled_quartz_wall_block_side", + "model": "actuallyadditions:block/black_quartz_chiseled_wall_block_side", "y": 90, "uvlock": true } @@ -23,7 +23,7 @@ "east": "tall" }, "apply": { - "model": "actuallyadditions:block/black_chiseled_quartz_wall_block_side_tall", + "model": "actuallyadditions:block/black_quartz_chiseled_wall_block_side_tall", "y": 90, "uvlock": true } @@ -33,7 +33,7 @@ "north": "low" }, "apply": { - "model": "actuallyadditions:block/black_chiseled_quartz_wall_block_side", + "model": "actuallyadditions:block/black_quartz_chiseled_wall_block_side", "uvlock": true } }, @@ -42,7 +42,7 @@ "north": "tall" }, "apply": { - "model": "actuallyadditions:block/black_chiseled_quartz_wall_block_side_tall", + "model": "actuallyadditions:block/black_quartz_chiseled_wall_block_side_tall", "uvlock": true } }, @@ -51,7 +51,7 @@ "south": "low" }, "apply": { - "model": "actuallyadditions:block/black_chiseled_quartz_wall_block_side", + "model": "actuallyadditions:block/black_quartz_chiseled_wall_block_side", "y": 180, "uvlock": true } @@ -61,7 +61,7 @@ "south": "tall" }, "apply": { - "model": "actuallyadditions:block/black_chiseled_quartz_wall_block_side_tall", + "model": "actuallyadditions:block/black_quartz_chiseled_wall_block_side_tall", "y": 180, "uvlock": true } @@ -71,7 +71,7 @@ "west": "low" }, "apply": { - "model": "actuallyadditions:block/black_chiseled_quartz_wall_block_side", + "model": "actuallyadditions:block/black_quartz_chiseled_wall_block_side", "y": 270, "uvlock": true } @@ -81,7 +81,7 @@ "west": "tall" }, "apply": { - "model": "actuallyadditions:block/black_chiseled_quartz_wall_block_side_tall", + "model": "actuallyadditions:block/black_quartz_chiseled_wall_block_side_tall", "y": 270, "uvlock": true } diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/black_pillar_quartz_wall_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar_wall_block.json similarity index 68% rename from src/generated/resources/assets/actuallyadditions/blockstates/black_pillar_quartz_wall_block.json rename to src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar_wall_block.json index eaa6f9b3d..cd5405feb 100644 --- a/src/generated/resources/assets/actuallyadditions/blockstates/black_pillar_quartz_wall_block.json +++ b/src/generated/resources/assets/actuallyadditions/blockstates/black_quartz_pillar_wall_block.json @@ -5,7 +5,7 @@ "up": "true" }, "apply": { - "model": "actuallyadditions:block/black_pillar_quartz_wall_block_post" + "model": "actuallyadditions:block/black_quartz_pillar_wall_block_post" } }, { @@ -13,7 +13,7 @@ "east": "low" }, "apply": { - "model": "actuallyadditions:block/black_pillar_quartz_wall_block_side", + "model": "actuallyadditions:block/black_quartz_pillar_wall_block_side", "y": 90, "uvlock": true } @@ -23,7 +23,7 @@ "east": "tall" }, "apply": { - "model": "actuallyadditions:block/black_pillar_quartz_wall_block_side_tall", + "model": "actuallyadditions:block/black_quartz_pillar_wall_block_side_tall", "y": 90, "uvlock": true } @@ -33,7 +33,7 @@ "north": "low" }, "apply": { - "model": "actuallyadditions:block/black_pillar_quartz_wall_block_side", + "model": "actuallyadditions:block/black_quartz_pillar_wall_block_side", "uvlock": true } }, @@ -42,7 +42,7 @@ "north": "tall" }, "apply": { - "model": "actuallyadditions:block/black_pillar_quartz_wall_block_side_tall", + "model": "actuallyadditions:block/black_quartz_pillar_wall_block_side_tall", "uvlock": true } }, @@ -51,7 +51,7 @@ "south": "low" }, "apply": { - "model": "actuallyadditions:block/black_pillar_quartz_wall_block_side", + "model": "actuallyadditions:block/black_quartz_pillar_wall_block_side", "y": 180, "uvlock": true } @@ -61,7 +61,7 @@ "south": "tall" }, "apply": { - "model": "actuallyadditions:block/black_pillar_quartz_wall_block_side_tall", + "model": "actuallyadditions:block/black_quartz_pillar_wall_block_side_tall", "y": 180, "uvlock": true } @@ -71,7 +71,7 @@ "west": "low" }, "apply": { - "model": "actuallyadditions:block/black_pillar_quartz_wall_block_side", + "model": "actuallyadditions:block/black_quartz_pillar_wall_block_side", "y": 270, "uvlock": true } @@ -81,7 +81,7 @@ "west": "tall" }, "apply": { - "model": "actuallyadditions:block/black_pillar_quartz_wall_block_side_tall", + "model": "actuallyadditions:block/black_quartz_pillar_wall_block_side_tall", "y": 270, "uvlock": true } diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/fishing_net_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/fishing_net_block.json deleted file mode 100644 index 4bbcc6bd3..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/fishing_net_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/fishing_net_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/item_repairer_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/item_repairer_block.json deleted file mode 100644 index fb5e6f828..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/item_repairer_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/item_repairer_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/smiley_cloud_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/smiley_cloud_block.json deleted file mode 100644 index 645b05c92..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/smiley_cloud_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/smiley_cloud_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/solar_panel_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/solar_panel_block.json deleted file mode 100644 index bfddf4aa0..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/solar_panel_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/solar_panel_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/treasure_chest_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/treasure_chest_block.json deleted file mode 100644 index ab4de332f..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/treasure_chest_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/treasure_chest_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/lang/en_us.json b/src/generated/resources/assets/actuallyadditions/lang/en_us.json index 18cf22d6a..82df95f5c 100644 --- a/src/generated/resources/assets/actuallyadditions/lang/en_us.json +++ b/src/generated/resources/assets/actuallyadditions/lang/en_us.json @@ -8,13 +8,13 @@ "block.actuallyadditions.bio_reactor_block": "Bio Reactor", "block.actuallyadditions.black_chiseled_quartz_slab_block": "Chiseled Black Quartz Slab", "block.actuallyadditions.black_chiseled_quartz_stair_block": "Chiseled Black Quartz Stairs", - "block.actuallyadditions.black_chiseled_quartz_wall_block": "Chiseled Black Quartz Wall", "block.actuallyadditions.black_pillar_quartz_slab_block": "Black Quartz Pillar Slab", "block.actuallyadditions.black_pillar_quartz_stair_block": "Black Quartz Pillar Stairs", - "block.actuallyadditions.black_pillar_quartz_wall_block": "Black Quartz Wall Pillar", "block.actuallyadditions.black_quartz_block": "Block of Black Quartz", "block.actuallyadditions.black_quartz_chiseled_block": "Chiseled Black Quartz", + "block.actuallyadditions.black_quartz_chiseled_wall_block": "Chiseled Black Quartz Wall", "block.actuallyadditions.black_quartz_pillar_block": "Black Quartz Pillar", + "block.actuallyadditions.black_quartz_pillar_wall_block": "Black Quartz Wall Pillar", "block.actuallyadditions.black_quartz_slab_block": "Black Quartz Slab", "block.actuallyadditions.black_quartz_stair_block": "Black Quartz Stairs", "block.actuallyadditions.black_quartz_wall_block": "Black Quartz Wall", @@ -62,7 +62,6 @@ "block.actuallyadditions.feeder_block": "Feeder", "block.actuallyadditions.fermenting_barrel_block": "Fermenting Barrel", "block.actuallyadditions.firework_box_block": "Firework Box", - "block.actuallyadditions.fishing_net_block": "Fishing Net", "block.actuallyadditions.flax_block": "Flax", "block.actuallyadditions.fluid_collector_block": "Fluid Collector", "block.actuallyadditions.fluid_placer_block": "Fluid Placer", @@ -78,7 +77,6 @@ "block.actuallyadditions.iron_casing_snow_block": "?", "block.actuallyadditions.item_interface_block": "Item Interface", "block.actuallyadditions.item_laser_relay_block": "Item Laser Relay", - "block.actuallyadditions.item_repairer_block": "Item Repairer", "block.actuallyadditions.lamp_black_block": "Black Lamp", "block.actuallyadditions.lamp_blue_block": "Blue Lamp", "block.actuallyadditions.lamp_brown_block": "Brown Lamp", @@ -115,10 +113,7 @@ "block.actuallyadditions.ranged_collector_block": "Ranged Collector", "block.actuallyadditions.rice_block": "Rice", "block.actuallyadditions.shock_suppressor_block": "Shock", - "block.actuallyadditions.smiley_cloud_block": "Smiley Cloud", - "block.actuallyadditions.solar_panel_block": "Solar Panel", "block.actuallyadditions.tiny_torch_block": "Tiny Torch", - "block.actuallyadditions.treasure_chest_block": "Treasure Chest", "block.actuallyadditions.white_block": "Ethentic Quartz Wall", "block.actuallyadditions.white_slab_block": "Ethentic Quartz Slab", "block.actuallyadditions.white_stairs_block": "Ethentic Quartz Stairs", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_chiseled_quartz_wall_block_post.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_chiseled_wall_block_post.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/black_chiseled_quartz_wall_block_post.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_quartz_chiseled_wall_block_post.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_chiseled_quartz_wall_block_side.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_chiseled_wall_block_side.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/black_chiseled_quartz_wall_block_side.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_quartz_chiseled_wall_block_side.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_chiseled_quartz_wall_block_side_tall.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_chiseled_wall_block_side_tall.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/black_chiseled_quartz_wall_block_side_tall.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_quartz_chiseled_wall_block_side_tall.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_pillar_quartz_wall_block_post.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_block_post.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/black_pillar_quartz_wall_block_post.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_block_post.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_pillar_quartz_wall_block_side.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_block_side.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/black_pillar_quartz_wall_block_side.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_block_side.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_pillar_quartz_wall_block_side_tall.json b/src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_block_side_tall.json similarity index 100% rename from src/generated/resources/assets/actuallyadditions/models/block/black_pillar_quartz_wall_block_side_tall.json rename to src/generated/resources/assets/actuallyadditions/models/block/black_quartz_pillar_wall_block_side_tall.json diff --git a/src/generated/resources/assets/actuallyadditions/models/block/fishing_net_block.json b/src/generated/resources/assets/actuallyadditions/models/block/fishing_net_block.json deleted file mode 100644 index 1d1851e86..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/block/fishing_net_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/fishing_net_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/item_repairer_block.json b/src/generated/resources/assets/actuallyadditions/models/block/item_repairer_block.json deleted file mode 100644 index 7aff24f6c..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/block/item_repairer_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/item_repairer_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/smiley_cloud_block.json b/src/generated/resources/assets/actuallyadditions/models/block/smiley_cloud_block.json deleted file mode 100644 index e7e3fdb2d..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/block/smiley_cloud_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/smiley_cloud_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/solar_panel_block.json b/src/generated/resources/assets/actuallyadditions/models/block/solar_panel_block.json deleted file mode 100644 index 800a02405..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/block/solar_panel_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/solar_panel_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/treasure_chest_block.json b/src/generated/resources/assets/actuallyadditions/models/block/treasure_chest_block.json deleted file mode 100644 index 3e649e5ae..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/block/treasure_chest_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/treasure_chest_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_chiseled_quartz_wall_block.json b/src/generated/resources/assets/actuallyadditions/models/item/black_chiseled_quartz_wall_block.json deleted file mode 100644 index 33e9e9ca2..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/black_chiseled_quartz_wall_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/black_chiseled_quartz_wall_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_pillar_quartz_wall_block.json b/src/generated/resources/assets/actuallyadditions/models/item/black_pillar_quartz_wall_block.json deleted file mode 100644 index d06f3e320..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/black_pillar_quartz_wall_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/black_pillar_quartz_wall_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_chiseled_wall_block.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_chiseled_wall_block.json new file mode 100644 index 000000000..fb2ce310f --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_chiseled_wall_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "actuallyadditions:block/black_quartz_chiseled_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_wall_block.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_wall_block.json new file mode 100644 index 000000000..dc8ae07d0 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_wall_block.json @@ -0,0 +1,6 @@ +{ + "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_block.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_wall_block.json index e9ee6a083..4a49b222b 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_wall_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_wall_block.json @@ -1,3 +1,6 @@ { - "parent": "actuallyadditions:block/black_quartz_wall_block" + "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/fishing_net_block.json b/src/generated/resources/assets/actuallyadditions/models/item/fishing_net_block.json deleted file mode 100644 index 6cb630fd4..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/fishing_net_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/fishing_net_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/green_wall_block.json b/src/generated/resources/assets/actuallyadditions/models/item/green_wall_block.json index a0bf232d8..b8c5101eb 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/green_wall_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/green_wall_block.json @@ -1,3 +1,6 @@ { - "parent": "actuallyadditions:block/green_wall_block" + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "actuallyadditions:block/green_block" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/item_repairer_block.json b/src/generated/resources/assets/actuallyadditions/models/item/item_repairer_block.json deleted file mode 100644 index 7702c5dbb..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/item_repairer_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/item_repairer_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/smiley_cloud_block.json b/src/generated/resources/assets/actuallyadditions/models/item/smiley_cloud_block.json deleted file mode 100644 index c0e0ce04a..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/smiley_cloud_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/smiley_cloud_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/solar_panel_block.json b/src/generated/resources/assets/actuallyadditions/models/item/solar_panel_block.json deleted file mode 100644 index c5f0cdba2..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/solar_panel_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/solar_panel_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/treasure_chest_block.json b/src/generated/resources/assets/actuallyadditions/models/item/treasure_chest_block.json deleted file mode 100644 index e21dcc32e..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/treasure_chest_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/treasure_chest_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/white_wall_block.json b/src/generated/resources/assets/actuallyadditions/models/item/white_wall_block.json index 30a1c88a9..dd05a5bc1 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/white_wall_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/white_wall_block.json @@ -1,3 +1,6 @@ { - "parent": "actuallyadditions:block/white_wall_block" + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "actuallyadditions:block/white_block" + } } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_chiseled_quartz_wall_block.json b/src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_chiseled_wall_block.json similarity index 81% rename from src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_chiseled_quartz_wall_block.json rename to src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_chiseled_wall_block.json index e7dbe3266..5dafc4cbd 100644 --- a/src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_chiseled_quartz_wall_block.json +++ b/src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_chiseled_wall_block.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "actuallyadditions:black_chiseled_quartz_wall_block" + "name": "actuallyadditions:black_quartz_chiseled_wall_block" } ], "conditions": [ diff --git a/src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_pillar_quartz_wall_block.json b/src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_pillar_wall_block.json similarity index 80% rename from src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_pillar_quartz_wall_block.json rename to src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_pillar_wall_block.json index 1f7b41219..d5f59d3c1 100644 --- a/src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_pillar_quartz_wall_block.json +++ b/src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_pillar_wall_block.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "actuallyadditions:black_pillar_quartz_wall_block" + "name": "actuallyadditions:black_quartz_pillar_wall_block" } ], "conditions": [ diff --git a/src/generated/resources/data/actuallyadditions/loot_tables/blocks/fishing_net_block.json b/src/generated/resources/data/actuallyadditions/loot_tables/blocks/fishing_net_block.json deleted file mode 100644 index ae105d693..000000000 --- a/src/generated/resources/data/actuallyadditions/loot_tables/blocks/fishing_net_block.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "actuallyadditions:fishing_net_block" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/loot_tables/blocks/item_repairer_block.json b/src/generated/resources/data/actuallyadditions/loot_tables/blocks/item_repairer_block.json deleted file mode 100644 index b3b636e40..000000000 --- a/src/generated/resources/data/actuallyadditions/loot_tables/blocks/item_repairer_block.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "actuallyadditions:item_repairer_block" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/loot_tables/blocks/smiley_cloud_block.json b/src/generated/resources/data/actuallyadditions/loot_tables/blocks/smiley_cloud_block.json deleted file mode 100644 index a44b0cdf0..000000000 --- a/src/generated/resources/data/actuallyadditions/loot_tables/blocks/smiley_cloud_block.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "actuallyadditions:smiley_cloud_block" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/loot_tables/blocks/solar_panel_block.json b/src/generated/resources/data/actuallyadditions/loot_tables/blocks/solar_panel_block.json deleted file mode 100644 index 56791a840..000000000 --- a/src/generated/resources/data/actuallyadditions/loot_tables/blocks/solar_panel_block.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "actuallyadditions:solar_panel_block" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/loot_tables/blocks/treasure_chest_block.json b/src/generated/resources/data/actuallyadditions/loot_tables/blocks/treasure_chest_block.json deleted file mode 100644 index 6ebb2df59..000000000 --- a/src/generated/resources/data/actuallyadditions/loot_tables/blocks/treasure_chest_block.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "actuallyadditions:treasure_chest_block" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/walls.json b/src/generated/resources/data/minecraft/tags/blocks/walls.json index 998e68aad..04896755f 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/walls.json +++ b/src/generated/resources/data/minecraft/tags/blocks/walls.json @@ -4,7 +4,7 @@ "actuallyadditions:white_wall_block", "actuallyadditions:green_wall_block", "actuallyadditions:black_quartz_wall_block", - "actuallyadditions:black_pillar_quartz_wall_block", - "actuallyadditions:black_chiseled_quartz_wall_block" + "actuallyadditions:black_quartz_pillar_wall_block", + "actuallyadditions:black_quartz_chiseled_wall_block" ] } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java index 7bf9316f6..c20b78dd5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java @@ -125,8 +125,8 @@ public class ActuallyBlocks { public static final RegistryObject BLACK_QUARTZ_PILLAR = BLOCKS.register("black_quartz_pillar_block", () -> new ActuallyBlock(Block.Properties.create(Material.ROCK))); public static final RegistryObject BLACK_QUARTZ_WALL = BLOCKS.register("black_quartz_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ.get()))); - public static final RegistryObject BLACK_CHISELED_QUARTZ_WALL = BLOCKS.register("black_chiseled_quartz_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ_CHISELED.get()))); - public static final RegistryObject BLACK_PILLAR_QUARTZ_WALL = BLOCKS.register("black_pillar_quartz_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ_PILLAR.get()))); + public static final RegistryObject BLACK_CHISELED_QUARTZ_WALL = BLOCKS.register("black_quartz_chiseled_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ_CHISELED.get()))); + public static final RegistryObject BLACK_PILLAR_QUARTZ_WALL = BLOCKS.register("black_quartz_pillar_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ_PILLAR.get()))); public static final RegistryObject BLACK_QUARTZ_STAIR = BLOCKS.register("black_quartz_stair_block", () -> new StairsBlock(() -> BLACK_QUARTZ.get().getDefaultState(), Block.Properties.create(Material.ROCK))); public static final RegistryObject BLACK_CHISELED_QUARTZ_STAIR = BLOCKS.register("black_chiseled_quartz_stair_block", () -> new StairsBlock(() -> BLACK_QUARTZ.get().getDefaultState(), Block.Properties.create(Material.ROCK))); public static final RegistryObject BLACK_PILLAR_QUARTZ_STAIR = BLOCKS.register("black_pillar_quartz_stair_block", () -> new StairsBlock(() -> BLACK_QUARTZ.get().getDefaultState(), Block.Properties.create(Material.ROCK))); diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java index f36eda780..3306fcb5b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java @@ -53,6 +53,9 @@ public final class ActuallyItems { public static final RegistryObject EMERADIC_CRYSTAL = ITEMS.register("emeradic_crystal", basicItem()); public static final RegistryObject ENORI_CRYSTAL = ITEMS.register("enori_crystal", basicItem()); + // Shards + + public static final RegistryObject BOOKLET = ITEMS.register("booklet", ManualItem::new); public static final Set> SIMPLE_ITEMS = ImmutableSet.of( diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorItemModels.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorItemModels.java index 7f5f05fe0..6c23479b5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorItemModels.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorItemModels.java @@ -5,8 +5,10 @@ import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlocks; import de.ellpeck.actuallyadditions.common.items.ActuallyItems; import de.ellpeck.actuallyadditions.common.items.ToolSet; 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; @@ -22,22 +24,31 @@ public class GeneratorItemModels extends ItemModelProvider { @Override protected void registerModels() { + // Items simpleItem(ActuallyItems.BOOKLET); // will require complex I think ActuallyItems.SIMPLE_ITEMS.forEach(this::simpleItem); - // Toolsets ActuallyItems.ALL_TOOL_SETS.stream() .map(ToolSet::getItemGroup) .flatMap(Collection::stream) .forEach(item -> simpleItem(() -> item)); + + // Blocks ActuallyBlocks.BLOCKS.getEntries().forEach(this::registerBlockModel); } private void registerBlockModel(RegistryObject block) { String path = block.get().getRegistryName().getPath(); + if (block.get() instanceof WallBlock) { + String name = path; + path = "block/" + path.replace("wall_", ""); + withExistingParent(name, new ResourceLocation("block/wall_inventory")) + .texture("wall", modLoc(path)); + return; + } getBuilder(path).parent(new ModelFile.UncheckedModelFile(modLoc("block/" + path))); }