From 5fba4e97109dc66f4db6341534a22470e6e27a6d Mon Sep 17 00:00:00 2001 From: Michael Hillcox Date: Sat, 21 Nov 2020 19:55:04 +0000 Subject: [PATCH] Fixed some name issues, added feature code to Crystal block, cluster and added walls to the block tag rules --- src/generated/resources/.cache/cache | 65 +++++++------ .../blockstates/crystal_enori_block.json | 7 ++ .../crystal_enori_empowered_block.json | 7 ++ .../blockstates/crystal_quarts_block.json | 7 -- .../crystal_quarts_empowered_block.json | 7 -- .../blockstates/green_block.json | 7 ++ .../blockstates/green_fence_block.json | 48 --------- .../blockstates/green_slab_block.json | 2 +- .../blockstates/green_wall_block.json | 91 +++++++++++++++++- .../blockstates/white_block.json | 7 ++ .../blockstates/white_fence_block.json | 48 --------- .../blockstates/white_slab_block.json | 2 +- .../blockstates/white_wall_block.json | 91 +++++++++++++++++- .../assets/actuallyadditions/lang/en_us.json | 10 +- ...ts_block.json => crystal_enori_block.json} | 2 +- .../block/crystal_enori_empowered_block.json | 6 ++ .../block/crystal_quarts_empowered_block.json | 6 -- ...green_wall_block.json => green_block.json} | 2 +- .../models/block/green_fence_block_post.json | 6 -- .../models/block/green_fence_block_side.json | 6 -- .../models/block/green_slab_block.json | 6 +- .../models/block/green_slab_block_top.json | 6 +- .../models/block/green_stairs_block.json | 6 +- .../block/green_stairs_block_inner.json | 6 +- .../block/green_stairs_block_outer.json | 6 +- .../models/block/green_wall_block_post.json | 6 ++ .../models/block/green_wall_block_side.json | 6 ++ .../block/green_wall_block_side_tall.json | 6 ++ ...white_wall_block.json => white_block.json} | 2 +- .../models/block/white_fence_block_post.json | 6 -- .../models/block/white_fence_block_side.json | 6 -- .../models/block/white_slab_block.json | 6 +- .../models/block/white_slab_block_top.json | 6 +- .../models/block/white_stairs_block.json | 6 +- .../block/white_stairs_block_inner.json | 6 +- .../block/white_stairs_block_outer.json | 6 +- .../models/block/white_wall_block_post.json | 6 ++ .../models/block/white_wall_block_side.json | 6 ++ .../block/white_wall_block_side_tall.json | 6 ++ .../models/item/crystal_enori_block.json | 3 + .../item/crystal_enori_empowered_block.json | 3 + .../models/item/crystal_quarts_block.json | 3 - .../item/crystal_quarts_empowered_block.json | 3 - .../models/item/green_block.json | 3 + .../models/item/green_fence_block.json | 3 - .../models/item/white_block.json | 3 + .../models/item/white_fence_block.json | 3 - .../data/minecraft/tags/blocks/walls.json | 10 ++ .../common/blocks/ActuallyBlocks.java | 23 +++-- .../common/blocks/building/CrystalBlock.java | 22 ++++- .../blocks/building/CrystalClusterBlock.java | 30 +++++- .../common/blocks/building/FenceBlock.java | 22 ----- .../actuallyadditions/data/ActuallyGens.java | 1 + .../data/GeneratorBlockStates.java | 22 ++--- .../data/GeneratorBlockTags.java | 45 +++++++++ .../data/GeneratorLanguage.java | 16 +-- ...ystal_diamatine_empowered_block.png.mcmeta | 7 ++ ...rystal_emeradic_empowered_block.png.mcmeta | 7 ++ ...arts_block.png => crystal_enori_block.png} | Bin ....png => crystal_enori_empowered_block.png} | Bin .../crystal_enori_empowered_block.png.mcmeta | 7 ++ .../crystal_palis_empowered_block.png.mcmeta | 7 ++ ...ystal_redstonia_empowered_block.png.mcmeta | 7 ++ .../crystal_void_empowered_block.png.mcmeta | 7 ++ .../{green_wall_block.png => green_block.png} | Bin .../{white_wall_block.png => white_block.png} | Bin 66 files changed, 508 insertions(+), 286 deletions(-) create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_enori_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_enori_empowered_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_quarts_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/crystal_quarts_empowered_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/green_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/green_fence_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/white_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/white_fence_block.json rename src/generated/resources/assets/actuallyadditions/models/block/{crystal_quarts_block.json => crystal_enori_block.json} (52%) create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/crystal_enori_empowered_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/block/crystal_quarts_empowered_block.json rename src/generated/resources/assets/actuallyadditions/models/block/{green_wall_block.json => green_block.json} (53%) delete mode 100644 src/generated/resources/assets/actuallyadditions/models/block/green_fence_block_post.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/block/green_fence_block_side.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/green_wall_block_post.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/green_wall_block_side.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/green_wall_block_side_tall.json rename src/generated/resources/assets/actuallyadditions/models/block/{white_wall_block.json => white_block.json} (53%) delete mode 100644 src/generated/resources/assets/actuallyadditions/models/block/white_fence_block_post.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/block/white_fence_block_side.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/white_wall_block_post.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/white_wall_block_side.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/block/white_wall_block_side_tall.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_enori_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_enori_empowered_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_quarts_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/crystal_quarts_empowered_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/green_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/green_fence_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/white_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/white_fence_block.json create mode 100644 src/generated/resources/data/minecraft/tags/blocks/walls.json delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/FenceBlock.java create mode 100644 src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockTags.java create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine_empowered_block.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic_empowered_block.png.mcmeta rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_quarts_block.png => crystal_enori_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{crystal_quarts_empowered_block.png => crystal_enori_empowered_block.png} (100%) create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_empowered_block.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/crystal_palis_empowered_block.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/crystal_redstonia_empowered_block.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/crystal_void_empowered_block.png.mcmeta rename src/main/resources/assets/actuallyadditions/textures/block/{green_wall_block.png => green_block.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{white_wall_block.png => white_block.png} (100%) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 951659a70..53b4b7923 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -34,10 +34,10 @@ a49100a962fea3fa49d8fec98843a17cfa48bfc7 assets/actuallyadditions/blockstates/co a757320af880ae84e22a98350dd873253111a97e assets/actuallyadditions/blockstates/crystal_diamatine_empowered_block.json a9f79bb1d3ab85883d89ab56ebecbb3b71ce59ab assets/actuallyadditions/blockstates/crystal_emeradic_block.json a99dc8ba0864988f9e20513e11b60c1d9c47f18b assets/actuallyadditions/blockstates/crystal_emeradic_empowered_block.json +7038760411c628d888f80c266ee54a2e68da57c9 assets/actuallyadditions/blockstates/crystal_enori_block.json +a3c44dea48b0f6892ed2a901cf5fb7b16d633704 assets/actuallyadditions/blockstates/crystal_enori_empowered_block.json de129f49b2fc5184a23851544be9d4282bf13b85 assets/actuallyadditions/blockstates/crystal_palis_block.json 5d053e3ae3ca4d25c2a20e7cb93f1ee9eae6eaae assets/actuallyadditions/blockstates/crystal_palis_empowered_block.json -661abe022841ca315050cd42ab1513a6bf7f129d assets/actuallyadditions/blockstates/crystal_quarts_block.json -1f76d7b4fd66b4656708245c645ce54dd18b2ede assets/actuallyadditions/blockstates/crystal_quarts_empowered_block.json 0a5efe6937f35891b879ec88dfbe841b83c0e11b assets/actuallyadditions/blockstates/crystal_restonia_block.json 894c6c628df3c766d7d8a19711470899bb030368 assets/actuallyadditions/blockstates/crystal_restonia_empowered_block.json 8ad2faa40e3c592773cb5bfb5f428fb9b33be0e3 assets/actuallyadditions/blockstates/crystal_void_block.json @@ -64,10 +64,10 @@ c3cb96f297ec4e3fd0571dcacc331883e56414f8 assets/actuallyadditions/blockstates/fl 6ab4ddadd6e44f4c6661ce2b8dd6a5dc78202554 assets/actuallyadditions/blockstates/fluid_collector_block.json 495c7ffb20099457fc8642c1450855d8673cd6f2 assets/actuallyadditions/blockstates/fluid_placer_block.json c361e00ee977a53e4ff68869a221c57e8b794ce4 assets/actuallyadditions/blockstates/fluids_laser_relay_block.json -1da0061dfba859490a0d9fba8482fad61be6ae9b assets/actuallyadditions/blockstates/green_fence_block.json -3793635a0e676cda0c4bc29df48d1be5505e3e9d assets/actuallyadditions/blockstates/green_slab_block.json +9a88773ad0e8accbe94d773e2ebd2212225359f9 assets/actuallyadditions/blockstates/green_block.json +a6a7461c7d71b5350644d2ae3b74fe818bd8f784 assets/actuallyadditions/blockstates/green_slab_block.json f54fe2d4ebaa81e1bef8ca575e40cabc72814d0e assets/actuallyadditions/blockstates/green_stairs_block.json -28cea920c23fc74e6b84e856afbac2c22f04f611 assets/actuallyadditions/blockstates/green_wall_block.json +2dfed79ee9f053505c026cbd0fecf77741aac332 assets/actuallyadditions/blockstates/green_wall_block.json 7a7d204e8a120ef29249c784855afb9736dde472 assets/actuallyadditions/blockstates/greenhouse_glass_block.json 7fa4f8d30b6afb1a1ef20862d2a3dda65d9cd040 assets/actuallyadditions/blockstates/heat_collector_block.json 6d3608a54573e2096bd36089163721b6b18fc8a7 assets/actuallyadditions/blockstates/hopping_item_interface_block.json @@ -116,13 +116,13 @@ c3cf146fb712a6ab4476201a471ac14e47f90c67 assets/actuallyadditions/blockstates/ra 0f310d143c8504d103ca060957a553bd58cf2259 assets/actuallyadditions/blockstates/solar_panel_block.json 5e4a1515853930ee4db617a7ebe2d81e8d00eac1 assets/actuallyadditions/blockstates/tiny_torch_block.json bdf1cc88bd235a3ee9451feb8acc081f7b6745b7 assets/actuallyadditions/blockstates/treasure_chest_block.json -24610c651f3b6d77b7277c412a58170d4a813f67 assets/actuallyadditions/blockstates/white_fence_block.json -3ff28c9e36b52a7ca9947de5297286f24533ab97 assets/actuallyadditions/blockstates/white_slab_block.json +e2c81adfe240117fa0ce2e3dfcfd04f4e1034153 assets/actuallyadditions/blockstates/white_block.json +26a953098e27b4043b5f4a98a63703dc6d4f36a4 assets/actuallyadditions/blockstates/white_slab_block.json 009f53924868e115c6bbe861a7922752261481dd assets/actuallyadditions/blockstates/white_stairs_block.json -1e76d2e4596765fb35e4f61c4535a8dcd9dcd248 assets/actuallyadditions/blockstates/white_wall_block.json +3670535838b4c26d01afe7ee4807c53a6cbaba12 assets/actuallyadditions/blockstates/white_wall_block.json 78e89628e3c6e891f2994b2a1794672f69826516 assets/actuallyadditions/blockstates/wood_casing_block.json 207adf3d139369e983100a6002f6f77d36d40916 assets/actuallyadditions/blockstates/xp_solidifier_block.json -c8e01af1c651c88d2bd8e9cd03cabf079b0e4c7a assets/actuallyadditions/lang/en_us.json +eebd14886a3c1958765f54a3b7a19d0e28813c5a assets/actuallyadditions/lang/en_us.json 8ce3f2af3288773fb581a3668c2cb90b64c9ee2f assets/actuallyadditions/models/block/advanced_item_laser_relay_block.json cc4fcbe75d6f858567a944e45cdc49711ad4c2cc assets/actuallyadditions/models/block/atomic_reconstructor_block.json 16a76926a07fc8fa10e4a3949d15ad2ca6920bb8 assets/actuallyadditions/models/block/battery_box_block.json @@ -174,10 +174,10 @@ c988df36707140e6b67b0d8a85b289f4d469778a assets/actuallyadditions/models/block/c 64a6619bceaab9846ebfe2326c2d1dc0299fda70 assets/actuallyadditions/models/block/crystal_diamatine_empowered_block.json ea5b05b6a39d8844628c832d73b524b20801704b assets/actuallyadditions/models/block/crystal_emeradic_block.json 5fa3ac72ebb891302c2a2dd91909cfd6c973af80 assets/actuallyadditions/models/block/crystal_emeradic_empowered_block.json +a32532b7ee97a5965c9dc3ff1067e16e123cf487 assets/actuallyadditions/models/block/crystal_enori_block.json +2ae9a4d5b1dce4d5eaf8cf97afdcf5d505993106 assets/actuallyadditions/models/block/crystal_enori_empowered_block.json e8c5da8af297132ee5bb0a0736eb5524e5ae0085 assets/actuallyadditions/models/block/crystal_palis_block.json c6335ebc65b2a6f72888157e0b12ca65667b5b21 assets/actuallyadditions/models/block/crystal_palis_empowered_block.json -fa292041b8ff3c1565c60482352aa0c96c1e2efc assets/actuallyadditions/models/block/crystal_quarts_block.json -063f41a23cf8b34ce3b29494b20d31e385e1d69e assets/actuallyadditions/models/block/crystal_quarts_empowered_block.json 58326e64c25814d1aa0961c61a51faaecc30bead assets/actuallyadditions/models/block/crystal_restonia_block.json 1a8955bcbf454617c0ca3ffc9f8a8536381eaebd assets/actuallyadditions/models/block/crystal_restonia_empowered_block.json 6f515acf2903ad23021e470dc7d0f016e9108e22 assets/actuallyadditions/models/block/crystal_void_block.json @@ -204,14 +204,15 @@ f1c3add14ec2f3623cc7ffb06e416212b5f251f5 assets/actuallyadditions/models/block/d 992c7f7cd2fd6bb80e84eef60930090e88aa9fe0 assets/actuallyadditions/models/block/fluid_collector_block.json 6d67b2ecdbbb8be56db49d0d28369211d7ca1ea6 assets/actuallyadditions/models/block/fluid_placer_block.json 13c818ed50a0226ec4f66960ce3cda19f337a767 assets/actuallyadditions/models/block/fluids_laser_relay_block.json -e8dceb40a71c3ea189142644879788ae27880bb4 assets/actuallyadditions/models/block/green_fence_block_post.json -7f15bdad8ea0ad26dc1f2f010b980c0b42b78297 assets/actuallyadditions/models/block/green_fence_block_side.json -7dc664f89cf7cd765a556b6595cbec9647d14b36 assets/actuallyadditions/models/block/green_slab_block.json -8478d3ca4c1c2b5515e19b3cb9f729bad3049e77 assets/actuallyadditions/models/block/green_slab_block_top.json -c7115f4ed8dff2277f5b613660d0d877ff80b769 assets/actuallyadditions/models/block/green_stairs_block.json -2338c4c2cf06951c7372b41239f763fb998d8c09 assets/actuallyadditions/models/block/green_stairs_block_inner.json -4bbd7c12f37b81aa243964b0c2d6f54efaae45b1 assets/actuallyadditions/models/block/green_stairs_block_outer.json -9efbbb43248fe7829ac93cfeb6f66ef84299972a assets/actuallyadditions/models/block/green_wall_block.json +586306ae4f8486b4ae789fad4fc0923449eed3d9 assets/actuallyadditions/models/block/green_block.json +f79d0e026988703dd5247913c28f488a322b3ba6 assets/actuallyadditions/models/block/green_slab_block.json +38c171b9cc5adba380a7ded0d82ef1c845f3ea19 assets/actuallyadditions/models/block/green_slab_block_top.json +98c847e4658971a93f63ebef53e1485c926b1cce assets/actuallyadditions/models/block/green_stairs_block.json +0e1160f32a239f177603ee507f2fc02299c392b9 assets/actuallyadditions/models/block/green_stairs_block_inner.json +7ed6085fec4ecfbd264be52dd813220b4417ca1d assets/actuallyadditions/models/block/green_stairs_block_outer.json +fa6e4278c92ea1b564bccc6d67c1b668d2a5fdc8 assets/actuallyadditions/models/block/green_wall_block_post.json +f98e633be86aa8f656e6eae4a10fbc92704c8a51 assets/actuallyadditions/models/block/green_wall_block_side.json +35dc79555bbaec8a36389515fb3dbe263e81aa3a assets/actuallyadditions/models/block/green_wall_block_side_tall.json fb6a2fdf86c26ea81bcde867e259b25681b6c010 assets/actuallyadditions/models/block/greenhouse_glass_block.json c5dd93f040f3e4fc68f10570262dccdd7a426244 assets/actuallyadditions/models/block/heat_collector_block.json d43971145be2910eefae6632306e4c36c1db54a5 assets/actuallyadditions/models/block/hopping_item_interface_block.json @@ -260,14 +261,15 @@ b3be81956ac79cbccc690e66589f362aecc7caf1 assets/actuallyadditions/models/block/s 63f7b900998eb89aa4106c4daa8c03d34c9bb9f3 assets/actuallyadditions/models/block/solar_panel_block.json d4566284fbb72145915dd3c7804f674f8d1c98be assets/actuallyadditions/models/block/tiny_torch_block.json 18d7ca4ca3d062756fb9455258a070c4580413dc assets/actuallyadditions/models/block/treasure_chest_block.json -45bf495c1cf419512139b2fc1c2a5e9b96ba9296 assets/actuallyadditions/models/block/white_fence_block_post.json -d597a9b7cc805de40b04f768c2bba1d4274e4806 assets/actuallyadditions/models/block/white_fence_block_side.json -f897a126aaef29c26152725f89b860570c392be3 assets/actuallyadditions/models/block/white_slab_block.json -dbe133d943d82467857fcfad45efc16a6c8eae6d assets/actuallyadditions/models/block/white_slab_block_top.json -e15ab8887f2dc7cb3053e5de36459b4674bfa3cd assets/actuallyadditions/models/block/white_stairs_block.json -d902b69fd284f4d1b434e5f216ea6373ad25b56f assets/actuallyadditions/models/block/white_stairs_block_inner.json -e2e134c8211fad3af8101068eaa8e3a7a7054b10 assets/actuallyadditions/models/block/white_stairs_block_outer.json -a6297276b8e80986289d808fb9de1202ce342080 assets/actuallyadditions/models/block/white_wall_block.json +150a875c60a9879f00a192326fb9fded362e020e assets/actuallyadditions/models/block/white_block.json +844fb52aad24436d035706aa47a4712c50e4405c assets/actuallyadditions/models/block/white_slab_block.json +c88728a8c7c69d41f9dddf90685a97a476053f85 assets/actuallyadditions/models/block/white_slab_block_top.json +2f02d2ecc6e4f08af6f6846077c649844f73d4de assets/actuallyadditions/models/block/white_stairs_block.json +e8dd484b908c4b17358d75d048b2af707ed96d31 assets/actuallyadditions/models/block/white_stairs_block_inner.json +c232ece699050c847c8994e5d42f0a9f2510ccaa assets/actuallyadditions/models/block/white_stairs_block_outer.json +8d5f0f489d8165df096d5836b263b020f5a745ff assets/actuallyadditions/models/block/white_wall_block_post.json +449b01ba4bf0d40c946916438b7bbe4da310a7c3 assets/actuallyadditions/models/block/white_wall_block_side.json +fe3f515068177c7ecc0d91373a5b917fc08f4e5d assets/actuallyadditions/models/block/white_wall_block_side_tall.json 51dfe7c1ab6f58f20395d921e475867ce35950b4 assets/actuallyadditions/models/block/wood_casing_block.json d9c371a1569a8bfdaa4c6d2f90af550e28378772 assets/actuallyadditions/models/block/xp_solidifier_block.json f8092e976c50d90ff29ca2dd4bccfd845ab299b7 assets/actuallyadditions/models/item/advanced_item_laser_relay_block.json @@ -308,10 +310,10 @@ c7a4c16801d226cf48cbcafd446050a179980b08 assets/actuallyadditions/models/item/cr b5e60c58aa8d54b81be41e542130b814ed902613 assets/actuallyadditions/models/item/crystal_diamatine_empowered_block.json e144d9a646c1eb32c6787601109f89311d05b873 assets/actuallyadditions/models/item/crystal_emeradic_block.json 3dfc6cdcf60315b4e40d2b6359184488c6880c9d assets/actuallyadditions/models/item/crystal_emeradic_empowered_block.json +3aa83e7e9eb8d3ad92c6d4f6748aeb06afc04310 assets/actuallyadditions/models/item/crystal_enori_block.json +0922992c39e81c74dc2cef2516e4ec8a31aba361 assets/actuallyadditions/models/item/crystal_enori_empowered_block.json f8780e974f2da4b88d3b65d53fde0c05650f6f54 assets/actuallyadditions/models/item/crystal_palis_block.json dca305818e1daf966bce9eb424d13dbcbdcf127a assets/actuallyadditions/models/item/crystal_palis_empowered_block.json -cc937bf0402633637bb503680139ab98b5b819a1 assets/actuallyadditions/models/item/crystal_quarts_block.json -6aedd71e14def214e372e61ba034bbdfc623bd42 assets/actuallyadditions/models/item/crystal_quarts_empowered_block.json 73710173d48090a864754cafe34975657f0e4adb assets/actuallyadditions/models/item/crystal_restonia_block.json 0cad4a4ebd25b5c9bde998dbfd882fba3265e938 assets/actuallyadditions/models/item/crystal_restonia_empowered_block.json af1f5da310b381b33448253efb60dbe483a45aa3 assets/actuallyadditions/models/item/crystal_void_block.json @@ -377,7 +379,7 @@ a159872078f26db6fe09c7e09b8caa3e892f4294 assets/actuallyadditions/models/item/en 86dc57da732f6dccb9fbf215baef75a9fc2a35fd assets/actuallyadditions/models/item/fluid_collector_block.json e09bdbddcd177907aaed963f848dfa0f51271ed4 assets/actuallyadditions/models/item/fluid_placer_block.json fa68689be3f4311d003c628b7831ecee9fd80e72 assets/actuallyadditions/models/item/fluids_laser_relay_block.json -19641ba14214334fa4c502f34cc109d8804f3323 assets/actuallyadditions/models/item/green_fence_block.json +b5c343509b6ae48e965a23cd5f3c74e85e4f7d64 assets/actuallyadditions/models/item/green_block.json 4c5a678dc881c854dcb2d6f2123ed5e459fb4856 assets/actuallyadditions/models/item/green_slab_block.json b25412614db4eb1b196fb8c1d29db3929506eaec assets/actuallyadditions/models/item/green_stairs_block.json 2eb66d4cffb3400d6aa08f21d0bb0bd2e762a628 assets/actuallyadditions/models/item/green_wall_block.json @@ -477,9 +479,10 @@ e62936f8ce3af90b6d6b1d9e379e3164d338e9c6 assets/actuallyadditions/models/item/vo ee36da9a021297b34b30e4979c30eb63835b2a6b assets/actuallyadditions/models/item/void_pickaxe.json 3130b0d1d84eb76ae29a402c6f6720d6c5eb0dfd assets/actuallyadditions/models/item/void_shovel.json 885555ad87ba088765384763091c87f05ed388f1 assets/actuallyadditions/models/item/void_sword.json -bc7e64bfbab905b96bca2b921617044d5bc6d3e7 assets/actuallyadditions/models/item/white_fence_block.json +bb3367e2a5b29e64ab8e0626603732152aec7d05 assets/actuallyadditions/models/item/white_block.json 18c64ee5cf2a0e93e561cb60e1203868dea6424e assets/actuallyadditions/models/item/white_slab_block.json ff80a66586e72226565ede5db5968bba67a09446 assets/actuallyadditions/models/item/white_stairs_block.json 2c72c538e9ad6eb2324833ae01c8a89f33e68173 assets/actuallyadditions/models/item/white_wall_block.json 018d9aae3519daccd557d07e541686fcb2456b53 assets/actuallyadditions/models/item/wood_casing_block.json 5ee8c662c6e0448c4b6a14c03456a9e68c4dd947 assets/actuallyadditions/models/item/xp_solidifier_block.json +5239d485f4e09b7fcf806d00913183dbca09c2dd data/minecraft/tags/blocks/walls.json diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_enori_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_enori_block.json new file mode 100644 index 000000000..b42d529f3 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_enori_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/crystal_enori_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_enori_empowered_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_enori_empowered_block.json new file mode 100644 index 000000000..917bbdf89 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_enori_empowered_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/crystal_enori_empowered_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_quarts_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_quarts_block.json deleted file mode 100644 index 16d00f1f1..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_quarts_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/crystal_quarts_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_quarts_empowered_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/crystal_quarts_empowered_block.json deleted file mode 100644 index 6c09ad145..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/crystal_quarts_empowered_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/crystal_quarts_empowered_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/green_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/green_block.json new file mode 100644 index 000000000..4f823d390 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/green_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/green_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/green_fence_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/green_fence_block.json deleted file mode 100644 index e45230221..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/green_fence_block.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "actuallyadditions:block/green_fence_block_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "actuallyadditions:block/green_fence_block_side", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "actuallyadditions:block/green_fence_block_side", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "actuallyadditions:block/green_fence_block_side", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "actuallyadditions:block/green_fence_block_side", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/green_slab_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/green_slab_block.json index 990fa3bca..4eab4ffc5 100644 --- a/src/generated/resources/assets/actuallyadditions/blockstates/green_slab_block.json +++ b/src/generated/resources/assets/actuallyadditions/blockstates/green_slab_block.json @@ -7,7 +7,7 @@ "model": "actuallyadditions:block/green_slab_block" }, "type=double": { - "model": "actuallyadditions:block/green_wall_block" + "model": "actuallyadditions:block/green_block" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/green_wall_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/green_wall_block.json index 686e6cb3d..aa7038152 100644 --- a/src/generated/resources/assets/actuallyadditions/blockstates/green_wall_block.json +++ b/src/generated/resources/assets/actuallyadditions/blockstates/green_wall_block.json @@ -1,7 +1,90 @@ { - "variants": { - "": { - "model": "actuallyadditions:block/green_wall_block" + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "actuallyadditions:block/green_wall_block_post" + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "actuallyadditions:block/green_wall_block_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "actuallyadditions:block/green_wall_block_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "actuallyadditions:block/green_wall_block_side", + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "actuallyadditions:block/green_wall_block_side_tall", + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "actuallyadditions:block/green_wall_block_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "actuallyadditions:block/green_wall_block_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "actuallyadditions:block/green_wall_block_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "actuallyadditions:block/green_wall_block_side_tall", + "y": 270, + "uvlock": true + } } - } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/white_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/white_block.json new file mode 100644 index 000000000..9739715f9 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/blockstates/white_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "actuallyadditions:block/white_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/white_fence_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/white_fence_block.json deleted file mode 100644 index 0da629d09..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/white_fence_block.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "actuallyadditions:block/white_fence_block_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "actuallyadditions:block/white_fence_block_side", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "actuallyadditions:block/white_fence_block_side", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "actuallyadditions:block/white_fence_block_side", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "actuallyadditions:block/white_fence_block_side", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/white_slab_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/white_slab_block.json index ef1253638..18f17acd5 100644 --- a/src/generated/resources/assets/actuallyadditions/blockstates/white_slab_block.json +++ b/src/generated/resources/assets/actuallyadditions/blockstates/white_slab_block.json @@ -7,7 +7,7 @@ "model": "actuallyadditions:block/white_slab_block" }, "type=double": { - "model": "actuallyadditions:block/white_wall_block" + "model": "actuallyadditions:block/white_block" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/white_wall_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/white_wall_block.json index 578b1a358..b480b7691 100644 --- a/src/generated/resources/assets/actuallyadditions/blockstates/white_wall_block.json +++ b/src/generated/resources/assets/actuallyadditions/blockstates/white_wall_block.json @@ -1,7 +1,90 @@ { - "variants": { - "": { - "model": "actuallyadditions:block/white_wall_block" + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "actuallyadditions:block/white_wall_block_post" + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "actuallyadditions:block/white_wall_block_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "actuallyadditions:block/white_wall_block_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "actuallyadditions:block/white_wall_block_side", + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "actuallyadditions:block/white_wall_block_side_tall", + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "actuallyadditions:block/white_wall_block_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "actuallyadditions:block/white_wall_block_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "actuallyadditions:block/white_wall_block_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "actuallyadditions:block/white_wall_block_side_tall", + "y": 270, + "uvlock": true + } } - } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/lang/en_us.json b/src/generated/resources/assets/actuallyadditions/lang/en_us.json index 9296f209c..be2e5c290 100644 --- a/src/generated/resources/assets/actuallyadditions/lang/en_us.json +++ b/src/generated/resources/assets/actuallyadditions/lang/en_us.json @@ -23,7 +23,7 @@ "block.actuallyadditions.coal_generator_block": "Coal Generator", "block.actuallyadditions.coffee_block": "Coffee", "block.actuallyadditions.coffee_machine_block": "Coffee Machine", - "block.actuallyadditions.crusher_block": "Grinder", + "block.actuallyadditions.crusher_block": "Crusher", "block.actuallyadditions.crusher_double_block": "Double Crusher", "block.actuallyadditions.crystal_cluster_diamatine_block": "Diamatine Crystal Cluster", "block.actuallyadditions.crystal_cluster_emeradic_block": "Emeradic Crystal Cluster", @@ -35,10 +35,10 @@ "block.actuallyadditions.crystal_diamatine_empowered_block": "Block of Empowered Diamatine Crystals", "block.actuallyadditions.crystal_emeradic_block": "Block of Emeradic Crystals", "block.actuallyadditions.crystal_emeradic_empowered_block": "Block of Empowered Emeradic Crystals", + "block.actuallyadditions.crystal_enori_block": "Block of Enori Crystals", + "block.actuallyadditions.crystal_enori_empowered_block": "Block of Empowered Enori Crystals", "block.actuallyadditions.crystal_palis_block": "Block of Palis Crystals", "block.actuallyadditions.crystal_palis_empowered_block": "Block of Empowered Palis Crystals", - "block.actuallyadditions.crystal_quarts_block": "?", - "block.actuallyadditions.crystal_quarts_empowered_block": "", "block.actuallyadditions.crystal_restonia_block": "Block of Restonia Crystals", "block.actuallyadditions.crystal_restonia_empowered_block": "Block of Empowered Restonia Crystals", "block.actuallyadditions.crystal_void_block": "Block of Void Crystals", @@ -65,7 +65,7 @@ "block.actuallyadditions.fluid_collector_block": "Fluid Collector", "block.actuallyadditions.fluid_placer_block": "Fluid Placer", "block.actuallyadditions.fluids_laser_relay_block": "Fluid Laser Relay", - "block.actuallyadditions.green_fence_block": "Ethentic Green Fence", + "block.actuallyadditions.green_block": "Ethentic Green Wall", "block.actuallyadditions.green_slab_block": "Ethentic Green Slab", "block.actuallyadditions.green_stairs_block": "Ethentic Green Stairs", "block.actuallyadditions.green_wall_block": "Ethentic Green Wall", @@ -117,7 +117,7 @@ "block.actuallyadditions.solar_panel_block": "Solar Panel", "block.actuallyadditions.tiny_torch_block": "Tiny Torch", "block.actuallyadditions.treasure_chest_block": "Treasure Chest", - "block.actuallyadditions.white_fence_block": "Ethentic Quartz Fence", + "block.actuallyadditions.white_block": "Ethentic Quartz Wall", "block.actuallyadditions.white_slab_block": "Ethentic Quartz Slab", "block.actuallyadditions.white_stairs_block": "Ethentic Quartz Stairs", "block.actuallyadditions.white_wall_block": "Ethentic Quartz Wall", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_quarts_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_enori_block.json similarity index 52% rename from src/generated/resources/assets/actuallyadditions/models/block/crystal_quarts_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/crystal_enori_block.json index 9d5c28a2c..05f13bfd8 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_quarts_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_enori_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/crystal_quarts_block" + "all": "actuallyadditions:block/crystal_enori_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_enori_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_enori_empowered_block.json new file mode 100644 index 000000000..d58c90ccf --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/crystal_enori_empowered_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "actuallyadditions:block/crystal_enori_empowered_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/crystal_quarts_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/block/crystal_quarts_empowered_block.json deleted file mode 100644 index dd133f1cc..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/block/crystal_quarts_empowered_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/crystal_quarts_empowered_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/green_wall_block.json b/src/generated/resources/assets/actuallyadditions/models/block/green_block.json similarity index 53% rename from src/generated/resources/assets/actuallyadditions/models/block/green_wall_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/green_block.json index 847f55a2b..b66f7b05b 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/green_wall_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/green_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/green_wall_block" + "all": "actuallyadditions:block/green_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/green_fence_block_post.json b/src/generated/resources/assets/actuallyadditions/models/block/green_fence_block_post.json deleted file mode 100644 index 7cae4cc31..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/block/green_fence_block_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_post", - "textures": { - "texture": "actuallyadditions:block/green_wall_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/green_fence_block_side.json b/src/generated/resources/assets/actuallyadditions/models/block/green_fence_block_side.json deleted file mode 100644 index dfd3dfd95..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/block/green_fence_block_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_side", - "textures": { - "texture": "actuallyadditions:block/green_wall_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/green_slab_block.json b/src/generated/resources/assets/actuallyadditions/models/block/green_slab_block.json index 022619632..35dfaa764 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/green_slab_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/green_slab_block.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "actuallyadditions:block/green_wall_block", - "bottom": "actuallyadditions:block/green_wall_block", - "top": "actuallyadditions:block/green_wall_block" + "side": "actuallyadditions:block/green_block", + "bottom": "actuallyadditions:block/green_block", + "top": "actuallyadditions:block/green_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/green_slab_block_top.json b/src/generated/resources/assets/actuallyadditions/models/block/green_slab_block_top.json index 8acfc9f7c..452a012ed 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/green_slab_block_top.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/green_slab_block_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "actuallyadditions:block/green_wall_block", - "bottom": "actuallyadditions:block/green_wall_block", - "top": "actuallyadditions:block/green_wall_block" + "side": "actuallyadditions:block/green_block", + "bottom": "actuallyadditions:block/green_block", + "top": "actuallyadditions:block/green_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/green_stairs_block.json b/src/generated/resources/assets/actuallyadditions/models/block/green_stairs_block.json index 67de62444..ae29207a6 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/green_stairs_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/green_stairs_block.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "actuallyadditions:block/green_wall_block", - "bottom": "actuallyadditions:block/green_wall_block", - "top": "actuallyadditions:block/green_wall_block" + "side": "actuallyadditions:block/green_block", + "bottom": "actuallyadditions:block/green_block", + "top": "actuallyadditions:block/green_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/green_stairs_block_inner.json b/src/generated/resources/assets/actuallyadditions/models/block/green_stairs_block_inner.json index 15f80f8b9..8043c602c 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/green_stairs_block_inner.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/green_stairs_block_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "actuallyadditions:block/green_wall_block", - "bottom": "actuallyadditions:block/green_wall_block", - "top": "actuallyadditions:block/green_wall_block" + "side": "actuallyadditions:block/green_block", + "bottom": "actuallyadditions:block/green_block", + "top": "actuallyadditions:block/green_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/green_stairs_block_outer.json b/src/generated/resources/assets/actuallyadditions/models/block/green_stairs_block_outer.json index 9821c83f4..8a1df84e5 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/green_stairs_block_outer.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/green_stairs_block_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "actuallyadditions:block/green_wall_block", - "bottom": "actuallyadditions:block/green_wall_block", - "top": "actuallyadditions:block/green_wall_block" + "side": "actuallyadditions:block/green_block", + "bottom": "actuallyadditions:block/green_block", + "top": "actuallyadditions:block/green_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/green_wall_block_post.json b/src/generated/resources/assets/actuallyadditions/models/block/green_wall_block_post.json new file mode 100644 index 000000000..6387c1d23 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/green_wall_block_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "actuallyadditions:block/green_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/green_wall_block_side.json b/src/generated/resources/assets/actuallyadditions/models/block/green_wall_block_side.json new file mode 100644 index 000000000..2a0b45915 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/green_wall_block_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "actuallyadditions:block/green_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/green_wall_block_side_tall.json b/src/generated/resources/assets/actuallyadditions/models/block/green_wall_block_side_tall.json new file mode 100644 index 000000000..1b5cccdfc --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/green_wall_block_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "actuallyadditions:block/green_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/white_wall_block.json b/src/generated/resources/assets/actuallyadditions/models/block/white_block.json similarity index 53% rename from src/generated/resources/assets/actuallyadditions/models/block/white_wall_block.json rename to src/generated/resources/assets/actuallyadditions/models/block/white_block.json index c41d4303d..30a27414b 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/white_wall_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/white_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "actuallyadditions:block/white_wall_block" + "all": "actuallyadditions:block/white_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/white_fence_block_post.json b/src/generated/resources/assets/actuallyadditions/models/block/white_fence_block_post.json deleted file mode 100644 index c3116fda5..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/block/white_fence_block_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_post", - "textures": { - "texture": "actuallyadditions:block/white_wall_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/white_fence_block_side.json b/src/generated/resources/assets/actuallyadditions/models/block/white_fence_block_side.json deleted file mode 100644 index c5e2b9c37..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/block/white_fence_block_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_side", - "textures": { - "texture": "actuallyadditions:block/white_wall_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/white_slab_block.json b/src/generated/resources/assets/actuallyadditions/models/block/white_slab_block.json index 6a19866ab..f5c50ec35 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/white_slab_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/white_slab_block.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "actuallyadditions:block/white_wall_block", - "bottom": "actuallyadditions:block/white_wall_block", - "top": "actuallyadditions:block/white_wall_block" + "side": "actuallyadditions:block/white_block", + "bottom": "actuallyadditions:block/white_block", + "top": "actuallyadditions:block/white_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/white_slab_block_top.json b/src/generated/resources/assets/actuallyadditions/models/block/white_slab_block_top.json index 3823d601c..1c746fe07 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/white_slab_block_top.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/white_slab_block_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "actuallyadditions:block/white_wall_block", - "bottom": "actuallyadditions:block/white_wall_block", - "top": "actuallyadditions:block/white_wall_block" + "side": "actuallyadditions:block/white_block", + "bottom": "actuallyadditions:block/white_block", + "top": "actuallyadditions:block/white_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/white_stairs_block.json b/src/generated/resources/assets/actuallyadditions/models/block/white_stairs_block.json index c7af75a6b..60be579ae 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/white_stairs_block.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/white_stairs_block.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "actuallyadditions:block/white_wall_block", - "bottom": "actuallyadditions:block/white_wall_block", - "top": "actuallyadditions:block/white_wall_block" + "side": "actuallyadditions:block/white_block", + "bottom": "actuallyadditions:block/white_block", + "top": "actuallyadditions:block/white_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/white_stairs_block_inner.json b/src/generated/resources/assets/actuallyadditions/models/block/white_stairs_block_inner.json index 7b1b86e6a..6835110f4 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/white_stairs_block_inner.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/white_stairs_block_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "actuallyadditions:block/white_wall_block", - "bottom": "actuallyadditions:block/white_wall_block", - "top": "actuallyadditions:block/white_wall_block" + "side": "actuallyadditions:block/white_block", + "bottom": "actuallyadditions:block/white_block", + "top": "actuallyadditions:block/white_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/white_stairs_block_outer.json b/src/generated/resources/assets/actuallyadditions/models/block/white_stairs_block_outer.json index fa4498e28..5af33fed8 100644 --- a/src/generated/resources/assets/actuallyadditions/models/block/white_stairs_block_outer.json +++ b/src/generated/resources/assets/actuallyadditions/models/block/white_stairs_block_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "actuallyadditions:block/white_wall_block", - "bottom": "actuallyadditions:block/white_wall_block", - "top": "actuallyadditions:block/white_wall_block" + "side": "actuallyadditions:block/white_block", + "bottom": "actuallyadditions:block/white_block", + "top": "actuallyadditions:block/white_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/white_wall_block_post.json b/src/generated/resources/assets/actuallyadditions/models/block/white_wall_block_post.json new file mode 100644 index 000000000..d6506a640 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/white_wall_block_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "actuallyadditions:block/white_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/white_wall_block_side.json b/src/generated/resources/assets/actuallyadditions/models/block/white_wall_block_side.json new file mode 100644 index 000000000..64da23609 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/white_wall_block_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "actuallyadditions:block/white_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/block/white_wall_block_side_tall.json b/src/generated/resources/assets/actuallyadditions/models/block/white_wall_block_side_tall.json new file mode 100644 index 000000000..4e31ce28a --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/block/white_wall_block_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "actuallyadditions:block/white_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_enori_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_enori_block.json new file mode 100644 index 000000000..26d89d8c9 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/crystal_enori_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/crystal_enori_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_enori_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_enori_empowered_block.json new file mode 100644 index 000000000..eb68877ea --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/crystal_enori_empowered_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/crystal_enori_empowered_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_quarts_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_quarts_block.json deleted file mode 100644 index 0d717aa95..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/crystal_quarts_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/crystal_quarts_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/crystal_quarts_empowered_block.json b/src/generated/resources/assets/actuallyadditions/models/item/crystal_quarts_empowered_block.json deleted file mode 100644 index 9389c805b..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/crystal_quarts_empowered_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/crystal_quarts_empowered_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/green_block.json b/src/generated/resources/assets/actuallyadditions/models/item/green_block.json new file mode 100644 index 000000000..13fe4aaa4 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/green_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/green_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/green_fence_block.json b/src/generated/resources/assets/actuallyadditions/models/item/green_fence_block.json deleted file mode 100644 index da81af9bd..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/green_fence_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/green_fence_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/white_block.json b/src/generated/resources/assets/actuallyadditions/models/item/white_block.json new file mode 100644 index 000000000..792dab1e5 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/white_block.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/white_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/white_fence_block.json b/src/generated/resources/assets/actuallyadditions/models/item/white_fence_block.json deleted file mode 100644 index 692f9f1dc..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/white_fence_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/white_fence_block" -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/walls.json b/src/generated/resources/data/minecraft/tags/blocks/walls.json new file mode 100644 index 000000000..998e68aad --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/walls.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "actuallyadditions:white_wall_block", + "actuallyadditions:green_wall_block", + "actuallyadditions:black_quartz_wall_block", + "actuallyadditions:black_pillar_quartz_wall_block", + "actuallyadditions:black_chiseled_quartz_wall_block" + ] +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java index 3382bd330..6c9ae4fe9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java @@ -3,7 +3,6 @@ package de.ellpeck.actuallyadditions.common.blocks; import de.ellpeck.actuallyadditions.common.ActuallyAdditions; import de.ellpeck.actuallyadditions.common.blocks.building.CrystalBlock; import de.ellpeck.actuallyadditions.common.blocks.building.CrystalClusterBlock; -import de.ellpeck.actuallyadditions.common.blocks.building.FenceBlock; import de.ellpeck.actuallyadditions.common.blocks.building.WallBlock; import de.ellpeck.actuallyadditions.common.blocks.functional.*; import de.ellpeck.actuallyadditions.common.blocks.misc.TinyTorchBlock; @@ -89,14 +88,14 @@ public class ActuallyBlocks { public static final RegistryObject XP_SOLIDIFIER = BLOCKS.register("xp_solidifier_block", XPSolidifierBlock::new); // CRYSTALS - public static final RegistryObject CRYSTAL_QUARTS = BLOCKS.register("crystal_quarts_block", () -> new CrystalBlock(false)); + public static final RegistryObject CRYSTAL_ENORI = BLOCKS.register("crystal_enori_block", () -> new CrystalBlock(false)); public static final RegistryObject CRYSTAL_RESTONIA = BLOCKS.register("crystal_restonia_block", () -> new CrystalBlock(false)); public static final RegistryObject CRYSTAL_PALIS = BLOCKS.register("crystal_palis_block", () -> new CrystalBlock(false)); public static final RegistryObject CRYSTAL_DIAMATINE = BLOCKS.register("crystal_diamatine_block", () -> new CrystalBlock(false)); public static final RegistryObject CRYSTAL_VOID = BLOCKS.register("crystal_void_block", () -> new CrystalBlock(false)); public static final RegistryObject CRYSTAL_EMERADIC = BLOCKS.register("crystal_emeradic_block", () -> new CrystalBlock(false)); - public static final RegistryObject CRYSTAL_EMPOWERED_QUARTS = BLOCKS.register("crystal_quarts_empowered_block", () -> new CrystalBlock(true)); + public static final RegistryObject CRYSTAL_EMPOWERED_ENORI = BLOCKS.register("crystal_enori_empowered_block", () -> new CrystalBlock(true)); public static final RegistryObject CRYSTAL_EMPOWERED_RESTONIA = BLOCKS.register("crystal_restonia_empowered_block", () -> new CrystalBlock(true)); public static final RegistryObject CRYSTAL_EMPOWERED_PALIS = BLOCKS.register("crystal_palis_empowered_block", () -> new CrystalBlock(true)); public static final RegistryObject CRYSTAL_EMPOWERED_DIAMATINE = BLOCKS.register("crystal_diamatine_empowered_block", () -> new CrystalBlock(true)); @@ -119,21 +118,21 @@ public class ActuallyBlocks { public static final RegistryObject ADVANCED_ITEM_LASER_RELAY = BLOCKS.register("advanced_item_laser_relay_block", () -> new LaserRelayBlock(LaserRelays.ITEM_WHITELIST)); // BUILDING BLOCKS - public static final RegistryObject GREEN_WALL = BLOCKS.register("green_wall_block", GenericBlock::new); - public static final RegistryObject WHITE_WALL = BLOCKS.register("white_wall_block", GenericBlock::new); - public static final RegistryObject GREEN_STAIRS = BLOCKS.register("green_stairs_block", () -> new StairsBlock(() -> GREEN_WALL.get().getDefaultState(), Block.Properties.create(Material.ROCK))); - public static final RegistryObject WHITE_STAIRS = BLOCKS.register("white_stairs_block", () -> new StairsBlock(() -> WHITE_WALL.get().getDefaultState(), Block.Properties.create(Material.ROCK))); + public static final RegistryObject GREEN_BLOCK = BLOCKS.register("green_block", GenericBlock::new); + public static final RegistryObject WHITE_BLOCK = BLOCKS.register("white_block", GenericBlock::new); + public static final RegistryObject GREEN_STAIRS = BLOCKS.register("green_stairs_block", () -> new StairsBlock(() -> GREEN_BLOCK.get().getDefaultState(), Block.Properties.create(Material.ROCK))); + public static final RegistryObject WHITE_STAIRS = BLOCKS.register("white_stairs_block", () -> new StairsBlock(() -> WHITE_BLOCK.get().getDefaultState(), Block.Properties.create(Material.ROCK))); public static final RegistryObject GREEN_SLAB = BLOCKS.register("green_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK))); public static final RegistryObject WHITE_SLAB = BLOCKS.register("white_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK))); - public static final RegistryObject GREEN_FENCE = BLOCKS.register("green_fence_block", () -> new de.ellpeck.actuallyadditions.common.blocks.building.FenceBlock(Block.Properties.create(Material.ROCK))); - public static final RegistryObject WHITE_FENCE = BLOCKS.register("white_fence_block", () -> new FenceBlock(Block.Properties.create(Material.ROCK))); + public static final RegistryObject GREEN_WALL = BLOCKS.register("green_wall_block", () -> new WallBlock(Block.Properties.create(Material.ROCK))); + public static final RegistryObject WHITE_WALL = BLOCKS.register("white_wall_block", () -> new WallBlock(Block.Properties.create(Material.ROCK))); public static final RegistryObject BLACK_QUARTZ = BLOCKS.register("black_quartz_block", () -> new Block(Block.Properties.create(Material.ROCK))); public static final RegistryObject BLACK_QUARTZ_CHISELED = BLOCKS.register("black_quartz_chiseled_block", () -> new Block(Block.Properties.create(Material.ROCK))); public static final RegistryObject BLACK_QUARTZ_PILLAR = BLOCKS.register("black_quartz_pillar_block", () -> new Block(Block.Properties.create(Material.ROCK))); - public static final RegistryObject BLACK_QUARTZ_WALL = BLOCKS.register("black_quartz_wall_block", () -> new de.ellpeck.actuallyadditions.common.blocks.building.WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ.get()))); - public static final RegistryObject BLACK_CHISELED_QUARTZ_WALL = BLOCKS.register("black_chiseled_quartz_wall_block", () -> new de.ellpeck.actuallyadditions.common.blocks.building.WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ_CHISELED.get()))); + public static final RegistryObject BLACK_QUARTZ_WALL = BLOCKS.register("black_quartz_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ.get()))); + public static final RegistryObject BLACK_CHISELED_QUARTZ_WALL = BLOCKS.register("black_chiseled_quartz_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ_CHISELED.get()))); public static final RegistryObject BLACK_PILLAR_QUARTZ_WALL = BLOCKS.register("black_pillar_quartz_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ_PILLAR.get()))); public static final RegistryObject BLACK_QUARTZ_STAIR = BLOCKS.register("black_quartz_stair_block", () -> new StairsBlock(() -> BLACK_QUARTZ.get().getDefaultState(), Block.Properties.create(Material.ROCK))); public static final RegistryObject BLACK_CHISELED_QUARTZ_STAIR = BLOCKS.register("black_chiseled_quartz_stair_block", () -> new StairsBlock(() -> BLACK_QUARTZ.get().getDefaultState(), Block.Properties.create(Material.ROCK))); @@ -165,7 +164,7 @@ public class ActuallyBlocks { // MISC BLOCKS public static final RegistryObject ENDERPEARL = BLOCKS.register("enderpearl_block", () -> new Block(Block.Properties.create(Material.ROCK))); public static final RegistryObject CHARCOAL = BLOCKS.register("charcoal_block", () -> new Block(Block.Properties.create(Material.ROCK))); - public static final RegistryObject ORE_BLACK_QUARTS = BLOCKS.register("ore_black_quartz_block", () -> new Block(Block.Properties.create(Material.ROCK))); + public static final RegistryObject ORE_BLACK_QUARTZ = BLOCKS.register("ore_black_quartz_block", () -> new Block(Block.Properties.create(Material.ROCK))); public static final RegistryObject ENDER_CASING = BLOCKS.register("ender_casing_block", () -> new Block(Block.Properties.create(Material.ROCK))); public static final RegistryObject IRON_CASING = BLOCKS.register("iron_casing_block", () -> new Block(Block.Properties.create(Material.ROCK))); public static final RegistryObject IRON_CASING_SNOW = BLOCKS.register("iron_casing_snow_block", () -> new Block(Block.Properties.create(Material.ROCK))); diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/CrystalBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/CrystalBlock.java index 597c5be6f..0b9e00485 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/CrystalBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/CrystalBlock.java @@ -2,9 +2,29 @@ package de.ellpeck.actuallyadditions.common.blocks.building; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; import net.minecraft.block.material.Material; +import net.minecraft.item.BlockItem; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.ToolType; public class CrystalBlock extends ActuallyBlock { + private boolean isEmpowered; + public CrystalBlock(boolean isEmpowered) { - super(Properties.create(Material.ROCK)); + super(Properties.create(Material.ROCK) + .hardnessAndResistance(1.5f, 10.0f) + .harvestTool(ToolType.PICKAXE) + .harvestLevel(1)); + + this.isEmpowered = isEmpowered; + } + + @Override + public BlockItem createBlockItem() { + return new BlockItem(this, getItemProperties()) { + @Override + public boolean hasEffect(ItemStack stack) { + return isEmpowered; + } + }; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/CrystalClusterBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/CrystalClusterBlock.java index fe55cf6c5..e5a3413bb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/CrystalClusterBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/CrystalClusterBlock.java @@ -2,10 +2,38 @@ package de.ellpeck.actuallyadditions.common.blocks.building; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; import de.ellpeck.actuallyadditions.common.blocks.types.Crystals; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.item.BlockItemUseContext; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.StateContainer; +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.Direction; public class CrystalClusterBlock extends ActuallyBlock { + public static final DirectionProperty FACING = BlockStateProperties.FACING; + public CrystalClusterBlock(Crystals crystal) { - super(Properties.create(Material.ROCK)); + super(Properties.create(Material.GLASS) + .setLightLevel((e) -> 7) + .sound(SoundType.GLASS) + .hardnessAndResistance(0.25f, 1.0f)); + + this.setDefaultState(this.stateContainer.getBaseState().with(FACING, Direction.UP)); + } + + public BlockState getStateForPlacement(BlockItemUseContext context) { + return this.getDefaultState().with(FACING, context.getNearestLookingDirection().getOpposite()); + } + + protected void fillStateContainer(StateContainer.Builder builder) { + builder.add(FACING); + } + + @Override + public boolean isTransparent(BlockState state) { + return true; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/FenceBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/FenceBlock.java deleted file mode 100644 index 0c0eeccaa..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/building/FenceBlock.java +++ /dev/null @@ -1,22 +0,0 @@ -package de.ellpeck.actuallyadditions.common.blocks.building; - -import de.ellpeck.actuallyadditions.common.ActuallyAdditions; -import de.ellpeck.actuallyadditions.common.blocks.IActuallyBlock; -import net.minecraft.item.BlockItem; -import net.minecraft.item.Item; - -public class FenceBlock extends net.minecraft.block.FenceBlock implements IActuallyBlock { - public FenceBlock(Properties properties) { - super(properties); - } - - @Override - public BlockItem createBlockItem() { - return new BlockItem(this, this.getItemProperties()); - } - - @Override - public Item.Properties getItemProperties() { - return new Item.Properties().group(ActuallyAdditions.ACTUALLY_GROUP); - } -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyGens.java b/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyGens.java index fe30f066b..2da8634f4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyGens.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyGens.java @@ -20,6 +20,7 @@ public final class ActuallyGens { generator.addProvider(new GeneratorBlockStates(generator, helper)); generator.addProvider(new GeneratorItemModels(generator, helper)); generator.addProvider(new GeneratorLanguage(generator)); + generator.addProvider(new GeneratorBlockTags(generator, helper)); } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java index 523706054..60f8a77d6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java @@ -43,13 +43,13 @@ public class GeneratorBlockStates extends BlockStateProvider { buildCubeAll(ActuallyBlocks.CRYSTAL_DIAMATINE); buildCubeAll(ActuallyBlocks.CRYSTAL_VOID); buildCubeAll(ActuallyBlocks.CRYSTAL_EMERADIC); - buildCubeAll(ActuallyBlocks.CRYSTAL_QUARTS); + buildCubeAll(ActuallyBlocks.CRYSTAL_ENORI); buildCubeAll(ActuallyBlocks.CRYSTAL_EMPOWERED_RESTONIA); buildCubeAll(ActuallyBlocks.CRYSTAL_EMPOWERED_PALIS); buildCubeAll(ActuallyBlocks.CRYSTAL_EMPOWERED_DIAMATINE); buildCubeAll(ActuallyBlocks.CRYSTAL_EMPOWERED_VOID); buildCubeAll(ActuallyBlocks.CRYSTAL_EMPOWERED_EMERADIC); - buildCubeAll(ActuallyBlocks.CRYSTAL_EMPOWERED_QUARTS); + buildCubeAll(ActuallyBlocks.CRYSTAL_EMPOWERED_ENORI); buildCubeAll(ActuallyBlocks.BLACK_LOTUS); buildCubeAll(ActuallyBlocks.ENERGY_LASER_RELAY); buildCubeAll(ActuallyBlocks.ENERGY_LASER_RELAY_ADVANCED); @@ -62,14 +62,14 @@ public class GeneratorBlockStates extends BlockStateProvider { buildCubeAll(ActuallyBlocks.LEAF_GENERATOR); buildCubeAll(ActuallyBlocks.SMILEY_CLOUD); buildCubeAll(ActuallyBlocks.XP_SOLIDIFIER); - buildCubeAll(ActuallyBlocks.GREEN_WALL); - buildCubeAll(ActuallyBlocks.WHITE_WALL); - stairsBlock((StairsBlock) ActuallyBlocks.GREEN_STAIRS.get(), modLoc("block/green_wall_block")); - stairsBlock((StairsBlock) ActuallyBlocks.WHITE_STAIRS.get(), modLoc("block/white_wall_block")); - slabBlock((SlabBlock) ActuallyBlocks.GREEN_SLAB.get(), modLoc("block/green_wall_block"), modLoc("block/green_wall_block")); - slabBlock((SlabBlock) ActuallyBlocks.WHITE_SLAB.get(), modLoc("block/white_wall_block"), modLoc("block/white_wall_block")); - fenceBlock((FenceBlock) ActuallyBlocks.GREEN_FENCE.get(), modLoc("block/green_wall_block")); - fenceBlock((FenceBlock) ActuallyBlocks.WHITE_FENCE.get(), modLoc("block/white_wall_block")); + buildCubeAll(ActuallyBlocks.GREEN_BLOCK); + buildCubeAll(ActuallyBlocks.WHITE_BLOCK); + stairsBlock((StairsBlock) ActuallyBlocks.GREEN_STAIRS.get(), modLoc("block/green_block")); + stairsBlock((StairsBlock) ActuallyBlocks.WHITE_STAIRS.get(), modLoc("block/white_block")); + slabBlock((SlabBlock) ActuallyBlocks.GREEN_SLAB.get(), modLoc("block/green_block"), modLoc("block/green_block")); + slabBlock((SlabBlock) ActuallyBlocks.WHITE_SLAB.get(), modLoc("block/white_block"), modLoc("block/white_block")); + wallBlock((WallBlock) ActuallyBlocks.GREEN_WALL.get(), modLoc("block/green_block")); + wallBlock((WallBlock) ActuallyBlocks.WHITE_WALL.get(), modLoc("block/white_block")); buildLitState(ActuallyBlocks.LAMP_WHITE); buildLitState(ActuallyBlocks.LAMP_ORANGE); buildLitState(ActuallyBlocks.LAMP_MAGENTA); @@ -114,7 +114,7 @@ public class GeneratorBlockStates extends BlockStateProvider { buildCubeAll(ActuallyBlocks.IRON_CASING); buildCubeAll(ActuallyBlocks.IRON_CASING_SNOW); buildCubeAll(ActuallyBlocks.LAVA_FACTORY_CASE); - buildCubeAll(ActuallyBlocks.ORE_BLACK_QUARTS); + buildCubeAll(ActuallyBlocks.ORE_BLACK_QUARTZ); buildCubeAll(ActuallyBlocks.WOOD_CASING); buildCubeAll(ActuallyBlocks.FEEDER); buildCubeAll(ActuallyBlocks.CRUSHER); diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockTags.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockTags.java new file mode 100644 index 000000000..8b88513de --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockTags.java @@ -0,0 +1,45 @@ +package de.ellpeck.actuallyadditions.data; + +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlocks; +import net.minecraft.data.BlockTagsProvider; +import net.minecraft.data.DataGenerator; +import net.minecraft.tags.BlockTags; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.data.ExistingFileHelper; + +import javax.annotation.Nullable; +import java.nio.file.Path; + +public class GeneratorBlockTags extends BlockTagsProvider { + public GeneratorBlockTags(DataGenerator generatorIn, @Nullable ExistingFileHelper existingFileHelper) { + super(generatorIn, ActuallyAdditions.MOD_ID, existingFileHelper); + } + + @Override + public void registerTags() { + getOrCreateBuilder(BlockTags.WALLS).add( + ActuallyBlocks.WHITE_WALL.get(), + ActuallyBlocks.GREEN_WALL.get(), + ActuallyBlocks.BLACK_QUARTZ_WALL.get(), + ActuallyBlocks.BLACK_PILLAR_QUARTZ_WALL.get(), + ActuallyBlocks.BLACK_CHISELED_QUARTZ_WALL.get() + ); + } + + /** + * Resolves a Path for the location to save the given tag. + */ + @Override + protected Path makePath(ResourceLocation id) { + return this.generator.getOutputFolder().resolve("data/" + id.getNamespace() + "/tags/blocks/" + id.getPath() + ".json"); + } + + /** + * Gets a name for this provider, to use in logging. + */ + @Override + public String getName() { + return "Block Tags"; + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java index 8feafb2e3..e54d8ba2f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java @@ -46,7 +46,7 @@ public class GeneratorLanguage extends LanguageProvider { addBlock(ActuallyBlocks.OIL_GENERATOR, "Oil Generator"); addBlock(ActuallyBlocks.FERMENTING_BARREL, "Fermenting Barrel"); addBlock(ActuallyBlocks.FEEDER, "Feeder"); - addBlock(ActuallyBlocks.CRUSHER, "Grinder"); + addBlock(ActuallyBlocks.CRUSHER, "Crusher"); addBlock(ActuallyBlocks.CRUSHER_DOUBLE, "Double Crusher"); addBlock(ActuallyBlocks.POWERED_FURNACE, "Powered Furnace"); addBlock(ActuallyBlocks.ESD, "ESD"); @@ -63,13 +63,13 @@ public class GeneratorLanguage extends LanguageProvider { addBlock(ActuallyBlocks.FLUID_COLLECTOR, "Fluid Collector"); addBlock(ActuallyBlocks.COFFEE_MACHINE, "Coffee Machine"); addBlock(ActuallyBlocks.PHANTOM_BOOSTER, "Phantom Booster"); - addBlock(ActuallyBlocks.CRYSTAL_QUARTS, "?"); + addBlock(ActuallyBlocks.CRYSTAL_ENORI, "Block of Enori Crystals"); addBlock(ActuallyBlocks.CRYSTAL_RESTONIA, "Block of Restonia Crystals"); addBlock(ActuallyBlocks.CRYSTAL_PALIS, "Block of Palis Crystals"); addBlock(ActuallyBlocks.CRYSTAL_DIAMATINE, "Block of Diamatine Crystals"); addBlock(ActuallyBlocks.CRYSTAL_VOID, "Block of Void Crystals"); addBlock(ActuallyBlocks.CRYSTAL_EMERADIC, "Block of Emeradic Crystals"); - addBlock(ActuallyBlocks.CRYSTAL_EMPOWERED_QUARTS, ""); + addBlock(ActuallyBlocks.CRYSTAL_EMPOWERED_ENORI, "Block of Empowered Enori Crystals"); addBlock(ActuallyBlocks.CRYSTAL_EMPOWERED_RESTONIA, "Block of Empowered Restonia Crystals"); addBlock(ActuallyBlocks.CRYSTAL_EMPOWERED_PALIS, "Block of Empowered Palis Crystals"); addBlock(ActuallyBlocks.CRYSTAL_EMPOWERED_DIAMATINE, "Block of Empowered Diamatine Crystals"); @@ -92,14 +92,14 @@ public class GeneratorLanguage extends LanguageProvider { addBlock(ActuallyBlocks.LEAF_GENERATOR, "Leaf Generator"); addBlock(ActuallyBlocks.SMILEY_CLOUD, "Smiley Cloud"); addBlock(ActuallyBlocks.XP_SOLIDIFIER, "XP Solidifier"); - addBlock(ActuallyBlocks.GREEN_WALL, "Ethentic Green Wall"); - addBlock(ActuallyBlocks.WHITE_WALL, "Ethentic Quartz Wall"); + addBlock(ActuallyBlocks.GREEN_BLOCK, "Ethentic Green Wall"); + addBlock(ActuallyBlocks.WHITE_BLOCK, "Ethentic Quartz Wall"); addBlock(ActuallyBlocks.GREEN_STAIRS, "Ethentic Green Stairs"); addBlock(ActuallyBlocks.WHITE_STAIRS, "Ethentic Quartz Stairs"); addBlock(ActuallyBlocks.GREEN_SLAB, "Ethentic Green Slab"); addBlock(ActuallyBlocks.WHITE_SLAB, "Ethentic Quartz Slab"); - addBlock(ActuallyBlocks.GREEN_FENCE, "Ethentic Green Fence"); - addBlock(ActuallyBlocks.WHITE_FENCE, "Ethentic Quartz Fence"); + addBlock(ActuallyBlocks.GREEN_WALL, "Ethentic Green Wall"); + addBlock(ActuallyBlocks.WHITE_WALL, "Ethentic Quartz Wall"); addBlock(ActuallyBlocks.BLACK_QUARTZ, "Block of Black Quartz"); addBlock(ActuallyBlocks.BLACK_QUARTZ_CHISELED, "Chiseled Black Quartz"); addBlock(ActuallyBlocks.BLACK_QUARTZ_PILLAR, "Black Quartz Pillar"); @@ -131,7 +131,7 @@ public class GeneratorLanguage extends LanguageProvider { addBlock(ActuallyBlocks.LAMP_CONTROLLER, "Lamp Controller"); addBlock(ActuallyBlocks.ENDERPEARL, "Block of Ender Pearls"); addBlock(ActuallyBlocks.CHARCOAL, "Charcoal"); - addBlock(ActuallyBlocks.ORE_BLACK_QUARTS, "Black Quartz Ore"); + addBlock(ActuallyBlocks.ORE_BLACK_QUARTZ, "Black Quartz Ore"); addBlock(ActuallyBlocks.ENDER_CASING, "Ender Casing"); addBlock(ActuallyBlocks.IRON_CASING, "Iron Casing"); addBlock(ActuallyBlocks.IRON_CASING_SNOW, "?"); diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine_empowered_block.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine_empowered_block.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/block/crystal_diamatine_empowered_block.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic_empowered_block.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic_empowered_block.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/block/crystal_emeradic_empowered_block.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_quarts_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_quarts_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_quarts_empowered_block.png b/src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_empowered_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/crystal_quarts_empowered_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_empowered_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_empowered_block.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_empowered_block.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/block/crystal_enori_empowered_block.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_palis_empowered_block.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/crystal_palis_empowered_block.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/block/crystal_palis_empowered_block.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_redstonia_empowered_block.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/crystal_redstonia_empowered_block.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/block/crystal_redstonia_empowered_block.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/block/crystal_void_empowered_block.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/block/crystal_void_empowered_block.png.mcmeta new file mode 100644 index 000000000..b81aa6365 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/block/crystal_void_empowered_block.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": + { + "frametime": 20, + "interpolate": true + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/block/green_wall_block.png b/src/main/resources/assets/actuallyadditions/textures/block/green_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/green_wall_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/green_block.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/white_wall_block.png b/src/main/resources/assets/actuallyadditions/textures/block/white_block.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/white_wall_block.png rename to src/main/resources/assets/actuallyadditions/textures/block/white_block.png