From 779ad45bb59a5ce48b59f54ed0948b6053010e80 Mon Sep 17 00:00:00 2001 From: Tazer Date: Sun, 20 Oct 2024 17:42:23 +0300 Subject: [PATCH 1/3] first holler and burial dirt commit --- .../002701d48eee4c36b62b24b011e74b0624793d05 | 592 ------------------ .../4d87f6c700406347abbc935fa7e5d5e893a595b5 | 156 ----- .../5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 | 40 -- .../735031f3addf80804addae5e3f53249900116f1e | 2 - .../86c4ba3fec62c329e6b7e74d87569e08181a0d37 | 53 -- .../940881aeb46562922fcc484940bba42a0d973262 | 2 - .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 289 --------- .../f43e2426f2370abaef549e24a3723585e9b3c47e | 2 - .../fab176c00984ff045b6565b8b962718c23b968ec | 3 - .../oreganized/blockstates/burial_dirt.json | 7 + .../assets/oreganized/lang/en_us.json | 2 + .../oreganized/models/block/burial_dirt.json | 6 + .../oreganized/models/item/burial_dirt.json | 3 + .../loot_tables/blocks/burial_dirt.json | 58 ++ .../loot_tables/entities/holler.json | 4 + .../java/galena/oreganized/Oreganized.java | 17 + .../oreganized/client/OModelLayers.java | 16 + .../oreganized/client/OreganizedClient.java | 8 + .../oreganized/client/model/HollerModel.java | 59 ++ .../client/render/entity/HollerRender.java | 32 + .../content/block/BurialDirtBlock.java | 47 ++ .../content/entity/holler/Holler.java | 209 +++++++ .../content/entity/holler/HollerAi.java | 43 ++ .../content/entity/holler/HollerPanic.java | 36 ++ .../galena/oreganized/data/OBlockStates.java | 2 + .../galena/oreganized/data/OItemModels.java | 2 + .../galena/oreganized/data/OLootTables.java | 12 +- .../data/provider/OBlockLootProvider.java | 6 + .../java/galena/oreganized/index/OBlocks.java | 18 +- .../galena/oreganized/index/OEntityTypes.java | 3 + .../java/galena/oreganized/index/OItems.java | 17 +- .../forge/biome_modifier/spawn_holler.json | 10 + 32 files changed, 589 insertions(+), 1167 deletions(-) delete mode 100644 src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 delete mode 100644 src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5 delete mode 100644 src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 delete mode 100644 src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e delete mode 100644 src/generated/resources/.cache/86c4ba3fec62c329e6b7e74d87569e08181a0d37 delete mode 100644 src/generated/resources/.cache/940881aeb46562922fcc484940bba42a0d973262 delete mode 100644 src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e delete mode 100644 src/generated/resources/.cache/f43e2426f2370abaef549e24a3723585e9b3c47e delete mode 100644 src/generated/resources/.cache/fab176c00984ff045b6565b8b962718c23b968ec create mode 100644 src/generated/resources/assets/oreganized/blockstates/burial_dirt.json create mode 100644 src/generated/resources/assets/oreganized/models/block/burial_dirt.json create mode 100644 src/generated/resources/assets/oreganized/models/item/burial_dirt.json create mode 100644 src/generated/resources/data/oreganized/loot_tables/blocks/burial_dirt.json create mode 100644 src/generated/resources/data/oreganized/loot_tables/entities/holler.json create mode 100644 src/main/java/galena/oreganized/client/OModelLayers.java create mode 100644 src/main/java/galena/oreganized/client/model/HollerModel.java create mode 100644 src/main/java/galena/oreganized/client/render/entity/HollerRender.java create mode 100644 src/main/java/galena/oreganized/content/block/BurialDirtBlock.java create mode 100644 src/main/java/galena/oreganized/content/entity/holler/Holler.java create mode 100644 src/main/java/galena/oreganized/content/entity/holler/HollerAi.java create mode 100644 src/main/java/galena/oreganized/content/entity/holler/HollerPanic.java create mode 100644 src/main/resources/data/oreganized/forge/biome_modifier/spawn_holler.json diff --git a/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 b/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 deleted file mode 100644 index b1920dd2..00000000 --- a/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 +++ /dev/null @@ -1,592 +0,0 @@ -// 1.20.1 2024-10-14T09:19:15.8831231 oreganized Block States -d85b0fb9e5cad1d9c4f22ed192b0fa621ee3373c assets/oreganized/blockstates/black_crystal_glass.json -05bb006ff7f48557fe5c5333bc120f7206052717 assets/oreganized/blockstates/black_crystal_glass_pane.json -5e5002e9c77ee7221425eeacce8834af484db877 assets/oreganized/blockstates/blue_crystal_glass.json -7e852e66ced2113bbad988b38469db326e88495c assets/oreganized/blockstates/blue_crystal_glass_pane.json -8f4bdde9fa05052630cd12fb4da9889024377adf assets/oreganized/blockstates/brown_crystal_glass.json -d59afe9c89ba1e614ce5943fdc8aa3d450585560 assets/oreganized/blockstates/brown_crystal_glass_pane.json -3c5c1979dfdd7174c48384591f2628f19f75fad1 assets/oreganized/blockstates/chiseled_glance.json -40088e383637c88f443a53fbafce9ade2ca40ddd assets/oreganized/blockstates/cut_lead.json -493ed64157b69a2cd174f244e50d75ccec5b7531 assets/oreganized/blockstates/cyan_crystal_glass.json -c1a188e052dc339804e5a201559b11fb8b43fec4 assets/oreganized/blockstates/cyan_crystal_glass_pane.json -8b7ca6fbce4b9d9e566adde74d2c27386cd1bdf8 assets/oreganized/blockstates/deepslate_lead_ore.json -91256f551a38187fc36c676586147444a26b6ef5 assets/oreganized/blockstates/deepslate_silver_ore.json -f0b8760d1a59408e5a3e68a4ad55e45c0601c07b assets/oreganized/blockstates/electrum_block.json -c1e90c9548de4808e0903a7e18f9ff83ca476d28 assets/oreganized/blockstates/gargoyle.json -7098288ccd6ba925fb22bad6197a39f177bd82bf assets/oreganized/blockstates/glance.json -83ceb01a7bc2cfa83cfeed35e236e23013033016 assets/oreganized/blockstates/glance_bricks.json -5382067f2b58b89788f38327e94e1a196cf01482 assets/oreganized/blockstates/glance_brick_slab.json -7273d1ccc83ec55f1b3aad15748a9b33f124d688 assets/oreganized/blockstates/glance_brick_stairs.json -7c58992b9dd45f26df5ced5b5ba91a6f43a5ce07 assets/oreganized/blockstates/glance_brick_wall.json -7dd47e316c43a9769c7f8c5b7b498c09a6c4ed1a assets/oreganized/blockstates/glance_slab.json -00faea85b67d135ac139276c84b591f9b2c0b8ef assets/oreganized/blockstates/glance_stairs.json -d9cf1c07d030b2f6303c81035e0037cb0c7c660e assets/oreganized/blockstates/glance_wall.json -9ea9fa8ac2f43c1effc054ea90d94cd083d1eba9 assets/oreganized/blockstates/gray_crystal_glass.json -c72a5228ef929553df57844bee603f560e737100 assets/oreganized/blockstates/gray_crystal_glass_pane.json -8e259fefeef23ef07a4f72a5a22c47b99d65859f assets/oreganized/blockstates/green_crystal_glass.json -0f0f5654a1123c1bfa032e813f1f6cff21ec1dcb assets/oreganized/blockstates/green_crystal_glass_pane.json -381580fe541332a18ae1a9efa69fb53201b66140 assets/oreganized/blockstates/grooved_blue_ice.json -cd524e91f5482d84fea6e9352cdffb3d3ad1ec23 assets/oreganized/blockstates/grooved_ice.json -fcaefc29cf8c2a1dc8707623a2148406e2df6df3 assets/oreganized/blockstates/grooved_packed_ice.json -c9995beec5545d6c6c41d8323c65ae06bbea0cbe assets/oreganized/blockstates/lead_bars.json -121e6d2788d907261435fceb5c2ed9aec2947965 assets/oreganized/blockstates/lead_block.json -d43efacf05b2229ee7dad465c3ad83df616ab763 assets/oreganized/blockstates/lead_bolt_crate.json -ac3dc34ee50ebc5c1ef49b1d5200bbcce6989806 assets/oreganized/blockstates/lead_bricks.json -3ef194f72e7b5911c4cb174e70906524d82bc695 assets/oreganized/blockstates/lead_bulb.json -0a8045f4a934dc1d2e7da7e004becf2de17b14d5 assets/oreganized/blockstates/lead_door.json -1e0faf898de4c648019ee6c1cef8ce1e8aed23ec assets/oreganized/blockstates/lead_ore.json -248766fb1eb05cbae03be8c6afd05e39f8b0f057 assets/oreganized/blockstates/lead_pillar.json -39bd9f24578399b63a72fa4938ce7fa061210992 assets/oreganized/blockstates/lead_trapdoor.json -13efbf997fc6c5f35827f6f3404fd41e0ef41e02 assets/oreganized/blockstates/light_blue_crystal_glass.json -2d73359fc7425188d9a469e5b9898322e1d2c457 assets/oreganized/blockstates/light_blue_crystal_glass_pane.json -27037bd6b3df11e3e08590d443f0c6eddf2095a2 assets/oreganized/blockstates/light_gray_crystal_glass.json -5e45ef9bf2d6081d6b736933e1b9d1985520297f assets/oreganized/blockstates/light_gray_crystal_glass_pane.json -afb1d4d0ee24999ae3023290f97fdccda3979a19 assets/oreganized/blockstates/lime_crystal_glass.json -c716019d58b098ac26affc31be09491e2de296e2 assets/oreganized/blockstates/lime_crystal_glass_pane.json -23860a3cdce3dabc87834f8b22b164a9d12bad71 assets/oreganized/blockstates/magenta_crystal_glass.json -b2da99204da7dab9df568e4bc6111eebcb057972 assets/oreganized/blockstates/magenta_crystal_glass_pane.json -10ba525a3b9d3eddc1e79feed3ef2f7e7cfff0b8 assets/oreganized/blockstates/molten_lead_cauldron.json -d9536dcff6be202d9b5d821c54ea54391f8ee1de assets/oreganized/blockstates/orange_crystal_glass.json -3468335e1b3d19afd9713cf2171f7f28771ff751 assets/oreganized/blockstates/orange_crystal_glass_pane.json -ea33f3305a768cacbe05a2cdc8475284c39afcad assets/oreganized/blockstates/pink_crystal_glass.json -9503a106ce6a38698a3e6fce6b975e5d339105df assets/oreganized/blockstates/pink_crystal_glass_pane.json -d7cf04a9abcafbdf27a906caaaa71a4ab9db0851 assets/oreganized/blockstates/polished_glance.json -e2cfbeacc6cd2556538c830fd063a9a9d2d34f2d assets/oreganized/blockstates/polished_glance_slab.json -57c980c45fd739c9f3c7bfdaa214de57c69bd521 assets/oreganized/blockstates/polished_glance_stairs.json -a0d5aab21480fec3d1f2868400975f62e9588fb1 assets/oreganized/blockstates/purple_crystal_glass.json -c9cb5c7d3dcf17e64b42b21b3ca32e2f872b32f7 assets/oreganized/blockstates/purple_crystal_glass_pane.json -7cb5ce8c7b7d4d9f1a7a5d06d4aff60d6b8661a9 assets/oreganized/blockstates/raw_lead_block.json -a8b05dbdd23fe1cf5ce82b267a4648b0629fc297 assets/oreganized/blockstates/raw_silver_block.json -5085b50121f91c56256b5f1189c8dc614c340d11 assets/oreganized/blockstates/red_crystal_glass.json -7a46fe801476209d2d5eb40213397140a7a06b8f assets/oreganized/blockstates/red_crystal_glass_pane.json -398fed72da8aa72d33e773d22a7fb5a5292e6fa5 assets/oreganized/blockstates/shrapnel_bomb.json -dcdf3b0a7a2bb1bd00f698b3325e8ffadd0bf98c assets/oreganized/blockstates/silver_block.json -89f5cc8a105178b0b12f32963a320afc120bf868 assets/oreganized/blockstates/silver_ore.json -870599b8654e91dfb946d3e8afc4d0de08e49f9d assets/oreganized/blockstates/spotted_glance.json -6992b8d448ed847ea9391428732a4f3aaddf258e assets/oreganized/blockstates/waxed_black_concrete_powder.json -d3fb359d8a8f03c227be45819904dd16c13e3e00 assets/oreganized/blockstates/waxed_blue_concrete_powder.json -073c781dfa55e697c92eedd2e04f7d6e476298f2 assets/oreganized/blockstates/waxed_brown_concrete_powder.json -708b59f97648e85e6963f020ac4c88238fdb441a assets/oreganized/blockstates/waxed_cyan_concrete_powder.json -b4169b33ba930ab1d6b4a80d9a6d4ec9b652ad07 assets/oreganized/blockstates/waxed_gray_concrete_powder.json -90aed3aa4a601e3bc0d16e7d5b3a47dc2069116c assets/oreganized/blockstates/waxed_green_concrete_powder.json -d753470fdcbd3e0c6f5a702c4583668f7b0cc75b assets/oreganized/blockstates/waxed_light_blue_concrete_powder.json -b4ca36cb4e640491cba8b3fa7b1ab0179faa958c assets/oreganized/blockstates/waxed_light_gray_concrete_powder.json -ccf8213f83efac847599e22998afffbca6d69e0c assets/oreganized/blockstates/waxed_lime_concrete_powder.json -719aa69e1c70530045ac104838635362bd693da0 assets/oreganized/blockstates/waxed_magenta_concrete_powder.json -5c66eb936e20f7c79eef159278c7aff4c29df430 assets/oreganized/blockstates/waxed_orange_concrete_powder.json -ed529e1c6c55bbc62e3ebb71118bdb1a44824c0d assets/oreganized/blockstates/waxed_pink_concrete_powder.json -51cac27d751b4e8e749e2371f7e8f1424eafc170 assets/oreganized/blockstates/waxed_purple_concrete_powder.json -5fb479d8afaba3c19fee4a5320eeb09b6924ce6c assets/oreganized/blockstates/waxed_red_concrete_powder.json -870599b8654e91dfb946d3e8afc4d0de08e49f9d assets/oreganized/blockstates/waxed_spotted_glance.json -afeb2ffdb9361c925ef9322c7303c0de3f4b39ee assets/oreganized/blockstates/waxed_white_concrete_powder.json -9e4d073c6804904639f89e3af04983dde1720efe assets/oreganized/blockstates/waxed_yellow_concrete_powder.json -0bc2464ae7dc6932baa23098183cf72c05980caa assets/oreganized/blockstates/white_crystal_glass.json -9bdc987f91dc587b97d6834523cac5392b7a0972 assets/oreganized/blockstates/white_crystal_glass_pane.json -c4f60492b52fe9b99177f6d8c47338beefb07d55 assets/oreganized/blockstates/yellow_crystal_glass.json -82873093c91346c863155b436c1c549e290de044 assets/oreganized/blockstates/yellow_crystal_glass_pane.json -a93c37505ed69e5e1b31c1803aebe021c8f5f28f assets/oreganized/models/block/black_concrete_powder.json -b4c9e12da0a5bb4bcde8a94accf272d4ee1fb921 assets/oreganized/models/block/black_crystal_glass.json -7fab60622967f8444f480d47cf889d31c5ba3d2a assets/oreganized/models/block/black_crystal_glass_in.json -bfdfeca26ce1b74652e14b146f96fcd369d7e31a assets/oreganized/models/block/black_crystal_glass_out.json -48a607e81724ad304d3366a94fd15f33e6fa5c5b assets/oreganized/models/block/black_crystal_glass_pane_noside.json -80abbfbb05258c39bbb8a5a2a80ab8fa77554eee assets/oreganized/models/block/black_crystal_glass_pane_noside_alt.json -be5ba13412580092c14ef9988e91dc2689b6e8a1 assets/oreganized/models/block/black_crystal_glass_pane_noside_alt_in.json -3a3e9c9a97435fb57fc36dbffc7dc747f1284a64 assets/oreganized/models/block/black_crystal_glass_pane_noside_alt_out.json -61d30161da384a5a59af44aa22f11f1286923138 assets/oreganized/models/block/black_crystal_glass_pane_noside_alt_rot.json -9e578f37b32554205e6cf9c56adb07a3bfd94073 assets/oreganized/models/block/black_crystal_glass_pane_noside_in.json -2674117bc3886000d17fa71638cae0e3fe30d6e1 assets/oreganized/models/block/black_crystal_glass_pane_noside_out.json -2f7ea0f458ea8b156735f57076ab37670c9d3430 assets/oreganized/models/block/black_crystal_glass_pane_noside_rot.json -f5f5427e59f4b6407090ab28c8d8c77caf10e150 assets/oreganized/models/block/black_crystal_glass_pane_post.json -4caa0002f6e2dcd54819f4d0b1961955f8e4428f assets/oreganized/models/block/black_crystal_glass_pane_post_in.json -b1d02bd394e5547025170bb5ff30a60c046128ca assets/oreganized/models/block/black_crystal_glass_pane_post_out.json -ea158a9d30fbf64e777868a57018cccf9e34aaf4 assets/oreganized/models/block/black_crystal_glass_pane_post_rot.json -86f438c12d792d92c24a5609d8adb4d86a7c7bcb assets/oreganized/models/block/black_crystal_glass_pane_side.json -b99d03493a1b64b2c37ed206e2c4f4f79b82846b assets/oreganized/models/block/black_crystal_glass_pane_side_alt.json -7f625eec9bc6d6044281d86eb18cefa2b9dd22b2 assets/oreganized/models/block/black_crystal_glass_pane_side_alt_in.json -3cbb299e55c57f40415605ce4d2c13e45e898d4c assets/oreganized/models/block/black_crystal_glass_pane_side_alt_out.json -c9954ab379525d4c3b39f28ffa98f44d41c32aa4 assets/oreganized/models/block/black_crystal_glass_pane_side_alt_rot.json -f4f6ee7e2a37a51fa0bc870fcf3511c9c8265d54 assets/oreganized/models/block/black_crystal_glass_pane_side_in.json -3a2d39aa1c8801c6b49bf5df3e0beecf4bada568 assets/oreganized/models/block/black_crystal_glass_pane_side_out.json -7754dcd2afe856a0041d52d272b8c2970e0e8bbc assets/oreganized/models/block/black_crystal_glass_pane_side_rot.json -33222758f40a3b9aa5438d2da2a81ca007b2480b assets/oreganized/models/block/black_crystal_glass_rot.json -476579543338ee34282e824ae1b7f06f2d6fc24c assets/oreganized/models/block/blue_concrete_powder.json -d268c1abcaca9de8544f616c43cfe52dcf1ab724 assets/oreganized/models/block/blue_crystal_glass.json -610d5a26dd77499724bb2a23cd79ab0c48994486 assets/oreganized/models/block/blue_crystal_glass_in.json -7c58e7b29be39b57e69b6a4689070cd57c425065 assets/oreganized/models/block/blue_crystal_glass_out.json -bf32f0854b97aa3d0e4a00d7a84cc5dcbcdb915f assets/oreganized/models/block/blue_crystal_glass_pane_noside.json -b445c1d803816689b0cbe9b556fae842f71e8b9b assets/oreganized/models/block/blue_crystal_glass_pane_noside_alt.json -69877ff2247a71722f5f0c21c822d0d17543f38b assets/oreganized/models/block/blue_crystal_glass_pane_noside_alt_in.json -7ac3621637cbda96a2b417e200311709eedf8402 assets/oreganized/models/block/blue_crystal_glass_pane_noside_alt_out.json -bc25b7c0ab05c2fc17172c22f7a6d90363d0d69c assets/oreganized/models/block/blue_crystal_glass_pane_noside_alt_rot.json -4ff12bee9df813b381c8e0f6a7f704f0cb2d1e19 assets/oreganized/models/block/blue_crystal_glass_pane_noside_in.json -98fcadee9ab80b0d5a8e25e8e9b7a1a6804f2020 assets/oreganized/models/block/blue_crystal_glass_pane_noside_out.json -525825913d00b892746c65d6fead1de1899389be assets/oreganized/models/block/blue_crystal_glass_pane_noside_rot.json -98c7ce45228733670518c155af1af55bb8f526e2 assets/oreganized/models/block/blue_crystal_glass_pane_post.json -b7363e95bff4b804ca701a10e88e7ff7aa62661e assets/oreganized/models/block/blue_crystal_glass_pane_post_in.json -a96ad653d62dd27370d873eff9ecaeb8d8523754 assets/oreganized/models/block/blue_crystal_glass_pane_post_out.json -590cb7c32c71e72f3b0fcd1550292a3ab2a8292e assets/oreganized/models/block/blue_crystal_glass_pane_post_rot.json -c7cfc199029c5ee4230736accbe92ad652e13737 assets/oreganized/models/block/blue_crystal_glass_pane_side.json -2c90bb4d653c04d7fe846bc1464ed5deaab26ab5 assets/oreganized/models/block/blue_crystal_glass_pane_side_alt.json -9a9e4d46243fe7e2fcd5c63e227a3f1a9534bab1 assets/oreganized/models/block/blue_crystal_glass_pane_side_alt_in.json -7c10ad84950065b6ac071d867c288d59b0a86c29 assets/oreganized/models/block/blue_crystal_glass_pane_side_alt_out.json -5add859993192555348fc32df33f8d74d8e4740e assets/oreganized/models/block/blue_crystal_glass_pane_side_alt_rot.json -a2f89ce936bf8a2409a947e3ba1c26a634cce501 assets/oreganized/models/block/blue_crystal_glass_pane_side_in.json -bdd196da9ed9e727e7dc655ca020b467440d0126 assets/oreganized/models/block/blue_crystal_glass_pane_side_out.json -5c4dd981e3eabb218f1fea37c285d30a2af88206 assets/oreganized/models/block/blue_crystal_glass_pane_side_rot.json -636f4fd7e8311b57d7167bcbbec656bc6eeec034 assets/oreganized/models/block/blue_crystal_glass_rot.json -3296354cd0709abe6eb75e1fc39f1c72d0a9d0a7 assets/oreganized/models/block/brown_concrete_powder.json -4154dddb09563c888c73caa346d5a491ff902782 assets/oreganized/models/block/brown_crystal_glass.json -632ce280a6004238bf5ee88445904213ca67c413 assets/oreganized/models/block/brown_crystal_glass_in.json -8fb814e2aad72dbf64bdf764611e1f32f2b9c33b assets/oreganized/models/block/brown_crystal_glass_out.json -51d8bf134842298f8aff2c2c09fe26208485d04d assets/oreganized/models/block/brown_crystal_glass_pane_noside.json -ec538c417b24a964a5f3723cfdadc8783c265d0b assets/oreganized/models/block/brown_crystal_glass_pane_noside_alt.json -9dbb545abaf7d51eb6512ee451a65f8ea7f0f684 assets/oreganized/models/block/brown_crystal_glass_pane_noside_alt_in.json -3c96061fd8354b1569e871d2880c2c2f2c0552aa assets/oreganized/models/block/brown_crystal_glass_pane_noside_alt_out.json -953dfa1b3ca5edca741e7162848a9954d3dcf2cc assets/oreganized/models/block/brown_crystal_glass_pane_noside_alt_rot.json -02aebce75ba4afebf5db559fd9e554f293e8302e assets/oreganized/models/block/brown_crystal_glass_pane_noside_in.json -c14d71fca422b1e2698b32574f77876fed018d3c assets/oreganized/models/block/brown_crystal_glass_pane_noside_out.json -242a7cbd2ca7cf10dd2d6d4ec3c67960c6dc20e4 assets/oreganized/models/block/brown_crystal_glass_pane_noside_rot.json -ae03a4265d14cd1566c984b894b89f9af6bffd33 assets/oreganized/models/block/brown_crystal_glass_pane_post.json -74dd52ec2f0910f50b4344b6ea3e904d8a60a188 assets/oreganized/models/block/brown_crystal_glass_pane_post_in.json -441355cf6d5dfda008bd4a5a3408781a63288ff3 assets/oreganized/models/block/brown_crystal_glass_pane_post_out.json -ee5ac1bd4a532dadd89cb8f5f945f94f33b9544f assets/oreganized/models/block/brown_crystal_glass_pane_post_rot.json -304e874ff96e5291aea89d6bbbab2880acce8dce assets/oreganized/models/block/brown_crystal_glass_pane_side.json -fdb11ea02e535685664e7252d40e10f51361c0c8 assets/oreganized/models/block/brown_crystal_glass_pane_side_alt.json -a6d3388f9ad56debc322efb7e170c37cdb3babc5 assets/oreganized/models/block/brown_crystal_glass_pane_side_alt_in.json -3d29c4e390de38eb4fcc455614d8cce47b0c9171 assets/oreganized/models/block/brown_crystal_glass_pane_side_alt_out.json -52366f61a42f373bcbc5e62ab2b9bb9b1053df08 assets/oreganized/models/block/brown_crystal_glass_pane_side_alt_rot.json -b5b65411b33249d560ae0af3fb44d1a2ad250522 assets/oreganized/models/block/brown_crystal_glass_pane_side_in.json -75b40c8c195db361d79368c56b01f6256d9e1742 assets/oreganized/models/block/brown_crystal_glass_pane_side_out.json -60c7d108ad8de5447835ffcb2069d65db948f34f assets/oreganized/models/block/brown_crystal_glass_pane_side_rot.json -7146bedcc663b9b4151fcbf89e573a2e2f636909 assets/oreganized/models/block/brown_crystal_glass_rot.json -4f188c17f6b739d6090b40856dee05dae6b32316 assets/oreganized/models/block/chiseled_glance.json -a9aeea1dec59b5c1594205bb9bc7034f30f447f0 assets/oreganized/models/block/cut_lead.json -65035089ce2758727d5b6cbc94c1a51c92ce613d assets/oreganized/models/block/cyan_concrete_powder.json -580d937fa29373e00d8c213b16df6a09e4a7d945 assets/oreganized/models/block/cyan_crystal_glass.json -9731518351eec7cc815bba289a33499ce52ce141 assets/oreganized/models/block/cyan_crystal_glass_in.json -406c63e33fa2503c2173169b8f67e4bf2d6c2e01 assets/oreganized/models/block/cyan_crystal_glass_out.json -0512995604e6a26a728411c5847f6f10154f4ea9 assets/oreganized/models/block/cyan_crystal_glass_pane_noside.json -2d479a967827d927b100ab3e49a314c27cfea868 assets/oreganized/models/block/cyan_crystal_glass_pane_noside_alt.json -60d516f9c609ab0c01a9f09f296b51dcc1ca710c assets/oreganized/models/block/cyan_crystal_glass_pane_noside_alt_in.json -5d4d9aca4e77c8e11e2d0184928bbb3bb19597e9 assets/oreganized/models/block/cyan_crystal_glass_pane_noside_alt_out.json -9d07f41f3e8535eb769dbd41d9c696f866d13fad assets/oreganized/models/block/cyan_crystal_glass_pane_noside_alt_rot.json -e32697fb610cef61b6d94b5606ee590231466ab4 assets/oreganized/models/block/cyan_crystal_glass_pane_noside_in.json -fa1b9d5db63ba8ebced329549e8b8b09d12ef8d2 assets/oreganized/models/block/cyan_crystal_glass_pane_noside_out.json -3761f8ff8069d3859bbbb9417d9e382f518c46ee assets/oreganized/models/block/cyan_crystal_glass_pane_noside_rot.json -3f3098e43bf4f9c72f311476d453118ae1628827 assets/oreganized/models/block/cyan_crystal_glass_pane_post.json -1e3e2a69d36ed5a792d201a26b412666798e3cab assets/oreganized/models/block/cyan_crystal_glass_pane_post_in.json -45a5904f602aab335bc7e6ce8a8b773336c838b1 assets/oreganized/models/block/cyan_crystal_glass_pane_post_out.json -d46b160fd3e9f9005084e0c4b78d37979bc34720 assets/oreganized/models/block/cyan_crystal_glass_pane_post_rot.json -988b530c69a0276ce35faddfd1b6f85f8b889055 assets/oreganized/models/block/cyan_crystal_glass_pane_side.json -30e59bf15957b0dfe928ff4b9c65e3efbc904978 assets/oreganized/models/block/cyan_crystal_glass_pane_side_alt.json -d2c549cf8fef6f29040f4f69a05e4e64d46963dc assets/oreganized/models/block/cyan_crystal_glass_pane_side_alt_in.json -572940e6303e21bd8799606cdbdcf4795b946309 assets/oreganized/models/block/cyan_crystal_glass_pane_side_alt_out.json -5b12d2fea8abd1eb28d2d5207d4c6409351f5a49 assets/oreganized/models/block/cyan_crystal_glass_pane_side_alt_rot.json -732bc6189336dfc4e83e9f24709a21f4ff1e0c8f assets/oreganized/models/block/cyan_crystal_glass_pane_side_in.json -9646ced025e6325906e665a54056f4586e1a759a assets/oreganized/models/block/cyan_crystal_glass_pane_side_out.json -e608b753dce2a8b19cb7dbee4045c14c15eecef7 assets/oreganized/models/block/cyan_crystal_glass_pane_side_rot.json -70e7d24a752911b20fe5ba6ab611abf3c358c136 assets/oreganized/models/block/cyan_crystal_glass_rot.json -28e5c8efea3bcd11f22ff5d8fc42e027451a8c94 assets/oreganized/models/block/deepslate_lead_ore.json -5f9de10cb0e348003b4ad9fa8bfc1fa9278e3df1 assets/oreganized/models/block/deepslate_silver_ore.json -50b31e901f9c3d7db1fde987cfd547999e37cf67 assets/oreganized/models/block/dimmer_lead_bulb.json -70dd1a0c1846410be1610e21f3f6e7458dc530a3 assets/oreganized/models/block/electrum_block.json -9b44bee43c08518c3880b29784895a8ee563d01a assets/oreganized/models/block/glance.json -c16aa840c01875b0a5c1655ba1bd0bdd55cefe35 assets/oreganized/models/block/glance_bricks.json -de9c306cb47beaa419a6155f46f93488fba9277e assets/oreganized/models/block/glance_brick_slab.json -888929741f7ed5f4893e5800b74a2ba78993be32 assets/oreganized/models/block/glance_brick_slab_top.json -2b0e9a146c70d2bd21ad8c6dd9dad0f755d55bb2 assets/oreganized/models/block/glance_brick_stairs.json -fa62b62589704ad47be5487032d62b4d88053822 assets/oreganized/models/block/glance_brick_stairs_inner.json -28812c870a0a353a52a9e38e1f535b18b818431a assets/oreganized/models/block/glance_brick_stairs_outer.json -82032149dd98fbf1d0b5c7f0cf2571bb27e7930b assets/oreganized/models/block/glance_brick_wall_post.json -03ad7a9261e96cec5969ee7cb2f056bffc6eccd9 assets/oreganized/models/block/glance_brick_wall_side.json -fe06e91a60ad8fc45f12626ddf0bda80ccbaffc5 assets/oreganized/models/block/glance_brick_wall_side_tall.json -c8274b75280cd15a67e6017da8f15a6e6c6c67db assets/oreganized/models/block/glance_slab.json -e2fcf6c0ee8ae907286ae2883fe04f85a19e5ab4 assets/oreganized/models/block/glance_slab_top.json -ae7596e4fea752166d25ec8a8c4ee3688baed364 assets/oreganized/models/block/glance_stairs.json -2d3720db16ca55a4bf23a3f707bc243f5419ff06 assets/oreganized/models/block/glance_stairs_inner.json -44bedd59085285b9663d3ebcf00b789e04b0ae92 assets/oreganized/models/block/glance_stairs_outer.json -48154504cf6f1f73dbc5262d6edcb57656fa5c1a assets/oreganized/models/block/glance_wall_post.json -0beb972189f06e7dd1f0bf0ad671b393d5ca8b1d assets/oreganized/models/block/glance_wall_side.json -af621de74a8c985af1481b400f3b6e275f348e17 assets/oreganized/models/block/glance_wall_side_tall.json -d8429a8aa937c6de9ba886ee85c172a948df9dba assets/oreganized/models/block/goopy_cut_lead.json -d002260fde1f4f364c01fd76e1be989be78c00d0 assets/oreganized/models/block/goopy_lead_bars_cap.json -7a760450feb33e614ece22c9dfcbaedb4057f091 assets/oreganized/models/block/goopy_lead_bars_cap_alt.json -d80d1585b67c180bdbc609a4d54078834de14849 assets/oreganized/models/block/goopy_lead_bars_post.json -1b7215212c3c9a67b7fdfbd6a7a791631c61384f assets/oreganized/models/block/goopy_lead_bars_post_ends.json -dc115957c625c5aa18ca6ea230fde5215fc73e6d assets/oreganized/models/block/goopy_lead_bars_side.json -23cc2e1b97b608df278064b893c657a315f92ab9 assets/oreganized/models/block/goopy_lead_bars_side_alt.json -eb736a40471fcd231ce12c1c955fee39ce7db3ef assets/oreganized/models/block/goopy_lead_block.json -581f0c65a273d4b16d5a696c249a900cff7775ca assets/oreganized/models/block/goopy_lead_bricks.json -a54be9d65eda1e43cd4bfd27eaab530f40637c75 assets/oreganized/models/block/goopy_lead_bulb.json -3ef5a41187f81462deb02c9b3be0560e229f0658 assets/oreganized/models/block/goopy_lead_door_bottom_left.json -24dc8aae0b84ed2a7b83709bf32fe8daa02501e3 assets/oreganized/models/block/goopy_lead_door_bottom_left_open.json -645ac4e18f99ee425ee54e81ea907fc389317fb0 assets/oreganized/models/block/goopy_lead_door_bottom_right.json -a7129d11480bda18172408b5e2e6fede1603d473 assets/oreganized/models/block/goopy_lead_door_bottom_right_open.json -d0d41977f3533864f9022c444888ac7cc512c410 assets/oreganized/models/block/goopy_lead_door_top_left.json -260960130854eb79089a484619de8671ba0a1743 assets/oreganized/models/block/goopy_lead_door_top_left_open.json -9e576a3e34c597f130dbfc73ea277135838aa1d9 assets/oreganized/models/block/goopy_lead_door_top_right.json -613227af844a6749c9f60a39c6e459b843b4f2ee assets/oreganized/models/block/goopy_lead_door_top_right_open.json -6b54070af3244091a12a857e881b735bdd8a4ea8 assets/oreganized/models/block/goopy_lead_pillar.json -ef326609bd98c61e74dd32823a5a263cc7397f53 assets/oreganized/models/block/goopy_lead_trapdoor_bottom.json -2809d897af406d87c14696867ae3f468e2cd1311 assets/oreganized/models/block/goopy_lead_trapdoor_open.json -87b894679af3e86b2bf77e49d39c6842ca809153 assets/oreganized/models/block/goopy_lead_trapdoor_top.json -d15b642295deff74b23bb71fa4b1c083f9911cb2 assets/oreganized/models/block/gray_concrete_powder.json -318fdd04ad04ed057ae79c6b0b4f1ce88dd09aff assets/oreganized/models/block/gray_crystal_glass.json -320c48b49db8a6a495d58bcad81d966b6651b7e2 assets/oreganized/models/block/gray_crystal_glass_in.json -89c4433dbf63c56a07ce2fb02ef7d64cac25ca04 assets/oreganized/models/block/gray_crystal_glass_out.json -a377cdcfa3cdd668887c61776d2ed66e93b9ec94 assets/oreganized/models/block/gray_crystal_glass_pane_noside.json -ac906cfba823e58448aa932db77363aec9b74de5 assets/oreganized/models/block/gray_crystal_glass_pane_noside_alt.json -282b3999af62cb76a3c1f45feb21d632d19989bf assets/oreganized/models/block/gray_crystal_glass_pane_noside_alt_in.json -0cabdec5e766bc056a85b8816638395cdedfbd62 assets/oreganized/models/block/gray_crystal_glass_pane_noside_alt_out.json -c10dc9aba2214bb656adbf047dc539147ff9f218 assets/oreganized/models/block/gray_crystal_glass_pane_noside_alt_rot.json -58dc40203a7ac6d522d613779d22a386370c9127 assets/oreganized/models/block/gray_crystal_glass_pane_noside_in.json -eb60a9925af0c72484000e42e20e158edde90a4e assets/oreganized/models/block/gray_crystal_glass_pane_noside_out.json -1be607516363815e9ddaa75cdf9a1681e0ea1d2b assets/oreganized/models/block/gray_crystal_glass_pane_noside_rot.json -4c9e826efdec504f4b306079bda6fdf1e6ded3da assets/oreganized/models/block/gray_crystal_glass_pane_post.json -30e827edef41dff18c7c9e77c993c4ef717a3ff7 assets/oreganized/models/block/gray_crystal_glass_pane_post_in.json -18fd36fae4e973981ae5a8fde3c70ba4bd0dae09 assets/oreganized/models/block/gray_crystal_glass_pane_post_out.json -7057da543c67df81f91dd21f710f98d74eb5d59e assets/oreganized/models/block/gray_crystal_glass_pane_post_rot.json -3081b781158e38e6c3e7b4f4bb648970e54ae80d assets/oreganized/models/block/gray_crystal_glass_pane_side.json -9af0c795efb1cc0769d1967bd534f2675d3982b1 assets/oreganized/models/block/gray_crystal_glass_pane_side_alt.json -3a128e1c36bc0ee455d88cd21a7b540b640863eb assets/oreganized/models/block/gray_crystal_glass_pane_side_alt_in.json -8974c378d5d70b1c0b29dd8e5d5d56dc4478c07b assets/oreganized/models/block/gray_crystal_glass_pane_side_alt_out.json -4a094f1921dc2f29042b83bf9c8ab29742dff9c1 assets/oreganized/models/block/gray_crystal_glass_pane_side_alt_rot.json -bb2a21c4cc7db90599b1498cbdc64eb244311589 assets/oreganized/models/block/gray_crystal_glass_pane_side_in.json -242a4e280a8ae4aa11b9c78aebb8810c3fe85c99 assets/oreganized/models/block/gray_crystal_glass_pane_side_out.json -70eba566d71f8fa6a7496fe057613ce8d7e4b4a4 assets/oreganized/models/block/gray_crystal_glass_pane_side_rot.json -6a45988e05de5c086a9e8ece8642cf412dd466af assets/oreganized/models/block/gray_crystal_glass_rot.json -7d9b9dd458a536627b1e22fe5ecb26ca9cfc8fb2 assets/oreganized/models/block/green_concrete_powder.json -169a2fb6047878118c082d9a710c265c99ec6345 assets/oreganized/models/block/green_crystal_glass.json -707b39ff895f28b54d9ecd784dcee6648e497451 assets/oreganized/models/block/green_crystal_glass_in.json -de54d09a385d02ffed5d9836d776593eb239423b assets/oreganized/models/block/green_crystal_glass_out.json -fcf6231bca92b0e1550891c1520492443024b491 assets/oreganized/models/block/green_crystal_glass_pane_noside.json -e8ece0b71a54688b915d1bb1bc1a107d9fe6b735 assets/oreganized/models/block/green_crystal_glass_pane_noside_alt.json -7ab7597c57f21e03f5d9e6019473f85904a88607 assets/oreganized/models/block/green_crystal_glass_pane_noside_alt_in.json -ae2084543c2c9fb4b6571cea73330cf4e2484084 assets/oreganized/models/block/green_crystal_glass_pane_noside_alt_out.json -29fdb3f2b783d314f5be47d63e54848760416126 assets/oreganized/models/block/green_crystal_glass_pane_noside_alt_rot.json -4fead94c35262fbb805d61c8ace7d2348982dba4 assets/oreganized/models/block/green_crystal_glass_pane_noside_in.json -78ca0afee78ac86a31f8ee9732c00d2ac148a4b2 assets/oreganized/models/block/green_crystal_glass_pane_noside_out.json -13264104fde991a810abfeb0fa2a2b7aded74a7e assets/oreganized/models/block/green_crystal_glass_pane_noside_rot.json -8c30261e00a56914f55968b015e680fc656746d1 assets/oreganized/models/block/green_crystal_glass_pane_post.json -21599d0764c9f92586b49fcf61ede9e4d64c3f74 assets/oreganized/models/block/green_crystal_glass_pane_post_in.json -385ff7e5abf01e20fc6597819000fe7995e59887 assets/oreganized/models/block/green_crystal_glass_pane_post_out.json -73683fab18e745379ffd7c947437e5d5d9610281 assets/oreganized/models/block/green_crystal_glass_pane_post_rot.json -884569b1ddb1505f2b4f9b1d082f8481663d3635 assets/oreganized/models/block/green_crystal_glass_pane_side.json -b29b81eeab0ea663ab0e8da2e222fe489e2ccd63 assets/oreganized/models/block/green_crystal_glass_pane_side_alt.json -d005ac0e0564c6766c9984c5db4fbfad5526c814 assets/oreganized/models/block/green_crystal_glass_pane_side_alt_in.json -9fe409077c8172b00d44843758db6a09912fc154 assets/oreganized/models/block/green_crystal_glass_pane_side_alt_out.json -f06c23bb719390bafdc75bda45d27d754cf5ca88 assets/oreganized/models/block/green_crystal_glass_pane_side_alt_rot.json -94c5370846273d6feadf4b90e0f5587564c3cba3 assets/oreganized/models/block/green_crystal_glass_pane_side_in.json -5dea33a075a76c327a95d404e83859280d1678ad assets/oreganized/models/block/green_crystal_glass_pane_side_out.json -526a594c52b1fd25b57124861bb247fd4fc32814 assets/oreganized/models/block/green_crystal_glass_pane_side_rot.json -0771143da48d3d7a50bd6bf5beb62fa778397c48 assets/oreganized/models/block/green_crystal_glass_rot.json -6ac43f4b7a86ba2b1a3638637108659d12dfb006 assets/oreganized/models/block/grooved_blue_ice.json -ff530b321353ded30d649ead0668faa2bcfe16a9 assets/oreganized/models/block/grooved_ice.json -2a0395c97d8caca1311c8b5181b324c228af84d7 assets/oreganized/models/block/grooved_packed_ice.json -cb3cc16c959785c50d6228a4ae538019643d4954 assets/oreganized/models/block/lead_bars_cap.json -be4d3f74e1f26b375a898571e38750510f450038 assets/oreganized/models/block/lead_bars_cap_alt.json -d2e7a7bcc18d80e85ad8d72e84ab19a631e321d0 assets/oreganized/models/block/lead_bars_post.json -d973c46a2238e07b1a2ad219f0c71556e3768cde assets/oreganized/models/block/lead_bars_post_ends.json -c817f48d9b0b502e26c7d4f44f76f9a260c846e4 assets/oreganized/models/block/lead_bars_side.json -2a78455f914b0bcb8797e0411b8e697e066e7630 assets/oreganized/models/block/lead_bars_side_alt.json -99f53d2888cb23cc09f497c6ea86063b0e8d7c06 assets/oreganized/models/block/lead_block.json -3711df98ba5e24c56ca10f080681b0efa52f7a69 assets/oreganized/models/block/lead_bolt_crate.json -fb1ee9f9c979aabda19fcc48ec167ba711d35ae2 assets/oreganized/models/block/lead_bricks.json -b93ab0c45a40dc3a5a25a6ccde6e8eb2471e0084 assets/oreganized/models/block/lead_bulb.json -19d826c306b5753a7c9d5539e5ac76c75dcebec9 assets/oreganized/models/block/lead_door_bottom_left.json -90047d804c7346b2246f8f87a22328816ed77156 assets/oreganized/models/block/lead_door_bottom_left_open.json -e0cb3ee1fd12c5bd73b3e37123313fc80cfe750b assets/oreganized/models/block/lead_door_bottom_right.json -a3b5fb9f197b9d401d6863366d6d3d657eae521d assets/oreganized/models/block/lead_door_bottom_right_open.json -294fa31777669bcd393605136f68653d2032f4d9 assets/oreganized/models/block/lead_door_top_left.json -be51e111a7b4e942be7c88cdca28f2b4a24e8fbe assets/oreganized/models/block/lead_door_top_left_open.json -969a6d9a5236354a465a19902da2484641ad13f9 assets/oreganized/models/block/lead_door_top_right.json -d3a87e54d03e4fdcd043dff4c64b8c816fb64c8e assets/oreganized/models/block/lead_door_top_right_open.json -638234cafeea24173c4c595e3f6b5f0eead7f3f9 assets/oreganized/models/block/lead_ore.json -48d0cda98b8a321498318830f37f31f5b1e37256 assets/oreganized/models/block/lead_pillar.json -2035fbf628e2e29273c51b129b86d3d5a7420a02 assets/oreganized/models/block/lead_trapdoor_bottom.json -fa732db48528411b86d49f5859cb2a65e41d47dc assets/oreganized/models/block/lead_trapdoor_open.json -f5a4c85ad7ede8826070336730750648f2901e75 assets/oreganized/models/block/lead_trapdoor_top.json -06db64e09c614890464ebccb6a0ff0a2b698e4d5 assets/oreganized/models/block/light_blue_concrete_powder.json -d0e3a18ba04b1fa0d55bd6fb34ee42c9a9e645b5 assets/oreganized/models/block/light_blue_crystal_glass.json -d2c97e97582441e89d21da3358ddf2624aab6ac7 assets/oreganized/models/block/light_blue_crystal_glass_in.json -e21e0cc71c0ae4911e8a8feeb0ba5fee12df5042 assets/oreganized/models/block/light_blue_crystal_glass_out.json -56ee7d3e74bf4933358a6feb2fbbbf891cf3d26d assets/oreganized/models/block/light_blue_crystal_glass_pane_noside.json -55e7a0c1a65688d2b6fd75dc55ad957df93bb1aa assets/oreganized/models/block/light_blue_crystal_glass_pane_noside_alt.json -339e9aebd33a635f8e9822907a5a2faed801ed06 assets/oreganized/models/block/light_blue_crystal_glass_pane_noside_alt_in.json -d54099a85cb575d675695ee26f3324303c0b264e assets/oreganized/models/block/light_blue_crystal_glass_pane_noside_alt_out.json -4e3ada58442f65ad4020a6d8b8627296d2235c8d assets/oreganized/models/block/light_blue_crystal_glass_pane_noside_alt_rot.json -7fcd1ab1cafb2f75926d5f621830a82da78c10c4 assets/oreganized/models/block/light_blue_crystal_glass_pane_noside_in.json -f93e2bc9151cb3da8bcd60bed0a40fd544433b2f assets/oreganized/models/block/light_blue_crystal_glass_pane_noside_out.json -c48145bbb998b3c86b435cf2836dbc3cdbc149f9 assets/oreganized/models/block/light_blue_crystal_glass_pane_noside_rot.json -a754e653a4ac820dc61e01adfbae4374603e3d16 assets/oreganized/models/block/light_blue_crystal_glass_pane_post.json -0ef8f7a6003468f0be8c22523e4f35245c28f411 assets/oreganized/models/block/light_blue_crystal_glass_pane_post_in.json -2ed59103f4a4ad9536dd243f3f5696dc209d052b assets/oreganized/models/block/light_blue_crystal_glass_pane_post_out.json -c4602cd3cc7072203976000a5060b35b3594fe84 assets/oreganized/models/block/light_blue_crystal_glass_pane_post_rot.json -0feb73b69e6dac427c2a36ea7fd371ef7fadc953 assets/oreganized/models/block/light_blue_crystal_glass_pane_side.json -4e044ffdad2373d641990c4a996a9eff1ef64fdd assets/oreganized/models/block/light_blue_crystal_glass_pane_side_alt.json -16b07c7c70f22dc325bad639e291b7da7bbeb1e8 assets/oreganized/models/block/light_blue_crystal_glass_pane_side_alt_in.json -592e82194cb80ffcc0e50eca997e10d80bf2814f assets/oreganized/models/block/light_blue_crystal_glass_pane_side_alt_out.json -225179c201175a82d161f73811a4d866a3cdaa39 assets/oreganized/models/block/light_blue_crystal_glass_pane_side_alt_rot.json -c996f95f0556c4516ae6d962266182bc41d8837c assets/oreganized/models/block/light_blue_crystal_glass_pane_side_in.json -e63efa9348807c5d087b5efaf057109e22481a65 assets/oreganized/models/block/light_blue_crystal_glass_pane_side_out.json -3f45b2e8f6c4c869af036765bf6b158d7c42d369 assets/oreganized/models/block/light_blue_crystal_glass_pane_side_rot.json -bef3c54f567c6ac71aad8184916114f6e6015e77 assets/oreganized/models/block/light_blue_crystal_glass_rot.json -cc3496c0dfc32a694af4f379cfb5f7cc1988e804 assets/oreganized/models/block/light_gray_concrete_powder.json -cafbdfb97d41927e293dddebf8892932e0bdbe83 assets/oreganized/models/block/light_gray_crystal_glass.json -6b595a6115f76b8625b80611d861032411e4ba08 assets/oreganized/models/block/light_gray_crystal_glass_in.json -eb9533c69c9f80c6c60dbbac53a114571b2cf0ff assets/oreganized/models/block/light_gray_crystal_glass_out.json -579afa2a9c544838859fab474092ebace1b2cbce assets/oreganized/models/block/light_gray_crystal_glass_pane_noside.json -cb729f2a7413d2de1998e357a57c35b4fb712747 assets/oreganized/models/block/light_gray_crystal_glass_pane_noside_alt.json -28f0e354c24967c00c28070bdec3560b5d56125d assets/oreganized/models/block/light_gray_crystal_glass_pane_noside_alt_in.json -867082194041129826e7f033697f8195d71ad7f0 assets/oreganized/models/block/light_gray_crystal_glass_pane_noside_alt_out.json -5c9edc97d1909c5b2f9705958e3892bfff15b59c assets/oreganized/models/block/light_gray_crystal_glass_pane_noside_alt_rot.json -1f3b988eb02727069670cd271e745071fa8157b0 assets/oreganized/models/block/light_gray_crystal_glass_pane_noside_in.json -5f78d74b94f0d850a5338b353ab64bee19c74aee assets/oreganized/models/block/light_gray_crystal_glass_pane_noside_out.json -c7057db3a41107a3adfc0f4fd6f8954464751b14 assets/oreganized/models/block/light_gray_crystal_glass_pane_noside_rot.json -5079b2f71cf1ef091e8280641e4d08ebad19ad81 assets/oreganized/models/block/light_gray_crystal_glass_pane_post.json -711fc2666f00ea6288cb8b498c951b69e6b33ed5 assets/oreganized/models/block/light_gray_crystal_glass_pane_post_in.json -3b9045445cec79e59f482cdfa39d7053ea0f0f7c assets/oreganized/models/block/light_gray_crystal_glass_pane_post_out.json -8758203f1bf053721f91f4597ab1fcf8a8174a0e assets/oreganized/models/block/light_gray_crystal_glass_pane_post_rot.json -c87fd58cddd3a07b21009426dea7c743968c2d08 assets/oreganized/models/block/light_gray_crystal_glass_pane_side.json -f58368f3ed9c99a692c61898ac5624cc79cfd8bd assets/oreganized/models/block/light_gray_crystal_glass_pane_side_alt.json -a63945d8dd0429857d1c7c10ce6167f0747ae2be assets/oreganized/models/block/light_gray_crystal_glass_pane_side_alt_in.json -2cb1e011f542e2f3bb1e33e875d9188adeba2c21 assets/oreganized/models/block/light_gray_crystal_glass_pane_side_alt_out.json -667f7a0e4fee9c017639cee76ad5e318480f714c assets/oreganized/models/block/light_gray_crystal_glass_pane_side_alt_rot.json -c85f4e300b801bd4e5267a9cc51751fc208eaf09 assets/oreganized/models/block/light_gray_crystal_glass_pane_side_in.json -79fa52d765a6545b38f6e4ae6ec5df08efb81825 assets/oreganized/models/block/light_gray_crystal_glass_pane_side_out.json -1c2b35fa2f11c609bd76406d609a258c340915ec assets/oreganized/models/block/light_gray_crystal_glass_pane_side_rot.json -377e4dcda4ac0aea8fb99d05715eefc69c2f38e6 assets/oreganized/models/block/light_gray_crystal_glass_rot.json -b667aed52d30f957bb5b8a674d72678074e1988a assets/oreganized/models/block/lime_concrete_powder.json -84a1cbd347232ebe94e1412ce552f542d0d4c04e assets/oreganized/models/block/lime_crystal_glass.json -cab16fecfcf35558e07021a775ec0850e559dc73 assets/oreganized/models/block/lime_crystal_glass_in.json -ca7a22b71362ec9fe7ff39a2737c913445551d0b assets/oreganized/models/block/lime_crystal_glass_out.json -0deda75760f9c89a1b3ad9a7c594564df6136cc3 assets/oreganized/models/block/lime_crystal_glass_pane_noside.json -900857a70960246f620013350e012017c01dbb21 assets/oreganized/models/block/lime_crystal_glass_pane_noside_alt.json -b3bf93d05d41aa98fa9ea3a0ba23b828981e81a0 assets/oreganized/models/block/lime_crystal_glass_pane_noside_alt_in.json -ed37f6e053b66ec086505f4da81aa5a7c77fa389 assets/oreganized/models/block/lime_crystal_glass_pane_noside_alt_out.json -613937aabaabd685f3e3af46b7aabe71e12790f8 assets/oreganized/models/block/lime_crystal_glass_pane_noside_alt_rot.json -a28fda10b65e401c890f798648a8ca48b6a3b7d5 assets/oreganized/models/block/lime_crystal_glass_pane_noside_in.json -f151a5c25519fa586cc0ec6bb59aa874ad8efee4 assets/oreganized/models/block/lime_crystal_glass_pane_noside_out.json -b2548adf6ba5d211812e2ba94a6c150e84f079fc assets/oreganized/models/block/lime_crystal_glass_pane_noside_rot.json -7024e91e3b8c92296d3e7dceb8e47aaf881bc0a8 assets/oreganized/models/block/lime_crystal_glass_pane_post.json -bd9cbfeebb30f349eddbf57f076cac7f599244e1 assets/oreganized/models/block/lime_crystal_glass_pane_post_in.json -d1f627f4280e0546735172b385578726674fd721 assets/oreganized/models/block/lime_crystal_glass_pane_post_out.json -cca4244832f21b881cdcf6f550ee092521e85b42 assets/oreganized/models/block/lime_crystal_glass_pane_post_rot.json -6ed425883e4701bfb83d612320ed0a53078d4993 assets/oreganized/models/block/lime_crystal_glass_pane_side.json -58f468941850c6d28a20027ac910fe3233568276 assets/oreganized/models/block/lime_crystal_glass_pane_side_alt.json -f45765e0cfb682f0db2c14f910cdec97299b2312 assets/oreganized/models/block/lime_crystal_glass_pane_side_alt_in.json -5282bb62924b11ebfad055e4ccadce4697085f9e assets/oreganized/models/block/lime_crystal_glass_pane_side_alt_out.json -eb65ef13605b8bd0f684a62ddde430e2efde190e assets/oreganized/models/block/lime_crystal_glass_pane_side_alt_rot.json -e48a604d3b2acbbf2df7b18b1dfabfc5add6fd2a assets/oreganized/models/block/lime_crystal_glass_pane_side_in.json -2bc5fcbd62541954cbf177ee2cb78b659cd8277c assets/oreganized/models/block/lime_crystal_glass_pane_side_out.json -9fbf48fe5fab3b2e538704f8a529b07f02b8ee35 assets/oreganized/models/block/lime_crystal_glass_pane_side_rot.json -467034c7b1573ec2c06170c287a7d43da218d223 assets/oreganized/models/block/lime_crystal_glass_rot.json -dcd8c9192f22a02c035f577021a787b876e57065 assets/oreganized/models/block/magenta_concrete_powder.json -84c88a72b4403008762910054f4f98f4a114defe assets/oreganized/models/block/magenta_crystal_glass.json -cc5694ad1eae57281f46d880f32f40fa6e78e318 assets/oreganized/models/block/magenta_crystal_glass_in.json -f3fc61a8e1adb5f591328bf20318d059c32a8aa7 assets/oreganized/models/block/magenta_crystal_glass_out.json -7e1fbd7748d7ef02f3e23b3e651992794ecb5af8 assets/oreganized/models/block/magenta_crystal_glass_pane_noside.json -daf0d0ad78162277ed45feb39ee16c8a2fdc8159 assets/oreganized/models/block/magenta_crystal_glass_pane_noside_alt.json -2605a598105a4dd96181182e4f7d874391e1114e assets/oreganized/models/block/magenta_crystal_glass_pane_noside_alt_in.json -494eea4fa2774d64804b6fc3f1c1ad6cdea6f6ec assets/oreganized/models/block/magenta_crystal_glass_pane_noside_alt_out.json -1a75299cb362be12fa08f43579de014cc4752f81 assets/oreganized/models/block/magenta_crystal_glass_pane_noside_alt_rot.json -65e3aa555be89db3746b2fe4d16f67ed3d145ed4 assets/oreganized/models/block/magenta_crystal_glass_pane_noside_in.json -4196850298accff0cad8185c43b91dc0f5579e3f assets/oreganized/models/block/magenta_crystal_glass_pane_noside_out.json -1c9c820b9a106288ef3bf55d36cebbdd133b7643 assets/oreganized/models/block/magenta_crystal_glass_pane_noside_rot.json -563a8fdd6e54853a7f99f759e0a89aa2bed24516 assets/oreganized/models/block/magenta_crystal_glass_pane_post.json -41ccbee9a7fe02a746aa4c7f2af6f3c285fbd5cb assets/oreganized/models/block/magenta_crystal_glass_pane_post_in.json -4cdc508c6927c4db3439b847a5c239a68e0a304c assets/oreganized/models/block/magenta_crystal_glass_pane_post_out.json -be1cd8995ac7eeae27ec63419283baabbb03d742 assets/oreganized/models/block/magenta_crystal_glass_pane_post_rot.json -4a7d3a9986c6a9477502fa5f76f7306f988aa6e5 assets/oreganized/models/block/magenta_crystal_glass_pane_side.json -918bf54e3663a5986a9b780d18790c796849072c assets/oreganized/models/block/magenta_crystal_glass_pane_side_alt.json -337aae670f4f115bc7684a10105e1d9efcaa7451 assets/oreganized/models/block/magenta_crystal_glass_pane_side_alt_in.json -8e0ee4ac9cb1651ecf080057370a04bb6f1a9a63 assets/oreganized/models/block/magenta_crystal_glass_pane_side_alt_out.json -a9c354ef0a50a87e3513e0e929debc0d0438b7c3 assets/oreganized/models/block/magenta_crystal_glass_pane_side_alt_rot.json -f61dd79a1da013e1fc0b59cf0991c6e5e97b0694 assets/oreganized/models/block/magenta_crystal_glass_pane_side_in.json -3c85ff6451d8a472d8e7cae8a2ae7fc2d47ced30 assets/oreganized/models/block/magenta_crystal_glass_pane_side_out.json -23db59d9843ded540b0b71ec72d9a7c1654034c7 assets/oreganized/models/block/magenta_crystal_glass_pane_side_rot.json -64b8bf65885c03ae44e23aee011008ccb67cb60d assets/oreganized/models/block/magenta_crystal_glass_rot.json -d6b67784754f6683734081c363b4f9b72f1f388b assets/oreganized/models/block/molten_lead_cauldron0.json -e831cbb457d1314e3c0f5a7706992c90c35337a6 assets/oreganized/models/block/molten_lead_cauldron1.json -e831cbb457d1314e3c0f5a7706992c90c35337a6 assets/oreganized/models/block/molten_lead_cauldron2.json -a93195bb7d6904f9512a944718ed3e277dd49825 assets/oreganized/models/block/molten_lead_cauldron3.json -dd32db6fa4116d962e9d315d2a04d4cc9abc4b57 assets/oreganized/models/block/orange_concrete_powder.json -35086543e21148211924a5e13792cce6bb365d83 assets/oreganized/models/block/orange_crystal_glass.json -b4262704315207fff392059489bc6ff455edcd6f assets/oreganized/models/block/orange_crystal_glass_in.json -ee10355a9987ec39116788eda5ecab7efb1bf0ed assets/oreganized/models/block/orange_crystal_glass_out.json -53b06d109175ca69f9ac50be6a81c855a652a9d2 assets/oreganized/models/block/orange_crystal_glass_pane_noside.json -ace23761e02accf5f73a14ab54cdb421fd1a9755 assets/oreganized/models/block/orange_crystal_glass_pane_noside_alt.json -e3592e684e9eb675a6ec08c9a1968138b4394538 assets/oreganized/models/block/orange_crystal_glass_pane_noside_alt_in.json -68c93d272f8387b904a41edda94c4bd1ad3453b9 assets/oreganized/models/block/orange_crystal_glass_pane_noside_alt_out.json -d3b9f721343d1c5bcba8a109052e63bbc2991b62 assets/oreganized/models/block/orange_crystal_glass_pane_noside_alt_rot.json -40502574528d992e4b786f5f83a7356b4c8858d9 assets/oreganized/models/block/orange_crystal_glass_pane_noside_in.json -61736e8f6e089ec63e6cb091c0b6801132c22b54 assets/oreganized/models/block/orange_crystal_glass_pane_noside_out.json -5760824179539f35fe6a6cde2de3918b5a2c65ea assets/oreganized/models/block/orange_crystal_glass_pane_noside_rot.json -4bb66beb9b059e863d040a7b98e4863a7528acaf assets/oreganized/models/block/orange_crystal_glass_pane_post.json -a11d7d1008ed910521aa2d3e4a5d5119e9f0531b assets/oreganized/models/block/orange_crystal_glass_pane_post_in.json -1f43cfc61c9ff3a8e1cc86e0c0e7a2863c18ed85 assets/oreganized/models/block/orange_crystal_glass_pane_post_out.json -d8700c79d280579885bcb487f183e5100667a0ce assets/oreganized/models/block/orange_crystal_glass_pane_post_rot.json -c240eaab024de53c8519d7d728b9924f69789080 assets/oreganized/models/block/orange_crystal_glass_pane_side.json -44cec27ea4d78b6234ba45c60594b9be859d9212 assets/oreganized/models/block/orange_crystal_glass_pane_side_alt.json -12064733011334a699b9ca6dbc761497b60d1826 assets/oreganized/models/block/orange_crystal_glass_pane_side_alt_in.json -323edaf2cf2509fa7f6f58e74a4b7ffb5d02a6e5 assets/oreganized/models/block/orange_crystal_glass_pane_side_alt_out.json -4c6050242ba9054049a78e14fb9741580a92306c assets/oreganized/models/block/orange_crystal_glass_pane_side_alt_rot.json -5d81502fba10d77863fe7ae382c4c4acaa5d6cfa assets/oreganized/models/block/orange_crystal_glass_pane_side_in.json -e200aa2575f72bde4fca7be46bfe49bdcf1d272e assets/oreganized/models/block/orange_crystal_glass_pane_side_out.json -dfa78dff5c2aaa56105176858237dc27e092990f assets/oreganized/models/block/orange_crystal_glass_pane_side_rot.json -6c85eea8420c50d496cd7b91d90d0002e9b7042b assets/oreganized/models/block/orange_crystal_glass_rot.json -58f7913ed5ccbeabf87fc3cc4356d05fa9d98f13 assets/oreganized/models/block/pink_concrete_powder.json -bd3378b8df075e77ca1b6f6ca1d4144f93b8b367 assets/oreganized/models/block/pink_crystal_glass.json -d109817afcdf3118fa3efbd353850e8f55517d64 assets/oreganized/models/block/pink_crystal_glass_in.json -8875740fcd136a522e0e2df384bec09e055a9236 assets/oreganized/models/block/pink_crystal_glass_out.json -f96705fc67f2283180532d5bb760399d78dd6f1e assets/oreganized/models/block/pink_crystal_glass_pane_noside.json -883172735abe33c2304990572e7c636067a7f223 assets/oreganized/models/block/pink_crystal_glass_pane_noside_alt.json -d2c4c0b3447cc0ff2d7343937d9f6b5ea9f0e50e assets/oreganized/models/block/pink_crystal_glass_pane_noside_alt_in.json -e012235c500effe71c77faa05a404442c5187235 assets/oreganized/models/block/pink_crystal_glass_pane_noside_alt_out.json -39f522ac49cc2e102a1387d9b850bdf2e22d2d94 assets/oreganized/models/block/pink_crystal_glass_pane_noside_alt_rot.json -76b3a544c61f4fdf95b16fb81c76ca7fa4d43451 assets/oreganized/models/block/pink_crystal_glass_pane_noside_in.json -a4735e6b69ef4b618af0d626ef22a89f70753310 assets/oreganized/models/block/pink_crystal_glass_pane_noside_out.json -418292cc60561c654f846873426f7353b823a675 assets/oreganized/models/block/pink_crystal_glass_pane_noside_rot.json -bfb76e9d4e7d7246919a6e71bb3f97f23e9bf1db assets/oreganized/models/block/pink_crystal_glass_pane_post.json -7b8f98e3bed4d2da9e1a011d9f845ac8f4ff08ec assets/oreganized/models/block/pink_crystal_glass_pane_post_in.json -0085f4b25f226b3ebf2494ff31503230f8609fe4 assets/oreganized/models/block/pink_crystal_glass_pane_post_out.json -8a3639c8cd84f092b3d213c0ff9caba7a27d626f assets/oreganized/models/block/pink_crystal_glass_pane_post_rot.json -5dd04f8f1c7701ede24228943af69844bd639024 assets/oreganized/models/block/pink_crystal_glass_pane_side.json -a1b213dafb54d59252fcc5cd50779adef6a2f5be assets/oreganized/models/block/pink_crystal_glass_pane_side_alt.json -cd8e2340875edf2739aa005b24a7d1faa79a04a4 assets/oreganized/models/block/pink_crystal_glass_pane_side_alt_in.json -880b3faf412d55f04ff3c374ca79c23254c5c2f1 assets/oreganized/models/block/pink_crystal_glass_pane_side_alt_out.json -b3caec9f6f245487dc5af89c0daf909585cfb601 assets/oreganized/models/block/pink_crystal_glass_pane_side_alt_rot.json -3cfa92ec526d344b42069040eb2d63cdeb598a25 assets/oreganized/models/block/pink_crystal_glass_pane_side_in.json -f13030d6c143a9a06d323ad8442eabd9f0061f3c assets/oreganized/models/block/pink_crystal_glass_pane_side_out.json -966d69e0ac44ef0ec493b281b759c1dbc1c7de61 assets/oreganized/models/block/pink_crystal_glass_pane_side_rot.json -27b1d54dd7f8170d4a78c154a0bfd25ceaea6af9 assets/oreganized/models/block/pink_crystal_glass_rot.json -2817146acda72f5ba4cb468563da370757344205 assets/oreganized/models/block/polished_glance.json -f18c05c0938bc4511c9a52080d4e21ccf889510b assets/oreganized/models/block/polished_glance_slab.json -b0ef458d7e44703460bc3eff2baf7473a814760f assets/oreganized/models/block/polished_glance_slab_top.json -1b89e0cbb7cb2a1a7d7bd7ca6d260faef0710b77 assets/oreganized/models/block/polished_glance_stairs.json -5154e907a40b190b5d13e045fa5e684091d602b4 assets/oreganized/models/block/polished_glance_stairs_inner.json -c5990836ebbf4ad12e8976813bc938b643854445 assets/oreganized/models/block/polished_glance_stairs_outer.json -f4c360c0910696ffa59f6bcdd36ad2ad05a7c56d assets/oreganized/models/block/purple_concrete_powder.json -ed183723f8238673074d678dfe42b29033580041 assets/oreganized/models/block/purple_crystal_glass.json -79722f90f36fe29f348c16c899296d351db4c2cb assets/oreganized/models/block/purple_crystal_glass_in.json -795b52c149355dfab3cf367111fbdd78418d77df assets/oreganized/models/block/purple_crystal_glass_out.json -ac265c2bffde24f9b463c4f6cf1fa603a232aa3a assets/oreganized/models/block/purple_crystal_glass_pane_noside.json -c42776583540fd49676ebc328090c67d7b7ad501 assets/oreganized/models/block/purple_crystal_glass_pane_noside_alt.json -ca57df4c57648f8e490a857cc7c0343cc1d71b3e assets/oreganized/models/block/purple_crystal_glass_pane_noside_alt_in.json -1b733b4c38aaeb1e4bfdfff2c55530adc43d41b5 assets/oreganized/models/block/purple_crystal_glass_pane_noside_alt_out.json -f9cbcc44914a04998a5e7b4da5c3391825a65f56 assets/oreganized/models/block/purple_crystal_glass_pane_noside_alt_rot.json -6dc0a593c4390caec2407384cde0b3b5731e6f03 assets/oreganized/models/block/purple_crystal_glass_pane_noside_in.json -4e3d41150f54e2e00c95fd7447933a62fe51921e assets/oreganized/models/block/purple_crystal_glass_pane_noside_out.json -fd55f1d8e09adcd11e5915eeb76d7eba4c48e2da assets/oreganized/models/block/purple_crystal_glass_pane_noside_rot.json -659b2ea1983825ba7e964b60b8c37da982ad0bd4 assets/oreganized/models/block/purple_crystal_glass_pane_post.json -5116319107f3b84bb77c0d2f8e9a583a7035e058 assets/oreganized/models/block/purple_crystal_glass_pane_post_in.json -a1724576d5f7e65845c7b927df339486616ccf50 assets/oreganized/models/block/purple_crystal_glass_pane_post_out.json -2ba411c03e4b87cab9d68e0fb346d95fe1198ac1 assets/oreganized/models/block/purple_crystal_glass_pane_post_rot.json -972342c82aa86d844dd82341fab2c59952428cab assets/oreganized/models/block/purple_crystal_glass_pane_side.json -b8f360ccef6ee0e1ccc75f076444cce7518a226b assets/oreganized/models/block/purple_crystal_glass_pane_side_alt.json -57c774d7c6843e98ccdb2cdaf5a85f46afb09ef4 assets/oreganized/models/block/purple_crystal_glass_pane_side_alt_in.json -b270f0f793422400d0e1a4927b16857c3012c1d1 assets/oreganized/models/block/purple_crystal_glass_pane_side_alt_out.json -fadb9f8c5f3bea03ab8b147b82d208a0b8efeb92 assets/oreganized/models/block/purple_crystal_glass_pane_side_alt_rot.json -379138695b84ebd57ab8164a5f02955a3447a96f assets/oreganized/models/block/purple_crystal_glass_pane_side_in.json -caa5c276899506e646402ad82a5a48847fc807a5 assets/oreganized/models/block/purple_crystal_glass_pane_side_out.json -a43e30367784b061022e86e51dfd4fcdd81fb44b assets/oreganized/models/block/purple_crystal_glass_pane_side_rot.json -f19346ca8fb8c7d4657c5d19666e190d6e39aa0d assets/oreganized/models/block/purple_crystal_glass_rot.json -9f8bd8f481fe842bd6d61699c2476c854a3fa677 assets/oreganized/models/block/raw_lead_block.json -717355700c42d3a0433c39bce8dc8b8980590aa4 assets/oreganized/models/block/raw_silver_block.json -1fc924cf9356ef366175d8f7a692e2d629683656 assets/oreganized/models/block/red_concrete_powder.json -ef7a5613ecc14910a7e74c0fb833dd073493a255 assets/oreganized/models/block/red_crystal_glass.json -6669062ee508ce6088fd6294458fa4153d61b71c assets/oreganized/models/block/red_crystal_glass_in.json -83d6ba44a3c09cd81c914e2e2a0be1e241c155c5 assets/oreganized/models/block/red_crystal_glass_out.json -11a3630017afd29778b09f324d83b60a7a957bf9 assets/oreganized/models/block/red_crystal_glass_pane_noside.json -9d40fa0e6dbe178a08c53ab2b461718e17882f9d assets/oreganized/models/block/red_crystal_glass_pane_noside_alt.json -c8200051ba646c11df0b5d540eeaf35c10a4598c assets/oreganized/models/block/red_crystal_glass_pane_noside_alt_in.json -30d9a2cb894815114b9bb657316d29f271363424 assets/oreganized/models/block/red_crystal_glass_pane_noside_alt_out.json -3151cd7b5b295a66ac008a7090107c00d4199d2c assets/oreganized/models/block/red_crystal_glass_pane_noside_alt_rot.json -bd5855f469fe7e62a200c626c447e21438abc016 assets/oreganized/models/block/red_crystal_glass_pane_noside_in.json -253ebb97e6739b56667e1733819a4ebd458fae80 assets/oreganized/models/block/red_crystal_glass_pane_noside_out.json -e92f4dbf3d34723f51ab480e74bf4a35e395ffcd assets/oreganized/models/block/red_crystal_glass_pane_noside_rot.json -bb0f510bd49f6360b108fb0836555f6f963cd17d assets/oreganized/models/block/red_crystal_glass_pane_post.json -99c5020ab89c3a4cb480fb1bcef41759288f684c assets/oreganized/models/block/red_crystal_glass_pane_post_in.json -709e9de8e5e32ec2a5a2a296870c5b3cd15059c4 assets/oreganized/models/block/red_crystal_glass_pane_post_out.json -d24ced929264e09343989994a75439d1edc79e9c assets/oreganized/models/block/red_crystal_glass_pane_post_rot.json -f9b2df6a6dc8bd5055301a2678f2eec6d3bfd4ab assets/oreganized/models/block/red_crystal_glass_pane_side.json -d4be21371ad5e98b1150f889016962109b530f59 assets/oreganized/models/block/red_crystal_glass_pane_side_alt.json -948cb14e2d7c8f09cbbf1da59cd3fce7131cabf9 assets/oreganized/models/block/red_crystal_glass_pane_side_alt_in.json -cb04598c8ad2b2b70c0dc0c0d364b7648c9d2ad4 assets/oreganized/models/block/red_crystal_glass_pane_side_alt_out.json -136ac8b64a4b9844fcb0590146e2a4c245bdf5a4 assets/oreganized/models/block/red_crystal_glass_pane_side_alt_rot.json -5e4629cdaf915ae784af2d436776231370511b12 assets/oreganized/models/block/red_crystal_glass_pane_side_in.json -fc4686b3abd998e5452c7f52f95955a09c2b1d6b assets/oreganized/models/block/red_crystal_glass_pane_side_out.json -9a7cde8b96069bdbfafa51128b0023b910010496 assets/oreganized/models/block/red_crystal_glass_pane_side_rot.json -10e86abb57750da011baca933546e5eb0266731e assets/oreganized/models/block/red_crystal_glass_rot.json -59ce500fd768122ca1d5039fe2e6a4c06d4c685a assets/oreganized/models/block/red_hot_lead.json -bbe7b499bd9c588515a8179aea90c345749f6298 assets/oreganized/models/block/red_hot_lead_bars_cap.json -251ea8bbf14270076f8a313a26b1d9f9708c28c6 assets/oreganized/models/block/red_hot_lead_bars_cap_alt.json -e7902f26b6dae9da5d5b503af270dfebb38f4701 assets/oreganized/models/block/red_hot_lead_bars_post.json -9b820ab12945bfca2df58c39a02a6fd4afb1d40a assets/oreganized/models/block/red_hot_lead_bars_post_ends.json -aa503c4926d1de2115155c6373559430025f3879 assets/oreganized/models/block/red_hot_lead_bars_side.json -6bcdcd41988a7cc5ebd7273f5bd7accef9eaef04 assets/oreganized/models/block/red_hot_lead_bars_side_alt.json -6981808121cac6c55a84203a9c8e3ab5a50083fc assets/oreganized/models/block/red_hot_lead_door_bottom_left.json -6981808121cac6c55a84203a9c8e3ab5a50083fc assets/oreganized/models/block/red_hot_lead_door_bottom_left_open.json -d606f62302a9656482f8076d3592122a95ebda2a assets/oreganized/models/block/red_hot_lead_door_bottom_right.json -d606f62302a9656482f8076d3592122a95ebda2a assets/oreganized/models/block/red_hot_lead_door_bottom_right_open.json -288adc1c97cd701ce45867813f7a23272b164c02 assets/oreganized/models/block/red_hot_lead_door_top_left.json -288adc1c97cd701ce45867813f7a23272b164c02 assets/oreganized/models/block/red_hot_lead_door_top_left_open.json -9aefc0424c65cfd5a4394bff34e2d3ed9556debe assets/oreganized/models/block/red_hot_lead_door_top_right.json -9aefc0424c65cfd5a4394bff34e2d3ed9556debe assets/oreganized/models/block/red_hot_lead_door_top_right_open.json -5924b1619aa47b9770b9c20e703eb8d120906ca8 assets/oreganized/models/block/red_hot_lead_trapdoor_bottom.json -6056202082cd609584dd6fd4571c8e4b615988a5 assets/oreganized/models/block/red_hot_lead_trapdoor_open.json -1974b68a782c0fcbe8b00eaf5c913341456bcfc3 assets/oreganized/models/block/red_hot_lead_trapdoor_top.json -325f19d03a38f249bcceb44770d7af7a5d956821 assets/oreganized/models/block/shrapnel_bomb.json -8b672f8e74c40583b323d948f93266ac9dc51d4e assets/oreganized/models/block/silver_block.json -e7ae7144c130a6d2636fe8e2702c99666720d878 assets/oreganized/models/block/silver_ore.json -4afbdc94277d1af98491836904766a30c027965b assets/oreganized/models/block/spotted_glance.json -d3acbbfbb7ca49fa57f8df95a92a67ed211fa6bd assets/oreganized/models/block/white_concrete_powder.json -4c8aa4d97ffe998af001dca04f62949a335cac61 assets/oreganized/models/block/white_crystal_glass.json -1018427cd01f59de4b6eaf4e4bd440ab2a49dcbd assets/oreganized/models/block/white_crystal_glass_in.json -445cb3f37dbd2d9deab0f249c5976bd69bd47286 assets/oreganized/models/block/white_crystal_glass_out.json -f224ca51770c19651152cadea845e742ad38f550 assets/oreganized/models/block/white_crystal_glass_pane_noside.json -6a6a3cf64497ecaf347ba3616ae7ab389a5376e1 assets/oreganized/models/block/white_crystal_glass_pane_noside_alt.json -088919727739e021889e6bda9f248b4bd8bdc8df assets/oreganized/models/block/white_crystal_glass_pane_noside_alt_in.json -850b6184a9c1582ee2ef48c37f9d3ed0361dfa25 assets/oreganized/models/block/white_crystal_glass_pane_noside_alt_out.json -aa5cb36ce33d820701fb78174ab69e8777f78055 assets/oreganized/models/block/white_crystal_glass_pane_noside_alt_rot.json -ec0ce4e272b582c64f8e1a6d1e9acaae60f4ec43 assets/oreganized/models/block/white_crystal_glass_pane_noside_in.json -4cadbb718672142b6d50e1cebfdb218b3ef2402c assets/oreganized/models/block/white_crystal_glass_pane_noside_out.json -cd9ea9b7daa2cc72346671718eb4c4e570ac976e assets/oreganized/models/block/white_crystal_glass_pane_noside_rot.json -8ec5d9464fc0939212bacdb70f8f3f968d5c84d4 assets/oreganized/models/block/white_crystal_glass_pane_post.json -2eb2dec7d9e779b382570553b20646e522454537 assets/oreganized/models/block/white_crystal_glass_pane_post_in.json -2643bea451f7311ff9d5f5b4bb70d71c41582633 assets/oreganized/models/block/white_crystal_glass_pane_post_out.json -77e33b2af6b9ffb709a6c8171093de4d5d255675 assets/oreganized/models/block/white_crystal_glass_pane_post_rot.json -a5c366ee4325876f1e5ac74b4ede365346fe5779 assets/oreganized/models/block/white_crystal_glass_pane_side.json -45978dbebf9ab5e2a7f54a77be68862016564352 assets/oreganized/models/block/white_crystal_glass_pane_side_alt.json -40e818f2bca11cf2b95269d20606ffacefe4dad5 assets/oreganized/models/block/white_crystal_glass_pane_side_alt_in.json -f79e82a7413fddf6e7330221e3fca0645b054d29 assets/oreganized/models/block/white_crystal_glass_pane_side_alt_out.json -6d632d6b9531f915304b48e65a59db5d57e6adc9 assets/oreganized/models/block/white_crystal_glass_pane_side_alt_rot.json -f1ec7a21ad60a91d4c0935e080f249a76ebb9056 assets/oreganized/models/block/white_crystal_glass_pane_side_in.json -aa1f6469d6b10f6cff1543f6c11d33e700c6d7f3 assets/oreganized/models/block/white_crystal_glass_pane_side_out.json -582a872df90f0b62fe5dace91efc6465fff70b06 assets/oreganized/models/block/white_crystal_glass_pane_side_rot.json -c93d99db2aacfa2035548a055fd9d7d162811a23 assets/oreganized/models/block/white_crystal_glass_rot.json -258d5907ef1cf646306b9f0acb50b29f03d35cde assets/oreganized/models/block/yellow_concrete_powder.json -c8a10b096058a91665c2493b0790391262523f4c assets/oreganized/models/block/yellow_crystal_glass.json -6376fa01d03a4a3f025743c7d18b577894f89d27 assets/oreganized/models/block/yellow_crystal_glass_in.json -5b488adc12f0af3f1e1e0c52af14c8c1fe442b2b assets/oreganized/models/block/yellow_crystal_glass_out.json -cc69ddc6079469450ffedc9e08e7bb2a8f201229 assets/oreganized/models/block/yellow_crystal_glass_pane_noside.json -163615d93225c776386fc1926509ef4a114a5b98 assets/oreganized/models/block/yellow_crystal_glass_pane_noside_alt.json -f7d8b30c307ad6533b6ee78c9e4f184c2d836e9c assets/oreganized/models/block/yellow_crystal_glass_pane_noside_alt_in.json -3e5c6449ca15c1502c66874666b195bfc0020ed9 assets/oreganized/models/block/yellow_crystal_glass_pane_noside_alt_out.json -bf466971cf5a82a2b804284c26d0a0ffca374d42 assets/oreganized/models/block/yellow_crystal_glass_pane_noside_alt_rot.json -c5752c4e4ae9f094d588a5b8787ea76a11c15eb5 assets/oreganized/models/block/yellow_crystal_glass_pane_noside_in.json -40b646423d03f9c365b5b99e23625a88fc9e9b82 assets/oreganized/models/block/yellow_crystal_glass_pane_noside_out.json -a9bc5556716b803f43094ebf51683ad01516177f assets/oreganized/models/block/yellow_crystal_glass_pane_noside_rot.json -3c956916c255751157c26142e4a4dad970dc22ed assets/oreganized/models/block/yellow_crystal_glass_pane_post.json -1bbd2be6d52b441d1d7373e33aaa998ed472ad07 assets/oreganized/models/block/yellow_crystal_glass_pane_post_in.json -cfb805b5ad4bd227e11d96003b1c94a033e4e37b assets/oreganized/models/block/yellow_crystal_glass_pane_post_out.json -145060cb2665fbaf64aa9309ebef1c1becd216ee assets/oreganized/models/block/yellow_crystal_glass_pane_post_rot.json -3a063540bc2b67c862ff423276b4517f7cf947c1 assets/oreganized/models/block/yellow_crystal_glass_pane_side.json -2e9c3844deda9db90f47f1fa2a513210e3fe5bc7 assets/oreganized/models/block/yellow_crystal_glass_pane_side_alt.json -89e0eb5972a1dbf085a69af683b676076aaf1501 assets/oreganized/models/block/yellow_crystal_glass_pane_side_alt_in.json -bd4e3e2f6e513ee45511e5f6c4d725a50487ebee assets/oreganized/models/block/yellow_crystal_glass_pane_side_alt_out.json -0de12397a6d0fc522a301b55ee6acc12a937398f assets/oreganized/models/block/yellow_crystal_glass_pane_side_alt_rot.json -3594cdce9e23c53036d14cd5c09bfc6259095d97 assets/oreganized/models/block/yellow_crystal_glass_pane_side_in.json -031ffbaf3f6780aa90b8dea7297261429ff32399 assets/oreganized/models/block/yellow_crystal_glass_pane_side_out.json -56ec2c12c64b2646536a3056b4ea27cbfc061499 assets/oreganized/models/block/yellow_crystal_glass_pane_side_rot.json -4fb7fdcfac066ff9d10fabb5fe52aabc28e4ac56 assets/oreganized/models/block/yellow_crystal_glass_rot.json diff --git a/src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5 b/src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5 deleted file mode 100644 index db2b5b4d..00000000 --- a/src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5 +++ /dev/null @@ -1,156 +0,0 @@ -// 1.20.1 2024-10-14T09:21:58.7369898 oreganized Item Models -18fcb236eeab67fa16a0014d9af5ba7dd6f9e7c8 assets/oreganized/models/item/black_crystal_glass.json -30bbb36792cb2d3f0a8a399f25238120cdf7e659 assets/oreganized/models/item/black_crystal_glass_pane.json -8dcab59e8c34403761c4aec2c3357b7db80b3f0b assets/oreganized/models/item/blue_crystal_glass.json -dfe6f545297f948beacae59685c3bc29a88b68d1 assets/oreganized/models/item/blue_crystal_glass_pane.json -ca77522dcfcf982429256fd99ca0e9f2c195bd73 assets/oreganized/models/item/brown_crystal_glass.json -cc365240dd7450add26aeaf5e0e689e985a4e5ad assets/oreganized/models/item/brown_crystal_glass_pane.json -87ae9e55b9b93036e2004b186696da47cbc5ca81 assets/oreganized/models/item/bush_hammer.json -9cb46711c71fcec37eae98916aa50acbe76cf96d assets/oreganized/models/item/chiseled_glance.json -0873e5720c3f7d81c4ef7e3f3d333e14a87e6757 assets/oreganized/models/item/crossbow_lead_bolt.json -cda1abbd4abc8987ee1a6d4ec093a5824260b4e0 assets/oreganized/models/item/cut_lead.json -1cad99f5b1d9bb26fafe94dd95e758217cb50a78 assets/oreganized/models/item/cyan_crystal_glass.json -522ec2287a524fc138cb3ebd01e3f4c70c43147e assets/oreganized/models/item/cyan_crystal_glass_pane.json -20ea18a10ccc6f0cef2ba654ea3358628de49679 assets/oreganized/models/item/deepslate_lead_ore.json -f4054bc225dbc8d64c33a9be97e3234c6b6aff70 assets/oreganized/models/item/deepslate_silver_ore.json -90d7ee1955f7b0dafcb1cc8c6e7481f2e798f0b3 assets/oreganized/models/item/electrum_axe.json -f84407520eae1c14edb63b8f9fb0ac59b392d891 assets/oreganized/models/item/electrum_block.json -921b1f947d298a7993cffee8ce2b9150822d6315 assets/oreganized/models/item/electrum_boots.json -ebd6c4dd25477fa3aee3da31ba022831eef821f1 assets/oreganized/models/item/electrum_boots_amethyst_trim.json -8da0044f5663ca8c33a2cf7da2aaeafd6b4f29f3 assets/oreganized/models/item/electrum_boots_copper_trim.json -ea320d41da3670d7b5f3aa47375825164c881009 assets/oreganized/models/item/electrum_boots_diamond_trim.json -f78e1531df3d1a96a7ddb0156c1bc25f782ef54e assets/oreganized/models/item/electrum_boots_emerald_trim.json -13ea29eca54fa201527aacb1a3133aa6c2dece0a assets/oreganized/models/item/electrum_boots_gold_trim.json -eddd2b3a1573aa504c9a9e3ccc2eb54097f25cf3 assets/oreganized/models/item/electrum_boots_iron_trim.json -cfcd420ac4aeffc816bdbd5b8695ac2ebf5233c3 assets/oreganized/models/item/electrum_boots_lapis_trim.json -f58c3a00d7cb1b945dd7c26bf941dd3d0ab8dde4 assets/oreganized/models/item/electrum_boots_netherite_trim.json -15351d9c3c3754e8ae395c24e878fe2eea9221d2 assets/oreganized/models/item/electrum_boots_quartz_trim.json -e95d2c96d5c6294cd62446295dd2d308ed2891e0 assets/oreganized/models/item/electrum_boots_redstone_trim.json -861c898cb9483f4a9b6664aaabbcb3494f89d187 assets/oreganized/models/item/electrum_chestplate.json -a821c6eec823108022ea761f58fa2e6e0b6e0fd1 assets/oreganized/models/item/electrum_chestplate_amethyst_trim.json -4884dcbad3b98701e23a389b3718df01c8301851 assets/oreganized/models/item/electrum_chestplate_copper_trim.json -34c91dc494f4c4a67705100e22d1f04982b2c3b8 assets/oreganized/models/item/electrum_chestplate_diamond_trim.json -92e972a8eaa567916d535445539a5a5a12936f97 assets/oreganized/models/item/electrum_chestplate_emerald_trim.json -7c47841331aee6c8ad0334c1bfc86442a034e89d assets/oreganized/models/item/electrum_chestplate_gold_trim.json -a1d8410db2baca1d6ec1216114ffe0578732c9fb assets/oreganized/models/item/electrum_chestplate_iron_trim.json -5bcfc00cf5735da8329c976b1c76d29095b04ced assets/oreganized/models/item/electrum_chestplate_lapis_trim.json -ebac983a04414e7e5c2a8431d2494ac14dab595a assets/oreganized/models/item/electrum_chestplate_netherite_trim.json -3661e26ce6c04e6d96a4170ac1c834ad9e73c905 assets/oreganized/models/item/electrum_chestplate_quartz_trim.json -552cd49fd2bf4e48d8a42112f6252d74d88603ab assets/oreganized/models/item/electrum_chestplate_redstone_trim.json -1f4d67a20bc58c1484c7c550c2401654f293c5f1 assets/oreganized/models/item/electrum_helmet.json -e87af594a177d4994fe5ed62c7ee9e5e4186a116 assets/oreganized/models/item/electrum_helmet_amethyst_trim.json -bf0f7c22b7b99c818d45283591a2e4e943227419 assets/oreganized/models/item/electrum_helmet_copper_trim.json -d34a8e6f6200252932c7589d280d66223a774c55 assets/oreganized/models/item/electrum_helmet_diamond_trim.json -a45d831838687591d6c87dc56fa97d806c4989f5 assets/oreganized/models/item/electrum_helmet_emerald_trim.json -676c701bb33d5d324ddea74492483d2f08675a5f assets/oreganized/models/item/electrum_helmet_gold_trim.json -64fcca087ef92636ee7b362a7f00fe28926d1f6f assets/oreganized/models/item/electrum_helmet_iron_trim.json -1eef08587a817cb4573131f719fe9d106815bb5a assets/oreganized/models/item/electrum_helmet_lapis_trim.json -fc91dfa3eda2433202da6e5b35a2daaa798ceb10 assets/oreganized/models/item/electrum_helmet_netherite_trim.json -6f4e5fb0306a7f4b2687137f015979f24fd470a8 assets/oreganized/models/item/electrum_helmet_quartz_trim.json -c0994add3605609d1e1e5c5fd8e8a2183965dd6a assets/oreganized/models/item/electrum_helmet_redstone_trim.json -dabbb804096b43b53b35e91e6af0be9e3159d7c4 assets/oreganized/models/item/electrum_hoe.json -a81f54a67369904cffeb3725f1391afced85c5fd assets/oreganized/models/item/electrum_ingot.json -11e1d020c32c5e56cd1342822536378ea1069379 assets/oreganized/models/item/electrum_knife.json -95afdd8f132febac54f8a5854a7a3fd68ac451f2 assets/oreganized/models/item/electrum_leggings.json -2d13f8dc0ed0ec41e0b6a19101658c335f0937af assets/oreganized/models/item/electrum_leggings_amethyst_trim.json -1c197c2053679693edc08a7440503e27a67a36e9 assets/oreganized/models/item/electrum_leggings_copper_trim.json -e52bbe67f2142ddd64f61380013f1acecce3efe5 assets/oreganized/models/item/electrum_leggings_diamond_trim.json -f3b3e8b89a354acedb2b9f9b2dd09e48d6fe689f assets/oreganized/models/item/electrum_leggings_emerald_trim.json -604f7994b05f296d68986c23b24528276002fe10 assets/oreganized/models/item/electrum_leggings_gold_trim.json -9ce1f9a351d5dfc6c9da6c601d123a1763fbac89 assets/oreganized/models/item/electrum_leggings_iron_trim.json -cb422c237c7d4e168c79cee51375d667fcf1d2fa assets/oreganized/models/item/electrum_leggings_lapis_trim.json -8d1a23960f88d2cf9e152ed5a630ceb23c79c56f assets/oreganized/models/item/electrum_leggings_netherite_trim.json -f3871ff234873195dd47e570e62f802f7f67c889 assets/oreganized/models/item/electrum_leggings_quartz_trim.json -75958844281a29549508f88f396e34b0919b68cb assets/oreganized/models/item/electrum_leggings_redstone_trim.json -2b65eac6675b9a9f27684237b88951fd63b4687e assets/oreganized/models/item/electrum_machete.json -2d8ac3c987dcd961d7505b71cda23b4c149a1348 assets/oreganized/models/item/electrum_nugget.json -225acc16e9cf1908e9199f83cfe63342fc724cf2 assets/oreganized/models/item/electrum_pickaxe.json -0f676c5ced38f926facc18f78f2f2545b4c44342 assets/oreganized/models/item/electrum_shield.json -16885683d24d78fa77d3f26ca06cd0016977b47e assets/oreganized/models/item/electrum_shield_blocking.json -ba6dafcb3b21faf4eb7886b812f205e91e59a49d assets/oreganized/models/item/electrum_shovel.json -05cacc76a2e9820c58a78e8456d69278e41ce32f assets/oreganized/models/item/electrum_sword.json -35a59e558e3caa534b1d2e155dea97863ed6bd56 assets/oreganized/models/item/electrum_upgrade_smithing_template.json -09db973c662b9a4617005b092f5c1f9a3e6c2840 assets/oreganized/models/item/flint_and_pewter.json -90794871c3e583844d22b86e27ef20d936d60715 assets/oreganized/models/item/gargoyle.json -5d88c542b8ca2e9e8768e2624f1b560ef793d32c assets/oreganized/models/item/glance.json -fb4d349a3ebe34df2254a4748e6e051d29730cae assets/oreganized/models/item/glance_bricks.json -c907552eecc918e0bc5f5bd7a457004fd6940136 assets/oreganized/models/item/glance_brick_slab.json -7fb0d10cd561abd9015d83d39160efefe46afc3e assets/oreganized/models/item/glance_brick_stairs.json -ac85e94a982472e935e7a342a94ad9b367268ecc assets/oreganized/models/item/glance_brick_wall.json -86ff6d4895f6f00245cb7eccdd654baaba20f9b5 assets/oreganized/models/item/glance_slab.json -bbe691c708914b9faf9bade0d70192b5fe4eaebb assets/oreganized/models/item/glance_stairs.json -463bc369e8108315ae8dba8e714e23b22a2bf31b assets/oreganized/models/item/glance_wall.json -9e5901b9c637724066adf0b0cf0a0ea7595643c2 assets/oreganized/models/item/gray_crystal_glass.json -620d7f2b29b528e35dc4bd1ba7caf47fea81e005 assets/oreganized/models/item/gray_crystal_glass_pane.json -be766846cf1dac197488418054a28488724b45db assets/oreganized/models/item/green_crystal_glass.json -0d2774c3473576f2f0e28ec4eaf9c9adaeca3e00 assets/oreganized/models/item/green_crystal_glass_pane.json -980a1d284d8ad09fb8a3cd3f6de11a5150e48a60 assets/oreganized/models/item/grooved_blue_ice.json -0a9bb963b90f719437cc2208e8a61ac1ea12d07d assets/oreganized/models/item/grooved_ice.json -0253c31f06cd51dcace95b3f958e2fa2e98bc954 assets/oreganized/models/item/grooved_packed_ice.json -55b5268d1200536fb742606ae34dd2a149e6d5be assets/oreganized/models/item/lead_bars.json -41e56017441ac21af8e8b9bb05b61e1cf4fbd035 assets/oreganized/models/item/lead_block.json -ae57922ed2f7a86f2f2228c54fe277a743a93000 assets/oreganized/models/item/lead_bolt.json -feba1e587044ee5e3b0c0eb5078d2c8e857aaeb5 assets/oreganized/models/item/lead_bolt_crate.json -e7d8507c908b82cd3a90619142d88fabe131f4b4 assets/oreganized/models/item/lead_bricks.json -f884e385f339f84b7d27ef8cbaa9d1ecc1fb6fd8 assets/oreganized/models/item/lead_bulb.json -46d5263663d3b35571d0ffb6025d7fd6c8466a0d assets/oreganized/models/item/lead_door.json -d882831b769bc45aa22e6401f6e6d86ce7f734af assets/oreganized/models/item/lead_ingot.json -ed012f08ddd306e7470ac30e323a66a928dd8981 assets/oreganized/models/item/lead_nugget.json -ddd9abce5fc944daa9bde4f9c7a2bb7ee8ed5c29 assets/oreganized/models/item/lead_ore.json -12381fe3b7d45c51eaf0281b6ee88c3483d8da46 assets/oreganized/models/item/lead_pillar.json -338eacf72084c98a75ac9a508e09c0a0fb4d98b5 assets/oreganized/models/item/lead_trapdoor.json -5108e55f2ba54c678879dc75b16b2929716d9b39 assets/oreganized/models/item/light_blue_crystal_glass.json -2dfe57627afd868c69ac0facf2f3e597b2622365 assets/oreganized/models/item/light_blue_crystal_glass_pane.json -4c62fede3aa446ab81dd7ec3a721a797ebf1f4d6 assets/oreganized/models/item/light_gray_crystal_glass.json -e5cb92ebff46639ff0dafa4ddf23cf47c7477ad3 assets/oreganized/models/item/light_gray_crystal_glass_pane.json -6dd0cc69548dd92b4ff7415b60f3f655ec00b6fb assets/oreganized/models/item/lime_crystal_glass.json -632ad6e9e36a3b06e53e546073f56426fa9e27a9 assets/oreganized/models/item/lime_crystal_glass_pane.json -1f00a2ac13d144011fbf0b44f53f3dd4bb904959 assets/oreganized/models/item/magenta_crystal_glass.json -4cbb48e036379c1a25aff26c097e960db03958b7 assets/oreganized/models/item/magenta_crystal_glass_pane.json -ab4ff89f9d171d8a8310df55e33939984a25bef1 assets/oreganized/models/item/molten_lead_bucket.json -2e85dce7d3ffc063559a1bb1eed2f47162c85435 assets/oreganized/models/item/music_disc_structure.json -9ed1cb50f0ab91d42a700c9868717154a383c774 assets/oreganized/models/item/netherite_nugget.json -e21f2c763df6c26d8cf26b0a8dc11ddc0ea7d271 assets/oreganized/models/item/orange_crystal_glass.json -8199d736ede58957f7c69b9d0a0572e595644fab assets/oreganized/models/item/orange_crystal_glass_pane.json -ea37ea78afdd8a4fd3648d41b638718cbc02b836 assets/oreganized/models/item/pink_crystal_glass.json -865b6f84533ef70a5be69753a83e761755b28383 assets/oreganized/models/item/pink_crystal_glass_pane.json -6464df28e19668c9967c89137664e9d59a99d028 assets/oreganized/models/item/polished_glance.json -741c04007f9bcbe8c875bcd92fb87172521585c0 assets/oreganized/models/item/polished_glance_slab.json -e0c5c128da027ed46ef1db33499714d71fa5c911 assets/oreganized/models/item/polished_glance_stairs.json -cbbc97d973493c32674c1502299822e20e2b9dd9 assets/oreganized/models/item/purple_crystal_glass.json -f7c411b709a3af883b55ceb15524a116468ee0b4 assets/oreganized/models/item/purple_crystal_glass_pane.json -70f7c5e87a33cccc0bc1baeec4aae548a1f63302 assets/oreganized/models/item/raw_lead.json -7bd3f2bb76af55b81590b0840503472f5cb5b2c9 assets/oreganized/models/item/raw_lead_block.json -3feb7012ce5279fcb92fcd9b2278c6c384110a8b assets/oreganized/models/item/raw_silver.json -0eb2d49665d43c865870beb62e13499299fd7174 assets/oreganized/models/item/raw_silver_block.json -848e82277b2a6223f4d24e6e8e53fd2769263be0 assets/oreganized/models/item/red_crystal_glass.json -1cbba207d199088dd85850ea56d55d5976e15f3c assets/oreganized/models/item/red_crystal_glass_pane.json -4c384b6c9ca85ea3aa0aca55eea89363d8355bd7 assets/oreganized/models/item/scribe.json -2f15086e7865fc768aa268ec9b3797e818976165 assets/oreganized/models/item/shrapnel_bomb.json -0a859cda7510d7756a43cfdf4bac94b2ed57ddb6 assets/oreganized/models/item/shrapnel_bomb_minecart.json -c644dd3b1845706977764c51e2bf8845fba82d07 assets/oreganized/models/item/silver_block.json -13ffab906a6704c68eb4fef73382a7b0e0a5d5be assets/oreganized/models/item/silver_ingot.json -13ed84c2f215331446a11c803af482b22156e938 assets/oreganized/models/item/silver_nugget.json -59197789f826ddb98e6b015bc21089a1e97612bc assets/oreganized/models/item/silver_ore.json -41b68d92ddc0e6a5f8c1ed0f11ff43eaa4bdb30c assets/oreganized/models/item/spotted_glance.json -848b3d02253bb84971088f90d231c7f7d229ed86 assets/oreganized/models/item/waxed_black_concrete_powder.json -6abe6033090d16e14079f4b0082bddfb1906fb5c assets/oreganized/models/item/waxed_blue_concrete_powder.json -acf39f6e32f8a16f200fe0ba4366d41e0a3d581d assets/oreganized/models/item/waxed_brown_concrete_powder.json -eb650d7d899ec1d30d9185176d26b0bc8447c3b0 assets/oreganized/models/item/waxed_cyan_concrete_powder.json -a0c2429e7a0924c6cf1acfa6958b21a8987c9fc2 assets/oreganized/models/item/waxed_gray_concrete_powder.json -6d5ac088a8409e79dd68efb2bd36ca4981ef0c23 assets/oreganized/models/item/waxed_green_concrete_powder.json -4486133fca6bfb53b21b03894d015dce1e323d72 assets/oreganized/models/item/waxed_light_blue_concrete_powder.json -c65a1e57f6d9dc74f274c56a057cc66dd1e7d90d assets/oreganized/models/item/waxed_light_gray_concrete_powder.json -0166bee8c0df68c31c1d83c54940a9651b18ad11 assets/oreganized/models/item/waxed_lime_concrete_powder.json -a17a24a91d7e1ac8b00645ff6df2b6d6e5df5bf5 assets/oreganized/models/item/waxed_magenta_concrete_powder.json -4f7c1933643c7b5b7f0dc010bb1debc0d49c3eeb assets/oreganized/models/item/waxed_orange_concrete_powder.json -2138337cebc7236567987904722b19cf323fa74f assets/oreganized/models/item/waxed_pink_concrete_powder.json -c21fa5382d5bf45ffba5327456e2c4d31e975161 assets/oreganized/models/item/waxed_purple_concrete_powder.json -9bfec6f38da4227b208c6179d07de63e38d0b974 assets/oreganized/models/item/waxed_red_concrete_powder.json -41b68d92ddc0e6a5f8c1ed0f11ff43eaa4bdb30c assets/oreganized/models/item/waxed_spotted_glance.json -1b4add5c46cd1475113f1d820b0f6041a666ab0b assets/oreganized/models/item/waxed_white_concrete_powder.json -83db5a91a81de586b19b015a1640cda847e2a31f assets/oreganized/models/item/waxed_yellow_concrete_powder.json -b85f64f4ee27a765d5e7df6ddd0a8736a7ff60b5 assets/oreganized/models/item/white_crystal_glass.json -1b016b020d70301e5c110b1374d4d435bf9f0cf6 assets/oreganized/models/item/white_crystal_glass_pane.json -97b2171d2047af3ffe2449255eabdecc2de5a958 assets/oreganized/models/item/yellow_crystal_glass.json -628a959a06ec4a440e72a291b17312dd1cc54e4d assets/oreganized/models/item/yellow_crystal_glass_pane.json diff --git a/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 b/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 deleted file mode 100644 index 35319101..00000000 --- a/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 +++ /dev/null @@ -1,40 +0,0 @@ -// 1.20.1 2024-10-11T21:00:01.0565671 Oreganized Block Tags -7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/forge/tags/blocks/glass.json -d96b4f83e03abe39a1b97d92b7818c8f6b2e5c68 data/forge/tags/blocks/glass_panes.json -d062c23ad5308b7de0b2e86f6531ea724530f898 data/forge/tags/blocks/melts_lead.json -4e9173550595ca2ada5744dc749553e93b05954f data/forge/tags/blocks/ores.json -dc9cc2dca9fa3a28a0458ec282e3e0fe81999ee1 data/forge/tags/blocks/ores/lead.json -bb86ac7ab19373da790ec5711f473614e4b62d79 data/forge/tags/blocks/ores/silver.json -084242f542331c46b8889564325f204f7b8bb6a4 data/forge/tags/blocks/ores_in_ground/deepslate.json -ec067464a41bb65b72566d6a4e4ffccb80261bf7 data/forge/tags/blocks/ores_in_ground/stone.json -4e9173550595ca2ada5744dc749553e93b05954f data/forge/tags/blocks/ore_rates/singular.json -367d69870d9a11ff9049e8f3ba71b3cb7396eee3 data/forge/tags/blocks/storage_blocks.json -7a1e2c391ad442cdc57f69ce1737207bc52bfb84 data/forge/tags/blocks/storage_blocks/electrum.json -bb0420ecbadc747d984fcef0fe7fc67586bc3231 data/forge/tags/blocks/storage_blocks/lead.json -4fb94c8b6f6641d27d70e8ff338e81cee30a321c data/forge/tags/blocks/storage_blocks/raw_lead.json -05f4708355ed88fe57116020dd93ac53f3098dba data/forge/tags/blocks/storage_blocks/raw_silver.json -bff6697a058fddfe9e14615bc043fcb2071fd6fc data/forge/tags/blocks/storage_blocks/silver.json -7a1e2c391ad442cdc57f69ce1737207bc52bfb84 data/minecraft/tags/blocks/beacon_base_blocks.json -82c03c405a971b2a7fc3fd43a9fb6c221f463ce0 data/minecraft/tags/blocks/cauldrons.json -503ad75af537d0ffef02ada9fb9afb5f5cd8e83b data/minecraft/tags/blocks/doors.json -0f64e9b9dc279dd460f6408313b130a37a0c9d86 data/minecraft/tags/blocks/ice.json -7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/minecraft/tags/blocks/impermeable.json -f7079c32fc948b65cb486bea80e2dc93d13ce577 data/minecraft/tags/blocks/mineable/axe.json -8794e7f7fcf41783b7738503b68f535efa58d511 data/minecraft/tags/blocks/mineable/pickaxe.json -84a13f81c79f0c05f8f7a8cbf1d3c25129a97179 data/minecraft/tags/blocks/mineable/shovel.json -bb86ac7ab19373da790ec5711f473614e4b62d79 data/minecraft/tags/blocks/needs_iron_tool.json -dc9cc2dca9fa3a28a0458ec282e3e0fe81999ee1 data/minecraft/tags/blocks/needs_stone_tool.json -e9873026bc587ab0729bda85f9d2a6ca7790d410 data/minecraft/tags/blocks/slabs.json -8dcd7041424abab98a418b19eadece10284b87f0 data/minecraft/tags/blocks/snow_layer_cannot_survive_on.json -e231a716e19756d6a2326e873062dab206b37184 data/minecraft/tags/blocks/stairs.json -0071c009a80f1ab7661b261dcf94799070b8cbea data/minecraft/tags/blocks/trapdoors.json -a4acb3623320f801e89e3451f8b7d9e2246f99d0 data/minecraft/tags/blocks/walls.json -143a34cb0f03223147aa614479cc4fcf4c38ca14 data/oreganized/tags/blocks/blows_lead_cloud.json -81fb1b18afaa14ae90800b23c32de565d1389bb3 data/oreganized/tags/blocks/crystal_glass.json -f1dfddab1e3f2dec1e7ed1c3fbf9f6a7f261cf08 data/oreganized/tags/blocks/crystal_glass_panes.json -6b73bb0ce38222c428d54ee64e82ffa1d96c64d7 data/oreganized/tags/blocks/fire_source.json -eaca08d04b1742f418e6bc0964dd32cf16035d88 data/oreganized/tags/blocks/mineable/scribe.json -0f64e9b9dc279dd460f6408313b130a37a0c9d86 data/oreganized/tags/blocks/no_silktouch_using_scribe.json -cf3608bd187922aeb48c566c19e8482b0dca34c7 data/oreganized/tags/blocks/prevents_lead_cloud.json -06c2e2e512966767a31df77e646e41c4c39e3dd3 data/oreganized/tags/blocks/silktouch_using_scribe.json -3112fb4a1df2953e2c3572fa47f886bf8e5bd679 data/oreganized/tags/blocks/stone_types/glance.json diff --git a/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e b/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e deleted file mode 100644 index 044ccd30..00000000 --- a/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e +++ /dev/null @@ -1,2 +0,0 @@ -// 1.20.1 2024-08-13T20:16:24.7249289 Sound Definitions -1c624d0138bd1190491dbcf118dbe3556f4f0713 assets/oreganized/sounds.json diff --git a/src/generated/resources/.cache/86c4ba3fec62c329e6b7e74d87569e08181a0d37 b/src/generated/resources/.cache/86c4ba3fec62c329e6b7e74d87569e08181a0d37 deleted file mode 100644 index 0b55c618..00000000 --- a/src/generated/resources/.cache/86c4ba3fec62c329e6b7e74d87569e08181a0d37 +++ /dev/null @@ -1,53 +0,0 @@ -// 1.20.1 2024-09-20T10:43:10.6795167 Oreganized Item Tags -3a2cbf8d34e9bde2e22d59d4437fa80361d53291 data/farmersdelight/tags/items/tools/knives.json -d8d286ea76e30a635512bc93d68815770003ff41 data/forge/tags/items/buckets/molten_lead.json -7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/forge/tags/items/glass.json -d96b4f83e03abe39a1b97d92b7818c8f6b2e5c68 data/forge/tags/items/glass_panes.json -e49cb4f6d619d05263a53690780f08940350b817 data/forge/tags/items/ingots.json -9115563bba2db6e89c2c107626da06ea199aa2c7 data/forge/tags/items/ingots/electrum.json -a5caec7ffef5e22f645062fbd7b1228c4e2bf60f data/forge/tags/items/ingots/lead.json -a38d481017d07adc5bcd423740718cac7cdaa829 data/forge/tags/items/ingots/silver.json -ecba5d070ab794f58b1ecd4e50396e5f1501ff78 data/forge/tags/items/nuggets.json -e6d8bf8310f21dfaeb310a9ab910735a569354bd data/forge/tags/items/nuggets/electrum.json -3b248cf90493366509ef462ef2ab45c771ef6f8c data/forge/tags/items/nuggets/lead.json -baec62ac3425b057aabc65f53f289a83c009337a data/forge/tags/items/nuggets/netherite.json -c009685a7974533094c2347c1eeb929f9e00da3f data/forge/tags/items/nuggets/silver.json -4e9173550595ca2ada5744dc749553e93b05954f data/forge/tags/items/ores.json -dc9cc2dca9fa3a28a0458ec282e3e0fe81999ee1 data/forge/tags/items/ores/lead.json -bb86ac7ab19373da790ec5711f473614e4b62d79 data/forge/tags/items/ores/silver.json -084242f542331c46b8889564325f204f7b8bb6a4 data/forge/tags/items/ores_in_ground/deepslate.json -ec067464a41bb65b72566d6a4e4ffccb80261bf7 data/forge/tags/items/ores_in_ground/stone.json -66ba659939fbf946a12fd974e4b1aa050d6c0d1c data/forge/tags/items/raw_materials.json -eb55c33bcf31bb18b06d5138f9d4ae7877d9739d data/forge/tags/items/raw_materials/lead.json -84d8f3093299dc4984a33c737ac8ff8964e135da data/forge/tags/items/raw_materials/silver.json -3d43625006347afbc2d100972433d9af9db7ac3e data/forge/tags/items/shields.json -346b0b24e693e29050a326ff267fb8c28bcfd21d data/forge/tags/items/storage_blocks.json -7a1e2c391ad442cdc57f69ce1737207bc52bfb84 data/forge/tags/items/storage_blocks/electrum.json -bb0420ecbadc747d984fcef0fe7fc67586bc3231 data/forge/tags/items/storage_blocks/lead.json -4fb94c8b6f6641d27d70e8ff338e81cee30a321c data/forge/tags/items/storage_blocks/raw_lead.json -05f4708355ed88fe57116020dd93ac53f3098dba data/forge/tags/items/storage_blocks/raw_silver.json -bff6697a058fddfe9e14615bc043fcb2071fd6fc data/forge/tags/items/storage_blocks/silver.json -4c880b8d05c88b2f9b44580057a8b4d2fd6fddc4 data/forge/tags/items/tools/bush_hammer.json -3a2cbf8d34e9bde2e22d59d4437fa80361d53291 data/forge/tags/items/tools/knives.json -ddc75b2f884f2deef1eb71418b0fc4ff6784c5f1 data/minecraft/tags/items/axes.json -9115563bba2db6e89c2c107626da06ea199aa2c7 data/minecraft/tags/items/beacon_payment_items.json -503ad75af537d0ffef02ada9fb9afb5f5cd8e83b data/minecraft/tags/items/doors.json -eef83cdf136be620185d326ac306dc8b3680b0ce data/minecraft/tags/items/hoes.json -5978220d099c8bf975bbd69e364ac49628f6dec7 data/minecraft/tags/items/music_discs.json -b20c1b1653f973a0f1474db47ae9c0e1f8515c42 data/minecraft/tags/items/pickaxes.json -c52b4dbffb6c07a4fbc75a2ce481671384feb984 data/minecraft/tags/items/shovels.json -e9873026bc587ab0729bda85f9d2a6ca7790d410 data/minecraft/tags/items/slabs.json -e231a716e19756d6a2326e873062dab206b37184 data/minecraft/tags/items/stairs.json -959791060c5661f7f86dedec67300177b0735bec data/minecraft/tags/items/swords.json -0071c009a80f1ab7661b261dcf94799070b8cbea data/minecraft/tags/items/trapdoors.json -bd1440ab62499b2be9d2d4050f2d30cbb306b34f data/minecraft/tags/items/trimmable_armor.json -9c01ba5c2837c6d506fea127ca2a1b2ba24e2fe0 data/minecraft/tags/items/trim_materials.json -a4acb3623320f801e89e3451f8b7d9e2246f99d0 data/minecraft/tags/items/walls.json -6c25715524e8df396dd757255895117ff2451b25 data/nethersdelight/tags/items/tools/machetes.json -81fb1b18afaa14ae90800b23c32de565d1389bb3 data/oreganized/tags/items/crystal_glass.json -f1dfddab1e3f2dec1e7ed1c3fbf9f6a7f261cf08 data/oreganized/tags/items/crystal_glass_panes.json -bf2ad799074f5c44acee490bdf3d3ae81d56997b data/oreganized/tags/items/gargoyle_snack.json -4d89056c908550931c1f2008f9817f5d3ff7aa68 data/oreganized/tags/items/has_kinetic_damage.json -376b7c9ff449a4b98cb7b1f65b47d658c4e39428 data/oreganized/tags/items/lighter_than_lead.json -3112fb4a1df2953e2c3572fa47f886bf8e5bd679 data/oreganized/tags/items/stone_types/glance.json -3d43625006347afbc2d100972433d9af9db7ac3e data/shieldexp/tags/items/shields.json diff --git a/src/generated/resources/.cache/940881aeb46562922fcc484940bba42a0d973262 b/src/generated/resources/.cache/940881aeb46562922fcc484940bba42a0d973262 deleted file mode 100644 index 3d998949..00000000 --- a/src/generated/resources/.cache/940881aeb46562922fcc484940bba42a0d973262 +++ /dev/null @@ -1,2 +0,0 @@ -// 1.20.1 2023-08-24T20:32:13.557772638 Oreganized Fluid Tags -c3cccb389de4652cbb5430ae9f57b2bb843b544f data/forge/tags/fluids/molten_lead.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e deleted file mode 100644 index f61066bb..00000000 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ /dev/null @@ -1,289 +0,0 @@ -// 1.20.1 2024-10-11T21:00:01.051565 Recipes -c27d3499944bf522a573dc8987582db2d7349b41 data/oreganized/advancements/recipes/brewing/poisonous_potato_from_lead.json -ee5e42ab2e9ac549022fadf1c2cbf9faebc2c53c data/oreganized/advancements/recipes/building_blocks/black_crystal_glass_pane.json -40700c3f2f5c78c617650fdd16e2ba248967353f data/oreganized/advancements/recipes/building_blocks/blue_crystal_glass_pane.json -a54c0b8196d1a5179a9b51cb260df9d0c4c26d4e data/oreganized/advancements/recipes/building_blocks/brown_crystal_glass_pane.json -ed54a44e190b5f65a8b74cd37feaada741e5b294 data/oreganized/advancements/recipes/building_blocks/chiseled_glance.json -ec10ea886188f3dfd43c7d11f91e7dd38d7f45a1 data/oreganized/advancements/recipes/building_blocks/cut_lead.json -e694c9883f1eae29f6bbaee90d1570b2f2c079d8 data/oreganized/advancements/recipes/building_blocks/cyan_crystal_glass_pane.json -9ffd6cb165ad80ea122b949afe78c01b464da732 data/oreganized/advancements/recipes/building_blocks/electrum_block.json -492899ba8540de9979ce7bcaaa689ee6193196ba data/oreganized/advancements/recipes/building_blocks/electrum_ingot_from_block.json -4f5d89d87a4e6f52d98b4ac10c5762e60b61e8dd data/oreganized/advancements/recipes/building_blocks/electrum_ingot_from_nuggets.json -93ee7e794aa1daaa6cb968cbd78ede7082531dba data/oreganized/advancements/recipes/building_blocks/electrum_nugget.json -aa2500862b8be4d4345bd338027a188729b87b8e data/oreganized/advancements/recipes/building_blocks/glance.json -81153af6375dcce5fd908cd268eca2682ff057ba data/oreganized/advancements/recipes/building_blocks/glance_bricks.json -852e4275839e06ebc1505d708e99396f6d53491f data/oreganized/advancements/recipes/building_blocks/glance_brick_slab.json -cd97e0da4ca12f382f0668a766f7d6cc8fd734bd data/oreganized/advancements/recipes/building_blocks/glance_brick_stairs.json -34b875c4c7af75451a0364c50fafdd857ffd870b data/oreganized/advancements/recipes/building_blocks/glance_brick_wall.json -2da44225ac85118cf0be3c9453afa32ceb8b2c8d data/oreganized/advancements/recipes/building_blocks/glance_slab.json -9f9ddabb36f94c84f8095469d75cd125fb3409b4 data/oreganized/advancements/recipes/building_blocks/glance_stairs.json -23ec7c79726af8725709464fbee7772f563c5c49 data/oreganized/advancements/recipes/building_blocks/glance_wall.json -1fdc8740e3cb94baa8de7c16c93a25c7d8ba1163 data/oreganized/advancements/recipes/building_blocks/gray_crystal_glass_pane.json -cb23709fa45885e26600b4c77044a515d0bec180 data/oreganized/advancements/recipes/building_blocks/green_crystal_glass_pane.json -36e6b6e9acc7a2d1e5d06499c08774b428491e64 data/oreganized/advancements/recipes/building_blocks/lead_block.json -6c6208eebd6c66cc8a03b2845bbd227dc4a19cae data/oreganized/advancements/recipes/building_blocks/lead_bolt_crate.json -5ebf44699bc82f68474d6f9b78178750faf6ca24 data/oreganized/advancements/recipes/building_blocks/lead_bolt_from_crate.json -946c08ec1a613679af7062c7108bb751aebf8252 data/oreganized/advancements/recipes/building_blocks/lead_bricks.json -eee68e2739bde8977814e2cfc0c04354a5c7f84c data/oreganized/advancements/recipes/building_blocks/lead_bulb.json -cb45a0e98365b4c03da2b7ce702a72498110fb6a data/oreganized/advancements/recipes/building_blocks/lead_ingot.json -bdf70ecf98bea7edf0acbc6bc4c451564b14348f data/oreganized/advancements/recipes/building_blocks/lead_ingot_from_block.json -ee9f7cd21489b5c992ab7ffd0565f9b7b99d6e5c data/oreganized/advancements/recipes/building_blocks/lead_nugget.json -e912a1a86bbe1928140a874d5677e455ec41c605 data/oreganized/advancements/recipes/building_blocks/lead_pillar.json -5b220eaec9e2e95d66ccd6ac908e63d1d0ef0838 data/oreganized/advancements/recipes/building_blocks/light_blue_crystal_glass_pane.json -53d78d2afba24d8d765eaf4320f0df84712c23ba data/oreganized/advancements/recipes/building_blocks/light_gray_crystal_glass_pane.json -0b18fc634f928ee633cfbc07feca8ed8be6dc4cb data/oreganized/advancements/recipes/building_blocks/lime_crystal_glass_pane.json -5c9fa11b6c39066dae99ef4f858dc4ef86e8bfe9 data/oreganized/advancements/recipes/building_blocks/magenta_crystal_glass_pane.json -3a4162c4abd6b335af84e00135f57526e2d7d7c3 data/oreganized/advancements/recipes/building_blocks/netherite_ingot_from_nuggets.json -a74a2d29864df211430ec34af6985fab449ce640 data/oreganized/advancements/recipes/building_blocks/netherite_nugget.json -9df9569821fc370e3a410ad7f8d1941dea6eabd6 data/oreganized/advancements/recipes/building_blocks/orange_crystal_glass_pane.json -cad8dcd275f6e1abd08c2d4e3094cfe33667ecbe data/oreganized/advancements/recipes/building_blocks/pink_crystal_glass_pane.json -2f6b9fd389ea02e5f06617940e16375db4f7e44d data/oreganized/advancements/recipes/building_blocks/polished_glance.json -510f6f1cf2c0c2e28e907bff4063f1e01c6bd046 data/oreganized/advancements/recipes/building_blocks/purple_crystal_glass_pane.json -cc090c01f50c10d7879d998493bc5c0272700996 data/oreganized/advancements/recipes/building_blocks/raw_lead_block.json -c596d51f8126f452e769b3b3cca8ee2304307401 data/oreganized/advancements/recipes/building_blocks/raw_lead_from_block.json -c4107a4bc74c40f8183f1dbfc4694edbc9116c3a data/oreganized/advancements/recipes/building_blocks/raw_silver_block.json -cd5b728daec67011147d991c1e92a8e45af0fa99 data/oreganized/advancements/recipes/building_blocks/raw_silver_from_block.json -075547176416d4a3ddadab4568b1c6fa8a33622a data/oreganized/advancements/recipes/building_blocks/red_crystal_glass_pane.json -9528970be4845861edbecb9d82ded9ae0e75bba8 data/oreganized/advancements/recipes/building_blocks/silver_block.json -12c7921ac3b753a488ea089b147d94c3cb4e209d data/oreganized/advancements/recipes/building_blocks/silver_ingot.json -c0826ad7125481ce64ca8eb0abbe230e25282bea data/oreganized/advancements/recipes/building_blocks/silver_ingot_from_block.json -3c1f009b8c71d0a224a6698a28d00e1aab20ebfc data/oreganized/advancements/recipes/building_blocks/silver_nugget.json -61a9d6bff7eb38cc4f4343c002bc32464ecf8379 data/oreganized/advancements/recipes/building_blocks/spotted_glance.json -ecd284557f24b8ef047d0766d4c59da775a4ae99 data/oreganized/advancements/recipes/building_blocks/stonecutting/chiseled_glance.json -3396102773d907a1a4d12c3e9fb8b29af9b763ea data/oreganized/advancements/recipes/building_blocks/stonecutting/cut_lead.json -46afe9b68c70008662be9cf8b6c93604e7d219d5 data/oreganized/advancements/recipes/building_blocks/stonecutting/glance_bricks_from_glance.json -7c3b4e9392dd3466af987e5e558633dd25ea4651 data/oreganized/advancements/recipes/building_blocks/stonecutting/glance_bricks_from_polished.json -67a03f67297c6c58da0a2454fcf219510943f316 data/oreganized/advancements/recipes/building_blocks/stonecutting/glance_brick_slab.json -2544aaf3fec551d9f98db5e4c1021e48686ad77c data/oreganized/advancements/recipes/building_blocks/stonecutting/glance_brick_slab_from_glance.json -7c6a1e324232ea97f774cb1cc4331a18c785cdf0 data/oreganized/advancements/recipes/building_blocks/stonecutting/glance_brick_slab_from_polished.json -f2acc98549a305f18765b1639de41f764c6d4973 data/oreganized/advancements/recipes/building_blocks/stonecutting/glance_brick_stairs.json -e991120466c17dcad8f4d8cf1a6f49ac1aee04e6 data/oreganized/advancements/recipes/building_blocks/stonecutting/glance_brick_stairs_from_glance.json -f99d7505e9738999dc1bc6e58dadb4976d6e956a data/oreganized/advancements/recipes/building_blocks/stonecutting/glance_brick_stairs_from_polished.json -782bbe56e0fb5dbf5d90d0282ca352e482391309 data/oreganized/advancements/recipes/building_blocks/stonecutting/glance_brick_wall.json -f0166689d4dbe1dcdebc636f9f1802cb7b034b52 data/oreganized/advancements/recipes/building_blocks/stonecutting/glance_brick_wall_from_glance.json -e40343a29b93d3f034c59dbcd23be81f423e115f data/oreganized/advancements/recipes/building_blocks/stonecutting/glance_brick_wall_from_polished.json -c892f82bee9a3f4b2c64b3549c9e38de235e37a4 data/oreganized/advancements/recipes/building_blocks/stonecutting/glance_slab.json -ee1906087d77c35eb0e7d0998f4ebe51f0b69aa4 data/oreganized/advancements/recipes/building_blocks/stonecutting/glance_stairs.json -edab35288579e9484254c7daf7e012f6ac266187 data/oreganized/advancements/recipes/building_blocks/stonecutting/glance_wall.json -43f2870e4c19511ef3b1e9813a315bbba4889386 data/oreganized/advancements/recipes/building_blocks/stonecutting/lead_bricks.json -ab878e34895cc94b31ad5f33433d394b3470eb67 data/oreganized/advancements/recipes/building_blocks/stonecutting/lead_bricks_from_cut_lead.json -58c7343117ba980c730285f51ac4013596fe8fe4 data/oreganized/advancements/recipes/building_blocks/stonecutting/lead_pillar.json -20dd06137eb8a338a5982e6010e52f49b2347d8a data/oreganized/advancements/recipes/building_blocks/stonecutting/lead_pillar_from_cut_lad.json -f14efdf82e5565a7f0c8a03bcbde5df9b8af3073 data/oreganized/advancements/recipes/building_blocks/stonecutting/polished_glance.json -a73b76343b9abc9d4c082f831be8daf1b62f762a data/oreganized/advancements/recipes/building_blocks/white_crystal_glass_pane.json -8c7873a88da4761a440798323daf006887973daf data/oreganized/advancements/recipes/building_blocks/yellow_crystal_glass_pane.json -b47ef8f1cecfb7182ed71b4684219ec469d3f2f3 data/oreganized/advancements/recipes/combat/lead_bolt.json -68105c4709bbf9a9c38cfea3aef83d7ae761c56c data/oreganized/advancements/recipes/decorations/black_crystal_glass.json -dcb18c1fb204f38642de3c1e3dc39a29c96d3c2a data/oreganized/advancements/recipes/decorations/blue_crystal_glass.json -4e458a90cff9efa21ded7e7af6b9325aa2b71b53 data/oreganized/advancements/recipes/decorations/brown_crystal_glass.json -370a34eafc888bc84647e5ae1ea1c1cf9e0b5538 data/oreganized/advancements/recipes/decorations/cyan_crystal_glass.json -90aeadf79050df3efd63720b6109d9a9c9360470 data/oreganized/advancements/recipes/decorations/gray_crystal_glass.json -9c60166d7df56297f7729623e05a0c619601b276 data/oreganized/advancements/recipes/decorations/green_crystal_glass.json -6e3a94022a18461268b80e98c5f8518e6612964b data/oreganized/advancements/recipes/decorations/light_blue_crystal_glass.json -f00270b4fcd0fbbc0e6a3995a59c164435d830d8 data/oreganized/advancements/recipes/decorations/light_gray_crystal_glass.json -d67b8fff946ef56ae53ba4718e5556f277799309 data/oreganized/advancements/recipes/decorations/lime_crystal_glass.json -228f542c50d6c0abc511d39cde0f2a4453250888 data/oreganized/advancements/recipes/decorations/magenta_crystal_glass.json -862dd17133d26e2f0fe6f1aa05651cff406131b6 data/oreganized/advancements/recipes/decorations/orange_crystal_glass.json -0b1087608b38dcbdd8e77f856cd9fb469df1e358 data/oreganized/advancements/recipes/decorations/pink_crystal_glass.json -09b30e2267c1e9b9c804283a4e5927f909506768 data/oreganized/advancements/recipes/decorations/purple_crystal_glass.json -31db1a4b63de5199b3389872a24d8cbb463a98a2 data/oreganized/advancements/recipes/decorations/red_crystal_glass.json -dbe2cf69f8eb30cff15328377c83ace6be8cb4a3 data/oreganized/advancements/recipes/decorations/waxed_black_concrete_powder.json -4a16c51ac08111b39ddac755d86f12c9f28c9119 data/oreganized/advancements/recipes/decorations/waxed_blue_concrete_powder.json -6b1858a1aee11d96bc6f5c7b4ced8dc5a3c6313e data/oreganized/advancements/recipes/decorations/waxed_brown_concrete_powder.json -297d5c7c64cb448bacd21ee20258a0cbd469395f data/oreganized/advancements/recipes/decorations/waxed_cyan_concrete_powder.json -a96969ffb807102dfc8267b197d772b7577cc924 data/oreganized/advancements/recipes/decorations/waxed_gray_concrete_powder.json -07351d5cf4eeff4d2808e9b0c8e0297afd5504ef data/oreganized/advancements/recipes/decorations/waxed_green_concrete_powder.json -5552377647c69d7a596e05918287d08d09256ea3 data/oreganized/advancements/recipes/decorations/waxed_light_blue_concrete_powder.json -97ce08c9226be960742597c8a9d06145131d58cc data/oreganized/advancements/recipes/decorations/waxed_light_gray_concrete_powder.json -1913f0f9f9460fa47d5cd193cc703467e181ee81 data/oreganized/advancements/recipes/decorations/waxed_lime_concrete_powder.json -bea72e3ab813990f81f7e9e4dedfe7917ce36dae data/oreganized/advancements/recipes/decorations/waxed_magenta_concrete_powder.json -1f0353d8d3e8901e9baae35a47a64a9245ce52bd data/oreganized/advancements/recipes/decorations/waxed_orange_concrete_powder.json -7f929b6f0d516dce575ae9b85193b6bf9f77b063 data/oreganized/advancements/recipes/decorations/waxed_pink_concrete_powder.json -76b013cab0982d805bc134a252aa22f901eca1d9 data/oreganized/advancements/recipes/decorations/waxed_purple_concrete_powder.json -39f46cd25c6e7d493826c670fda636f593e15cca data/oreganized/advancements/recipes/decorations/waxed_red_concrete_powder.json -ee7a0547c57242fae2a839f1670a874460a95eec data/oreganized/advancements/recipes/decorations/waxed_spotted_glance.json -7d1a63b33dae8e669de224e05b266abc0aab2801 data/oreganized/advancements/recipes/decorations/waxed_white_concrete_powder.json -53baa195f776cc7c4c83747553813b5f11977c90 data/oreganized/advancements/recipes/decorations/waxed_yellow_concrete_powder.json -67322f0f3dc08929ca6e1cb60be6a94d119f9fbb data/oreganized/advancements/recipes/decorations/white_crystal_glass.json -fe0a32b407395b706b6b52549bb1c721e5c3b765 data/oreganized/advancements/recipes/decorations/yellow_crystal_glass.json -e1f47e3fdc23ecee9564fac43513d6809dca7101 data/oreganized/advancements/recipes/misc/blast_deepslate_lead_ore.json -80e9978d519027bf047cea31cd98b0d7b759a72a data/oreganized/advancements/recipes/misc/blast_deepslate_silver_ore.json -58012f87da9f8ce8c4af18245f1ae4c8f65c01bd data/oreganized/advancements/recipes/misc/blast_lead_ore.json -99715e33747f4d31c71f38736e261f7a8d2f2d63 data/oreganized/advancements/recipes/misc/blast_raw_lead.json -c62693524f1d2d53f4f08380656c250ece56d8da data/oreganized/advancements/recipes/misc/blast_raw_silver.json -9b5a1255a6bdb7235ed65ab8fa2523cec584e925 data/oreganized/advancements/recipes/misc/blast_silver_ore.json -a181dd2f62cf52beeebf4b5a3724166d8f1e90bb data/oreganized/advancements/recipes/misc/electrum_axe.json -ab8a88c72e15d139634ee1ee62bbd74ad92001d0 data/oreganized/advancements/recipes/misc/electrum_boots.json -bf845f94976369f712e8400c3c309914805b0f85 data/oreganized/advancements/recipes/misc/electrum_chestplate.json -06566b6fc43f73a99e1a0535f6d1160c57567c59 data/oreganized/advancements/recipes/misc/electrum_helmet.json -a1ec7610a511d24d9db99cc2bd83681982fbf51f data/oreganized/advancements/recipes/misc/electrum_hoe.json -19c675cf37ccc87206dbd86cc2ccf4e9502d651c data/oreganized/advancements/recipes/misc/electrum_knife.json -65b56593eac2b513d8fa0535e105e186c056ebee data/oreganized/advancements/recipes/misc/electrum_leggings.json -87c0104bbee244abc1deddd48eb041f2db1fb767 data/oreganized/advancements/recipes/misc/electrum_machete.json -02620b2da35b3e1d2324a94603e5b973adc5e962 data/oreganized/advancements/recipes/misc/electrum_pickaxe.json -363103c5720efb98f1aa5760e30ab45f7c9fb304 data/oreganized/advancements/recipes/misc/electrum_shield.json -58c33b42d00ef50433eda9f25ea00c298532d093 data/oreganized/advancements/recipes/misc/electrum_shovel.json -b5a1699e8a4bc63dcfb5412b22fb72817a8b3b1c data/oreganized/advancements/recipes/misc/electrum_sword.json -1d811909bcfe63a3a5950c6e9bc1d70535645605 data/oreganized/advancements/recipes/misc/electrum_upgrade_smithing_template.json -4d9b20d8cc59a239f63d470d63b671df2dee237b data/oreganized/advancements/recipes/misc/lead_nugget_from_blasting.json -10451d4560b74764df6897acf5d8f8a8cb9e5f3c data/oreganized/advancements/recipes/misc/lead_nugget_from_smelting.json -1bfbfc7246cf22f39d8522e12a84709c60d51bf6 data/oreganized/advancements/recipes/misc/smelt_deepslate_lead_ore.json -bacd4047275f3c40df06a276e36804b6f9bf155e data/oreganized/advancements/recipes/misc/smelt_deepslate_silver_ore.json -12da797a8715b3c67fd2dd9dcc06cb7f8dc60a88 data/oreganized/advancements/recipes/misc/smelt_lead_ore.json -e5e53c7d6b2173a1f6dec77caf21771f41f97edc data/oreganized/advancements/recipes/misc/smelt_raw_lead.json -2f4e1f1ac23c86a7a60e1d860af14dc24e0ca4fd data/oreganized/advancements/recipes/misc/smelt_raw_silver.json -69c401795ef31b870e886764e132efa99277d42a data/oreganized/advancements/recipes/misc/smelt_silver_ore.json -1c41aefb7db7e46e4e73cbb28fdbc35925f8da11 data/oreganized/advancements/recipes/redstone/gargoyle.json -515ce7c277e9172bf0c68c6bddc09d08de2b0c12 data/oreganized/advancements/recipes/redstone/lead_bars.json -fea94b2bd9d8d2a9ef8e130ad2eb404691da858d data/oreganized/advancements/recipes/redstone/lead_door.json -716ef31e308f24d22ef6dae98e96fe9b16169e9b data/oreganized/advancements/recipes/redstone/lead_trapdoor.json -d8d4342744c72378bf0e7430305569819e8eeef1 data/oreganized/advancements/recipes/redstone/shrapnel_bomb.json -430e8110352b21c77fe0b3cb175b5b3fc4c6e4fd data/oreganized/advancements/recipes/tools/bush_hammer.json -54315d01f4b0a57f8c13766c770aa7b305a0c4bc data/oreganized/advancements/recipes/tools/flint_and_pewter.json -4a68b65b81f872d9396798417f3ff5be886ce70c data/oreganized/advancements/recipes/tools/scribe.json -57cf50f8e6ff4069b2fdc5fcf0e5092b68377468 data/oreganized/advancements/recipes/tools/silver_mirror.json -bd88fa660d3a40c321d3288b127cfe99e795cb6f data/oreganized/advancements/recipes/transportation/shrapnel_bomb_minecart.json -ee154313df45723058ea98bd9cbc74eeb3e1293f data/oreganized/recipes/black_crystal_glass.json -2da1c73754604da03234ae3e7649348be5838370 data/oreganized/recipes/black_crystal_glass_pane.json -ce4d670e5c75d72e690fd1d4a95357eee6fc68f7 data/oreganized/recipes/blast_deepslate_lead_ore.json -f51b34e44e4f5de9a01cf2de886ff05186f9b5de data/oreganized/recipes/blast_deepslate_silver_ore.json -de5a90db4241ab7d50a3fdd9012b8d880123a560 data/oreganized/recipes/blast_lead_ore.json -c7ea893379a76649ac8b1106b64b617e4cc047f6 data/oreganized/recipes/blast_raw_lead.json -e44ee55f7ab6df42caecd2dde0963666975e06ef data/oreganized/recipes/blast_raw_silver.json -849e9f7e29c3c1b6837bb2a6923c7ae803ece639 data/oreganized/recipes/blast_silver_ore.json -7f55a0b31e261d977a597e7005f9984aa55de54f data/oreganized/recipes/blue_crystal_glass.json -87854bacdbf7862b5c7fed3a7c295f87fc7eecf6 data/oreganized/recipes/blue_crystal_glass_pane.json -509c4b4713fb5d506d4c2ec7da3c63212e0f13ba data/oreganized/recipes/brown_crystal_glass.json -c261b93b8e4cbe7c710f1165c1a554e8f29fb243 data/oreganized/recipes/brown_crystal_glass_pane.json -e5116d96bde067efde6b8c3461019d7d9c122e4a data/oreganized/recipes/bush_hammer.json -dbbcb8a0cb8e7821654839c7dcd5718cc0cf3668 data/oreganized/recipes/chiseled_glance.json -80eb26782e0a919bf55d1526a096ef8f459dcfec data/oreganized/recipes/cut_lead.json -827423b22ea9e4fa0629dfc22cfd20d1743ebe84 data/oreganized/recipes/cyan_crystal_glass.json -e144c96a82b709098efe48ba362b1952150c41a3 data/oreganized/recipes/cyan_crystal_glass_pane.json -f79dc1125e97eff3392512d9dd0f6e8d3976cadf data/oreganized/recipes/electrum_axe.json -39a453380820864f17724f6aee0e6ec5036a9d81 data/oreganized/recipes/electrum_block.json -036b275950a9d4899856d68fbae81fccea9a509b data/oreganized/recipes/electrum_boots.json -5198b63aed769d981094a4f106db2ec184b6e3fd data/oreganized/recipes/electrum_chestplate.json -c8502d8a714cc82e207b2ad97b2e850cf3917412 data/oreganized/recipes/electrum_helmet.json -1189d31e075d6909f3583ba7f2d5de2bd7cd1c91 data/oreganized/recipes/electrum_hoe.json -69c5963caea3066816b59f94dcccd3d9ba483375 data/oreganized/recipes/electrum_ingot_from_block.json -112f3c308899ff08a6e3748eeb169574c6d14039 data/oreganized/recipes/electrum_ingot_from_nuggets.json -d4434e571f38b5c051bd1010490538e7abe87991 data/oreganized/recipes/electrum_knife.json -f6691dd342ce33ca9fabde7156cf12c5968c1369 data/oreganized/recipes/electrum_leggings.json -c24de7bbb04a1939e6a036255e8329f65c1d96ae data/oreganized/recipes/electrum_machete.json -8079094659f955b3e1b3735c9a89cbbaeca01552 data/oreganized/recipes/electrum_nugget.json -db731a127ba3046ceee5ae0e2f6e86d5d01504b2 data/oreganized/recipes/electrum_pickaxe.json -7af48b1f6b76e4e8d2dcf51f4335a66cd328e0fe data/oreganized/recipes/electrum_shield.json -facfd8f07459c400bb70163f4867e70d66652787 data/oreganized/recipes/electrum_shovel.json -cf15ffd760d39ce405ab20a1a677b1798ae80437 data/oreganized/recipes/electrum_sword.json -4a09ce0c226b618b61938286b85395b81ecb3efb data/oreganized/recipes/electrum_upgrade_smithing_template.json -d68f51c4e7cbe030b9d3767eb034a19dd16849b1 data/oreganized/recipes/flint_and_pewter.json -1fe4c5cc425db61412f873704d046425f07198e0 data/oreganized/recipes/gargoyle.json -00290f492ce615c61417079534a6aa00d08c3157 data/oreganized/recipes/glance.json -6b6c7d006b274224fdd9b469859e18aaf20040ff data/oreganized/recipes/glance_bricks.json -cd75a9311f1b63a61fb34547c17607b26dd7d911 data/oreganized/recipes/glance_brick_slab.json -662d083cb32864017951a843fc190a77d0f55f69 data/oreganized/recipes/glance_brick_stairs.json -3ed0877b3ec99b32cfd4660977fd2a08fda23ab1 data/oreganized/recipes/glance_brick_wall.json -88c5d38551315aeaf96ba3b51db2e10f1d6e833b data/oreganized/recipes/glance_slab.json -8b1f8619639789e753b398912dc062a2d6597353 data/oreganized/recipes/glance_stairs.json -57ad76c3c14643c7d28d84dbbd26885ef48c8d9e data/oreganized/recipes/glance_wall.json -e1c09f2d1950d7e5186f3a1ebaed0d1d9bc20f2a data/oreganized/recipes/gray_crystal_glass.json -43861aa0170dad9badd8ee37d31616c75a26119a data/oreganized/recipes/gray_crystal_glass_pane.json -137cc4870829488fe9aac4b7cc3c1d2d961ce636 data/oreganized/recipes/green_crystal_glass.json -716c99397627e656f05017ee28f973380862691f data/oreganized/recipes/green_crystal_glass_pane.json -fa74ed7a7cbf05b56856f395a780c726c7d4b065 data/oreganized/recipes/lead_bars.json -65befcd063025cfae493e0f156e69cad8c397843 data/oreganized/recipes/lead_block.json -887688824467cf6b5d7c699c740feceb46d2b788 data/oreganized/recipes/lead_bolt.json -9a3d66b85dc44ff589e742ac94a11a513e3a8e85 data/oreganized/recipes/lead_bolt_crate.json -b13c740aa1e59139c3ad6e85c0d6692457ae81e2 data/oreganized/recipes/lead_bolt_from_crate.json -d556fb758fd3dbab160acceee42cd40c0d02170f data/oreganized/recipes/lead_bricks.json -b280a1dac0963942de582b67ea3803fc9a362398 data/oreganized/recipes/lead_bulb.json -350064cd19b5d9dbc07e88b5706984f8cfb0be2e data/oreganized/recipes/lead_door.json -c3f86a2f15dedc7d9258364671aa799e426758eb data/oreganized/recipes/lead_ingot.json -f9266001d55884e79480a35f2c5d587a7f805040 data/oreganized/recipes/lead_ingot_from_block.json -4d4f1d0d66dd1e0a000af50afb6961574eabff2d data/oreganized/recipes/lead_nugget.json -68baacfd2aac33a768f0c959b2d25bcdc9ccb1a0 data/oreganized/recipes/lead_nugget_from_blasting.json -7f91e5d8ca2c1cca8cf9492bf074e48aa2fcb9a0 data/oreganized/recipes/lead_nugget_from_smelting.json -4777ada5e87b81e5c697238ca50512f8c4d8d764 data/oreganized/recipes/lead_pillar.json -93ad1995e2ee3628ce6e7c21bb3470a52a0c99cd data/oreganized/recipes/lead_trapdoor.json -b464404c9d6762093867324221fc9e37e761ef14 data/oreganized/recipes/light_blue_crystal_glass.json -f355729ac7d11ce8e7d97fa846ee44d16f0c3ce6 data/oreganized/recipes/light_blue_crystal_glass_pane.json -5b975a3ff07610808a6d27f798c46ca81a28a11c data/oreganized/recipes/light_gray_crystal_glass.json -71b1323e7da06da1be66af6df041a7e7cc421671 data/oreganized/recipes/light_gray_crystal_glass_pane.json -04a73c07655513376690673edb4f259b7ee6d002 data/oreganized/recipes/lime_crystal_glass.json -5105fac3be074aa13b81b38a4f4c886bf5499597 data/oreganized/recipes/lime_crystal_glass_pane.json -2ff62dfa2f73f6f5826112c0b0717332785f7eaa data/oreganized/recipes/magenta_crystal_glass.json -ebe46c86e77b1fc839f4015bfe55872a98965463 data/oreganized/recipes/magenta_crystal_glass_pane.json -48ae5162138d3c5e230540db54451b911f56d077 data/oreganized/recipes/netherite_ingot_from_nuggets.json -48000befd6235c166f1566a60fef9f8177d09db9 data/oreganized/recipes/netherite_nugget.json -f4eba4afe1e276abb01928934bd053590a052f62 data/oreganized/recipes/orange_crystal_glass.json -6981700d6a300695de6ad15fa2efc8b073288d0b data/oreganized/recipes/orange_crystal_glass_pane.json -2468369c94e2a07717f71ea3d4e314044d8973c5 data/oreganized/recipes/pink_crystal_glass.json -ee97125ec9a428a7b02a932df58d9844f880f5dd data/oreganized/recipes/pink_crystal_glass_pane.json -117664785859b51a04b4430dedfcd060b967f0c6 data/oreganized/recipes/poisonous_potato_from_lead.json -fc29aa31634903492522f5039cbd6359cdf4b021 data/oreganized/recipes/polished_glance.json -1c015bbedb951766c631bf91bbc6159f677a5999 data/oreganized/recipes/purple_crystal_glass.json -23bd919785f4a9123893d30d26981039aa1db576 data/oreganized/recipes/purple_crystal_glass_pane.json -de027e6a84b7854012960c27c03f18c22de4cc78 data/oreganized/recipes/raw_lead_block.json -3de80928bb85603723e5b6039a9ac5fdacd0b003 data/oreganized/recipes/raw_lead_from_block.json -1c63d1f79916f942b947c1ea0dbf86c67a845ea0 data/oreganized/recipes/raw_silver_block.json -7c161f552218843de6033c84fdbcda9f024de464 data/oreganized/recipes/raw_silver_from_block.json -2deee8e79dab0cc6a48f66589d44f3e2ee6df545 data/oreganized/recipes/red_crystal_glass.json -f143419602a22f529db20cea44e5e370e8e4d868 data/oreganized/recipes/red_crystal_glass_pane.json -06ea07eed909dbcff647ac8724355430c1817e0e data/oreganized/recipes/scribe.json -194a5e4bfb1acbb98161ddeb6c0af5b21917e508 data/oreganized/recipes/shrapnel_bomb.json -cedc682018d184f9f9f384afe3b157e6cbfff4b1 data/oreganized/recipes/shrapnel_bomb_minecart.json -07595b3d623aafa3ef700093ec0449ebafa1ed27 data/oreganized/recipes/silver_block.json -733eb92ce47032da037d0cdc408892f1b4e7fa9a data/oreganized/recipes/silver_ingot.json -a485b68bcbb9b775b278da161e586a14fb02d402 data/oreganized/recipes/silver_ingot_from_block.json -88cb68a1ee79f62063a110a36eaa35f88d0a893e data/oreganized/recipes/silver_mirror.json -3b1e58f3a6defb06a3a0b071a532ce52fa96f1ff data/oreganized/recipes/silver_nugget.json -5481134ed83b0cd59931bea7b0093c8ec584a2db data/oreganized/recipes/smelt_deepslate_lead_ore.json -685fd2b9132eac20e19566fc14eadc2ca22ece8f data/oreganized/recipes/smelt_deepslate_silver_ore.json -41ebc17ff58bc5925360df3995dee5c8603d442e data/oreganized/recipes/smelt_lead_ore.json -0bef18d650c987afa638720c517c479353649026 data/oreganized/recipes/smelt_raw_lead.json -d6fc88f30af0ebff0f813a9529ba1ca25b3ebf77 data/oreganized/recipes/smelt_raw_silver.json -e1d8bfafa7904e89fce7ae3242b7eebc46e9f3ed data/oreganized/recipes/smelt_silver_ore.json -05d3527a52be4f021824699c760733665d480d6b data/oreganized/recipes/spotted_glance.json -95a4c40547ba898ef6ff3a952994d0d9a10f1858 data/oreganized/recipes/stonecutting/chiseled_glance.json -2b1be77c6ac39442d637397ad5969b34350dbc59 data/oreganized/recipes/stonecutting/cut_lead.json -e8ea478c690f39424f4b22f471d2a6ad6b13db5e data/oreganized/recipes/stonecutting/glance_bricks_from_glance.json -210bd9aa5dcababc24669202e8aa6c374b5aec33 data/oreganized/recipes/stonecutting/glance_bricks_from_polished.json -477744c8f968b875e139426b1b7c6beb95b79761 data/oreganized/recipes/stonecutting/glance_brick_slab.json -105f0805dff91c847df7dfc103a373d9cb8cc0cf data/oreganized/recipes/stonecutting/glance_brick_slab_from_glance.json -39848aab675eb806ab95c0fdde64f4900c50f8f5 data/oreganized/recipes/stonecutting/glance_brick_slab_from_polished.json -8e0da03b3ecdcd57609f3517fd481c85490d7531 data/oreganized/recipes/stonecutting/glance_brick_stairs.json -cfe9fac19b72cad57cd47a9291ce09fd00b1e1d3 data/oreganized/recipes/stonecutting/glance_brick_stairs_from_glance.json -a5bdc4b85d7afa0d21f0cb38b0d86b9afa344dbd data/oreganized/recipes/stonecutting/glance_brick_stairs_from_polished.json -690e66ab7cb04fec38497369ab7710536a7c3a09 data/oreganized/recipes/stonecutting/glance_brick_wall.json -3139315e2fa42a85e33ba68c76472863434d6bec data/oreganized/recipes/stonecutting/glance_brick_wall_from_glance.json -0ad2a2c63f01ded1f8fc319465ed176a5a811083 data/oreganized/recipes/stonecutting/glance_brick_wall_from_polished.json -f924074ff7c1499ef4f0677c937fa0cd1fbff11b data/oreganized/recipes/stonecutting/glance_slab.json -ffdc99d3894a03c3fccd52c33d0b70cf769be3cb data/oreganized/recipes/stonecutting/glance_stairs.json -c4bb5be91a0f5d818b5891cdbc61f62c4f337286 data/oreganized/recipes/stonecutting/glance_wall.json -757db1424a0abe2ebd87db0d0ed706ecb6bf30be data/oreganized/recipes/stonecutting/lead_bricks.json -63a4d04e9f472bd4a4360eba3d3f9f1f11ec042c data/oreganized/recipes/stonecutting/lead_bricks_from_cut_lead.json -e19433073beac3a542465c7de86da46cb8fbd2e4 data/oreganized/recipes/stonecutting/lead_pillar.json -38a9b7a3ad7d62eb8e455ebaf22775b3e0acfe68 data/oreganized/recipes/stonecutting/lead_pillar_from_cut_lad.json -79444ccacf5f4f853c8081f720dd1bd6de552268 data/oreganized/recipes/stonecutting/polished_glance.json -4acc1b141e985ebf068349d5d87fce8dcac0c23b data/oreganized/recipes/waxed_black_concrete_powder.json -ac8c461a02678f5d58a10243d41d160252ee0fa6 data/oreganized/recipes/waxed_blue_concrete_powder.json -5696c4981da26fc6ba8d5041e8cf9a64fb99a7c4 data/oreganized/recipes/waxed_brown_concrete_powder.json -0a96904f34ec6c3a8323e9fdff849fb747d0a3d4 data/oreganized/recipes/waxed_cyan_concrete_powder.json -fef1e081549986a2753179bb1a50cb6fb1053109 data/oreganized/recipes/waxed_gray_concrete_powder.json -804249d140e76e9b1ebea9edcacef255886c8241 data/oreganized/recipes/waxed_green_concrete_powder.json -584e97f8ee55d497b34d084a8eb1818172d0e2ef data/oreganized/recipes/waxed_light_blue_concrete_powder.json -2fef1a02a7501ab3b338848f104d0fa9ef957670 data/oreganized/recipes/waxed_light_gray_concrete_powder.json -3707ac69bdf5b6ab39755b8c92ac163f91c1f454 data/oreganized/recipes/waxed_lime_concrete_powder.json -40d465fe522ec12e4115c8983693a265ac169c39 data/oreganized/recipes/waxed_magenta_concrete_powder.json -3265ee594fa127db29c9ee361b6bd9496140010c data/oreganized/recipes/waxed_orange_concrete_powder.json -2bb61bbb3b0b9c481e9a482ca6005356153c9806 data/oreganized/recipes/waxed_pink_concrete_powder.json -44f7e81856bccc688589090fce3dfe62c6bcc26e data/oreganized/recipes/waxed_purple_concrete_powder.json -ad45773d8fa7b5925f14769e8d4d9252fcb84c53 data/oreganized/recipes/waxed_red_concrete_powder.json -aadd65174c07b919472852a939e8cc545aabb546 data/oreganized/recipes/waxed_spotted_glance.json -2fdc6d63aac4869ccedfe7298ae9946212bd4736 data/oreganized/recipes/waxed_white_concrete_powder.json -acfeef33bb3d82dcf786a44453ab479c4a1cb8fc data/oreganized/recipes/waxed_yellow_concrete_powder.json -e8a1f8934552db84c94387a4453afdfb9310cd60 data/oreganized/recipes/white_crystal_glass.json -151e9613e18dc4afa2aece6a233b76d85e58775d data/oreganized/recipes/white_crystal_glass_pane.json -8dc590323e78a612735614ae31e180b6bff17b66 data/oreganized/recipes/yellow_crystal_glass.json -0298502a7b6edea1824342a4cbc213d80d6fb400 data/oreganized/recipes/yellow_crystal_glass_pane.json diff --git a/src/generated/resources/.cache/f43e2426f2370abaef549e24a3723585e9b3c47e b/src/generated/resources/.cache/f43e2426f2370abaef549e24a3723585e9b3c47e deleted file mode 100644 index e72c15b2..00000000 --- a/src/generated/resources/.cache/f43e2426f2370abaef549e24a3723585e9b3c47e +++ /dev/null @@ -1,2 +0,0 @@ -// 1.20.1 2023-08-24T20:32:13.551458979 Oreganized Entity Type Tags -29671cfa11d074462c259806e9d60468451e3cdb data/oreganized/tags/entity_types/lighter_than_lead.json diff --git a/src/generated/resources/.cache/fab176c00984ff045b6565b8b962718c23b968ec b/src/generated/resources/.cache/fab176c00984ff045b6565b8b962718c23b968ec deleted file mode 100644 index c52a6e82..00000000 --- a/src/generated/resources/.cache/fab176c00984ff045b6565b8b962718c23b968ec +++ /dev/null @@ -1,3 +0,0 @@ -// 1.20.1 2023-08-24T20:32:13.555038231 Oreganized Biome Tags -d7dd92daad66eaa897e786e9a1a0bfddcc0e1fbf data/oreganized/tags/worldgen/biome/has_structure/boulder.json -123a8c4cf362352d397dc85738c4e8bb2ef2dc40 data/oreganized/tags/worldgen/biome/rich_in_lead_ore.json diff --git a/src/generated/resources/assets/oreganized/blockstates/burial_dirt.json b/src/generated/resources/assets/oreganized/blockstates/burial_dirt.json new file mode 100644 index 00000000..8c7ac15a --- /dev/null +++ b/src/generated/resources/assets/oreganized/blockstates/burial_dirt.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "oreganized:block/burial_dirt" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/lang/en_us.json b/src/generated/resources/assets/oreganized/lang/en_us.json index 31ede671..de2ea3f3 100644 --- a/src/generated/resources/assets/oreganized/lang/en_us.json +++ b/src/generated/resources/assets/oreganized/lang/en_us.json @@ -30,6 +30,7 @@ "block.oreganized.blue_crystal_glass_pane": "Blue Crystal Glass Pane", "block.oreganized.brown_crystal_glass": "Brown Crystal Glass", "block.oreganized.brown_crystal_glass_pane": "Brown Crystal Glass Pane", + "block.oreganized.burial_dirt": "Burial Dirt", "block.oreganized.chiseled_glance": "Chiseled Glance", "block.oreganized.cut_lead": "Cut Lead", "block.oreganized.cyan_crystal_glass": "Cyan Crystal Glass", @@ -115,6 +116,7 @@ "death.attack.molten_lead": "%1$s refused to let go of the soaring hot metal", "effect.oreganized.stunning": "Brain Damage", "effect.oreganized.stunning.description": "Paralyzes the victim periodically with random intervals", + "entity.oreganized.holler": "Holler", "entity.oreganized.lead_bolt": "Lead Bolt", "entity.oreganized.shrapnel_bomb": "Shrapnel Bomb", "entity.oreganized.shrapnel_bomb_minecart": "Shrapnel Bomb Minecart", diff --git a/src/generated/resources/assets/oreganized/models/block/burial_dirt.json b/src/generated/resources/assets/oreganized/models/block/burial_dirt.json new file mode 100644 index 00000000..b2bd3832 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/burial_dirt.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "oreganized:block/burial_dirt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/item/burial_dirt.json b/src/generated/resources/assets/oreganized/models/item/burial_dirt.json new file mode 100644 index 00000000..51eddcda --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/item/burial_dirt.json @@ -0,0 +1,3 @@ +{ + "parent": "oreganized:block/burial_dirt" +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/burial_dirt.json b/src/generated/resources/data/oreganized/loot_tables/blocks/burial_dirt.json new file mode 100644 index 00000000..cf8773ed --- /dev/null +++ b/src/generated/resources/data/oreganized/loot_tables/blocks/burial_dirt.json @@ -0,0 +1,58 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "oreganized:burial_dirt" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "minecraft:dirt" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "oreganized:blocks/burial_dirt" +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/loot_tables/entities/holler.json b/src/generated/resources/data/oreganized/loot_tables/entities/holler.json new file mode 100644 index 00000000..30b34f4a --- /dev/null +++ b/src/generated/resources/data/oreganized/loot_tables/entities/holler.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:entity", + "random_sequence": "oreganized:entities/holler" +} \ No newline at end of file diff --git a/src/main/java/galena/oreganized/Oreganized.java b/src/main/java/galena/oreganized/Oreganized.java index 8b2b1bb8..a3b1107e 100644 --- a/src/main/java/galena/oreganized/Oreganized.java +++ b/src/main/java/galena/oreganized/Oreganized.java @@ -8,6 +8,7 @@ import galena.oreganized.compat.create.CreateCompat; import galena.oreganized.content.block.LeadOreBlock; import galena.oreganized.content.block.MoltenLeadCauldronBlock; +import galena.oreganized.content.entity.holler.Holler; import galena.oreganized.content.entity.LeadBoltEntity; import galena.oreganized.data.OAdvancements; import galena.oreganized.data.OBiomeTags; @@ -51,6 +52,7 @@ import net.minecraft.server.packs.PackType; import net.minecraft.server.packs.metadata.pack.PackMetadataSection; import net.minecraft.tags.FluidTags; +import net.minecraft.world.entity.SpawnPlacements; import net.minecraft.world.entity.npc.VillagerProfession; import net.minecraft.world.entity.projectile.AbstractArrow; import net.minecraft.world.entity.projectile.Projectile; @@ -67,6 +69,7 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.DispenserBlock; import net.minecraft.world.level.block.FireBlock; +import net.minecraft.world.level.levelgen.Heightmap; import net.minecraft.world.level.levelgen.structure.pools.StructurePoolElement; import net.minecraft.world.level.levelgen.structure.pools.StructureTemplatePool; import net.minecraftforge.common.BasicItemListing; @@ -77,6 +80,8 @@ import net.minecraftforge.common.util.MutableHashedLinkedMap; import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.event.BuildCreativeModeTabContentsEvent; +import net.minecraftforge.event.entity.EntityAttributeCreationEvent; +import net.minecraftforge.event.entity.SpawnPlacementRegisterEvent; import net.minecraftforge.event.village.VillagerTradesEvent; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -129,6 +134,8 @@ public Oreganized() { modBus.addListener(this::clientSetup); modBus.addListener(this::gatherData); modBus.addListener(this::buildCreativeModeTabContents); + modBus.addListener(this::registerAttributes); + modBus.addListener(this::registerSpawnPlacements); forgeBus.addListener(this::injectVillagerTrades); LOOT_MODIFIERS.register("add_item", () -> AddItemLootModifier.CODEC); @@ -165,6 +172,15 @@ public Oreganized() { //context.registerConfig(ModConfig.Type.CLIENT, OreganizedConfig.CLIENT_SPEC); } + private void registerAttributes(EntityAttributeCreationEvent event) { + event.put(OEntityTypes.HOLLER.get(), Holler.createAttributes().build()); + } + + private void registerSpawnPlacements(SpawnPlacementRegisterEvent event) { + event.register(OEntityTypes.HOLLER.get(), SpawnPlacements.Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Holler::checkHollerSpawnRules, SpawnPlacementRegisterEvent.Operation.REPLACE); + } + + private void injectVillagerTrades(VillagerTradesEvent event) { if (event.getType() == VillagerProfession.MASON) { event.getTrades().get(5).add(new BasicItemListing(14, new ItemStack(OBlocks.GARGOYLE.get()), 5, 30, 0.05F)); @@ -371,6 +387,7 @@ public void buildCreativeModeTabContents(BuildCreativeModeTabContentsEvent event putAfter(entries, Blocks.ICE, OBlocks.GROOVED_ICE); putAfter(entries, Blocks.PACKED_ICE, OBlocks.GROOVED_PACKED_ICE); putAfter(entries, Blocks.BLUE_ICE, OBlocks.GROOVED_BLUE_ICE); + putAfter(entries, Blocks.FARMLAND, OBlocks.BURIAL_DIRT); } if (tab == CreativeModeTabs.REDSTONE_BLOCKS) { putBefore(entries, Items.NOTE_BLOCK, OBlocks.GARGOYLE); diff --git a/src/main/java/galena/oreganized/client/OModelLayers.java b/src/main/java/galena/oreganized/client/OModelLayers.java new file mode 100644 index 00000000..04a42996 --- /dev/null +++ b/src/main/java/galena/oreganized/client/OModelLayers.java @@ -0,0 +1,16 @@ +package galena.oreganized.client; + +import com.google.common.collect.Sets; +import galena.oreganized.Oreganized; +import net.minecraft.client.model.geom.ModelLayerLocation; +import net.minecraft.resources.ResourceLocation; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + +import java.util.Set; + +@OnlyIn(Dist.CLIENT) +public class OModelLayers { + + public static final ModelLayerLocation HOLLER = new ModelLayerLocation(new ResourceLocation(Oreganized.MOD_ID, "holler"), "main"); +} diff --git a/src/main/java/galena/oreganized/client/OreganizedClient.java b/src/main/java/galena/oreganized/client/OreganizedClient.java index 0b9b4751..e7c50dd7 100644 --- a/src/main/java/galena/oreganized/client/OreganizedClient.java +++ b/src/main/java/galena/oreganized/client/OreganizedClient.java @@ -2,6 +2,8 @@ import com.mojang.math.Axis; import galena.oreganized.Oreganized; +import galena.oreganized.client.model.HollerModel; +import galena.oreganized.client.render.entity.HollerRender; import galena.oreganized.client.render.entity.LeadBoltRender; import galena.oreganized.client.render.entity.ShrapnelBombMinecartRender; import galena.oreganized.client.render.entity.ShrapnelBombRender; @@ -93,6 +95,12 @@ public static void registerEntityRenderers(EntityRenderersEvent.RegisterRenderer event.registerEntityRenderer(OEntityTypes.SHRAPNEL_BOMB.get(), ShrapnelBombRender::new); event.registerEntityRenderer(OEntityTypes.SHRAPNEL_BOMB_MINECART.get(), ShrapnelBombMinecartRender::new); event.registerEntityRenderer(OEntityTypes.LEAD_BOLT.get(), LeadBoltRender::new); + event.registerEntityRenderer(OEntityTypes.HOLLER.get(), HollerRender::new); + } + + @SubscribeEvent + public static void registerModelLayers(EntityRenderersEvent.RegisterLayerDefinitions event) { + event.registerLayerDefinition(OModelLayers.HOLLER, HollerModel::createBodyLayer); } @SubscribeEvent diff --git a/src/main/java/galena/oreganized/client/model/HollerModel.java b/src/main/java/galena/oreganized/client/model/HollerModel.java new file mode 100644 index 00000000..407afb85 --- /dev/null +++ b/src/main/java/galena/oreganized/client/model/HollerModel.java @@ -0,0 +1,59 @@ +package galena.oreganized.client.model; + +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import net.minecraft.client.model.EntityModel; +import net.minecraft.client.model.geom.ModelPart; +import net.minecraft.client.model.geom.PartPose; +import net.minecraft.client.model.geom.builders.*; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.world.entity.Entity; + +public class HollerModel extends EntityModel { + private final ModelPart head; + private final ModelPart body; + private final ModelPart right_arm; + private final ModelPart left_arm; + + public HollerModel(ModelPart root) { + super(RenderType::entityTranslucent); + this.head = root.getChild("head"); + this.body = root.getChild("body"); + this.right_arm = root.getChild("right_arm"); + this.left_arm = root.getChild("left_arm"); + } + + public static LayerDefinition createBodyLayer() { + MeshDefinition meshdefinition = new MeshDefinition(); + PartDefinition partdefinition = meshdefinition.getRoot(); + + PartDefinition head = partdefinition.addOrReplaceChild("head", CubeListBuilder.create().texOffs(0, 0).addBox(-2.5F, -5, -2.5F, 5, 5, 5) + .texOffs(12, 16).addBox(-2.5F, -5, -2.5F, 5, 5, 5, new CubeDeformation(0.5F)), PartPose.offset(0, 18, 0)); + + PartDefinition body = partdefinition.addOrReplaceChild("body", CubeListBuilder.create().texOffs(0, 10).addBox(-1.5F, 0, -1, 3, 4, 2) + .texOffs(0, 16).addBox(-1.5F, 4, -1, 3, 5, 2, new CubeDeformation(-0.2F)) + .texOffs(0, 16).addBox(-1.5F, 2.5F, -1, 3, 2, 2, new CubeDeformation(-0.2F)), PartPose.offset(0, 18, 0)); + + PartDefinition right_arm = partdefinition.addOrReplaceChild("right_arm", CubeListBuilder.create().texOffs(22, 0).addBox(-0.75F, -0.5F, -1, 2, 6, 2) + .texOffs(2, 24).mirror().addBox(-0.75F, -0.5F, -0.9F, 5, 6, 0).mirror(false) + .texOffs(2, 24).mirror().addBox(1.25F, -0.5F, 0.9F, 5, 6, 0).mirror(false), PartPose.offsetAndRotation(-1.75F, 18.5F, 0, 0, 0, 1.5708F)); + + PartDefinition left_arm = partdefinition.addOrReplaceChild("left_arm", CubeListBuilder.create().texOffs(22, 26).addBox(-6.25F, -0.5F, 0.9F, 5, 6, 0) + .texOffs(22, 26).addBox(-4.25F, -0.5F, -0.9F, 5, 6, 0) + .texOffs(22, 8).addBox(-1.25F, -0.5F, -1, 2, 6, 2), PartPose.offsetAndRotation(1.75F, 18.5F, 0, 0, 0, -1.5708F)); + + return LayerDefinition.create(meshdefinition, 32, 32); + } + + @Override + public void setupAnim(T entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) { + } + + @Override + public void renderToBuffer(PoseStack poseStack, VertexConsumer vertexConsumer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha) { + head.render(poseStack, vertexConsumer, packedLight, packedOverlay, red, green, blue, alpha); + body.render(poseStack, vertexConsumer, packedLight, packedOverlay, red, green, blue, alpha); + right_arm.render(poseStack, vertexConsumer, packedLight, packedOverlay, red, green, blue, alpha); + left_arm.render(poseStack, vertexConsumer, packedLight, packedOverlay, red, green, blue, alpha); + } +} \ No newline at end of file diff --git a/src/main/java/galena/oreganized/client/render/entity/HollerRender.java b/src/main/java/galena/oreganized/client/render/entity/HollerRender.java new file mode 100644 index 00000000..ab9d2066 --- /dev/null +++ b/src/main/java/galena/oreganized/client/render/entity/HollerRender.java @@ -0,0 +1,32 @@ +package galena.oreganized.client.render.entity; + +import galena.oreganized.Oreganized; +import galena.oreganized.client.OModelLayers; +import galena.oreganized.client.model.HollerModel; +import galena.oreganized.content.entity.holler.Holler; +import net.minecraft.client.renderer.entity.EntityRendererProvider; +import net.minecraft.client.renderer.entity.MobRenderer; +import net.minecraft.core.BlockPos; +import net.minecraft.resources.ResourceLocation; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + +@OnlyIn(Dist.CLIENT) +public class HollerRender extends MobRenderer> { + + private static final ResourceLocation HOLLER_TEXTURE = new ResourceLocation(Oreganized.MOD_ID, "textures/entity/holler.png"); + + public HollerRender(EntityRendererProvider.Context context) { + super(context, new HollerModel<>(context.bakeLayer(OModelLayers.HOLLER)), 0.4F); + } + + @Override + public ResourceLocation getTextureLocation(Holler holler) { + return HOLLER_TEXTURE; + } + + @Override + protected int getBlockLightLevel(Holler p_114496_, BlockPos p_114497_) { + return 15; + } +} diff --git a/src/main/java/galena/oreganized/content/block/BurialDirtBlock.java b/src/main/java/galena/oreganized/content/block/BurialDirtBlock.java new file mode 100644 index 00000000..2c4163a6 --- /dev/null +++ b/src/main/java/galena/oreganized/content/block/BurialDirtBlock.java @@ -0,0 +1,47 @@ +package galena.oreganized.content.block; + +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.util.RandomSource; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.monster.Skeleton; +import net.minecraft.world.entity.monster.Zombie; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.BlockState; + +public class BurialDirtBlock extends Block { + public BurialDirtBlock(Properties properties) { + super(properties); + } + + @Override + public boolean isRandomlyTicking(BlockState state) { + return true; + } + + @Override + public void randomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) { + if (!level.getBlockState(pos.above()).isAir()) level.setBlockAndUpdate(pos, Blocks.DIRT.withPropertiesOf(state)); + if (level.isNight() && random.nextFloat() < 0.1) { + spawnZombie(level, pos); + level.setBlockAndUpdate(pos, Blocks.DIRT.withPropertiesOf(state)); + } + } + + @Override + public void spawnAfterBreak(BlockState state, ServerLevel level, BlockPos pos, ItemStack stack, boolean dropExperience) { + spawnZombie(level, pos); + } + + public void spawnZombie(Level level, BlockPos pos) { + Zombie zombie = EntityType.ZOMBIE.create(level); + if (zombie != null) { + zombie.moveTo(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 0, 0); + level.addFreshEntity(zombie); + zombie.spawnAnim(); + } + } +} diff --git a/src/main/java/galena/oreganized/content/entity/holler/Holler.java b/src/main/java/galena/oreganized/content/entity/holler/Holler.java new file mode 100644 index 00000000..eb49163b --- /dev/null +++ b/src/main/java/galena/oreganized/content/entity/holler/Holler.java @@ -0,0 +1,209 @@ +package galena.oreganized.content.entity.holler; + +import com.google.common.collect.ImmutableList; +import com.mojang.serialization.Dynamic; +import galena.oreganized.index.OBlocks; +import net.minecraft.core.BlockPos; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.network.protocol.game.DebugPackets; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.util.RandomSource; +import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.world.entity.*; +import net.minecraft.world.entity.ai.Brain; +import net.minecraft.world.entity.ai.attributes.AttributeSupplier; +import net.minecraft.world.entity.ai.attributes.Attributes; +import net.minecraft.world.entity.ai.control.FlyingMoveControl; +import net.minecraft.world.entity.ai.memory.MemoryModuleType; +import net.minecraft.world.entity.ai.navigation.FlyingPathNavigation; +import net.minecraft.world.entity.ai.navigation.PathNavigation; +import net.minecraft.world.entity.ai.sensing.Sensor; +import net.minecraft.world.entity.ai.sensing.SensorType; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.LightLayer; +import net.minecraft.world.level.block.SnowyDirtBlock; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.Vec3; + +import java.time.LocalDate; +import java.time.temporal.ChronoField; + +public class Holler extends PathfinderMob { + + private static final ImmutableList>> SENSOR_TYPES = ImmutableList.of( + SensorType.NEAREST_LIVING_ENTITIES, + SensorType.NEAREST_PLAYERS, + SensorType.HURT_BY + ); + + + private static final ImmutableList> MEMORY_TYPES = ImmutableList.of( + MemoryModuleType.PATH, + MemoryModuleType.LOOK_TARGET, + MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES, + MemoryModuleType.WALK_TARGET, + MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, + MemoryModuleType.NEAREST_PLAYERS, + MemoryModuleType.HURT_BY, + MemoryModuleType.IS_PANICKING + ); + + public Holler(EntityType entityType, Level level) { + super(entityType, level); + this.moveControl = new FlyingMoveControl(this, 20, true); + } + + protected Brain.Provider brainProvider() { + return Brain.provider(MEMORY_TYPES, SENSOR_TYPES); + } + + protected Brain makeBrain(Dynamic p_218344_) { + return HollerAi.makeBrain(this.brainProvider().makeBrain(p_218344_)); + } + + @Override + public Brain getBrain() { + return (Brain) super.getBrain(); + } + + @Override + public boolean removeWhenFarAway(double p_21542_) { + return false; + } + + @Override + protected void customServerAiStep() { + this.level().getProfiler().push("hollerBrain"); + this.getBrain().tick((ServerLevel)this.level(), this); + this.level().getProfiler().pop(); + this.level().getProfiler().push("hollerActivityUpdate"); + HollerAi.updateActivity(this); + this.level().getProfiler().pop(); + super.customServerAiStep(); + } + + @Override + public void aiStep() { + super.aiStep(); + if (!this.level().isClientSide && this.isAlive() && this.tickCount % 10 == 0) { + this.heal(1.0F); + } + } + + @Override + protected void sendDebugPackets() { + super.sendDebugPackets(); + DebugPackets.sendEntityBrain(this); + } + + @Override + public void tick() { + this.noPhysics = true; + super.tick(); + this.noPhysics = false; + this.setNoGravity(true); + } + + public static AttributeSupplier.Builder createAttributes() { + return Mob.createMobAttributes() + .add(Attributes.MAX_HEALTH, 20.0) + .add(Attributes.FLYING_SPEED, 0.10000000149011612) + .add(Attributes.MOVEMENT_SPEED, 0.10000000149011612) + .add(Attributes.ATTACK_DAMAGE, 2.0) + .add(Attributes.FOLLOW_RANGE, 48.0); + } + + @Override + protected PathNavigation createNavigation(Level level) { + FlyingPathNavigation flyingpathnavigation = new FlyingPathNavigation(this, level); + flyingpathnavigation.setCanOpenDoors(false); + flyingpathnavigation.setCanFloat(true); + flyingpathnavigation.setCanPassDoors(true); + return flyingpathnavigation; + } + + @Override + public void travel(Vec3 vec3) { + if (this.isControlledByLocalInstance()) { + if (this.isInWater()) { + this.moveRelative(0.02F, vec3); + this.move(MoverType.SELF, this.getDeltaMovement()); + this.setDeltaMovement(this.getDeltaMovement().scale(0.800000011920929)); + } else if (this.isInLava()) { + this.moveRelative(0.02F, vec3); + this.move(MoverType.SELF, this.getDeltaMovement()); + this.setDeltaMovement(this.getDeltaMovement().scale(0.5)); + } else { + this.moveRelative(this.getSpeed(), vec3); + this.move(MoverType.SELF, this.getDeltaMovement()); + this.setDeltaMovement(this.getDeltaMovement().scale(0.9100000262260437)); + } + } + + this.calculateEntityAnimation(false); + this.tryCheckInsideBlocks(); + } + + @Override + protected void playStepSound(BlockPos pos, BlockState state) { + } + + @Override + protected void checkFallDamage(double p_218316_, boolean p_218317_, BlockState state, BlockPos pos) { + } + + @Override + protected SoundEvent getAmbientSound() { + return SoundEvents.ALLAY_AMBIENT_WITHOUT_ITEM; + } + + @Override + public SoundEvent getHurtSound(DamageSource damageSource) { + return SoundEvents.ALLAY_HURT; + } + + @Override + protected SoundEvent getDeathSound() { + return SoundEvents.VEX_DEATH; + } + + @Override + protected float getSoundVolume() { + return 0.4F; + } + + @Override + protected void onInsideBlock(BlockState state) { + if (!state.isAir() && isPanicking()) { + BlockPos.withinManhattan(blockPosition(), 3, 1, 3).forEach(pos -> { + if (level().getBlockState(pos).getBlock() instanceof SnowyDirtBlock && level().random.nextFloat() < 0.25) + level().setBlockAndUpdate(pos, OBlocks.BURIAL_DIRT.get().withPropertiesOf(state)); + if (level().isClientSide) level().addParticle(ParticleTypes.SMOKE, pos.getX(), pos.getY()+1.5, pos.getZ(), 0, 0, 0); + }); + + if (level().isClientSide) { + // level().playSound(this, SoundEvents.IT); + level().addParticle(ParticleTypes.SMOKE, getX(), getY(), getZ(), 0, 0, 0); + } + this.remove(RemovalReason.KILLED); + } + } + + public static boolean checkHollerSpawnRules(EntityType entityType, LevelAccessor levelAccessor, MobSpawnType spawnType, BlockPos pos, RandomSource random) { + return levelAccessor.getBrightness(LightLayer.SKY, pos) < random.nextInt(8) && random.nextInt(10) > (isHalloween() ? 2 : 5) && checkMobSpawnRules(entityType, levelAccessor, spawnType, pos, random); + } + + public boolean isPanicking() { + return this.brain.getMemory(MemoryModuleType.IS_PANICKING).isPresent(); + } + + private static boolean isHalloween() { + LocalDate $$0 = LocalDate.now(); + int $$1 = $$0.get(ChronoField.DAY_OF_MONTH); + int $$2 = $$0.get(ChronoField.MONTH_OF_YEAR); + return $$2 == 10 && $$1 >= 20 || $$2 == 11 && $$1 <= 3; + } +} diff --git a/src/main/java/galena/oreganized/content/entity/holler/HollerAi.java b/src/main/java/galena/oreganized/content/entity/holler/HollerAi.java new file mode 100644 index 00000000..f7d367f4 --- /dev/null +++ b/src/main/java/galena/oreganized/content/entity/holler/HollerAi.java @@ -0,0 +1,43 @@ +package galena.oreganized.content.entity.holler; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; +import com.mojang.datafixers.util.Pair; +import net.minecraft.util.valueproviders.UniformInt; +import net.minecraft.world.entity.ai.Brain; +import net.minecraft.world.entity.ai.behavior.*; +import net.minecraft.world.entity.schedule.Activity; + +public class HollerAi { + + public HollerAi() { + } + + protected static Brain makeBrain(Brain hollerBrain) { + initCoreActivity(hollerBrain); + initIdleActivity(hollerBrain); + hollerBrain.setCoreActivities(ImmutableSet.of(Activity.CORE)); + hollerBrain.setDefaultActivity(Activity.IDLE); + hollerBrain.useDefaultActivity(); + return hollerBrain; + } + + private static void initCoreActivity(Brain hollerBrain) { + hollerBrain.addActivity(Activity.CORE, 0, ImmutableList.of(new Swim(0.8F), new AnimalPanic(3F), new LookAtTargetSink(45, 90), new MoveToTargetSink())); + } + + private static void initIdleActivity(Brain hollerBrain) { + hollerBrain.addActivity(Activity.IDLE, ImmutableList.of( + Pair.of(0, SetEntityLookTargetSometimes.create(6.0F, UniformInt.of(30, 60))), + Pair.of(1, new RunOne<>(ImmutableList.of( + Pair.of(RandomStroll.fly(1.0F), 2), + Pair.of(SetWalkTargetFromLookTarget.create(1.0F, 3), 2), + Pair.of(new DoNothing(30, 60), 1) + )))) + ); + } + + public static void updateActivity(Holler holler) { + holler.getBrain().setActiveActivityToFirstValid(ImmutableList.of(Activity.IDLE)); + } +} diff --git a/src/main/java/galena/oreganized/content/entity/holler/HollerPanic.java b/src/main/java/galena/oreganized/content/entity/holler/HollerPanic.java new file mode 100644 index 00000000..b7dfa342 --- /dev/null +++ b/src/main/java/galena/oreganized/content/entity/holler/HollerPanic.java @@ -0,0 +1,36 @@ +package galena.oreganized.content.entity.holler; + +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.entity.PathfinderMob; +import net.minecraft.world.entity.ai.behavior.AnimalPanic; +import net.minecraft.world.entity.ai.memory.MemoryModuleType; +import net.minecraft.world.entity.ai.memory.WalkTarget; +import net.minecraft.world.entity.ai.util.LandRandomPos; +import net.minecraft.world.phys.Vec3; + +import java.util.Optional; +import java.util.function.Predicate; + +public class HollerPanic extends AnimalPanic { + private final float speedMultiplier; + + public HollerPanic(float p_147385_) { + super(p_147385_); + this.speedMultiplier = p_147385_; + } + + @Override + protected void tick(ServerLevel level, PathfinderMob mob, long p_147405_) { + if (mob.getNavigation().isDone()) { + Vec3 $$3 = this.getPanicPos(level, mob); + if ($$3 != null) { + mob.getBrain().setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget($$3, speedMultiplier, 0)); + } + } + } + + private Vec3 getPanicPos(ServerLevel level, PathfinderMob mob) { + return LandRandomPos.getPosTowards(mob, 5, 4, mob.position().subtract(0, 10, 0)); + } +} diff --git a/src/main/java/galena/oreganized/data/OBlockStates.java b/src/main/java/galena/oreganized/data/OBlockStates.java index 3d026b83..3f535ee2 100644 --- a/src/main/java/galena/oreganized/data/OBlockStates.java +++ b/src/main/java/galena/oreganized/data/OBlockStates.java @@ -112,6 +112,8 @@ protected void registerStatesAndModels() { simpleBlock(OBlocks.GROOVED_PACKED_ICE); simpleBlock(OBlocks.GROOVED_BLUE_ICE); + simpleBlock(OBlocks.BURIAL_DIRT); + gargoyleBlock(OBlocks.GARGOYLE); } diff --git a/src/main/java/galena/oreganized/data/OItemModels.java b/src/main/java/galena/oreganized/data/OItemModels.java index d1dcd08e..1e4fae01 100644 --- a/src/main/java/galena/oreganized/data/OItemModels.java +++ b/src/main/java/galena/oreganized/data/OItemModels.java @@ -130,6 +130,8 @@ protected void registerModels() { block(OBlocks.GROOVED_PACKED_ICE); block(OBlocks.GROOVED_BLUE_ICE); + block(OBlocks.BURIAL_DIRT); + for (Supplier blocks : OBlocks.WAXED_CONRETE_POWDER) { withExistingParent(blockName(blocks), "minecraft:block/" + blockName(blocks).replace("waxed_", "")); } diff --git a/src/main/java/galena/oreganized/data/OLootTables.java b/src/main/java/galena/oreganized/data/OLootTables.java index 55074762..28f7c48d 100644 --- a/src/main/java/galena/oreganized/data/OLootTables.java +++ b/src/main/java/galena/oreganized/data/OLootTables.java @@ -112,6 +112,16 @@ protected void generate() { LootItem.lootTableItem(OBlocks.LEAD_BARS.get()) ))))); + add(OBlocks.BURIAL_DIRT.get(), LootTable.lootTable() + .withPool(LootPool.lootPool() + .setRolls(ConstantValue.exactly(1.0F)) + .add(AlternativesEntry.alternatives( + LootItem.lootTableItem(OBlocks.BURIAL_DIRT.get()) + .when(HAS_SILK_TOUCH), + LootItem.lootTableItem(Blocks.DIRT) + .when(HAS_NO_SILK_TOUCH) + )))); + //dropSelf(QCompatRegistry.GLANCE_PILLAR); //slab(QCompatRegistry.RAW_LEAD_BRICK_SLAB); //slab(QCompatRegistry.RAW_SILVER_BRICK_SLAB); @@ -157,7 +167,7 @@ public EntityLoot() { @Override public void generate() { - + add(OEntityTypes.HOLLER.get(), LootTable.lootTable()); } @Override diff --git a/src/main/java/galena/oreganized/data/provider/OBlockLootProvider.java b/src/main/java/galena/oreganized/data/provider/OBlockLootProvider.java index ad60f29e..ccd85bfd 100644 --- a/src/main/java/galena/oreganized/data/provider/OBlockLootProvider.java +++ b/src/main/java/galena/oreganized/data/provider/OBlockLootProvider.java @@ -37,6 +37,12 @@ public void dropAsSilk(Supplier block) { super.dropWhenSilkTouch(block.get()); } + public void dropOtherWithoutSilk(Supplier block, Supplier other) { + super.dropWhenSilkTouch(block.get()); + + super.otherWhenSilkTouch(block.get(), other.get()); + } + public void dropWithSilk(Supplier block, Supplier drop) { add(block.get(), (result) -> createSingleItemTableWithSilkTouch(result, drop.get())); } diff --git a/src/main/java/galena/oreganized/index/OBlocks.java b/src/main/java/galena/oreganized/index/OBlocks.java index af355640..00e916df 100644 --- a/src/main/java/galena/oreganized/index/OBlocks.java +++ b/src/main/java/galena/oreganized/index/OBlocks.java @@ -3,21 +3,7 @@ import com.google.common.collect.ImmutableBiMap; import com.teamabnormals.blueprint.core.util.registry.BlockSubRegistryHelper; import galena.oreganized.Oreganized; -import galena.oreganized.content.block.BulbBlock; -import galena.oreganized.content.block.CrystalGlassBlock; -import galena.oreganized.content.block.CrystalGlassPaneBlock; -import galena.oreganized.content.block.GargoyleBlock; -import galena.oreganized.content.block.IMeltableBlock; -import galena.oreganized.content.block.LeadBarsBlock; -import galena.oreganized.content.block.LeadDoorBlock; -import galena.oreganized.content.block.LeadOreBlock; -import galena.oreganized.content.block.LeadTrapdoorBlock; -import galena.oreganized.content.block.MeltableBlock; -import galena.oreganized.content.block.MeltablePillarBlock; -import galena.oreganized.content.block.MoltenLeadBlock; -import galena.oreganized.content.block.MoltenLeadCauldronBlock; -import galena.oreganized.content.block.ShrapnelBombBlock; -import galena.oreganized.content.block.SpottedGlanceBlock; +import galena.oreganized.content.block.*; import net.minecraft.sounds.SoundEvents; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.DoubleHighBlockItem; @@ -137,6 +123,8 @@ private static BlockBehaviour.Properties leadDecoProperties() { public static final RegistryObject GROOVED_PACKED_ICE = register("grooved_packed_ice", () -> new Block(BlockBehaviour.Properties.copy(Blocks.PACKED_ICE).friction(0.6F))); public static final RegistryObject GROOVED_BLUE_ICE = register("grooved_blue_ice", () -> new Block(BlockBehaviour.Properties.copy(Blocks.BLUE_ICE).friction(0.6F))); + public static final RegistryObject BURIAL_DIRT = register("burial_dirt", () -> new BurialDirtBlock(BlockBehaviour.Properties.copy(Blocks.DIRT))); + public static final List> CRYSTAL_GLASS = List.of( WHITE_CRYSTAL_GLASS, ORANGE_CRYSTAL_GLASS, MAGENTA_CRYSTAL_GLASS, LIGHT_BLUE_CRYSTAL_GLASS, YELLOW_CRYSTAL_GLASS, LIME_CRYSTAL_GLASS, PINK_CRYSTAL_GLASS, GRAY_CRYSTAL_GLASS, LIGHT_GRAY_CRYSTAL_GLASS, diff --git a/src/main/java/galena/oreganized/index/OEntityTypes.java b/src/main/java/galena/oreganized/index/OEntityTypes.java index 0e59d51d..a65e7303 100644 --- a/src/main/java/galena/oreganized/index/OEntityTypes.java +++ b/src/main/java/galena/oreganized/index/OEntityTypes.java @@ -1,6 +1,7 @@ package galena.oreganized.index; import galena.oreganized.Oreganized; +import galena.oreganized.content.entity.holler.Holler; import galena.oreganized.content.entity.LeadBoltEntity; import galena.oreganized.content.entity.MinecartShrapnelBomb; import galena.oreganized.content.entity.ShrapnelBomb; @@ -18,4 +19,6 @@ public class OEntityTypes { public static final RegistryObject> SHRAPNEL_BOMB_MINECART = ENTITIES.register("shrapnel_bomb_minecart", () -> EntityType.Builder.of(MinecartShrapnelBomb::new, MobCategory.MISC).sized(0.98F, 0.7F).clientTrackingRange(8).build("shrapnel_bomb_minecart")); public static final RegistryObject> LEAD_BOLT = ENTITIES.register("lead_bolt", () -> EntityType.Builder.of(LeadBoltEntity::new, MobCategory.MISC).sized(0.5F, 0.5F).clientTrackingRange(4).updateInterval(20).build("lead_bolt")); + public static final RegistryObject> HOLLER = ENTITIES.register("holler", () -> EntityType.Builder.of(Holler::new, MobCategory.CREATURE).sized(0.35F, 0.6F).clientTrackingRange(8).updateInterval(2).build("holler")); + } diff --git a/src/main/java/galena/oreganized/index/OItems.java b/src/main/java/galena/oreganized/index/OItems.java index b2cc6856..59310568 100644 --- a/src/main/java/galena/oreganized/index/OItems.java +++ b/src/main/java/galena/oreganized/index/OItems.java @@ -13,18 +13,7 @@ import galena.oreganized.content.item.ScribeItem; import galena.oreganized.content.item.SilverMirrorItem; import net.minecraft.world.entity.vehicle.AbstractMinecart; -import net.minecraft.world.item.ArmorItem; -import net.minecraft.world.item.AxeItem; -import net.minecraft.world.item.BucketItem; -import net.minecraft.world.item.HoeItem; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.PickaxeItem; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.RecordItem; -import net.minecraft.world.item.ShieldItem; -import net.minecraft.world.item.ShovelItem; -import net.minecraft.world.item.SwordItem; +import net.minecraft.world.item.*; import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.RegistryObject; @@ -97,4 +86,8 @@ public static Supplier compat(String modid, Function SHRAPNEL_BOMB_MINECART = HELPER.createItem("shrapnel_bomb_minecart", () -> new MinecartShrapnelBombItem(AbstractMinecart.Type.TNT, OEntityTypes.SHRAPNEL_BOMB_MINECART)); + + // Misc +// public static final RegistryObject HOLLER_SPAWN_EGG = HELPER.createItem("holler_spawn_egg", +// () -> new SpawnEggItem(OEntityTypes.HOLLER.get(), 56063, 44543, new Item.Properties())); } \ No newline at end of file diff --git a/src/main/resources/data/oreganized/forge/biome_modifier/spawn_holler.json b/src/main/resources/data/oreganized/forge/biome_modifier/spawn_holler.json new file mode 100644 index 00000000..9f69fda9 --- /dev/null +++ b/src/main/resources/data/oreganized/forge/biome_modifier/spawn_holler.json @@ -0,0 +1,10 @@ +{ + "type": "forge:add_spawns", + "biomes": "#minecraft:is_overworld", + "spawners": { + "type": "oreganized:holler", + "weight": 100, + "minCount": 1, + "maxCount": 2 + } +} \ No newline at end of file From 4eae9863b1da1cab8c1bfc08efc3561a24e23c43 Mon Sep 17 00:00:00 2001 From: Tazer Date: Sun, 20 Oct 2024 23:34:35 +0300 Subject: [PATCH 2/3] almost done with the big (well actually small) H --- .../oreganized/client/OreganizedClient.java | 39 ++++++++ .../oreganized/client/model/HollerModel.java | 3 +- .../oreganized/content/effect/FogEffect.java | 20 ++++ .../content/entity/holler/Holler.java | 87 +++++++++++------- .../content/entity/holler/HollerAi.java | 2 +- .../content/entity/holler/HollerPanic.java | 22 ++++- .../galena/oreganized/index/OEffects.java | 3 + .../oreganized/textures/entity/holler.png | Bin 851 -> 905 bytes .../forge/biome_modifier/spawn_holler.json | 2 +- 9 files changed, 137 insertions(+), 41 deletions(-) create mode 100644 src/main/java/galena/oreganized/content/effect/FogEffect.java diff --git a/src/main/java/galena/oreganized/client/OreganizedClient.java b/src/main/java/galena/oreganized/client/OreganizedClient.java index e7c50dd7..55ae56d7 100644 --- a/src/main/java/galena/oreganized/client/OreganizedClient.java +++ b/src/main/java/galena/oreganized/client/OreganizedClient.java @@ -9,12 +9,14 @@ import galena.oreganized.client.render.entity.ShrapnelBombRender; import galena.oreganized.client.render.gui.StunningOverlay; import galena.oreganized.index.OBlocks; +import galena.oreganized.index.OEffects; import galena.oreganized.index.OEntityTypes; import galena.oreganized.index.OItems; import galena.oreganized.world.IDoorProgressHolder; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.model.geom.ModelPart; +import net.minecraft.client.renderer.FogRenderer; import net.minecraft.client.renderer.ItemBlockRenderTypes; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; @@ -22,8 +24,12 @@ import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.Mth; import net.minecraft.world.InteractionHand; +import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.HumanoidArm; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.CrossbowItem; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; @@ -31,8 +37,10 @@ import net.minecraftforge.client.event.EntityRenderersEvent; import net.minecraftforge.client.event.RegisterGuiOverlaysEvent; import net.minecraftforge.client.event.RenderHandEvent; +import net.minecraftforge.client.event.ViewportEvent; import net.minecraftforge.client.gui.overlay.VanillaGuiOverlay; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.TickEvent; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @@ -117,6 +125,37 @@ public static void renderThirdPersonArm(ModelPart arm, boolean rightArm) { @Mod.EventBusSubscriber(modid = Oreganized.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.FORGE) public static class ForgeBusEvents { + public static MobEffectInstance fogEffect; + private static int timer = 0; + + @SubscribeEvent + public static void clientTick(TickEvent.ClientTickEvent event) { + if (!(Minecraft.getInstance().gameRenderer.getMainCamera().getEntity() instanceof Player player)) return; + fogEffect = player.getEffect(OEffects.FOG.get()); + } + + @SubscribeEvent + public static void fogEffectFog(ViewportEvent.RenderFog event) { + if (fogEffect != null && fogEffect.getFactorData().isPresent()) { + LivingEntity entity = (LivingEntity) Minecraft.getInstance().gameRenderer.getMainCamera().getEntity(); + float f = Mth.lerp(fogEffect.getFactorData().get().getFactor(entity, (float) event.getPartialTick()), event.getFarPlaneDistance(), 25.0F); + event.setNearPlaneDistance(event.getMode() == FogRenderer.FogMode.FOG_SKY ? -2F : f * -0.5F); + event.setFarPlaneDistance(f); + event.setCanceled(true); + } + } + + @SubscribeEvent + public static void fogEffectColor(ViewportEvent.ComputeFogColor event) { + if (fogEffect != null) { + LivingEntity entity = (LivingEntity) Minecraft.getInstance().gameRenderer.getMainCamera().getEntity(); + float color = fogEffect.getFactorData().isPresent() ? 1.2F - (fogEffect.getFactorData().get()).getFactor(entity, (float) event.getPartialTick()) : 0.0F; + event.setRed(event.getRed()*color); + event.setGreen(event.getGreen()*color); + event.setBlue(event.getBlue()*color); + } + } + @SubscribeEvent public static void addTooltips(ItemTooltipEvent event) { if (event.getItemStack().is(OItems.BUSH_HAMMER.get())) { diff --git a/src/main/java/galena/oreganized/client/model/HollerModel.java b/src/main/java/galena/oreganized/client/model/HollerModel.java index 407afb85..d1912d04 100644 --- a/src/main/java/galena/oreganized/client/model/HollerModel.java +++ b/src/main/java/galena/oreganized/client/model/HollerModel.java @@ -28,6 +28,7 @@ public static LayerDefinition createBodyLayer() { PartDefinition partdefinition = meshdefinition.getRoot(); PartDefinition head = partdefinition.addOrReplaceChild("head", CubeListBuilder.create().texOffs(0, 0).addBox(-2.5F, -5, -2.5F, 5, 5, 5) + .texOffs(10, 28).addBox(-1.5F, 0, -2.5F, 3, 2, 2) .texOffs(12, 16).addBox(-2.5F, -5, -2.5F, 5, 5, 5, new CubeDeformation(0.5F)), PartPose.offset(0, 18, 0)); PartDefinition body = partdefinition.addOrReplaceChild("body", CubeListBuilder.create().texOffs(0, 10).addBox(-1.5F, 0, -1, 3, 4, 2) @@ -41,7 +42,7 @@ public static LayerDefinition createBodyLayer() { PartDefinition left_arm = partdefinition.addOrReplaceChild("left_arm", CubeListBuilder.create().texOffs(22, 26).addBox(-6.25F, -0.5F, 0.9F, 5, 6, 0) .texOffs(22, 26).addBox(-4.25F, -0.5F, -0.9F, 5, 6, 0) .texOffs(22, 8).addBox(-1.25F, -0.5F, -1, 2, 6, 2), PartPose.offsetAndRotation(1.75F, 18.5F, 0, 0, 0, -1.5708F)); - + return LayerDefinition.create(meshdefinition, 32, 32); } diff --git a/src/main/java/galena/oreganized/content/effect/FogEffect.java b/src/main/java/galena/oreganized/content/effect/FogEffect.java new file mode 100644 index 00000000..d9e114b0 --- /dev/null +++ b/src/main/java/galena/oreganized/content/effect/FogEffect.java @@ -0,0 +1,20 @@ +package galena.oreganized.content.effect; + +import net.minecraft.world.effect.MobEffect; +import net.minecraft.world.effect.MobEffectCategory; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.entity.LivingEntity; + +import java.util.function.Supplier; + +public class FogEffect extends MobEffect { + public FogEffect() { + super(MobEffectCategory.NEUTRAL, 2696993); + this.setFactorDataFactory(() -> new MobEffectInstance.FactorData(22)); + } + + @Override + public void applyEffectTick(LivingEntity entity, int amplifier) { + + } +} diff --git a/src/main/java/galena/oreganized/content/entity/holler/Holler.java b/src/main/java/galena/oreganized/content/entity/holler/Holler.java index eb49163b..8914962a 100644 --- a/src/main/java/galena/oreganized/content/entity/holler/Holler.java +++ b/src/main/java/galena/oreganized/content/entity/holler/Holler.java @@ -3,14 +3,19 @@ import com.google.common.collect.ImmutableList; import com.mojang.serialization.Dynamic; import galena.oreganized.index.OBlocks; +import galena.oreganized.index.OEffects; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.network.protocol.game.DebugPackets; import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; import net.minecraft.util.RandomSource; import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.effect.MobEffectUtil; +import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.*; import net.minecraft.world.entity.ai.Brain; import net.minecraft.world.entity.ai.attributes.AttributeSupplier; @@ -24,10 +29,12 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.LightLayer; +import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.SnowyDirtBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; +import javax.annotation.Nullable; import java.time.LocalDate; import java.time.temporal.ChronoField; @@ -53,7 +60,7 @@ public class Holler extends PathfinderMob { public Holler(EntityType entityType, Level level) { super(entityType, level); - this.moveControl = new FlyingMoveControl(this, 20, true); + moveControl = new FlyingMoveControl(this, 20, true); } protected Brain.Provider brainProvider() { @@ -61,7 +68,7 @@ protected Brain.Provider brainProvider() { } protected Brain makeBrain(Dynamic p_218344_) { - return HollerAi.makeBrain(this.brainProvider().makeBrain(p_218344_)); + return HollerAi.makeBrain(brainProvider().makeBrain(p_218344_)); } @Override @@ -76,20 +83,28 @@ public boolean removeWhenFarAway(double p_21542_) { @Override protected void customServerAiStep() { - this.level().getProfiler().push("hollerBrain"); - this.getBrain().tick((ServerLevel)this.level(), this); - this.level().getProfiler().pop(); - this.level().getProfiler().push("hollerActivityUpdate"); + level().getProfiler().push("hollerBrain"); + getBrain().tick((ServerLevel)level(), this); + level().getProfiler().pop(); + level().getProfiler().push("hollerActivityUpdate"); HollerAi.updateActivity(this); - this.level().getProfiler().pop(); + level().getProfiler().pop(); super.customServerAiStep(); + if ((tickCount + getId()) % 120 == 0) { + applyFogAround((ServerLevel) level(), position(), this, 20); + } + } + + public static void applyFogAround(ServerLevel level, Vec3 pos, @Nullable Entity source, int radius) { + MobEffectInstance mobeffectinstance = new MobEffectInstance(OEffects.FOG.get(), 260, 0, false, false); + MobEffectUtil.addEffectToPlayersAround(level, source, pos, radius, mobeffectinstance, 200); } @Override public void aiStep() { super.aiStep(); - if (!this.level().isClientSide && this.isAlive() && this.tickCount % 10 == 0) { - this.heal(1.0F); + if (!level().isClientSide && isAlive() && tickCount % 10 == 0) { + heal(1.0F); } } @@ -101,10 +116,10 @@ protected void sendDebugPackets() { @Override public void tick() { - this.noPhysics = true; + noPhysics = true; super.tick(); - this.noPhysics = false; - this.setNoGravity(true); + noPhysics = false; + setNoGravity(true); } public static AttributeSupplier.Builder createAttributes() { @@ -127,24 +142,24 @@ protected PathNavigation createNavigation(Level level) { @Override public void travel(Vec3 vec3) { - if (this.isControlledByLocalInstance()) { - if (this.isInWater()) { - this.moveRelative(0.02F, vec3); - this.move(MoverType.SELF, this.getDeltaMovement()); - this.setDeltaMovement(this.getDeltaMovement().scale(0.800000011920929)); - } else if (this.isInLava()) { - this.moveRelative(0.02F, vec3); - this.move(MoverType.SELF, this.getDeltaMovement()); - this.setDeltaMovement(this.getDeltaMovement().scale(0.5)); + if (isControlledByLocalInstance()) { + if (isInWater()) { + moveRelative(0.02F, vec3); + move(MoverType.SELF, getDeltaMovement()); + setDeltaMovement(getDeltaMovement().scale(0.800000011920929)); + } else if (isInLava()) { + moveRelative(0.02F, vec3); + move(MoverType.SELF, getDeltaMovement()); + setDeltaMovement(getDeltaMovement().scale(0.5)); } else { - this.moveRelative(this.getSpeed(), vec3); - this.move(MoverType.SELF, this.getDeltaMovement()); - this.setDeltaMovement(this.getDeltaMovement().scale(0.9100000262260437)); + moveRelative(getSpeed(), vec3); + move(MoverType.SELF, getDeltaMovement()); + setDeltaMovement(getDeltaMovement().scale(0.9100000262260437)); } } - this.calculateEntityAnimation(false); - this.tryCheckInsideBlocks(); + calculateEntityAnimation(false); + tryCheckInsideBlocks(); } @Override @@ -177,18 +192,24 @@ protected float getSoundVolume() { @Override protected void onInsideBlock(BlockState state) { - if (!state.isAir() && isPanicking()) { + if ((state.getBlock() instanceof SnowyDirtBlock || state.is(Blocks.DIRT)) && isPanicking()) { BlockPos.withinManhattan(blockPosition(), 3, 1, 3).forEach(pos -> { if (level().getBlockState(pos).getBlock() instanceof SnowyDirtBlock && level().random.nextFloat() < 0.25) level().setBlockAndUpdate(pos, OBlocks.BURIAL_DIRT.get().withPropertiesOf(state)); - if (level().isClientSide) level().addParticle(ParticleTypes.SMOKE, pos.getX(), pos.getY()+1.5, pos.getZ(), 0, 0, 0); + double x = getX()+0.5+random.nextInt(-100, 100)*0.01; + double y = getY()+1+random.nextInt(-100, 100)*0.01; + double z = getZ()+0.5+random.nextInt(-100, 100)*0.01; + if (!level().isClientSide) ((ServerLevel) level()).sendParticles(ParticleTypes.SMOKE, x, y, z, 3, 0, 0, 0, 0); }); - if (level().isClientSide) { - // level().playSound(this, SoundEvents.IT); - level().addParticle(ParticleTypes.SMOKE, getX(), getY(), getZ(), 0, 0, 0); + if (!level().isClientSide) { + ServerLevel level = (ServerLevel) level(); + double x = getX()+0.5+random.nextInt(-100, 100)*0.01; + double y = getY()+random.nextInt(-100, 100)*0.01; + double z = getZ()+0.5+random.nextInt(-100, 100)*0.01; + level.sendParticles(ParticleTypes.SMOKE, x, y, z, 3, 0, 0, 0, 0); } - this.remove(RemovalReason.KILLED); + remove(RemovalReason.KILLED); } } @@ -197,7 +218,7 @@ public static boolean checkHollerSpawnRules(EntityType entityType, Level } public boolean isPanicking() { - return this.brain.getMemory(MemoryModuleType.IS_PANICKING).isPresent(); + return brain.getMemory(MemoryModuleType.IS_PANICKING).isPresent(); } private static boolean isHalloween() { diff --git a/src/main/java/galena/oreganized/content/entity/holler/HollerAi.java b/src/main/java/galena/oreganized/content/entity/holler/HollerAi.java index f7d367f4..d502d503 100644 --- a/src/main/java/galena/oreganized/content/entity/holler/HollerAi.java +++ b/src/main/java/galena/oreganized/content/entity/holler/HollerAi.java @@ -23,7 +23,7 @@ protected static Brain makeBrain(Brain hollerBrain) { } private static void initCoreActivity(Brain hollerBrain) { - hollerBrain.addActivity(Activity.CORE, 0, ImmutableList.of(new Swim(0.8F), new AnimalPanic(3F), new LookAtTargetSink(45, 90), new MoveToTargetSink())); + hollerBrain.addActivity(Activity.CORE, 0, ImmutableList.of(new Swim(0.8F), new HollerPanic(3F), new LookAtTargetSink(45, 90), new MoveToTargetSink())); } private static void initIdleActivity(Brain hollerBrain) { diff --git a/src/main/java/galena/oreganized/content/entity/holler/HollerPanic.java b/src/main/java/galena/oreganized/content/entity/holler/HollerPanic.java index b7dfa342..f482af85 100644 --- a/src/main/java/galena/oreganized/content/entity/holler/HollerPanic.java +++ b/src/main/java/galena/oreganized/content/entity/holler/HollerPanic.java @@ -2,11 +2,16 @@ import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; +import net.minecraft.tags.FluidTags; +import net.minecraft.util.Mth; import net.minecraft.world.entity.PathfinderMob; import net.minecraft.world.entity.ai.behavior.AnimalPanic; import net.minecraft.world.entity.ai.memory.MemoryModuleType; import net.minecraft.world.entity.ai.memory.WalkTarget; import net.minecraft.world.entity.ai.util.LandRandomPos; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.SnowyDirtBlock; import net.minecraft.world.phys.Vec3; import java.util.Optional; @@ -23,14 +28,21 @@ public HollerPanic(float p_147385_) { @Override protected void tick(ServerLevel level, PathfinderMob mob, long p_147405_) { if (mob.getNavigation().isDone()) { - Vec3 $$3 = this.getPanicPos(level, mob); - if ($$3 != null) { - mob.getBrain().setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget($$3, speedMultiplier, 0)); + Vec3 panicPosition = this.getPanicPos(level, (Holler) mob); + if (panicPosition != null) { + mob.getBrain().setMemory(MemoryModuleType.WALK_TARGET, new WalkTarget(panicPosition, speedMultiplier, 0)); } } } - private Vec3 getPanicPos(ServerLevel level, PathfinderMob mob) { - return LandRandomPos.getPosTowards(mob, 5, 4, mob.position().subtract(0, 10, 0)); + private Vec3 getPanicPos(ServerLevel level, Holler holler) { + Optional dirtPosition = lookForDirt(level, holler).map(Vec3::atBottomCenterOf); + return dirtPosition.orElseGet(() -> LandRandomPos.getPos(holler, 5, 5)); + } + + private Optional lookForDirt(BlockGetter blockGetter, Holler holler) { + BlockPos hollerPos = holler.blockPosition(); + Predicate isDirtBlock = (pos) -> (blockGetter.getBlockState(pos).getBlock() instanceof SnowyDirtBlock || blockGetter.getBlockState(pos).is(Blocks.DIRT)); + return BlockPos.findClosestMatch(hollerPos, 10, 10, isDirtBlock); } } diff --git a/src/main/java/galena/oreganized/index/OEffects.java b/src/main/java/galena/oreganized/index/OEffects.java index d95eceb5..f1a46467 100644 --- a/src/main/java/galena/oreganized/index/OEffects.java +++ b/src/main/java/galena/oreganized/index/OEffects.java @@ -1,6 +1,7 @@ package galena.oreganized.index; import galena.oreganized.Oreganized; +import galena.oreganized.content.effect.FogEffect; import galena.oreganized.content.effect.StunningEffect; import net.minecraft.world.effect.MobEffect; import net.minecraftforge.registries.DeferredRegister; @@ -12,4 +13,6 @@ public class OEffects { public static final DeferredRegister EFFECTS = DeferredRegister.create(ForgeRegistries.MOB_EFFECTS, Oreganized.MOD_ID); public static final RegistryObject STUNNING = EFFECTS.register("stunning", StunningEffect::new); + public static final RegistryObject FOG = EFFECTS.register("fog", FogEffect::new); + } diff --git a/src/main/resources/assets/oreganized/textures/entity/holler.png b/src/main/resources/assets/oreganized/textures/entity/holler.png index 0f08716ba4286d0b2a78654eed7e87104d7a27fc..5637861e39300b6d31008f51b525c85791b6388b 100644 GIT binary patch delta 845 zcmV-T1G4jQgi+`S{roj6&K{3GjtHwtOL3!I#9Vbfmgo!wh5k`+MUJX<(l0M_iqbDciFsLs`h0?)V zIYa0beyF^0kkR+gUxnqd+fubkfmO)2BjdS(rJ|&T_1ink#eFh(@yW(Yp!;P^>P=9QC-(~fOFPpq4;Ce z7e!LCD}RGyi&xD1HlAI$RXkC=DHD6d^!>jG_?$x8pN2WW(<6^@KHD_ zAQcaVm5u@WeT@LO3H(~d%mMNxSwUN8@-6EY4>3S!aC%lNbibR`#2fek%aO#~PqS5huTpewnE>SK&KbQ%X@wGR~* zDYc=$8~Ey>3AC607!zYJp`rj@sf5BP>B&V@dosoxI-Rc}r<9?4b7#Z#@2|&-N%;SM zb4GQgHZtlC$0E>%jFpV1C<@>spwovC!XKl_AOb) zDP}du5onC_J88h{mz^wlqZ05UlJ^$ z-w3$I{+ViW^J3^}$p+AIYNYKUVCVQvE?-!8SkTK)KiU6s^@R$9d;pphNZUhz?EHQE z)k&lJL^%b)X~((A7=JxLwUTmv&AKB~0wUcshTYJS*{H39iG%C|fcyaG0QS%8tF&w6 zfC~g^RF4uS{eJ-SKZw( z_V;L@Ngp2GArE?okA19nKln4MSyuNa)Gaegy{lJhHu78i|;e7p?hC?T%R97JJ8tMRT zJV;wW`H`NG2GvD_NENM6ALN5FlJPXe4d!k^%&l%Y+RaI600H& Date: Fri, 25 Oct 2024 12:56:54 +0200 Subject: [PATCH 3/3] combine vigil candle hitboxes --- .../content/block/VigilCandleBlock.java | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java b/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java index 6ee3146a..d804b224 100644 --- a/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java +++ b/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java @@ -23,7 +23,6 @@ import net.minecraft.world.level.material.Fluids; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; -import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import org.jetbrains.annotations.Nullable; @@ -44,21 +43,9 @@ private static VoxelShape shape(double x, double y, double z) { private static VoxelShape[] createShapes(boolean hanging) { return new VoxelShape[]{ shape(5, hanging ? 2 : 0, 5), - Shapes.or( - shape(6 + (hanging ? 0 : 1), hanging ? 2 : 0, 1), - shape(3, 0, 9) - ), - Shapes.or( - shape(1, 0, 2 + (hanging ? 2 : 0)), - shape(9, hanging ? 2 : 0, 1), - shape(7 + (hanging ? 2 : 0), hanging ? 4 : 0, 9) - ), - Shapes.or( - shape(1, hanging ? 4 : 0, 1), - shape(9, 0, 1), - shape(1, 0, 9), - shape(9, hanging ? 2 : 0, 9) - ) + Block.box(3, 0, 1, hanging ? 12 : 13, hanging ? 12 : 10, 15), + Block.box(1, 0, 1, 15, hanging ? 14 : 10, 15), + Block.box(1, 0, 1, 15, hanging ? 14 : 10, 15) }; } @@ -94,8 +81,7 @@ public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, Co var candles = state.getValue(CANDLES); var hanging = state.getValue(HANGING); var index = candles - 1; - return createShapes(hanging)[index]; - //return (handing ? HANGING_SHAPES : SHAPES)[index]; + return (hanging ? HANGING_SHAPES : SHAPES)[index]; } @Override