diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 2b3ccbc27..76e8cc790 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -6,6 +6,7 @@ a891d5abbc133288a9ad377b3ea9adad8ee92972 assets/create/blockstates/andesite_allo 951d67fc41af364e333babf649e1a04beea6226a assets/create/blockstates/andesite_bars.json f08653e3772bee4a5b280caa9dabf6d56f7cabad assets/create/blockstates/andesite_belt_funnel.json 9999a75c7766781eadb12510a09264600bc846e4 assets/create/blockstates/andesite_casing.json +daa19ecc22c8f5999da08a9a71e8b1680c76a833 assets/create/blockstates/andesite_door.json 96bd534d3d84336927fb6512f9848d837d557084 assets/create/blockstates/andesite_encased_cogwheel.json 1673172100317477ca559c32fd91d16b165e0085 assets/create/blockstates/andesite_encased_large_cogwheel.json 9639b901ffdd2ecccab5575c5c9e6c7b5c901e02 assets/create/blockstates/andesite_encased_shaft.json @@ -35,6 +36,7 @@ f3697a7d105e5d271f5999b86df071fe5893457c assets/create/blockstates/blue_valve_ha e7368157defc81f6fd72831f3464ec666cf885f8 assets/create/blockstates/brass_belt_funnel.json 8b1dd00adcc7e74c5a9feed069e2610b15a338cb assets/create/blockstates/brass_block.json b8dd6e505943e06706d0718ece620ab3cf943650 assets/create/blockstates/brass_casing.json +171f5dddd9548bd957608961468597044ccd28f0 assets/create/blockstates/brass_door.json 577adb030af119fb980ededaa7fc2a3d3ed14220 assets/create/blockstates/brass_encased_cogwheel.json e69a71fdeb5855b2a59a31598f25eaea589c1748 assets/create/blockstates/brass_encased_large_cogwheel.json 288bad07593a8a2c8efaf44bba0ffb0011d36cd3 assets/create/blockstates/brass_encased_shaft.json @@ -62,6 +64,7 @@ e4efa0811219796fedb9277151a4d99831688914 assets/create/blockstates/content_obser 961b615124ea9a5a5735e8a79f81a702de7da2cf assets/create/blockstates/copper_backtank.json 977c993fbcebf7d321eaa6840f179f6c9a155148 assets/create/blockstates/copper_bars.json cabf6b8c59eb0e3d56a0a5a856ca058bb3200882 assets/create/blockstates/copper_casing.json +d6e977867a57dec9b51cff331453721262ed8d70 assets/create/blockstates/copper_door.json a54d18937f8ce000f7ed0dc627d6d3414805006a assets/create/blockstates/copper_ladder.json 9d264bda40584003a183c386264117829279d21b assets/create/blockstates/copper_scaffolding.json b3d0dee8f6e14fa6c637e98cc1c6f1ea55b5f0d5 assets/create/blockstates/copper_shingle_slab.json @@ -578,8 +581,8 @@ bf2b0310500213ff853c748c236eb5d01f61658e assets/create/blockstates/yellow_toolbo 5616dda664dd106d576848124fc0fc1de18d0fd3 assets/create/blockstates/yellow_valve_handle.json 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json -b04b22fd6e7941c2b2559fbb4e28f31cf54657af assets/create/lang/en_ud.json -9489a13cafb96d2c968ea47185d12f959ccb4c02 assets/create/lang/en_us.json +fcaad84ac4ebdb1e6d9301b77245ce855dbde503 assets/create/lang/en_ud.json +988c876b2f101c2b02a27f00090d0d1348c01cc3 assets/create/lang/en_us.json 487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json 3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json @@ -1662,6 +1665,7 @@ e7759d9b3cd64d2719a58dc35fc75ca65b9e14fa assets/create/models/item/analog_lever. 2e7cf267efb66404721ac8bf08802de0eb134159 assets/create/models/item/andesite_alloy_block.json 946756a1a498ccd2e61b33ef317c5ec9e30afebf assets/create/models/item/andesite_bars.json 174c9705d25f149052835fdcf7c85626afead90b assets/create/models/item/andesite_casing.json +7d1c0a45c95fe70c677ffe14ed58bbdc82d4b1d9 assets/create/models/item/andesite_door.json 7d421377a50b4986626bedbd517aebe39a81247d assets/create/models/item/andesite_encased_cogwheel.json 1a18f605be05b9031f3a4bdbd3de8103b2783e0c assets/create/models/item/andesite_encased_large_cogwheel.json bc6e7469744604e578200ea87690e4dd3b25e447 assets/create/models/item/andesite_encased_shaft.json @@ -1690,6 +1694,7 @@ bec96ebf3369d3cffa9bb1b8bf9f2a5cd5d0ef96 assets/create/models/item/blue_valve_ha 5afa91abed387b3dfa39c39c7feae5f8f02a4bd9 assets/create/models/item/brass_bars.json 17d340c3678bd24cb085ba49490b2b4cb341a9e7 assets/create/models/item/brass_block.json f5a18f4279c2e845a5967b1c2f9e807c2bb77afb assets/create/models/item/brass_casing.json +e08cc6b277f9d29f84d9cfb9443a1f282c234533 assets/create/models/item/brass_door.json e462012b46bb628a17874abc75282849f6511211 assets/create/models/item/brass_encased_cogwheel.json 4c3e5e94a4c4027246f09c5a0c7ed6d020cde565 assets/create/models/item/brass_encased_large_cogwheel.json c723011e09203821b6b59cff9de22454c5e4395a assets/create/models/item/brass_encased_shaft.json @@ -1729,6 +1734,7 @@ bd476beac53d01a51d9690e6069de4033f02d6b8 assets/create/models/item/copper_bars.j 759bcb5fe7dfdd628716f9b4ff19a5ab00393381 assets/create/models/item/copper_casing.json 16182c4c32b11b370cf5b1116250cf3dda838954 assets/create/models/item/copper_diving_boots.json dc517e70cee9c5d74edfedd49ac43a67fe258c1b assets/create/models/item/copper_diving_helmet.json +986fe2c50bbdec434b7fb3615d57050ba9e59374 assets/create/models/item/copper_door.json 599845f2382da5b43a3c610f6ed7a87c032e1c6a assets/create/models/item/copper_ladder.json 751324b03f657f4166460eb10a64dae47cb97bd4 assets/create/models/item/copper_nugget.json b22b214f534b9f7308e958487e2d3270d4da16e4 assets/create/models/item/copper_scaffolding.json @@ -2416,15 +2422,9 @@ a8c72e7e02fd0843d33fa4c5d43de81f29bc3aa4 data/create/advancements/recipes/create 3e9753006da898d4569bbeabf95997e8c90847c8 data/create/advancements/recipes/create.base/crafting/kinetics/attribute_filter.json 08b21b30437a1c6e7ba61b137f17aabb6c24acab data/create/advancements/recipes/create.base/crafting/kinetics/basin.json de5160b4c1813b62ecc0c1955085da13f1c74d88 data/create/advancements/recipes/create.base/crafting/kinetics/belt_connector.json -80d87f1dde60adb5334e0cff25a9f0b7f67c1526 data/create/advancements/recipes/create.base/crafting/kinetics/black_seat.json -771e2fc2f3be2867f6d83af8030ed321c0b8ab8d data/create/advancements/recipes/create.base/crafting/kinetics/black_seat_from_other_seat.json 86d3e8ba30723ad87e32a589171a35ca907b5db9 data/create/advancements/recipes/create.base/crafting/kinetics/black_valve_handle_from_other_valve_handle.json -ffbe212a442084b0688bbee82ad71c482c9b032c data/create/advancements/recipes/create.base/crafting/kinetics/blue_seat.json -2cc2a11839ad826340fcc7bca1aa1a4d92953b96 data/create/advancements/recipes/create.base/crafting/kinetics/blue_seat_from_other_seat.json 17ffdf52575a3905a8b6372f749858604334c5f0 data/create/advancements/recipes/create.base/crafting/kinetics/blue_valve_handle_from_other_valve_handle.json 0a49cc7cb958c64de1dd35b0acd30070d6a0d81d data/create/advancements/recipes/create.base/crafting/kinetics/brass_hand.json -3d16de97e9821ea473d6fc8b22026cca9e9e172b data/create/advancements/recipes/create.base/crafting/kinetics/brown_seat.json -5a53f4229ce56608207d430c7f87ee44f8d41f6f data/create/advancements/recipes/create.base/crafting/kinetics/brown_seat_from_other_seat.json d12c6127aa397138d490ccfcf31148fb3754b7a6 data/create/advancements/recipes/create.base/crafting/kinetics/brown_valve_handle_from_other_valve_handle.json 94ad3db260f33ee255265d36d9b865f7dbc78c5f data/create/advancements/recipes/create.base/crafting/kinetics/cart_assembler.json bf3bcb52176b43f1886c7538705ca7a4f0e84a9e data/create/advancements/recipes/create.base/crafting/kinetics/chute.json @@ -2438,8 +2438,6 @@ c66893266dac69fdcc9ba6bae432e915678b0706 data/create/advancements/recipes/create cfcb1053b7311aeea03ee9caa66e783801ae74f3 data/create/advancements/recipes/create.base/crafting/kinetics/copper_valve_handle_from_others.json adb639c5e0c2b12c22c29af2218e450ebbe2e07a data/create/advancements/recipes/create.base/crafting/kinetics/crafter_slot_cover.json bb771079e7e814a2a7a854d48bbf270db16a420e data/create/advancements/recipes/create.base/crafting/kinetics/cuckoo_clock.json -44cf4c0a792e8742a030c82f92a529ade059b475 data/create/advancements/recipes/create.base/crafting/kinetics/cyan_seat.json -80dc8151d0b9dff01a8a2abf6b84057c9ef5b908 data/create/advancements/recipes/create.base/crafting/kinetics/cyan_seat_from_other_seat.json 2691122d20392bffa45a2b39c84555c90fe07e7d data/create/advancements/recipes/create.base/crafting/kinetics/cyan_valve_handle_from_other_valve_handle.json cd1a6ea80663ec9251bb13e27d90e6ccdd10ce3e data/create/advancements/recipes/create.base/crafting/kinetics/deployer.json 2c85a7080390156ce05985bbba840ad9ffbaed8f data/create/advancements/recipes/create.base/crafting/kinetics/depot.json @@ -2454,19 +2452,13 @@ f79cc141e2cfc8dde9f27b1e3b2e00aced8ee632 data/create/advancements/recipes/create 450a84018a6df61921e2c7eac507928e42d82b93 data/create/advancements/recipes/create.base/crafting/kinetics/fluid_tank.json 5b68a2e467e01d2255c448691ec5b4be20ac35c2 data/create/advancements/recipes/create.base/crafting/kinetics/fluid_valve.json 36f5f608cba7cb563a4c8bffc964cd4baa5c3997 data/create/advancements/recipes/create.base/crafting/kinetics/flywheel.json -842a332a966d80cc4680f91f376a2264ef3bb268 data/create/advancements/recipes/create.base/crafting/kinetics/framed_glass_door.json -61d73f42d67b73eb51c1da98f573279389ec3abf data/create/advancements/recipes/create.base/crafting/kinetics/framed_glass_trapdoor.json 4049cbeed4452bf6fe7608e06f4a4c90f58d6da0 data/create/advancements/recipes/create.base/crafting/kinetics/gantry_carriage.json 10529af8626e0d60d041aaebeadd4ac6a22cf061 data/create/advancements/recipes/create.base/crafting/kinetics/gantry_shaft.json 60beaa4f519b92eea28a4db11739313da9168beb data/create/advancements/recipes/create.base/crafting/kinetics/gearbox.json 710c5c73147a3a92841b823ed41d45faa0ffeb90 data/create/advancements/recipes/create.base/crafting/kinetics/gearboxfrom_conversion.json d5a9e092f1b591c648487454d10ce7bac208c7de data/create/advancements/recipes/create.base/crafting/kinetics/gearshift.json 0b465aeff26c469f525dbf92f2dfaa6d90eb5d76 data/create/advancements/recipes/create.base/crafting/kinetics/goggles.json -585378d03f5ae23e43a587468d183951e3fa58a9 data/create/advancements/recipes/create.base/crafting/kinetics/gray_seat.json -f0a0c371c6851a5418b4b9480797677c8e871372 data/create/advancements/recipes/create.base/crafting/kinetics/gray_seat_from_other_seat.json c023b9221d7983487d21e5ecc7d92246cfc7e791 data/create/advancements/recipes/create.base/crafting/kinetics/gray_valve_handle_from_other_valve_handle.json -72194ca0c9820e8b098534007df7f2b2d3813af6 data/create/advancements/recipes/create.base/crafting/kinetics/green_seat.json -2ba23f019a110a3e035a49e56ee8156fc11d74c0 data/create/advancements/recipes/create.base/crafting/kinetics/green_seat_from_other_seat.json 9af3d92d11c3f520df3e22f3069042bf34585010 data/create/advancements/recipes/create.base/crafting/kinetics/green_valve_handle_from_other_valve_handle.json f2dadb365c75dd2604ee96e0217cd8024d0d137d data/create/advancements/recipes/create.base/crafting/kinetics/hand_crank.json f4e8fd79cb27e0677460f5c260b106338f2a48cc data/create/advancements/recipes/create.base/crafting/kinetics/hose_pulley.json @@ -2475,19 +2467,11 @@ a9f2c8a0b0b322741575ef833a461006ef2f0421 data/create/advancements/recipes/create 73433a5cd400ed392796a4e543f15c42dd499fe8 data/create/advancements/recipes/create.base/crafting/kinetics/large_cogwheel.json dce186637ad5dacdbe352fb8a711df8e8687ccdc data/create/advancements/recipes/create.base/crafting/kinetics/large_cogwheel_from_little.json 5a1df5831fe5d2e2a6cbedcbc67216dd566e7fa0 data/create/advancements/recipes/create.base/crafting/kinetics/large_water_wheel.json -eb007bb079bbe6b6aaad2ca90f5af84261e3f8ea data/create/advancements/recipes/create.base/crafting/kinetics/light_blue_seat.json -571da50fbf5f2fcd3363b3dab91e7233e0ebffa0 data/create/advancements/recipes/create.base/crafting/kinetics/light_blue_seat_from_other_seat.json ddd80e84a7d595bbb3cf405a902ebbfd4ea5263c data/create/advancements/recipes/create.base/crafting/kinetics/light_blue_valve_handle_from_other_valve_handle.json -e72a9e36ee72b838d83dee29129085c9717bd1c0 data/create/advancements/recipes/create.base/crafting/kinetics/light_gray_seat.json -b670caaa6822ba7d9dc59ab4b6f21ab7d1ab2482 data/create/advancements/recipes/create.base/crafting/kinetics/light_gray_seat_from_other_seat.json ef79bf45e7aa43374d05a258ccb62a8243047fbb data/create/advancements/recipes/create.base/crafting/kinetics/light_gray_valve_handle_from_other_valve_handle.json -471b41b1beb16be7885b32e3ab5e37e835888ed3 data/create/advancements/recipes/create.base/crafting/kinetics/lime_seat.json -7621220bcda54b559156a5dfb047de3429f1d4d2 data/create/advancements/recipes/create.base/crafting/kinetics/lime_seat_from_other_seat.json 0ce3062d3094ac20cc191b37fe948b54afe1f939 data/create/advancements/recipes/create.base/crafting/kinetics/lime_valve_handle_from_other_valve_handle.json 7e9adf73981fe03b76c5e22c59ebfdb9408a665e data/create/advancements/recipes/create.base/crafting/kinetics/linear_chassis.json bcb507ccb27c297339634f8575842a27bbf1c10e data/create/advancements/recipes/create.base/crafting/kinetics/linear_chassisfrom_conversion.json -bf36904e7e691a150379561fb6f945123ebd3978 data/create/advancements/recipes/create.base/crafting/kinetics/magenta_seat.json -da90875fb845ee952ca2cb71f96b8de4f6420c21 data/create/advancements/recipes/create.base/crafting/kinetics/magenta_seat_from_other_seat.json 8ae8701f89b0881fbf9fcdf18b550e4bdf8d1483 data/create/advancements/recipes/create.base/crafting/kinetics/magenta_valve_handle_from_other_valve_handle.json 7de075574fa72f6cf5155490c306354474ec1efa data/create/advancements/recipes/create.base/crafting/kinetics/mechanical_arm.json 79684098e8677dcd3e0741fb56897ad89d18192d data/create/advancements/recipes/create.base/crafting/kinetics/mechanical_bearing.json @@ -2502,28 +2486,19 @@ ab3cb22e7cb2469c69a177ba83e29a2e1abdc3f8 data/create/advancements/recipes/create b0fabbe0b97cf7a56260af78cb29d21c55aafbe1 data/create/advancements/recipes/create.base/crafting/kinetics/mechanical_roller.json 40a87b7abbc22436efab546fad3910f4a945c5fc data/create/advancements/recipes/create.base/crafting/kinetics/mechanical_saw.json ed6f472a0de659074e384d20e6c5903bda543acc data/create/advancements/recipes/create.base/crafting/kinetics/metal_bracket.json -3072592260b044257cc53be8f023909394b6cfea data/create/advancements/recipes/create.base/crafting/kinetics/metal_girder.json 1c06cd141f9ec29fd78ca4010115074865aef335 data/create/advancements/recipes/create.base/crafting/kinetics/millstone.json 25839b28208552ffe2a7dc094679514b200a065c data/create/advancements/recipes/create.base/crafting/kinetics/mysterious_cuckoo_clock.json 59f300d33fb2a0be6cb07fefebc6a9d59fb2476b data/create/advancements/recipes/create.base/crafting/kinetics/nixie_tube.json e1390d3436bacda88c126fa6f6e349fa11852fbc data/create/advancements/recipes/create.base/crafting/kinetics/nozzle.json -ccd49c33260333ba850d0b843c4913cb6371eee9 data/create/advancements/recipes/create.base/crafting/kinetics/orange_seat.json -0556cca38a52f819e7f786ffbf284d5ef3364d0a data/create/advancements/recipes/create.base/crafting/kinetics/orange_seat_from_other_seat.json 58c0a2742e8f10e45a09cb97e40b542a58c7134b data/create/advancements/recipes/create.base/crafting/kinetics/orange_valve_handle_from_other_valve_handle.json -460240d4e8437b35c24262c5724884ae213e1b9c data/create/advancements/recipes/create.base/crafting/kinetics/pink_seat.json -ca21e2192a2fea0f112764f96c928d337762158b data/create/advancements/recipes/create.base/crafting/kinetics/pink_seat_from_other_seat.json 6c11444884679c4dd03d43f5893fca5cdc271915 data/create/advancements/recipes/create.base/crafting/kinetics/pink_valve_handle_from_other_valve_handle.json bb2250aa06cc87e8eb39dfde45c53f6f263be7e7 data/create/advancements/recipes/create.base/crafting/kinetics/piston_extension_pole.json 6cdb61c0f53ddfda3274cd6cdb598741ba482fcd data/create/advancements/recipes/create.base/crafting/kinetics/placard.json d1f5c8d73a700ad1022563e73844ea80f76d32b4 data/create/advancements/recipes/create.base/crafting/kinetics/portable_fluid_interface.json e43aa4b89f57ba643cd5b4885e8fd6abd8c514b3 data/create/advancements/recipes/create.base/crafting/kinetics/portable_storage_interface.json 02258b70f1db3d91f0ccb5a5ffd362349f8f359d data/create/advancements/recipes/create.base/crafting/kinetics/propeller.json -d2a430820a87c24104729eede57628c6a92b277e data/create/advancements/recipes/create.base/crafting/kinetics/purple_seat.json -8eb1319984a8bf9502d8fddb717b11a1ee082f39 data/create/advancements/recipes/create.base/crafting/kinetics/purple_seat_from_other_seat.json a295c929f7c9b31fd97607f8f6a1f8c56c16c7c8 data/create/advancements/recipes/create.base/crafting/kinetics/purple_valve_handle_from_other_valve_handle.json 03f1d8ece03d2090bdc807675d458b8f51a6ea0f data/create/advancements/recipes/create.base/crafting/kinetics/radial_chassis.json -f639481c8e1485019bf120463e67811b6d2d8ef9 data/create/advancements/recipes/create.base/crafting/kinetics/red_seat.json -038e18d0815e7de55fc8fcb5fe7127cdad62210f data/create/advancements/recipes/create.base/crafting/kinetics/red_seat_from_other_seat.json dba0696069fe0850120dc6e1ca1ab741b0fe6d21 data/create/advancements/recipes/create.base/crafting/kinetics/red_valve_handle_from_other_valve_handle.json 6aea000b80ac153ed6a027fff5ca0a1d55250d43 data/create/advancements/recipes/create.base/crafting/kinetics/rope_pulley.json 43c694f0058538dd14cb06dde267c96b0f34bdf0 data/create/advancements/recipes/create.base/crafting/kinetics/rose_quartz_lamp.json @@ -2548,8 +2523,6 @@ f3fc3d4fee0712906f833aa17185f0bacb21922f data/create/advancements/recipes/create e7df922cf9c6b39ee866d224d1812288073c7907 data/create/advancements/recipes/create.base/crafting/kinetics/track_observer_from_other_plates.json 23c1ecff946d41c74d4fb78e2bbc5e348c4487f5 data/create/advancements/recipes/create.base/crafting/kinetics/track_signal.json da30636ca7e77f2947d0d28542c0b99747c9939e data/create/advancements/recipes/create.base/crafting/kinetics/track_station.json -050b8c527083e624a01f38ea8b34771a19ed2bc5 data/create/advancements/recipes/create.base/crafting/kinetics/train_door.json -3b6779f388eaf07f3c18fec33713f41f39a0032d data/create/advancements/recipes/create.base/crafting/kinetics/train_trapdoor.json 9d7bbda05cebecc0922f4d344e9a51d4c2774a18 data/create/advancements/recipes/create.base/crafting/kinetics/turntable.json c1bb8d9022dff3dcf6c42f651b421281924c7dd2 data/create/advancements/recipes/create.base/crafting/kinetics/vertical_gearboxfrom_conversion.json a67713418e505fa68ecde6b8bc83c09ccced7a65 data/create/advancements/recipes/create.base/crafting/kinetics/water_wheel.json @@ -2557,14 +2530,10 @@ a67713418e505fa68ecde6b8bc83c09ccced7a65 data/create/advancements/recipes/create 7c146cc51139c2a8e287a60c8d645fa6f6f48cb1 data/create/advancements/recipes/create.base/crafting/kinetics/whisk.json 85c29c56780b4ee3e9c758dd4baa9a78e824cf5a data/create/advancements/recipes/create.base/crafting/kinetics/white_sail.json 8c1194d26957352943841ba6cf368157cb8dd0f7 data/create/advancements/recipes/create.base/crafting/kinetics/white_sailfrom_conversion.json -37e545b016a7c5cd283168ac71ace6467a5ad3ef data/create/advancements/recipes/create.base/crafting/kinetics/white_seat.json -856760c4b120f7b29a94dd22fe04d62df061d409 data/create/advancements/recipes/create.base/crafting/kinetics/white_seat_from_other_seat.json b73e6f8b89e6ef94167b6fa3d0837a27222edb01 data/create/advancements/recipes/create.base/crafting/kinetics/white_valve_handle_from_other_valve_handle.json 9ca9cf9b09753369ad10284579a48eefa06674eb data/create/advancements/recipes/create.base/crafting/kinetics/windmill_bearing.json 8f5b25390f53d9e2c2b7b8c37b7c46a2eb9f2ebb data/create/advancements/recipes/create.base/crafting/kinetics/wooden_bracket.json 99fe89639e2aea18b4a0461cc85f27a6c7c665bb data/create/advancements/recipes/create.base/crafting/kinetics/wrench.json -14c1cac4545f544a78bfd80cf7dd6355794c6679 data/create/advancements/recipes/create.base/crafting/kinetics/yellow_seat.json -e8c2001863d9819d2a2c1fddeda41a4f126a5c09 data/create/advancements/recipes/create.base/crafting/kinetics/yellow_seat_from_other_seat.json f05bbae1e39eabb51dffa0babecf07f5de2cee3d data/create/advancements/recipes/create.base/crafting/kinetics/yellow_valve_handle_from_other_valve_handle.json 0af26235bc51f73b0656d26a4232ae26419cee38 data/create/advancements/recipes/create.base/crafting/logistics/andesite_funnel.json 3443156df3d50b283be20d466797075064ddd59d data/create/advancements/recipes/create.base/crafting/logistics/andesite_tunnel.json @@ -2654,6 +2623,46 @@ abda25ed5695780b534412b4501e927ec3a6fe16 data/create/advancements/recipes/create 5a3e5b3285e44d543c55ab92510864f031f0ccf8 data/create/advancements/recipes/create.palettes/crafting/copper/waxed_weathered_copper_tile_slab_from_honeycomb.json 2e8b01267e308929961be0b1f268b34f5faa3aa3 data/create/advancements/recipes/create.palettes/crafting/copper/waxed_weathered_copper_tile_stairs_from_honeycomb.json 1ed6fd1f67443f5d6d955218dc45254db407d8ac data/create/advancements/recipes/create.palettes/crafting/copper/waxed_weathered_copper_tiles_from_honeycomb.json +14ae922a4ca2bb44befbd26870a5bb11afa477c2 data/create/advancements/recipes/create.palettes/crafting/kinetics/andesite_door.json +80d87f1dde60adb5334e0cff25a9f0b7f67c1526 data/create/advancements/recipes/create.palettes/crafting/kinetics/black_seat.json +771e2fc2f3be2867f6d83af8030ed321c0b8ab8d data/create/advancements/recipes/create.palettes/crafting/kinetics/black_seat_from_other_seat.json +ffbe212a442084b0688bbee82ad71c482c9b032c data/create/advancements/recipes/create.palettes/crafting/kinetics/blue_seat.json +2cc2a11839ad826340fcc7bca1aa1a4d92953b96 data/create/advancements/recipes/create.palettes/crafting/kinetics/blue_seat_from_other_seat.json +1d92a3fc5b57e2edc5bfa23fec18fc4bac6c1cdf data/create/advancements/recipes/create.palettes/crafting/kinetics/brass_door.json +3d16de97e9821ea473d6fc8b22026cca9e9e172b data/create/advancements/recipes/create.palettes/crafting/kinetics/brown_seat.json +5a53f4229ce56608207d430c7f87ee44f8d41f6f data/create/advancements/recipes/create.palettes/crafting/kinetics/brown_seat_from_other_seat.json +7d7c70c89c212217e9b8918ae24454359557dbf5 data/create/advancements/recipes/create.palettes/crafting/kinetics/copper_door.json +44cf4c0a792e8742a030c82f92a529ade059b475 data/create/advancements/recipes/create.palettes/crafting/kinetics/cyan_seat.json +80dc8151d0b9dff01a8a2abf6b84057c9ef5b908 data/create/advancements/recipes/create.palettes/crafting/kinetics/cyan_seat_from_other_seat.json +842a332a966d80cc4680f91f376a2264ef3bb268 data/create/advancements/recipes/create.palettes/crafting/kinetics/framed_glass_door.json +61d73f42d67b73eb51c1da98f573279389ec3abf data/create/advancements/recipes/create.palettes/crafting/kinetics/framed_glass_trapdoor.json +585378d03f5ae23e43a587468d183951e3fa58a9 data/create/advancements/recipes/create.palettes/crafting/kinetics/gray_seat.json +f0a0c371c6851a5418b4b9480797677c8e871372 data/create/advancements/recipes/create.palettes/crafting/kinetics/gray_seat_from_other_seat.json +72194ca0c9820e8b098534007df7f2b2d3813af6 data/create/advancements/recipes/create.palettes/crafting/kinetics/green_seat.json +2ba23f019a110a3e035a49e56ee8156fc11d74c0 data/create/advancements/recipes/create.palettes/crafting/kinetics/green_seat_from_other_seat.json +eb007bb079bbe6b6aaad2ca90f5af84261e3f8ea data/create/advancements/recipes/create.palettes/crafting/kinetics/light_blue_seat.json +571da50fbf5f2fcd3363b3dab91e7233e0ebffa0 data/create/advancements/recipes/create.palettes/crafting/kinetics/light_blue_seat_from_other_seat.json +e72a9e36ee72b838d83dee29129085c9717bd1c0 data/create/advancements/recipes/create.palettes/crafting/kinetics/light_gray_seat.json +b670caaa6822ba7d9dc59ab4b6f21ab7d1ab2482 data/create/advancements/recipes/create.palettes/crafting/kinetics/light_gray_seat_from_other_seat.json +471b41b1beb16be7885b32e3ab5e37e835888ed3 data/create/advancements/recipes/create.palettes/crafting/kinetics/lime_seat.json +7621220bcda54b559156a5dfb047de3429f1d4d2 data/create/advancements/recipes/create.palettes/crafting/kinetics/lime_seat_from_other_seat.json +bf36904e7e691a150379561fb6f945123ebd3978 data/create/advancements/recipes/create.palettes/crafting/kinetics/magenta_seat.json +da90875fb845ee952ca2cb71f96b8de4f6420c21 data/create/advancements/recipes/create.palettes/crafting/kinetics/magenta_seat_from_other_seat.json +3072592260b044257cc53be8f023909394b6cfea data/create/advancements/recipes/create.palettes/crafting/kinetics/metal_girder.json +ccd49c33260333ba850d0b843c4913cb6371eee9 data/create/advancements/recipes/create.palettes/crafting/kinetics/orange_seat.json +0556cca38a52f819e7f786ffbf284d5ef3364d0a data/create/advancements/recipes/create.palettes/crafting/kinetics/orange_seat_from_other_seat.json +460240d4e8437b35c24262c5724884ae213e1b9c data/create/advancements/recipes/create.palettes/crafting/kinetics/pink_seat.json +ca21e2192a2fea0f112764f96c928d337762158b data/create/advancements/recipes/create.palettes/crafting/kinetics/pink_seat_from_other_seat.json +d2a430820a87c24104729eede57628c6a92b277e data/create/advancements/recipes/create.palettes/crafting/kinetics/purple_seat.json +8eb1319984a8bf9502d8fddb717b11a1ee082f39 data/create/advancements/recipes/create.palettes/crafting/kinetics/purple_seat_from_other_seat.json +f639481c8e1485019bf120463e67811b6d2d8ef9 data/create/advancements/recipes/create.palettes/crafting/kinetics/red_seat.json +038e18d0815e7de55fc8fcb5fe7127cdad62210f data/create/advancements/recipes/create.palettes/crafting/kinetics/red_seat_from_other_seat.json +91961ef145c35b0e1e21c585faf1e7400c8e32cc data/create/advancements/recipes/create.palettes/crafting/kinetics/train_door.json +c8721a3c600b4211e7662e42bbaddb8e67ab8240 data/create/advancements/recipes/create.palettes/crafting/kinetics/train_trapdoor.json +37e545b016a7c5cd283168ac71ace6467a5ad3ef data/create/advancements/recipes/create.palettes/crafting/kinetics/white_seat.json +856760c4b120f7b29a94dd22fe04d62df061d409 data/create/advancements/recipes/create.palettes/crafting/kinetics/white_seat_from_other_seat.json +14c1cac4545f544a78bfd80cf7dd6355794c6679 data/create/advancements/recipes/create.palettes/crafting/kinetics/yellow_seat.json +e8c2001863d9819d2a2c1fddeda41a4f126a5c09 data/create/advancements/recipes/create.palettes/crafting/kinetics/yellow_seat_from_other_seat.json a0227781b6f28feb0cc6ec326eb2dcc4d489af1e data/create/advancements/recipes/create.palettes/crafting/materials/andesite_alloy_block.json a7d9a6dda3049332f04f4db027340070e1a9e597 data/create/advancements/recipes/create.palettes/crafting/materials/brass_block_from_compacting.json 433e9dae24a4167b2cbd23e37e59bc84cfe352e5 data/create/advancements/recipes/create.palettes/crafting/materials/raw_zinc_block.json @@ -3247,6 +3256,7 @@ a4716789704bb30cf1c518b04c61661ba6289efa data/create/loot_tables/blocks/analog_l bda9c999d5f4313fa1f22b3034a359f2d7947d64 data/create/loot_tables/blocks/andesite_bars.json 468759c042e8410da9230357f4b602766190df79 data/create/loot_tables/blocks/andesite_belt_funnel.json f9b768b3b9bbddede80912f1319e7b290cd90f20 data/create/loot_tables/blocks/andesite_casing.json +cd357c4aa31428afd9fb3cd69889341c28eac5b0 data/create/loot_tables/blocks/andesite_door.json 982a41e1bccd9a130a2874aff995d4f7da0f0316 data/create/loot_tables/blocks/andesite_encased_cogwheel.json a70fcfe474ba023adc9c326218c5664fbd7b58f8 data/create/loot_tables/blocks/andesite_encased_large_cogwheel.json 09907573ad2602251401bc53db0e389a45d6833c data/create/loot_tables/blocks/andesite_encased_shaft.json @@ -3276,6 +3286,7 @@ f5709ddd387ac4634244f5d002122fc4e62644e2 data/create/loot_tables/blocks/blue_val fae7b622f27b426b1d3e6f31cd0157aff672a42d data/create/loot_tables/blocks/brass_belt_funnel.json e8535a9acc565e8d80fa4c15f0ef6c4ffd842856 data/create/loot_tables/blocks/brass_block.json a2d433dcfe44c9a3c1b5dd16415a2f31edbe309d data/create/loot_tables/blocks/brass_casing.json +5d70910831513477959be0e2e50178f0c4ef7246 data/create/loot_tables/blocks/brass_door.json 982a41e1bccd9a130a2874aff995d4f7da0f0316 data/create/loot_tables/blocks/brass_encased_cogwheel.json a70fcfe474ba023adc9c326218c5664fbd7b58f8 data/create/loot_tables/blocks/brass_encased_large_cogwheel.json 09907573ad2602251401bc53db0e389a45d6833c data/create/loot_tables/blocks/brass_encased_shaft.json @@ -3302,6 +3313,7 @@ c2b075008849e152f20e8da946e89c9722325df6 data/create/loot_tables/blocks/content_ 3abf04f6132955275ad490668cd28f481afb4ec2 data/create/loot_tables/blocks/copper_backtank.json 6697e619d5c6dcb81aad4f5c88ba319d13665b35 data/create/loot_tables/blocks/copper_bars.json 8010db6b2427536c74312c85425b3ba83abc363c data/create/loot_tables/blocks/copper_casing.json +ea5fb942c8dfb792daac538e09d286ac120aa199 data/create/loot_tables/blocks/copper_door.json bb51540df81ea359cdc9d8a4d08ba6410ecd4919 data/create/loot_tables/blocks/copper_ladder.json ac80fa6b1d968ddab6c3bf187a99a4cf24f30710 data/create/loot_tables/blocks/copper_scaffolding.json 31b3e00f6ab3e593a0d6abd42961b3e5e03fc888 data/create/loot_tables/blocks/copper_shingle_slab.json @@ -3923,6 +3935,7 @@ ab875f89a22504f3d3fd6ee2aa004d5f0082f169 data/create/recipes/crafting/curiositie 07b3ca3a3e44ee1f76c69132ffa6556e027e5b0e data/create/recipes/crafting/curiosities/toolbox_dyeing.json 4e9630bad12e6879ae7357ce7c8d455dddded9a4 data/create/recipes/crafting/kinetics/adjustable_chain_gearshift.json 88de51b451469698665b7319e5b9cfb9a87ae3e0 data/create/recipes/crafting/kinetics/analog_lever.json +641cf5b273b33399339a1ba439344d9fa723cf70 data/create/recipes/crafting/kinetics/andesite_door.json cf1f3a6306d47025cebe153cf05949ef69ccbe5a data/create/recipes/crafting/kinetics/attribute_filter.json 059d12526529b2896ed583555373afa31839a0de data/create/recipes/crafting/kinetics/basin.json dcf98e667d321fb4bd9fa6dfec7927a84cdbd5d6 data/create/recipes/crafting/kinetics/belt_connector.json @@ -3932,6 +3945,7 @@ d02a23b12abe105660ae613e69979cc7e86bfbca data/create/recipes/crafting/kinetics/b 19cf1b77431fc50bee7c7adae51c5025b5f0b6bc data/create/recipes/crafting/kinetics/blue_seat.json 6e03e06a20832116a1daa1a2ebe781b9cb44cb0d data/create/recipes/crafting/kinetics/blue_seat_from_other_seat.json f7ed975f13585273832f12d9f28808e0215308af data/create/recipes/crafting/kinetics/blue_valve_handle_from_other_valve_handle.json +d71b34254b4ea9140002a405967cbb062fe8a60f data/create/recipes/crafting/kinetics/brass_door.json 23fe800a45e81a08eb0aa732c5cb52e4e8ebfe86 data/create/recipes/crafting/kinetics/brass_hand.json 23b98f9772b1567172607cb0aecc65e2fdd933de data/create/recipes/crafting/kinetics/brown_seat.json ab3b69d035dae7fe696f5dd983d7018649f466a2 data/create/recipes/crafting/kinetics/brown_seat_from_other_seat.json @@ -3944,6 +3958,7 @@ a79bb44c6b136ea3d3f28926adf84e37e6aa6aa6 data/create/recipes/crafting/kinetics/c a0c74542a8cc156e6055cda6aaca7545890b7bef data/create/recipes/crafting/kinetics/contraption_controls.json 11fe2ccc11f470e5735c3e848a944f889697ff73 data/create/recipes/crafting/kinetics/controller_rail.json 397c6c0691a54987b67854673b8d3c16c7f74e14 data/create/recipes/crafting/kinetics/controls.json +778fedf971c05997529e6c49b9f6924ec52fe285 data/create/recipes/crafting/kinetics/copper_door.json 3093be508f6597eee2f3230cd9072f12d2821a6f data/create/recipes/crafting/kinetics/copper_valve_handle.json 886caa21481e62d44d70fd103f8d29f9bac64d60 data/create/recipes/crafting/kinetics/copper_valve_handle_from_others.json 59db5170cec390fe6c20a27d6154deebe044580c data/create/recipes/crafting/kinetics/crafter_slot_cover.json @@ -4060,8 +4075,8 @@ ea173b87f9a8c86abcf7f662a7b1d510b8a13f83 data/create/recipes/crafting/kinetics/t a6d074a4a400e82223211badfd923bb28c3c0bd0 data/create/recipes/crafting/kinetics/track_observer_from_other_plates.json 456d59d0fff2b042e1e886ebbe46b84fbd212c40 data/create/recipes/crafting/kinetics/track_signal.json 3c8fd3b5fe4d264cfe405c8d222b451769c816d5 data/create/recipes/crafting/kinetics/track_station.json -c38984c432bd410261aaf6a6f30744c58481b325 data/create/recipes/crafting/kinetics/train_door.json -5e2af5ce3957d5ce4f54ceb667dcfed5cffafb32 data/create/recipes/crafting/kinetics/train_trapdoor.json +60650b8a20f0b69b5626d979f509e7b6d2a2cae9 data/create/recipes/crafting/kinetics/train_door.json +6ab92d6453b0ea10aa83a239b73443a6d5a4412e data/create/recipes/crafting/kinetics/train_trapdoor.json 8494f5fcd85a740fa0f0384e3522d8cdd905ce49 data/create/recipes/crafting/kinetics/turntable.json 057c889b0a306f44b8835c896663154ccd9ff12f data/create/recipes/crafting/kinetics/vertical_gearboxfrom_conversion.json 152e63ade2759d01a07b9e71a3c60dfe5ea15ba8 data/create/recipes/crafting/kinetics/water_wheel.json @@ -5317,7 +5332,7 @@ a8bdc387cfa6296ebcc4af14323e2ddb632234dc data/create/tags/fluids/bottomless/allo 74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/create/tags/items/blaze_burner_fuel/regular.json 97061ef67cac1fafd869493d06115b968bcb99bf data/create/tags/items/blaze_burner_fuel/special.json d99d5c67bdffff60789a19bd51a5c5267c75e0a4 data/create/tags/items/casing.json -f450961313b78ba24b2cc8cc83e2c5a2886a9695 data/create/tags/items/contraption_controlled.json +a1d4f4243cc2c700488fbfa292b483a7f43d4d58 data/create/tags/items/contraption_controlled.json c98ffdc2780c2a7690c590f46f014aeee7b0b504 data/create/tags/items/create_ingots.json 4480f211f4a37bfee193eba945bc9f5a8d2c6e34 data/create/tags/items/crushed_ores.json 49847bfbea11808b5101c972023a7f5833fe5a14 data/create/tags/items/deployable_drink.json @@ -5398,12 +5413,12 @@ e002dfedc5e8762de0f97ea1f3fa546e92e748ae data/forge/tags/items/tools/wrench.json 2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/azalea_root_replaceable.json 9f7a428085b1aac66da32a43e9d51c7efc1f0d81 data/minecraft/tags/blocks/beacon_base_blocks.json cf71d9ad48f109da3a8b22a8d2d1a68d4eac99c0 data/minecraft/tags/blocks/climbable.json -e16d74571ae10007f06f3b86ddf05d3ca9b73559 data/minecraft/tags/blocks/doors.json +45daa588f642e6bb26fa985273f59dfbdc63c976 data/minecraft/tags/blocks/doors.json 2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/dripstone_replaceable_blocks.json 69f596fcb065e26b02ce246760432b5174191b76 data/minecraft/tags/blocks/impermeable.json 2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/lush_ground_replaceable.json -b477e815d5f38011414b67437c8e6ba16296eea9 data/minecraft/tags/blocks/mineable/axe.json -9a18f38279c68dcddc7d976f97e740f3d49e4887 data/minecraft/tags/blocks/mineable/pickaxe.json +b68d565b4befb7b1c542d69eaa81309cc5304327 data/minecraft/tags/blocks/mineable/axe.json +a8384d64b16abfdb7f43453fc1cc09a3aae5ab6c data/minecraft/tags/blocks/mineable/pickaxe.json 2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/moss_replaceable.json e157c1d3af30e409e34bbefbe15a037e6e1c8daa data/minecraft/tags/blocks/needs_iron_tool.json a08f67865337f62601c5e333b4011382d10020e4 data/minecraft/tags/blocks/needs_stone_tool.json @@ -5412,13 +5427,13 @@ a08f67865337f62601c5e333b4011382d10020e4 data/minecraft/tags/blocks/needs_stone_ bc0917bead5b198feeeaa5c5b92dddae48bbb6f5 data/minecraft/tags/blocks/stairs.json d622e97373b1e96632ffb0a312ef04696da0ed4d data/minecraft/tags/blocks/trapdoors.json 0ec220675cbf8a6eeb47d42b7409395a0cb6ae6e data/minecraft/tags/blocks/walls.json -e16d74571ae10007f06f3b86ddf05d3ca9b73559 data/minecraft/tags/blocks/wooden_doors.json +45daa588f642e6bb26fa985273f59dfbdc63c976 data/minecraft/tags/blocks/wooden_doors.json 09d26bcd0f94459f945219997277c4fbf14adeb7 data/minecraft/tags/fluids/water.json d9ffc62a496946fc4848934e7c0a6e917337f8be data/minecraft/tags/items/beacon_payment_items.json -e16d74571ae10007f06f3b86ddf05d3ca9b73559 data/minecraft/tags/items/doors.json +45daa588f642e6bb26fa985273f59dfbdc63c976 data/minecraft/tags/items/doors.json 49cadea86f6b63d5065b859a0d0e7ad772cf51d6 data/minecraft/tags/items/piglin_loved.json 49a043b38ca8d4e2fa8cba9ceee3b69715a8476e data/minecraft/tags/items/slabs.json bc0917bead5b198feeeaa5c5b92dddae48bbb6f5 data/minecraft/tags/items/stairs.json d622e97373b1e96632ffb0a312ef04696da0ed4d data/minecraft/tags/items/trapdoors.json 0ec220675cbf8a6eeb47d42b7409395a0cb6ae6e data/minecraft/tags/items/walls.json -e16d74571ae10007f06f3b86ddf05d3ca9b73559 data/quark/tags/blocks/non_double_door.json +45daa588f642e6bb26fa985273f59dfbdc63c976 data/quark/tags/blocks/non_double_door.json diff --git a/src/generated/resources/assets/create/blockstates/andesite_door.json b/src/generated/resources/assets/create/blockstates/andesite_door.json new file mode 100644 index 000000000..c3b124376 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/andesite_door.json @@ -0,0 +1,244 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false,visible=false": { + "model": "create:block/andesite_door/block_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false,visible=false": { + "model": "create:block/andesite_door/block_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false,visible=false": { + "model": "create:block/andesite_door/block_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false,visible=false": { + "model": "create:block/andesite_door/block_top" + }, + "facing=north,half=lower,hinge=left,open=false,visible=false": { + "model": "create:block/andesite_door/block_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false,visible=false": { + "model": "create:block/andesite_door/block_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false,visible=false": { + "model": "create:block/andesite_door/block_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false,visible=false": { + "model": "create:block/andesite_door/block_bottom" + }, + "facing=north,half=upper,hinge=right,open=false,visible=false": { + "model": "create:block/andesite_door/block_top", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false,visible=false": { + "model": "create:block/andesite_door/block_top", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false,visible=false": { + "model": "create:block/andesite_door/block_top", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false,visible=false": { + "model": "create:block/andesite_door/block_top" + }, + "facing=north,half=lower,hinge=right,open=false,visible=false": { + "model": "create:block/andesite_door/block_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false,visible=false": { + "model": "create:block/andesite_door/block_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false,visible=false": { + "model": "create:block/andesite_door/block_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false,visible=false": { + "model": "create:block/andesite_door/block_bottom" + }, + "facing=north,half=upper,hinge=left,open=true,visible=false": { + "model": "create:block/andesite_door/block_top" + }, + "facing=south,half=upper,hinge=left,open=true,visible=false": { + "model": "create:block/andesite_door/block_top", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true,visible=false": { + "model": "create:block/andesite_door/block_top", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true,visible=false": { + "model": "create:block/andesite_door/block_top", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true,visible=false": { + "model": "create:block/andesite_door/block_bottom" + }, + "facing=south,half=lower,hinge=left,open=true,visible=false": { + "model": "create:block/andesite_door/block_bottom", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true,visible=false": { + "model": "create:block/andesite_door/block_bottom", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true,visible=false": { + "model": "create:block/andesite_door/block_bottom", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true,visible=false": { + "model": "create:block/andesite_door/block_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true,visible=false": { + "model": "create:block/andesite_door/block_top" + }, + "facing=west,half=upper,hinge=right,open=true,visible=false": { + "model": "create:block/andesite_door/block_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true,visible=false": { + "model": "create:block/andesite_door/block_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true,visible=false": { + "model": "create:block/andesite_door/block_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true,visible=false": { + "model": "create:block/andesite_door/block_bottom" + }, + "facing=west,half=lower,hinge=right,open=true,visible=false": { + "model": "create:block/andesite_door/block_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true,visible=false": { + "model": "create:block/andesite_door/block_bottom", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=false,visible=true": { + "model": "create:block/andesite_door/block_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false,visible=true": { + "model": "create:block/andesite_door/block_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false,visible=true": { + "model": "create:block/andesite_door/block_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false,visible=true": { + "model": "create:block/andesite_door/block_top" + }, + "facing=north,half=lower,hinge=left,open=false,visible=true": { + "model": "create:block/andesite_door/block_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false,visible=true": { + "model": "create:block/andesite_door/block_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false,visible=true": { + "model": "create:block/andesite_door/block_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false,visible=true": { + "model": "create:block/andesite_door/block_bottom" + }, + "facing=north,half=upper,hinge=right,open=false,visible=true": { + "model": "create:block/andesite_door/block_top", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false,visible=true": { + "model": "create:block/andesite_door/block_top", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false,visible=true": { + "model": "create:block/andesite_door/block_top", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false,visible=true": { + "model": "create:block/andesite_door/block_top" + }, + "facing=north,half=lower,hinge=right,open=false,visible=true": { + "model": "create:block/andesite_door/block_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false,visible=true": { + "model": "create:block/andesite_door/block_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false,visible=true": { + "model": "create:block/andesite_door/block_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false,visible=true": { + "model": "create:block/andesite_door/block_bottom" + }, + "facing=north,half=upper,hinge=left,open=true,visible=true": { + "model": "create:block/andesite_door/block_top" + }, + "facing=south,half=upper,hinge=left,open=true,visible=true": { + "model": "create:block/andesite_door/block_top", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true,visible=true": { + "model": "create:block/andesite_door/block_top", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true,visible=true": { + "model": "create:block/andesite_door/block_top", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true,visible=true": { + "model": "create:block/andesite_door/block_bottom" + }, + "facing=south,half=lower,hinge=left,open=true,visible=true": { + "model": "create:block/andesite_door/block_bottom", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true,visible=true": { + "model": "create:block/andesite_door/block_bottom", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true,visible=true": { + "model": "create:block/andesite_door/block_bottom", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true,visible=true": { + "model": "create:block/andesite_door/block_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true,visible=true": { + "model": "create:block/andesite_door/block_top" + }, + "facing=west,half=upper,hinge=right,open=true,visible=true": { + "model": "create:block/andesite_door/block_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true,visible=true": { + "model": "create:block/andesite_door/block_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true,visible=true": { + "model": "create:block/andesite_door/block_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true,visible=true": { + "model": "create:block/andesite_door/block_bottom" + }, + "facing=west,half=lower,hinge=right,open=true,visible=true": { + "model": "create:block/andesite_door/block_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true,visible=true": { + "model": "create:block/andesite_door/block_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/brass_door.json b/src/generated/resources/assets/create/blockstates/brass_door.json new file mode 100644 index 000000000..3fee16d2c --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/brass_door.json @@ -0,0 +1,244 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false,visible=false": { + "model": "create:block/brass_door/block_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false,visible=false": { + "model": "create:block/brass_door/block_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false,visible=false": { + "model": "create:block/brass_door/block_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false,visible=false": { + "model": "create:block/brass_door/block_top" + }, + "facing=north,half=lower,hinge=left,open=false,visible=false": { + "model": "create:block/brass_door/block_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false,visible=false": { + "model": "create:block/brass_door/block_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false,visible=false": { + "model": "create:block/brass_door/block_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false,visible=false": { + "model": "create:block/brass_door/block_bottom" + }, + "facing=north,half=upper,hinge=right,open=false,visible=false": { + "model": "create:block/brass_door/block_top", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false,visible=false": { + "model": "create:block/brass_door/block_top", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false,visible=false": { + "model": "create:block/brass_door/block_top", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false,visible=false": { + "model": "create:block/brass_door/block_top" + }, + "facing=north,half=lower,hinge=right,open=false,visible=false": { + "model": "create:block/brass_door/block_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false,visible=false": { + "model": "create:block/brass_door/block_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false,visible=false": { + "model": "create:block/brass_door/block_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false,visible=false": { + "model": "create:block/brass_door/block_bottom" + }, + "facing=north,half=upper,hinge=left,open=true,visible=false": { + "model": "create:block/brass_door/block_top" + }, + "facing=south,half=upper,hinge=left,open=true,visible=false": { + "model": "create:block/brass_door/block_top", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true,visible=false": { + "model": "create:block/brass_door/block_top", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true,visible=false": { + "model": "create:block/brass_door/block_top", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true,visible=false": { + "model": "create:block/brass_door/block_bottom" + }, + "facing=south,half=lower,hinge=left,open=true,visible=false": { + "model": "create:block/brass_door/block_bottom", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true,visible=false": { + "model": "create:block/brass_door/block_bottom", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true,visible=false": { + "model": "create:block/brass_door/block_bottom", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true,visible=false": { + "model": "create:block/brass_door/block_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true,visible=false": { + "model": "create:block/brass_door/block_top" + }, + "facing=west,half=upper,hinge=right,open=true,visible=false": { + "model": "create:block/brass_door/block_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true,visible=false": { + "model": "create:block/brass_door/block_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true,visible=false": { + "model": "create:block/brass_door/block_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true,visible=false": { + "model": "create:block/brass_door/block_bottom" + }, + "facing=west,half=lower,hinge=right,open=true,visible=false": { + "model": "create:block/brass_door/block_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true,visible=false": { + "model": "create:block/brass_door/block_bottom", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=false,visible=true": { + "model": "create:block/brass_door/block_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false,visible=true": { + "model": "create:block/brass_door/block_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false,visible=true": { + "model": "create:block/brass_door/block_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false,visible=true": { + "model": "create:block/brass_door/block_top" + }, + "facing=north,half=lower,hinge=left,open=false,visible=true": { + "model": "create:block/brass_door/block_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false,visible=true": { + "model": "create:block/brass_door/block_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false,visible=true": { + "model": "create:block/brass_door/block_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false,visible=true": { + "model": "create:block/brass_door/block_bottom" + }, + "facing=north,half=upper,hinge=right,open=false,visible=true": { + "model": "create:block/brass_door/block_top", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false,visible=true": { + "model": "create:block/brass_door/block_top", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false,visible=true": { + "model": "create:block/brass_door/block_top", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false,visible=true": { + "model": "create:block/brass_door/block_top" + }, + "facing=north,half=lower,hinge=right,open=false,visible=true": { + "model": "create:block/brass_door/block_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false,visible=true": { + "model": "create:block/brass_door/block_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false,visible=true": { + "model": "create:block/brass_door/block_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false,visible=true": { + "model": "create:block/brass_door/block_bottom" + }, + "facing=north,half=upper,hinge=left,open=true,visible=true": { + "model": "create:block/brass_door/block_top" + }, + "facing=south,half=upper,hinge=left,open=true,visible=true": { + "model": "create:block/brass_door/block_top", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true,visible=true": { + "model": "create:block/brass_door/block_top", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true,visible=true": { + "model": "create:block/brass_door/block_top", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true,visible=true": { + "model": "create:block/brass_door/block_bottom" + }, + "facing=south,half=lower,hinge=left,open=true,visible=true": { + "model": "create:block/brass_door/block_bottom", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true,visible=true": { + "model": "create:block/brass_door/block_bottom", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true,visible=true": { + "model": "create:block/brass_door/block_bottom", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true,visible=true": { + "model": "create:block/brass_door/block_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true,visible=true": { + "model": "create:block/brass_door/block_top" + }, + "facing=west,half=upper,hinge=right,open=true,visible=true": { + "model": "create:block/brass_door/block_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true,visible=true": { + "model": "create:block/brass_door/block_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true,visible=true": { + "model": "create:block/brass_door/block_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true,visible=true": { + "model": "create:block/brass_door/block_bottom" + }, + "facing=west,half=lower,hinge=right,open=true,visible=true": { + "model": "create:block/brass_door/block_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true,visible=true": { + "model": "create:block/brass_door/block_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/copper_door.json b/src/generated/resources/assets/create/blockstates/copper_door.json new file mode 100644 index 000000000..fd70ddc57 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/copper_door.json @@ -0,0 +1,244 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false,visible=false": { + "model": "create:block/copper_door/block_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false,visible=false": { + "model": "create:block/copper_door/block_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false,visible=false": { + "model": "create:block/copper_door/block_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false,visible=false": { + "model": "create:block/copper_door/block_top" + }, + "facing=north,half=lower,hinge=left,open=false,visible=false": { + "model": "create:block/copper_door/block_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false,visible=false": { + "model": "create:block/copper_door/block_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false,visible=false": { + "model": "create:block/copper_door/block_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false,visible=false": { + "model": "create:block/copper_door/block_bottom" + }, + "facing=north,half=upper,hinge=right,open=false,visible=false": { + "model": "create:block/copper_door/block_top", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false,visible=false": { + "model": "create:block/copper_door/block_top", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false,visible=false": { + "model": "create:block/copper_door/block_top", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false,visible=false": { + "model": "create:block/copper_door/block_top" + }, + "facing=north,half=lower,hinge=right,open=false,visible=false": { + "model": "create:block/copper_door/block_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false,visible=false": { + "model": "create:block/copper_door/block_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false,visible=false": { + "model": "create:block/copper_door/block_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false,visible=false": { + "model": "create:block/copper_door/block_bottom" + }, + "facing=north,half=upper,hinge=left,open=true,visible=false": { + "model": "create:block/copper_door/block_top" + }, + "facing=south,half=upper,hinge=left,open=true,visible=false": { + "model": "create:block/copper_door/block_top", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true,visible=false": { + "model": "create:block/copper_door/block_top", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true,visible=false": { + "model": "create:block/copper_door/block_top", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true,visible=false": { + "model": "create:block/copper_door/block_bottom" + }, + "facing=south,half=lower,hinge=left,open=true,visible=false": { + "model": "create:block/copper_door/block_bottom", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true,visible=false": { + "model": "create:block/copper_door/block_bottom", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true,visible=false": { + "model": "create:block/copper_door/block_bottom", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true,visible=false": { + "model": "create:block/copper_door/block_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true,visible=false": { + "model": "create:block/copper_door/block_top" + }, + "facing=west,half=upper,hinge=right,open=true,visible=false": { + "model": "create:block/copper_door/block_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true,visible=false": { + "model": "create:block/copper_door/block_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true,visible=false": { + "model": "create:block/copper_door/block_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true,visible=false": { + "model": "create:block/copper_door/block_bottom" + }, + "facing=west,half=lower,hinge=right,open=true,visible=false": { + "model": "create:block/copper_door/block_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true,visible=false": { + "model": "create:block/copper_door/block_bottom", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=false,visible=true": { + "model": "create:block/copper_door/block_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false,visible=true": { + "model": "create:block/copper_door/block_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false,visible=true": { + "model": "create:block/copper_door/block_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false,visible=true": { + "model": "create:block/copper_door/block_top" + }, + "facing=north,half=lower,hinge=left,open=false,visible=true": { + "model": "create:block/copper_door/block_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false,visible=true": { + "model": "create:block/copper_door/block_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false,visible=true": { + "model": "create:block/copper_door/block_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false,visible=true": { + "model": "create:block/copper_door/block_bottom" + }, + "facing=north,half=upper,hinge=right,open=false,visible=true": { + "model": "create:block/copper_door/block_top", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false,visible=true": { + "model": "create:block/copper_door/block_top", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false,visible=true": { + "model": "create:block/copper_door/block_top", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false,visible=true": { + "model": "create:block/copper_door/block_top" + }, + "facing=north,half=lower,hinge=right,open=false,visible=true": { + "model": "create:block/copper_door/block_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false,visible=true": { + "model": "create:block/copper_door/block_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false,visible=true": { + "model": "create:block/copper_door/block_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false,visible=true": { + "model": "create:block/copper_door/block_bottom" + }, + "facing=north,half=upper,hinge=left,open=true,visible=true": { + "model": "create:block/copper_door/block_top" + }, + "facing=south,half=upper,hinge=left,open=true,visible=true": { + "model": "create:block/copper_door/block_top", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true,visible=true": { + "model": "create:block/copper_door/block_top", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true,visible=true": { + "model": "create:block/copper_door/block_top", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true,visible=true": { + "model": "create:block/copper_door/block_bottom" + }, + "facing=south,half=lower,hinge=left,open=true,visible=true": { + "model": "create:block/copper_door/block_bottom", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true,visible=true": { + "model": "create:block/copper_door/block_bottom", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true,visible=true": { + "model": "create:block/copper_door/block_bottom", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true,visible=true": { + "model": "create:block/copper_door/block_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true,visible=true": { + "model": "create:block/copper_door/block_top" + }, + "facing=west,half=upper,hinge=right,open=true,visible=true": { + "model": "create:block/copper_door/block_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true,visible=true": { + "model": "create:block/copper_door/block_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true,visible=true": { + "model": "create:block/copper_door/block_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true,visible=true": { + "model": "create:block/copper_door/block_bottom" + }, + "facing=west,half=lower,hinge=right,open=true,visible=true": { + "model": "create:block/copper_door/block_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true,visible=true": { + "model": "create:block/copper_door/block_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/lang/en_ud.json b/src/generated/resources/assets/create/lang/en_ud.json index bad92e60a..14e57cd82 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -7,6 +7,7 @@ "block.create.andesite_bars": "s\u0279\u0250\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_belt_funnel": "\u05DF\u01DDuun\u2132 \u0287\u05DF\u01DD\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_casing": "bu\u0131s\u0250\u0186 \u01DD\u0287\u0131s\u01DDpu\u2C6F", + "block.create.andesite_door": "\u0279oo\u15E1 \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_encased_cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 p\u01DDs\u0250\u0254u\u018E \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_encased_large_cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 \u01DDb\u0279\u0250\uA780 p\u01DDs\u0250\u0254u\u018E \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_encased_shaft": "\u0287\u025F\u0250\u0265S p\u01DDs\u0250\u0254u\u018E \u01DD\u0287\u0131s\u01DDpu\u2C6F", @@ -36,6 +37,7 @@ "block.create.brass_belt_funnel": "\u05DF\u01DDuun\u2132 \u0287\u05DF\u01DD\u15FA ss\u0250\u0279\u15FA", "block.create.brass_block": "ss\u0250\u0279\u15FA \u025Fo \u029E\u0254o\u05DF\u15FA", "block.create.brass_casing": "bu\u0131s\u0250\u0186 ss\u0250\u0279\u15FA", + "block.create.brass_door": "\u0279oo\u15E1 ss\u0250\u0279\u15FA", "block.create.brass_encased_cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 p\u01DDs\u0250\u0254u\u018E ss\u0250\u0279\u15FA", "block.create.brass_encased_large_cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 \u01DDb\u0279\u0250\uA780 p\u01DDs\u0250\u0254u\u018E ss\u0250\u0279\u15FA", "block.create.brass_encased_shaft": "\u0287\u025F\u0250\u0265S p\u01DDs\u0250\u0254u\u018E ss\u0250\u0279\u15FA", @@ -63,6 +65,7 @@ "block.create.copper_backtank": "\u029Eu\u0250\u0287\u029E\u0254\u0250\u15FA \u0279\u01DDddo\u0186", "block.create.copper_bars": "s\u0279\u0250\u15FA \u0279\u01DDddo\u0186", "block.create.copper_casing": "bu\u0131s\u0250\u0186 \u0279\u01DDddo\u0186", + "block.create.copper_door": "\u0279oo\u15E1 \u0279\u01DDddo\u0186", "block.create.copper_ladder": "\u0279\u01DDpp\u0250\uA780 \u0279\u01DDddo\u0186", "block.create.copper_scaffolding": "bu\u0131p\u05DFo\u025F\u025F\u0250\u0254S \u0279\u01DDddo\u0186", "block.create.copper_shingle_slab": "q\u0250\u05DFS \u01DD\u05DFbu\u0131\u0265S \u0279\u01DDddo\u0186", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index f26e5a388..ad3504295 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -10,6 +10,7 @@ "block.create.andesite_bars": "Andesite Bars", "block.create.andesite_belt_funnel": "Andesite Belt Funnel", "block.create.andesite_casing": "Andesite Casing", + "block.create.andesite_door": "Andesite Door", "block.create.andesite_encased_cogwheel": "Andesite Encased Cogwheel", "block.create.andesite_encased_large_cogwheel": "Andesite Encased Large Cogwheel", "block.create.andesite_encased_shaft": "Andesite Encased Shaft", @@ -39,6 +40,7 @@ "block.create.brass_belt_funnel": "Brass Belt Funnel", "block.create.brass_block": "Block of Brass", "block.create.brass_casing": "Brass Casing", + "block.create.brass_door": "Brass Door", "block.create.brass_encased_cogwheel": "Brass Encased Cogwheel", "block.create.brass_encased_large_cogwheel": "Brass Encased Large Cogwheel", "block.create.brass_encased_shaft": "Brass Encased Shaft", @@ -66,6 +68,7 @@ "block.create.copper_backtank": "Copper Backtank", "block.create.copper_bars": "Copper Bars", "block.create.copper_casing": "Copper Casing", + "block.create.copper_door": "Copper Door", "block.create.copper_ladder": "Copper Ladder", "block.create.copper_scaffolding": "Copper Scaffolding", "block.create.copper_shingle_slab": "Copper Shingle Slab", diff --git a/src/generated/resources/assets/create/models/item/andesite_door.json b/src/generated/resources/assets/create/models/item/andesite_door.json new file mode 100644 index 000000000..644fdf227 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/andesite_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "create:item/andesite_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/brass_door.json b/src/generated/resources/assets/create/models/item/brass_door.json new file mode 100644 index 000000000..814256ba6 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/brass_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "create:item/brass_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/copper_door.json b/src/generated/resources/assets/create/models/item/copper_door.json new file mode 100644 index 000000000..8e2e20d3e --- /dev/null +++ b/src/generated/resources/assets/create/models/item/copper_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "create:item/copper_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/andesite_door.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/andesite_door.json new file mode 100644 index 000000000..788f51175 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/andesite_door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:crafting/kinetics/andesite_door" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "create:andesite_casing" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:crafting/kinetics/andesite_door" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/black_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/black_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/black_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/black_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/black_seat_from_other_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/black_seat_from_other_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/black_seat_from_other_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/black_seat_from_other_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/blue_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/blue_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/blue_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/blue_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/blue_seat_from_other_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/blue_seat_from_other_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/blue_seat_from_other_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/blue_seat_from_other_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/brass_door.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/brass_door.json new file mode 100644 index 000000000..a035e3d3a --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/brass_door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:crafting/kinetics/brass_door" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "create:brass_casing" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:crafting/kinetics/brass_door" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/brown_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/brown_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/brown_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/brown_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/brown_seat_from_other_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/brown_seat_from_other_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/brown_seat_from_other_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/brown_seat_from_other_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/copper_door.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/copper_door.json new file mode 100644 index 000000000..4ab980502 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/copper_door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:crafting/kinetics/copper_door" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "create:copper_casing" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:crafting/kinetics/copper_door" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/cyan_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/cyan_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/cyan_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/cyan_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/cyan_seat_from_other_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/cyan_seat_from_other_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/cyan_seat_from_other_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/cyan_seat_from_other_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/framed_glass_door.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/framed_glass_door.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/framed_glass_door.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/framed_glass_door.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/framed_glass_trapdoor.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/framed_glass_trapdoor.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/framed_glass_trapdoor.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/framed_glass_trapdoor.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/gray_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/gray_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/gray_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/gray_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/gray_seat_from_other_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/gray_seat_from_other_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/gray_seat_from_other_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/gray_seat_from_other_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/green_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/green_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/green_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/green_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/green_seat_from_other_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/green_seat_from_other_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/green_seat_from_other_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/green_seat_from_other_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/light_blue_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/light_blue_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/light_blue_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/light_blue_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/light_blue_seat_from_other_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/light_blue_seat_from_other_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/light_blue_seat_from_other_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/light_blue_seat_from_other_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/light_gray_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/light_gray_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/light_gray_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/light_gray_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/light_gray_seat_from_other_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/light_gray_seat_from_other_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/light_gray_seat_from_other_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/light_gray_seat_from_other_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/lime_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/lime_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/lime_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/lime_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/lime_seat_from_other_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/lime_seat_from_other_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/lime_seat_from_other_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/lime_seat_from_other_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/magenta_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/magenta_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/magenta_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/magenta_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/magenta_seat_from_other_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/magenta_seat_from_other_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/magenta_seat_from_other_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/magenta_seat_from_other_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/metal_girder.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/metal_girder.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/metal_girder.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/metal_girder.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/orange_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/orange_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/orange_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/orange_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/orange_seat_from_other_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/orange_seat_from_other_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/orange_seat_from_other_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/orange_seat_from_other_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/pink_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/pink_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/pink_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/pink_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/pink_seat_from_other_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/pink_seat_from_other_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/pink_seat_from_other_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/pink_seat_from_other_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/purple_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/purple_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/purple_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/purple_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/purple_seat_from_other_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/purple_seat_from_other_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/purple_seat_from_other_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/purple_seat_from_other_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/red_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/red_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/red_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/red_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/red_seat_from_other_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/red_seat_from_other_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/red_seat_from_other_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/red_seat_from_other_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/train_door.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/train_door.json similarity index 87% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/train_door.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/train_door.json index 05cc6e7ee..fba5220b6 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/train_door.json +++ b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/train_door.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": [ + "create:railway_casing" + ] } ] } diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/train_trapdoor.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/train_trapdoor.json similarity index 88% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/train_trapdoor.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/train_trapdoor.json index 92ffc3e35..fd9965815 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/train_trapdoor.json +++ b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/train_trapdoor.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": [ + "create:railway_casing" + ] } ] } diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/white_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/white_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/white_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/white_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/white_seat_from_other_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/white_seat_from_other_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/white_seat_from_other_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/white_seat_from_other_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/yellow_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/yellow_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/yellow_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/yellow_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/yellow_seat_from_other_seat.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/yellow_seat_from_other_seat.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/yellow_seat_from_other_seat.json rename to src/generated/resources/data/create/advancements/recipes/create.palettes/crafting/kinetics/yellow_seat_from_other_seat.json diff --git a/src/generated/resources/data/create/loot_tables/blocks/andesite_door.json b/src/generated/resources/data/create/loot_tables/blocks/andesite_door.json new file mode 100644 index 000000000..49cf670f7 --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/andesite_door.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:andesite_door", + "properties": { + "half": "lower" + } + } + ], + "name": "create:andesite_door" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/brass_door.json b/src/generated/resources/data/create/loot_tables/blocks/brass_door.json new file mode 100644 index 000000000..b783b6145 --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/brass_door.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:brass_door", + "properties": { + "half": "lower" + } + } + ], + "name": "create:brass_door" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/copper_door.json b/src/generated/resources/data/create/loot_tables/blocks/copper_door.json new file mode 100644 index 000000000..0f1a745f1 --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/copper_door.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "create:copper_door", + "properties": { + "half": "lower" + } + } + ], + "name": "create:copper_door" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/andesite_door.json b/src/generated/resources/data/create/recipes/crafting/kinetics/andesite_door.json new file mode 100644 index 000000000..f8870c5fc --- /dev/null +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/andesite_door.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "minecraft:wooden_doors" + }, + { + "item": "create:andesite_casing" + } + ], + "result": { + "item": "create:andesite_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/brass_door.json b/src/generated/resources/data/create/recipes/crafting/kinetics/brass_door.json new file mode 100644 index 000000000..1ff8c45ee --- /dev/null +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/brass_door.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "minecraft:wooden_doors" + }, + { + "item": "create:brass_casing" + } + ], + "result": { + "item": "create:brass_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/copper_door.json b/src/generated/resources/data/create/recipes/crafting/kinetics/copper_door.json new file mode 100644 index 000000000..98cb8e353 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/copper_door.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "minecraft:wooden_doors" + }, + { + "item": "create:copper_casing" + } + ], + "result": { + "item": "create:copper_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/train_door.json b/src/generated/resources/data/create/recipes/crafting/kinetics/train_door.json index 7751dd7ef..558c8734f 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/train_door.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/train_door.json @@ -5,7 +5,7 @@ "tag": "minecraft:wooden_doors" }, { - "tag": "forge:plates/brass" + "item": "create:railway_casing" } ], "result": { diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/train_trapdoor.json b/src/generated/resources/data/create/recipes/crafting/kinetics/train_trapdoor.json index 6b37bcb5c..82b668a52 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/train_trapdoor.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/train_trapdoor.json @@ -5,7 +5,7 @@ "tag": "minecraft:wooden_trapdoors" }, { - "tag": "forge:plates/brass" + "item": "create:railway_casing" } ], "result": { diff --git a/src/generated/resources/data/create/tags/items/contraption_controlled.json b/src/generated/resources/data/create/tags/items/contraption_controlled.json index 1d5d6242f..eedd21c2b 100644 --- a/src/generated/resources/data/create/tags/items/contraption_controlled.json +++ b/src/generated/resources/data/create/tags/items/contraption_controlled.json @@ -10,12 +10,15 @@ "create:mechanical_harvester", "create:mechanical_plough", "create:mechanical_roller", - "create:train_door", - "create:framed_glass_door", "create:andesite_funnel", "create:brass_funnel", "create:peculiar_bell", "create:haunted_bell", + "create:andesite_door", + "create:brass_door", + "create:copper_door", + "create:train_door", + "create:framed_glass_door", "minecraft:bell", "minecraft:campfire", "minecraft:soul_campfire", diff --git a/src/generated/resources/data/minecraft/tags/blocks/doors.json b/src/generated/resources/data/minecraft/tags/blocks/doors.json index 56284a409..84decc3a1 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/doors.json +++ b/src/generated/resources/data/minecraft/tags/blocks/doors.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ + "create:andesite_door", + "create:brass_door", + "create:copper_door", "create:train_door", "create:framed_glass_door" ] diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json index dfff13dfe..a6e05f437 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -59,22 +59,6 @@ "create:mechanical_harvester", "create:mechanical_plough", "create:mechanical_roller", - "create:white_seat", - "create:orange_seat", - "create:magenta_seat", - "create:light_blue_seat", - "create:yellow_seat", - "create:lime_seat", - "create:pink_seat", - "create:gray_seat", - "create:light_gray_seat", - "create:cyan_seat", - "create:purple_seat", - "create:blue_seat", - "create:brown_seat", - "create:green_seat", - "create:red_seat", - "create:black_seat", "create:sail_frame", "create:white_sail", "create:orange_sail", @@ -112,6 +96,22 @@ "create:lectern_controller", "create:clipboard", "create:copycat_step", - "create:copycat_panel" + "create:copycat_panel", + "create:white_seat", + "create:orange_seat", + "create:magenta_seat", + "create:light_blue_seat", + "create:yellow_seat", + "create:lime_seat", + "create:pink_seat", + "create:gray_seat", + "create:light_gray_seat", + "create:cyan_seat", + "create:purple_seat", + "create:blue_seat", + "create:brown_seat", + "create:green_seat", + "create:red_seat", + "create:black_seat" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 70c4e2c5e..ab7e33b93 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -43,8 +43,6 @@ "create:stressometer", "create:wooden_bracket", "create:metal_bracket", - "create:metal_girder", - "create:metal_girder_encased_shaft", "create:fluid_pipe", "create:encased_fluid_pipe", "create:glass_fluid_pipe", @@ -123,10 +121,6 @@ "create:small_bogey", "create:large_bogey", "create:controls", - "create:train_door", - "create:train_trapdoor", - "create:framed_glass_door", - "create:framed_glass_trapdoor", "create:item_vault", "create:andesite_funnel", "create:andesite_belt_funnel", @@ -170,9 +164,18 @@ "create:andesite_scaffolding", "create:brass_scaffolding", "create:copper_scaffolding", + "create:metal_girder", + "create:metal_girder_encased_shaft", "create:copycat_base", "create:copycat_step", "create:copycat_panel", + "create:andesite_door", + "create:brass_door", + "create:copper_door", + "create:train_door", + "create:train_trapdoor", + "create:framed_glass_door", + "create:framed_glass_trapdoor", "create:zinc_ore", "create:deepslate_zinc_ore", "create:raw_zinc_block", diff --git a/src/generated/resources/data/minecraft/tags/blocks/wooden_doors.json b/src/generated/resources/data/minecraft/tags/blocks/wooden_doors.json index 56284a409..84decc3a1 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/wooden_doors.json +++ b/src/generated/resources/data/minecraft/tags/blocks/wooden_doors.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ + "create:andesite_door", + "create:brass_door", + "create:copper_door", "create:train_door", "create:framed_glass_door" ] diff --git a/src/generated/resources/data/minecraft/tags/items/doors.json b/src/generated/resources/data/minecraft/tags/items/doors.json index 56284a409..84decc3a1 100644 --- a/src/generated/resources/data/minecraft/tags/items/doors.json +++ b/src/generated/resources/data/minecraft/tags/items/doors.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ + "create:andesite_door", + "create:brass_door", + "create:copper_door", "create:train_door", "create:framed_glass_door" ] diff --git a/src/generated/resources/data/quark/tags/blocks/non_double_door.json b/src/generated/resources/data/quark/tags/blocks/non_double_door.json index 56284a409..84decc3a1 100644 --- a/src/generated/resources/data/quark/tags/blocks/non_double_door.json +++ b/src/generated/resources/data/quark/tags/blocks/non_double_door.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ + "create:andesite_door", + "create:brass_door", + "create:copper_door", "create:train_door", "create:framed_glass_door" ] diff --git a/src/main/java/com/simibubi/create/AllBlockEntityTypes.java b/src/main/java/com/simibubi/create/AllBlockEntityTypes.java index 767d7ec82..f6355af67 100644 --- a/src/main/java/com/simibubi/create/AllBlockEntityTypes.java +++ b/src/main/java/com/simibubi/create/AllBlockEntityTypes.java @@ -852,11 +852,12 @@ public class AllBlockEntityTypes { .validBlocks(AllBlocks.TRACK_STATION) .register(); - public static final BlockEntityEntry SLIDING_DOOR = REGISTRATE - .blockEntity("sliding_door", SlidingDoorBlockEntity::new) - .renderer(() -> SlidingDoorRenderer::new) - .validBlocks(AllBlocks.TRAIN_DOOR, AllBlocks.FRAMED_GLASS_DOOR) - .register(); + public static final BlockEntityEntry SLIDING_DOOR = + REGISTRATE.blockEntity("sliding_door", SlidingDoorBlockEntity::new) + .renderer(() -> SlidingDoorRenderer::new) + .validBlocks(AllBlocks.TRAIN_DOOR, AllBlocks.FRAMED_GLASS_DOOR, AllBlocks.ANDESITE_DOOR, + AllBlocks.BRASS_DOOR, AllBlocks.COPPER_DOOR) + .register(); public static final BlockEntityEntry COPYCAT = REGISTRATE .blockEntity("copycat", CopycatBlockEntity::new) diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 474fd14cc..a3086a5fe 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -417,21 +417,22 @@ public class AllBlocks { .transform(axeOrPickaxe()) .register(); - public static final BlockEntry ANDESITE_ENCASED_LARGE_COGWHEEL = - REGISTRATE.block("andesite_encased_large_cogwheel", p -> new EncasedCogwheelBlock(p, true, AllBlocks.ANDESITE_CASING::get)) - .properties(p -> p.color(MaterialColor.PODZOL)) - .transform(BuilderTransformers.encasedLargeCogwheel("andesite", () -> AllSpriteShifts.ANDESITE_CASING)) - .transform(EncasingRegistry.addVariantTo(AllBlocks.LARGE_COGWHEEL)) - .transform(axeOrPickaxe()) - .register(); + public static final BlockEntry ANDESITE_ENCASED_LARGE_COGWHEEL = REGISTRATE + .block("andesite_encased_large_cogwheel", + p -> new EncasedCogwheelBlock(p, true, AllBlocks.ANDESITE_CASING::get)) + .properties(p -> p.color(MaterialColor.PODZOL)) + .transform(BuilderTransformers.encasedLargeCogwheel("andesite", () -> AllSpriteShifts.ANDESITE_CASING)) + .transform(EncasingRegistry.addVariantTo(AllBlocks.LARGE_COGWHEEL)) + .transform(axeOrPickaxe()) + .register(); - public static final BlockEntry BRASS_ENCASED_LARGE_COGWHEEL = - REGISTRATE.block("brass_encased_large_cogwheel", p -> new EncasedCogwheelBlock(p, true, AllBlocks.BRASS_CASING::get)) - .properties(p -> p.color(MaterialColor.TERRACOTTA_BROWN)) - .transform(BuilderTransformers.encasedLargeCogwheel("brass", () -> AllSpriteShifts.BRASS_CASING)) - .transform(EncasingRegistry.addVariantTo(AllBlocks.LARGE_COGWHEEL)) - .transform(axeOrPickaxe()) - .register(); + public static final BlockEntry BRASS_ENCASED_LARGE_COGWHEEL = REGISTRATE + .block("brass_encased_large_cogwheel", p -> new EncasedCogwheelBlock(p, true, AllBlocks.BRASS_CASING::get)) + .properties(p -> p.color(MaterialColor.TERRACOTTA_BROWN)) + .transform(BuilderTransformers.encasedLargeCogwheel("brass", () -> AllSpriteShifts.BRASS_CASING)) + .transform(EncasingRegistry.addVariantTo(AllBlocks.LARGE_COGWHEEL)) + .transform(axeOrPickaxe()) + .register(); public static final BlockEntry GEARBOX = REGISTRATE.block("gearbox", GearboxBlock::new) .initialProperties(SharedProperties::stone) @@ -539,8 +540,7 @@ public class AllBlocks { .blockstate( (c, p) -> BlockStateGen.directionalBlockIgnoresWaterlogged(c, p, s -> AssetLookup.partialBaseModel(c, p))) .addLayer(() -> RenderType::cutoutMipped) - .transform(BlockStressDefaults - .setCapacity(32.0)) + .transform(BlockStressDefaults.setCapacity(32.0)) .transform(BlockStressDefaults.setGeneratorSpeed(WaterWheelBlock::getSpeedRange)) .item() .transform(customItemModel()) @@ -826,31 +826,6 @@ public class AllBlocks { .transform(BracketGenerator.itemModel("metal")) .register(); - public static final BlockEntry METAL_GIRDER = REGISTRATE.block("metal_girder", GirderBlock::new) - .initialProperties(SharedProperties::softMetal) - .blockstate(GirderBlockStateGenerator::blockState) - .properties(p -> p.color(MaterialColor.COLOR_GRAY)) - .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) - .transform(pickaxeOnly()) - .onRegister(CreateRegistrate.blockModel(() -> ConnectedGirderModel::new)) - .item() - .transform(customItemModel()) - .register(); - - public static final BlockEntry METAL_GIRDER_ENCASED_SHAFT = - REGISTRATE.block("metal_girder_encased_shaft", GirderEncasedShaftBlock::new) - .initialProperties(SharedProperties::softMetal) - .blockstate(GirderBlockStateGenerator::blockStateWithShaft) - .properties(p -> p.color(MaterialColor.COLOR_GRAY)) - .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) - .transform(pickaxeOnly()) - .loot((p, b) -> p.add(b, RegistrateBlockLootTables.createSingleItemTable(METAL_GIRDER.get()) - .withPool(RegistrateBlockLootTables.applyExplosionCondition(SHAFT.get(), LootPool.lootPool() - .setRolls(ConstantValue.exactly(1.0F)) - .add(LootItem.lootTableItem(SHAFT.get())))))) - .onRegister(CreateRegistrate.blockModel(() -> ConnectedGirderModel::new)) - .register(); - // Fluids public static final BlockEntry FLUID_PIPE = REGISTRATE.block("fluid_pipe", FluidPipeBlock::new) @@ -1423,43 +1398,6 @@ public class AllBlocks { .transform(customItemModel()) .register(); - public static final DyedBlockList SEATS = new DyedBlockList<>(colour -> { - String colourName = colour.getSerializedName(); - SeatMovementBehaviour movementBehaviour = new SeatMovementBehaviour(); - SeatInteractionBehaviour interactionBehaviour = new SeatInteractionBehaviour(); - return REGISTRATE.block(colourName + "_seat", p -> new SeatBlock(p, colour, colour == DyeColor.RED)) - .initialProperties(SharedProperties::wooden) - .properties(p -> p.color(colour.getMaterialColor())) - .transform(axeOnly()) - .onRegister(movementBehaviour(movementBehaviour)) - .onRegister(interactionBehaviour(interactionBehaviour)) - .onRegister(assignDataBehaviour(new EntityNameDisplaySource(), "entity_name")) - .blockstate((c, p) -> { - p.simpleBlock(c.get(), p.models() - .withExistingParent(colourName + "_seat", p.modLoc("block/seat")) - .texture("1", p.modLoc("block/seat/top_" + colourName)) - .texture("2", p.modLoc("block/seat/side_" + colourName))); - }) - .recipe((c, p) -> { - ShapelessRecipeBuilder.shapeless(c.get()) - .requires(DyeHelper.getWoolOfDye(colour)) - .requires(ItemTags.WOODEN_SLABS) - .unlockedBy("has_wool", RegistrateRecipeProvider.has(ItemTags.WOOL)) - .save(p, Create.asResource("crafting/kinetics/" + c.getName())); - ShapelessRecipeBuilder.shapeless(c.get()) - .requires(colour.getTag()) - .requires(AllItemTags.SEATS.tag) - .unlockedBy("has_seat", RegistrateRecipeProvider.has(AllItemTags.SEATS.tag)) - .save(p, Create.asResource("crafting/kinetics/" + c.getName() + "_from_other_seat")); - }) - .onRegisterAfter(Registry.ITEM_REGISTRY, v -> ItemDescription.useKey(v, "block.create.seat")) - .tag(AllBlockTags.SEATS.tag) - .item() - .tag(AllItemTags.SEATS.tag) - .build() - .register(); - }); - public static final BlockEntry SAIL_FRAME = REGISTRATE.block("sail_frame", p -> SailBlock.frame(p)) .initialProperties(SharedProperties::wooden) .properties(p -> p.color(MaterialColor.DIRT)) @@ -1709,40 +1647,6 @@ public class AllBlocks { .transform(customItemModel()) .register(); - public static final BlockEntry TRAIN_DOOR = REGISTRATE.block("train_door", SlidingDoorBlock::new) - .transform(BuilderTransformers.slidingDoor("train")) - .properties(p -> p.color(MaterialColor.TERRACOTTA_CYAN) - .sound(SoundType.NETHERITE_BLOCK) - .noOcclusion()) - .register(); - - public static final BlockEntry TRAIN_TRAPDOOR = - REGISTRATE.block("train_trapdoor", TrainTrapdoorBlock::new) - .initialProperties(SharedProperties::softMetal) - .properties(p -> p.color(MaterialColor.TERRACOTTA_CYAN) - .sound(SoundType.NETHERITE_BLOCK)) - .transform(BuilderTransformers.trapdoor(true)) - .register(); - - public static final BlockEntry FRAMED_GLASS_DOOR = - REGISTRATE.block("framed_glass_door", SlidingDoorBlock::new) - .transform(BuilderTransformers.slidingDoor("glass")) - .properties(p -> p.color(MaterialColor.NONE) - .sound(SoundType.GLASS) - .noOcclusion()) - .register(); - - public static final BlockEntry FRAMED_GLASS_TRAPDOOR = - REGISTRATE.block("framed_glass_trapdoor", TrainTrapdoorBlock::new) - .initialProperties(SharedProperties::softMetal) - .transform(BuilderTransformers.trapdoor(false)) - .properties(p -> p.color(MaterialColor.NONE) - .sound(SoundType.GLASS) - .noOcclusion()) - .onRegister(connectedTextures(TrapdoorCTBehaviour::new)) - .addLayer(() -> RenderType::cutoutMipped) - .register(); - public static final BlockEntry ITEM_VAULT = REGISTRATE.block("item_vault", ItemVaultBlock::new) .initialProperties(SharedProperties::softMetal) .properties(p -> p.color(MaterialColor.TERRACOTTA_BLUE)) @@ -2094,47 +1998,73 @@ public class AllBlocks { public static final BlockEntry ANDESITE_LADDER = REGISTRATE.block("andesite_ladder", MetalLadderBlock::new) - .transform( - BuilderTransformers.ladder("andesite", () -> DataIngredient.items(AllItems.ANDESITE_ALLOY.get()))) + .transform(BuilderTransformers.ladder("andesite", () -> DataIngredient.items(AllItems.ANDESITE_ALLOY.get()), + MaterialColor.STONE)) .register(); public static final BlockEntry BRASS_LADDER = REGISTRATE.block("brass_ladder", MetalLadderBlock::new) - .transform( - BuilderTransformers.ladder("brass", () -> DataIngredient.tag(AllTags.forgeItemTag("ingots/brass")))) + .transform(BuilderTransformers.ladder("brass", + () -> DataIngredient.tag(AllTags.forgeItemTag("ingots/brass")), MaterialColor.TERRACOTTA_YELLOW)) .register(); public static final BlockEntry COPPER_LADDER = REGISTRATE.block("copper_ladder", MetalLadderBlock::new) - .transform( - BuilderTransformers.ladder("copper", () -> DataIngredient.tag(AllTags.forgeItemTag("ingots/copper")))) + .transform(BuilderTransformers.ladder("copper", + () -> DataIngredient.tag(AllTags.forgeItemTag("ingots/copper")), MaterialColor.COLOR_ORANGE)) .register(); - public static final BlockEntry ANDESITE_BARS = - MetalBarsGen.createBars("andesite", true, () -> DataIngredient.items(AllItems.ANDESITE_ALLOY.get())); - public static final BlockEntry BRASS_BARS = - MetalBarsGen.createBars("brass", true, () -> DataIngredient.tag(AllTags.forgeItemTag("ingots/brass"))); - public static final BlockEntry COPPER_BARS = - MetalBarsGen.createBars("copper", true, () -> DataIngredient.tag(AllTags.forgeItemTag("ingots/copper"))); + public static final BlockEntry ANDESITE_BARS = MetalBarsGen.createBars("andesite", true, + () -> DataIngredient.items(AllItems.ANDESITE_ALLOY.get()), MaterialColor.STONE); + public static final BlockEntry BRASS_BARS = MetalBarsGen.createBars("brass", true, + () -> DataIngredient.tag(AllTags.forgeItemTag("ingots/brass")), MaterialColor.TERRACOTTA_YELLOW); + public static final BlockEntry COPPER_BARS = MetalBarsGen.createBars("copper", true, + () -> DataIngredient.tag(AllTags.forgeItemTag("ingots/copper")), MaterialColor.COLOR_ORANGE); - public static final BlockEntry ANDESITE_SCAFFOLD = - REGISTRATE.block("andesite_scaffolding", MetalScaffoldingBlock::new) - .transform(BuilderTransformers.scaffold("andesite", - () -> DataIngredient.items(AllItems.ANDESITE_ALLOY.get()), AllSpriteShifts.ANDESITE_SCAFFOLD, - AllSpriteShifts.ANDESITE_SCAFFOLD_INSIDE, AllSpriteShifts.ANDESITE_CASING)) - .register(); - - public static final BlockEntry BRASS_SCAFFOLD = REGISTRATE - .block("brass_scaffolding", MetalScaffoldingBlock::new) - .transform(BuilderTransformers.scaffold("brass", () -> DataIngredient.tag(AllTags.forgeItemTag("ingots/brass")), - AllSpriteShifts.BRASS_SCAFFOLD, AllSpriteShifts.BRASS_SCAFFOLD_INSIDE, AllSpriteShifts.BRASS_CASING)) + public static final BlockEntry ANDESITE_SCAFFOLD = REGISTRATE + .block("andesite_scaffolding", MetalScaffoldingBlock::new) + .transform(BuilderTransformers.scaffold("andesite", () -> DataIngredient.items(AllItems.ANDESITE_ALLOY.get()), + MaterialColor.STONE, AllSpriteShifts.ANDESITE_SCAFFOLD, AllSpriteShifts.ANDESITE_SCAFFOLD_INSIDE, + AllSpriteShifts.ANDESITE_CASING)) .register(); + public static final BlockEntry BRASS_SCAFFOLD = + REGISTRATE.block("brass_scaffolding", MetalScaffoldingBlock::new) + .transform(BuilderTransformers.scaffold("brass", + () -> DataIngredient.tag(AllTags.forgeItemTag("ingots/brass")), MaterialColor.TERRACOTTA_YELLOW, + AllSpriteShifts.BRASS_SCAFFOLD, AllSpriteShifts.BRASS_SCAFFOLD_INSIDE, AllSpriteShifts.BRASS_CASING)) + .register(); + public static final BlockEntry COPPER_SCAFFOLD = REGISTRATE.block("copper_scaffolding", MetalScaffoldingBlock::new) .transform(BuilderTransformers.scaffold("copper", - () -> DataIngredient.tag(AllTags.forgeItemTag("ingots/copper")), AllSpriteShifts.COPPER_SCAFFOLD, - AllSpriteShifts.COPPER_SCAFFOLD_INSIDE, AllSpriteShifts.COPPER_CASING)) + () -> DataIngredient.tag(AllTags.forgeItemTag("ingots/copper")), MaterialColor.COLOR_ORANGE, + AllSpriteShifts.COPPER_SCAFFOLD, AllSpriteShifts.COPPER_SCAFFOLD_INSIDE, AllSpriteShifts.COPPER_CASING)) + .register(); + + public static final BlockEntry METAL_GIRDER = REGISTRATE.block("metal_girder", GirderBlock::new) + .initialProperties(SharedProperties::softMetal) + .blockstate(GirderBlockStateGenerator::blockState) + .properties(p -> p.color(MaterialColor.COLOR_GRAY)) + .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) + .transform(pickaxeOnly()) + .onRegister(CreateRegistrate.blockModel(() -> ConnectedGirderModel::new)) + .item() + .transform(customItemModel()) + .register(); + + public static final BlockEntry METAL_GIRDER_ENCASED_SHAFT = + REGISTRATE.block("metal_girder_encased_shaft", GirderEncasedShaftBlock::new) + .initialProperties(SharedProperties::softMetal) + .blockstate(GirderBlockStateGenerator::blockStateWithShaft) + .properties(p -> p.color(MaterialColor.COLOR_GRAY)) + .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) + .transform(pickaxeOnly()) + .loot((p, b) -> p.add(b, RegistrateBlockLootTables.createSingleItemTable(METAL_GIRDER.get()) + .withPool(RegistrateBlockLootTables.applyExplosionCondition(SHAFT.get(), LootPool.lootPool() + .setRolls(ConstantValue.exactly(1.0F)) + .add(LootItem.lootTableItem(SHAFT.get())))))) + .onRegister(CreateRegistrate.blockModel(() -> ConnectedGirderModel::new)) .register(); public static final BlockEntry COPYCAT_BASE = REGISTRATE.block("copycat_base", Block::new) @@ -2169,7 +2099,103 @@ public class AllBlocks { .blockstate(new SpecialCopycatPanelBlockState("bars")::generate) .onRegister(CreateRegistrate.blockModel(() -> CopycatBarsModel::new)) .register(); - + + public static final DyedBlockList SEATS = new DyedBlockList<>(colour -> { + String colourName = colour.getSerializedName(); + SeatMovementBehaviour movementBehaviour = new SeatMovementBehaviour(); + SeatInteractionBehaviour interactionBehaviour = new SeatInteractionBehaviour(); + return REGISTRATE.block(colourName + "_seat", p -> new SeatBlock(p, colour, true)) + .initialProperties(SharedProperties::wooden) + .properties(p -> p.color(colour.getMaterialColor())) + .transform(axeOnly()) + .onRegister(movementBehaviour(movementBehaviour)) + .onRegister(interactionBehaviour(interactionBehaviour)) + .onRegister(assignDataBehaviour(new EntityNameDisplaySource(), "entity_name")) + .blockstate((c, p) -> { + p.simpleBlock(c.get(), p.models() + .withExistingParent(colourName + "_seat", p.modLoc("block/seat")) + .texture("1", p.modLoc("block/seat/top_" + colourName)) + .texture("2", p.modLoc("block/seat/side_" + colourName))); + }) + .recipe((c, p) -> { + ShapelessRecipeBuilder.shapeless(c.get()) + .requires(DyeHelper.getWoolOfDye(colour)) + .requires(ItemTags.WOODEN_SLABS) + .unlockedBy("has_wool", RegistrateRecipeProvider.has(ItemTags.WOOL)) + .save(p, Create.asResource("crafting/kinetics/" + c.getName())); + ShapelessRecipeBuilder.shapeless(c.get()) + .requires(colour.getTag()) + .requires(AllItemTags.SEATS.tag) + .unlockedBy("has_seat", RegistrateRecipeProvider.has(AllItemTags.SEATS.tag)) + .save(p, Create.asResource("crafting/kinetics/" + c.getName() + "_from_other_seat")); + }) + .onRegisterAfter(Registry.ITEM_REGISTRY, v -> ItemDescription.useKey(v, "block.create.seat")) + .tag(AllBlockTags.SEATS.tag) + .item() + .tag(AllItemTags.SEATS.tag) + .build() + .register(); + }); + + public static final BlockEntry ANDESITE_DOOR = + REGISTRATE.block("andesite_door", p -> new SlidingDoorBlock(p, true)) + .transform(BuilderTransformers.slidingDoor("andesite")) + .properties(p -> p.color(MaterialColor.STONE) + .sound(SoundType.STONE) + .noOcclusion()) + .register(); + + public static final BlockEntry BRASS_DOOR = + REGISTRATE.block("brass_door", p -> new SlidingDoorBlock(p, false)) + .transform(BuilderTransformers.slidingDoor("brass")) + .properties(p -> p.color(MaterialColor.TERRACOTTA_YELLOW) + .sound(SoundType.STONE) + .noOcclusion()) + .register(); + + public static final BlockEntry COPPER_DOOR = + REGISTRATE.block("copper_door", p -> new SlidingDoorBlock(p, true)) + .transform(BuilderTransformers.slidingDoor("copper")) + .properties(p -> p.color(MaterialColor.COLOR_ORANGE) + .sound(SoundType.STONE) + .noOcclusion()) + .register(); + + public static final BlockEntry TRAIN_DOOR = + REGISTRATE.block("train_door", p -> new SlidingDoorBlock(p, false)) + .transform(BuilderTransformers.slidingDoor("train")) + .properties(p -> p.color(MaterialColor.TERRACOTTA_CYAN) + .sound(SoundType.NETHERITE_BLOCK) + .noOcclusion()) + .register(); + + public static final BlockEntry TRAIN_TRAPDOOR = + REGISTRATE.block("train_trapdoor", TrainTrapdoorBlock::new) + .initialProperties(SharedProperties::softMetal) + .properties(p -> p.color(MaterialColor.TERRACOTTA_CYAN) + .sound(SoundType.NETHERITE_BLOCK)) + .transform(BuilderTransformers.trapdoor(true)) + .register(); + + public static final BlockEntry FRAMED_GLASS_DOOR = + REGISTRATE.block("framed_glass_door", p -> new SlidingDoorBlock(p, false)) + .transform(BuilderTransformers.slidingDoor("glass")) + .properties(p -> p.color(MaterialColor.NONE) + .sound(SoundType.GLASS) + .noOcclusion()) + .register(); + + public static final BlockEntry FRAMED_GLASS_TRAPDOOR = + REGISTRATE.block("framed_glass_trapdoor", TrainTrapdoorBlock::new) + .initialProperties(SharedProperties::softMetal) + .transform(BuilderTransformers.trapdoor(false)) + .properties(p -> p.color(MaterialColor.NONE) + .sound(SoundType.GLASS) + .noOcclusion()) + .onRegister(connectedTextures(TrapdoorCTBehaviour::new)) + .addLayer(() -> RenderType::cutoutMipped) + .register(); + public static final BlockEntry ZINC_ORE = REGISTRATE.block("zinc_ore", Block::new) .initialProperties(() -> Blocks.GOLD_ORE) .properties(p -> p.color(MaterialColor.METAL)) @@ -2230,7 +2256,7 @@ public class AllBlocks { .build() .lang("Block of Zinc") .register(); - + public static final BlockEntry ANDESITE_ALLOY_BLOCK = REGISTRATE.block("andesite_alloy_block", Block::new) .initialProperties(() -> Blocks.ANDESITE) .properties(p -> p.color(MaterialColor.STONE)) @@ -2243,7 +2269,7 @@ public class AllBlocks { .build() .lang("Block of Andesite Alloy") .register(); - + public static final BlockEntry INDUSTRIAL_IRON_BLOCK = REGISTRATE.block("industrial_iron_block", Block::new) .initialProperties(SharedProperties::softMetal) .properties(p -> p.color(MaterialColor.COLOR_GRAY)) diff --git a/src/main/java/com/simibubi/create/AllPartialModels.java b/src/main/java/com/simibubi/create/AllPartialModels.java index 341f66612..a0ca1a4fe 100644 --- a/src/main/java/com/simibubi/create/AllPartialModels.java +++ b/src/main/java/com/simibubi/create/AllPartialModels.java @@ -8,10 +8,12 @@ import java.util.Map; import com.jozufozu.flywheel.core.PartialModel; import com.simibubi.create.content.contraptions.fluids.FluidTransportBehaviour; +import com.simibubi.create.foundation.utility.Couple; import com.simibubi.create.foundation.utility.Iterate; import com.simibubi.create.foundation.utility.Lang; import net.minecraft.core.Direction; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.DyeColor; public class AllPartialModels { @@ -65,7 +67,7 @@ public class AllPartialModels { CUCKOO_PIG = block("cuckoo_clock/pig"), CUCKOO_CREEPER = block("cuckoo_clock/creeper"), GANTRY_COGS = block("gantry_carriage/wheels"), - + ROPE_COIL = block("rope_pulley/rope_coil"), ROPE_HALF = block("rope_pulley/rope_half"), ROPE_HALF_MAGNET = block("rope_pulley/rope_half_magnet"), @@ -188,6 +190,7 @@ public class AllPartialModels { public static final Map METAL_GIRDER_BRACKETS = new EnumMap<>(Direction.class); public static final Map TOOLBOX_LIDS = new EnumMap<>(DyeColor.class); + public static final Map> FOLDING_DOORS = new HashMap<>(); public static final List CONTRAPTION_CONTROLS_INDICATOR = new ArrayList<>(); static { @@ -205,6 +208,14 @@ public class AllPartialModels { METAL_GIRDER_BRACKETS.put(d, block("metal_girder/bracket_" + Lang.asId(d.name()))); for (int i = 0; i < 8; i++) CONTRAPTION_CONTROLS_INDICATOR.add(block("contraption_controls/indicator_" + i)); + + putFoldingDoor("andesite_door"); + putFoldingDoor("copper_door"); + } + + private static void putFoldingDoor(String path) { + FOLDING_DOORS.put(Create.asResource(path), + Couple.create(block(path + "/fold_left"), block(path + "/fold_right"))); } private static PartialModel block(String path) { diff --git a/src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorBlock.java b/src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorBlock.java index 9b2e80012..ecb77e7f7 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorBlock.java +++ b/src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorBlock.java @@ -38,19 +38,8 @@ import net.minecraftforge.eventbus.api.Event.Result; public class SlidingDoorBlock extends DoorBlock implements IWrenchable, IBE { - protected static final VoxelShape SE_AABB = Block.box(0.0D, 0.0D, -13.0D, 3.0D, 16.0D, 3.0D); - protected static final VoxelShape ES_AABB = Block.box(-13.0D, 0.0D, 0.0D, 3.0D, 16.0D, 3.0D); - - protected static final VoxelShape NW_AABB = Block.box(13.0D, 0.0D, 13.0D, 16.0D, 16.0D, 29.0D); - protected static final VoxelShape WN_AABB = Block.box(13.0D, 0.0D, 13.0D, 29.0D, 16.0D, 16.0D); - - protected static final VoxelShape SW_AABB = Block.box(13.0D, 0.0D, -13.0D, 16.0D, 16.0D, 3.0D); - protected static final VoxelShape WS_AABB = Block.box(13.0D, 0.0D, 0.0D, 29.0D, 16.0D, 3.0D); - - protected static final VoxelShape NE_AABB = Block.box(0.0D, 0.0D, 13.0D, 3.0D, 16.0D, 29.0D); - protected static final VoxelShape EN_AABB = Block.box(-13.0D, 0.0D, 13.0D, 3.0D, 16.0D, 16.0D); - public static final BooleanProperty VISIBLE = BooleanProperty.create("visible"); + private boolean folds; @Deprecated // Remove in 1.19 - Fixes incompatibility with Quarks double door module public static void stopItQuark(PlayerInteractEvent.RightClickBlock event) { @@ -64,14 +53,19 @@ public class SlidingDoorBlock extends DoorBlock implements IWrenchable, IBE (hinge ? ES_AABB : WS_AABB); - case WEST -> (hinge ? SW_AABB : NW_AABB); - case NORTH -> (hinge ? WN_AABB : EN_AABB); - default -> (hinge ? NE_AABB : SE_AABB); - }; + return SlidingDoorShapes.get(direction, hinge, isFoldingDoor()); } @Override diff --git a/src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorRenderer.java b/src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorRenderer.java index 123478ade..b085d2f19 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorRenderer.java +++ b/src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorRenderer.java @@ -1,9 +1,15 @@ package com.simibubi.create.content.curiosities.deco; +import com.jozufozu.flywheel.core.PartialModel; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import com.simibubi.create.AllPartialModels; import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; import com.simibubi.create.foundation.render.CachedBufferer; +import com.simibubi.create.foundation.render.SuperByteBuffer; +import com.simibubi.create.foundation.utility.AngleHelper; +import com.simibubi.create.foundation.utility.Couple; +import com.simibubi.create.foundation.utility.Iterate; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -36,12 +42,45 @@ public class SlidingDoorRenderer extends SafeBlockEntityRenderer partials = AllPartialModels.FOLDING_DOORS.get(blockState.getBlock() + .getRegistryName()); + + boolean flip = blockState.getValue(DoorBlock.HINGE) == DoorHingeSide.RIGHT; + for (boolean left : Iterate.trueAndFalse) { + SuperByteBuffer partial = CachedBufferer.partial(partials.get(left ^ flip), blockState); + float f = flip ? -1 : 1; + + partial.translate(0, -1 / 512f, 0) + .translate(Vec3.atLowerCornerOf(facing.getNormal()) + .scale(value2 * 1 / 32f)); + partial.rotateCentered(Direction.UP, + Mth.DEG_TO_RAD * AngleHelper.horizontalAngle(facing.getClockWise())); + + if (flip) + partial.translate(0, 0, 1); + partial.rotateY(91 * f * value * value); + + if (!left) + partial.translate(0, 0, f / 2f) + .rotateY(-181 * f * value * value); + + if (flip) + partial.translate(0, 0, -1 / 2f); + + partial.light(light) + .renderInto(ms, vb); + } + + return; + } + for (DoubleBlockHalf half : DoubleBlockHalf.values()) { CachedBufferer.block(blockState.setValue(DoorBlock.OPEN, false) .setValue(DoorBlock.HALF, half)) diff --git a/src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorShapes.java b/src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorShapes.java new file mode 100644 index 000000000..00b4759bd --- /dev/null +++ b/src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorShapes.java @@ -0,0 +1,44 @@ +package com.simibubi.create.content.curiosities.deco; + +import net.minecraft.core.Direction; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.phys.shapes.VoxelShape; + +public class SlidingDoorShapes { + + protected static final VoxelShape SE_AABB = Block.box(0.0D, 0.0D, -13.0D, 3.0D, 16.0D, 3.0D); + protected static final VoxelShape ES_AABB = Block.box(-13.0D, 0.0D, 0.0D, 3.0D, 16.0D, 3.0D); + protected static final VoxelShape NW_AABB = Block.box(13.0D, 0.0D, 13.0D, 16.0D, 16.0D, 29.0D); + protected static final VoxelShape WN_AABB = Block.box(13.0D, 0.0D, 13.0D, 29.0D, 16.0D, 16.0D); + protected static final VoxelShape SW_AABB = Block.box(13.0D, 0.0D, -13.0D, 16.0D, 16.0D, 3.0D); + protected static final VoxelShape WS_AABB = Block.box(13.0D, 0.0D, 0.0D, 29.0D, 16.0D, 3.0D); + protected static final VoxelShape NE_AABB = Block.box(0.0D, 0.0D, 13.0D, 3.0D, 16.0D, 29.0D); + protected static final VoxelShape EN_AABB = Block.box(-13.0D, 0.0D, 13.0D, 3.0D, 16.0D, 16.0D); + + protected static final VoxelShape SE_AABB_FOLD = Block.box(0.0D, 0.0D, -3.0D, 9.0D, 16.0D, 3.0D); + protected static final VoxelShape ES_AABB_FOLD = Block.box(-3.0D, 0.0D, 0.0D, 3.0D, 16.0D, 9.0D); + protected static final VoxelShape NW_AABB_FOLD = Block.box(7.0D, 0.0D, 13.0D, 16.0D, 16.0D, 19.0D); + protected static final VoxelShape WN_AABB_FOLD = Block.box(13.0D, 0.0D, 7.0D, 19.0D, 16.0D, 16.0D); + protected static final VoxelShape SW_AABB_FOLD = Block.box(7.0D, 0.0D, -3.0D, 16.0D, 16.0D, 3.0D); + protected static final VoxelShape WS_AABB_FOLD = Block.box(13.0D, 0.0D, 0.0D, 19.0D, 16.0D, 9.0D); + protected static final VoxelShape NE_AABB_FOLD = Block.box(0.0D, 0.0D, 13.0D, 9.0D, 16.0D, 19.0D); + protected static final VoxelShape EN_AABB_FOLD = Block.box(-3.0D, 0.0D, 7.0D, 3.0D, 16.0D, 16.0D); + + public static VoxelShape get(Direction facing, boolean hinge, boolean fold) { + if (fold) + return switch (facing) { + case SOUTH -> (hinge ? ES_AABB_FOLD : WS_AABB_FOLD); + case WEST -> (hinge ? SW_AABB_FOLD : NW_AABB_FOLD); + case NORTH -> (hinge ? WN_AABB_FOLD : EN_AABB_FOLD); + default -> (hinge ? NE_AABB_FOLD : SE_AABB_FOLD); + }; + + return switch (facing) { + case SOUTH -> (hinge ? ES_AABB : WS_AABB); + case WEST -> (hinge ? SW_AABB : NW_AABB); + case NORTH -> (hinge ? WN_AABB : EN_AABB); + default -> (hinge ? NE_AABB : SE_AABB); + }; + } + +} diff --git a/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java b/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java index 48678d564..0ade21bfc 100644 --- a/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java +++ b/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java @@ -227,8 +227,9 @@ public class BuilderTransformers { } public static NonNullUnaryOperator> ladder(String name, - Supplier ingredient) { + Supplier ingredient, MaterialColor color) { return b -> b.initialProperties(() -> Blocks.LADDER) + .properties(p -> p.color(color)) .addLayer(() -> RenderType::cutout) .blockstate((c, p) -> p.horizontalBlock(c.get(), p.models() .withExistingParent(c.getName(), p.modLoc("block/ladder")) @@ -245,10 +246,11 @@ public class BuilderTransformers { } public static NonNullUnaryOperator> scaffold(String name, - Supplier ingredient, CTSpriteShiftEntry scaffoldShift, CTSpriteShiftEntry scaffoldInsideShift, - CTSpriteShiftEntry casingShift) { + Supplier ingredient, MaterialColor color, CTSpriteShiftEntry scaffoldShift, + CTSpriteShiftEntry scaffoldInsideShift, CTSpriteShiftEntry casingShift) { return b -> b.initialProperties(() -> Blocks.SCAFFOLDING) - .properties(p -> p.sound(SoundType.COPPER)) + .properties(p -> p.sound(SoundType.COPPER) + .color(color)) .addLayer(() -> RenderType::cutout) .blockstate((c, p) -> p.getVariantBuilder(c.get()) .forAllStatesExcept(s -> { diff --git a/src/main/java/com/simibubi/create/foundation/data/MetalBarsGen.java b/src/main/java/com/simibubi/create/foundation/data/MetalBarsGen.java index 3f583a8f9..1697cf211 100644 --- a/src/main/java/com/simibubi/create/foundation/data/MetalBarsGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/MetalBarsGen.java @@ -22,6 +22,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.IronBarsBlock; import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.material.MaterialColor; import net.minecraftforge.client.model.generators.ModelFile; public class MetalBarsGen { @@ -121,11 +122,12 @@ public class MetalBarsGen { } public static BlockEntry createBars(String name, boolean specialEdge, - Supplier ingredient) { + Supplier ingredient, MaterialColor color) { return REGISTRATE.block(name + "_bars", IronBarsBlock::new) .addLayer(() -> RenderType::cutoutMipped) .initialProperties(() -> Blocks.IRON_BARS) - .properties(p -> p.sound(SoundType.COPPER)) + .properties(p -> p.sound(SoundType.COPPER) + .color(color)) .tag(AllBlockTags.WRENCH_PICKUP.tag) .tag(AllBlockTags.FAN_TRANSPARENT.tag) .blockstate(barsBlockState(name, specialEdge)) diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java index 253ffb08c..0120a318c 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java @@ -335,14 +335,29 @@ public class StandardRecipeGen extends CreateRecipeProvider { .requires(I.brassSheet())), TRAIN_DOOR = create(AllBlocks.TRAIN_DOOR).returns(1) - .unlockedByTag(() -> I.brass()) + .unlockedBy(() -> I.railwayCasing()) .viaShapeless(b -> b.requires(ItemTags.WOODEN_DOORS) - .requires(I.brassSheet())), + .requires(I.railwayCasing())), + + ANDESITE_DOOR = create(AllBlocks.ANDESITE_DOOR).returns(1) + .unlockedBy(() -> I.andesiteCasing()) + .viaShapeless(b -> b.requires(ItemTags.WOODEN_DOORS) + .requires(I.andesiteCasing())), + + BRASS_DOOR = create(AllBlocks.BRASS_DOOR).returns(1) + .unlockedBy(() -> I.brassCasing()) + .viaShapeless(b -> b.requires(ItemTags.WOODEN_DOORS) + .requires(I.brassCasing())), + + COPPER_DOOR = create(AllBlocks.COPPER_DOOR).returns(1) + .unlockedBy(() -> I.copperCasing()) + .viaShapeless(b -> b.requires(ItemTags.WOODEN_DOORS) + .requires(I.copperCasing())), TRAIN_TRAPDOOR = create(AllBlocks.TRAIN_TRAPDOOR).returns(1) - .unlockedByTag(() -> I.brass()) + .unlockedBy(() -> I.railwayCasing()) .viaShapeless(b -> b.requires(ItemTags.WOODEN_TRAPDOORS) - .requires(I.brassSheet())), + .requires(I.railwayCasing())), FRAMED_GLASS_DOOR = create(AllBlocks.FRAMED_GLASS_DOOR).returns(1) .unlockedBy(AllPaletteBlocks.FRAMED_GLASS::get) @@ -650,7 +665,7 @@ public class StandardRecipeGen extends CreateRecipeProvider { .pattern("B") .pattern("C") .pattern("I")), - + CONTRAPTION_CONTROLS = create(AllBlocks.CONTRAPTION_CONTROLS).unlockedBy(I::andesite) .viaShaped(b -> b.define('B', ItemTags.BUTTONS) .define('C', I.andesiteCasing()) @@ -915,7 +930,7 @@ public class StandardRecipeGen extends CreateRecipeProvider { .pattern("R") .pattern("B") .pattern("I")), - + THRESHOLD_SWITCH = create(AllBlocks.THRESHOLD_SWITCH).unlockedBy(I::brassCasing) .viaShaped(b -> b.define('B', I.brassCasing()) .define('R', I.electronTube()) @@ -1036,10 +1051,8 @@ public class StandardRecipeGen extends CreateRecipeProvider { .pattern("P") .pattern("G")), - CLIPBOARD_CLEAR = clearData(AllBlocks.CLIPBOARD), - SCHEDULE_CLEAR = clearData(AllItems.SCHEDULE), - FILTER_CLEAR = clearData(AllItems.FILTER), - ATTRIBUTE_FILTER_CLEAR = clearData(AllItems.ATTRIBUTE_FILTER), + CLIPBOARD_CLEAR = clearData(AllBlocks.CLIPBOARD), SCHEDULE_CLEAR = clearData(AllItems.SCHEDULE), + FILTER_CLEAR = clearData(AllItems.FILTER), ATTRIBUTE_FILTER_CLEAR = clearData(AllItems.ATTRIBUTE_FILTER), DIVING_HELMET = create(AllItems.COPPER_DIVING_HELMET).unlockedBy(I::copper) .viaShaped(b -> b.define('G', Tags.Items.GLASS) diff --git a/src/main/resources/assets/create/models/block/andesite_door/block_bottom.json b/src/main/resources/assets/create/models/block/andesite_door/block_bottom.json new file mode 100644 index 000000000..031dfea51 --- /dev/null +++ b/src/main/resources/assets/create/models/block/andesite_door/block_bottom.json @@ -0,0 +1,22 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "create:block/andesite_door_side", + "2": "create:block/andesite_door_bottom", + "particle": "create:block/andesite_casing" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [3, 16, 16], + "faces": { + "north": {"uv": [0, 12, 16, 15], "rotation": 270, "texture": "#0"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "south": {"uv": [0, 12, 16, 15], "rotation": 270, "texture": "#0"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "down": {"uv": [0, 8, 16, 11], "rotation": 90, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/andesite_door/block_top.json b/src/main/resources/assets/create/models/block/andesite_door/block_top.json new file mode 100644 index 000000000..f9c8bf504 --- /dev/null +++ b/src/main/resources/assets/create/models/block/andesite_door/block_top.json @@ -0,0 +1,22 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "create:block/andesite_door_side", + "2": "create:block/andesite_door_top", + "particle": "create:block/andesite_casing" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [3, 16, 16], + "faces": { + "north": {"uv": [0, 4, 16, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "south": {"uv": [0, 4, 16, 7], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "up": {"uv": [0, 0, 16, 3], "rotation": 90, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/andesite_door/fold_left.json b/src/main/resources/assets/create/models/block/andesite_door/fold_left.json new file mode 100644 index 000000000..a12a4964b --- /dev/null +++ b/src/main/resources/assets/create/models/block/andesite_door/fold_left.json @@ -0,0 +1,34 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "create:block/andesite_door_side", + "2": "create:block/andesite_door_top", + "3": "create:block/andesite_door_bottom", + "particle": "create:block/andesite_casing" + }, + "elements": [ + { + "from": [0, 16, 0], + "to": [3, 32, 8], + "faces": { + "north": {"uv": [0, 4, 16, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [8, 0, 16, 16], "texture": "#2"}, + "south": {"uv": [0, 4, 16, 7], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 0, 8, 16], "texture": "#2"}, + "up": {"uv": [0, 0, 8, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [0, 0, 0], + "to": [3, 16, 8], + "faces": { + "north": {"uv": [16, 4, 0, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [8, 0, 16, 16], "texture": "#3"}, + "south": {"uv": [16, 4, 0, 7], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 0, 8, 16], "texture": "#3"}, + "down": {"uv": [0, 8, 8, 11], "rotation": 270, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/andesite_door/fold_right.json b/src/main/resources/assets/create/models/block/andesite_door/fold_right.json new file mode 100644 index 000000000..5da0deb6a --- /dev/null +++ b/src/main/resources/assets/create/models/block/andesite_door/fold_right.json @@ -0,0 +1,34 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "create:block/andesite_door_side", + "2": "create:block/andesite_door_top", + "3": "create:block/andesite_door_bottom", + "particle": "create:block/andesite_casing" + }, + "elements": [ + { + "from": [0, 16, 0], + "to": [3, 32, 8], + "faces": { + "north": {"uv": [0, 4, 16, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 0, 8, 16], "texture": "#2"}, + "south": {"uv": [0, 4, 16, 7], "rotation": 90, "texture": "#0"}, + "west": {"uv": [8, 0, 16, 16], "texture": "#2"}, + "up": {"uv": [8, 0, 16, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [0, 0, 0], + "to": [3, 16, 8], + "faces": { + "north": {"uv": [16, 4, 0, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 0, 8, 16], "texture": "#3"}, + "south": {"uv": [16, 4, 0, 7], "rotation": 90, "texture": "#0"}, + "west": {"uv": [8, 0, 16, 16], "texture": "#3"}, + "down": {"uv": [8, 8, 16, 11], "rotation": 270, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/brass_door/block_bottom.json b/src/main/resources/assets/create/models/block/brass_door/block_bottom.json new file mode 100644 index 000000000..198ec8677 --- /dev/null +++ b/src/main/resources/assets/create/models/block/brass_door/block_bottom.json @@ -0,0 +1,22 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "create:block/brass_door_side", + "2": "create:block/brass_door_bottom", + "particle": "create:block/brass_casing" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [3, 16, 16], + "faces": { + "north": {"uv": [0, 12, 16, 15], "rotation": 270, "texture": "#0"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "south": {"uv": [0, 12, 16, 15], "rotation": 270, "texture": "#0"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "down": {"uv": [0, 8, 16, 11], "rotation": 90, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/brass_door/block_top.json b/src/main/resources/assets/create/models/block/brass_door/block_top.json new file mode 100644 index 000000000..46a4b3519 --- /dev/null +++ b/src/main/resources/assets/create/models/block/brass_door/block_top.json @@ -0,0 +1,22 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "create:block/brass_door_side", + "2": "create:block/brass_door_top", + "particle": "create:block/brass_casing" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [3, 16, 16], + "faces": { + "north": {"uv": [0, 4, 16, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "south": {"uv": [0, 4, 16, 7], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "up": {"uv": [0, 0, 16, 3], "rotation": 90, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/copper_door/block_bottom.json b/src/main/resources/assets/create/models/block/copper_door/block_bottom.json new file mode 100644 index 000000000..0611f158e --- /dev/null +++ b/src/main/resources/assets/create/models/block/copper_door/block_bottom.json @@ -0,0 +1,22 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "create:block/copper_door_side", + "2": "create:block/copper_door_bottom", + "particle": "create:block/copper_casing" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [3, 16, 16], + "faces": { + "north": {"uv": [0, 12, 16, 15], "rotation": 270, "texture": "#0"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "south": {"uv": [0, 12, 16, 15], "rotation": 270, "texture": "#0"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "down": {"uv": [0, 8, 16, 11], "rotation": 90, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/copper_door/block_top.json b/src/main/resources/assets/create/models/block/copper_door/block_top.json new file mode 100644 index 000000000..ec3bcee26 --- /dev/null +++ b/src/main/resources/assets/create/models/block/copper_door/block_top.json @@ -0,0 +1,22 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "create:block/copper_door_side", + "2": "create:block/copper_door_top", + "particle": "create:block/copper_casing" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [3, 16, 16], + "faces": { + "north": {"uv": [0, 4, 16, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "south": {"uv": [0, 4, 16, 7], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "up": {"uv": [0, 0, 16, 3], "rotation": 90, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/copper_door/fold_left.json b/src/main/resources/assets/create/models/block/copper_door/fold_left.json new file mode 100644 index 000000000..02f85e1a9 --- /dev/null +++ b/src/main/resources/assets/create/models/block/copper_door/fold_left.json @@ -0,0 +1,34 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "create:block/copper_door_side", + "2": "create:block/copper_door_top", + "3": "create:block/copper_door_bottom", + "particle": "create:block/copper_casing" + }, + "elements": [ + { + "from": [0, 16, 0], + "to": [3, 32, 8], + "faces": { + "north": {"uv": [0, 4, 16, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [8, 0, 16, 16], "texture": "#2"}, + "south": {"uv": [0, 4, 16, 7], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 0, 8, 16], "texture": "#2"}, + "up": {"uv": [0, 0, 8, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [0, 0, 0], + "to": [3, 16, 8], + "faces": { + "north": {"uv": [16, 4, 0, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [8, 0, 16, 16], "texture": "#3"}, + "south": {"uv": [16, 4, 0, 7], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 0, 8, 16], "texture": "#3"}, + "down": {"uv": [0, 8, 8, 11], "rotation": 270, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/copper_door/fold_right.json b/src/main/resources/assets/create/models/block/copper_door/fold_right.json new file mode 100644 index 000000000..c13051b64 --- /dev/null +++ b/src/main/resources/assets/create/models/block/copper_door/fold_right.json @@ -0,0 +1,34 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "create:block/copper_door_side", + "2": "create:block/copper_door_top", + "3": "create:block/copper_door_bottom", + "particle": "create:block/copper_casing" + }, + "elements": [ + { + "from": [0, 16, 0], + "to": [3, 32, 8], + "faces": { + "north": {"uv": [0, 4, 16, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 0, 8, 16], "texture": "#2"}, + "south": {"uv": [0, 4, 16, 7], "rotation": 90, "texture": "#0"}, + "west": {"uv": [8, 0, 16, 16], "texture": "#2"}, + "up": {"uv": [8, 0, 16, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [0, 0, 0], + "to": [3, 16, 8], + "faces": { + "north": {"uv": [16, 4, 0, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 0, 8, 16], "texture": "#3"}, + "south": {"uv": [16, 4, 0, 7], "rotation": 90, "texture": "#0"}, + "west": {"uv": [8, 0, 16, 16], "texture": "#3"}, + "down": {"uv": [8, 8, 16, 11], "rotation": 270, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/block/andesite_door_bottom.png b/src/main/resources/assets/create/textures/block/andesite_door_bottom.png new file mode 100644 index 000000000..5fdd59f6b Binary files /dev/null and b/src/main/resources/assets/create/textures/block/andesite_door_bottom.png differ diff --git a/src/main/resources/assets/create/textures/block/andesite_door_side.png b/src/main/resources/assets/create/textures/block/andesite_door_side.png new file mode 100644 index 000000000..0fdbac4a3 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/andesite_door_side.png differ diff --git a/src/main/resources/assets/create/textures/block/andesite_door_top.png b/src/main/resources/assets/create/textures/block/andesite_door_top.png new file mode 100644 index 000000000..e899195ae Binary files /dev/null and b/src/main/resources/assets/create/textures/block/andesite_door_top.png differ diff --git a/src/main/resources/assets/create/textures/block/brass_door_bottom.png b/src/main/resources/assets/create/textures/block/brass_door_bottom.png new file mode 100644 index 000000000..ac561580f Binary files /dev/null and b/src/main/resources/assets/create/textures/block/brass_door_bottom.png differ diff --git a/src/main/resources/assets/create/textures/block/brass_door_side.png b/src/main/resources/assets/create/textures/block/brass_door_side.png new file mode 100644 index 000000000..b511e27a8 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/brass_door_side.png differ diff --git a/src/main/resources/assets/create/textures/block/brass_door_top.png b/src/main/resources/assets/create/textures/block/brass_door_top.png new file mode 100644 index 000000000..f99391b67 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/brass_door_top.png differ diff --git a/src/main/resources/assets/create/textures/block/copper_door_bottom.png b/src/main/resources/assets/create/textures/block/copper_door_bottom.png new file mode 100644 index 000000000..819f31c47 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/copper_door_bottom.png differ diff --git a/src/main/resources/assets/create/textures/block/copper_door_side.png b/src/main/resources/assets/create/textures/block/copper_door_side.png new file mode 100644 index 000000000..d9feb0edc Binary files /dev/null and b/src/main/resources/assets/create/textures/block/copper_door_side.png differ diff --git a/src/main/resources/assets/create/textures/block/copper_door_top.png b/src/main/resources/assets/create/textures/block/copper_door_top.png new file mode 100644 index 000000000..f7dd8dadb Binary files /dev/null and b/src/main/resources/assets/create/textures/block/copper_door_top.png differ diff --git a/src/main/resources/assets/create/textures/item/andesite_door.png b/src/main/resources/assets/create/textures/item/andesite_door.png new file mode 100644 index 000000000..6edcbbdb8 Binary files /dev/null and b/src/main/resources/assets/create/textures/item/andesite_door.png differ diff --git a/src/main/resources/assets/create/textures/item/brass_door.png b/src/main/resources/assets/create/textures/item/brass_door.png new file mode 100644 index 000000000..8e60729b1 Binary files /dev/null and b/src/main/resources/assets/create/textures/item/brass_door.png differ diff --git a/src/main/resources/assets/create/textures/item/copper_door.png b/src/main/resources/assets/create/textures/item/copper_door.png new file mode 100644 index 000000000..fb5356c31 Binary files /dev/null and b/src/main/resources/assets/create/textures/item/copper_door.png differ