diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index da6a5219c..eb018b6c6 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -96,30 +96,159 @@ d89ce6c2187bf08f01097ce02c32aeacfb467bbf assets/actuallyadditions/blockstates/re 244e220702a65c286381d576de62772c2d509cc5 assets/actuallyadditions/blockstates/xp_solidifier.json e3b1972935fa68ca5feaad8f7412530df5d6b8a2 assets/actuallyadditions/models/block/canola.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 +b2cb85be4c4939aa3e47627ba8e6edff602279a4 assets/actuallyadditions/models/block/empowered_diamatine_crystal_block.json +c0057069962a7fc59ecd0f37160e55ede2f581e4 assets/actuallyadditions/models/block/empowered_emeradic_crystal_block.json +65f9f23ef65a4f8073403d60bb7abed54b9281e5 assets/actuallyadditions/models/block/empowered_enori_crystal_block.json +424ec3122f411090a616e014caa36bcbac4f6cd3 assets/actuallyadditions/models/block/empowered_palis_crystal_block.json +8d49c44b137a3d59a4128acfdffaf78553148a72 assets/actuallyadditions/models/block/empowered_restonia_crystal_block.json +a45f3846f8637a6b66d613d5a185a792e25ac77d assets/actuallyadditions/models/block/empowered_void_crystal_block.json 915095a6b35cf3bc2cf8b501c06e3fb8847cbeae assets/actuallyadditions/models/block/ender_casing.json 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 3f5f9a6ad3d87756e54af6a2bc0c8a44038343dc assets/actuallyadditions/models/block/ethetic_white_block.json ae0b77900f38b8af43b992b839d7460478a99dc4 assets/actuallyadditions/models/block/flax.json b23b86dd6bf3d1e9790ce97bb309765d738bc8fe assets/actuallyadditions/models/block/iron_casing.json -9a4167f5cb4f9def9ae4f4ad9791e2773dd616d3 assets/actuallyadditions/models/block/lamp_black.json -e2850c26892021a6081d879987d6bd0290ca2be8 assets/actuallyadditions/models/block/lamp_blue.json -5bd10f41ffc6cf2f1efcef92dff373331dd54119 assets/actuallyadditions/models/block/lamp_brown.json -14ed1b8fecf46f624e6858231f5ff7e036aa06e3 assets/actuallyadditions/models/block/lamp_cyan.json -a77bf1d1fd7ccd28f949088cc5160edf4cf92f5d assets/actuallyadditions/models/block/lamp_gray.json -58df152c63c1e668aa78b432eaf049d1df7b7cd6 assets/actuallyadditions/models/block/lamp_green.json -1311cd7285cea40bf064a56233969a10d01010d4 assets/actuallyadditions/models/block/lamp_light_blue.json -0afd1ddbcdd8930a71e081f6cb127ccde6cc5213 assets/actuallyadditions/models/block/lamp_light_gray.json -b2662538ba004d135b2004c002e54505fcbcaa54 assets/actuallyadditions/models/block/lamp_lime.json -520214cdb180cde6efe972dc47fda278235d26ff assets/actuallyadditions/models/block/lamp_magenta.json -82ff5d39b894ec234820e0ebdd53b68189f5abfc assets/actuallyadditions/models/block/lamp_orange.json -df751483270af0f3113ab0afa89c54ba842acd39 assets/actuallyadditions/models/block/lamp_pink.json -06af88b6b663fe2225535e5381bf882c97efce88 assets/actuallyadditions/models/block/lamp_purple.json -efe29e2ef5b349859508e4b4d2de1ce71c0f121d assets/actuallyadditions/models/block/lamp_red.json -130c3474ae76340a8073100cfe20788f5ba61e9f assets/actuallyadditions/models/block/lamp_white.json -894c22e147a999b330fe4ae3b4e97ce7237e6d98 assets/actuallyadditions/models/block/lamp_yellow.json +fec26190d66a1a3e309e195cfcbd8e84c5d2683a assets/actuallyadditions/models/block/lamp_black.json +2995f2108fc28eae5b33e290fd459f3cd08cecbd assets/actuallyadditions/models/block/lamp_blue.json +ddd8aa305a7de0de6192ff32c8de440f19e316e2 assets/actuallyadditions/models/block/lamp_brown.json +5522f3e7871f166ae6f5e03f41f16f16406a71bc assets/actuallyadditions/models/block/lamp_cyan.json +61a4d0868bce376de6453b459b949713cba74f43 assets/actuallyadditions/models/block/lamp_gray.json +4672736a5b8c3f175871709cd4ebbc2cb7b36e07 assets/actuallyadditions/models/block/lamp_green.json +c6c4a7a7c6340b4ff111afa252c384452546bd29 assets/actuallyadditions/models/block/lamp_light_blue.json +61418a47c621abc6774551726dab6d6831225b9c assets/actuallyadditions/models/block/lamp_light_gray.json +5862857def7fd10280e779338bf110b5cb7f8ce8 assets/actuallyadditions/models/block/lamp_lime.json +303be3869df06dda7efc6ceb790de0fc8944e5a7 assets/actuallyadditions/models/block/lamp_magenta.json +00efef589de3fc9ba2034f01488ad732cec074d4 assets/actuallyadditions/models/block/lamp_orange.json +edd10c0408589b5f350193471324e7b0fafd2a93 assets/actuallyadditions/models/block/lamp_pink.json +e48e76012740860d213f33ecffc49317f18a42e1 assets/actuallyadditions/models/block/lamp_purple.json +32693eb441f9bc1fcb5c5c285502eaccc8b00e3a assets/actuallyadditions/models/block/lamp_red.json +0fa207b710d9ebcff7a0fa565ecea4cead6f745c assets/actuallyadditions/models/block/lamp_white.json +0dd86fd376a934beb8a6499dd7d2181111259980 assets/actuallyadditions/models/block/lamp_yellow.json +fa0040bf5801821cde761a2b959235756aa004e9 assets/actuallyadditions/models/block/palis_crystal_block.json +0d22ae782351d009d7329ba954e54921a207a64b assets/actuallyadditions/models/block/restonia_crystal_block.json bf348e13cbaf0532bc254c9efa92350ae8b0023c assets/actuallyadditions/models/block/rice.json +292e546009c16dc7d5e38b4faa8ce84baaaa2242 assets/actuallyadditions/models/block/void_crystal_block.json 83da16f21abc2ec8361ecc3b1bda2852d48dbd97 assets/actuallyadditions/models/block/wood_casing.json +c2e3b2291b34f85eab9907c9266c6198d8478001 assets/actuallyadditions/models/item/atomic_reconstructor.json +50f7c08aa8725f8c33c54290d58b65cb293f9529 assets/actuallyadditions/models/item/battery_box.json +44c0a208ef528d296e7532a834d6563d7cd90922 assets/actuallyadditions/models/item/bio_reactor.json +37d49b21bf16128d58a5d63d742508891a114ece assets/actuallyadditions/models/item/black_quartz_block.json +50075e8e8b428b161113d45d583f6eae5e8360f3 assets/actuallyadditions/models/item/black_quartz_pillar_block.json +5614453539110f6214c52d47c12aa1ce05447d53 assets/actuallyadditions/models/item/black_quartz_pillar_slab.json +3bd2d755493ff85b07dff3cb31d0cc040e6150c5 assets/actuallyadditions/models/item/black_quartz_pillar_stair.json +af5c7ad8debbfecef494103c8655e5edf7e40bf9 assets/actuallyadditions/models/item/black_quartz_pillar_wall.json +dfb8604b25fc7a671c371a81e3384410c69cc7b1 assets/actuallyadditions/models/item/black_quartz_slab.json +ea2f5b2bf99670f4df05889ab67c73686a26a58b assets/actuallyadditions/models/item/black_quartz_stair.json +51bf433ed582a704fd504132a59f02fc08e780e9 assets/actuallyadditions/models/item/black_quartz_wall.json +3679056a9aee03821a997a2616b8808af7bfe4b7 assets/actuallyadditions/models/item/breaker.json +f3282e55e71d26a32cee1287881ac2d5e91c30a8 assets/actuallyadditions/models/item/canola.json +08c70d561c219bb4c6d21b5f56192df81f054e0a assets/actuallyadditions/models/item/canola_press.json +b0f7c3915b646ccd27ca6ff40517e19e2a0fb7ef assets/actuallyadditions/models/item/canolaoil.json +36179c5cc77dc38364a1931f2fabbf846ef9c39d assets/actuallyadditions/models/item/chiseled_black_quartz_block.json +27c8ed9e39b600161a6a327db0ac53e10acc13bb assets/actuallyadditions/models/item/chiseled_black_quartz_slab.json +0b574626d1648584c3afa6ee0ccc974fb68bb425 assets/actuallyadditions/models/item/chiseled_black_quartz_stair.json +59e1e2bddb67512960f5011fa4926d0dcd32b58c assets/actuallyadditions/models/item/chiseled_black_quartz_wall.json +bbf723238f6536295339f0b0b5b052cf89b92d5b assets/actuallyadditions/models/item/coal_generator.json +73511866d0c115d75f18e160ba5a09e714bd4769 assets/actuallyadditions/models/item/coffee.json +082ecd5232059fadaa447a99a623437e3adab3ef assets/actuallyadditions/models/item/coffee_machine.json +1e7e61701473dbf3dfc18bb5b9fa7be91b443dd8 assets/actuallyadditions/models/item/crusher.json +aeacd7ca465c19d6cbcef25e61023397c4472ab3 assets/actuallyadditions/models/item/crusher_double.json +da3b2fa50416d61d8b3683ee74f9572b36f4fea3 assets/actuallyadditions/models/item/crystaloil.json +491736b20e628a539c9bb2472d499c03cdbc3760 assets/actuallyadditions/models/item/diamatine_crystal_block.json +297827c231b1ef558dc89085993b270014730c51 assets/actuallyadditions/models/item/diamatine_crystal_cluster.json +57d05111bf8aa9c36234a4dbaecaa9fe86126331 assets/actuallyadditions/models/item/display_stand.json +ef9ec5b31db12805460edb62f611c67973ac18ba assets/actuallyadditions/models/item/dropper.json +083818321ae732cb35a63b5cc78c99df16d649f4 assets/actuallyadditions/models/item/emeradic_crystal_block.json +282f140a42261eaabd2096e3562d7919faf331a0 assets/actuallyadditions/models/item/emeradic_crystal_cluster.json +d7948c3ad4bf22f0efa6e669de7a559c27b52aae assets/actuallyadditions/models/item/empowered_diamatine_crystal_block.json +cfabdb67ce0ccaaea437cfbbac68f0e0c8e7d890 assets/actuallyadditions/models/item/empowered_emeradic_crystal_block.json +42bfc556aa4e9f0861855b4eee58397b75bd85f8 assets/actuallyadditions/models/item/empowered_enori_crystal_block.json +d019c764e87de9f1856dc8d12b880d874e215fac assets/actuallyadditions/models/item/empowered_palis_crystal_block.json +f7c65e8d77b723f4fd5b7349c7f8ec23f2e6440b assets/actuallyadditions/models/item/empowered_restonia_crystal_block.json +c70272562c084ce2a04933ca04e270f9b3493cf4 assets/actuallyadditions/models/item/empowered_void_crystal_block.json +485a85b7176f60fce7286293767107c51649e488 assets/actuallyadditions/models/item/empoweredoil.json +88457aa73c273fb512b5c4103a1183e93dcec412 assets/actuallyadditions/models/item/empowerer.json +0d0fd6b7df3a378a58cd35168fb0e1c3d54c6b03 assets/actuallyadditions/models/item/ender_casing.json +5afcb323c7e19f36edfcb8cd33652a6f75aa7c49 assets/actuallyadditions/models/item/ender_pearl_block.json +9d011453796b6a4aa0ac86679fe27fad6b0e3337 assets/actuallyadditions/models/item/energizer.json +df3d37e900946dc1198f04c837de897089528847 assets/actuallyadditions/models/item/enervator.json +8111195e2a23422d407f962d588e9cda39f3a0ce assets/actuallyadditions/models/item/enori_crystal_block.json +c3af20ba50f5e6db6a5f13bc94c5b85646e938fa assets/actuallyadditions/models/item/enori_crystal_cluster.json +547a18a0434aa8526dce6ab2727bc05674480611 assets/actuallyadditions/models/item/ethetic_green_block.json +29c5b35219bfb4bb1276297b0c92d235a39c9d2b assets/actuallyadditions/models/item/ethetic_green_slab.json +661f1b449d78ea517012204f1c2a47bd0f892fca assets/actuallyadditions/models/item/ethetic_green_stairs.json +7ece175db08374aa44ba1c7a0ed6ff45fa942856 assets/actuallyadditions/models/item/ethetic_green_wall.json +95e377e9e9d0b78ef9e122f9f9d3aa80334014b0 assets/actuallyadditions/models/item/ethetic_white_block.json +506ffae6797b6088f902adbc787e2b4c80468b3c assets/actuallyadditions/models/item/ethetic_white_slab.json +894f042b3426007d2c87e4ccc9002dc2bac48801 assets/actuallyadditions/models/item/ethetic_white_stairs.json +67dd4dc1ce36811dfa9857a3f887c0964aa6a90a assets/actuallyadditions/models/item/ethetic_white_wall.json +8bcb533ef0b7c42b3218e2cf52c752fef283c267 assets/actuallyadditions/models/item/farmer.json +d4338f09f71dd9bc75babcb7cebba80ab57eee01 assets/actuallyadditions/models/item/feeder.json +bb4fc4a881ec4b949fb657b112826731988cdaf8 assets/actuallyadditions/models/item/fermenting_barrel.json +bc83a5a96df045a0c005637ec1cb8f0e66de69a5 assets/actuallyadditions/models/item/firework_box.json +b84a9d002727c49cbf74b81108e4dd4098e39ade assets/actuallyadditions/models/item/flax.json +1e296d34f5c206b7a741df29a7e1f3718f583267 assets/actuallyadditions/models/item/fluid_collector.json +9197cf2c197f5116a5fc98fd58b5766677ef76e8 assets/actuallyadditions/models/item/fluid_placer.json +cb44cc7dc93b234b6173bdf4d5152eb639c945b0 assets/actuallyadditions/models/item/greenhouse_glass.json +340d0e0eca2fe4be4577a40ba9f530186828cd4b assets/actuallyadditions/models/item/heat_collector.json +a4bc0e00bec22d8a0da612b6dfe4dba7688a2758 assets/actuallyadditions/models/item/iron_casing.json +32974ab97db39decad106e89e5c051d79e87624c assets/actuallyadditions/models/item/item_viewer.json +f18d781df4b1659ee8e38313db97360e5bbfe813 assets/actuallyadditions/models/item/item_viewer_hopping.json +1e3d4970b8a5ed46ed72deedc5c38d8347658d2f assets/actuallyadditions/models/item/lamp_black.json +8b730988dfb2cb6caa448647d245f9a4160c4247 assets/actuallyadditions/models/item/lamp_blue.json +42df4aeb9a27d43da2c3a47cafd4f3fac1f3c0fa assets/actuallyadditions/models/item/lamp_brown.json +a7ab5171e74fdeafa04ed27b300248bb9c2c35e5 assets/actuallyadditions/models/item/lamp_cyan.json +c9e9aec4973eeeb08f7ed65a808f96ab48aed81c assets/actuallyadditions/models/item/lamp_gray.json +8819c0d6b76c7fdb1c6bf167e009b7b544a834ae assets/actuallyadditions/models/item/lamp_green.json +22460d93e1496b99576e46b24141ffae3afaeddb assets/actuallyadditions/models/item/lamp_light_blue.json +f8e9e058860f6b1f99d0859e70cf0e8a04fa9463 assets/actuallyadditions/models/item/lamp_light_gray.json +67fb621bd2e40e3fe9a7678b2ce02783037ac3b0 assets/actuallyadditions/models/item/lamp_lime.json +c88ca523161a3447a1c9a4feb38fe0b24a5b94e1 assets/actuallyadditions/models/item/lamp_magenta.json +c8f8905f57f473ec0ad34e87ad14e78638564710 assets/actuallyadditions/models/item/lamp_orange.json +20818b50f1749e51548754059ec13fe8579691b4 assets/actuallyadditions/models/item/lamp_pink.json +816e301ba6a4490b216da2697b280f8a39edd61f assets/actuallyadditions/models/item/lamp_powerer.json +a346185f550e8a0bc36382d3a8c11737747f65c1 assets/actuallyadditions/models/item/lamp_purple.json +0da789e3cbe0cf917c931e93d8269fd1c0848c2a assets/actuallyadditions/models/item/lamp_red.json +13645100bd0fa18851918dd20bbf3b015b2155d0 assets/actuallyadditions/models/item/lamp_white.json +21c68ce4e823db63ec79c32fe0f0e2b50910907c assets/actuallyadditions/models/item/lamp_yellow.json +4d228100e72f5cf16c03eb50ebace24230e2021c assets/actuallyadditions/models/item/laser_relay.json +fe3c77543d11ac86cf7f25f46140ec1a86421145 assets/actuallyadditions/models/item/laser_relay_advanced.json +1ebb9b5e9fe9f82ec4deafc4829ae1dba66cdbfb assets/actuallyadditions/models/item/laser_relay_extreme.json +96b5e768b5d813ba6d278322301b64002ec8c296 assets/actuallyadditions/models/item/laser_relay_fluids.json +32268082e079a09d791ef953bae0288119a94bb8 assets/actuallyadditions/models/item/laser_relay_item.json +e9236fdb3ac03dceaa8697b26a6762ed983265da assets/actuallyadditions/models/item/laser_relay_item_advanced.json +f3866a691bfbeccf2f0ce2c77e07eae3b5e4d8c5 assets/actuallyadditions/models/item/lava_factory_casing.json +2220fec34569b35a5c3ff06bde4edbb87b673b96 assets/actuallyadditions/models/item/lava_factory_controller.json +c7fdd35353e69e5df8437757520e96083682470a assets/actuallyadditions/models/item/leaf_generator.json +55ce74cb71c0db54712382cd61f2c27214201c94 assets/actuallyadditions/models/item/long_range_breaker.json +cec09548b75f7f3e2079e75e1aaf5253e2f318ba assets/actuallyadditions/models/item/oil_generator.json +cd1128cdfd0de67aed5e2f18fbc04252300758d1 assets/actuallyadditions/models/item/palis_crystal_block.json +d504e45345c3edde0c3ce18df5c49bbf8638c91d assets/actuallyadditions/models/item/palis_crystal_cluster.json +a0e9339d3e9cdd9dcb28e5053f4017c6f13ee22d assets/actuallyadditions/models/item/phantom_booster.json +b5470f03099362062e21d0d9dcb045da8d7b29d4 assets/actuallyadditions/models/item/phantom_breaker.json +545dbd33d3afa630cf5f5a8aefaa43bf16372529 assets/actuallyadditions/models/item/phantom_energyface.json +8f1697d57a2cdd6144d7bc5f10ac9636ab325d61 assets/actuallyadditions/models/item/phantom_itemface.json +77f8324fd0fc9192a894cbb129b41968571869fb assets/actuallyadditions/models/item/phantom_liquiface.json +d9739be2a8b1709805d1076ff524933b054482d4 assets/actuallyadditions/models/item/phantom_placer.json +ead41eb85786ee32e480cd9e63b5f261150782ec assets/actuallyadditions/models/item/phantom_redstoneface.json +9851fbdbd1e175f5ddbc85b07d3a9f6a2540ea51 assets/actuallyadditions/models/item/placer.json +983248f2dae457870e042a9a220434a1572fe78f assets/actuallyadditions/models/item/player_interface.json +070e1d9e4bfb52dffc7d2bbf02f504374d97c502 assets/actuallyadditions/models/item/powered_furnace.json +d8cf56e92afa1ea98eead8af208cc6281c815ede assets/actuallyadditions/models/item/ranged_collector.json +12b62d8ed574812fb48d32e416b3c9f4ebf70ec8 assets/actuallyadditions/models/item/refinedcanolaoil.json +e1ac2543ec64ac16a79eb40ece195c260911d9bb assets/actuallyadditions/models/item/restonia_crystal_block.json +b7162b0c606ec8d39ebf2012fc0316a390f23c6d assets/actuallyadditions/models/item/restonia_crystal_cluster.json +f456241999745258c54b26e50aed4fdd2a995d9e assets/actuallyadditions/models/item/rice.json +8334f0d8c5364b930a8d674cfe86f8b4461b03f3 assets/actuallyadditions/models/item/shock_suppressor.json +ab1238b9d05cf387edf8f82d984eff7e8f050390 assets/actuallyadditions/models/item/tiny_torch.json +15e8675d650eb7639154dc7730207c33c8c05f29 assets/actuallyadditions/models/item/vertical_digger.json +5ecd8ffdb80cd831e4997489e1126cf62dcfe554 assets/actuallyadditions/models/item/void_crystal_block.json +637116b594ddef84e14b6fb0e8bcc1a562bb2bdf assets/actuallyadditions/models/item/void_crystal_cluster.json +f68d37fcdaf57ec06518d5974cbf540e6c45d271 assets/actuallyadditions/models/item/wood_casing.json +0b1ab8963077c90a5104b516eab36e56c8a07057 assets/actuallyadditions/models/item/xp_solidifier.json a91ac0f76c7b325ac3ef0eefe5614d17f1f533d3 data/actuallyadditions/recipes/atomic_reconstructor.json df2c79e474e102a0bf80ee90a753fbe3690110e5 data/actuallyadditions/recipes/axe_crystal_diamatine.json 8d4e7233566d4764348c7c21178553bdc79efb32 data/actuallyadditions/recipes/axe_crystal_emeradic.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_diamatine_block.json b/src/generated/resources/assets/actuallyadditions/models/block/diamatine_crystal_block.json similarity index 50% rename from src/main/resources/assets/actuallyadditions/models/block/crystal_diamatine_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/diamatine_crystal_block.json index 6bd6d1429..738074559 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/crystal_diamatine_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/diamatine_crystal_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/crystal_diamatine_block" + "all": "actuallyadditions:block/diamatine_crystal_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_emeradic_block.json b/src/generated/resources/assets/actuallyadditions/models/block/emeradic_crystal_block.json similarity index 51% rename from src/main/resources/assets/actuallyadditions/models/block/crystal_emeradic_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/emeradic_crystal_block.json index 5b25d61d7..57bd57d68 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/crystal_emeradic_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/emeradic_crystal_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/crystal_emeradic_block" + "all": "actuallyadditions:block/emeradic_crystal_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_diamatine_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/block/empowered_diamatine_crystal_block.json similarity index 52% rename from src/main/resources/assets/actuallyadditions/models/block/crystal_diamatine_empowered_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/empowered_diamatine_crystal_block.json index 1588bbe57..abec74e28 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/crystal_diamatine_empowered_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/empowered_diamatine_crystal_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/crystal_diamatine_empowered_block" + "all": "actuallyadditions:block/empowered_diamatine_crystal_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_restonia_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/block/empowered_emeradic_crystal_block.json similarity index 51% rename from src/main/resources/assets/actuallyadditions/models/block/crystal_restonia_empowered_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/empowered_emeradic_crystal_block.json index b0e8e9402..9316b96ed 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/crystal_restonia_empowered_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/empowered_emeradic_crystal_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/crystal_restonia_empowered_block" + "all": "actuallyadditions:block/empowered_emeradic_crystal_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_enori_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/block/empowered_enori_crystal_block.json similarity index 50% rename from src/main/resources/assets/actuallyadditions/models/block/crystal_enori_empowered_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/empowered_enori_crystal_block.json index d58c90ccf..f5eab2c62 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/crystal_enori_empowered_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/empowered_enori_crystal_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/crystal_enori_empowered_block" + "all": "actuallyadditions:block/empowered_enori_crystal_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_palis_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/block/empowered_palis_crystal_block.json similarity index 50% rename from src/main/resources/assets/actuallyadditions/models/block/crystal_palis_empowered_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/empowered_palis_crystal_block.json index 047eb04b5..670f1bfc3 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/crystal_palis_empowered_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/empowered_palis_crystal_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/crystal_palis_empowered_block" + "all": "actuallyadditions:block/empowered_palis_crystal_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_emeradic_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/block/empowered_restonia_crystal_block.json similarity index 51% rename from src/main/resources/assets/actuallyadditions/models/block/crystal_emeradic_empowered_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/empowered_restonia_crystal_block.json index 43a8cba40..77e2d7f07 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/crystal_emeradic_empowered_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/empowered_restonia_crystal_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/crystal_emeradic_empowered_block" + "all": "actuallyadditions:block/empowered_restonia_crystal_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_void_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/block/empowered_void_crystal_block.json similarity index 50% rename from src/main/resources/assets/actuallyadditions/models/block/crystal_void_empowered_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/empowered_void_crystal_block.json index b6c4308e9..e83efbb29 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/crystal_void_empowered_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/empowered_void_crystal_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/crystal_void_empowered_block" + "all": "actuallyadditions:block/empowered_void_crystal_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_palis_block.json b/src/generated/resources/assets/actuallyadditions/models/block/enori_crystal_block.json similarity index 52% rename from src/main/resources/assets/actuallyadditions/models/block/crystal_palis_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/enori_crystal_block.json index 7b6557b12..2622ee037 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/crystal_palis_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/enori_crystal_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/crystal_palis_block" + "all": "actuallyadditions:block/enori_crystal_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_black.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_black.json index cd6014011..9c93e860f 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_black.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_black.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/lamp_black" + "all": "actuallyadditions:block/lamp_black_on" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_blue.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_blue.json index 9b1672eec..d5172483b 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_blue.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_blue.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/lamp_blue" + "all": "actuallyadditions:block/lamp_blue_on" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_brown.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_brown.json index c52c3d4d0..7ce779826 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_brown.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_brown.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/lamp_brown" + "all": "actuallyadditions:block/lamp_brown_on" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_cyan.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_cyan.json index f5f93bbe0..012a83c43 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_cyan.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_cyan.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/lamp_cyan" + "all": "actuallyadditions:block/lamp_cyan_on" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_gray.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_gray.json index f341bec92..096104114 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_gray.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_gray.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/lamp_gray" + "all": "actuallyadditions:block/lamp_gray_on" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_green.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_green.json index 53a94037a..424ec5c3c 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_green.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_green.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/lamp_green" + "all": "actuallyadditions:block/lamp_green_on" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_light_blue.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_light_blue.json index fe2c421fe..338866738 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_light_blue.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_light_blue.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/lamp_light_blue" + "all": "actuallyadditions:block/lamp_light_blue_on" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_light_gray.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_light_gray.json index 743fcefc7..8d1c616f3 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_light_gray.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_light_gray.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/lamp_light_gray" + "all": "actuallyadditions:block/lamp_light_gray_on" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_lime.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_lime.json index 61b67742b..b50e254ef 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_lime.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_lime.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/lamp_lime" + "all": "actuallyadditions:block/lamp_lime_on" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_magenta.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_magenta.json index 2346559d3..004fd849f 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_magenta.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_magenta.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/lamp_magenta" + "all": "actuallyadditions:block/lamp_magenta_on" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_orange.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_orange.json index 54f478044..f1417161e 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_orange.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_orange.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/lamp_orange" + "all": "actuallyadditions:block/lamp_orange_on" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_pink.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_pink.json index bde4fa2a6..090c79e5d 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_pink.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_pink.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/lamp_pink" + "all": "actuallyadditions:block/lamp_pink_on" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_purple.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_purple.json index 06ae88bed..5ddb6dbfc 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_purple.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_purple.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/lamp_purple" + "all": "actuallyadditions:block/lamp_purple_on" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_red.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_red.json index 37904a2e2..87e40dc0e 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_red.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_red.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/lamp_red" + "all": "actuallyadditions:block/lamp_red_on" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_white.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_white.json index e163bd9eb..b6f8bd1ef 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_white.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_white.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/lamp_white" + "all": "actuallyadditions:block/lamp_white_on" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/lamp_yellow.json b/src/generated/resources/assets/actuallyadditions/models/block/lamp_yellow.json index a6c0e261d..51deff0df 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/lamp_yellow.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/lamp_yellow.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/lamp_yellow" + "all": "actuallyadditions:block/lamp_yellow_on" } } \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/ender_casing_block.json b/src/generated/resources/assets/actuallyadditions/models/block/palis_crystal_block.json similarity index 52% rename from src/main/resources/assets/actuallyadditions/models/block/ender_casing_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/palis_crystal_block.json index ea2d09e43..596cb320a 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/ender_casing_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/palis_crystal_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/ender_casing_block" + "all": "actuallyadditions:block/palis_crystal_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_restonia_block.json b/src/generated/resources/assets/actuallyadditions/models/block/restonia_crystal_block.json similarity index 51% rename from src/main/resources/assets/actuallyadditions/models/block/crystal_restonia_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/restonia_crystal_block.json index 87cacb725..7bc7c6f05 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/crystal_restonia_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/restonia_crystal_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/crystal_restonia_block" + "all": "actuallyadditions:block/restonia_crystal_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_void_block.json b/src/generated/resources/assets/actuallyadditions/models/block/void_crystal_block.json similarity index 52% rename from src/main/resources/assets/actuallyadditions/models/block/crystal_void_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/void_crystal_block.json index 432f6023c..3f7b635a6 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/crystal_void_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/void_crystal_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/crystal_void_block" + "all": "actuallyadditions:block/void_crystal_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/atomic_reconstructor.json b/src/generated/resources/assets/actuallyadditions/models/item/atomic_reconstructor.json new file mode 100644 index 000000000..68209ae34 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/atomic_reconstructor.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/atomic_reconstructor" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/battery_box.json b/src/generated/resources/assets/actuallyadditions/models/item/battery_box.json new file mode 100644 index 000000000..cdf93ec17 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/battery_box.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/battery_box" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/bio_reactor.json b/src/generated/resources/assets/actuallyadditions/models/item/bio_reactor.json new file mode 100644 index 000000000..7e965f13c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/bio_reactor.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/bio_reactor" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_block.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_block.json new file mode 100644 index 000000000..9a1d047bb --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_quartz_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_block.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_block.json new file mode 100644 index 000000000..f87890559 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_quartz_pillar_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_slab.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_slab.json new file mode 100644 index 000000000..b13560531 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_quartz_pillar_slab" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_stair.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_stair.json new file mode 100644 index 000000000..9e7fb1f1e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_stair.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_quartz_pillar_stair" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_wall.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_wall.json new file mode 100644 index 000000000..7ad8c7c16 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_pillar_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_quartz_pillar_wall" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_slab.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_slab.json new file mode 100644 index 000000000..e61f76b80 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_quartz_slab" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_stair.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_stair.json new file mode 100644 index 000000000..bdc3f8ea4 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_stair.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_quartz_stair" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_wall.json b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_wall.json new file mode 100644 index 000000000..af3903a16 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/black_quartz_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/black_quartz_wall" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/breaker.json b/src/generated/resources/assets/actuallyadditions/models/item/breaker.json new file mode 100644 index 000000000..822f9eac1 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/breaker.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/breaker" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/canola.json b/src/generated/resources/assets/actuallyadditions/models/item/canola.json new file mode 100644 index 000000000..cbb4b84d7 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/canola.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/canola" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/canola_press.json b/src/generated/resources/assets/actuallyadditions/models/item/canola_press.json new file mode 100644 index 000000000..da5659fd6 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/canola_press.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/canola_press" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/canolaoil.json b/src/generated/resources/assets/actuallyadditions/models/item/canolaoil.json new file mode 100644 index 000000000..1c2d7ff43 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/canolaoil.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/canolaoil" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_block.json b/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_block.json new file mode 100644 index 000000000..1653c3b8f --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/chiseled_black_quartz_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_slab.json b/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_slab.json new file mode 100644 index 000000000..d057a65ba --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/chiseled_black_quartz_slab" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_stair.json b/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_stair.json new file mode 100644 index 000000000..e05d1f285 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_stair.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/chiseled_black_quartz_stair" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_wall.json b/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_wall.json new file mode 100644 index 000000000..8ee1e84e1 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/chiseled_black_quartz_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/chiseled_black_quartz_wall" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/coal_generator.json b/src/generated/resources/assets/actuallyadditions/models/item/coal_generator.json new file mode 100644 index 000000000..cfe444acb --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/coal_generator.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/coal_generator" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/coffee.json b/src/generated/resources/assets/actuallyadditions/models/item/coffee.json new file mode 100644 index 000000000..ef2e3683b --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/coffee.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/coffee" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/coffee_machine.json b/src/generated/resources/assets/actuallyadditions/models/item/coffee_machine.json new file mode 100644 index 000000000..291090489 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/coffee_machine.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/coffee_machine" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crusher.json b/src/generated/resources/assets/actuallyadditions/models/item/crusher.json new file mode 100644 index 000000000..211ed2723 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/crusher.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/crusher" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crusher_double.json b/src/generated/resources/assets/actuallyadditions/models/item/crusher_double.json new file mode 100644 index 000000000..b61e34a09 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/crusher_double.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/crusher_double" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystaloil.json b/src/generated/resources/assets/actuallyadditions/models/item/crystaloil.json new file mode 100644 index 000000000..e18623031 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/crystaloil.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/crystaloil" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/diamatine_crystal_block.json b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_crystal_block.json new file mode 100644 index 000000000..4e5970e39 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_crystal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/diamatine_crystal_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/diamatine_crystal_cluster.json b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_crystal_cluster.json new file mode 100644 index 000000000..5eb3b0cde --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_crystal_cluster.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/diamatine_crystal_cluster" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/display_stand.json b/src/generated/resources/assets/actuallyadditions/models/item/display_stand.json new file mode 100644 index 000000000..e03ad12b8 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/display_stand.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/display_stand" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/dropper.json b/src/generated/resources/assets/actuallyadditions/models/item/dropper.json new file mode 100644 index 000000000..096df3100 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/dropper.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/dropper" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/emeradic_crystal_block.json b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_crystal_block.json new file mode 100644 index 000000000..1a86b40a6 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_crystal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/emeradic_crystal_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/emeradic_crystal_cluster.json b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_crystal_cluster.json new file mode 100644 index 000000000..00e46ac7a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_crystal_cluster.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/emeradic_crystal_cluster" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/empowered_diamatine_crystal_block.json b/src/generated/resources/assets/actuallyadditions/models/item/empowered_diamatine_crystal_block.json new file mode 100644 index 000000000..6eb7acb45 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/empowered_diamatine_crystal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/empowered_diamatine_crystal_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/empowered_emeradic_crystal_block.json b/src/generated/resources/assets/actuallyadditions/models/item/empowered_emeradic_crystal_block.json new file mode 100644 index 000000000..d9dbb9b78 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/empowered_emeradic_crystal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/empowered_emeradic_crystal_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/empowered_enori_crystal_block.json b/src/generated/resources/assets/actuallyadditions/models/item/empowered_enori_crystal_block.json new file mode 100644 index 000000000..f0d3c5e58 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/empowered_enori_crystal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/empowered_enori_crystal_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/empowered_palis_crystal_block.json b/src/generated/resources/assets/actuallyadditions/models/item/empowered_palis_crystal_block.json new file mode 100644 index 000000000..0927d60e3 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/empowered_palis_crystal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/empowered_palis_crystal_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/empowered_restonia_crystal_block.json b/src/generated/resources/assets/actuallyadditions/models/item/empowered_restonia_crystal_block.json new file mode 100644 index 000000000..3b25dabf0 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/empowered_restonia_crystal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/empowered_restonia_crystal_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/empowered_void_crystal_block.json b/src/generated/resources/assets/actuallyadditions/models/item/empowered_void_crystal_block.json new file mode 100644 index 000000000..e818c89c4 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/empowered_void_crystal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/empowered_void_crystal_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/empoweredoil.json b/src/generated/resources/assets/actuallyadditions/models/item/empoweredoil.json new file mode 100644 index 000000000..66f5b8dca --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/empoweredoil.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/empoweredoil" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/empowerer.json b/src/generated/resources/assets/actuallyadditions/models/item/empowerer.json new file mode 100644 index 000000000..9b83213e2 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/empowerer.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/empowerer" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ender_casing.json b/src/generated/resources/assets/actuallyadditions/models/item/ender_casing.json new file mode 100644 index 000000000..dbbf30cac --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/ender_casing.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/ender_casing" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ender_pearl_block.json b/src/generated/resources/assets/actuallyadditions/models/item/ender_pearl_block.json new file mode 100644 index 000000000..407c8265c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/ender_pearl_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/ender_pearl_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/energizer.json b/src/generated/resources/assets/actuallyadditions/models/item/energizer.json new file mode 100644 index 000000000..28f61f24b --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/energizer.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/energizer" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/enervator.json b/src/generated/resources/assets/actuallyadditions/models/item/enervator.json new file mode 100644 index 000000000..c30fca6c7 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/enervator.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/enervator" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/enori_crystal_block.json b/src/generated/resources/assets/actuallyadditions/models/item/enori_crystal_block.json new file mode 100644 index 000000000..2f69b7c22 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/enori_crystal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/enori_crystal_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/enori_crystal_cluster.json b/src/generated/resources/assets/actuallyadditions/models/item/enori_crystal_cluster.json new file mode 100644 index 000000000..fe93a01c0 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/enori_crystal_cluster.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/enori_crystal_cluster" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ethetic_green_block.json b/src/generated/resources/assets/actuallyadditions/models/item/ethetic_green_block.json new file mode 100644 index 000000000..a34dd2972 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/ethetic_green_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/ethetic_green_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ethetic_green_slab.json b/src/generated/resources/assets/actuallyadditions/models/item/ethetic_green_slab.json new file mode 100644 index 000000000..aa8424b5a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/ethetic_green_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/ethetic_green_slab" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ethetic_green_stairs.json b/src/generated/resources/assets/actuallyadditions/models/item/ethetic_green_stairs.json new file mode 100644 index 000000000..086d6ca00 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/ethetic_green_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/ethetic_green_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ethetic_green_wall.json b/src/generated/resources/assets/actuallyadditions/models/item/ethetic_green_wall.json new file mode 100644 index 000000000..47c04c998 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/ethetic_green_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/ethetic_green_wall" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ethetic_white_block.json b/src/generated/resources/assets/actuallyadditions/models/item/ethetic_white_block.json new file mode 100644 index 000000000..aa8ec6f89 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/ethetic_white_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/ethetic_white_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ethetic_white_slab.json b/src/generated/resources/assets/actuallyadditions/models/item/ethetic_white_slab.json new file mode 100644 index 000000000..3b38f4676 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/ethetic_white_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/ethetic_white_slab" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ethetic_white_stairs.json b/src/generated/resources/assets/actuallyadditions/models/item/ethetic_white_stairs.json new file mode 100644 index 000000000..3e16a6b3c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/ethetic_white_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/ethetic_white_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ethetic_white_wall.json b/src/generated/resources/assets/actuallyadditions/models/item/ethetic_white_wall.json new file mode 100644 index 000000000..b5a7cf8fe --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/ethetic_white_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/ethetic_white_wall" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/farmer.json b/src/generated/resources/assets/actuallyadditions/models/item/farmer.json new file mode 100644 index 000000000..adb53e1fc --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/farmer.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/farmer" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/feeder.json b/src/generated/resources/assets/actuallyadditions/models/item/feeder.json new file mode 100644 index 000000000..10b93aeff --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/feeder.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/feeder" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/fermenting_barrel.json b/src/generated/resources/assets/actuallyadditions/models/item/fermenting_barrel.json new file mode 100644 index 000000000..339e62f7f --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/fermenting_barrel.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/fermenting_barrel" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/firework_box.json b/src/generated/resources/assets/actuallyadditions/models/item/firework_box.json new file mode 100644 index 000000000..6ba3992e5 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/firework_box.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/firework_box" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/flax.json b/src/generated/resources/assets/actuallyadditions/models/item/flax.json new file mode 100644 index 000000000..e2522a00f --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/flax.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/flax" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/fluid_collector.json b/src/generated/resources/assets/actuallyadditions/models/item/fluid_collector.json new file mode 100644 index 000000000..a5f1d796f --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/fluid_collector.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/fluid_collector" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/fluid_placer.json b/src/generated/resources/assets/actuallyadditions/models/item/fluid_placer.json new file mode 100644 index 000000000..3a3fbc6fa --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/fluid_placer.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/fluid_placer" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/greenhouse_glass.json b/src/generated/resources/assets/actuallyadditions/models/item/greenhouse_glass.json new file mode 100644 index 000000000..49042f30c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/greenhouse_glass.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/greenhouse_glass" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/heat_collector.json b/src/generated/resources/assets/actuallyadditions/models/item/heat_collector.json new file mode 100644 index 000000000..6f234e2f8 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/heat_collector.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/heat_collector" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/iron_casing.json b/src/generated/resources/assets/actuallyadditions/models/item/iron_casing.json new file mode 100644 index 000000000..ea79502a6 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/iron_casing.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/iron_casing" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/item_viewer.json b/src/generated/resources/assets/actuallyadditions/models/item/item_viewer.json new file mode 100644 index 000000000..20fb1ed83 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/item_viewer.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/item_viewer" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/item_viewer_hopping.json b/src/generated/resources/assets/actuallyadditions/models/item/item_viewer_hopping.json new file mode 100644 index 000000000..8ae924b0e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/item_viewer_hopping.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/item_viewer_hopping" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lamp_black.json b/src/generated/resources/assets/actuallyadditions/models/item/lamp_black.json new file mode 100644 index 000000000..e68e66488 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lamp_black.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/lamp_black" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lamp_blue.json b/src/generated/resources/assets/actuallyadditions/models/item/lamp_blue.json new file mode 100644 index 000000000..7c630d31b --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lamp_blue.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/lamp_blue" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lamp_brown.json b/src/generated/resources/assets/actuallyadditions/models/item/lamp_brown.json new file mode 100644 index 000000000..8345cf64f --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lamp_brown.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/lamp_brown" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lamp_cyan.json b/src/generated/resources/assets/actuallyadditions/models/item/lamp_cyan.json new file mode 100644 index 000000000..4bf21b9d4 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lamp_cyan.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/lamp_cyan" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lamp_gray.json b/src/generated/resources/assets/actuallyadditions/models/item/lamp_gray.json new file mode 100644 index 000000000..d5740a59f --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lamp_gray.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/lamp_gray" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lamp_green.json b/src/generated/resources/assets/actuallyadditions/models/item/lamp_green.json new file mode 100644 index 000000000..e76774818 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lamp_green.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/lamp_green" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lamp_light_blue.json b/src/generated/resources/assets/actuallyadditions/models/item/lamp_light_blue.json new file mode 100644 index 000000000..5f013899f --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lamp_light_blue.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/lamp_light_blue" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lamp_light_gray.json b/src/generated/resources/assets/actuallyadditions/models/item/lamp_light_gray.json new file mode 100644 index 000000000..0ff9f5272 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lamp_light_gray.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/lamp_light_gray" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lamp_lime.json b/src/generated/resources/assets/actuallyadditions/models/item/lamp_lime.json new file mode 100644 index 000000000..fd47e09d0 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lamp_lime.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/lamp_lime" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lamp_magenta.json b/src/generated/resources/assets/actuallyadditions/models/item/lamp_magenta.json new file mode 100644 index 000000000..4791f7aef --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lamp_magenta.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/lamp_magenta" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lamp_orange.json b/src/generated/resources/assets/actuallyadditions/models/item/lamp_orange.json new file mode 100644 index 000000000..03bf4d478 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lamp_orange.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/lamp_orange" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lamp_pink.json b/src/generated/resources/assets/actuallyadditions/models/item/lamp_pink.json new file mode 100644 index 000000000..6ccc83472 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lamp_pink.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/lamp_pink" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lamp_powerer.json b/src/generated/resources/assets/actuallyadditions/models/item/lamp_powerer.json new file mode 100644 index 000000000..b60351032 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lamp_powerer.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/lamp_powerer" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lamp_purple.json b/src/generated/resources/assets/actuallyadditions/models/item/lamp_purple.json new file mode 100644 index 000000000..dbdf6b068 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lamp_purple.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/lamp_purple" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lamp_red.json b/src/generated/resources/assets/actuallyadditions/models/item/lamp_red.json new file mode 100644 index 000000000..bc564c703 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lamp_red.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/lamp_red" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lamp_white.json b/src/generated/resources/assets/actuallyadditions/models/item/lamp_white.json new file mode 100644 index 000000000..2fad3ed4d --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lamp_white.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/lamp_white" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lamp_yellow.json b/src/generated/resources/assets/actuallyadditions/models/item/lamp_yellow.json new file mode 100644 index 000000000..717849c6b --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lamp_yellow.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/lamp_yellow" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/laser_relay.json b/src/generated/resources/assets/actuallyadditions/models/item/laser_relay.json new file mode 100644 index 000000000..09ec40a97 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/laser_relay.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/laser_relay" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_advanced.json b/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_advanced.json new file mode 100644 index 000000000..453e06fe9 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_advanced.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/laser_relay_advanced" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_extreme.json b/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_extreme.json new file mode 100644 index 000000000..bd83dd0dd --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_extreme.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/laser_relay_extreme" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_fluids.json b/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_fluids.json new file mode 100644 index 000000000..8a05fa9ca --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_fluids.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/laser_relay_fluids" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_item.json b/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_item.json new file mode 100644 index 000000000..5a3325eb6 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_item.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/laser_relay_item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_item_advanced.json b/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_item_advanced.json new file mode 100644 index 000000000..9c107ab4a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/laser_relay_item_advanced.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/laser_relay_item_advanced" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lava_factory_casing.json b/src/generated/resources/assets/actuallyadditions/models/item/lava_factory_casing.json new file mode 100644 index 000000000..7bac399cb --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lava_factory_casing.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/lava_factory_casing" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lava_factory_controller.json b/src/generated/resources/assets/actuallyadditions/models/item/lava_factory_controller.json new file mode 100644 index 000000000..8f26ad434 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/lava_factory_controller.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/lava_factory_controller" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/leaf_generator.json b/src/generated/resources/assets/actuallyadditions/models/item/leaf_generator.json new file mode 100644 index 000000000..ebc33cc9c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/leaf_generator.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/leaf_generator" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/long_range_breaker.json b/src/generated/resources/assets/actuallyadditions/models/item/long_range_breaker.json new file mode 100644 index 000000000..b40637df2 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/long_range_breaker.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/long_range_breaker" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/oil_generator.json b/src/generated/resources/assets/actuallyadditions/models/item/oil_generator.json new file mode 100644 index 000000000..24323e038 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/oil_generator.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/oil_generator" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/palis_crystal_block.json b/src/generated/resources/assets/actuallyadditions/models/item/palis_crystal_block.json new file mode 100644 index 000000000..c8f656881 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/palis_crystal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/palis_crystal_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/palis_crystal_cluster.json b/src/generated/resources/assets/actuallyadditions/models/item/palis_crystal_cluster.json new file mode 100644 index 000000000..6e2f706c8 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/palis_crystal_cluster.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/palis_crystal_cluster" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/phantom_booster.json b/src/generated/resources/assets/actuallyadditions/models/item/phantom_booster.json new file mode 100644 index 000000000..35dc14a34 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/phantom_booster.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/phantom_booster" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/phantom_breaker.json b/src/generated/resources/assets/actuallyadditions/models/item/phantom_breaker.json new file mode 100644 index 000000000..b29e57c63 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/phantom_breaker.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/phantom_breaker" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/phantom_energyface.json b/src/generated/resources/assets/actuallyadditions/models/item/phantom_energyface.json new file mode 100644 index 000000000..dee470aa2 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/phantom_energyface.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/phantom_energyface" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/phantom_itemface.json b/src/generated/resources/assets/actuallyadditions/models/item/phantom_itemface.json new file mode 100644 index 000000000..1879dbdce --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/phantom_itemface.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/phantom_itemface" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/phantom_liquiface.json b/src/generated/resources/assets/actuallyadditions/models/item/phantom_liquiface.json new file mode 100644 index 000000000..306eca069 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/phantom_liquiface.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/phantom_liquiface" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/phantom_placer.json b/src/generated/resources/assets/actuallyadditions/models/item/phantom_placer.json new file mode 100644 index 000000000..5fe90399c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/phantom_placer.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/phantom_placer" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/phantom_redstoneface.json b/src/generated/resources/assets/actuallyadditions/models/item/phantom_redstoneface.json new file mode 100644 index 000000000..663584a0c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/phantom_redstoneface.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/phantom_redstoneface" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/placer.json b/src/generated/resources/assets/actuallyadditions/models/item/placer.json new file mode 100644 index 000000000..4fa189066 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/placer.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/placer" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/player_interface.json b/src/generated/resources/assets/actuallyadditions/models/item/player_interface.json new file mode 100644 index 000000000..932e0e972 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/player_interface.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/player_interface" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/powered_furnace.json b/src/generated/resources/assets/actuallyadditions/models/item/powered_furnace.json new file mode 100644 index 000000000..d1f6813fc --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/powered_furnace.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/powered_furnace" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/ranged_collector.json b/src/generated/resources/assets/actuallyadditions/models/item/ranged_collector.json new file mode 100644 index 000000000..b5b35b81f --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/ranged_collector.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/ranged_collector" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/refinedcanolaoil.json b/src/generated/resources/assets/actuallyadditions/models/item/refinedcanolaoil.json new file mode 100644 index 000000000..3d975aec4 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/refinedcanolaoil.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/refinedcanolaoil" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/restonia_crystal_block.json b/src/generated/resources/assets/actuallyadditions/models/item/restonia_crystal_block.json new file mode 100644 index 000000000..9ac845549 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/restonia_crystal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/restonia_crystal_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/restonia_crystal_cluster.json b/src/generated/resources/assets/actuallyadditions/models/item/restonia_crystal_cluster.json new file mode 100644 index 000000000..c6f11fd87 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/restonia_crystal_cluster.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/restonia_crystal_cluster" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/rice.json b/src/generated/resources/assets/actuallyadditions/models/item/rice.json new file mode 100644 index 000000000..b008e42e0 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/rice.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/rice" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/shock_suppressor.json b/src/generated/resources/assets/actuallyadditions/models/item/shock_suppressor.json new file mode 100644 index 000000000..f62185e8b --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/shock_suppressor.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/shock_suppressor" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/tiny_torch.json b/src/generated/resources/assets/actuallyadditions/models/item/tiny_torch.json new file mode 100644 index 000000000..32d65e7c0 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/tiny_torch.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/tiny_torch" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/vertical_digger.json b/src/generated/resources/assets/actuallyadditions/models/item/vertical_digger.json new file mode 100644 index 000000000..15ab9cf6e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/vertical_digger.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/vertical_digger" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/void_crystal_block.json b/src/generated/resources/assets/actuallyadditions/models/item/void_crystal_block.json new file mode 100644 index 000000000..60edea34c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/void_crystal_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/void_crystal_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/void_crystal_cluster.json b/src/generated/resources/assets/actuallyadditions/models/item/void_crystal_cluster.json new file mode 100644 index 000000000..4693fbf35 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/void_crystal_cluster.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/void_crystal_cluster" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/wood_casing.json b/src/generated/resources/assets/actuallyadditions/models/item/wood_casing.json new file mode 100644 index 000000000..503dca106 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/wood_casing.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/wood_casing" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/xp_solidifier.json b/src/generated/resources/assets/actuallyadditions/models/item/xp_solidifier.json new file mode 100644 index 000000000..e38bc954c --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/xp_solidifier.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/xp_solidifier" +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyAdditionsData.java b/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyAdditionsData.java index b56ac662a..60911becb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyAdditionsData.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyAdditionsData.java @@ -31,6 +31,7 @@ public class ActuallyAdditionsData { generator.addProvider(new ItemTagsGenerator(generator, generatorBlockTags, helper)); generator.addProvider(new BlockStateGenerator(generator, helper)); + generator.addProvider(new ItemModelGenerator(generator, helper)); generator.addProvider(new LaserRecipeGenerator(generator)); generator.addProvider(new EmpoweringRecipeGenerator(generator)); diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java index 98f529a12..818e1556c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java @@ -40,7 +40,7 @@ public class BlockStateGenerator extends BlockStateProvider { horizontallyDirectionalBlock(ActuallyBlocks.POWERED_FURNACE); horizontallyDirectionalBlock(ActuallyBlocks.COAL_GENERATOR); horizontallyDirectionalBlock(ActuallyBlocks.OIL_GENERATOR); - //horizontallyDirectionalBlock(ActuallyBlocks.LAMP_CONTROLLER); //TODO missing + horizontallyDirectionalBlock(ActuallyBlocks.LAMP_CONTROLLER); horizontallyDirectionalBlock(ActuallyBlocks.LAVA_FACTORY_CONTROLLER); // Standard Block @@ -59,18 +59,18 @@ public class BlockStateGenerator extends BlockStateProvider { standardBlock(ActuallyBlocks.PLAYER_INTERFACE); standardBlock(ActuallyBlocks.ITEM_INTERFACE); standardBlock(ActuallyBlocks.FIREWORK_BOX); - standardBlock(ActuallyBlocks.RESTONIA_CRYSTAL); - standardBlock(ActuallyBlocks.PALIS_CRYSTAL); - standardBlock(ActuallyBlocks.DIAMATINE_CRYSTAL); - standardBlock(ActuallyBlocks.VOID_CRYSTAL); - standardBlock(ActuallyBlocks.EMERADIC_CRYSTAL); - standardBlock(ActuallyBlocks.ENORI_CRYSTAL); - standardBlock(ActuallyBlocks.EMPOWERED_RESTONIA_CRYSTAL); - standardBlock(ActuallyBlocks.EMPOWERED_PALIS_CRYSTAL); - standardBlock(ActuallyBlocks.EMPOWERED_DIAMATINE_CRYSTAL); - standardBlock(ActuallyBlocks.EMPOWERED_VOID_CRYSTAL); - standardBlock(ActuallyBlocks.EMPOWERED_EMERADIC_CRYSTAL); - standardBlock(ActuallyBlocks.EMPOWERED_ENORI_CRYSTAL); + buildCubeAll(ActuallyBlocks.RESTONIA_CRYSTAL); + buildCubeAll(ActuallyBlocks.PALIS_CRYSTAL); + buildCubeAll(ActuallyBlocks.DIAMATINE_CRYSTAL); + buildCubeAll(ActuallyBlocks.VOID_CRYSTAL); + buildCubeAll(ActuallyBlocks.EMERADIC_CRYSTAL); + buildCubeAll(ActuallyBlocks.ENORI_CRYSTAL); + buildCubeAll(ActuallyBlocks.EMPOWERED_RESTONIA_CRYSTAL); + buildCubeAll(ActuallyBlocks.EMPOWERED_PALIS_CRYSTAL); + buildCubeAll(ActuallyBlocks.EMPOWERED_DIAMATINE_CRYSTAL); + buildCubeAll(ActuallyBlocks.EMPOWERED_VOID_CRYSTAL); + buildCubeAll(ActuallyBlocks.EMPOWERED_EMERADIC_CRYSTAL); + buildCubeAll(ActuallyBlocks.EMPOWERED_ENORI_CRYSTAL); standardBlock(ActuallyBlocks.LASER_RELAY); standardBlock(ActuallyBlocks.LASER_RELAY_ADVANCED); standardBlock(ActuallyBlocks.LASER_RELAY_EXTREME); @@ -180,6 +180,14 @@ public class BlockStateGenerator extends BlockStateProvider { simpleBlock(block.get(), model); } + private void standardBlockWithCube(Supplier block) { + ResourceLocation name = block.get().getRegistryName(); + assert name != null; + + ModelFile model = models().cubeAll(name.toString(), modLoc("block/" + name.getPath())); + simpleBlock(block.get(), model); + } + private void buildLitState(Supplier block) { ResourceLocation name = block.get().getRegistryName(); assert name != null; @@ -188,7 +196,7 @@ public class BlockStateGenerator extends BlockStateProvider { .partialState().with(BlockStateProperties.LIT, false) .addModels(ConfiguredModel.builder().modelFile(models().cubeAll(name.toString(), modLoc("block/" + name.getPath()))).build()) .partialState().with(BlockStateProperties.LIT, true) - .addModels(ConfiguredModel.builder().modelFile(models().cubeAll(name.toString(), modLoc("block/" + name.getPath().replace("_block", "_on_block")))).build()); + .addModels(ConfiguredModel.builder().modelFile(models().cubeAll(name.toString(), modLoc("block/" + name.getPath() + "_on"))).build()); } private void fullyDirectionalBlock(Supplier block) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ItemModelGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/ItemModelGenerator.java new file mode 100644 index 000000000..925163475 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ItemModelGenerator.java @@ -0,0 +1,57 @@ +package de.ellpeck.actuallyadditions.data; + +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks; +import net.minecraft.block.Block; +import net.minecraft.data.DataGenerator; +import net.minecraft.item.Item; +import net.minecraftforge.client.model.generators.ItemModelProvider; +import net.minecraftforge.client.model.generators.ModelFile; +import net.minecraftforge.common.data.ExistingFileHelper; +import net.minecraftforge.fml.RegistryObject; + +import java.util.function.Supplier; + +public class ItemModelGenerator extends ItemModelProvider { + public ItemModelGenerator(DataGenerator generator, ExistingFileHelper existingFileHelper) { + super(generator, ActuallyAdditions.MODID, existingFileHelper); + } + + @Override + protected void registerModels() { + // Items + //simpleItem(ActuallyItems.BOOKLET); // will require complex I think + + // All items? + //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)));*/ + String path = block.get().getRegistryName().getPath(); + getBuilder(path).parent(new ModelFile.UncheckedModelFile(modLoc("block/"+path))); + } + + private void simpleItem(Supplier item) { + String path = item.get().getRegistryName().getPath(); + singleTexture(path, mcLoc("item/handheld"), "layer0", modLoc("item/" + path)); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java index be6feea97..6a9555408 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java @@ -54,7 +54,7 @@ public final class ActuallyBlocks { public static final AABlockReg LAVA_FACTORY_CONTROLLER = new AABlockReg<>("lava_factory_controller", BlockLavaFactoryController::new, (b) -> new AABlockItem(b, defaultBlockItemProperties), TileEntityLavaFactoryController::new); - public static final AABlockReg LAMP_POWERER = new AABlockReg<>("lamp_powerer", BlockLampPowerer::new, (b) -> new AABlockItem(b, defaultBlockItemProperties)); + public static final AABlockReg LAMP_CONTROLLER = new AABlockReg<>("lamp_controller", BlockLampController::new, (b) -> new AABlockItem(b, defaultBlockItemProperties)); public static final AABlockReg CANOLA_PRESS = new AABlockReg<>("canola_press", BlockCanolaPress::new, (b) -> new AABlockItem(b, defaultBlockItemProperties), TileEntityCanolaPress::new); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampController.java similarity index 97% rename from src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampController.java index 3271ea54c..7256ed778 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampController.java @@ -25,9 +25,9 @@ import net.minecraft.world.World; import java.util.ArrayList; import java.util.List; -public class BlockLampPowerer extends FullyDirectionalBlock { +public class BlockLampController extends FullyDirectionalBlock { - public BlockLampPowerer() { + public BlockLampController() { super(ActuallyBlocks.defaultPickProps(0)); } diff --git a/src/main/resources/assets/actuallyadditions/models/block/advanced_item_laser_relay_block.json b/src/main/resources/assets/actuallyadditions/models/block/advanced_item_laser_relay.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/advanced_item_laser_relay_block.json rename to src/main/resources/assets/actuallyadditions/models/block/advanced_item_laser_relay.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/atomic_reconstructor_block.json b/src/main/resources/assets/actuallyadditions/models/block/atomic_reconstructor.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/atomic_reconstructor_block.json rename to src/main/resources/assets/actuallyadditions/models/block/atomic_reconstructor.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/battery_box_block.json b/src/main/resources/assets/actuallyadditions/models/block/battery_box.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/battery_box_block.json rename to src/main/resources/assets/actuallyadditions/models/block/battery_box.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/bio_reactor_block.json b/src/main/resources/assets/actuallyadditions/models/block/bio_reactor.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/bio_reactor_block.json rename to src/main/resources/assets/actuallyadditions/models/block/bio_reactor.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/black_quartz_smooth_block.json b/src/main/resources/assets/actuallyadditions/models/block/black_quartz_smooth_block.json deleted file mode 100644 index e269ec264..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/black_quartz_smooth_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/black_quartz_smooth_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/breaker_block.json b/src/main/resources/assets/actuallyadditions/models/block/breaker.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/breaker_block.json rename to src/main/resources/assets/actuallyadditions/models/block/breaker.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/canola_press_block.json b/src/main/resources/assets/actuallyadditions/models/block/canola_press.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/canola_press_block.json rename to src/main/resources/assets/actuallyadditions/models/block/canola_press.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/coal_generator_block.json b/src/main/resources/assets/actuallyadditions/models/block/coal_generator.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/coal_generator_block.json rename to src/main/resources/assets/actuallyadditions/models/block/coal_generator.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/coffee_machine_block.json b/src/main/resources/assets/actuallyadditions/models/block/coffee_machine.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/coffee_machine_block.json rename to src/main/resources/assets/actuallyadditions/models/block/coffee_machine.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/crusher_block.json b/src/main/resources/assets/actuallyadditions/models/block/crusher.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/crusher_block.json rename to src/main/resources/assets/actuallyadditions/models/block/crusher.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/crusher_double_block.json b/src/main/resources/assets/actuallyadditions/models/block/crusher_double.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/crusher_double_block.json rename to src/main/resources/assets/actuallyadditions/models/block/crusher_double.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_diamatine_block.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_diamatine.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_diamatine_block.json rename to src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_diamatine.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_emeradic_block.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_emeradic.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_emeradic_block.json rename to src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_emeradic.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_enori_block.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_enori.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_enori_block.json rename to src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_enori.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_palis_block.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_palis.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_palis_block.json rename to src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_palis.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_restonia_block.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_restonia.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_restonia_block.json rename to src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_restonia.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_void_block.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_void.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_void_block.json rename to src/main/resources/assets/actuallyadditions/models/block/crystal_cluster_void.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/crystal_enori_block.json b/src/main/resources/assets/actuallyadditions/models/block/crystal_enori_block.json deleted file mode 100644 index 05f13bfd8..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/crystal_enori_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/crystal_enori_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/directional_breaker_block.json b/src/main/resources/assets/actuallyadditions/models/block/directional_breaker.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/directional_breaker_block.json rename to src/main/resources/assets/actuallyadditions/models/block/directional_breaker.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/display_stand_block.json b/src/main/resources/assets/actuallyadditions/models/block/display_stand.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/display_stand_block.json rename to src/main/resources/assets/actuallyadditions/models/block/display_stand.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/double_powered_furnace_block.json b/src/main/resources/assets/actuallyadditions/models/block/double_powered_furnace.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/double_powered_furnace_block.json rename to src/main/resources/assets/actuallyadditions/models/block/double_powered_furnace.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/dropper_block.json b/src/main/resources/assets/actuallyadditions/models/block/dropper.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/dropper_block.json rename to src/main/resources/assets/actuallyadditions/models/block/dropper.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/empowerer_block.json b/src/main/resources/assets/actuallyadditions/models/block/empowerer.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/empowerer_block.json rename to src/main/resources/assets/actuallyadditions/models/block/empowerer.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/enderpearl_block.json b/src/main/resources/assets/actuallyadditions/models/block/enderpearl_block.json deleted file mode 100644 index b68e73c25..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/enderpearl_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/enderpearl_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/energizer_block.json b/src/main/resources/assets/actuallyadditions/models/block/energizer.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/energizer_block.json rename to src/main/resources/assets/actuallyadditions/models/block/energizer.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay_block.json b/src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay_block.json rename to src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay_advanced_block.json b/src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay_advanced.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay_advanced_block.json rename to src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay_advanced.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay_extreme_block.json b/src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay_extreme.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay_extreme_block.json rename to src/main/resources/assets/actuallyadditions/models/block/energy_laser_relay_extreme.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/enervator_block.json b/src/main/resources/assets/actuallyadditions/models/block/enervator.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/enervator_block.json rename to src/main/resources/assets/actuallyadditions/models/block/enervator.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/farmer_block.json b/src/main/resources/assets/actuallyadditions/models/block/farmer.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/farmer_block.json rename to src/main/resources/assets/actuallyadditions/models/block/farmer.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/feeder_block.json b/src/main/resources/assets/actuallyadditions/models/block/feeder.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/feeder_block.json rename to src/main/resources/assets/actuallyadditions/models/block/feeder.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/fermenting_barrel_block.json b/src/main/resources/assets/actuallyadditions/models/block/fermenting_barrel.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/fermenting_barrel_block.json rename to src/main/resources/assets/actuallyadditions/models/block/fermenting_barrel.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/firework_box_block.json b/src/main/resources/assets/actuallyadditions/models/block/firework_box.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/firework_box_block.json rename to src/main/resources/assets/actuallyadditions/models/block/firework_box.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/fluid_collector_block.json b/src/main/resources/assets/actuallyadditions/models/block/fluid_collector.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/fluid_collector_block.json rename to src/main/resources/assets/actuallyadditions/models/block/fluid_collector.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/fluid_placer_block.json b/src/main/resources/assets/actuallyadditions/models/block/fluid_placer.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/fluid_placer_block.json rename to src/main/resources/assets/actuallyadditions/models/block/fluid_placer.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/fluids_laser_relay_block.json b/src/main/resources/assets/actuallyadditions/models/block/fluids_laser_relay.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/fluids_laser_relay_block.json rename to src/main/resources/assets/actuallyadditions/models/block/fluids_laser_relay.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/greenhouse_glass_block.json b/src/main/resources/assets/actuallyadditions/models/block/greenhouse_glass.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/greenhouse_glass_block.json rename to src/main/resources/assets/actuallyadditions/models/block/greenhouse_glass.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/heat_collector_block.json b/src/main/resources/assets/actuallyadditions/models/block/heat_collector.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/heat_collector_block.json rename to src/main/resources/assets/actuallyadditions/models/block/heat_collector.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/hopping_item_interface_block.json b/src/main/resources/assets/actuallyadditions/models/block/hopping_item_interface.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/hopping_item_interface_block.json rename to src/main/resources/assets/actuallyadditions/models/block/hopping_item_interface.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/iron_casing_block.json b/src/main/resources/assets/actuallyadditions/models/block/iron_casing_block.json deleted file mode 100644 index 673f31063..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/iron_casing_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/iron_casing_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/item_interface_block.json b/src/main/resources/assets/actuallyadditions/models/block/item_interface.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/item_interface_block.json rename to src/main/resources/assets/actuallyadditions/models/block/item_interface.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/item_laser_relay_block.json b/src/main/resources/assets/actuallyadditions/models/block/item_laser_relay.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/item_laser_relay_block.json rename to src/main/resources/assets/actuallyadditions/models/block/item_laser_relay.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_black_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_black_block.json deleted file mode 100644 index 44527d0d1..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/lamp_black_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/lamp_black_on_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_blue_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_blue_block.json deleted file mode 100644 index 9cbeea4ef..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/lamp_blue_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/lamp_blue_on_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_brown_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_brown_block.json deleted file mode 100644 index 626db0d7a..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/lamp_brown_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/lamp_brown_on_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_controller_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_controller.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/lamp_controller_block.json rename to src/main/resources/assets/actuallyadditions/models/block/lamp_controller.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_cyan_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_cyan_block.json deleted file mode 100644 index 688d70e65..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/lamp_cyan_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/lamp_cyan_on_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_gray_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_gray_block.json deleted file mode 100644 index 4bf8865ad..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/lamp_gray_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/lamp_gray_on_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_green_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_green_block.json deleted file mode 100644 index 6d9efa6db..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/lamp_green_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/lamp_green_on_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_light_blue_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_light_blue_block.json deleted file mode 100644 index 0b470891c..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/lamp_light_blue_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/lamp_light_blue_on_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_light_gray_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_light_gray_block.json deleted file mode 100644 index 6cf1055f3..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/lamp_light_gray_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/lamp_light_gray_on_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_lime_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_lime_block.json deleted file mode 100644 index 4963e7182..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/lamp_lime_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/lamp_lime_on_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_magenta_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_magenta_block.json deleted file mode 100644 index bb44f0f45..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/lamp_magenta_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/lamp_magenta_on_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_orange_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_orange_block.json deleted file mode 100644 index 9e48bae8f..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/lamp_orange_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/lamp_orange_on_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_pink_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_pink_block.json deleted file mode 100644 index 6dcf9fabe..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/lamp_pink_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/lamp_pink_on_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_purple_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_purple_block.json deleted file mode 100644 index 49752de04..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/lamp_purple_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/lamp_purple_on_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_red_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_red_block.json deleted file mode 100644 index c2cb786d6..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/lamp_red_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/lamp_red_on_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_white_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_white_block.json deleted file mode 100644 index 0f2589124..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/lamp_white_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/lamp_white_on_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lamp_yellow_block.json b/src/main/resources/assets/actuallyadditions/models/block/lamp_yellow_block.json deleted file mode 100644 index 47cebabcc..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/lamp_yellow_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/lamp_yellow_on_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/lava_factory_case_block.json b/src/main/resources/assets/actuallyadditions/models/block/lava_factory_case.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/lava_factory_case_block.json rename to src/main/resources/assets/actuallyadditions/models/block/lava_factory_case.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/lava_factory_controller_block.json b/src/main/resources/assets/actuallyadditions/models/block/lava_factory_controller.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/lava_factory_controller_block.json rename to src/main/resources/assets/actuallyadditions/models/block/lava_factory_controller.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/leaf_generator_block.json b/src/main/resources/assets/actuallyadditions/models/block/leaf_generator.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/leaf_generator_block.json rename to src/main/resources/assets/actuallyadditions/models/block/leaf_generator.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/miner_block.json b/src/main/resources/assets/actuallyadditions/models/block/miner.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/miner_block.json rename to src/main/resources/assets/actuallyadditions/models/block/miner.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/oil_generator_block.json b/src/main/resources/assets/actuallyadditions/models/block/oil_generator.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/oil_generator_block.json rename to src/main/resources/assets/actuallyadditions/models/block/oil_generator.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/ore_black_quartz_block.json b/src/main/resources/assets/actuallyadditions/models/block/ore_black_quartz_block.json deleted file mode 100644 index 29c89c43f..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/ore_black_quartz_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/ore_black_quartz_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/phantom_booster_block.json b/src/main/resources/assets/actuallyadditions/models/block/phantom_booster.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/phantom_booster_block.json rename to src/main/resources/assets/actuallyadditions/models/block/phantom_booster.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/phantom_breaker_block.json b/src/main/resources/assets/actuallyadditions/models/block/phantom_breaker.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/phantom_breaker_block.json rename to src/main/resources/assets/actuallyadditions/models/block/phantom_breaker.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/phantom_energyface_block.json b/src/main/resources/assets/actuallyadditions/models/block/phantom_energyface.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/phantom_energyface_block.json rename to src/main/resources/assets/actuallyadditions/models/block/phantom_energyface.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/phantom_liquiface_block.json b/src/main/resources/assets/actuallyadditions/models/block/phantom_liquiface.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/phantom_liquiface_block.json rename to src/main/resources/assets/actuallyadditions/models/block/phantom_liquiface.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/phantom_placer_block.json b/src/main/resources/assets/actuallyadditions/models/block/phantom_placer.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/phantom_placer_block.json rename to src/main/resources/assets/actuallyadditions/models/block/phantom_placer.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/phantom_redstoneface_block.json b/src/main/resources/assets/actuallyadditions/models/block/phantom_redstoneface.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/phantom_redstoneface_block.json rename to src/main/resources/assets/actuallyadditions/models/block/phantom_redstoneface.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/phantomface_block.json b/src/main/resources/assets/actuallyadditions/models/block/phantomface.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/phantomface_block.json rename to src/main/resources/assets/actuallyadditions/models/block/phantomface.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/placer_block.json b/src/main/resources/assets/actuallyadditions/models/block/placer.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/placer_block.json rename to src/main/resources/assets/actuallyadditions/models/block/placer.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/player_interface_block.json b/src/main/resources/assets/actuallyadditions/models/block/player_interface.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/player_interface_block.json rename to src/main/resources/assets/actuallyadditions/models/block/player_interface.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/powered_furnace_block.json b/src/main/resources/assets/actuallyadditions/models/block/powered_furnace.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/powered_furnace_block.json rename to src/main/resources/assets/actuallyadditions/models/block/powered_furnace.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/ranged_collector_block.json b/src/main/resources/assets/actuallyadditions/models/block/ranged_collector.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/ranged_collector_block.json rename to src/main/resources/assets/actuallyadditions/models/block/ranged_collector.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/shock_suppressor_block.json b/src/main/resources/assets/actuallyadditions/models/block/shock_suppressor.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/shock_suppressor_block.json rename to src/main/resources/assets/actuallyadditions/models/block/shock_suppressor.json diff --git a/src/main/resources/assets/actuallyadditions/models/block/wood_casing_block.json b/src/main/resources/assets/actuallyadditions/models/block/wood_casing_block.json deleted file mode 100644 index eccc2e0af..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/wood_casing_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/wood_casing_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/xp_solidifier_block.json b/src/main/resources/assets/actuallyadditions/models/block/xp_solidifier.json similarity index 100% rename from src/main/resources/assets/actuallyadditions/models/block/xp_solidifier_block.json rename to src/main/resources/assets/actuallyadditions/models/block/xp_solidifier.json diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine.png b/src/main/resources/assets/actuallyadditions/textures/block/diamatine_crystal_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine.png rename to src/main/resources/assets/actuallyadditions/textures/block/diamatine_crystal_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic.png b/src/main/resources/assets/actuallyadditions/textures/block/emeradic_crystal_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic.png rename to src/main/resources/assets/actuallyadditions/textures/block/emeradic_crystal_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine_empowered.png b/src/main/resources/assets/actuallyadditions/textures/block/empowered_diamatine_crystal_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine_empowered.png rename to src/main/resources/assets/actuallyadditions/textures/block/empowered_diamatine_crystal_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine_empowered.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/empowered_diamatine_crystal_block.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine_empowered.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/empowered_diamatine_crystal_block.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic_empowered.png b/src/main/resources/assets/actuallyadditions/textures/block/empowered_emeradic_crystal_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic_empowered.png rename to src/main/resources/assets/actuallyadditions/textures/block/empowered_emeradic_crystal_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic_empowered.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/empowered_emeradic_crystal_block.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic_empowered.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/empowered_emeradic_crystal_block.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_empowered.png b/src/main/resources/assets/actuallyadditions/textures/block/empowered_enori_crystal_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_empowered.png rename to src/main/resources/assets/actuallyadditions/textures/block/empowered_enori_crystal_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_empowered.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/empowered_enori_crystal_block.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_empowered.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/empowered_enori_crystal_block.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_palis_empowered.png b/src/main/resources/assets/actuallyadditions/textures/block/empowered_palis_crystal_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_palis_empowered.png rename to src/main/resources/assets/actuallyadditions/textures/block/empowered_palis_crystal_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_palis_empowered.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/empowered_palis_crystal_block.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_palis_empowered.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/empowered_palis_crystal_block.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia_empowered.png b/src/main/resources/assets/actuallyadditions/textures/block/empowered_restonia_crystal_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia_empowered.png rename to src/main/resources/assets/actuallyadditions/textures/block/empowered_restonia_crystal_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia_empowered.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/empowered_restonia_crystal_block.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia_empowered.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/empowered_restonia_crystal_block.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_void_empowered.png b/src/main/resources/assets/actuallyadditions/textures/block/empowered_void_crystal_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_void_empowered.png rename to src/main/resources/assets/actuallyadditions/textures/block/empowered_void_crystal_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_void_empowered.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/empowered_void_crystal_block.png.mcmeta similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_void_empowered.png.mcmeta rename to src/main/resources/assets/actuallyadditions/textures/block/empowered_void_crystal_block.png.mcmeta diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_enori.png b/src/main/resources/assets/actuallyadditions/textures/block/enori_crystal_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_enori.png rename to src/main/resources/assets/actuallyadditions/textures/block/enori_crystal_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_palis.png b/src/main/resources/assets/actuallyadditions/textures/block/palis_crystal_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_palis.png rename to src/main/resources/assets/actuallyadditions/textures/block/palis_crystal_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia.png b/src/main/resources/assets/actuallyadditions/textures/block/restonia_crystal_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_restonia.png rename to src/main/resources/assets/actuallyadditions/textures/block/restonia_crystal_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_void.png b/src/main/resources/assets/actuallyadditions/textures/block/void_crystal_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_void.png rename to src/main/resources/assets/actuallyadditions/textures/block/void_crystal_block.png