diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index b89ffae8f..8e657704f 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -5,25 +5,31 @@ f0d6baaabda94151134f569246d61a6e710c35a9 assets\create\blockstates\acacia_window 79c50afcea3a360783a5b3c73de9823511e9aed9 assets\create\blockstates\adjustable_pulse_repeater.json 1d730df54c9eae94063e37396d224fb3c87517e0 assets\create\blockstates\adjustable_repeater.json 9dd79bf5430f674e7d3e3fc7d59edee3d66e241e assets\create\blockstates\analog_lever.json +aaad1fc11aae17e209b0c3fbc9977c724c50c1ef assets\create\blockstates\andesite_belt_funnel.json 585481e97c5066af63ea12fa5dd658798844d64c assets\create\blockstates\andesite_bricks.json 4e8d61aa2c8490301317ef747f67f0169ebfc2ed assets\create\blockstates\andesite_bricks_slab.json da63a8be3191d6d72afef6c79e3aea3f607631f9 assets\create\blockstates\andesite_bricks_stairs.json a579c40c43dc2174afb66f42d00d0c4a0efaaeee assets\create\blockstates\andesite_bricks_wall.json 9999a75c7766781eadb12510a09264600bc846e4 assets\create\blockstates\andesite_casing.json +7074f8af642b74edc26464bb627d919516c2de0a assets\create\blockstates\andesite_chute_funnel.json 3af4ea3c44b5ebc7e1e3fb73fb8356faf067a613 assets\create\blockstates\andesite_cobblestone.json 97adf53a7cb99d7652fb39adc957e9e34cbaca47 assets\create\blockstates\andesite_cobblestone_slab.json 96b5284693da168ab8e0809d86515b5f1a7e763f assets\create\blockstates\andesite_cobblestone_stairs.json 82bd82270aff7d51e9239680ef4dd7b5c899ceb0 assets\create\blockstates\andesite_cobblestone_wall.json +2be950008c00513dfe39021b65c26eea8554ee20 assets\create\blockstates\andesite_funnel.json 398922758a6219544e5b85c91c9cf8a543b437e5 assets\create\blockstates\andesite_pillar.json +a9f73f228f2cde7f707fab3467e57a9080233433 assets\create\blockstates\andesite_tunnel.json f9fa6aa530eb0891a74eadfbebc663172a57147a assets\create\blockstates\basin.json 39dc813be2049a42475f93d12f9f2e356139cf1b assets\create\blockstates\belt.json -9bbc9a2dc2428175ae0cadf7537ed6815e3e241d assets\create\blockstates\belt_funnel.json 40d10934934ea142d71fc6ce598b1455c3ad47b4 assets\create\blockstates\belt_observer.json -4325605fbdea60d5f54286c309c825bebcd74b95 assets\create\blockstates\belt_tunnel.json cf9045eb16e5299a1d917c4cb536289f49411276 assets\create\blockstates\birch_window.json 94a1a91403eb4b035fec48071e7fcae57a8a6abd assets\create\blockstates\birch_window_pane.json +fba967b1f6e44b34a9d9662e2fedfc13aad7f36c assets\create\blockstates\brass_belt_funnel.json 8b1dd00adcc7e74c5a9feed069e2610b15a338cb assets\create\blockstates\brass_block.json b8dd6e505943e06706d0718ece620ab3cf943650 assets\create\blockstates\brass_casing.json +e8583247cc7108c80320b739d7af121a890d79a8 assets\create\blockstates\brass_chute_funnel.json +3057e1121117c0cd651c288cd8e2d46bdf64afb1 assets\create\blockstates\brass_funnel.json +a967a349df6ca76b772abed915545abbca515c90 assets\create\blockstates\brass_tunnel.json 26f3b6a8f8249e4e622ab200057d75e228762817 assets\create\blockstates\cart_assembler.json 7299cea212d879d6d5611bd139b24768b9af236f assets\create\blockstates\chiseled_dark_scoria.json 0f01f813388d3e6907c1cfd992e4b21c914e267e assets\create\blockstates\chiseled_dolomite.json @@ -32,7 +38,6 @@ b8dd6e505943e06706d0718ece620ab3cf943650 assets\create\blockstates\brass_casing. cbcdab42d01f8085db9e5f8db884f8adf7f17625 assets\create\blockstates\chiseled_scoria.json 291952556c52fba2af5bbd793c71af81abd27e71 assets\create\blockstates\chiseled_weathered_limestone.json 99def0a786714a337e2b1b17db844e4d1aee6234 assets\create\blockstates\chute.json -dabf21c320b6d33486478cb0e4b4bbd62a753c7a assets\create\blockstates\chute_funnel.json 4947c261310445fa55b92038326ac82967d192dd assets\create\blockstates\clockwork_bearing.json 1f33834c685e3243882acfe20183fe64dfa872be assets\create\blockstates\clutch.json e5e3757e99c139d67b2a70288466d8a74d818841 assets\create\blockstates\cogwheel.json @@ -123,7 +128,6 @@ b2a7c321b1795f20e7433f81a55ce4683de081b8 assets\create\blockstates\fancy_weather e9da1794b6ece7f9aa8bcb43d42c23a55446133b assets\create\blockstates\flywheel.json ac00d40e1ef50a37041c0481afa1a23a14dea78e assets\create\blockstates\framed_glass.json 61df7769fa61f6dd2868a4377e54320fdd473b4e assets\create\blockstates\framed_glass_pane.json -3cc74c51eb8fc2bbe9285ad0ae640ece0a602bae assets\create\blockstates\funnel.json 3cf49f4812732f00f578fa73785e14ffdf340f21 assets\create\blockstates\furnace_engine.json f512b70d7fd0ca10184f21f5bfb71c83ab11f8ef assets\create\blockstates\gabbro.json d2358eb3d9337741f55339f0b94b2e81d73965c8 assets\create\blockstates\gabbro_bricks.json @@ -283,7 +287,6 @@ e8b0a401c10d1ba67ed71ba31bd5f9bc28571b65 assets\create\blockstates\powered_toggl 3a739f9d4276828d83f2d2750bf3227c87bcd438 assets\create\blockstates\pulley_magnet.json 469e430d96cb0a5e1aaf6b7cc5d401d488c9e600 assets\create\blockstates\pulse_repeater.json 6fa36883e76e9e403bb429c8f86b8c0d3bba0cff assets\create\blockstates\radial_chassis.json -5e03eb759050c365f9f452ef0659f19a80e1e2f8 assets\create\blockstates\reality_funnel.json 8929677f2cc5354aa19ef182af69f9f0b41eb242 assets\create\blockstates\redstone_contact.json c29213b77ac0c78d8979c5f6188d2b265696f9b9 assets\create\blockstates\redstone_link.json 1eac804cba08aebb5f4646758ae1ef9b32e01365 assets\create\blockstates\reinforced_rail.json @@ -318,7 +321,6 @@ a8094531617e27a545c4815ab2062bf0ffca3633 assets\create\blockstates\turntable.jso d45450255fd7a64cfd2bd8856fd4cff01a49cc8d assets\create\blockstates\vertical_extractor.json 69dfe8afaa8eb6105dae9f76ab8b7847bf90b8c6 assets\create\blockstates\vertical_framed_glass.json c4db76b9d36cfb098df0d158cb6f8b82768ebe14 assets\create\blockstates\vertical_framed_glass_pane.json -3ecf6ddcf6d31a04b98e1d9a46a1db04278041d9 assets\create\blockstates\vertical_funnel.json 0ecc57db2487ed6b370b9cc43d2a873c61d7c37e assets\create\blockstates\vertical_linked_extractor.json 751b99625aca1b4122a0333bfaf93325d37eb003 assets\create\blockstates\vertical_linked_transposer.json 02199afb5b6ebcbc8e11567df05f39eface39e39 assets\create\blockstates\vertical_transposer.json @@ -335,17 +337,17 @@ c60c3115fd6eeaa3a696428a87a74d184ab7d62d assets\create\blockstates\weathered_lim c77b46d8b459e5c7cc495393546f3fcca8a1fa1d assets\create\blockstates\weathered_limestone_pillar.json 7f39521b211441f5c3e06d60c5978cebe16cacfb assets\create\blockstates\zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets\create\blockstates\zinc_ore.json -d6d4eaadc6f2c86dd69b8a818ca7352b85be52cd assets\create\lang\en_ud.json -b149cd24e07fcadf25331bac859c313373617462 assets\create\lang\en_us.json -feb13f2c71a8ccc5c9a1b3cd58f0e06db6e89825 assets\create\lang\unfinished\de_de.json -e06e04eb9c06679cef7b3b1273c02e83297bf3cb assets\create\lang\unfinished\fr_fr.json -78973e80977ebc94dfadbfc6cd21de91c673f32a assets\create\lang\unfinished\it_it.json -dd821fcf079b96bd636350f9b3c77da13fa8dfc5 assets\create\lang\unfinished\ja_jp.json -92058021567b46150322be87120ca009cf74f808 assets\create\lang\unfinished\ko_kr.json -c076938f726f8ed92ebc8bb27b9df415fb8f06be assets\create\lang\unfinished\nl_nl.json -e4562ef48bd555d84dbe13233e850e0bd0917a90 assets\create\lang\unfinished\pt_br.json -dfacb15608f4b043e06a6ac9441234acbfccf708 assets\create\lang\unfinished\ru_ru.json -a685880eb8e0dd580f74675e66e8470b01415c50 assets\create\lang\unfinished\zh_cn.json +541831ab0cf2f0222f0b7e42ec6c4b0ae636168d assets\create\lang\en_ud.json +fe44adfde38a1084754fe46b632811f90dcfcd7f assets\create\lang\en_us.json +143b76ed828949330ef0e338fb6709c28561ac2d assets\create\lang\unfinished\de_de.json +95bf7693b162141c2c76617ed4e04bec474e2def assets\create\lang\unfinished\fr_fr.json +b3bf60afc7d0dea72a9d7d01df36d34affd6a296 assets\create\lang\unfinished\it_it.json +ef336e01a8e3ed3f8c2713c66476bcc708e3e3b0 assets\create\lang\unfinished\ja_jp.json +66c84c388e552ee8259eca2ab1009493456fc4d3 assets\create\lang\unfinished\ko_kr.json +66b3140ef158b51208a191e6a90473fba5bb1749 assets\create\lang\unfinished\nl_nl.json +775702e0f3fbdab7ef8b1714e3cff69da56bd500 assets\create\lang\unfinished\pt_br.json +7c4c4e7a00456f893538a6baa35d726a8786bf93 assets\create\lang\unfinished\ru_ru.json +ce16074d9dc5d504f2a91b164258f0059163260b assets\create\lang\unfinished\zh_cn.json 846200eb548d3bfa2e77b41039de159b4b6cfb45 assets\create\models\block\acacia_window.json 1930fa3a3c98d53dd19e4ee7f55bc27fd47aa281 assets\create\models\block\acacia_window_pane_noside.json 1763ea2c9b981d187f5031ba608f3d5d3be3986a assets\create\models\block\acacia_window_pane_noside_alt.json @@ -368,6 +370,10 @@ cda6f9761431c5b8538f746db2dc55e5fb57bf01 assets\create\models\block\adjustable_p ce5e0cd1598cf2228bb77a68c304dd210f3848f8 assets\create\models\block\adjustable_repeater_powered.json c82a31943f5adb4a64c6db4c48c94cbce5d95bc4 assets\create\models\block\adjustable_repeater_powered_powering.json 51cf61f8bc25cf62b0e0c0705c75512809358ff0 assets\create\models\block\adjustable_repeater_powering.json +e4af27010c74bb5b1e79b6fccf1669526e1bb5e3 assets\create\models\block\andesite_belt_funnel_pull_extended.json +502916dc860e5ba971af51c640192b5ac02e574f assets\create\models\block\andesite_belt_funnel_pull_retracted.json +f1ba5c40d5e580d3c46d2eeab37b59263d0b0904 assets\create\models\block\andesite_belt_funnel_push_extended.json +5689f01354dcb8bf1547467c7c5b86468f962bce assets\create\models\block\andesite_belt_funnel_push_retracted.json 4d412de3eb98dfee548a0dcdbae5d0168ac67123 assets\create\models\block\andesite_bricks.json 054ef3fff7f146dbf8adc92dc2b6d169c2bdb7a5 assets\create\models\block\andesite_bricks_slab.json 8784414839f6a5786bf43d6a7dff6c27bdf7fe46 assets\create\models\block\andesite_bricks_slab_top.json @@ -377,6 +383,8 @@ c82a31943f5adb4a64c6db4c48c94cbce5d95bc4 assets\create\models\block\adjustable_r f0a955282f7abd5ce0b412ec7b59024113ca970a assets\create\models\block\andesite_bricks_wall_post.json 0ed2fa65af49b5c92c4e5c688c155e37d3d6b118 assets\create\models\block\andesite_bricks_wall_side.json b9943c5585fc081385ea49a4199efeb6c7c22423 assets\create\models\block\andesite_casing.json +d89f1a04622290303729479ce5e19768f296a297 assets\create\models\block\andesite_chute_funnel_pull.json +911cd82e8716a076a7760534de845f60db3534fb assets\create\models\block\andesite_chute_funnel_push.json 77a045e855eb37d2da7ed8f7d27a85b9546c0ab8 assets\create\models\block\andesite_cobblestone.json 7d816d54c85bc7d0cc8db9c68abcba960daa7b43 assets\create\models\block\andesite_cobblestone_slab.json 5179ecd1f926bf3211a1a3f033dfd1d2368eeb20 assets\create\models\block\andesite_cobblestone_slab_top.json @@ -385,13 +393,15 @@ ad255a62a5f54b578db06e89fd7160001f905675 assets\create\models\block\andesite_cob a033fbac3129bba9211c6c4a0e16c905643afa39 assets\create\models\block\andesite_cobblestone_stairs_outer.json 1c574ee47aeb6fcb305bfc95dd131e153b795a0e assets\create\models\block\andesite_cobblestone_wall_post.json 0ed983628e8868f77301bea1111570d3631f24fb assets\create\models\block\andesite_cobblestone_wall_side.json +9febbf6fb88e726a89573c3788bd8348ba805b6d assets\create\models\block\andesite_funnel.json b1d0bb538fc8285b7d3fd77a977d78a104b83b62 assets\create\models\block\andesite_pillar.json -3928a75e18fc9fe02e3d72696e5dfddd40ef164c assets\create\models\block\belt_funnel_pull_off_extended.json -024fdab5f6bb0559bb18d2c3cffa1d5a7baf76e9 assets\create\models\block\belt_funnel_pull_off_retracted.json -eecd774d431bd9c30649e824421ead350b5333cd assets\create\models\block\belt_funnel_pull_on_extended.json -8e6e5caf8befa95d68280ecfaca9a07313570524 assets\create\models\block\belt_funnel_pull_on_retracted.json -5e93193368ebdf0fa4d53b19a306431e6d3ab099 assets\create\models\block\belt_funnel_push_on_extended.json -08f8ffc241e9a49a0981026602deb0230dd8258a assets\create\models\block\belt_funnel_push_on_retracted.json +cb644bda777d361ddf1255644641086d82df8480 assets\create\models\block\andesite_tunnel\cross.json +99e33c403e907dc3febdb6a0a8b183fe454c2448 assets\create\models\block\andesite_tunnel\fullshade.json +c1d4392677fe3871fd6948f29bdf427abc9910ed assets\create\models\block\andesite_tunnel\halfshade.json +8e5c47a028ec674048c208e380152bb4f817a406 assets\create\models\block\andesite_tunnel\straight.json +a814c9aaa2cd44c8035124cd8f87ea4ad368701e assets\create\models\block\andesite_tunnel\t_left.json +64f63d63b7682c4237bf04faf51f68b3d0122de9 assets\create\models\block\andesite_tunnel\t_right.json +b121b55494785695b03bf7971fb0cc77503d857f assets\create\models\block\andesite_tunnel\window.json e8bfb63e0a4426f9d95cd111640169b218dead1b assets\create\models\block\belt_observer\detect.json a2e63810eceb028484b193ddf4315e1811950dc8 assets\create\models\block\belt_observer\detect_belt.json 034c308d46def892e6638ac0b3374849a6a88a26 assets\create\models\block\belt_observer\detect_belt_powered.json @@ -414,17 +424,35 @@ fa79580db6187c864bc8148a41987ecdd1eb03b7 assets\create\models\block\belt_observe 3905ced5892afa60009bf26279f9fa4756c273d4 assets\create\models\block\birch_window_pane_post.json 62b3f2edc5ef5d7dabbcff19220921b0e3582376 assets\create\models\block\birch_window_pane_side.json 95d4230eb366f5e7684820c9337e3956ed34042a assets\create\models\block\birch_window_pane_side_alt.json +7f2ed408fb662a23a75c29398e75bb9deff4c2b5 assets\create\models\block\brass_belt_funnel_pull_extended.json +242c9972e2dc70671ffef4de15a31a74b800fcb4 assets\create\models\block\brass_belt_funnel_pull_powered_extended.json +3f88752bbf2d4d635cfadb9c7217035a74ff78e3 assets\create\models\block\brass_belt_funnel_pull_powered_retracted.json +da2ae304a1b1e02b1ce03cd0205be66d824e16d6 assets\create\models\block\brass_belt_funnel_pull_retracted.json +91ba57aded6f4a99208a8812650f454b1a44fe8b assets\create\models\block\brass_belt_funnel_push_extended.json +ee79efc65b05d953784b00e573d37602629eb9e8 assets\create\models\block\brass_belt_funnel_push_powered_extended.json +1231141717d6609f0e3c282996b1739a2c790e0c assets\create\models\block\brass_belt_funnel_push_powered_retracted.json +253e88f2c11006abdc87156dd409ed3944bb7295 assets\create\models\block\brass_belt_funnel_push_retracted.json 0934933df6bfbb19a1b14cd0e3cab2c18d5a3ebc assets\create\models\block\brass_block.json 166a5c053a81e6aadc24509ed24dc144a7255969 assets\create\models\block\brass_casing.json +8c42d09a18fb17fe846365138d0f0d58c6a3c05e assets\create\models\block\brass_chute_funnel_pull.json +7b3d2865ee7611940af017161aaabc7cb107225d assets\create\models\block\brass_chute_funnel_pull_powered.json +78122dd0f7b65bd071974030682fa484c31d7ba2 assets\create\models\block\brass_chute_funnel_push.json +7edf6b5c95f61071d8a9243a63e786765d6104a3 assets\create\models\block\brass_chute_funnel_push_powered.json +6c617fc504cb2259263d24fc56c4735e455aac6d assets\create\models\block\brass_funnel.json +2f152b82291b7fc994191b1ffb8ec6d65aec748b assets\create\models\block\brass_funnel_powered.json +5544ab512bdfe6acb9b14f8e6576ffcca097f18f assets\create\models\block\brass_tunnel\cross.json +fd2fec2a7699b54516c79d3e554c4fc10c331be1 assets\create\models\block\brass_tunnel\fullshade.json +816aa7593ce220dd7c0dab9eef48eef13be289e3 assets\create\models\block\brass_tunnel\halfshade.json +e65fac8652f201891b25067b922efdd2d9309cc7 assets\create\models\block\brass_tunnel\straight.json +7a85b21c40c659c93c2c41f5edd2227e4ee56614 assets\create\models\block\brass_tunnel\t_left.json +881d97c0b7ee57695dea157bfeeaad212c98766a assets\create\models\block\brass_tunnel\t_right.json +fddfb12eae701af4b84b6e9c1a4cdaceb848fb43 assets\create\models\block\brass_tunnel\window.json 028a07b49c05fe8a93f1d8c229d81e73d887c2df assets\create\models\block\chiseled_dark_scoria.json b1f9ee4867373dd8f976625bab744a1c72c7fd16 assets\create\models\block\chiseled_dolomite.json cd7751090cf3d55296b8e415d0af9b6f18d69770 assets\create\models\block\chiseled_gabbro.json d2e195aa2e90c712e51d855a9a4a334b52f62a69 assets\create\models\block\chiseled_limestone.json ac07568fa7b2d3fa84d0fe89a498514d30514291 assets\create\models\block\chiseled_scoria.json ecb2b85ee210dce329d2be66b98d0f0d4e6fc223 assets\create\models\block\chiseled_weathered_limestone.json -d3a156e746f890b8a0b92caa70b8eb6e690f0fb6 assets\create\models\block\chute_funnel_pull_off.json -5e4424fb63041a449ddffe143ee766018d064c8f assets\create\models\block\chute_funnel_pull_on.json -ac32d22841b5d37ef182869f605b9a97075f3d33 assets\create\models\block\chute_funnel_push_on.json f9a3f0939ea43b404eb2826b94211a25fca5ebc2 assets\create\models\block\clockwork_bearing.json 70406933cc4fa5471af6e562fd84a397347dba17 assets\create\models\block\copper_casing.json 1ef7060b0ca7e9c0bfc8151f98ca08da31862cda assets\create\models\block\crate\brass\bottom.json @@ -961,19 +989,22 @@ d283f86cd05ed378efd82ce46cf49bc83783069b assets\create\models\item\andesite_bric 1ceb0e49f2c46f1d5414d5fd6edfc2bdd3afa6f7 assets\create\models\item\andesite_cobblestone_slab.json b0f664dd6de3d0ee9afcb6223fbcd53b97fa0d65 assets\create\models\item\andesite_cobblestone_stairs.json 4856d13a72ec0af9f10226b4a4bf0567eb580b9a assets\create\models\item\andesite_cobblestone_wall.json +0a9f5f6d552813029474dbbfa31e8443ed91adcd assets\create\models\item\andesite_funnel.json 75b8b00c2418b9660d35a7fabd0774925cf1c02f assets\create\models\item\andesite_pillar.json +c259e28f971a736af10b1fd7393118d5d31c51b2 assets\create\models\item\andesite_tunnel.json bf1fc6bdf7fca6f1958a2d3e96202c1cecb50669 assets\create\models\item\basin.json 1da382e7e58eaa9788f5b1d92221ccac573e068f assets\create\models\item\belt_connector.json 695a69d5854e2eb134b55d855bd2b7b18808a01d assets\create\models\item\belt_observer.json -5006164d5bdb17cc5ec9759d7cdaf218e2b45f04 assets\create\models\item\belt_tunnel.json 9044243882cfd49a2827e1b910a4c9b0e46daa47 assets\create\models\item\birch_window.json 6ed49f59ea91068ef68720f43e67a9237594bdf0 assets\create\models\item\birch_window_pane.json 17d340c3678bd24cb085ba49490b2b4cb341a9e7 assets\create\models\item\brass_block.json f5a18f4279c2e845a5967b1c2f9e807c2bb77afb assets\create\models\item\brass_casing.json +ab045c951352806c3f632dda7b71573f93f60ac4 assets\create\models\item\brass_funnel.json 361f75a79de5007d7a99ad0a38103c9aa8c3017c assets\create\models\item\brass_hand.json 1786bdffa2ab5a07c88d2797db3d7b54461323c4 assets\create\models\item\brass_ingot.json a37be4a0ec9bf6c381527403c57ced4f81abd67c assets\create\models\item\brass_nugget.json 14ea6ee4db6e7e76446e331a70b6b6bec31e8eb7 assets\create\models\item\brass_sheet.json +2c71c36d0b987d5a5e07da4f23f3eaa88f806edf assets\create\models\item\brass_tunnel.json 3e232a103f7f916fc11edb4d541ca99fe7b44181 assets\create\models\item\cart_assembler.json 99d64b76b3baa84c3bd4b96ccd3376ca12425950 assets\create\models\item\chiseled_dark_scoria.json 83d3571eacde52568786802b268f24c6578c1e5d assets\create\models\item\chiseled_dolomite.json @@ -1085,7 +1116,6 @@ e5e6fb6eb182b85b977e1025a7fe84d46de59320 assets\create\models\item\fluid_pipe.js 8707332c0cb6ee123e7962d08536a60725c64ce8 assets\create\models\item\flywheel.json d62b93d3c274d280f3eec22a28b5175943411d25 assets\create\models\item\framed_glass.json 1041d462c6e856f7f3f2365c299c0599703d1ed7 assets\create\models\item\framed_glass_pane.json -2dc08da54182756cd3520f1420d0506ab50063e1 assets\create\models\item\funnel.json 0bee2855dc9bad52e941153b87e9c35797c246ee assets\create\models\item\furnace_engine.json 090edb6a728fc3803e870d647c7c4e826faadca0 assets\create\models\item\furnace_minecart_contraption.json 2c1608c114ccc285a84e936dc3f1233c535e1a26 assets\create\models\item\gabbro.json @@ -1253,7 +1283,6 @@ d3cfc1a1137c4bc98848947d425d2972df144c95 assets\create\models\item\powdered_obsi 16f363038d5afeae34e0724a6a9f0b8f6e65424a assets\create\models\item\propeller.json 4b8a27ff05ed5331889dfc4b0b4562f3e94b0dfe assets\create\models\item\pulse_repeater.json 469652eb5baa92008dbfc4deec232c3381684af6 assets\create\models\item\radial_chassis.json -c485de0c102ef2d2d709bfb8a26688f1dee78948 assets\create\models\item\reality_funnel.json b9a4ac219a27e60a82f55129f2df5ae6183981e2 assets\create\models\item\redstone_contact.json 52e561abeb954d0349e640566de92ef80ccbf919 assets\create\models\item\redstone_link.json ba99e2fdb64892f4f479a8ac51c226cb5f71f659 assets\create\models\item\red_sand_paper.json @@ -1738,25 +1767,31 @@ fe37896bb804d2be9b8abf3744c5b9b7bc1c086e data\create\advancements\wand_of_symmet 417da41ebd0520ae22ddc3541eb490daf2af95dd data\create\loot_tables\blocks\adjustable_pulse_repeater.json d0ba402852cea164f6d279a9b37cc38ac3958574 data\create\loot_tables\blocks\adjustable_repeater.json 0d139e302f4a11438b0acd664c0df15b41040f69 data\create\loot_tables\blocks\analog_lever.json +d3202a337c15c8b8ec41fa5879bb94327bb75057 data\create\loot_tables\blocks\andesite_belt_funnel.json 1d04146c468ce4bf898b596c171b3ba3146d7d66 data\create\loot_tables\blocks\andesite_bricks.json b67ea51eaed1e847317829636cbf5967522e73d1 data\create\loot_tables\blocks\andesite_bricks_slab.json 0ba4528089294c5229e1904dc3191f604138cf8e data\create\loot_tables\blocks\andesite_bricks_stairs.json db2d27969cb53d9489e7c7e4bf60864fa89b29f4 data\create\loot_tables\blocks\andesite_bricks_wall.json cb36b039a511aca643fe674a63de8d6ad8478256 data\create\loot_tables\blocks\andesite_casing.json +d3202a337c15c8b8ec41fa5879bb94327bb75057 data\create\loot_tables\blocks\andesite_chute_funnel.json 906155b0d00438e695d34dd14b374d94e691460d data\create\loot_tables\blocks\andesite_cobblestone.json 6d2f1bd619b131803d5bc9e393a2c67e03c39ff6 data\create\loot_tables\blocks\andesite_cobblestone_slab.json 6b5393dab7d443da6d54debccbc8b060c6c9bdc7 data\create\loot_tables\blocks\andesite_cobblestone_stairs.json 36d38c085d8e522fe15f0ef9bc64363e163f3de7 data\create\loot_tables\blocks\andesite_cobblestone_wall.json +d3202a337c15c8b8ec41fa5879bb94327bb75057 data\create\loot_tables\blocks\andesite_funnel.json 6908f62c809ea2105bc92765d84d5655197346ab data\create\loot_tables\blocks\andesite_pillar.json +317aa99086127c649981b7b2fc85e66774a30f58 data\create\loot_tables\blocks\andesite_tunnel.json 14bf1764b9313893b6a6f57094f9506ac9fa71a8 data\create\loot_tables\blocks\basin.json c7f81e30c31837a287d6d6040cdb02c7dec11441 data\create\loot_tables\blocks\belt.json -617f27876863dda6a16d6818231bc52de104fc70 data\create\loot_tables\blocks\belt_funnel.json 1104e323abb2a8c25769c47dc5d1154965113cc9 data\create\loot_tables\blocks\belt_observer.json -f2acadb49cac3aa6347cae606536cbbde89f0a5f data\create\loot_tables\blocks\belt_tunnel.json 67a8e2513c3cb09e6fe80279fda94f79d5018c37 data\create\loot_tables\blocks\birch_window.json bf1d5843f93533f84bc4adec5b77da2114fa2025 data\create\loot_tables\blocks\birch_window_pane.json +1dbc446abe190b2832b2ce7d52c2f2d2bdd45949 data\create\loot_tables\blocks\brass_belt_funnel.json 70d9d4def43d5b31fa7cdc5ca5002c71cf4a90b0 data\create\loot_tables\blocks\brass_block.json 8a14258ad5d79d9e4dc5a318905644b446196420 data\create\loot_tables\blocks\brass_casing.json +1dbc446abe190b2832b2ce7d52c2f2d2bdd45949 data\create\loot_tables\blocks\brass_chute_funnel.json +1dbc446abe190b2832b2ce7d52c2f2d2bdd45949 data\create\loot_tables\blocks\brass_funnel.json +6c8e784677d1a843b6c707484c79751acdb46ebc data\create\loot_tables\blocks\brass_tunnel.json 0be542fef3bc0e1a0d556883568a1400a8b97df1 data\create\loot_tables\blocks\cart_assembler.json ab820bbaaf67c6697dfbab33c05fb73b18c70bfb data\create\loot_tables\blocks\chiseled_dark_scoria.json 1f907058afd7d8dbe628c9ab315b8ddbdccfbfda data\create\loot_tables\blocks\chiseled_dolomite.json @@ -1765,7 +1800,6 @@ ab820bbaaf67c6697dfbab33c05fb73b18c70bfb data\create\loot_tables\blocks\chiseled 43f446abd3c1c184a08645979edf620e59955a30 data\create\loot_tables\blocks\chiseled_scoria.json adde89e46b12de1eee6fd0c5cb98c5f45feefc15 data\create\loot_tables\blocks\chiseled_weathered_limestone.json 07ccc1576a71338cb73c4e06f8c28a2c86843877 data\create\loot_tables\blocks\chute.json -617f27876863dda6a16d6818231bc52de104fc70 data\create\loot_tables\blocks\chute_funnel.json 778b53c36d73b6e9c78fd6c091c9c3535c3c18f7 data\create\loot_tables\blocks\clockwork_bearing.json d76113310fc56eca6382d44df174096f2210d416 data\create\loot_tables\blocks\clutch.json 673ba3a5deae9133b917d16c9eb87fe4c2873c8a data\create\loot_tables\blocks\cogwheel.json @@ -1856,7 +1890,6 @@ c8aa9bbed8fd703eb1853de0b7c9e04dffb7a511 data\create\loot_tables\blocks\fluid_pi f37526c092c645045c22674dea6c7b1ec503c9c3 data\create\loot_tables\blocks\flywheel.json ce0bb978b11935bc2d1218445f8ab18099af6b8a data\create\loot_tables\blocks\framed_glass.json 89bd90ecd7a1ce1f75bd873989cc58a84c8dcef9 data\create\loot_tables\blocks\framed_glass_pane.json -ed895ef7dcb97ad9b00d80a4fa9c331229dd532e data\create\loot_tables\blocks\funnel.json 4063880eda871fe63a4eb549a19daecabce849e5 data\create\loot_tables\blocks\furnace_engine.json 1070cba1c0f46cf7ebe31089f35333f5eadda6e4 data\create\loot_tables\blocks\gabbro.json 0356e003d8890d31b89d0ad98e32aae892da71f9 data\create\loot_tables\blocks\gabbro_bricks.json @@ -2016,7 +2049,6 @@ a3fb7d3e3bf9dc73ce754002f10c469d57db1f71 data\create\loot_tables\blocks\powered_ 205f5899101262f31f5c1a88bb7d954918d08d04 data\create\loot_tables\blocks\pulley_magnet.json e8fb62c91226ac107dee45c5ebc54c8dd0aee224 data\create\loot_tables\blocks\pulse_repeater.json 768420dab8785909891e52c4d77a182d99ba11d3 data\create\loot_tables\blocks\radial_chassis.json -617f27876863dda6a16d6818231bc52de104fc70 data\create\loot_tables\blocks\reality_funnel.json f5907a694206facc01f61f3428f72488486761c7 data\create\loot_tables\blocks\redstone_contact.json 886a0c1386fb12104b736a15689030aaff771270 data\create\loot_tables\blocks\redstone_link.json 97c945de837a6360c0ab7e1371f16ebc1645f6ea data\create\loot_tables\blocks\reinforced_rail.json @@ -2051,7 +2083,6 @@ b201436ae6d2ad5a7d47dca0ee8c7016b4c28fa5 data\create\loot_tables\blocks\transpos 5a47c1535c866184b4ffca65763f5676f319e0aa data\create\loot_tables\blocks\vertical_extractor.json 028e293b5cd694017962f67dc80dba719f904e28 data\create\loot_tables\blocks\vertical_framed_glass.json d0156602dd5f4a274c293df67e19374820c72890 data\create\loot_tables\blocks\vertical_framed_glass_pane.json -ed895ef7dcb97ad9b00d80a4fa9c331229dd532e data\create\loot_tables\blocks\vertical_funnel.json dac789cf53b00eed34308848b5e267b7ccec090c data\create\loot_tables\blocks\vertical_linked_extractor.json 7af5a13c9e10903b11732fbc01ae3299328216f0 data\create\loot_tables\blocks\vertical_linked_transposer.json b201436ae6d2ad5a7d47dca0ee8c7016b4c28fa5 data\create\loot_tables\blocks\vertical_transposer.json @@ -2444,7 +2475,7 @@ d3fdb8ece6cb072a93ddb64a0baad5ac952117a4 data\create\recipes\weathered_limestone 6eceb25fabbb6b389ca35de3b829ad061c9c456a data\create\recipes\weathered_limestone_pillar.json 11667414f73bc2d00bda7c5c1a7d2934bf6e9165 data\create\recipes\weathered_limestone_pillar_from_weathered_limestone_stonecutting.json 266f08e604d229a9d2b46f7272c0b06ec270bf3d data\create\recipes\zinc_block.json -87024323ea933fa10a4e7802f68ce5b9054021e6 data\create\tags\blocks\brittle.json +403576ae5710d4fe731144fe623b1673093076ea data\create\tags\blocks\brittle.json 081f5aa35602fc27af2ca01ea9f2fd5e7eb284dc data\create\tags\items\create_ingots.json d2dc4ff179ef7b2aa9276455c196e15d44aa95a8 data\create\tags\items\crushed_ores.json 16bcb8fcbe9170c2c11f1ca8d99d8b36cd812bbd data\forge\tags\blocks\glass\colorless.json diff --git a/src/generated/resources/assets/create/blockstates/andesite_belt_funnel.json b/src/generated/resources/assets/create/blockstates/andesite_belt_funnel.json new file mode 100644 index 000000000..750bc272b --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/andesite_belt_funnel.json @@ -0,0 +1,64 @@ +{ + "variants": { + "facing=north,pushing=false,shape=retracted": { + "model": "create:block/andesite_belt_funnel_pull_retracted" + }, + "facing=south,pushing=false,shape=retracted": { + "model": "create:block/andesite_belt_funnel_pull_retracted", + "y": 180 + }, + "facing=west,pushing=false,shape=retracted": { + "model": "create:block/andesite_belt_funnel_pull_retracted", + "y": 270 + }, + "facing=east,pushing=false,shape=retracted": { + "model": "create:block/andesite_belt_funnel_pull_retracted", + "y": 90 + }, + "facing=north,pushing=true,shape=retracted": { + "model": "create:block/andesite_belt_funnel_push_retracted" + }, + "facing=south,pushing=true,shape=retracted": { + "model": "create:block/andesite_belt_funnel_push_retracted", + "y": 180 + }, + "facing=west,pushing=true,shape=retracted": { + "model": "create:block/andesite_belt_funnel_push_retracted", + "y": 270 + }, + "facing=east,pushing=true,shape=retracted": { + "model": "create:block/andesite_belt_funnel_push_retracted", + "y": 90 + }, + "facing=north,pushing=false,shape=extended": { + "model": "create:block/andesite_belt_funnel_pull_extended" + }, + "facing=south,pushing=false,shape=extended": { + "model": "create:block/andesite_belt_funnel_pull_extended", + "y": 180 + }, + "facing=west,pushing=false,shape=extended": { + "model": "create:block/andesite_belt_funnel_pull_extended", + "y": 270 + }, + "facing=east,pushing=false,shape=extended": { + "model": "create:block/andesite_belt_funnel_pull_extended", + "y": 90 + }, + "facing=north,pushing=true,shape=extended": { + "model": "create:block/andesite_belt_funnel_push_extended" + }, + "facing=south,pushing=true,shape=extended": { + "model": "create:block/andesite_belt_funnel_push_extended", + "y": 180 + }, + "facing=west,pushing=true,shape=extended": { + "model": "create:block/andesite_belt_funnel_push_extended", + "y": 270 + }, + "facing=east,pushing=true,shape=extended": { + "model": "create:block/andesite_belt_funnel_push_extended", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/andesite_chute_funnel.json b/src/generated/resources/assets/create/blockstates/andesite_chute_funnel.json new file mode 100644 index 000000000..cea68cada --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/andesite_chute_funnel.json @@ -0,0 +1,34 @@ +{ + "variants": { + "facing=north,pushing=false": { + "model": "create:block/andesite_chute_funnel_pull" + }, + "facing=south,pushing=false": { + "model": "create:block/andesite_chute_funnel_pull", + "y": 180 + }, + "facing=west,pushing=false": { + "model": "create:block/andesite_chute_funnel_pull", + "y": 270 + }, + "facing=east,pushing=false": { + "model": "create:block/andesite_chute_funnel_pull", + "y": 90 + }, + "facing=north,pushing=true": { + "model": "create:block/andesite_chute_funnel_push" + }, + "facing=south,pushing=true": { + "model": "create:block/andesite_chute_funnel_push", + "y": 180 + }, + "facing=west,pushing=true": { + "model": "create:block/andesite_chute_funnel_push", + "y": 270 + }, + "facing=east,pushing=true": { + "model": "create:block/andesite_chute_funnel_push", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/andesite_funnel.json b/src/generated/resources/assets/create/blockstates/andesite_funnel.json new file mode 100644 index 000000000..29e935e43 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/andesite_funnel.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=down": { + "model": "create:block/andesite_funnel", + "x": 180 + }, + "facing=up": { + "model": "create:block/andesite_funnel" + }, + "facing=north": { + "model": "create:block/andesite_funnel", + "x": 90 + }, + "facing=south": { + "model": "create:block/andesite_funnel", + "x": 90, + "y": 180 + }, + "facing=west": { + "model": "create:block/andesite_funnel", + "x": 90, + "y": 270 + }, + "facing=east": { + "model": "create:block/andesite_funnel", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/andesite_tunnel.json b/src/generated/resources/assets/create/blockstates/andesite_tunnel.json new file mode 100644 index 000000000..152534c34 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/andesite_tunnel.json @@ -0,0 +1,53 @@ +{ + "variants": { + "axis=x,shape=straight": { + "model": "create:block/andesite_tunnel/straight" + }, + "axis=z,shape=straight": { + "model": "create:block/andesite_tunnel/straight", + "y": 90 + }, + "axis=x,shape=window": { + "model": "create:block/andesite_tunnel/window" + }, + "axis=z,shape=window": { + "model": "create:block/andesite_tunnel/window", + "y": 90 + }, + "axis=x,shape=halfshade": { + "model": "create:block/andesite_tunnel/halfshade" + }, + "axis=z,shape=halfshade": { + "model": "create:block/andesite_tunnel/halfshade", + "y": 90 + }, + "axis=x,shape=fullshade": { + "model": "create:block/andesite_tunnel/fullshade" + }, + "axis=z,shape=fullshade": { + "model": "create:block/andesite_tunnel/fullshade", + "y": 90 + }, + "axis=x,shape=t_left": { + "model": "create:block/andesite_tunnel/t_left" + }, + "axis=z,shape=t_left": { + "model": "create:block/andesite_tunnel/t_left", + "y": 90 + }, + "axis=x,shape=t_right": { + "model": "create:block/andesite_tunnel/t_right" + }, + "axis=z,shape=t_right": { + "model": "create:block/andesite_tunnel/t_right", + "y": 90 + }, + "axis=x,shape=cross": { + "model": "create:block/andesite_tunnel/cross" + }, + "axis=z,shape=cross": { + "model": "create:block/andesite_tunnel/cross", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/belt_tunnel.json b/src/generated/resources/assets/create/blockstates/belt_tunnel.json deleted file mode 100644 index b3f8cbd90..000000000 --- a/src/generated/resources/assets/create/blockstates/belt_tunnel.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "variants": { - "axis=x,shape=straight": { - "model": "create:block/belt_tunnel/straight" - }, - "axis=z,shape=straight": { - "model": "create:block/belt_tunnel/straight", - "y": 90 - }, - "axis=x,shape=window": { - "model": "create:block/belt_tunnel/window" - }, - "axis=z,shape=window": { - "model": "create:block/belt_tunnel/window", - "y": 90 - }, - "axis=x,shape=halfshade": { - "model": "create:block/belt_tunnel/halfshade" - }, - "axis=z,shape=halfshade": { - "model": "create:block/belt_tunnel/halfshade", - "y": 90 - }, - "axis=x,shape=fullshade": { - "model": "create:block/belt_tunnel/fullshade" - }, - "axis=z,shape=fullshade": { - "model": "create:block/belt_tunnel/fullshade", - "y": 90 - }, - "axis=x,shape=t_left": { - "model": "create:block/belt_tunnel/t_left" - }, - "axis=z,shape=t_left": { - "model": "create:block/belt_tunnel/t_left", - "y": 90 - }, - "axis=x,shape=t_right": { - "model": "create:block/belt_tunnel/t_right" - }, - "axis=z,shape=t_right": { - "model": "create:block/belt_tunnel/t_right", - "y": 90 - }, - "axis=x,shape=cross": { - "model": "create:block/belt_tunnel/cross" - }, - "axis=z,shape=cross": { - "model": "create:block/belt_tunnel/cross", - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/belt_funnel.json b/src/generated/resources/assets/create/blockstates/brass_belt_funnel.json similarity index 55% rename from src/generated/resources/assets/create/blockstates/belt_funnel.json rename to src/generated/resources/assets/create/blockstates/brass_belt_funnel.json index ebd56a413..779a55e87 100644 --- a/src/generated/resources/assets/create/blockstates/belt_funnel.json +++ b/src/generated/resources/assets/create/blockstates/brass_belt_funnel.json @@ -1,123 +1,123 @@ { "variants": { "facing=north,powered=false,pushing=false,shape=retracted": { - "model": "create:block/belt_funnel_pull_off_retracted" + "model": "create:block/brass_belt_funnel_pull_retracted" }, "facing=south,powered=false,pushing=false,shape=retracted": { - "model": "create:block/belt_funnel_pull_off_retracted", + "model": "create:block/brass_belt_funnel_pull_retracted", "y": 180 }, "facing=west,powered=false,pushing=false,shape=retracted": { - "model": "create:block/belt_funnel_pull_off_retracted", + "model": "create:block/brass_belt_funnel_pull_retracted", "y": 270 }, "facing=east,powered=false,pushing=false,shape=retracted": { - "model": "create:block/belt_funnel_pull_off_retracted", + "model": "create:block/brass_belt_funnel_pull_retracted", "y": 90 }, "facing=north,powered=true,pushing=false,shape=retracted": { - "model": "create:block/belt_funnel_pull_on_retracted" + "model": "create:block/brass_belt_funnel_pull_powered_retracted" }, "facing=south,powered=true,pushing=false,shape=retracted": { - "model": "create:block/belt_funnel_pull_on_retracted", + "model": "create:block/brass_belt_funnel_pull_powered_retracted", "y": 180 }, "facing=west,powered=true,pushing=false,shape=retracted": { - "model": "create:block/belt_funnel_pull_on_retracted", + "model": "create:block/brass_belt_funnel_pull_powered_retracted", "y": 270 }, "facing=east,powered=true,pushing=false,shape=retracted": { - "model": "create:block/belt_funnel_pull_on_retracted", + "model": "create:block/brass_belt_funnel_pull_powered_retracted", "y": 90 }, "facing=north,powered=false,pushing=true,shape=retracted": { - "model": "create:block/belt_funnel/block_retracted" + "model": "create:block/brass_belt_funnel_push_retracted" }, "facing=south,powered=false,pushing=true,shape=retracted": { - "model": "create:block/belt_funnel/block_retracted", + "model": "create:block/brass_belt_funnel_push_retracted", "y": 180 }, "facing=west,powered=false,pushing=true,shape=retracted": { - "model": "create:block/belt_funnel/block_retracted", + "model": "create:block/brass_belt_funnel_push_retracted", "y": 270 }, "facing=east,powered=false,pushing=true,shape=retracted": { - "model": "create:block/belt_funnel/block_retracted", + "model": "create:block/brass_belt_funnel_push_retracted", "y": 90 }, "facing=north,powered=true,pushing=true,shape=retracted": { - "model": "create:block/belt_funnel_push_on_retracted" + "model": "create:block/brass_belt_funnel_push_powered_retracted" }, "facing=south,powered=true,pushing=true,shape=retracted": { - "model": "create:block/belt_funnel_push_on_retracted", + "model": "create:block/brass_belt_funnel_push_powered_retracted", "y": 180 }, "facing=west,powered=true,pushing=true,shape=retracted": { - "model": "create:block/belt_funnel_push_on_retracted", + "model": "create:block/brass_belt_funnel_push_powered_retracted", "y": 270 }, "facing=east,powered=true,pushing=true,shape=retracted": { - "model": "create:block/belt_funnel_push_on_retracted", + "model": "create:block/brass_belt_funnel_push_powered_retracted", "y": 90 }, "facing=north,powered=false,pushing=false,shape=extended": { - "model": "create:block/belt_funnel_pull_off_extended" + "model": "create:block/brass_belt_funnel_pull_extended" }, "facing=south,powered=false,pushing=false,shape=extended": { - "model": "create:block/belt_funnel_pull_off_extended", + "model": "create:block/brass_belt_funnel_pull_extended", "y": 180 }, "facing=west,powered=false,pushing=false,shape=extended": { - "model": "create:block/belt_funnel_pull_off_extended", + "model": "create:block/brass_belt_funnel_pull_extended", "y": 270 }, "facing=east,powered=false,pushing=false,shape=extended": { - "model": "create:block/belt_funnel_pull_off_extended", + "model": "create:block/brass_belt_funnel_pull_extended", "y": 90 }, "facing=north,powered=true,pushing=false,shape=extended": { - "model": "create:block/belt_funnel_pull_on_extended" + "model": "create:block/brass_belt_funnel_pull_powered_extended" }, "facing=south,powered=true,pushing=false,shape=extended": { - "model": "create:block/belt_funnel_pull_on_extended", + "model": "create:block/brass_belt_funnel_pull_powered_extended", "y": 180 }, "facing=west,powered=true,pushing=false,shape=extended": { - "model": "create:block/belt_funnel_pull_on_extended", + "model": "create:block/brass_belt_funnel_pull_powered_extended", "y": 270 }, "facing=east,powered=true,pushing=false,shape=extended": { - "model": "create:block/belt_funnel_pull_on_extended", + "model": "create:block/brass_belt_funnel_pull_powered_extended", "y": 90 }, "facing=north,powered=false,pushing=true,shape=extended": { - "model": "create:block/belt_funnel/block_extended" + "model": "create:block/brass_belt_funnel_push_extended" }, "facing=south,powered=false,pushing=true,shape=extended": { - "model": "create:block/belt_funnel/block_extended", + "model": "create:block/brass_belt_funnel_push_extended", "y": 180 }, "facing=west,powered=false,pushing=true,shape=extended": { - "model": "create:block/belt_funnel/block_extended", + "model": "create:block/brass_belt_funnel_push_extended", "y": 270 }, "facing=east,powered=false,pushing=true,shape=extended": { - "model": "create:block/belt_funnel/block_extended", + "model": "create:block/brass_belt_funnel_push_extended", "y": 90 }, "facing=north,powered=true,pushing=true,shape=extended": { - "model": "create:block/belt_funnel_push_on_extended" + "model": "create:block/brass_belt_funnel_push_powered_extended" }, "facing=south,powered=true,pushing=true,shape=extended": { - "model": "create:block/belt_funnel_push_on_extended", + "model": "create:block/brass_belt_funnel_push_powered_extended", "y": 180 }, "facing=west,powered=true,pushing=true,shape=extended": { - "model": "create:block/belt_funnel_push_on_extended", + "model": "create:block/brass_belt_funnel_push_powered_extended", "y": 270 }, "facing=east,powered=true,pushing=true,shape=extended": { - "model": "create:block/belt_funnel_push_on_extended", + "model": "create:block/brass_belt_funnel_push_powered_extended", "y": 90 } } diff --git a/src/generated/resources/assets/create/blockstates/chute_funnel.json b/src/generated/resources/assets/create/blockstates/brass_chute_funnel.json similarity index 53% rename from src/generated/resources/assets/create/blockstates/chute_funnel.json rename to src/generated/resources/assets/create/blockstates/brass_chute_funnel.json index 59a0eda96..0e5f38388 100644 --- a/src/generated/resources/assets/create/blockstates/chute_funnel.json +++ b/src/generated/resources/assets/create/blockstates/brass_chute_funnel.json @@ -1,63 +1,63 @@ { "variants": { "facing=north,powered=false,pushing=false": { - "model": "create:block/chute_funnel_pull_off" + "model": "create:block/brass_chute_funnel_pull" }, "facing=south,powered=false,pushing=false": { - "model": "create:block/chute_funnel_pull_off", + "model": "create:block/brass_chute_funnel_pull", "y": 180 }, "facing=west,powered=false,pushing=false": { - "model": "create:block/chute_funnel_pull_off", + "model": "create:block/brass_chute_funnel_pull", "y": 270 }, "facing=east,powered=false,pushing=false": { - "model": "create:block/chute_funnel_pull_off", + "model": "create:block/brass_chute_funnel_pull", "y": 90 }, "facing=north,powered=true,pushing=false": { - "model": "create:block/chute_funnel_pull_on" + "model": "create:block/brass_chute_funnel_pull_powered" }, "facing=south,powered=true,pushing=false": { - "model": "create:block/chute_funnel_pull_on", + "model": "create:block/brass_chute_funnel_pull_powered", "y": 180 }, "facing=west,powered=true,pushing=false": { - "model": "create:block/chute_funnel_pull_on", + "model": "create:block/brass_chute_funnel_pull_powered", "y": 270 }, "facing=east,powered=true,pushing=false": { - "model": "create:block/chute_funnel_pull_on", + "model": "create:block/brass_chute_funnel_pull_powered", "y": 90 }, "facing=north,powered=false,pushing=true": { - "model": "create:block/chute_funnel/block" + "model": "create:block/brass_chute_funnel_push" }, "facing=south,powered=false,pushing=true": { - "model": "create:block/chute_funnel/block", + "model": "create:block/brass_chute_funnel_push", "y": 180 }, "facing=west,powered=false,pushing=true": { - "model": "create:block/chute_funnel/block", + "model": "create:block/brass_chute_funnel_push", "y": 270 }, "facing=east,powered=false,pushing=true": { - "model": "create:block/chute_funnel/block", + "model": "create:block/brass_chute_funnel_push", "y": 90 }, "facing=north,powered=true,pushing=true": { - "model": "create:block/chute_funnel_push_on" + "model": "create:block/brass_chute_funnel_push_powered" }, "facing=south,powered=true,pushing=true": { - "model": "create:block/chute_funnel_push_on", + "model": "create:block/brass_chute_funnel_push_powered", "y": 180 }, "facing=west,powered=true,pushing=true": { - "model": "create:block/chute_funnel_push_on", + "model": "create:block/brass_chute_funnel_push_powered", "y": 270 }, "facing=east,powered=true,pushing=true": { - "model": "create:block/chute_funnel_push_on", + "model": "create:block/brass_chute_funnel_push_powered", "y": 90 } } diff --git a/src/generated/resources/assets/create/blockstates/reality_funnel.json b/src/generated/resources/assets/create/blockstates/brass_funnel.json similarity index 53% rename from src/generated/resources/assets/create/blockstates/reality_funnel.json rename to src/generated/resources/assets/create/blockstates/brass_funnel.json index 7b9e14ef9..bd9c61333 100644 --- a/src/generated/resources/assets/create/blockstates/reality_funnel.json +++ b/src/generated/resources/assets/create/blockstates/brass_funnel.json @@ -1,54 +1,54 @@ { "variants": { "facing=down,powered=false": { - "model": "create:block/reality_funnel/block", + "model": "create:block/brass_funnel", "x": 180 }, "facing=up,powered=false": { - "model": "create:block/reality_funnel/block" + "model": "create:block/brass_funnel" }, "facing=north,powered=false": { - "model": "create:block/reality_funnel/block", + "model": "create:block/brass_funnel", "x": 90 }, "facing=south,powered=false": { - "model": "create:block/reality_funnel/block", + "model": "create:block/brass_funnel", "x": 90, "y": 180 }, "facing=west,powered=false": { - "model": "create:block/reality_funnel/block", + "model": "create:block/brass_funnel", "x": 90, "y": 270 }, "facing=east,powered=false": { - "model": "create:block/reality_funnel/block", + "model": "create:block/brass_funnel", "x": 90, "y": 90 }, "facing=down,powered=true": { - "model": "create:block/reality_funnel/block_powered", + "model": "create:block/brass_funnel_powered", "x": 180 }, "facing=up,powered=true": { - "model": "create:block/reality_funnel/block_powered" + "model": "create:block/brass_funnel_powered" }, "facing=north,powered=true": { - "model": "create:block/reality_funnel/block_powered", + "model": "create:block/brass_funnel_powered", "x": 90 }, "facing=south,powered=true": { - "model": "create:block/reality_funnel/block_powered", + "model": "create:block/brass_funnel_powered", "x": 90, "y": 180 }, "facing=west,powered=true": { - "model": "create:block/reality_funnel/block_powered", + "model": "create:block/brass_funnel_powered", "x": 90, "y": 270 }, "facing=east,powered=true": { - "model": "create:block/reality_funnel/block_powered", + "model": "create:block/brass_funnel_powered", "x": 90, "y": 90 } diff --git a/src/generated/resources/assets/create/blockstates/brass_tunnel.json b/src/generated/resources/assets/create/blockstates/brass_tunnel.json new file mode 100644 index 000000000..05e7de04f --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/brass_tunnel.json @@ -0,0 +1,53 @@ +{ + "variants": { + "axis=x,shape=straight": { + "model": "create:block/brass_tunnel/straight" + }, + "axis=z,shape=straight": { + "model": "create:block/brass_tunnel/straight", + "y": 90 + }, + "axis=x,shape=window": { + "model": "create:block/brass_tunnel/window" + }, + "axis=z,shape=window": { + "model": "create:block/brass_tunnel/window", + "y": 90 + }, + "axis=x,shape=halfshade": { + "model": "create:block/brass_tunnel/halfshade" + }, + "axis=z,shape=halfshade": { + "model": "create:block/brass_tunnel/halfshade", + "y": 90 + }, + "axis=x,shape=fullshade": { + "model": "create:block/brass_tunnel/fullshade" + }, + "axis=z,shape=fullshade": { + "model": "create:block/brass_tunnel/fullshade", + "y": 90 + }, + "axis=x,shape=t_left": { + "model": "create:block/brass_tunnel/t_left" + }, + "axis=z,shape=t_left": { + "model": "create:block/brass_tunnel/t_left", + "y": 90 + }, + "axis=x,shape=t_right": { + "model": "create:block/brass_tunnel/t_right" + }, + "axis=z,shape=t_right": { + "model": "create:block/brass_tunnel/t_right", + "y": 90 + }, + "axis=x,shape=cross": { + "model": "create:block/brass_tunnel/cross" + }, + "axis=z,shape=cross": { + "model": "create:block/brass_tunnel/cross", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/funnel.json b/src/generated/resources/assets/create/blockstates/funnel.json deleted file mode 100644 index 303155a12..000000000 --- a/src/generated/resources/assets/create/blockstates/funnel.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "variants": { - "belt=false,facing=north": { - "model": "create:block/funnel/horizontal" - }, - "belt=true,facing=north": { - "model": "create:block/funnel/horizontal_belt" - }, - "belt=false,facing=south": { - "model": "create:block/funnel/horizontal", - "y": 180 - }, - "belt=true,facing=south": { - "model": "create:block/funnel/horizontal_belt", - "y": 180 - }, - "belt=false,facing=west": { - "model": "create:block/funnel/horizontal", - "y": 270 - }, - "belt=true,facing=west": { - "model": "create:block/funnel/horizontal_belt", - "y": 270 - }, - "belt=false,facing=east": { - "model": "create:block/funnel/horizontal", - "y": 90 - }, - "belt=true,facing=east": { - "model": "create:block/funnel/horizontal_belt", - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/vertical_funnel.json b/src/generated/resources/assets/create/blockstates/vertical_funnel.json deleted file mode 100644 index 2b4f2a6f2..000000000 --- a/src/generated/resources/assets/create/blockstates/vertical_funnel.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "variants": { - "facing=north,upward=false": { - "model": "create:block/funnel/vertical", - "x": 90, - "y": 180 - }, - "facing=south,upward=false": { - "model": "create:block/funnel/vertical", - "x": 90 - }, - "facing=west,upward=false": { - "model": "create:block/funnel/vertical", - "x": 90, - "y": 90 - }, - "facing=east,upward=false": { - "model": "create:block/funnel/vertical", - "x": 90, - "y": 270 - }, - "facing=north,upward=true": { - "model": "create:block/funnel/vertical", - "x": 270 - }, - "facing=south,upward=true": { - "model": "create:block/funnel/vertical", - "x": 270, - "y": 180 - }, - "facing=west,upward=true": { - "model": "create:block/funnel/vertical", - "x": 270, - "y": 270 - }, - "facing=east,upward=true": { - "model": "create:block/funnel/vertical", - "x": 270, - "y": 90 - } - } -} \ 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 f35699efa..be027ea35 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -6,25 +6,31 @@ "block.create.adjustable_pulse_repeater": "\u0279\u01DD\u0287\u0250\u01DDd\u01DD\u1D1A \u01DDs\u05DFn\u0500 \u01DD\u05DFq\u0250\u0287sn\u0638p\u2C6F", "block.create.adjustable_repeater": "\u0279\u01DD\u0287\u0250\u01DDd\u01DD\u1D1A \u01DD\u05DFq\u0250\u0287sn\u0638p\u2C6F", "block.create.analog_lever": "\u0279\u01DD\u028C\u01DD\uA780 bo\u05DF\u0250u\u2C6F", + "block.create.andesite_belt_funnel": "\u05DF\u01DDuun\u2132 \u0287\u05DF\u01DD\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_bricks": "s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_bricks_slab": "q\u0250\u05DFS s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_bricks_stairs": "s\u0279\u0131\u0250\u0287S s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_bricks_wall": "\u05DF\u05DF\u0250M s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_casing": "bu\u0131s\u0250\u0186 \u01DD\u0287\u0131s\u01DDpu\u2C6F", + "block.create.andesite_chute_funnel": "\u05DF\u01DDuun\u2132 \u01DD\u0287n\u0265\u0186 \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_cobblestone": "\u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_cobblestone_slab": "q\u0250\u05DFS \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_cobblestone_stairs": "s\u0279\u0131\u0250\u0287S \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_cobblestone_wall": "\u05DF\u05DF\u0250M \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DD\u0287\u0131s\u01DDpu\u2C6F", + "block.create.andesite_funnel": "\u05DF\u01DDuun\u2132 \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_pillar": "\u0279\u0250\u05DF\u05DF\u0131\u0500 \u01DD\u0287\u0131s\u01DDpu\u2C6F", + "block.create.andesite_tunnel": "\u05DF\u01DDuun\u27D8 \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.basin": "u\u0131s\u0250\u15FA", "block.create.belt": "\u0287\u05DF\u01DD\u15FA", - "block.create.belt_funnel": "\u05DF\u01DDuun\u2132 \u0287\u05DF\u01DD\u15FA", "block.create.belt_observer": "\u0279\u01DD\u028C\u0279\u01DDsqO \u0287\u05DF\u01DD\u15FA", - "block.create.belt_tunnel": "\u05DF\u01DDuun\u27D8 \u0287\u05DF\u01DD\u15FA", "block.create.birch_window": "\u028Dopu\u0131M \u0265\u0254\u0279\u0131\u15FA", "block.create.birch_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M \u0265\u0254\u0279\u0131\u15FA", + "block.create.brass_belt_funnel": "\u05DF\u01DDuun\u2132 \u0287\u05DF\u01DD\u15FA ss\u0250\u0279\u15FA", "block.create.brass_block": "\u029E\u0254o\u05DF\u15FA ss\u0250\u0279\u15FA", "block.create.brass_casing": "bu\u0131s\u0250\u0186 ss\u0250\u0279\u15FA", + "block.create.brass_chute_funnel": "\u05DF\u01DDuun\u2132 \u01DD\u0287n\u0265\u0186 ss\u0250\u0279\u15FA", + "block.create.brass_funnel": "\u05DF\u01DDuun\u2132 ss\u0250\u0279\u15FA", + "block.create.brass_tunnel": "\u05DF\u01DDuun\u27D8 ss\u0250\u0279\u15FA", "block.create.cart_assembler": "\u0279\u01DD\u05DFq\u026F\u01DDss\u2C6F \u0287\u0279\u0250\u0186", "block.create.chiseled_dark_scoria": "\u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1 p\u01DD\u05DF\u01DDs\u0131\u0265\u0186", "block.create.chiseled_dolomite": "\u01DD\u0287\u0131\u026Fo\u05DFo\u15E1 p\u01DD\u05DF\u01DDs\u0131\u0265\u0186", @@ -33,7 +39,6 @@ "block.create.chiseled_scoria": "\u0250\u0131\u0279o\u0254S p\u01DD\u05DF\u01DDs\u0131\u0265\u0186", "block.create.chiseled_weathered_limestone": "\u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM p\u01DD\u05DF\u01DDs\u0131\u0265\u0186", "block.create.chute": "\u01DD\u0287n\u0265\u0186", - "block.create.chute_funnel": "\u05DF\u01DDuun\u2132 \u01DD\u0287n\u0265\u0186", "block.create.clockwork_bearing": "bu\u0131\u0279\u0250\u01DD\u15FA \u029E\u0279o\u028D\u029E\u0254o\u05DF\u0186", "block.create.clutch": "\u0265\u0254\u0287n\u05DF\u0186", "block.create.cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186", @@ -124,7 +129,6 @@ "block.create.flywheel": "\u05DF\u01DD\u01DD\u0265\u028D\u028E\u05DF\u2132", "block.create.framed_glass": "ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132", "block.create.framed_glass_pane": "\u01DDu\u0250\u0500 ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132", - "block.create.funnel": "\u05DF\u01DDuun\u2132", "block.create.furnace_engine": "\u01DDu\u0131bu\u018E \u01DD\u0254\u0250u\u0279n\u2132", "block.create.gabbro": "o\u0279qq\u0250\u2141", "block.create.gabbro_bricks": "s\u029E\u0254\u0131\u0279\u15FA o\u0279qq\u0250\u2141", @@ -284,7 +288,6 @@ "block.create.pulley_magnet": "\u0287\u01DDub\u0250W \u028E\u01DD\u05DF\u05DFn\u0500", "block.create.pulse_repeater": "\u0279\u01DD\u0287\u0250\u01DDd\u01DD\u1D1A \u01DDs\u05DFn\u0500", "block.create.radial_chassis": "s\u0131ss\u0250\u0265\u0186 \u05DF\u0250\u0131p\u0250\u1D1A", - "block.create.reality_funnel": "\u05DF\u01DDuun\u2132 \u028E\u0287\u0131\u05DF\u0250\u01DD\u1D1A", "block.create.redstone_contact": "\u0287\u0254\u0250\u0287uo\u0186 \u01DDuo\u0287sp\u01DD\u1D1A", "block.create.redstone_link": "\u029Eu\u0131\uA780 \u01DDuo\u0287sp\u01DD\u1D1A", "block.create.reinforced_rail": "\u05DF\u0131\u0250\u1D1A p\u01DD\u0254\u0279o\u025Fu\u0131\u01DD\u1D1A", @@ -319,7 +322,6 @@ "block.create.vertical_extractor": "\u0279o\u0287\u0254\u0250\u0279\u0287x\u018E \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B", "block.create.vertical_framed_glass": "ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132 \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B", "block.create.vertical_framed_glass_pane": "\u01DDu\u0250\u0500 ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132 \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B", - "block.create.vertical_funnel": "\u05DF\u01DDuun\u2132 \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B", "block.create.vertical_linked_extractor": "\u0279o\u0287\u0254\u0250\u0279\u0287x\u018E p\u01DD\u029Eu\u0131\uA780 \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B", "block.create.vertical_linked_transposer": "\u0279\u01DDsodsu\u0250\u0279\u27D8 p\u01DD\u029Eu\u0131\uA780 \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B", "block.create.vertical_transposer": "\u0279\u01DDsodsu\u0250\u0279\u27D8 \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 128dd9440..5e18d7883 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -9,25 +9,31 @@ "block.create.adjustable_pulse_repeater": "Adjustable Pulse Repeater", "block.create.adjustable_repeater": "Adjustable Repeater", "block.create.analog_lever": "Analog Lever", + "block.create.andesite_belt_funnel": "Andesite Belt Funnel", "block.create.andesite_bricks": "Andesite Bricks", "block.create.andesite_bricks_slab": "Andesite Bricks Slab", "block.create.andesite_bricks_stairs": "Andesite Bricks Stairs", "block.create.andesite_bricks_wall": "Andesite Bricks Wall", "block.create.andesite_casing": "Andesite Casing", + "block.create.andesite_chute_funnel": "Andesite Chute Funnel", "block.create.andesite_cobblestone": "Andesite Cobblestone", "block.create.andesite_cobblestone_slab": "Andesite Cobblestone Slab", "block.create.andesite_cobblestone_stairs": "Andesite Cobblestone Stairs", "block.create.andesite_cobblestone_wall": "Andesite Cobblestone Wall", + "block.create.andesite_funnel": "Andesite Funnel", "block.create.andesite_pillar": "Andesite Pillar", + "block.create.andesite_tunnel": "Andesite Tunnel", "block.create.basin": "Basin", "block.create.belt": "Belt", - "block.create.belt_funnel": "Belt Funnel", "block.create.belt_observer": "Belt Observer", - "block.create.belt_tunnel": "Belt Tunnel", "block.create.birch_window": "Birch Window", "block.create.birch_window_pane": "Birch Window Pane", + "block.create.brass_belt_funnel": "Brass Belt Funnel", "block.create.brass_block": "Brass Block", "block.create.brass_casing": "Brass Casing", + "block.create.brass_chute_funnel": "Brass Chute Funnel", + "block.create.brass_funnel": "Brass Funnel", + "block.create.brass_tunnel": "Brass Tunnel", "block.create.cart_assembler": "Cart Assembler", "block.create.chiseled_dark_scoria": "Chiseled Dark Scoria", "block.create.chiseled_dolomite": "Chiseled Dolomite", @@ -36,7 +42,6 @@ "block.create.chiseled_scoria": "Chiseled Scoria", "block.create.chiseled_weathered_limestone": "Chiseled Weathered Limestone", "block.create.chute": "Chute", - "block.create.chute_funnel": "Chute Funnel", "block.create.clockwork_bearing": "Clockwork Bearing", "block.create.clutch": "Clutch", "block.create.cogwheel": "Cogwheel", @@ -127,7 +132,6 @@ "block.create.flywheel": "Flywheel", "block.create.framed_glass": "Framed Glass", "block.create.framed_glass_pane": "Framed Glass Pane", - "block.create.funnel": "Funnel", "block.create.furnace_engine": "Furnace Engine", "block.create.gabbro": "Gabbro", "block.create.gabbro_bricks": "Gabbro Bricks", @@ -287,7 +291,6 @@ "block.create.pulley_magnet": "Pulley Magnet", "block.create.pulse_repeater": "Pulse Repeater", "block.create.radial_chassis": "Radial Chassis", - "block.create.reality_funnel": "Reality Funnel", "block.create.redstone_contact": "Redstone Contact", "block.create.redstone_link": "Redstone Link", "block.create.reinforced_rail": "Reinforced Rail", @@ -322,7 +325,6 @@ "block.create.vertical_extractor": "Vertical Extractor", "block.create.vertical_framed_glass": "Vertical Framed Glass", "block.create.vertical_framed_glass_pane": "Vertical Framed Glass Pane", - "block.create.vertical_funnel": "Vertical Funnel", "block.create.vertical_linked_extractor": "Vertical Linked Extractor", "block.create.vertical_linked_transposer": "Vertical Linked Transposer", "block.create.vertical_transposer": "Vertical Transposer", diff --git a/src/generated/resources/assets/create/lang/unfinished/de_de.json b/src/generated/resources/assets/create/lang/unfinished/de_de.json index d920041b5..0b7f7b251 100644 --- a/src/generated/resources/assets/create/lang/unfinished/de_de.json +++ b/src/generated/resources/assets/create/lang/unfinished/de_de.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 774", + "_": "Missing Localizations: 777", "_": "->------------------------] Game Elements [------------------------<-", @@ -10,25 +10,31 @@ "block.create.adjustable_pulse_repeater": "UNLOCALIZED: Adjustable Pulse Repeater", "block.create.adjustable_repeater": "Verzögernder Verstärker", "block.create.analog_lever": "UNLOCALIZED: Analog Lever", + "block.create.andesite_belt_funnel": "UNLOCALIZED: Andesite Belt Funnel", "block.create.andesite_bricks": "Andesitziegel", "block.create.andesite_bricks_slab": "UNLOCALIZED: Andesite Bricks Slab", "block.create.andesite_bricks_stairs": "UNLOCALIZED: Andesite Bricks Stairs", "block.create.andesite_bricks_wall": "UNLOCALIZED: Andesite Bricks Wall", "block.create.andesite_casing": "UNLOCALIZED: Andesite Casing", + "block.create.andesite_chute_funnel": "UNLOCALIZED: Andesite Chute Funnel", "block.create.andesite_cobblestone": "UNLOCALIZED: Andesite Cobblestone", "block.create.andesite_cobblestone_slab": "UNLOCALIZED: Andesite Cobblestone Slab", "block.create.andesite_cobblestone_stairs": "UNLOCALIZED: Andesite Cobblestone Stairs", "block.create.andesite_cobblestone_wall": "UNLOCALIZED: Andesite Cobblestone Wall", + "block.create.andesite_funnel": "UNLOCALIZED: Andesite Funnel", "block.create.andesite_pillar": "UNLOCALIZED: Andesite Pillar", + "block.create.andesite_tunnel": "UNLOCALIZED: Andesite Tunnel", "block.create.basin": "UNLOCALIZED: Basin", "block.create.belt": "Mechanischer Riemen", - "block.create.belt_funnel": "UNLOCALIZED: Belt Funnel", "block.create.belt_observer": "Fließband-Beobachter", - "block.create.belt_tunnel": "UNLOCALIZED: Belt Tunnel", "block.create.birch_window": "UNLOCALIZED: Birch Window", "block.create.birch_window_pane": "UNLOCALIZED: Birch Window Pane", + "block.create.brass_belt_funnel": "UNLOCALIZED: Brass Belt Funnel", "block.create.brass_block": "UNLOCALIZED: Brass Block", "block.create.brass_casing": "UNLOCALIZED: Brass Casing", + "block.create.brass_chute_funnel": "UNLOCALIZED: Brass Chute Funnel", + "block.create.brass_funnel": "UNLOCALIZED: Brass Funnel", + "block.create.brass_tunnel": "UNLOCALIZED: Brass Tunnel", "block.create.cart_assembler": "UNLOCALIZED: Cart Assembler", "block.create.chiseled_dark_scoria": "UNLOCALIZED: Chiseled Dark Scoria", "block.create.chiseled_dolomite": "UNLOCALIZED: Chiseled Dolomite", @@ -37,7 +43,6 @@ "block.create.chiseled_scoria": "UNLOCALIZED: Chiseled Scoria", "block.create.chiseled_weathered_limestone": "UNLOCALIZED: Chiseled Weathered Limestone", "block.create.chute": "UNLOCALIZED: Chute", - "block.create.chute_funnel": "UNLOCALIZED: Chute Funnel", "block.create.clockwork_bearing": "UNLOCALIZED: Clockwork Bearing", "block.create.clutch": "Kupplung", "block.create.cogwheel": "Zahnrad", @@ -128,7 +133,6 @@ "block.create.flywheel": "UNLOCALIZED: Flywheel", "block.create.framed_glass": "UNLOCALIZED: Framed Glass", "block.create.framed_glass_pane": "UNLOCALIZED: Framed Glass Pane", - "block.create.funnel": "Fließbandtrichter", "block.create.furnace_engine": "UNLOCALIZED: Furnace Engine", "block.create.gabbro": "Gabbro", "block.create.gabbro_bricks": "Gabbroziegel", @@ -288,7 +292,6 @@ "block.create.pulley_magnet": "UNLOCALIZED: Pulley Magnet", "block.create.pulse_repeater": "Pulsierender Verstärker", "block.create.radial_chassis": "Drehgerüst", - "block.create.reality_funnel": "UNLOCALIZED: Reality Funnel", "block.create.redstone_contact": "Redstone-Kontakt", "block.create.redstone_link": "Redstone-Verbindung", "block.create.reinforced_rail": "UNLOCALIZED: Reinforced Rail", @@ -323,7 +326,6 @@ "block.create.vertical_extractor": "UNLOCALIZED: Vertical Extractor", "block.create.vertical_framed_glass": "UNLOCALIZED: Vertical Framed Glass", "block.create.vertical_framed_glass_pane": "UNLOCALIZED: Vertical Framed Glass Pane", - "block.create.vertical_funnel": "UNLOCALIZED: Vertical Funnel", "block.create.vertical_linked_extractor": "UNLOCALIZED: Vertical Linked Extractor", "block.create.vertical_linked_transposer": "UNLOCALIZED: Vertical Linked Transposer", "block.create.vertical_transposer": "UNLOCALIZED: Vertical Transposer", diff --git a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json index b4b09cdfc..21baa7d50 100644 --- a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json +++ b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 376", + "_": "Missing Localizations: 380", "_": "->------------------------] Game Elements [------------------------<-", @@ -10,25 +10,31 @@ "block.create.adjustable_pulse_repeater": "Répéteur d'impulsions réglable", "block.create.adjustable_repeater": "Répéteur réglable", "block.create.analog_lever": "Levier analogique", + "block.create.andesite_belt_funnel": "UNLOCALIZED: Andesite Belt Funnel", "block.create.andesite_bricks": "Briques d'andésite", "block.create.andesite_bricks_slab": "UNLOCALIZED: Andesite Bricks Slab", "block.create.andesite_bricks_stairs": "UNLOCALIZED: Andesite Bricks Stairs", "block.create.andesite_bricks_wall": "UNLOCALIZED: Andesite Bricks Wall", "block.create.andesite_casing": "Boîtier en andésite", + "block.create.andesite_chute_funnel": "UNLOCALIZED: Andesite Chute Funnel", "block.create.andesite_cobblestone": "UNLOCALIZED: Andesite Cobblestone", "block.create.andesite_cobblestone_slab": "UNLOCALIZED: Andesite Cobblestone Slab", "block.create.andesite_cobblestone_stairs": "UNLOCALIZED: Andesite Cobblestone Stairs", "block.create.andesite_cobblestone_wall": "UNLOCALIZED: Andesite Cobblestone Wall", + "block.create.andesite_funnel": "UNLOCALIZED: Andesite Funnel", "block.create.andesite_pillar": "UNLOCALIZED: Andesite Pillar", + "block.create.andesite_tunnel": "UNLOCALIZED: Andesite Tunnel", "block.create.basin": "Bassin", "block.create.belt": "Tapis roulant", - "block.create.belt_funnel": "UNLOCALIZED: Belt Funnel", "block.create.belt_observer": "Observateur d'entité", - "block.create.belt_tunnel": "Tunnel de convoyeur", "block.create.birch_window": "UNLOCALIZED: Birch Window", "block.create.birch_window_pane": "UNLOCALIZED: Birch Window Pane", + "block.create.brass_belt_funnel": "UNLOCALIZED: Brass Belt Funnel", "block.create.brass_block": "UNLOCALIZED: Brass Block", "block.create.brass_casing": "Boîtier en laiton", + "block.create.brass_chute_funnel": "UNLOCALIZED: Brass Chute Funnel", + "block.create.brass_funnel": "UNLOCALIZED: Brass Funnel", + "block.create.brass_tunnel": "UNLOCALIZED: Brass Tunnel", "block.create.cart_assembler": "Assembleur de wagon", "block.create.chiseled_dark_scoria": "UNLOCALIZED: Chiseled Dark Scoria", "block.create.chiseled_dolomite": "UNLOCALIZED: Chiseled Dolomite", @@ -37,7 +43,6 @@ "block.create.chiseled_scoria": "UNLOCALIZED: Chiseled Scoria", "block.create.chiseled_weathered_limestone": "UNLOCALIZED: Chiseled Weathered Limestone", "block.create.chute": "UNLOCALIZED: Chute", - "block.create.chute_funnel": "UNLOCALIZED: Chute Funnel", "block.create.clockwork_bearing": "Roulement mécanique horloger", "block.create.clutch": "Embrayage", "block.create.cogwheel": "Roue dentée", @@ -128,7 +133,6 @@ "block.create.flywheel": "Volant d'inertie", "block.create.framed_glass": "Grande fenêtre en verre", "block.create.framed_glass_pane": "Grande vitre encadrée", - "block.create.funnel": "Entonnoir amélioré", "block.create.furnace_engine": "Moteur de four", "block.create.gabbro": "Gabbro", "block.create.gabbro_bricks": "Briques de gabbro", @@ -288,7 +292,6 @@ "block.create.pulley_magnet": "Aimant de poulie", "block.create.pulse_repeater": "Répéteur d'impulsions", "block.create.radial_chassis": "Châssis radial", - "block.create.reality_funnel": "UNLOCALIZED: Reality Funnel", "block.create.redstone_contact": "redstone_contact Redstone", "block.create.redstone_link": "Liaison Redstone", "block.create.reinforced_rail": "UNLOCALIZED: Reinforced Rail", @@ -323,7 +326,6 @@ "block.create.vertical_extractor": "UNLOCALIZED: Vertical Extractor", "block.create.vertical_framed_glass": "Fenêtre en verre verticale", "block.create.vertical_framed_glass_pane": "Vitre encadrée verticale", - "block.create.vertical_funnel": "UNLOCALIZED: Vertical Funnel", "block.create.vertical_linked_extractor": "UNLOCALIZED: Vertical Linked Extractor", "block.create.vertical_linked_transposer": "UNLOCALIZED: Vertical Linked Transposer", "block.create.vertical_transposer": "UNLOCALIZED: Vertical Transposer", diff --git a/src/generated/resources/assets/create/lang/unfinished/it_it.json b/src/generated/resources/assets/create/lang/unfinished/it_it.json index e477c8700..cd54613f7 100644 --- a/src/generated/resources/assets/create/lang/unfinished/it_it.json +++ b/src/generated/resources/assets/create/lang/unfinished/it_it.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 360", + "_": "Missing Localizations: 364", "_": "->------------------------] Game Elements [------------------------<-", @@ -10,25 +10,31 @@ "block.create.adjustable_pulse_repeater": "Ripetitore di Impulsi Regolabile", "block.create.adjustable_repeater": "Ripetitore Regolabile", "block.create.analog_lever": "Leva Analogica", + "block.create.andesite_belt_funnel": "UNLOCALIZED: Andesite Belt Funnel", "block.create.andesite_bricks": "Mattoni di Andesite", "block.create.andesite_bricks_slab": "UNLOCALIZED: Andesite Bricks Slab", "block.create.andesite_bricks_stairs": "UNLOCALIZED: Andesite Bricks Stairs", "block.create.andesite_bricks_wall": "UNLOCALIZED: Andesite Bricks Wall", "block.create.andesite_casing": "Involucro di Andesite", + "block.create.andesite_chute_funnel": "UNLOCALIZED: Andesite Chute Funnel", "block.create.andesite_cobblestone": "UNLOCALIZED: Andesite Cobblestone", "block.create.andesite_cobblestone_slab": "UNLOCALIZED: Andesite Cobblestone Slab", "block.create.andesite_cobblestone_stairs": "UNLOCALIZED: Andesite Cobblestone Stairs", "block.create.andesite_cobblestone_wall": "UNLOCALIZED: Andesite Cobblestone Wall", + "block.create.andesite_funnel": "UNLOCALIZED: Andesite Funnel", "block.create.andesite_pillar": "UNLOCALIZED: Andesite Pillar", + "block.create.andesite_tunnel": "UNLOCALIZED: Andesite Tunnel", "block.create.basin": "Bacinella", "block.create.belt": "Nastro Meccanico", - "block.create.belt_funnel": "UNLOCALIZED: Belt Funnel", "block.create.belt_observer": "Osservatore a Cinghia", - "block.create.belt_tunnel": "Tunnel Trasportatore", "block.create.birch_window": "UNLOCALIZED: Birch Window", "block.create.birch_window_pane": "UNLOCALIZED: Birch Window Pane", + "block.create.brass_belt_funnel": "UNLOCALIZED: Brass Belt Funnel", "block.create.brass_block": "Blocco di Ottone", "block.create.brass_casing": "Involucro di Ottone", + "block.create.brass_chute_funnel": "UNLOCALIZED: Brass Chute Funnel", + "block.create.brass_funnel": "UNLOCALIZED: Brass Funnel", + "block.create.brass_tunnel": "UNLOCALIZED: Brass Tunnel", "block.create.cart_assembler": "Assemblatore Carrello da Miniera", "block.create.chiseled_dark_scoria": "UNLOCALIZED: Chiseled Dark Scoria", "block.create.chiseled_dolomite": "UNLOCALIZED: Chiseled Dolomite", @@ -37,7 +43,6 @@ "block.create.chiseled_scoria": "UNLOCALIZED: Chiseled Scoria", "block.create.chiseled_weathered_limestone": "UNLOCALIZED: Chiseled Weathered Limestone", "block.create.chute": "UNLOCALIZED: Chute", - "block.create.chute_funnel": "UNLOCALIZED: Chute Funnel", "block.create.clockwork_bearing": "Supporto del Orologio", "block.create.clutch": "Frizione", "block.create.cogwheel": "Ruota Dentata", @@ -128,7 +133,6 @@ "block.create.flywheel": "Volano", "block.create.framed_glass": "Finestra Grande Vetro", "block.create.framed_glass_pane": "Pannello di Finestra Grande Vetro", - "block.create.funnel": "Imbuto", "block.create.furnace_engine": "Motore Fornace", "block.create.gabbro": "Gabbro", "block.create.gabbro_bricks": "Mattoni di Gabbro", @@ -288,7 +292,6 @@ "block.create.pulley_magnet": "Magnete della Puleggia", "block.create.pulse_repeater": "Ripetitore di Impulsi", "block.create.radial_chassis": "Telaio Radiale", - "block.create.reality_funnel": "UNLOCALIZED: Reality Funnel", "block.create.redstone_contact": "Contatto Redstone", "block.create.redstone_link": "Collegamento Redstone", "block.create.reinforced_rail": "UNLOCALIZED: Reinforced Rail", @@ -323,7 +326,6 @@ "block.create.vertical_extractor": "UNLOCALIZED: Vertical Extractor", "block.create.vertical_framed_glass": "Finestra Verticale Vetro", "block.create.vertical_framed_glass_pane": "Pannello di Finestra Verticale Vetro", - "block.create.vertical_funnel": "UNLOCALIZED: Vertical Funnel", "block.create.vertical_linked_extractor": "UNLOCALIZED: Vertical Linked Extractor", "block.create.vertical_linked_transposer": "UNLOCALIZED: Vertical Linked Transposer", "block.create.vertical_transposer": "UNLOCALIZED: Vertical Transposer", diff --git a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json index eb1aba63d..4bc000f9d 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json +++ b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 355", + "_": "Missing Localizations: 359", "_": "->------------------------] Game Elements [------------------------<-", @@ -10,25 +10,31 @@ "block.create.adjustable_pulse_repeater": "調整可能なパルスリピーター", "block.create.adjustable_repeater": "調整可能なリピーター", "block.create.analog_lever": "アナログレバー", + "block.create.andesite_belt_funnel": "UNLOCALIZED: Andesite Belt Funnel", "block.create.andesite_bricks": "安山岩レンガ", "block.create.andesite_bricks_slab": "UNLOCALIZED: Andesite Bricks Slab", "block.create.andesite_bricks_stairs": "UNLOCALIZED: Andesite Bricks Stairs", "block.create.andesite_bricks_wall": "UNLOCALIZED: Andesite Bricks Wall", "block.create.andesite_casing": "安山岩ケーシング", + "block.create.andesite_chute_funnel": "UNLOCALIZED: Andesite Chute Funnel", "block.create.andesite_cobblestone": "UNLOCALIZED: Andesite Cobblestone", "block.create.andesite_cobblestone_slab": "UNLOCALIZED: Andesite Cobblestone Slab", "block.create.andesite_cobblestone_stairs": "UNLOCALIZED: Andesite Cobblestone Stairs", "block.create.andesite_cobblestone_wall": "UNLOCALIZED: Andesite Cobblestone Wall", + "block.create.andesite_funnel": "UNLOCALIZED: Andesite Funnel", "block.create.andesite_pillar": "UNLOCALIZED: Andesite Pillar", + "block.create.andesite_tunnel": "UNLOCALIZED: Andesite Tunnel", "block.create.basin": "鉢", "block.create.belt": "メカニカルベルト", - "block.create.belt_funnel": "UNLOCALIZED: Belt Funnel", "block.create.belt_observer": "ベルトオブザーバー", - "block.create.belt_tunnel": "コンベアトンネル", "block.create.birch_window": "UNLOCALIZED: Birch Window", "block.create.birch_window_pane": "UNLOCALIZED: Birch Window Pane", + "block.create.brass_belt_funnel": "UNLOCALIZED: Brass Belt Funnel", "block.create.brass_block": "真鍮ブロック", "block.create.brass_casing": "真鍮ケーシング", + "block.create.brass_chute_funnel": "UNLOCALIZED: Brass Chute Funnel", + "block.create.brass_funnel": "UNLOCALIZED: Brass Funnel", + "block.create.brass_tunnel": "UNLOCALIZED: Brass Tunnel", "block.create.cart_assembler": "カートアセンブラ", "block.create.chiseled_dark_scoria": "UNLOCALIZED: Chiseled Dark Scoria", "block.create.chiseled_dolomite": "UNLOCALIZED: Chiseled Dolomite", @@ -37,7 +43,6 @@ "block.create.chiseled_scoria": "UNLOCALIZED: Chiseled Scoria", "block.create.chiseled_weathered_limestone": "UNLOCALIZED: Chiseled Weathered Limestone", "block.create.chute": "UNLOCALIZED: Chute", - "block.create.chute_funnel": "UNLOCALIZED: Chute Funnel", "block.create.clockwork_bearing": "時計仕掛けのベアリング", "block.create.clutch": "クラッチ", "block.create.cogwheel": "歯車", @@ -128,7 +133,6 @@ "block.create.flywheel": "勢車", "block.create.framed_glass": "大きなガラス窓", "block.create.framed_glass_pane": "大きなガラス窓板", - "block.create.funnel": "漏斗", "block.create.furnace_engine": "かまどエンジン", "block.create.gabbro": "斑れい岩", "block.create.gabbro_bricks": "斑れい岩レンガ", @@ -288,7 +292,6 @@ "block.create.pulley_magnet": "プーリーマグネット", "block.create.pulse_repeater": "パルスリピーター", "block.create.radial_chassis": "ラジアルシャーシ", - "block.create.reality_funnel": "UNLOCALIZED: Reality Funnel", "block.create.redstone_contact": "レッドストーンコンタクト", "block.create.redstone_link": "レッドストーンリンク", "block.create.reinforced_rail": "UNLOCALIZED: Reinforced Rail", @@ -323,7 +326,6 @@ "block.create.vertical_extractor": "UNLOCALIZED: Vertical Extractor", "block.create.vertical_framed_glass": "垂直ガラス窓", "block.create.vertical_framed_glass_pane": "垂直ガラス窓板", - "block.create.vertical_funnel": "UNLOCALIZED: Vertical Funnel", "block.create.vertical_linked_extractor": "UNLOCALIZED: Vertical Linked Extractor", "block.create.vertical_linked_transposer": "UNLOCALIZED: Vertical Linked Transposer", "block.create.vertical_transposer": "UNLOCALIZED: Vertical Transposer", diff --git a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json index a46b6bf9b..92d51ddfc 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json +++ b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 360", + "_": "Missing Localizations: 364", "_": "->------------------------] Game Elements [------------------------<-", @@ -10,25 +10,31 @@ "block.create.adjustable_pulse_repeater": "가변 펄스 리피터", "block.create.adjustable_repeater": "가변 리피터", "block.create.analog_lever": "아날로그 레버", + "block.create.andesite_belt_funnel": "UNLOCALIZED: Andesite Belt Funnel", "block.create.andesite_bricks": "안산안 벽돌", "block.create.andesite_bricks_slab": "UNLOCALIZED: Andesite Bricks Slab", "block.create.andesite_bricks_stairs": "UNLOCALIZED: Andesite Bricks Stairs", "block.create.andesite_bricks_wall": "UNLOCALIZED: Andesite Bricks Wall", "block.create.andesite_casing": "안산암 케이스", + "block.create.andesite_chute_funnel": "UNLOCALIZED: Andesite Chute Funnel", "block.create.andesite_cobblestone": "UNLOCALIZED: Andesite Cobblestone", "block.create.andesite_cobblestone_slab": "UNLOCALIZED: Andesite Cobblestone Slab", "block.create.andesite_cobblestone_stairs": "UNLOCALIZED: Andesite Cobblestone Stairs", "block.create.andesite_cobblestone_wall": "UNLOCALIZED: Andesite Cobblestone Wall", + "block.create.andesite_funnel": "UNLOCALIZED: Andesite Funnel", "block.create.andesite_pillar": "UNLOCALIZED: Andesite Pillar", + "block.create.andesite_tunnel": "UNLOCALIZED: Andesite Tunnel", "block.create.basin": "대야", "block.create.belt": "컨베이어 벨트", - "block.create.belt_funnel": "UNLOCALIZED: Belt Funnel", "block.create.belt_observer": "벨트 감지기", - "block.create.belt_tunnel": "컨베이어 벨트 터널", "block.create.birch_window": "UNLOCALIZED: Birch Window", "block.create.birch_window_pane": "UNLOCALIZED: Birch Window Pane", + "block.create.brass_belt_funnel": "UNLOCALIZED: Brass Belt Funnel", "block.create.brass_block": "황동 블럭", "block.create.brass_casing": "황동 케이스", + "block.create.brass_chute_funnel": "UNLOCALIZED: Brass Chute Funnel", + "block.create.brass_funnel": "UNLOCALIZED: Brass Funnel", + "block.create.brass_tunnel": "UNLOCALIZED: Brass Tunnel", "block.create.cart_assembler": "카트 조립기", "block.create.chiseled_dark_scoria": "UNLOCALIZED: Chiseled Dark Scoria", "block.create.chiseled_dolomite": "UNLOCALIZED: Chiseled Dolomite", @@ -37,7 +43,6 @@ "block.create.chiseled_scoria": "UNLOCALIZED: Chiseled Scoria", "block.create.chiseled_weathered_limestone": "UNLOCALIZED: Chiseled Weathered Limestone", "block.create.chute": "UNLOCALIZED: Chute", - "block.create.chute_funnel": "UNLOCALIZED: Chute Funnel", "block.create.clockwork_bearing": "시계 베어링", "block.create.clutch": "클러치", "block.create.cogwheel": "톱나버퀴", @@ -128,7 +133,6 @@ "block.create.flywheel": "플라이휠", "block.create.framed_glass": "큰 유리", "block.create.framed_glass_pane": "큰 유리판", - "block.create.funnel": "깔대기", "block.create.furnace_engine": "화로 엔진", "block.create.gabbro": "반려암", "block.create.gabbro_bricks": "반려암 벽돌", @@ -288,7 +292,6 @@ "block.create.pulley_magnet": "도르래 자석", "block.create.pulse_repeater": "펄스 리피터", "block.create.radial_chassis": "원형 섀시", - "block.create.reality_funnel": "UNLOCALIZED: Reality Funnel", "block.create.redstone_contact": "동형 감지기", "block.create.redstone_link": "레드스톤 링크", "block.create.reinforced_rail": "UNLOCALIZED: Reinforced Rail", @@ -323,7 +326,6 @@ "block.create.vertical_extractor": "UNLOCALIZED: Vertical Extractor", "block.create.vertical_framed_glass": "수직 유리", "block.create.vertical_framed_glass_pane": "수직 유리판", - "block.create.vertical_funnel": "UNLOCALIZED: Vertical Funnel", "block.create.vertical_linked_extractor": "UNLOCALIZED: Vertical Linked Extractor", "block.create.vertical_linked_transposer": "UNLOCALIZED: Vertical Linked Transposer", "block.create.vertical_transposer": "UNLOCALIZED: Vertical Transposer", diff --git a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json index 72168412c..82e15be94 100644 --- a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json +++ b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 710", + "_": "Missing Localizations: 714", "_": "->------------------------] Game Elements [------------------------<-", @@ -10,25 +10,31 @@ "block.create.adjustable_pulse_repeater": "UNLOCALIZED: Adjustable Pulse Repeater", "block.create.adjustable_repeater": "FlexSterker", "block.create.analog_lever": "UNLOCALIZED: Analog Lever", + "block.create.andesite_belt_funnel": "UNLOCALIZED: Andesite Belt Funnel", "block.create.andesite_bricks": "Andesietstenen", "block.create.andesite_bricks_slab": "UNLOCALIZED: Andesite Bricks Slab", "block.create.andesite_bricks_stairs": "UNLOCALIZED: Andesite Bricks Stairs", "block.create.andesite_bricks_wall": "UNLOCALIZED: Andesite Bricks Wall", "block.create.andesite_casing": "UNLOCALIZED: Andesite Casing", + "block.create.andesite_chute_funnel": "UNLOCALIZED: Andesite Chute Funnel", "block.create.andesite_cobblestone": "UNLOCALIZED: Andesite Cobblestone", "block.create.andesite_cobblestone_slab": "UNLOCALIZED: Andesite Cobblestone Slab", "block.create.andesite_cobblestone_stairs": "UNLOCALIZED: Andesite Cobblestone Stairs", "block.create.andesite_cobblestone_wall": "UNLOCALIZED: Andesite Cobblestone Wall", + "block.create.andesite_funnel": "UNLOCALIZED: Andesite Funnel", "block.create.andesite_pillar": "UNLOCALIZED: Andesite Pillar", + "block.create.andesite_tunnel": "UNLOCALIZED: Andesite Tunnel", "block.create.basin": "Bekken", "block.create.belt": "Mechanische Transportband", - "block.create.belt_funnel": "UNLOCALIZED: Belt Funnel", "block.create.belt_observer": "Transportband Observeerder", - "block.create.belt_tunnel": "Transportband Tunnel", "block.create.birch_window": "UNLOCALIZED: Birch Window", "block.create.birch_window_pane": "UNLOCALIZED: Birch Window Pane", + "block.create.brass_belt_funnel": "UNLOCALIZED: Brass Belt Funnel", "block.create.brass_block": "UNLOCALIZED: Brass Block", "block.create.brass_casing": "UNLOCALIZED: Brass Casing", + "block.create.brass_chute_funnel": "UNLOCALIZED: Brass Chute Funnel", + "block.create.brass_funnel": "UNLOCALIZED: Brass Funnel", + "block.create.brass_tunnel": "UNLOCALIZED: Brass Tunnel", "block.create.cart_assembler": "Kar Assembler", "block.create.chiseled_dark_scoria": "UNLOCALIZED: Chiseled Dark Scoria", "block.create.chiseled_dolomite": "UNLOCALIZED: Chiseled Dolomite", @@ -37,7 +43,6 @@ "block.create.chiseled_scoria": "UNLOCALIZED: Chiseled Scoria", "block.create.chiseled_weathered_limestone": "UNLOCALIZED: Chiseled Weathered Limestone", "block.create.chute": "UNLOCALIZED: Chute", - "block.create.chute_funnel": "UNLOCALIZED: Chute Funnel", "block.create.clockwork_bearing": "UNLOCALIZED: Clockwork Bearing", "block.create.clutch": "Koppeling", "block.create.cogwheel": "Tandwiel", @@ -128,7 +133,6 @@ "block.create.flywheel": "UNLOCALIZED: Flywheel", "block.create.framed_glass": "Ingelijst Glas", "block.create.framed_glass_pane": "UNLOCALIZED: Framed Glass Pane", - "block.create.funnel": "Transportband Trechter", "block.create.furnace_engine": "UNLOCALIZED: Furnace Engine", "block.create.gabbro": "Gabbro", "block.create.gabbro_bricks": "Gabbrostenen", @@ -288,7 +292,6 @@ "block.create.pulley_magnet": "UNLOCALIZED: Pulley Magnet", "block.create.pulse_repeater": "Pulse Versterker", "block.create.radial_chassis": "Rotation Frame", - "block.create.reality_funnel": "UNLOCALIZED: Reality Funnel", "block.create.redstone_contact": "Redstone redstone_contact", "block.create.redstone_link": "Redstone Brug", "block.create.reinforced_rail": "UNLOCALIZED: Reinforced Rail", @@ -323,7 +326,6 @@ "block.create.vertical_extractor": "UNLOCALIZED: Vertical Extractor", "block.create.vertical_framed_glass": "UNLOCALIZED: Vertical Framed Glass", "block.create.vertical_framed_glass_pane": "UNLOCALIZED: Vertical Framed Glass Pane", - "block.create.vertical_funnel": "UNLOCALIZED: Vertical Funnel", "block.create.vertical_linked_extractor": "UNLOCALIZED: Vertical Linked Extractor", "block.create.vertical_linked_transposer": "UNLOCALIZED: Vertical Linked Transposer", "block.create.vertical_transposer": "UNLOCALIZED: Vertical Transposer", diff --git a/src/generated/resources/assets/create/lang/unfinished/pt_br.json b/src/generated/resources/assets/create/lang/unfinished/pt_br.json index 345a72f3e..134623835 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_br.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_br.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 781", + "_": "Missing Localizations: 784", "_": "->------------------------] Game Elements [------------------------<-", @@ -10,25 +10,31 @@ "block.create.adjustable_pulse_repeater": "UNLOCALIZED: Adjustable Pulse Repeater", "block.create.adjustable_repeater": "Repetidor Flex", "block.create.analog_lever": "UNLOCALIZED: Analog Lever", + "block.create.andesite_belt_funnel": "UNLOCALIZED: Andesite Belt Funnel", "block.create.andesite_bricks": "Tijolos de Andesite", "block.create.andesite_bricks_slab": "UNLOCALIZED: Andesite Bricks Slab", "block.create.andesite_bricks_stairs": "UNLOCALIZED: Andesite Bricks Stairs", "block.create.andesite_bricks_wall": "UNLOCALIZED: Andesite Bricks Wall", "block.create.andesite_casing": "UNLOCALIZED: Andesite Casing", + "block.create.andesite_chute_funnel": "UNLOCALIZED: Andesite Chute Funnel", "block.create.andesite_cobblestone": "UNLOCALIZED: Andesite Cobblestone", "block.create.andesite_cobblestone_slab": "UNLOCALIZED: Andesite Cobblestone Slab", "block.create.andesite_cobblestone_stairs": "UNLOCALIZED: Andesite Cobblestone Stairs", "block.create.andesite_cobblestone_wall": "UNLOCALIZED: Andesite Cobblestone Wall", + "block.create.andesite_funnel": "UNLOCALIZED: Andesite Funnel", "block.create.andesite_pillar": "UNLOCALIZED: Andesite Pillar", + "block.create.andesite_tunnel": "UNLOCALIZED: Andesite Tunnel", "block.create.basin": "UNLOCALIZED: Basin", "block.create.belt": "Esteira Mecânica", - "block.create.belt_funnel": "UNLOCALIZED: Belt Funnel", "block.create.belt_observer": "Observador de Esteira", - "block.create.belt_tunnel": "UNLOCALIZED: Belt Tunnel", "block.create.birch_window": "UNLOCALIZED: Birch Window", "block.create.birch_window_pane": "UNLOCALIZED: Birch Window Pane", + "block.create.brass_belt_funnel": "UNLOCALIZED: Brass Belt Funnel", "block.create.brass_block": "UNLOCALIZED: Brass Block", "block.create.brass_casing": "UNLOCALIZED: Brass Casing", + "block.create.brass_chute_funnel": "UNLOCALIZED: Brass Chute Funnel", + "block.create.brass_funnel": "UNLOCALIZED: Brass Funnel", + "block.create.brass_tunnel": "UNLOCALIZED: Brass Tunnel", "block.create.cart_assembler": "UNLOCALIZED: Cart Assembler", "block.create.chiseled_dark_scoria": "UNLOCALIZED: Chiseled Dark Scoria", "block.create.chiseled_dolomite": "UNLOCALIZED: Chiseled Dolomite", @@ -37,7 +43,6 @@ "block.create.chiseled_scoria": "UNLOCALIZED: Chiseled Scoria", "block.create.chiseled_weathered_limestone": "UNLOCALIZED: Chiseled Weathered Limestone", "block.create.chute": "UNLOCALIZED: Chute", - "block.create.chute_funnel": "UNLOCALIZED: Chute Funnel", "block.create.clockwork_bearing": "UNLOCALIZED: Clockwork Bearing", "block.create.clutch": "Embreagem", "block.create.cogwheel": "Roda Dentada", @@ -128,7 +133,6 @@ "block.create.flywheel": "UNLOCALIZED: Flywheel", "block.create.framed_glass": "UNLOCALIZED: Framed Glass", "block.create.framed_glass_pane": "UNLOCALIZED: Framed Glass Pane", - "block.create.funnel": "Funil de Esteira", "block.create.furnace_engine": "UNLOCALIZED: Furnace Engine", "block.create.gabbro": "Gabbro", "block.create.gabbro_bricks": "Tijolos de Gabbro", @@ -288,7 +292,6 @@ "block.create.pulley_magnet": "UNLOCALIZED: Pulley Magnet", "block.create.pulse_repeater": "Repetidor de Pulso", "block.create.radial_chassis": "Chassis de Rotação", - "block.create.reality_funnel": "UNLOCALIZED: Reality Funnel", "block.create.redstone_contact": "Contato de Redstone", "block.create.redstone_link": "Conexão de Redstone", "block.create.reinforced_rail": "UNLOCALIZED: Reinforced Rail", @@ -323,7 +326,6 @@ "block.create.vertical_extractor": "UNLOCALIZED: Vertical Extractor", "block.create.vertical_framed_glass": "UNLOCALIZED: Vertical Framed Glass", "block.create.vertical_framed_glass_pane": "UNLOCALIZED: Vertical Framed Glass Pane", - "block.create.vertical_funnel": "UNLOCALIZED: Vertical Funnel", "block.create.vertical_linked_extractor": "UNLOCALIZED: Vertical Linked Extractor", "block.create.vertical_linked_transposer": "UNLOCALIZED: Vertical Linked Transposer", "block.create.vertical_transposer": "UNLOCALIZED: Vertical Transposer", diff --git a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json index d4a63d2ae..b3f27dba3 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json +++ b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 775", + "_": "Missing Localizations: 778", "_": "->------------------------] Game Elements [------------------------<-", @@ -10,25 +10,31 @@ "block.create.adjustable_pulse_repeater": "UNLOCALIZED: Adjustable Pulse Repeater", "block.create.adjustable_repeater": "Настраиваемый повторитель", "block.create.analog_lever": "UNLOCALIZED: Analog Lever", + "block.create.andesite_belt_funnel": "UNLOCALIZED: Andesite Belt Funnel", "block.create.andesite_bricks": "Андезитовые кирпичи", "block.create.andesite_bricks_slab": "UNLOCALIZED: Andesite Bricks Slab", "block.create.andesite_bricks_stairs": "UNLOCALIZED: Andesite Bricks Stairs", "block.create.andesite_bricks_wall": "UNLOCALIZED: Andesite Bricks Wall", "block.create.andesite_casing": "UNLOCALIZED: Andesite Casing", + "block.create.andesite_chute_funnel": "UNLOCALIZED: Andesite Chute Funnel", "block.create.andesite_cobblestone": "UNLOCALIZED: Andesite Cobblestone", "block.create.andesite_cobblestone_slab": "UNLOCALIZED: Andesite Cobblestone Slab", "block.create.andesite_cobblestone_stairs": "UNLOCALIZED: Andesite Cobblestone Stairs", "block.create.andesite_cobblestone_wall": "UNLOCALIZED: Andesite Cobblestone Wall", + "block.create.andesite_funnel": "UNLOCALIZED: Andesite Funnel", "block.create.andesite_pillar": "UNLOCALIZED: Andesite Pillar", + "block.create.andesite_tunnel": "UNLOCALIZED: Andesite Tunnel", "block.create.basin": "UNLOCALIZED: Basin", "block.create.belt": "Механическая лента", - "block.create.belt_funnel": "UNLOCALIZED: Belt Funnel", "block.create.belt_observer": "Ленточный сканер", - "block.create.belt_tunnel": "UNLOCALIZED: Belt Tunnel", "block.create.birch_window": "UNLOCALIZED: Birch Window", "block.create.birch_window_pane": "UNLOCALIZED: Birch Window Pane", + "block.create.brass_belt_funnel": "UNLOCALIZED: Brass Belt Funnel", "block.create.brass_block": "UNLOCALIZED: Brass Block", "block.create.brass_casing": "UNLOCALIZED: Brass Casing", + "block.create.brass_chute_funnel": "UNLOCALIZED: Brass Chute Funnel", + "block.create.brass_funnel": "UNLOCALIZED: Brass Funnel", + "block.create.brass_tunnel": "UNLOCALIZED: Brass Tunnel", "block.create.cart_assembler": "UNLOCALIZED: Cart Assembler", "block.create.chiseled_dark_scoria": "UNLOCALIZED: Chiseled Dark Scoria", "block.create.chiseled_dolomite": "UNLOCALIZED: Chiseled Dolomite", @@ -37,7 +43,6 @@ "block.create.chiseled_scoria": "UNLOCALIZED: Chiseled Scoria", "block.create.chiseled_weathered_limestone": "UNLOCALIZED: Chiseled Weathered Limestone", "block.create.chute": "UNLOCALIZED: Chute", - "block.create.chute_funnel": "UNLOCALIZED: Chute Funnel", "block.create.clockwork_bearing": "UNLOCALIZED: Clockwork Bearing", "block.create.clutch": "Переключаемая муфта", "block.create.cogwheel": "Шестерня", @@ -128,7 +133,6 @@ "block.create.flywheel": "UNLOCALIZED: Flywheel", "block.create.framed_glass": "UNLOCALIZED: Framed Glass", "block.create.framed_glass_pane": "UNLOCALIZED: Framed Glass Pane", - "block.create.funnel": "Ленточная воронка", "block.create.furnace_engine": "UNLOCALIZED: Furnace Engine", "block.create.gabbro": "Габбро", "block.create.gabbro_bricks": "Габбровые кирпичи", @@ -288,7 +292,6 @@ "block.create.pulley_magnet": "UNLOCALIZED: Pulley Magnet", "block.create.pulse_repeater": "Повторитель импульса", "block.create.radial_chassis": "Поворотная рама", - "block.create.reality_funnel": "UNLOCALIZED: Reality Funnel", "block.create.redstone_contact": "Контактное соединение", "block.create.redstone_link": "Сигнальное соединение", "block.create.reinforced_rail": "UNLOCALIZED: Reinforced Rail", @@ -323,7 +326,6 @@ "block.create.vertical_extractor": "UNLOCALIZED: Vertical Extractor", "block.create.vertical_framed_glass": "UNLOCALIZED: Vertical Framed Glass", "block.create.vertical_framed_glass_pane": "UNLOCALIZED: Vertical Framed Glass Pane", - "block.create.vertical_funnel": "UNLOCALIZED: Vertical Funnel", "block.create.vertical_linked_extractor": "UNLOCALIZED: Vertical Linked Extractor", "block.create.vertical_linked_transposer": "UNLOCALIZED: Vertical Linked Transposer", "block.create.vertical_transposer": "UNLOCALIZED: Vertical Transposer", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json index e30433a0d..0f1a8b8b8 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 35", + "_": "Missing Localizations: 40", "_": "->------------------------] Game Elements [------------------------<-", @@ -10,25 +10,31 @@ "block.create.adjustable_pulse_repeater": "可调节脉冲中继器", "block.create.adjustable_repeater": "可调节中继器", "block.create.analog_lever": "可调节拉杆", + "block.create.andesite_belt_funnel": "UNLOCALIZED: Andesite Belt Funnel", "block.create.andesite_bricks": "安山岩砖", "block.create.andesite_bricks_slab": "安山岩砖台阶", "block.create.andesite_bricks_stairs": "安山岩砖楼梯", "block.create.andesite_bricks_wall": "安山岩砖墙", "block.create.andesite_casing": "安山机壳", + "block.create.andesite_chute_funnel": "UNLOCALIZED: Andesite Chute Funnel", "block.create.andesite_cobblestone": "安山岩圆石", "block.create.andesite_cobblestone_slab": "安山岩圆石台阶", "block.create.andesite_cobblestone_stairs": "安山岩圆石楼梯", "block.create.andesite_cobblestone_wall": "安山岩圆石墙", + "block.create.andesite_funnel": "UNLOCALIZED: Andesite Funnel", "block.create.andesite_pillar": "竖纹安山岩", + "block.create.andesite_tunnel": "UNLOCALIZED: Andesite Tunnel", "block.create.basin": "工作盆", "block.create.belt": "传送带", - "block.create.belt_funnel": "UNLOCALIZED: Belt Funnel", "block.create.belt_observer": "传送带侦测器", - "block.create.belt_tunnel": "传送带隧道", "block.create.birch_window": "白桦窗户", "block.create.birch_window_pane": "白桦窗户板", + "block.create.brass_belt_funnel": "UNLOCALIZED: Brass Belt Funnel", "block.create.brass_block": "黄铜块", "block.create.brass_casing": "黄铜机壳", + "block.create.brass_chute_funnel": "UNLOCALIZED: Brass Chute Funnel", + "block.create.brass_funnel": "UNLOCALIZED: Brass Funnel", + "block.create.brass_tunnel": "UNLOCALIZED: Brass Tunnel", "block.create.cart_assembler": "矿车装配站", "block.create.chiseled_dark_scoria": "錾制深色熔渣", "block.create.chiseled_dolomite": "錾制白云岩", @@ -37,7 +43,6 @@ "block.create.chiseled_scoria": "錾制熔渣", "block.create.chiseled_weathered_limestone": "錾制风化石灰岩", "block.create.chute": "UNLOCALIZED: Chute", - "block.create.chute_funnel": "UNLOCALIZED: Chute Funnel", "block.create.clockwork_bearing": "时钟轴承", "block.create.clutch": "离合器", "block.create.cogwheel": "齿轮", @@ -128,7 +133,6 @@ "block.create.flywheel": "飞轮", "block.create.framed_glass": "边框玻璃", "block.create.framed_glass_pane": "边框玻璃板", - "block.create.funnel": "漏斗", "block.create.furnace_engine": "熔炼引擎", "block.create.gabbro": "辉长岩", "block.create.gabbro_bricks": "辉长岩砖", @@ -288,7 +292,6 @@ "block.create.pulley_magnet": "传送带磁铁", "block.create.pulse_repeater": "脉冲中继器", "block.create.radial_chassis": "旋转底盘", - "block.create.reality_funnel": "UNLOCALIZED: Reality Funnel", "block.create.redstone_contact": "信号检测器", "block.create.redstone_link": "无限红石信号终端", "block.create.reinforced_rail": "UNLOCALIZED: Reinforced Rail", @@ -323,7 +326,6 @@ "block.create.vertical_extractor": "竖直提取器", "block.create.vertical_framed_glass": "竖直边框玻璃", "block.create.vertical_framed_glass_pane": "竖直边框玻璃板", - "block.create.vertical_funnel": "竖直漏斗", "block.create.vertical_linked_extractor": "竖直无限提取器", "block.create.vertical_linked_transposer": "竖直无线传输器", "block.create.vertical_transposer": "竖直传输器", diff --git a/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pull_extended.json b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pull_extended.json new file mode 100644 index 000000000..da858b2fc --- /dev/null +++ b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pull_extended.json @@ -0,0 +1,9 @@ +{ + "parent": "create:block/belt_funnel/block_extended", + "textures": { + "particle": "create:block/andesite_casing", + "2": "create:block/andesite_funnel_pull", + "3": "create:block/andesite_funnel_back", + "4": "create:block/andesite_funnel_plating" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pull_retracted.json b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pull_retracted.json new file mode 100644 index 000000000..67b96635e --- /dev/null +++ b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pull_retracted.json @@ -0,0 +1,9 @@ +{ + "parent": "create:block/belt_funnel/block_retracted", + "textures": { + "particle": "create:block/andesite_casing", + "2": "create:block/andesite_funnel_pull", + "3": "create:block/andesite_funnel_back", + "4": "create:block/andesite_funnel_plating" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_belt_funnel_push_extended.json b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_push_extended.json new file mode 100644 index 000000000..105a02ccb --- /dev/null +++ b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_push_extended.json @@ -0,0 +1,9 @@ +{ + "parent": "create:block/belt_funnel/block_extended", + "textures": { + "particle": "create:block/andesite_casing", + "2": "create:block/andesite_funnel_push", + "3": "create:block/andesite_funnel_back", + "4": "create:block/andesite_funnel_plating" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_belt_funnel_push_retracted.json b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_push_retracted.json new file mode 100644 index 000000000..1284e8489 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_push_retracted.json @@ -0,0 +1,9 @@ +{ + "parent": "create:block/belt_funnel/block_retracted", + "textures": { + "particle": "create:block/andesite_casing", + "2": "create:block/andesite_funnel_push", + "3": "create:block/andesite_funnel_back", + "4": "create:block/andesite_funnel_plating" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_chute_funnel_pull.json b/src/generated/resources/assets/create/models/block/andesite_chute_funnel_pull.json new file mode 100644 index 000000000..4561dbc7a --- /dev/null +++ b/src/generated/resources/assets/create/models/block/andesite_chute_funnel_pull.json @@ -0,0 +1,9 @@ +{ + "parent": "create:block/chute_funnel/block", + "textures": { + "particle": "create:block/andesite_casing", + "3": "create:block/andesite_funnel_pull", + "1_2": "create:block/andesite_funnel_back", + "4": "create:block/andesite_funnel_plating" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_chute_funnel_push.json b/src/generated/resources/assets/create/models/block/andesite_chute_funnel_push.json new file mode 100644 index 000000000..5e9dde5b1 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/andesite_chute_funnel_push.json @@ -0,0 +1,9 @@ +{ + "parent": "create:block/chute_funnel/block", + "textures": { + "particle": "create:block/andesite_casing", + "3": "create:block/andesite_funnel_push", + "1_2": "create:block/andesite_funnel_back", + "4": "create:block/andesite_funnel_plating" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_funnel.json b/src/generated/resources/assets/create/models/block/andesite_funnel.json new file mode 100644 index 000000000..d16aeb312 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/andesite_funnel.json @@ -0,0 +1,9 @@ +{ + "parent": "create:block/funnel/block", + "textures": { + "2": "create:block/andesite_funnel_back", + "3": "create:block/andesite_funnel", + "4": "create:block/andesite_funnel_plating", + "particle": "create:block/andesite_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_tunnel/cross.json b/src/generated/resources/assets/create/models/block/andesite_tunnel/cross.json new file mode 100644 index 000000000..358403aca --- /dev/null +++ b/src/generated/resources/assets/create/models/block/andesite_tunnel/cross.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/belt_tunnel/cross", + "textures": { + "0": "create:block/andesite_tunnel", + "particle": "block/polished_andesite" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_tunnel/fullshade.json b/src/generated/resources/assets/create/models/block/andesite_tunnel/fullshade.json new file mode 100644 index 000000000..b1656f6c8 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/andesite_tunnel/fullshade.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/belt_tunnel/fullshade", + "textures": { + "0": "create:block/andesite_tunnel", + "particle": "block/polished_andesite" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_tunnel/halfshade.json b/src/generated/resources/assets/create/models/block/andesite_tunnel/halfshade.json new file mode 100644 index 000000000..c679c0a88 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/andesite_tunnel/halfshade.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/belt_tunnel/halfshade", + "textures": { + "0": "create:block/andesite_tunnel", + "particle": "block/polished_andesite" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_tunnel/straight.json b/src/generated/resources/assets/create/models/block/andesite_tunnel/straight.json new file mode 100644 index 000000000..53fc1627a --- /dev/null +++ b/src/generated/resources/assets/create/models/block/andesite_tunnel/straight.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/belt_tunnel/straight", + "textures": { + "0": "create:block/andesite_tunnel", + "particle": "block/polished_andesite" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_tunnel/t_left.json b/src/generated/resources/assets/create/models/block/andesite_tunnel/t_left.json new file mode 100644 index 000000000..12beb7306 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/andesite_tunnel/t_left.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/belt_tunnel/t_left", + "textures": { + "0": "create:block/andesite_tunnel", + "particle": "block/polished_andesite" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_tunnel/t_right.json b/src/generated/resources/assets/create/models/block/andesite_tunnel/t_right.json new file mode 100644 index 000000000..a5b30e322 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/andesite_tunnel/t_right.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/belt_tunnel/t_right", + "textures": { + "0": "create:block/andesite_tunnel", + "particle": "block/polished_andesite" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_tunnel/window.json b/src/generated/resources/assets/create/models/block/andesite_tunnel/window.json new file mode 100644 index 000000000..a2cef9213 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/andesite_tunnel/window.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/belt_tunnel/window", + "textures": { + "0": "create:block/andesite_tunnel", + "particle": "block/polished_andesite" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/belt_funnel_pull_off_extended.json b/src/generated/resources/assets/create/models/block/belt_funnel_pull_off_extended.json deleted file mode 100644 index d5b74c732..000000000 --- a/src/generated/resources/assets/create/models/block/belt_funnel_pull_off_extended.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/belt_funnel/block_extended", - "textures": { - "2": "create:block/belt_funnel_pull_off" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/belt_funnel_pull_off_retracted.json b/src/generated/resources/assets/create/models/block/belt_funnel_pull_off_retracted.json deleted file mode 100644 index 8139c8f3c..000000000 --- a/src/generated/resources/assets/create/models/block/belt_funnel_pull_off_retracted.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/belt_funnel/block_retracted", - "textures": { - "2": "create:block/belt_funnel_pull_off" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/belt_funnel_pull_on_extended.json b/src/generated/resources/assets/create/models/block/belt_funnel_pull_on_extended.json deleted file mode 100644 index 04c877bc1..000000000 --- a/src/generated/resources/assets/create/models/block/belt_funnel_pull_on_extended.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/belt_funnel/block_extended", - "textures": { - "2": "create:block/belt_funnel_pull_on" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/belt_funnel_pull_on_retracted.json b/src/generated/resources/assets/create/models/block/belt_funnel_pull_on_retracted.json deleted file mode 100644 index a0e81c6cd..000000000 --- a/src/generated/resources/assets/create/models/block/belt_funnel_pull_on_retracted.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/belt_funnel/block_retracted", - "textures": { - "2": "create:block/belt_funnel_pull_on" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/belt_funnel_push_on_extended.json b/src/generated/resources/assets/create/models/block/belt_funnel_push_on_extended.json deleted file mode 100644 index 94272c53b..000000000 --- a/src/generated/resources/assets/create/models/block/belt_funnel_push_on_extended.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/belt_funnel/block_extended", - "textures": { - "2": "create:block/belt_funnel_push_on" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/belt_funnel_push_on_retracted.json b/src/generated/resources/assets/create/models/block/belt_funnel_push_on_retracted.json deleted file mode 100644 index a1800b8e0..000000000 --- a/src/generated/resources/assets/create/models/block/belt_funnel_push_on_retracted.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/belt_funnel/block_retracted", - "textures": { - "2": "create:block/belt_funnel_push_on" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_belt_funnel_pull_extended.json b/src/generated/resources/assets/create/models/block/brass_belt_funnel_pull_extended.json new file mode 100644 index 000000000..744a196ce --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_belt_funnel_pull_extended.json @@ -0,0 +1,9 @@ +{ + "parent": "create:block/belt_funnel/block_extended", + "textures": { + "particle": "create:block/brass_casing", + "2": "create:block/brass_funnel_pull", + "3": "create:block/brass_funnel_back", + "4": "create:block/brass_funnel_plating" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_belt_funnel_pull_powered_extended.json b/src/generated/resources/assets/create/models/block/brass_belt_funnel_pull_powered_extended.json new file mode 100644 index 000000000..aa5aa7d49 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_belt_funnel_pull_powered_extended.json @@ -0,0 +1,9 @@ +{ + "parent": "create:block/belt_funnel/block_extended", + "textures": { + "particle": "create:block/brass_casing", + "2": "create:block/brass_funnel_pull_powered", + "3": "create:block/brass_funnel_back", + "4": "create:block/brass_funnel_plating" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_belt_funnel_pull_powered_retracted.json b/src/generated/resources/assets/create/models/block/brass_belt_funnel_pull_powered_retracted.json new file mode 100644 index 000000000..6bdee09e6 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_belt_funnel_pull_powered_retracted.json @@ -0,0 +1,9 @@ +{ + "parent": "create:block/belt_funnel/block_retracted", + "textures": { + "particle": "create:block/brass_casing", + "2": "create:block/brass_funnel_pull_powered", + "3": "create:block/brass_funnel_back", + "4": "create:block/brass_funnel_plating" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_belt_funnel_pull_retracted.json b/src/generated/resources/assets/create/models/block/brass_belt_funnel_pull_retracted.json new file mode 100644 index 000000000..8121dc133 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_belt_funnel_pull_retracted.json @@ -0,0 +1,9 @@ +{ + "parent": "create:block/belt_funnel/block_retracted", + "textures": { + "particle": "create:block/brass_casing", + "2": "create:block/brass_funnel_pull", + "3": "create:block/brass_funnel_back", + "4": "create:block/brass_funnel_plating" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_belt_funnel_push_extended.json b/src/generated/resources/assets/create/models/block/brass_belt_funnel_push_extended.json new file mode 100644 index 000000000..a52556ff0 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_belt_funnel_push_extended.json @@ -0,0 +1,9 @@ +{ + "parent": "create:block/belt_funnel/block_extended", + "textures": { + "particle": "create:block/brass_casing", + "2": "create:block/brass_funnel_push", + "3": "create:block/brass_funnel_back", + "4": "create:block/brass_funnel_plating" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_belt_funnel_push_powered_extended.json b/src/generated/resources/assets/create/models/block/brass_belt_funnel_push_powered_extended.json new file mode 100644 index 000000000..aa3f44366 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_belt_funnel_push_powered_extended.json @@ -0,0 +1,9 @@ +{ + "parent": "create:block/belt_funnel/block_extended", + "textures": { + "particle": "create:block/brass_casing", + "2": "create:block/brass_funnel_push_powered", + "3": "create:block/brass_funnel_back", + "4": "create:block/brass_funnel_plating" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_belt_funnel_push_powered_retracted.json b/src/generated/resources/assets/create/models/block/brass_belt_funnel_push_powered_retracted.json new file mode 100644 index 000000000..fc08d9de8 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_belt_funnel_push_powered_retracted.json @@ -0,0 +1,9 @@ +{ + "parent": "create:block/belt_funnel/block_retracted", + "textures": { + "particle": "create:block/brass_casing", + "2": "create:block/brass_funnel_push_powered", + "3": "create:block/brass_funnel_back", + "4": "create:block/brass_funnel_plating" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_belt_funnel_push_retracted.json b/src/generated/resources/assets/create/models/block/brass_belt_funnel_push_retracted.json new file mode 100644 index 000000000..9dcab1608 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_belt_funnel_push_retracted.json @@ -0,0 +1,9 @@ +{ + "parent": "create:block/belt_funnel/block_retracted", + "textures": { + "particle": "create:block/brass_casing", + "2": "create:block/brass_funnel_push", + "3": "create:block/brass_funnel_back", + "4": "create:block/brass_funnel_plating" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_chute_funnel_pull.json b/src/generated/resources/assets/create/models/block/brass_chute_funnel_pull.json new file mode 100644 index 000000000..f5621e7c1 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_chute_funnel_pull.json @@ -0,0 +1,9 @@ +{ + "parent": "create:block/chute_funnel/block", + "textures": { + "particle": "create:block/brass_casing", + "3": "create:block/brass_funnel_pull", + "1_2": "create:block/brass_funnel_back", + "4": "create:block/brass_funnel_plating" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_chute_funnel_pull_powered.json b/src/generated/resources/assets/create/models/block/brass_chute_funnel_pull_powered.json new file mode 100644 index 000000000..4905bfe91 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_chute_funnel_pull_powered.json @@ -0,0 +1,9 @@ +{ + "parent": "create:block/chute_funnel/block", + "textures": { + "particle": "create:block/brass_casing", + "3": "create:block/brass_funnel_pull_powered", + "1_2": "create:block/brass_funnel_back", + "4": "create:block/brass_funnel_plating" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_chute_funnel_push.json b/src/generated/resources/assets/create/models/block/brass_chute_funnel_push.json new file mode 100644 index 000000000..c7fa3fa20 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_chute_funnel_push.json @@ -0,0 +1,9 @@ +{ + "parent": "create:block/chute_funnel/block", + "textures": { + "particle": "create:block/brass_casing", + "3": "create:block/brass_funnel_push", + "1_2": "create:block/brass_funnel_back", + "4": "create:block/brass_funnel_plating" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_chute_funnel_push_powered.json b/src/generated/resources/assets/create/models/block/brass_chute_funnel_push_powered.json new file mode 100644 index 000000000..549934816 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_chute_funnel_push_powered.json @@ -0,0 +1,9 @@ +{ + "parent": "create:block/chute_funnel/block", + "textures": { + "particle": "create:block/brass_casing", + "3": "create:block/brass_funnel_push_powered", + "1_2": "create:block/brass_funnel_back", + "4": "create:block/brass_funnel_plating" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_funnel.json b/src/generated/resources/assets/create/models/block/brass_funnel.json new file mode 100644 index 000000000..959b75b9a --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_funnel.json @@ -0,0 +1,9 @@ +{ + "parent": "create:block/funnel/block", + "textures": { + "2": "create:block/brass_funnel_back", + "3": "create:block/brass_funnel", + "4": "create:block/brass_funnel_plating", + "particle": "create:block/brass_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_funnel_powered.json b/src/generated/resources/assets/create/models/block/brass_funnel_powered.json new file mode 100644 index 000000000..d1e5a5f36 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_funnel_powered.json @@ -0,0 +1,9 @@ +{ + "parent": "create:block/funnel/block", + "textures": { + "2": "create:block/brass_funnel_back", + "3": "create:block/brass_funnel_powered", + "4": "create:block/brass_funnel_plating", + "particle": "create:block/brass_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_tunnel/cross.json b/src/generated/resources/assets/create/models/block/brass_tunnel/cross.json new file mode 100644 index 000000000..ddd59b92b --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_tunnel/cross.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/belt_tunnel/cross", + "textures": { + "0": "create:block/brass_tunnel", + "particle": "create:block/brass_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_tunnel/fullshade.json b/src/generated/resources/assets/create/models/block/brass_tunnel/fullshade.json new file mode 100644 index 000000000..40d276e2b --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_tunnel/fullshade.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/belt_tunnel/fullshade", + "textures": { + "0": "create:block/brass_tunnel", + "particle": "create:block/brass_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_tunnel/halfshade.json b/src/generated/resources/assets/create/models/block/brass_tunnel/halfshade.json new file mode 100644 index 000000000..60b51a330 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_tunnel/halfshade.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/belt_tunnel/halfshade", + "textures": { + "0": "create:block/brass_tunnel", + "particle": "create:block/brass_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_tunnel/straight.json b/src/generated/resources/assets/create/models/block/brass_tunnel/straight.json new file mode 100644 index 000000000..dd6fd9f1f --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_tunnel/straight.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/belt_tunnel/straight", + "textures": { + "0": "create:block/brass_tunnel", + "particle": "create:block/brass_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_tunnel/t_left.json b/src/generated/resources/assets/create/models/block/brass_tunnel/t_left.json new file mode 100644 index 000000000..38ff1c45c --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_tunnel/t_left.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/belt_tunnel/t_left", + "textures": { + "0": "create:block/brass_tunnel", + "particle": "create:block/brass_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_tunnel/t_right.json b/src/generated/resources/assets/create/models/block/brass_tunnel/t_right.json new file mode 100644 index 000000000..39ffb1a04 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_tunnel/t_right.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/belt_tunnel/t_right", + "textures": { + "0": "create:block/brass_tunnel", + "particle": "create:block/brass_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_tunnel/window.json b/src/generated/resources/assets/create/models/block/brass_tunnel/window.json new file mode 100644 index 000000000..b01232551 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_tunnel/window.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/belt_tunnel/window", + "textures": { + "0": "create:block/brass_tunnel", + "particle": "create:block/brass_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/chute_funnel_pull_off.json b/src/generated/resources/assets/create/models/block/chute_funnel_pull_off.json deleted file mode 100644 index f506327e4..000000000 --- a/src/generated/resources/assets/create/models/block/chute_funnel_pull_off.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/chute_funnel/block", - "textures": { - "3": "create:block/belt_funnel_pull_off" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/chute_funnel_pull_on.json b/src/generated/resources/assets/create/models/block/chute_funnel_pull_on.json deleted file mode 100644 index 2ae11c5a2..000000000 --- a/src/generated/resources/assets/create/models/block/chute_funnel_pull_on.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/chute_funnel/block", - "textures": { - "3": "create:block/belt_funnel_pull_on" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/chute_funnel_push_on.json b/src/generated/resources/assets/create/models/block/chute_funnel_push_on.json deleted file mode 100644 index a41a5207c..000000000 --- a/src/generated/resources/assets/create/models/block/chute_funnel_push_on.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/chute_funnel/block", - "textures": { - "3": "create:block/belt_funnel_push_on" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/andesite_funnel.json b/src/generated/resources/assets/create/models/item/andesite_funnel.json new file mode 100644 index 000000000..b3601a41f --- /dev/null +++ b/src/generated/resources/assets/create/models/item/andesite_funnel.json @@ -0,0 +1,9 @@ +{ + "parent": "create:block/funnel/item", + "textures": { + "2": "create:block/andesite_funnel_back", + "3": "create:block/andesite_funnel", + "4": "create:block/andesite_funnel_plating", + "particle": "create:block/andesite_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/andesite_tunnel.json b/src/generated/resources/assets/create/models/item/andesite_tunnel.json new file mode 100644 index 000000000..602fd4968 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/andesite_tunnel.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/belt_tunnel/item", + "textures": { + "0": "create:block/andesite_tunnel", + "particle": "block/polished_andesite" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/belt_tunnel.json b/src/generated/resources/assets/create/models/item/belt_tunnel.json deleted file mode 100644 index e47d5d8df..000000000 --- a/src/generated/resources/assets/create/models/item/belt_tunnel.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/belt_tunnel/item" -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/brass_funnel.json b/src/generated/resources/assets/create/models/item/brass_funnel.json new file mode 100644 index 000000000..3e7642b35 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/brass_funnel.json @@ -0,0 +1,9 @@ +{ + "parent": "create:block/funnel/item", + "textures": { + "2": "create:block/brass_funnel_back", + "3": "create:block/brass_funnel", + "4": "create:block/brass_funnel_plating", + "particle": "create:block/brass_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/brass_tunnel.json b/src/generated/resources/assets/create/models/item/brass_tunnel.json new file mode 100644 index 000000000..faa128867 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/brass_tunnel.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/belt_tunnel/item", + "textures": { + "0": "create:block/brass_tunnel", + "particle": "create:block/brass_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/funnel.json b/src/generated/resources/assets/create/models/item/funnel.json deleted file mode 100644 index 2092f1ffc..000000000 --- a/src/generated/resources/assets/create/models/item/funnel.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/funnel/item" -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/reality_funnel.json b/src/generated/resources/assets/create/models/item/reality_funnel.json deleted file mode 100644 index 38f4140ef..000000000 --- a/src/generated/resources/assets/create/models/item/reality_funnel.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/reality_funnel/item" -} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/belt_funnel.json b/src/generated/resources/data/create/loot_tables/blocks/andesite_belt_funnel.json similarity index 86% rename from src/generated/resources/data/create/loot_tables/blocks/belt_funnel.json rename to src/generated/resources/data/create/loot_tables/blocks/andesite_belt_funnel.json index 4f7095793..c6403dc5a 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/belt_funnel.json +++ b/src/generated/resources/data/create/loot_tables/blocks/andesite_belt_funnel.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "create:reality_funnel" + "name": "create:andesite_funnel" } ], "conditions": [ diff --git a/src/generated/resources/data/create/loot_tables/blocks/andesite_chute_funnel.json b/src/generated/resources/data/create/loot_tables/blocks/andesite_chute_funnel.json new file mode 100644 index 000000000..c6403dc5a --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/andesite_chute_funnel.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:andesite_funnel" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/andesite_funnel.json b/src/generated/resources/data/create/loot_tables/blocks/andesite_funnel.json new file mode 100644 index 000000000..c6403dc5a --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/andesite_funnel.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:andesite_funnel" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/andesite_tunnel.json b/src/generated/resources/data/create/loot_tables/blocks/andesite_tunnel.json new file mode 100644 index 000000000..64e2b05ab --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/andesite_tunnel.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:andesite_tunnel" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/vertical_funnel.json b/src/generated/resources/data/create/loot_tables/blocks/brass_belt_funnel.json similarity index 86% rename from src/generated/resources/data/create/loot_tables/blocks/vertical_funnel.json rename to src/generated/resources/data/create/loot_tables/blocks/brass_belt_funnel.json index 34ac7539d..c23027b20 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/vertical_funnel.json +++ b/src/generated/resources/data/create/loot_tables/blocks/brass_belt_funnel.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "create:funnel" + "name": "create:brass_funnel" } ], "conditions": [ diff --git a/src/generated/resources/data/create/loot_tables/blocks/belt_tunnel.json b/src/generated/resources/data/create/loot_tables/blocks/brass_chute_funnel.json similarity index 86% rename from src/generated/resources/data/create/loot_tables/blocks/belt_tunnel.json rename to src/generated/resources/data/create/loot_tables/blocks/brass_chute_funnel.json index 727739640..c23027b20 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/belt_tunnel.json +++ b/src/generated/resources/data/create/loot_tables/blocks/brass_chute_funnel.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "create:belt_tunnel" + "name": "create:brass_funnel" } ], "conditions": [ diff --git a/src/generated/resources/data/create/loot_tables/blocks/funnel.json b/src/generated/resources/data/create/loot_tables/blocks/brass_funnel.json similarity index 86% rename from src/generated/resources/data/create/loot_tables/blocks/funnel.json rename to src/generated/resources/data/create/loot_tables/blocks/brass_funnel.json index 34ac7539d..c23027b20 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/funnel.json +++ b/src/generated/resources/data/create/loot_tables/blocks/brass_funnel.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "create:funnel" + "name": "create:brass_funnel" } ], "conditions": [ diff --git a/src/generated/resources/data/create/loot_tables/blocks/chute_funnel.json b/src/generated/resources/data/create/loot_tables/blocks/brass_tunnel.json similarity index 86% rename from src/generated/resources/data/create/loot_tables/blocks/chute_funnel.json rename to src/generated/resources/data/create/loot_tables/blocks/brass_tunnel.json index 4f7095793..c627a6553 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/chute_funnel.json +++ b/src/generated/resources/data/create/loot_tables/blocks/brass_tunnel.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "create:reality_funnel" + "name": "create:brass_tunnel" } ], "conditions": [ diff --git a/src/generated/resources/data/create/loot_tables/blocks/reality_funnel.json b/src/generated/resources/data/create/loot_tables/blocks/reality_funnel.json deleted file mode 100644 index 4f7095793..000000000 --- a/src/generated/resources/data/create/loot_tables/blocks/reality_funnel.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "create:reality_funnel" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/blocks/brittle.json b/src/generated/resources/data/create/tags/blocks/brittle.json index b07e222fb..c2e37b343 100644 --- a/src/generated/resources/data/create/tags/blocks/brittle.json +++ b/src/generated/resources/data/create/tags/blocks/brittle.json @@ -10,8 +10,6 @@ "create:extractor", "create:vertical_extractor", "create:linked_extractor", - "create:vertical_linked_extractor", - "create:funnel", - "create:vertical_funnel" + "create:vertical_linked_extractor" ] } \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 05099f5e7..4560fb109 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -93,19 +93,19 @@ import com.simibubi.create.content.logistics.block.diodes.ToggleLatchGenerator; import com.simibubi.create.content.logistics.block.extractor.ExtractorBlock; import com.simibubi.create.content.logistics.block.extractor.LinkedExtractorBlock; import com.simibubi.create.content.logistics.block.extractor.VerticalExtractorGenerator; -import com.simibubi.create.content.logistics.block.funnel.FunnelBlock; -import com.simibubi.create.content.logistics.block.funnel.VerticalFunnelGenerator; import com.simibubi.create.content.logistics.block.inventories.AdjustableCrateBlock; import com.simibubi.create.content.logistics.block.inventories.CreativeCrateBlock; import com.simibubi.create.content.logistics.block.mechanicalArm.ArmBlock; import com.simibubi.create.content.logistics.block.mechanicalArm.ArmItem; import com.simibubi.create.content.logistics.block.packager.PackagerBlock; -import com.simibubi.create.content.logistics.block.realityFunnel.BeltFunnelBlock; +import com.simibubi.create.content.logistics.block.realityFunnel.AndesiteBeltFunnelBlock; +import com.simibubi.create.content.logistics.block.realityFunnel.AndesiteChuteFunnelBlock; +import com.simibubi.create.content.logistics.block.realityFunnel.AndesiteFunnelBlock; import com.simibubi.create.content.logistics.block.realityFunnel.BeltFunnelGenerator; -import com.simibubi.create.content.logistics.block.realityFunnel.ChuteFunnelBlock; +import com.simibubi.create.content.logistics.block.realityFunnel.BrassBeltFunnelBlock; +import com.simibubi.create.content.logistics.block.realityFunnel.BrassChuteFunnelBlock; +import com.simibubi.create.content.logistics.block.realityFunnel.BrassFunnelBlock; import com.simibubi.create.content.logistics.block.realityFunnel.ChuteFunnelGenerator; -import com.simibubi.create.content.logistics.block.realityFunnel.FunnelItem; -import com.simibubi.create.content.logistics.block.realityFunnel.RealityFunnelBlock; import com.simibubi.create.content.logistics.block.redstone.AnalogLeverBlock; import com.simibubi.create.content.logistics.block.redstone.NixieTubeBlock; import com.simibubi.create.content.logistics.block.redstone.NixieTubeGenerator; @@ -138,6 +138,7 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.state.properties.PistonType; import net.minecraft.tags.BlockTags; import net.minecraft.util.Direction.Axis; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.generators.ConfiguredModel; import net.minecraftforge.common.ToolType; @@ -703,25 +704,54 @@ public class AllBlocks { .transform(customItemModel()) .register(); - public static final BlockEntry REALITY_FUNNEL = - REGISTRATE.block("reality_funnel", RealityFunnelBlock::new) - .initialProperties(SharedProperties::softMetal) - .blockstate((c, p) -> p.directionalBlock(c.get(), AssetLookup.forPowered(c, p))) - .item(FunnelItem::new) - .transform(customItemModel()) + public static final BlockEntry ANDESITE_FUNNEL = + REGISTRATE.block("andesite_funnel", AndesiteFunnelBlock::new) + .initialProperties(SharedProperties::stone) + .transform(BuilderTransformers.funnel("andesite", Create.asResource("block/andesite_casing"))) .register(); - public static final BlockEntry BELT_FUNNEL = REGISTRATE.block("belt_funnel", BeltFunnelBlock::new) - .initialProperties(SharedProperties::softMetal) - .blockstate(new BeltFunnelGenerator()::generate) - .loot((p, b) -> p.registerDropping(b, REALITY_FUNNEL.get())) - .register(); + public static final BlockEntry ANDESITE_BELT_FUNNEL = + REGISTRATE.block("andesite_belt_funnel", AndesiteBeltFunnelBlock::new) + .initialProperties(SharedProperties::stone) + .blockstate(new BeltFunnelGenerator("andesite")::generate) + .loot((p, b) -> p.registerDropping(b, ANDESITE_FUNNEL.get())) + .register(); - public static final BlockEntry CHUTE_FUNNEL = - REGISTRATE.block("chute_funnel", ChuteFunnelBlock::new) + public static final BlockEntry ANDESITE_CHUTE_FUNNEL = + REGISTRATE.block("andesite_chute_funnel", AndesiteChuteFunnelBlock::new) + .initialProperties(SharedProperties::stone) + .blockstate(new ChuteFunnelGenerator("andesite")::generate) + .loot((p, b) -> p.registerDropping(b, ANDESITE_FUNNEL.get())) + .register(); + + public static final BlockEntry BRASS_FUNNEL = + REGISTRATE.block("brass_funnel", BrassFunnelBlock::new) .initialProperties(SharedProperties::softMetal) - .blockstate(new ChuteFunnelGenerator()::generate) - .loot((p, b) -> p.registerDropping(b, REALITY_FUNNEL.get())) + .transform(BuilderTransformers.funnel("brass", Create.asResource("block/brass_casing"))) + .register(); + + public static final BlockEntry BRASS_BELT_FUNNEL = + REGISTRATE.block("brass_belt_funnel", BrassBeltFunnelBlock::new) + .initialProperties(SharedProperties::softMetal) + .blockstate(new BeltFunnelGenerator("brass")::generate) + .loot((p, b) -> p.registerDropping(b, BRASS_FUNNEL.get())) + .register(); + + public static final BlockEntry BRASS_CHUTE_FUNNEL = + REGISTRATE.block("brass_chute_funnel", BrassChuteFunnelBlock::new) + .initialProperties(SharedProperties::softMetal) + .blockstate(new ChuteFunnelGenerator("brass")::generate) + .loot((p, b) -> p.registerDropping(b, BRASS_FUNNEL.get())) + .register(); + + public static final BlockEntry ANDESITE_TUNNEL = + REGISTRATE.block("andesite_tunnel", BeltTunnelBlock::new) + .transform(BuilderTransformers.beltTunnel("andesite", new ResourceLocation("block/polished_andesite"))) + .register(); + + public static final BlockEntry BRASS_TUNNEL = + REGISTRATE.block("brass_tunnel", BeltTunnelBlock::new) + .transform(BuilderTransformers.beltTunnel("brass", Create.asResource("block/brass_block"))) .register(); public static final BlockEntry REDSTONE_CONTACT = @@ -777,20 +807,6 @@ public class AllBlocks { .transform(customItemModel()) .register(); - public static final BlockEntry BELT_TUNNEL = REGISTRATE.block("belt_tunnel", BeltTunnelBlock::new) - .initialProperties(SharedProperties::stone) - .addLayer(() -> RenderType::getCutoutMipped) - .blockstate((c, p) -> p.getVariantBuilder(c.get()) - .forAllStates(state -> ConfiguredModel.builder() - .modelFile(p.models() - .getExistingFile(p.modLoc("block/belt_tunnel/" + state.get(BeltTunnelBlock.SHAPE) - .getName()))) - .rotationY(state.get(BeltTunnelBlock.HORIZONTAL_AXIS) == Axis.X ? 0 : 90) - .build())) - .item() - .transform(customItemModel()) - .register(); - public static final BlockEntry PACKAGER = REGISTRATE.block("packager", PackagerBlock::new) .initialProperties(SharedProperties::softMetal) .transform(StressConfigDefaults.setImpact(4.0)) @@ -839,23 +855,6 @@ public class AllBlocks { .addLayer(() -> RenderType::getCutoutMipped) .register(); - public static final BlockEntry FUNNEL = REGISTRATE.block("funnel", FunnelBlock::new) - .initialProperties(SharedProperties::softMetal) - .tag(AllBlockTags.BRITTLE.tag) - .blockstate((c, p) -> p.horizontalBlock(c.get(), state -> p.models() - .getExistingFile(p.modLoc("block/funnel/horizontal" + (state.get(FunnelBlock.BELT) ? "_belt" : ""))))) - .item() - .transform(customItemModel()) - .register(); - - public static final BlockEntry VERTICAL_FUNNEL = - REGISTRATE.block("vertical_funnel", FunnelBlock.Vertical::new) - .initialProperties(SharedProperties::softMetal) - .tag(AllBlockTags.BRITTLE.tag) - .blockstate(new VerticalFunnelGenerator()::generate) - .loot((p, b) -> p.registerDropping(b, FUNNEL.get())) - .register(); - public static final BlockEntry TRANSPOSER = REGISTRATE.block("transposer", TransposerBlock::new) .initialProperties(SharedProperties::softMetal) .blockstate((c, p) -> p.horizontalBlock(c.get(), AssetLookup.forPowered(c, p, c.getName() + "/block"), 180)) diff --git a/src/main/java/com/simibubi/create/AllTileEntities.java b/src/main/java/com/simibubi/create/AllTileEntities.java index b639047f5..044d4fa25 100644 --- a/src/main/java/com/simibubi/create/AllTileEntities.java +++ b/src/main/java/com/simibubi/create/AllTileEntities.java @@ -81,7 +81,6 @@ import com.simibubi.create.content.logistics.block.diodes.AdjustableRepeaterRend import com.simibubi.create.content.logistics.block.diodes.AdjustableRepeaterTileEntity; import com.simibubi.create.content.logistics.block.extractor.ExtractorTileEntity; import com.simibubi.create.content.logistics.block.extractor.LinkedExtractorTileEntity; -import com.simibubi.create.content.logistics.block.funnel.FunnelTileEntity; import com.simibubi.create.content.logistics.block.inventories.AdjustableCrateTileEntity; import com.simibubi.create.content.logistics.block.inventories.CreativeCrateTileEntity; import com.simibubi.create.content.logistics.block.mechanicalArm.ArmRenderer; @@ -159,7 +158,7 @@ public class AllTileEntities { public static final TileEntityEntry CHUTE = register("chute", ChuteTileEntity::new, AllBlocks.CHUTE); public static final TileEntityEntry BELT_TUNNEL = - register("belt_tunnel", BeltTunnelTileEntity::new, AllBlocks.BELT_TUNNEL); + register("belt_tunnel", BeltTunnelTileEntity::new, AllBlocks.ANDESITE_TUNNEL, AllBlocks.BRASS_TUNNEL); public static final TileEntityEntry MECHANICAL_ARM = register("mechanical_arm", ArmTileEntity::new, AllBlocks.MECHANICAL_ARM); public static final TileEntityEntry MECHANICAL_PISTON = register("mechanical_piston", @@ -229,7 +228,8 @@ public class AllTileEntities { public static final TileEntityEntry DEPOT = register("depot", DepotTileEntity::new, AllBlocks.DEPOT); public static final TileEntityEntry REALITY_FUNNEL = register("reality_funnel", - RealityFunnelTileEntity::new, AllBlocks.REALITY_FUNNEL, AllBlocks.BELT_FUNNEL, AllBlocks.CHUTE_FUNNEL); + RealityFunnelTileEntity::new, AllBlocks.BRASS_FUNNEL, AllBlocks.BRASS_BELT_FUNNEL, AllBlocks.BRASS_CHUTE_FUNNEL, + AllBlocks.ANDESITE_FUNNEL, AllBlocks.ANDESITE_BELT_FUNNEL, AllBlocks.ANDESITE_CHUTE_FUNNEL); public static final TileEntityEntry PACKAGER = register("packager", PackagerTileEntity::new, AllBlocks.PACKAGER); @@ -241,8 +241,6 @@ public class AllTileEntities { register("transposer", TransposerTileEntity::new, AllBlocks.TRANSPOSER, AllBlocks.VERTICAL_TRANSPOSER); public static final TileEntityEntry LINKED_TRANSPOSER = register("linked_transposer", LinkedTransposerTileEntity::new, AllBlocks.LINKED_TRANSPOSER, AllBlocks.VERTICAL_LINKED_TRANSPOSER); - public static final TileEntityEntry FUNNEL = - register("funnel", FunnelTileEntity::new, AllBlocks.FUNNEL, AllBlocks.VERTICAL_FUNNEL); public static final TileEntityEntry BELT_OBSERVER = register("belt_observer", BeltObserverTileEntity::new, AllBlocks.BELT_OBSERVER); public static final TileEntityEntry ADJUSTABLE_REPEATER = @@ -314,7 +312,6 @@ public class AllTileEntities { bind(LINKED_EXTRACTOR, SmartTileEntityRenderer::new); bind(TRANSPOSER, SmartTileEntityRenderer::new); bind(LINKED_TRANSPOSER, SmartTileEntityRenderer::new); - bind(FUNNEL, SmartTileEntityRenderer::new); bind(REALITY_FUNNEL, RealityFunnelRenderer::new); bind(BELT_TUNNEL, BeltTunnelRenderer::new); bind(MECHANICAL_ARM, ArmRenderer::new); diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/BlockMovementTraits.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/BlockMovementTraits.java index 9d99d6491..e5944e514 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/BlockMovementTraits.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/BlockMovementTraits.java @@ -19,7 +19,6 @@ import com.simibubi.create.content.contraptions.components.structureMovement.pul import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyTileEntity; import com.simibubi.create.content.logistics.block.AttachedLogisticalBlock; import com.simibubi.create.content.logistics.block.extractor.ExtractorBlock; -import com.simibubi.create.content.logistics.block.funnel.FunnelBlock; import com.simibubi.create.content.logistics.block.redstone.RedstoneLinkBlock; import com.simibubi.create.content.logistics.block.transposer.TransposerBlock; @@ -97,8 +96,6 @@ public class BlockMovementTraits { return true; if (block instanceof ExtractorBlock) return true; - if (block instanceof FunnelBlock) - return true; return blockState.getPushReaction() != PushReaction.BLOCK; } diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java index 59b7be968..ceb92d25e 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java @@ -522,8 +522,9 @@ public class BeltBlock extends HorizontalKineticBlock implements ITE, return tunnelState; } - public static void updateTunnel(World world, BlockPos pos) { + public void updateTunnel(World world, BlockPos pos) { BlockState tunnel = world.getBlockState(pos); BlockState newTunnel = getTunnelState(world, pos); if (tunnel != newTunnel) { @@ -144,9 +144,8 @@ public class BeltTunnelBlock extends Block implements ITE, return group; } - private static BlockState getTunnelState(IBlockReader reader, BlockPos pos) { - BlockState state = AllBlocks.BELT_TUNNEL.getDefaultState(); - + private BlockState getTunnelState(IBlockReader reader, BlockPos pos) { + BlockState state = getDefaultState(); BlockState belt = reader.getBlockState(pos.down()); if (AllBlocks.BELT.has(belt)) state = state.with(HORIZONTAL_AXIS, belt.get(BeltBlock.HORIZONTAL_FACING) @@ -174,8 +173,9 @@ public class BeltTunnelBlock extends Block implements ITE, if (state.get(SHAPE) == Shape.STRAIGHT) { Direction fw = Direction.getFacingFromAxis(AxisDirection.POSITIVE, axis); - if (AllBlocks.BELT_TUNNEL.has(reader.getBlockState(pos.offset(fw))) - && AllBlocks.BELT_TUNNEL.has(reader.getBlockState(pos.offset(fw.getOpposite())))) + BlockState blockState1 = reader.getBlockState(pos.offset(fw)); + BlockState blockState2 = reader.getBlockState(pos.offset(fw.getOpposite())); + if (blockState1.getBlock() instanceof BeltTunnelBlock && blockState2.getBlock() instanceof BeltTunnelBlock) state = state.with(SHAPE, Shape.WINDOW); } diff --git a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelTileEntity.java index 0ea67c232..5d9cfa415 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelTileEntity.java @@ -54,9 +54,11 @@ public class BeltTunnelTileEntity extends SyncedTileEntity implements ITickableT if (AllBlocks.BELT.has(world.getBlockState(pos.down()))) { TileEntity teBelow = world.getTileEntity(pos.down()); if (teBelow != null) { - T capBelow = teBelow.getCapability(capability, Direction.UP).orElse(null); + T capBelow = teBelow.getCapability(capability, Direction.UP) + .orElse(null); if (capBelow != null) { - cap = LazyOptional.of(() -> capBelow).cast(); + cap = LazyOptional.of(() -> capBelow) + .cast(); } } } @@ -102,7 +104,7 @@ public class BeltTunnelTileEntity extends SyncedTileEntity implements ITickableT syncedFlaps.remove(face); else syncedFlaps.put(face, ItemStack.EMPTY); - + markDirty(); sendData(); return true; @@ -115,7 +117,8 @@ public class BeltTunnelTileEntity extends SyncedTileEntity implements ITickableT ListNBT flapsNBT = new ListNBT(); for (Pair pair : flapsToSend) { CompoundNBT flap = new CompoundNBT(); - flap.putInt("Flap", pair.getKey().getIndex()); + flap.putInt("Flap", pair.getKey() + .getIndex()); flap.putBoolean("FlapInward", pair.getValue()); flapsNBT.add(flap); } @@ -148,13 +151,15 @@ public class BeltTunnelTileEntity extends SyncedTileEntity implements ITickableT flaps.clear(); BlockState tunnelState = getBlockState(); for (Direction direction : Direction.values()) { - if (direction.getAxis().isVertical()) + if (direction.getAxis() + .isVertical()) continue; - if (AllBlocks.BELT_TUNNEL.has(world.getBlockState(pos.offset(direction)))) + BlockState blockState = world.getBlockState(pos.offset(direction)); + if (blockState.getBlock() instanceof BeltTunnelBlock) continue; if (direction.getAxis() != tunnelState.get(BlockStateProperties.HORIZONTAL_AXIS)) { - boolean positive = direction.getAxisDirection() == AxisDirection.POSITIVE - ^ direction.getAxis() == Axis.Z; + boolean positive = + direction.getAxisDirection() == AxisDirection.POSITIVE ^ direction.getAxis() == Axis.Z; Shape shape = tunnelState.get(BeltTunnelBlock.SHAPE); if (BeltTunnelBlock.isStraight(tunnelState)) continue; @@ -163,14 +168,16 @@ public class BeltTunnelTileEntity extends SyncedTileEntity implements ITickableT if (!positive && shape == Shape.T_RIGHT) continue; } - flaps.put(direction, new InterpolatedChasingValue().target(0).withSpeed(.05f)); + flaps.put(direction, new InterpolatedChasingValue().target(0) + .withSpeed(.05f)); } } public void flap(Direction side, boolean inward) { if (world.isRemote) { if (flaps.containsKey(side)) - flaps.get(side).set(inward ? -1 : 1); + flaps.get(side) + .set(inward ? -1 : 1); return; } diff --git a/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteTileEntity.java index 1d266f23c..4d8cfdfc0 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteTileEntity.java @@ -10,6 +10,7 @@ import com.simibubi.create.content.contraptions.components.fan.EncasedFanBlock; import com.simibubi.create.content.contraptions.components.fan.EncasedFanTileEntity; import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation; import com.simibubi.create.content.logistics.block.chute.ChuteBlock.Shape; +import com.simibubi.create.content.logistics.block.realityFunnel.BrassFunnelBlock; import com.simibubi.create.content.logistics.block.realityFunnel.ChuteFunnelBlock; import com.simibubi.create.content.logistics.block.realityFunnel.RealityFunnelBlock; import com.simibubi.create.foundation.gui.widgets.InterpolatedValue; @@ -146,10 +147,10 @@ public class ChuteTileEntity extends SmartTileEntity implements IHaveGoggleInfor return false; BlockState stateBelow = world.getBlockState(pos.down()); - if (AllBlocks.REALITY_FUNNEL.has(stateBelow)) { - if (stateBelow.get(RealityFunnelBlock.POWERED)) + if (AllBlocks.BRASS_FUNNEL.has(stateBelow)) { + if (stateBelow.get(BrassFunnelBlock.POWERED)) return false; - if (stateBelow.get(RealityFunnelBlock.FACING) != Direction.UP) + if (stateBelow.get(BrassFunnelBlock.FACING) != Direction.UP) return false; ItemStack remainder = RealityFunnelBlock.tryInsert(world, pos.down(), item, simulate); if (!simulate) @@ -186,9 +187,9 @@ public class ChuteTileEntity extends SmartTileEntity implements IHaveGoggleInfor private boolean handleUpwardOutput(boolean simulate) { BlockState stateAbove = world.getBlockState(pos.up()); - if (AllBlocks.REALITY_FUNNEL.has(stateAbove)) { - if (!stateAbove.get(RealityFunnelBlock.POWERED) - && stateAbove.get(RealityFunnelBlock.FACING) == Direction.DOWN) { + if (AllBlocks.BRASS_FUNNEL.has(stateAbove)) { + if (!stateAbove.get(BrassFunnelBlock.POWERED) + && stateAbove.get(BrassFunnelBlock.FACING) == Direction.DOWN) { ItemStack remainder = RealityFunnelBlock.tryInsert(world, pos.up(), item, simulate); if (remainder.isEmpty()) { if (!simulate) @@ -242,7 +243,7 @@ public class ChuteTileEntity extends SmartTileEntity implements IHaveGoggleInfor for (Direction direction : Iterate.horizontalDirections) { BlockPos funnelPos = pos.offset(direction); BlockState funnelState = world.getBlockState(funnelPos); - if (AllBlocks.CHUTE_FUNNEL.has(funnelState)) { + if (AllBlocks.BRASS_CHUTE_FUNNEL.has(funnelState)) { if (funnelState.get(ChuteFunnelBlock.POWERED)) continue; if (funnelState.get(ChuteFunnelBlock.HORIZONTAL_FACING) != direction.getOpposite()) diff --git a/src/main/java/com/simibubi/create/content/logistics/block/extractor/VerticalExtractorGenerator.java b/src/main/java/com/simibubi/create/content/logistics/block/extractor/VerticalExtractorGenerator.java index 27f87ac30..6a78f11e4 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/extractor/VerticalExtractorGenerator.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/extractor/VerticalExtractorGenerator.java @@ -1,6 +1,5 @@ package com.simibubi.create.content.logistics.block.extractor; -import com.simibubi.create.content.logistics.block.funnel.FunnelBlock; import com.simibubi.create.foundation.data.AssetLookup; import com.simibubi.create.foundation.data.SpecialBlockStateGen; import com.tterrag.registrate.providers.DataGenContext; @@ -25,7 +24,7 @@ public class VerticalExtractorGenerator extends SpecialBlockStateGen { @Override protected int getYRotation(BlockState state) { - return (state.get(FunnelBlock.UPWARD) ? 0 : 180) + horizontalAngle(state.get(FunnelBlock.HORIZONTAL_FACING)); + return (state.get(ExtractorBlock.UPWARD) ? 0 : 180) + horizontalAngle(state.get(ExtractorBlock.HORIZONTAL_FACING)); } @Override diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelBlock.java deleted file mode 100644 index b99794025..000000000 --- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelBlock.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.simibubi.create.content.logistics.block.funnel; - -import java.util.Collections; - -import com.simibubi.create.AllBlocks; -import com.simibubi.create.AllShapes; -import com.simibubi.create.AllTileEntities; -import com.simibubi.create.content.contraptions.components.structureMovement.IPortableBlock; -import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour; -import com.simibubi.create.content.contraptions.relays.belt.BeltHelper; -import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity; -import com.simibubi.create.content.logistics.block.AttachedLogisticalBlock; -import com.simibubi.create.foundation.block.ITE; -import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; -import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.entity.Entity; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.BlockItemUseContext; -import net.minecraft.item.ItemStack; -import net.minecraft.state.BooleanProperty; -import net.minecraft.state.StateContainer.Builder; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.shapes.ISelectionContext; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; -import net.minecraft.world.World; - -public class FunnelBlock extends AttachedLogisticalBlock - implements ITE, IPortableBlock { - - public static final BooleanProperty BELT = BooleanProperty.create("belt"); - public static final MovementBehaviour MOVEMENT = new FunnelMovementBehaviour(); - - public FunnelBlock(Properties properties) { - super(properties); - } - - @Override - protected void fillStateContainer(Builder builder) { - if (!isVertical()) - builder.add(BELT); - super.fillStateContainer(builder); - } - - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - - @Override - public TileEntity createTileEntity(BlockState state, IBlockReader world) { - return AllTileEntities.FUNNEL.create(); - } - - @Override - protected boolean isVertical() { - return false; - } - - @Override - public void onEntityCollision(BlockState state, World worldIn, BlockPos pos, Entity entityIn) { - if (worldIn.isRemote) - return; - if (!(entityIn instanceof ItemEntity)) - return; - ItemEntity itemEntity = (ItemEntity) entityIn; - withTileEntityDo(worldIn, pos, te -> { - ItemStack remainder = te.tryToInsert(itemEntity.getItem()); - if (remainder.isEmpty()) - itemEntity.remove(); - if (remainder.getCount() < itemEntity.getItem().getCount()) - itemEntity.setItem(remainder); - }); - } - - @Override - protected BlockState getVerticalDefaultState() { - return AllBlocks.VERTICAL_FUNNEL.getDefaultState(); - } - - @Override - protected BlockState getHorizontalDefaultState() { - return AllBlocks.FUNNEL.getDefaultState(); - } - - @Override - public BlockState updatePostPlacement(BlockState stateIn, Direction facing, BlockState facingState, IWorld worldIn, - BlockPos currentPos, BlockPos facingPos) { - if (facing == Direction.DOWN && !isVertical(stateIn)) - return stateIn.with(BELT, isOnBelt(worldIn, currentPos)); - return stateIn; - } - - @Override - public BlockState getStateForPlacement(BlockItemUseContext context) { - BlockState state = super.getStateForPlacement(context); - if (!isVertical(state)) { - World world = context.getWorld(); - BlockPos pos = context.getPos(); - state = state.with(BELT, isOnBelt(world, pos)); - } - return state; - } - - protected boolean isOnBelt(IWorld world, BlockPos pos) { - return AllBlocks.BELT.has(world.getBlockState(pos.down())); - } - - @Override - public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { - Direction direction = getBlockFacing(state); - if (!isVertical(state) && state.get(BELT)) - return AllShapes.BELT_FUNNEL.get(direction); - return AllShapes.FUNNEL.get(direction); - } - - @Override - public void onBlockAdded(BlockState state, World worldIn, BlockPos pos, BlockState oldState, boolean isMoving) { - if (worldIn.isRemote) - return; - - if (isOnBelt(worldIn, pos)) { - BeltTileEntity belt = BeltHelper.getSegmentTE(worldIn, pos.down()); - if (belt == null) - return; - - BeltTileEntity controllerBelt = belt.getControllerTE(); - if (controllerBelt == null) - return; - - controllerBelt.getInventory().applyToEachWithin(belt.index + .5f, .55f, (transportedItemStack) -> { - controllerBelt.getInventory().eject(transportedItemStack); - return Collections.emptyList(); - }); - } - } - - @Override - public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) { - if (state.hasTileEntity() && state.getBlock() != newState.getBlock()) { - TileEntityBehaviour.destroy(worldIn, pos, FilteringBehaviour.TYPE); - worldIn.removeTileEntity(pos); - } - } - - @Override - public ActionResultType onUse(BlockState state, World worldIn, BlockPos pos, PlayerEntity player, Hand handIn, - BlockRayTraceResult hit) { - - if (hit.getFace() == getBlockFacing(state).getOpposite()) { - if (!worldIn.isRemote) - withTileEntityDo(worldIn, pos, te -> { - ItemStack heldItem = player.getHeldItem(handIn).copy(); - ItemStack remainder = te.tryToInsert(heldItem); - if (!ItemStack.areItemStacksEqual(remainder, heldItem)) - player.setHeldItem(handIn, remainder); - }); - return ActionResultType.SUCCESS; - } - - return ActionResultType.PASS; - } - - public static class Vertical extends FunnelBlock { - public Vertical(Properties properties) { - super(properties); - } - - @Override - protected boolean isVertical() { - return true; - } - } - - @Override - public MovementBehaviour getMovementBehaviour() { - return MOVEMENT; - } - - @Override - public Class getTileEntityClass() { - return FunnelTileEntity.class; - } - -} diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelFilterSlot.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelFilterSlot.java deleted file mode 100644 index a4dea706a..000000000 --- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelFilterSlot.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.simibubi.create.content.logistics.block.funnel; - -import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.content.logistics.block.AttachedLogisticalBlock; -import com.simibubi.create.content.logistics.block.extractor.ExtractorBlock; -import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform; -import com.simibubi.create.foundation.utility.AngleHelper; -import com.simibubi.create.foundation.utility.MatrixStacker; -import com.simibubi.create.foundation.utility.VecHelper; - -import net.minecraft.block.BlockState; -import net.minecraft.util.Direction; -import net.minecraft.util.Direction.Axis; -import net.minecraft.util.math.Vec3d; - -public class FunnelFilterSlot extends ValueBoxTransform { - - Vec3d offsetForHorizontal = VecHelper.voxelSpace(8f, 14f, 13.5f); - Vec3d offsetForBelt = VecHelper.voxelSpace(8f, 8.5f, 14f); - Vec3d offsetForUpward = VecHelper.voxelSpace(8f, 13.5f, 2f); - Vec3d offsetForDownward = VecHelper.voxelSpace(8f, 2.5f, 2f); - - @Override - protected Vec3d getLocalOffset(BlockState state) { - Vec3d vec = offsetForHorizontal; - float yRot = AngleHelper.horizontalAngle(state.get(ExtractorBlock.HORIZONTAL_FACING)); - if (AttachedLogisticalBlock.isVertical(state)) - vec = state.get(AttachedLogisticalBlock.UPWARD) ? offsetForUpward : offsetForDownward; - else if (state.get(FunnelBlock.BELT)) - vec = offsetForBelt; - - return VecHelper.rotateCentered(vec, yRot, Axis.Y); - } - - @Override - protected void rotate(BlockState state, MatrixStack ms) { - Direction blockFacing = AttachedLogisticalBlock.getBlockFacing(state); - boolean vertical = AttachedLogisticalBlock.isVertical(state); - float horizontalAngle = AngleHelper.horizontalAngle(state.get(ExtractorBlock.HORIZONTAL_FACING)); - - float yRot = blockFacing == Direction.DOWN ? horizontalAngle + 180 : horizontalAngle; - float xRot = (vertical || state.get(FunnelBlock.BELT)) ? 90 : 0; - - if (blockFacing == Direction.UP) - xRot += 180; - - MatrixStacker.of(ms) - .rotateY(yRot) - .rotateX(xRot); - } - -} diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelTileEntity.java deleted file mode 100644 index fb2d2f541..000000000 --- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelTileEntity.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.simibubi.create.content.logistics.block.funnel; - -import java.util.List; - -import com.simibubi.create.AllBlocks; -import com.simibubi.create.AllSoundEvents; -import com.simibubi.create.content.contraptions.relays.belt.BeltHelper; -import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity; -import com.simibubi.create.content.logistics.block.AttachedLogisticalBlock; -import com.simibubi.create.foundation.tileEntity.SmartTileEntity; -import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; -import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; -import com.simibubi.create.foundation.tileEntity.behaviour.inventory.InsertingBehaviour; -import com.simibubi.create.foundation.tileEntity.behaviour.inventory.InventoryManagementBehaviour.Attachments; -import com.simibubi.create.foundation.utility.VecHelper; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.particles.ItemParticleData; -import net.minecraft.particles.ParticleTypes; -import net.minecraft.state.properties.BlockStateProperties; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; -import net.minecraft.util.math.Vec3i; - -public class FunnelTileEntity extends SmartTileEntity { - - private FilteringBehaviour filtering; - private InsertingBehaviour inserting; - private ItemStack justEaten; - - public FunnelTileEntity(TileEntityType type) { - super(type); - } - - @Override - public void addBehaviours(List behaviours) { - filtering = new FilteringBehaviour(this, new FunnelFilterSlot()).withCallback(this::filterChanged); - behaviours.add(filtering); - inserting = new InsertingBehaviour(this, - Attachments.toward(() -> AttachedLogisticalBlock.getBlockFacing(getBlockState()))); - behaviours.add(inserting); - } - - public void filterChanged(ItemStack stack) { - } - - @Override - public CompoundNBT writeToClient(CompoundNBT tag) { - if (justEaten != null) { - tag.put("Nom", justEaten.serializeNBT()); - justEaten = null; - } - return super.writeToClient(tag); - } - - @Override - public void readClientUpdate(CompoundNBT tag) { - super.readClientUpdate(tag); - if (tag.contains("Nom")) - justEaten = ItemStack.read(tag.getCompound("Nom")); - } - - @Override - public void tick() { - super.tick(); - if (world.isRemote && justEaten != null) { - spawnParticles(justEaten); - justEaten = null; - } - } - - public ItemStack tryToInsert(ItemStack stack) { - if (!filtering.test(stack)) - return stack; - - ItemStack remainder = ItemStack.EMPTY; - - BeltTileEntity targetingBelt = getTargetingBelt(); - if (targetingBelt != null) { - Direction facing = AttachedLogisticalBlock.getBlockFacing(getBlockState()); - if (!targetingBelt.tryInsertingFromSide(facing, stack.copy(), false)) - remainder = stack; - } else { - remainder = inserting.insert(stack.copy(), false); - } - - if (remainder.isEmpty()) { - if (!world.isRemote) - world.playSound(null, pos, AllSoundEvents.BLOCK_FUNNEL_EAT.get(), SoundCategory.BLOCKS, .125f, 1f); - justEaten = stack.copy(); - } - - if (remainder.getCount() != stack.getCount()) - sendData(); - - return remainder; - } - - protected BeltTileEntity getTargetingBelt() { - BlockPos targetPos = pos.offset(AttachedLogisticalBlock.getBlockFacing(getBlockState())); - if (!AllBlocks.BELT.has(world.getBlockState(targetPos))) - return null; - return BeltHelper.getSegmentTE(world, targetPos); - } - - public void spawnParticles(ItemStack stack) { - Vec3i directionVec = getBlockState().get(BlockStateProperties.HORIZONTAL_FACING).getDirectionVec(); - float xSpeed = directionVec.getX() * 1 / 8f; - float zSpeed = directionVec.getZ() * 1 / 8f; - Vec3d vec = VecHelper.getCenterOf(pos); - world.addParticle(new ItemParticleData(ParticleTypes.ITEM, stack), vec.x, vec.y - 9 / 16f, vec.z, xSpeed, - 1 / 6f, zSpeed); - } - -} diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/VerticalFunnelGenerator.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/VerticalFunnelGenerator.java deleted file mode 100644 index 1c1ee2649..000000000 --- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/VerticalFunnelGenerator.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.simibubi.create.content.logistics.block.funnel; - -import com.simibubi.create.foundation.data.SpecialBlockStateGen; -import com.tterrag.registrate.providers.DataGenContext; -import com.tterrag.registrate.providers.RegistrateBlockstateProvider; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraftforge.client.model.generators.ModelFile; - -public class VerticalFunnelGenerator extends SpecialBlockStateGen { - - @Override - protected int getXRotation(BlockState state) { - return state.get(FunnelBlock.UPWARD) ? 270 : 90; - } - - @Override - protected int getYRotation(BlockState state) { - return (state.get(FunnelBlock.UPWARD) ? 180 : 0) + horizontalAngle(state.get(FunnelBlock.HORIZONTAL_FACING)); - } - - @Override - public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, - BlockState state) { - return prov.models() - .getExistingFile(prov.modLoc("block/funnel/vertical")); - } - -} diff --git a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java index c247eaf62..f9250cf2d 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java @@ -69,7 +69,7 @@ public abstract class ArmInteractionPoint { static boolean isInteractable(BlockState state) { return AllBlocks.DEPOT.has(state) || AllBlocks.BELT.has(state) || AllBlocks.CHUTE.has(state) - || AllBlocks.REALITY_FUNNEL.has(state); + || state.getBlock() instanceof RealityFunnelBlock; } ArmAngleTarget getTargetAngles(BlockPos armPos) { @@ -125,7 +125,7 @@ public abstract class ArmInteractionPoint { point = new Belt(); if (AllBlocks.CHUTE.has(state)) point = new Chute(); - if (AllBlocks.REALITY_FUNNEL.has(state)) + if (state.getBlock() instanceof RealityFunnelBlock) point = new Funnel(); if (point != null) { @@ -209,9 +209,10 @@ public abstract class ArmInteractionPoint { @Override Direction getInteractionDirection() { - return RealityFunnelBlock.getFunnelFacing(state).getOpposite(); + return RealityFunnelBlock.getFunnelFacing(state) + .getOpposite(); } - + @Override ItemStack insert(World world, ItemStack stack, boolean simulate) { FilteringBehaviour filtering = TileEntityBehaviour.get(world, pos, FilteringBehaviour.TYPE); @@ -225,7 +226,7 @@ public abstract class ArmInteractionPoint { @Override boolean isValid(BlockState state) { - return AllBlocks.REALITY_FUNNEL.has(state); + return state.getBlock() instanceof RealityFunnelBlock; } @Override diff --git a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPointHandler.java b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPointHandler.java index b6a94e2b1..12f61cf53 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPointHandler.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPointHandler.java @@ -23,7 +23,6 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/AndesiteBeltFunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/AndesiteBeltFunnelBlock.java new file mode 100644 index 000000000..cfb9d5d95 --- /dev/null +++ b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/AndesiteBeltFunnelBlock.java @@ -0,0 +1,16 @@ +package com.simibubi.create.content.logistics.block.realityFunnel; + +import com.simibubi.create.AllBlocks; + +public class AndesiteBeltFunnelBlock extends BeltFunnelBlock { + + public AndesiteBeltFunnelBlock(Properties p_i48377_1_) { + super(AllBlocks.ANDESITE_FUNNEL, p_i48377_1_); + } + + @Override + public boolean hasPoweredProperty() { + return false; + } + +} diff --git a/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/AndesiteChuteFunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/AndesiteChuteFunnelBlock.java new file mode 100644 index 000000000..a6a6e3f62 --- /dev/null +++ b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/AndesiteChuteFunnelBlock.java @@ -0,0 +1,16 @@ +package com.simibubi.create.content.logistics.block.realityFunnel; + +import com.simibubi.create.AllBlocks; + +public class AndesiteChuteFunnelBlock extends ChuteFunnelBlock { + + public AndesiteChuteFunnelBlock(Properties p_i48377_1_) { + super(AllBlocks.ANDESITE_FUNNEL, p_i48377_1_); + } + + @Override + public boolean hasPoweredProperty() { + return false; + } + +} diff --git a/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/AndesiteFunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/AndesiteFunnelBlock.java new file mode 100644 index 000000000..e537e8799 --- /dev/null +++ b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/AndesiteFunnelBlock.java @@ -0,0 +1,28 @@ +package com.simibubi.create.content.logistics.block.realityFunnel; + +import com.simibubi.create.AllBlocks; + +import net.minecraft.block.BlockState; +import net.minecraft.util.Direction; + +public class AndesiteFunnelBlock extends RealityFunnelBlock { + + public AndesiteFunnelBlock(Properties p_i48415_1_) { + super(p_i48415_1_); + } + + @Override + public BlockState getEquivalentBeltFunnel(BlockState state) { + Direction facing = state.get(FACING); + return AllBlocks.ANDESITE_BELT_FUNNEL.getDefaultState() + .with(BeltFunnelBlock.HORIZONTAL_FACING, facing); + } + + @Override + public BlockState getEquivalentChuteFunnel(BlockState state) { + Direction facing = state.get(FACING); + return AllBlocks.ANDESITE_CHUTE_FUNNEL.getDefaultState() + .with(ChuteFunnelBlock.HORIZONTAL_FACING, facing); + } + +} diff --git a/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/BeltFunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/BeltFunnelBlock.java index ca185b137..a71f67a72 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/BeltFunnelBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/BeltFunnelBlock.java @@ -3,12 +3,12 @@ package com.simibubi.create.content.logistics.block.realityFunnel; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllShapes; import com.simibubi.create.content.contraptions.relays.belt.BeltBlock; -import com.simibubi.create.content.contraptions.relays.belt.BeltBlock.Slope; import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity; import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock; import com.simibubi.create.content.logistics.block.depot.DepotBlock; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.VoxelShaper; +import com.tterrag.registrate.util.entry.BlockEntry; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -28,7 +28,7 @@ import net.minecraft.world.IWorld; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -public class BeltFunnelBlock extends HorizontalInteractionFunnelBlock { +public abstract class BeltFunnelBlock extends HorizontalInteractionFunnelBlock { public static final IProperty SHAPE = EnumProperty.create("shape", Shape.class); @@ -47,8 +47,8 @@ public class BeltFunnelBlock extends HorizontalInteractionFunnelBlock { } } - public BeltFunnelBlock(Properties p_i48377_1_) { - super(p_i48377_1_); + public BeltFunnelBlock(BlockEntry parent, Properties p_i48377_1_) { + super(parent, p_i48377_1_); setDefaultState(getDefaultState().with(SHAPE, Shape.RETRACTED)); } diff --git a/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/BeltFunnelGenerator.java b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/BeltFunnelGenerator.java index 0b74af3fe..3c494de97 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/BeltFunnelGenerator.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/BeltFunnelGenerator.java @@ -1,6 +1,5 @@ package com.simibubi.create.content.logistics.block.realityFunnel; -import com.simibubi.create.foundation.data.AssetLookup; import com.simibubi.create.foundation.data.SpecialBlockStateGen; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; @@ -11,6 +10,12 @@ import net.minecraftforge.client.model.generators.ModelFile; public class BeltFunnelGenerator extends SpecialBlockStateGen { + private String type; + + public BeltFunnelGenerator(String type) { + this.type = type; + } + @Override protected int getXRotation(BlockState state) { return 0; @@ -25,15 +30,18 @@ public class BeltFunnelGenerator extends SpecialBlockStateGen { public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, BlockState state) { boolean pushing = state.get(BeltFunnelBlock.PUSHING); - boolean powered = state.get(BeltFunnelBlock.POWERED); + boolean powered = state.has(BeltFunnelBlock.POWERED) && state.get(BeltFunnelBlock.POWERED); String shapeName = state.get(BeltFunnelBlock.SHAPE) .getName(); - if (pushing && !powered) - return AssetLookup.partialBaseModel(ctx, prov, shapeName); - String name = ctx.getName() + "_" + (pushing ? "push_" : "pull_") + (powered ? "on" : "off"); + String suffix = (pushing ? "push" : "pull") + (powered ? "_powered" : ""); + String name = ctx.getName() + "_" + suffix; + String textureName = type + "_funnel_" + suffix; return prov.models() - .withExistingParent(name + "_" + shapeName, prov.modLoc("block/" + ctx.getName() + "/block_" + shapeName)) - .texture("2", prov.modLoc("block/" + name)); + .withExistingParent(name + "_" + shapeName, prov.modLoc("block/belt_funnel/block_" + shapeName)) + .texture("particle", prov.modLoc("block/" + type + "_casing")) + .texture("2", prov.modLoc("block/" + textureName)) + .texture("3", prov.modLoc("block/" + type + "_funnel_back")) + .texture("4", prov.modLoc("block/" + type + "_funnel_plating")); } } diff --git a/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/BrassBeltFunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/BrassBeltFunnelBlock.java new file mode 100644 index 000000000..cf0ae9ef3 --- /dev/null +++ b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/BrassBeltFunnelBlock.java @@ -0,0 +1,16 @@ +package com.simibubi.create.content.logistics.block.realityFunnel; + +import com.simibubi.create.AllBlocks; + +public class BrassBeltFunnelBlock extends BeltFunnelBlock { + + public BrassBeltFunnelBlock(Properties p_i48377_1_) { + super(AllBlocks.BRASS_FUNNEL, p_i48377_1_); + } + + @Override + public boolean hasPoweredProperty() { + return true; + } + +} diff --git a/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/BrassChuteFunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/BrassChuteFunnelBlock.java new file mode 100644 index 000000000..ad584afd2 --- /dev/null +++ b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/BrassChuteFunnelBlock.java @@ -0,0 +1,16 @@ +package com.simibubi.create.content.logistics.block.realityFunnel; + +import com.simibubi.create.AllBlocks; + +public class BrassChuteFunnelBlock extends ChuteFunnelBlock { + + public BrassChuteFunnelBlock(Properties p_i48377_1_) { + super(AllBlocks.BRASS_FUNNEL, p_i48377_1_); + } + + @Override + public boolean hasPoweredProperty() { + return true; + } + +} diff --git a/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/BrassFunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/BrassFunnelBlock.java new file mode 100644 index 000000000..c036722bd --- /dev/null +++ b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/BrassFunnelBlock.java @@ -0,0 +1,66 @@ +package com.simibubi.create.content.logistics.block.realityFunnel; + +import com.simibubi.create.AllBlocks; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.item.BlockItemUseContext; +import net.minecraft.state.BooleanProperty; +import net.minecraft.state.StateContainer.Builder; +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.Direction; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class BrassFunnelBlock extends RealityFunnelBlock { + + public static final BooleanProperty POWERED = BlockStateProperties.POWERED; + + public BrassFunnelBlock(Properties p_i48415_1_) { + super(p_i48415_1_); + setDefaultState(getDefaultState().with(POWERED, false)); + } + + @Override + public BlockState getStateForPlacement(BlockItemUseContext context) { + return super.getStateForPlacement(context).with(POWERED, context.getWorld() + .isBlockPowered(context.getPos())); + } + + @Override + protected boolean canInsertIntoFunnel(BlockState state) { + return super.canInsertIntoFunnel(state) && !state.get(POWERED); + } + + @Override + protected void fillStateContainer(Builder builder) { + super.fillStateContainer(builder.add(POWERED)); + } + + @Override + public void neighborChanged(BlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos, + boolean isMoving) { + if (worldIn.isRemote) + return; + boolean previouslyPowered = state.get(POWERED); + if (previouslyPowered != worldIn.isBlockPowered(pos)) + worldIn.setBlockState(pos, state.cycle(POWERED), 2); + } + + @Override + public BlockState getEquivalentBeltFunnel(BlockState state) { + Direction facing = state.get(FACING); + return AllBlocks.BRASS_BELT_FUNNEL.getDefaultState() + .with(BeltFunnelBlock.HORIZONTAL_FACING, facing) + .with(POWERED, state.get(POWERED)); + } + + @Override + public BlockState getEquivalentChuteFunnel(BlockState state) { + Direction facing = state.get(FACING); + return AllBlocks.BRASS_CHUTE_FUNNEL.getDefaultState() + .with(ChuteFunnelBlock.HORIZONTAL_FACING, facing) + .with(POWERED, state.get(POWERED)); + } + +} diff --git a/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/ChuteFunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/ChuteFunnelBlock.java index 25f79c470..596f94a81 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/ChuteFunnelBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/ChuteFunnelBlock.java @@ -2,6 +2,7 @@ package com.simibubi.create.content.logistics.block.realityFunnel; import com.simibubi.create.AllShapes; import com.simibubi.create.content.logistics.block.chute.ChuteBlock; +import com.tterrag.registrate.util.entry.BlockEntry; import net.minecraft.block.BlockState; import net.minecraft.util.Direction; @@ -11,10 +12,10 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; -public class ChuteFunnelBlock extends HorizontalInteractionFunnelBlock { +public abstract class ChuteFunnelBlock extends HorizontalInteractionFunnelBlock { - public ChuteFunnelBlock(Properties p_i48377_1_) { - super(p_i48377_1_); + public ChuteFunnelBlock(BlockEntry parent, Properties p_i48377_1_) { + super(parent, p_i48377_1_); } public static boolean isOnValidChute(BlockState state, IWorldReader world, BlockPos pos) { diff --git a/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/ChuteFunnelGenerator.java b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/ChuteFunnelGenerator.java index 98ce6320f..fb78f26e4 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/ChuteFunnelGenerator.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/ChuteFunnelGenerator.java @@ -1,6 +1,5 @@ package com.simibubi.create.content.logistics.block.realityFunnel; -import com.simibubi.create.foundation.data.AssetLookup; import com.simibubi.create.foundation.data.SpecialBlockStateGen; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; @@ -11,6 +10,12 @@ import net.minecraftforge.client.model.generators.ModelFile; public class ChuteFunnelGenerator extends SpecialBlockStateGen { + private String type; + + public ChuteFunnelGenerator(String type) { + this.type = type; + } + @Override protected int getXRotation(BlockState state) { return 0; @@ -25,15 +30,16 @@ public class ChuteFunnelGenerator extends SpecialBlockStateGen { public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, BlockState state) { boolean pushing = state.get(ChuteFunnelBlock.PUSHING); - boolean powered = state.get(ChuteFunnelBlock.POWERED); - if (pushing && !powered) - return AssetLookup.partialBaseModel(ctx, prov); - String suffix = (pushing ? "push_" : "pull_") + (powered ? "on" : "off"); - String textureName = "belt_funnel_" + suffix; + boolean powered = state.has(ChuteFunnelBlock.POWERED) && state.get(ChuteFunnelBlock.POWERED); + String suffix = (pushing ? "push" : "pull") + (powered ? "_powered" : ""); + String textureName = type + "_funnel_" + suffix; String modelName = ctx.getName() + "_" + suffix; return prov.models() - .withExistingParent(modelName, prov.modLoc("block/" + ctx.getName() + "/block")) - .texture("3", prov.modLoc("block/" + textureName)); + .withExistingParent(modelName, prov.modLoc("block/chute_funnel/block")) + .texture("particle", prov.modLoc("block/" + type + "_casing")) + .texture("3", prov.modLoc("block/" + textureName)) + .texture("1_2", prov.modLoc("block/" + type + "_funnel_back")) + .texture("4", prov.modLoc("block/" + type + "_funnel_plating")); } } diff --git a/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/FunnelFilterSlotPositioning.java b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/FunnelFilterSlotPositioning.java index fcf0af437..281213b2a 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/FunnelFilterSlotPositioning.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/FunnelFilterSlotPositioning.java @@ -19,7 +19,7 @@ public class FunnelFilterSlotPositioning extends ValueBoxTransform.Sided { @Override protected Vec3d getLocalOffset(BlockState state) { - if (AllBlocks.BELT_FUNNEL.has(state)) + if (AllBlocks.BRASS_BELT_FUNNEL.has(state)) if (state.get(BeltFunnelBlock.SHAPE) == Shape.RETRACTED) return VecHelper.rotateCentered(VecHelper.voxelSpace(8, 13, 7.5f), AngleHelper.horizontalAngle(getSide()), Axis.Y); @@ -33,7 +33,7 @@ public class FunnelFilterSlotPositioning extends ValueBoxTransform.Sided { localOffset = VecHelper.rotateCentered(southLocation, AngleHelper.horizontalAngle(getSide()), Axis.Y); } - if (AllBlocks.CHUTE_FUNNEL.has(state)) { + if (AllBlocks.BRASS_CHUTE_FUNNEL.has(state)) { Direction facing = state.get(ChuteFunnelBlock.HORIZONTAL_FACING); localOffset = localOffset.subtract(new Vec3d(facing.getDirectionVec()).scale(2 / 16f)); } @@ -47,7 +47,7 @@ public class FunnelFilterSlotPositioning extends ValueBoxTransform.Sided { if (!facing.getAxis() .isVertical() - && !(AllBlocks.BELT_FUNNEL.has(state) && state.get(BeltFunnelBlock.SHAPE) == Shape.RETRACTED)) { + && !(AllBlocks.BRASS_BELT_FUNNEL.has(state) && state.get(BeltFunnelBlock.SHAPE) == Shape.RETRACTED)) { Direction verticalDirection = DirectionHelper.rotateAround(getSide(), facing.rotateY() .getAxis()); if (facing.getAxis() == Axis.Z) @@ -81,7 +81,7 @@ public class FunnelFilterSlotPositioning extends ValueBoxTransform.Sided { if (facing == null) return false; - if (AllBlocks.BELT_FUNNEL.has(state)) + if (AllBlocks.BRASS_BELT_FUNNEL.has(state)) return state.get(BeltFunnelBlock.SHAPE) == Shape.RETRACTED ? direction == facing : direction != Direction.DOWN && direction.getAxis() != facing.getAxis(); diff --git a/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/FunnelItem.java b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/FunnelItem.java index da693fe5b..5a276a35f 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/FunnelItem.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/FunnelItem.java @@ -1,7 +1,5 @@ package com.simibubi.create.content.logistics.block.realityFunnel; -import com.simibubi.create.AllBlocks; - import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.item.BlockItem; @@ -41,11 +39,15 @@ public class FunnelItem extends BlockItem { .isHorizontal()) return state; - BlockState equivalentBeltFunnel = AllBlocks.BELT_FUNNEL.get() - .getStateForPlacement(ctx) + RealityFunnelBlock block = (RealityFunnelBlock) getBlock(); + Block beltFunnelBlock = block.getEquivalentBeltFunnel(state) + .getBlock(); + Block chuteFunnelBlock = block.getEquivalentChuteFunnel(state) + .getBlock(); + + BlockState equivalentBeltFunnel = beltFunnelBlock.getStateForPlacement(ctx) .with(BeltFunnelBlock.HORIZONTAL_FACING, direction); - BlockState equivalentChuteFunnel = AllBlocks.CHUTE_FUNNEL.get() - .getStateForPlacement(ctx) + BlockState equivalentChuteFunnel = chuteFunnelBlock.getStateForPlacement(ctx) .with(ChuteFunnelBlock.HORIZONTAL_FACING, direction); BlockState reversedChuteFunnel = equivalentChuteFunnel.rotate(Rotation.CLOCKWISE_180) .cycle(ChuteFunnelBlock.PUSHING); diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelMovementBehaviour.java b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/FunnelMovementBehaviour.java similarity index 95% rename from src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelMovementBehaviour.java rename to src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/FunnelMovementBehaviour.java index c0cc9deef..a4521ec6e 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/FunnelMovementBehaviour.java @@ -1,4 +1,4 @@ -package com.simibubi.create.content.logistics.block.funnel; +package com.simibubi.create.content.logistics.block.realityFunnel; import java.util.List; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/HorizontalInteractionFunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/HorizontalInteractionFunnelBlock.java index dd53e51d2..0e284bb4d 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/HorizontalInteractionFunnelBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/HorizontalInteractionFunnelBlock.java @@ -1,8 +1,8 @@ package com.simibubi.create.content.logistics.block.realityFunnel; -import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTileEntities; import com.simibubi.create.content.contraptions.wrench.IWrenchable; +import com.tterrag.registrate.util.entry.BlockEntry; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -28,13 +28,19 @@ public abstract class HorizontalInteractionFunnelBlock extends HorizontalBlock i public static final BooleanProperty POWERED = BlockStateProperties.POWERED; public static final BooleanProperty PUSHING = BooleanProperty.create("pushing"); + private BlockEntry parent; - public HorizontalInteractionFunnelBlock(Properties p_i48377_1_) { + public HorizontalInteractionFunnelBlock(BlockEntry parent, Properties p_i48377_1_) { super(p_i48377_1_); - setDefaultState(getDefaultState().with(PUSHING, true) - .with(POWERED, false)); + this.parent = parent; + BlockState defaultState = getDefaultState().with(PUSHING, true); + if (hasPoweredProperty()) + defaultState = defaultState.with(POWERED, false); + setDefaultState(defaultState); } + public abstract boolean hasPoweredProperty(); + @Override public boolean hasTileEntity(BlockState state) { return true; @@ -47,13 +53,18 @@ public abstract class HorizontalInteractionFunnelBlock extends HorizontalBlock i @Override protected void fillStateContainer(Builder p_206840_1_) { - super.fillStateContainer(p_206840_1_.add(HORIZONTAL_FACING, POWERED, PUSHING)); + if (hasPoweredProperty()) + p_206840_1_.add(POWERED); + super.fillStateContainer(p_206840_1_.add(HORIZONTAL_FACING, PUSHING)); } @Override public BlockState getStateForPlacement(BlockItemUseContext ctx) { - return super.getStateForPlacement(ctx).with(POWERED, ctx.getWorld() - .isBlockPowered(ctx.getPos())); + BlockState stateForPlacement = super.getStateForPlacement(ctx); + if (hasPoweredProperty()) + stateForPlacement = stateForPlacement.with(POWERED, ctx.getWorld() + .isBlockPowered(ctx.getPos())); + return stateForPlacement; } @Override @@ -69,14 +80,14 @@ public abstract class HorizontalInteractionFunnelBlock extends HorizontalBlock i @Override public ItemStack getPickBlock(BlockState state, RayTraceResult target, IBlockReader world, BlockPos pos, PlayerEntity player) { - return AllBlocks.REALITY_FUNNEL.asStack(); + return parent.asStack(); } @Override public BlockState updatePostPlacement(BlockState state, Direction direction, BlockState neighbour, IWorld world, BlockPos pos, BlockPos p_196271_6_) { if (!canStillInteract(state, world, pos)) - return AllBlocks.REALITY_FUNNEL.getDefaultState() + return parent.getDefaultState() .with(RealityFunnelBlock.FACING, state.get(HORIZONTAL_FACING)); return state; } @@ -94,6 +105,8 @@ public abstract class HorizontalInteractionFunnelBlock extends HorizontalBlock i @Override public void neighborChanged(BlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) { + if (!hasPoweredProperty()) + return; if (worldIn.isRemote) return; boolean previouslyPowered = state.get(POWERED); diff --git a/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/RealityFunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/RealityFunnelBlock.java index 38361f52a..640f49b02 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/RealityFunnelBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/realityFunnel/RealityFunnelBlock.java @@ -2,7 +2,6 @@ package com.simibubi.create.content.logistics.block.realityFunnel; import javax.annotation.Nullable; -import com.simibubi.create.AllBlocks; import com.simibubi.create.AllShapes; import com.simibubi.create.AllTileEntities; import com.simibubi.create.content.logistics.block.chute.ChuteBlock; @@ -17,15 +16,17 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.ItemStack; -import net.minecraft.state.BooleanProperty; -import net.minecraft.state.StateContainer.Builder; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; import net.minecraft.util.Direction.AxisDirection; +import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; @@ -34,13 +35,10 @@ import net.minecraft.world.IWorld; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -public class RealityFunnelBlock extends ProperDirectionalBlock implements ITE { - - public static final BooleanProperty POWERED = BlockStateProperties.POWERED; +public abstract class RealityFunnelBlock extends ProperDirectionalBlock implements ITE { public RealityFunnelBlock(Properties p_i48415_1_) { super(p_i48415_1_); - setDefaultState(getDefaultState().with(POWERED, false)); } @Override @@ -53,9 +51,27 @@ public class RealityFunnelBlock extends ProperDirectionalBlock implements ITE { + ItemStack heldItem = player.getHeldItem(handIn) + .copy(); + ItemStack remainder = tryInsert(worldIn, pos, heldItem, false); + if (!ItemStack.areItemStacksEqual(remainder, heldItem)) + player.setHeldItem(handIn, remainder); + }); + return ActionResultType.SUCCESS; + } + + return ActionResultType.PASS; } @Override @@ -64,7 +80,7 @@ public class RealityFunnelBlock extends ProperDirectionalBlock implements ITE builder) { - super.fillStateContainer(builder.add(POWERED)); - } - @Override public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext context) { return AllShapes.REALITY_FUNNEL.get(state.get(FACING)); @@ -130,24 +141,17 @@ public class RealityFunnelBlock extends ProperDirectionalBlock implements ITE { BlockState blockState = getBlockState(); return blockState.getBlock() instanceof HorizontalInteractionFunnelBlock && blockState.get(HorizontalInteractionFunnelBlock.PUSHING) || determineCurrentMode() == Mode.CHUTE_END; }); - + filtering.onlyActiveWhen(this::supportsFiltering); behaviours.add(filtering); - behaviours.add(inserting); - behaviours.add(extracting); + + } + + private boolean supportsFiltering() { + BlockState blockState = getBlockState(); + return blockState != null && blockState.has(BlockStateProperties.POWERED); } public void flap(boolean inward) { @@ -189,7 +196,7 @@ public class RealityFunnelTileEntity extends SmartTileEntity { } public boolean hasFlap() { - return AllBlocks.BELT_FUNNEL.has(getBlockState()) + return getBlockState().getBlock() instanceof BeltFunnelBlock && getBlockState().get(BeltFunnelBlock.SHAPE) == Shape.RETRACTED; } diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneLinkBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneLinkBlock.java index 1933627ff..1a48f106e 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneLinkBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneLinkBlock.java @@ -1,9 +1,9 @@ package com.simibubi.create.content.logistics.block.redstone; -import com.simibubi.create.AllBlocks; import com.simibubi.create.AllShapes; import com.simibubi.create.AllTileEntities; import com.simibubi.create.content.contraptions.wrench.IWrenchable; +import com.simibubi.create.content.logistics.block.realityFunnel.RealityFunnelBlock; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.block.ProperDirectionalBlock; import com.simibubi.create.foundation.utility.Iterate; @@ -165,7 +165,7 @@ public class RedstoneLinkBlock extends ProperDirectionalBlock implements ITE NonNullUnaryOperator> funnel( + String type, ResourceLocation particleTexture) { + return b -> { + return b.blockstate((c, p) -> { + Function model = s -> { + String powered = + s.has(BlockStateProperties.POWERED) && s.get(BlockStateProperties.POWERED) ? "_powered" : ""; + return p.models() + .withExistingParent("block/" + type + "_funnel" + powered, p.modLoc("block/funnel/block")) + .texture("2", p.modLoc("block/" + type + "_funnel_back")) + .texture("3", p.modLoc("block/" + type + "_funnel" + powered)) + .texture("4", p.modLoc("block/" + type + "_funnel_plating")) + .texture("particle", particleTexture); + }; + p.directionalBlock(c.get(), model); + }) + .item(FunnelItem::new) + .model((c, p) -> { + p.withExistingParent("item/" + type + "_funnel", p.modLoc("block/funnel/item")) + .texture("2", p.modLoc("block/" + type + "_funnel_back")) + .texture("3", p.modLoc("block/" + type + "_funnel")) + .texture("4", p.modLoc("block/" + type + "_funnel_plating")) + .texture("particle", particleTexture); + }) + .build(); + }; + } + + public static NonNullUnaryOperator> beltTunnel( + String type, ResourceLocation particleTexture) { + return b -> b.initialProperties(SharedProperties::stone) + .addLayer(() -> RenderType::getCutoutMipped) + .blockstate((c, p) -> p.getVariantBuilder(c.get()) + .forAllStates(state -> { + String id = "block/" + type + "_tunnel"; + String shapeName = state.get(BeltTunnelBlock.SHAPE) + .getName(); + return ConfiguredModel.builder() + .modelFile(p.models() + .withExistingParent(id + "/" + shapeName, p.modLoc("block/belt_tunnel/" + shapeName)) + .texture("0", p.modLoc(id)) + .texture("particle", particleTexture)) + .rotationY(state.get(BeltTunnelBlock.HORIZONTAL_AXIS) == Axis.X ? 0 : 90) + .build(); + })) + .item() + .model((c, p) -> { + String id = type + "_tunnel"; + p.withExistingParent("item/" + id, p.modLoc("block/belt_tunnel/item")) + .texture("0", p.modLoc("block/" + id)) + .texture("particle", particleTexture); + }) + .build(); + } + public static NonNullUnaryOperator> mechanicalPiston(PistonType type) { return b -> b.initialProperties(SharedProperties::stone) .properties(p -> p.nonOpaque()) diff --git a/src/main/java/com/simibubi/create/foundation/data/SharedProperties.java b/src/main/java/com/simibubi/create/foundation/data/SharedProperties.java index 1b143ec12..2c25c51bd 100644 --- a/src/main/java/com/simibubi/create/foundation/data/SharedProperties.java +++ b/src/main/java/com/simibubi/create/foundation/data/SharedProperties.java @@ -14,11 +14,11 @@ public class SharedProperties { public static Block stone() { return Blocks.ANDESITE; } - + public static Block softMetal() { return Blocks.GOLD_BLOCK; } - + public static Block wooden() { return Blocks.STRIPPED_SPRUCE_WOOD; } diff --git a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/filtering/FilteringBehaviour.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/filtering/FilteringBehaviour.java index 1f4fc520a..1abae30c6 100644 --- a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/filtering/FilteringBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/filtering/FilteringBehaviour.java @@ -155,7 +155,7 @@ public class FilteringBehaviour extends TileEntityBehaviour { } public boolean test(ItemStack stack) { - return filter.isEmpty() || FilterItem.test(tileEntity.getWorld(), stack, filter); + return !isActive() || filter.isEmpty() || FilterItem.test(tileEntity.getWorld(), stack, filter); } @Override diff --git a/src/main/resources/assets/create/models/block/belt_funnel/block_extended.json b/src/main/resources/assets/create/models/block/belt_funnel/block_extended.json index 06b398e96..769dac047 100644 --- a/src/main/resources/assets/create/models/block/belt_funnel/block_extended.json +++ b/src/main/resources/assets/create/models/block/belt_funnel/block_extended.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "2": "create:block/belt_funnel_push_off", - "3": "create:block/funnel_back", - "4": "create:block/funnel_plating", + "2": "create:block/brass_funnel_push", + "3": "create:block/brass_funnel_back", + "4": "create:block/brass_funnel_plating", "particle": "create:block/brass_block" }, "elements": [ diff --git a/src/main/resources/assets/create/models/block/belt_funnel/block_retracted.json b/src/main/resources/assets/create/models/block/belt_funnel/block_retracted.json index 7da170c36..ee59d4be2 100644 --- a/src/main/resources/assets/create/models/block/belt_funnel/block_retracted.json +++ b/src/main/resources/assets/create/models/block/belt_funnel/block_retracted.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "2": "create:block/belt_funnel_push_off", - "3": "create:block/funnel_back", - "4": "create:block/funnel_plating", + "2": "create:block/brass_funnel_push", + "3": "create:block/brass_funnel_back", + "4": "create:block/brass_funnel_plating", "particle": "create:block/brass_block" }, "elements": [ diff --git a/src/main/resources/assets/create/models/block/belt_funnel/flap.json b/src/main/resources/assets/create/models/block/belt_funnel/flap.json index f00cc83a2..328a8a1f5 100644 --- a/src/main/resources/assets/create/models/block/belt_funnel/flap.json +++ b/src/main/resources/assets/create/models/block/belt_funnel/flap.json @@ -1,6 +1,6 @@ { "textures": { - "4": "create:block/funnel_plating" + "4": "create:block/brass_funnel_plating" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/cross.json b/src/main/resources/assets/create/models/block/belt_tunnel/cross.json index 81c29b76d..ebc0f82f0 100644 --- a/src/main/resources/assets/create/models/block/belt_tunnel/cross.json +++ b/src/main/resources/assets/create/models/block/belt_tunnel/cross.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/belt_tunnel", - "particle": "create:block/belt_tunnel" + "0": "create:block/brass_tunnel", + "particle": "create:block/brass_tunnel" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/flap.json b/src/main/resources/assets/create/models/block/belt_tunnel/flap.json index b1b1e371e..17626fed4 100644 --- a/src/main/resources/assets/create/models/block/belt_tunnel/flap.json +++ b/src/main/resources/assets/create/models/block/belt_tunnel/flap.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/belt_tunnel", - "particle": "create:block/belt_tunnel" + "0": "create:block/brass_tunnel", + "particle": "create:block/brass_tunnel" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/fullshade.json b/src/main/resources/assets/create/models/block/belt_tunnel/fullshade.json index 2deeb5bfa..4b5217f11 100644 --- a/src/main/resources/assets/create/models/block/belt_tunnel/fullshade.json +++ b/src/main/resources/assets/create/models/block/belt_tunnel/fullshade.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/belt_tunnel", - "particle": "create:block/belt_tunnel" + "0": "create:block/brass_tunnel", + "particle": "create:block/brass_tunnel" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/halfshade.json b/src/main/resources/assets/create/models/block/belt_tunnel/halfshade.json index bdc3759ca..bc5fe4c68 100644 --- a/src/main/resources/assets/create/models/block/belt_tunnel/halfshade.json +++ b/src/main/resources/assets/create/models/block/belt_tunnel/halfshade.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/belt_tunnel", - "particle": "create:block/belt_tunnel" + "0": "create:block/brass_tunnel", + "particle": "create:block/brass_tunnel" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/indicator.json b/src/main/resources/assets/create/models/block/belt_tunnel/indicator.json index 1558c2d43..0b0a2e788 100644 --- a/src/main/resources/assets/create/models/block/belt_tunnel/indicator.json +++ b/src/main/resources/assets/create/models/block/belt_tunnel/indicator.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/belt_tunnel", - "particle": "create:block/belt_tunnel" + "0": "create:block/brass_tunnel", + "particle": "create:block/brass_tunnel" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/item.json b/src/main/resources/assets/create/models/block/belt_tunnel/item.json index dc73dabf0..fdde3f3a9 100644 --- a/src/main/resources/assets/create/models/block/belt_tunnel/item.json +++ b/src/main/resources/assets/create/models/block/belt_tunnel/item.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/belt_tunnel", - "particle": "create:block/belt_tunnel" + "0": "create:block/brass_tunnel", + "particle": "create:block/brass_tunnel" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/straight.json b/src/main/resources/assets/create/models/block/belt_tunnel/straight.json index 027b65eb7..2de43a1e2 100644 --- a/src/main/resources/assets/create/models/block/belt_tunnel/straight.json +++ b/src/main/resources/assets/create/models/block/belt_tunnel/straight.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/belt_tunnel", - "particle": "create:block/belt_tunnel" + "0": "create:block/brass_tunnel", + "particle": "create:block/brass_tunnel" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/t_left.json b/src/main/resources/assets/create/models/block/belt_tunnel/t_left.json index fbb3568b4..b2c3f760f 100644 --- a/src/main/resources/assets/create/models/block/belt_tunnel/t_left.json +++ b/src/main/resources/assets/create/models/block/belt_tunnel/t_left.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/belt_tunnel", - "particle": "create:block/belt_tunnel" + "0": "create:block/brass_tunnel", + "particle": "create:block/brass_tunnel" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/t_right.json b/src/main/resources/assets/create/models/block/belt_tunnel/t_right.json index 85bb96bcf..15d6fdcbd 100644 --- a/src/main/resources/assets/create/models/block/belt_tunnel/t_right.json +++ b/src/main/resources/assets/create/models/block/belt_tunnel/t_right.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/belt_tunnel", - "particle": "create:block/belt_tunnel" + "0": "create:block/brass_tunnel", + "particle": "create:block/brass_tunnel" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/window.json b/src/main/resources/assets/create/models/block/belt_tunnel/window.json index dda810dce..38de43720 100644 --- a/src/main/resources/assets/create/models/block/belt_tunnel/window.json +++ b/src/main/resources/assets/create/models/block/belt_tunnel/window.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/belt_tunnel", - "particle": "create:block/belt_tunnel" + "0": "create:block/brass_tunnel", + "particle": "create:block/brass_tunnel" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/chute_funnel/block.json b/src/main/resources/assets/create/models/block/chute_funnel/block.json index a7597b729..43a769f49 100644 --- a/src/main/resources/assets/create/models/block/chute_funnel/block.json +++ b/src/main/resources/assets/create/models/block/chute_funnel/block.json @@ -2,12 +2,12 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "3": "create:block/belt_funnel_push_off", - "4": "create:block/funnel_plating", + "3": "create:block/brass_funnel_push", + "4": "create:block/brass_funnel_plating", "13": "create:block/chute", "particle": "create:block/brass_block", - "3_particle": "create:block/brass_block", - "1_2": "create:block/funnel_back" + "3_particle": "#particle", + "1_2": "create:block/brass_funnel_back" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/reality_funnel/block.json b/src/main/resources/assets/create/models/block/funnel/block.json similarity index 97% rename from src/main/resources/assets/create/models/block/reality_funnel/block.json rename to src/main/resources/assets/create/models/block/funnel/block.json index 3ec2eb39f..5ec5f5d4d 100644 --- a/src/main/resources/assets/create/models/block/reality_funnel/block.json +++ b/src/main/resources/assets/create/models/block/funnel/block.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "2": "create:block/funnel_back", - "3": "create:block/funnel_off", - "4": "create:block/funnel_plating", + "2": "create:block/brass_funnel_back", + "3": "create:block/brass_funnel", + "4": "create:block/brass_funnel_plating", "particle": "create:block/brass_block" }, "elements": [ diff --git a/src/main/resources/assets/create/models/block/funnel/horizontal.json b/src/main/resources/assets/create/models/block/funnel/horizontal.json deleted file mode 100644 index 630a512ea..000000000 --- a/src/main/resources/assets/create/models/block/funnel/horizontal.json +++ /dev/null @@ -1,208 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "3": "block/dark_oak_log_top", - "4": "create:block/extractor", - "brass_casing": "create:block/brass_casing", - "belt_funnel": "create:block/belt_funnel", - "package_funnel_horizontal": "create:block/funnel_horizontal", - "particle": "#package_funnel_horizontal" - }, - "elements": [ - { - "name": "Cube", - "from": [1, 1, 0], - "to": [15, 2, 3], - "faces": { - "north": {"uv": [1, 14, 15, 15], "texture": "#3"}, - "east": {"uv": [0, 12, 1, 15], "rotation": 270, "texture": "#belt_funnel"}, - "south": {"uv": [0, 13, 14, 14], "texture": "#package_funnel_horizontal"}, - "west": {"uv": [0, 12, 1, 15], "rotation": 90, "texture": "#belt_funnel"}, - "up": {"uv": [0, 12, 14, 15], "rotation": 180, "texture": "#belt_funnel"}, - "down": {"uv": [0, 12, 14, 15], "texture": "#belt_funnel"} - } - }, - { - "name": "Cube", - "from": [1.1, 1.1, -1], - "to": [14.9, 2, 0], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 5]}, - "faces": { - "north": {"uv": [1, 14, 15, 15], "texture": "#3"}, - "east": {"uv": [0, 15, 1, 16], "rotation": 270, "texture": "#belt_funnel"}, - "south": {"uv": [0, 13, 14, 14], "texture": "#package_funnel_horizontal"}, - "west": {"uv": [0, 15, 1, 16], "rotation": 90, "texture": "#belt_funnel"}, - "up": {"uv": [0, 12, 14, 13], "rotation": 180, "texture": "#belt_funnel"}, - "down": {"uv": [0, 15, 14, 16], "texture": "#belt_funnel"} - } - }, - { - "name": "Cube", - "from": [11, 14, 0], - "to": [15, 15, 3], - "faces": { - "north": {"uv": [11, 1, 15, 2], "texture": "#3"}, - "east": {"uv": [13, 12, 14, 15], "rotation": 270, "texture": "#belt_funnel"}, - "south": {"uv": [10, 0, 14, 1], "texture": "#package_funnel_horizontal"}, - "west": {"uv": [13, 12, 14, 15], "rotation": 90, "texture": "#belt_funnel"}, - "up": {"uv": [0, 12, 4, 15], "rotation": 180, "texture": "#belt_funnel"}, - "down": {"uv": [0, 12, 4, 15], "texture": "#belt_funnel"} - } - }, - { - "name": "Cube", - "from": [11, 14, -1], - "to": [14.9, 14.9, 0], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 5]}, - "faces": { - "north": {"uv": [11, 1, 15, 2], "texture": "#3"}, - "east": {"uv": [13, 15, 14, 16], "rotation": 270, "texture": "#belt_funnel"}, - "south": {"uv": [10, 0, 14, 1], "texture": "#package_funnel_horizontal"}, - "west": {"uv": [13, 12, 14, 13], "rotation": 90, "texture": "#belt_funnel"}, - "up": {"uv": [0, 15, 4, 16], "rotation": 180, "texture": "#belt_funnel"}, - "down": {"uv": [0, 12, 4, 13], "texture": "#belt_funnel"} - } - }, - { - "name": "Cube", - "from": [1, 14, 0], - "to": [5, 15, 3], - "faces": { - "north": {"uv": [1, 1, 5, 2], "texture": "#3"}, - "east": {"uv": [13, 12, 14, 15], "rotation": 270, "texture": "#belt_funnel"}, - "south": {"uv": [0, 0, 4, 1], "texture": "#package_funnel_horizontal"}, - "west": {"uv": [13, 12, 14, 15], "rotation": 90, "texture": "#belt_funnel"}, - "up": {"uv": [10, 12, 14, 15], "rotation": 180, "texture": "#belt_funnel"}, - "down": {"uv": [0, 12, 4, 15], "texture": "#belt_funnel"} - } - }, - { - "name": "Cube", - "from": [1.1, 14, -1], - "to": [5, 14.9, 0], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 5]}, - "faces": { - "north": {"uv": [1, 1, 5, 2], "texture": "#3"}, - "east": {"uv": [13, 12, 14, 13], "rotation": 270, "texture": "#belt_funnel"}, - "south": {"uv": [0, 0, 4, 1], "texture": "#package_funnel_horizontal"}, - "west": {"uv": [13, 15, 14, 16], "rotation": 90, "texture": "#belt_funnel"}, - "up": {"uv": [10, 15, 14, 16], "rotation": 180, "texture": "#belt_funnel"}, - "down": {"uv": [0, 12, 4, 13], "texture": "#belt_funnel"} - } - }, - { - "name": "Cube", - "from": [1, 2, 0], - "to": [2, 14, 3], - "faces": { - "north": {"uv": [14, 2, 15, 14], "texture": "#3"}, - "east": {"uv": [1, 12, 13, 15], "rotation": 270, "texture": "#belt_funnel"}, - "south": {"uv": [0, 1, 1, 13], "texture": "#package_funnel_horizontal"}, - "west": {"uv": [1, 12, 13, 15], "rotation": 90, "texture": "#belt_funnel"} - } - }, - { - "name": "Cube", - "from": [1.1, 2, -1], - "to": [2, 14, 0], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 5]}, - "faces": { - "north": {"uv": [14, 2, 15, 14], "texture": "#3"}, - "east": {"uv": [1, 12, 13, 13], "rotation": 270, "texture": "#belt_funnel"}, - "south": {"uv": [0, 1, 1, 13], "texture": "#package_funnel_horizontal"}, - "west": {"uv": [1, 15, 13, 16], "rotation": 90, "texture": "#belt_funnel"} - } - }, - { - "name": "Cube", - "from": [14, 2, 0], - "to": [15, 14, 3], - "faces": { - "north": {"uv": [1, 2, 2, 14], "texture": "#3"}, - "east": {"uv": [1, 12, 13, 15], "rotation": 270, "texture": "#belt_funnel"}, - "south": {"uv": [13, 1, 14, 13], "texture": "#package_funnel_horizontal"}, - "west": {"uv": [1, 12, 13, 15], "rotation": 90, "texture": "#belt_funnel"} - } - }, - { - "name": "Cube", - "from": [14, 2, -1], - "to": [14.9, 14, 0], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 5]}, - "faces": { - "north": {"uv": [1, 2, 2, 14], "texture": "#3"}, - "east": {"uv": [1, 15, 13, 16], "rotation": 270, "texture": "#belt_funnel"}, - "south": {"uv": [13, 1, 14, 13], "texture": "#package_funnel_horizontal"}, - "west": {"uv": [1, 12, 13, 13], "rotation": 90, "texture": "#belt_funnel"} - } - }, - { - "name": "Inner", - "from": [2, 2, -1], - "to": [14, 14, 2], - "faces": { - "north": {"uv": [2, 2, 14, 14], "texture": "#3"}, - "east": {"uv": [12, 2, 16, 14], "texture": "#3"}, - "south": {"uv": [1, 1, 13, 13], "texture": "#package_funnel_horizontal"}, - "west": {"uv": [0, 2, 4, 14], "texture": "#3"}, - "up": {"uv": [2, 0, 14, 4], "texture": "#3"}, - "down": {"uv": [2, 12, 14, 16], "texture": "#3"} - } - }, - { - "name": "Inner", - "from": [2.1, 2.1, -2], - "to": [13.9, 13.9, -1], - "faces": { - "north": {"uv": [2, 2, 14, 14], "texture": "#brass_casing"}, - "east": {"uv": [12, 2, 13, 14], "texture": "#3"}, - "west": {"uv": [0, 2, 1, 14], "texture": "#3"}, - "up": {"uv": [2, 0, 14, 1], "texture": "#3"}, - "down": {"uv": [2, 12, 14, 13], "texture": "#3"} - } - }, - { - "name": "Filter", - "from": [5, 12, 0], - "to": [11, 16, 3], - "faces": { - "north": {"uv": [6, 8, 12, 12], "texture": "#4"}, - "east": {"uv": [3, 0, 6, 4], "rotation": 180, "texture": "#4"}, - "south": {"uv": [6, 8, 12, 12], "texture": "#4"}, - "west": {"uv": [3, 0, 6, 4], "texture": "#4"}, - "up": {"uv": [6, 8, 12, 11], "texture": "#4"}, - "down": {"uv": [6, 8, 12, 11], "texture": "#4"} - } - }, - { - "name": "Filter", - "from": [5, 14, -1], - "to": [11, 14.9, 0], - "faces": { - "north": {"uv": [6, 8, 12, 9], "texture": "#4"}, - "east": {"uv": [2, 0, 3, 1], "rotation": 180, "texture": "#4"}, - "south": {"uv": [6, 8, 12, 9], "texture": "#4"}, - "west": {"uv": [2, 0, 3, 1], "texture": "#4"}, - "up": {"uv": [6, 8, 12, 9], "texture": "#4"}, - "down": {"uv": [6, 8, 12, 9], "texture": "#4"} - } - } - ], - "display": { - "ground": { - "translation": [0, 3, 2], - "scale": [0.25, 0.25, 0.25] - }, - "gui": { - "rotation": [30, 45, 0], - "translation": [2.6, -1, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "rotation": [0, 180, 0], - "translation": [0, 0, -7], - "scale": [0.625, 0.625, 0.625] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/funnel/horizontal_belt.json b/src/main/resources/assets/create/models/block/funnel/horizontal_belt.json deleted file mode 100644 index 5ae900fb7..000000000 --- a/src/main/resources/assets/create/models/block/funnel/horizontal_belt.json +++ /dev/null @@ -1,144 +0,0 @@ -{ - "credit": "Made with Blockbench", - "textures": { - "2": "create:block/extractor", - "particle": "create:block/belt_funnel", - "belt_funnel": "create:block/belt_funnel", - "brass_casing": "create:block/brass_casing" - }, - "elements": [ - { - "name": "Bottom", - "from": [3, -4.1, -1], - "to": [13, -3.1, 5], - "faces": { - "north": {"uv": [0, 11, 10, 12], "texture": "#belt_funnel"}, - "east": {"uv": [10, 11, 16, 12], "rotation": 180, "texture": "#belt_funnel"}, - "south": {"uv": [0, 11, 10, 12], "texture": "#belt_funnel"}, - "west": {"uv": [10, 11, 16, 12], "texture": "#belt_funnel"}, - "up": {"uv": [10, 0, 16, 13], "rotation": 90, "texture": "#belt_funnel"}, - "down": {"uv": [10, 1, 16, 11], "rotation": 270, "texture": "#belt_funnel"} - } - }, - { - "name": "Top", - "from": [3, 7, -1], - "to": [13, 8, 5], - "faces": { - "north": {"uv": [0, 0, 10, 1], "texture": "#belt_funnel"}, - "east": {"uv": [10, 0, 16, 1], "rotation": 180, "texture": "#belt_funnel"}, - "south": {"uv": [0, 0, 10, 1], "texture": "#belt_funnel"}, - "west": {"uv": [10, 0, 16, 1], "texture": "#belt_funnel"}, - "up": {"uv": [10, 1, 16, 11], "rotation": 90, "texture": "#belt_funnel"}, - "down": {"uv": [10, 0, 16, 13], "rotation": 90, "texture": "#belt_funnel"} - } - }, - { - "name": "Side", - "from": [3, -3.1, -1], - "to": [4, 7, 5], - "faces": { - "north": {"uv": [9, 1, 10, 11.1], "texture": "#belt_funnel"}, - "east": {"uv": [10, 1, 16, 11], "texture": "#belt_funnel"}, - "south": {"uv": [0, 1, 1, 11.1], "texture": "#belt_funnel"}, - "west": {"uv": [10, 1, 16, 11], "texture": "#belt_funnel"} - } - }, - { - "name": "Center", - "from": [4, -3.1, -1], - "to": [12, 7, 4], - "faces": { - "north": {"uv": [4, 3, 12, 13.1], "texture": "#brass_casing"}, - "east": {"uv": [9, 3, 10, 9], "rotation": 90, "texture": "#belt_funnel"}, - "south": {"uv": [1, 1, 9, 11.1], "texture": "#belt_funnel"}, - "west": {"uv": [0, 2, 1, 8], "rotation": 90, "texture": "#belt_funnel"} - } - }, - { - "name": "Top", - "from": [5, 8, 0], - "to": [11, 9, 5], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 0]}, - "faces": { - "north": {"uv": [6, 8, 12, 9], "texture": "#2"}, - "east": {"uv": [11, 1, 16, 2], "rotation": 180, "texture": "#belt_funnel"}, - "south": {"uv": [6, 9, 12, 10], "texture": "#2"}, - "west": {"uv": [11, 3, 16, 4], "texture": "#belt_funnel"}, - "up": {"uv": [6, 10, 12, 15], "texture": "#2"}, - "down": {"uv": [1, 8, 9, 13], "texture": "#belt_funnel"} - } - }, - { - "name": "Ramp", - "from": [3.9, -3.1, -7.1], - "to": [12.1, 4, -1], - "rotation": {"angle": 0, "axis": "x", "origin": [8, -4, -1]}, - "faces": { - "north": {"uv": [4, 0, 12.2, 7.1], "rotation": 180, "texture": "#brass_casing"}, - "east": {"uv": [2, 9, 8, 16], "texture": "#brass_casing"}, - "west": {"uv": [8, 9, 14, 16], "texture": "#brass_casing"}, - "up": {"uv": [4, 5, 12.2, 11], "rotation": 180, "texture": "#brass_casing"}, - "down": {"uv": [4, 5, 12.2, 11], "texture": "#brass_casing"} - } - }, - { - "name": "Ramp", - "from": [3.9, 4, -9.1], - "to": [12.1, 7.1, -1], - "rotation": {"angle": 0, "axis": "x", "origin": [8, -4, -1]}, - "faces": { - "north": {"uv": [4, 0, 12.2, 3], "texture": "#brass_casing"}, - "east": {"uv": [4, 0, 12, 3], "texture": "#brass_casing"}, - "west": {"uv": [4, 0, 12, 3], "texture": "#brass_casing"}, - "up": {"uv": [4, 4, 12, 12], "rotation": 180, "texture": "#brass_casing"}, - "down": {"uv": [4, 5, 12.2, 13], "texture": "#brass_casing"} - } - }, - { - "name": "Side", - "from": [12, -3.1, -1], - "to": [13, 7, 5], - "faces": { - "north": {"uv": [0, 1, 1, 11.1], "texture": "#belt_funnel"}, - "east": {"uv": [10, 1, 16, 11], "rotation": 180, "texture": "#belt_funnel"}, - "south": {"uv": [9, 1, 10, 11.1], "texture": "#belt_funnel"}, - "west": {"uv": [10, 1, 16, 11], "texture": "#belt_funnel"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [75, -149, 0], - "translation": [-0.5, 3.25, 2.25], - "scale": [0.375, 0.375, 0.375] - }, - "thirdperson_lefthand": { - "rotation": [75, -149, 0], - "translation": [-0.5, 3.25, 2.25], - "scale": [0.375, 0.375, 0.375] - }, - "firstperson_righthand": { - "rotation": [0, -55, 0], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [0, -55, 0], - "scale": [0.4, 0.4, 0.4] - }, - "ground": { - "translation": [0, 0, 2.25], - "scale": [0.25, 0.25, 0.25] - }, - "gui": { - "rotation": [30, 45, 0], - "translation": [2.5, 1.75, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "rotation": [0, 180, 0], - "translation": [0, 3.5, -4.5], - "scale": [0.5, 0.5, 0.5] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/funnel/item.json b/src/main/resources/assets/create/models/block/funnel/item.json index 86da5a656..e6d6c804e 100644 --- a/src/main/resources/assets/create/models/block/funnel/item.json +++ b/src/main/resources/assets/create/models/block/funnel/item.json @@ -1,118 +1,208 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "textures": { - "2": "create:block/extractor", - "particle": "create:block/belt_funnel", - "belt_funnel": "create:block/belt_funnel", - "brass_casing": "create:block/brass_casing" + "2": "create:block/brass_funnel_back", + "3": "create:block/brass_funnel", + "4": "create:block/brass_funnel_plating", + "particle": "create:block/brass_block" }, "elements": [ { - "name": "Bottom", - "from": [3, -4.1, -1], - "to": [13, -3.1, 5], + "name": "RightWall", + "from": [0, 10, 0], + "to": [2, 16, 16], "faces": { - "north": {"uv": [0, 11, 10, 12], "texture": "#belt_funnel"}, - "east": {"uv": [10, 11, 16, 12], "rotation": 180, "texture": "#belt_funnel"}, - "south": {"uv": [0, 11, 10, 12], "texture": "#belt_funnel"}, - "west": {"uv": [10, 11, 16, 12], "texture": "#belt_funnel"}, - "up": {"uv": [10, 0, 16, 13], "rotation": 90, "texture": "#belt_funnel"}, - "down": {"uv": [10, 1, 16, 11], "rotation": 270, "texture": "#belt_funnel"} + "north": {"uv": [14, 0, 16, 6], "texture": "#3"}, + "east": {"uv": [0, 0, 16, 6], "texture": "#3"}, + "south": {"uv": [0, 0, 2, 6], "texture": "#3"}, + "west": {"uv": [0, 0, 16, 6], "texture": "#3"}, + "up": {"uv": [14, 0, 16, 16], "rotation": 180, "texture": "#particle"}, + "down": {"uv": [0, 0, 2, 16], "texture": "#particle"} + } + }, + { + "name": "LeftWall", + "from": [14, 10, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 2, 6], "texture": "#3"}, + "east": {"uv": [0, 0, 16, 6], "texture": "#3"}, + "south": {"uv": [14, 0, 16, 6], "texture": "#3"}, + "west": {"uv": [0, 0, 16, 6], "texture": "#3"}, + "up": {"uv": [0, 0, 2, 16], "rotation": 180, "texture": "#particle"}, + "down": {"uv": [14, 0, 16, 16], "texture": "#particle"} } }, { "name": "Top", - "from": [3, 7, -1], - "to": [13, 8, 5], + "from": [2, 10, 14], + "to": [14, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 8]}, "faces": { - "north": {"uv": [0, 0, 10, 1], "texture": "#belt_funnel"}, - "east": {"uv": [10, 0, 16, 1], "rotation": 180, "texture": "#belt_funnel"}, - "south": {"uv": [0, 0, 10, 1], "texture": "#belt_funnel"}, - "west": {"uv": [10, 0, 16, 1], "texture": "#belt_funnel"}, - "up": {"uv": [10, 1, 16, 11], "rotation": 90, "texture": "#belt_funnel"}, - "down": {"uv": [10, 0, 16, 13], "rotation": 90, "texture": "#belt_funnel"} - } - }, - { - "name": "Side", - "from": [3, -3.1, -1], - "to": [4, 7, 5], - "faces": { - "north": {"uv": [9, 1, 10, 11.1], "texture": "#belt_funnel"}, - "east": {"uv": [10, 1, 16, 11], "texture": "#belt_funnel"}, - "south": {"uv": [0, 1, 1, 11.1], "texture": "#belt_funnel"}, - "west": {"uv": [10, 1, 16, 11], "texture": "#belt_funnel"} - } - }, - { - "name": "Center", - "from": [4, -3.1, -1], - "to": [12, 7, 4], - "faces": { - "north": {"uv": [4, 3, 12, 13.1], "texture": "#brass_casing"}, - "east": {"uv": [9, 3, 10, 9], "rotation": 90, "texture": "#belt_funnel"}, - "south": {"uv": [1, 1, 9, 11.1], "texture": "#belt_funnel"}, - "west": {"uv": [0, 2, 1, 8], "rotation": 90, "texture": "#belt_funnel"} + "north": {"uv": [2, 0, 14, 6], "texture": "#3"}, + "south": {"uv": [2, 0, 14, 6], "texture": "#3"}, + "up": {"uv": [2, 0, 14, 2], "rotation": 180, "texture": "#particle"}, + "down": {"uv": [2, 0, 14, 2], "texture": "#particle"} } }, { "name": "Top", - "from": [5, 8, 0], - "to": [11, 9, 5], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 0]}, + "from": [2, 10, 0], + "to": [14, 16, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 8]}, "faces": { - "north": {"uv": [6, 8, 12, 9], "texture": "#2"}, - "east": {"uv": [11, 1, 16, 2], "rotation": 180, "texture": "#belt_funnel"}, - "south": {"uv": [6, 9, 12, 10], "texture": "#2"}, - "west": {"uv": [11, 3, 16, 4], "texture": "#belt_funnel"}, - "up": {"uv": [6, 10, 12, 15], "texture": "#2"}, - "down": {"uv": [1, 8, 9, 13], "texture": "#belt_funnel"} + "north": {"uv": [2, 0, 14, 6], "texture": "#3"}, + "south": {"uv": [2, 0, 14, 6], "texture": "#3"}, + "up": {"uv": [2, 14, 14, 16], "rotation": 180, "texture": "#particle"}, + "down": {"uv": [2, 14, 14, 16], "texture": "#particle"} } }, { - "name": "Side", - "from": [12, -3.1, -1], - "to": [13, 7, 5], + "name": "F4", + "from": [11, 14, 1.5], + "to": [14, 15, 14.5], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8.5, 8]}, "faces": { - "north": {"uv": [0, 1, 1, 11.1], "texture": "#belt_funnel"}, - "east": {"uv": [10, 1, 16, 11], "rotation": 180, "texture": "#belt_funnel"}, - "south": {"uv": [9, 1, 10, 11.1], "texture": "#belt_funnel"}, - "west": {"uv": [10, 1, 16, 11], "texture": "#belt_funnel"} + "up": {"uv": [6.5, 0, 8, 6.5], "rotation": 180, "texture": "#4"} + } + }, + { + "name": "F5", + "from": [5, 14, 1.5], + "to": [8, 15, 14.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 8]}, + "faces": { + "up": {"uv": [6.5, 0, 8, 6.5], "rotation": 180, "texture": "#4"} + } + }, + { + "name": "F5", + "from": [8, 14, 1.5], + "to": [11, 15, 14.5], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 8.5, 8]}, + "faces": { + "up": {"uv": [6.5, 0, 8, 6.5], "rotation": 180, "texture": "#4"} + } + }, + { + "name": "F6", + "from": [2, 14, 1.5], + "to": [5, 15, 14.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 8]}, + "faces": { + "up": {"uv": [6.5, 0, 8, 6.5], "rotation": 180, "texture": "#4"} + } + }, + { + "name": "BackExtension", + "from": [2, 2, 2], + "to": [14, 6, 14], + "faces": { + "north": {"uv": [13, 10, 15, 16], "rotation": 270, "texture": "#2"}, + "east": {"uv": [13, 10, 15, 16], "rotation": 270, "texture": "#2"}, + "south": {"uv": [13, 10, 15, 16], "rotation": 270, "texture": "#2"}, + "west": {"uv": [13, 10, 15, 16], "rotation": 270, "texture": "#2"}, + "down": {"uv": [9, 0.5, 15, 6.5], "texture": "#2"} + } + }, + { + "name": "MidExtension", + "from": [1, 6, 1], + "to": [15, 10, 15], + "faces": { + "north": {"uv": [11, 9, 13, 16], "rotation": 90, "texture": "#2"}, + "east": {"uv": [11, 9, 13, 16], "rotation": 90, "texture": "#2"}, + "south": {"uv": [11, 9, 13, 16], "rotation": 90, "texture": "#2"}, + "west": {"uv": [11, 9, 13, 16], "rotation": 90, "texture": "#2"}, + "up": {"uv": [0, 9, 7, 16], "rotation": 180, "texture": "#2"}, + "down": {"uv": [8.5, 0, 15.5, 7], "texture": "#2"} + } + }, + { + "name": "Back", + "from": [3, -2, 3], + "to": [13, 2, 13], + "faces": { + "north": {"uv": [9.5, 9, 14.5, 11], "texture": "#4"}, + "east": {"uv": [9.5, 9, 14.5, 11], "texture": "#4"}, + "south": {"uv": [9.5, 9, 14.5, 11], "texture": "#4"}, + "west": {"uv": [9.5, 9, 14.5, 11], "texture": "#4"}, + "down": {"uv": [9.5, 11, 14.5, 16], "texture": "#4"} } } ], "display": { "thirdperson_righthand": { - "rotation": [75, -149, 0], - "translation": [-0.5, 3.25, 2.25], + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], "scale": [0.375, 0.375, 0.375] }, "thirdperson_lefthand": { - "rotation": [75, -149, 0], - "translation": [-0.5, 3.25, 2.25], + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], "scale": [0.375, 0.375, 0.375] }, "firstperson_righthand": { - "rotation": [0, -55, 0], + "rotation": [0, 45, 0], "scale": [0.4, 0.4, 0.4] }, "firstperson_lefthand": { - "rotation": [0, -55, 0], + "rotation": [0, 225, 0], "scale": [0.4, 0.4, 0.4] }, "ground": { - "translation": [0, 0, 2.25], + "translation": [0, 3, 0], "scale": [0.25, 0.25, 0.25] }, "gui": { - "rotation": [30, 45, 0], - "translation": [2.5, 1.75, 0], + "rotation": [30, 225, 0], "scale": [0.625, 0.625, 0.625] }, + "head": { + "rotation": [0, 90, 0] + }, "fixed": { - "rotation": [0, 180, 0], - "translation": [0, 3.5, -4.5], "scale": [0.5, 0.5, 0.5] } - } + }, + "groups": [ + { + "name": "BeltFunnel", + "origin": [9, -4, 8], + "children": [ + { + "name": "FrontSection", + "origin": [9, -4, 8], + "children": [0, 1, 2, 3, + { + "name": "Flap", + "origin": [8, 8, 8], + "children": [4, 5, 6, 7] + } + ] + }, + { + "name": "Extension", + "origin": [9, -4, 8], + "children": [8, 9] + }, + { + "name": "DELETABLEEXTENSION", + "origin": [9, -4, 8], + "children": [] + }, + { + "name": "DELETABLEEXTESNIONMID", + "origin": [35, 12, 4], + "children": [] + }, + { + "name": "Base", + "origin": [9, -4, 8], + "children": [10] + } + ] + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/funnel/vertical.json b/src/main/resources/assets/create/models/block/funnel/vertical.json deleted file mode 100644 index d5de931ce..000000000 --- a/src/main/resources/assets/create/models/block/funnel/vertical.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/funnel/horizontal", - "textures": { - "particle": "create:block/funnel_vertical", - "package_funnel_horizontal": "create:block/funnel_vertical" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/reality_funnel/block_powered.json b/src/main/resources/assets/create/models/block/reality_funnel/block_powered.json deleted file mode 100644 index de55e8ac2..000000000 --- a/src/main/resources/assets/create/models/block/reality_funnel/block_powered.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/reality_funnel/block", - "textures": { - "3": "create:block/funnel_on" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/reality_funnel/item.json b/src/main/resources/assets/create/models/block/reality_funnel/item.json deleted file mode 100644 index df9190407..000000000 --- a/src/main/resources/assets/create/models/block/reality_funnel/item.json +++ /dev/null @@ -1,208 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "2": "create:block/funnel_back", - "3": "create:block/funnel_off", - "4": "create:block/funnel_plating", - "particle": "create:block/brass_block" - }, - "elements": [ - { - "name": "RightWall", - "from": [0, 10, 0], - "to": [2, 16, 16], - "faces": { - "north": {"uv": [14, 0, 16, 6], "texture": "#3"}, - "east": {"uv": [0, 0, 16, 6], "texture": "#3"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#3"}, - "west": {"uv": [0, 0, 16, 6], "texture": "#3"}, - "up": {"uv": [14, 0, 16, 16], "rotation": 180, "texture": "#particle"}, - "down": {"uv": [0, 0, 2, 16], "texture": "#particle"} - } - }, - { - "name": "LeftWall", - "from": [14, 10, 0], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 2, 6], "texture": "#3"}, - "east": {"uv": [0, 0, 16, 6], "texture": "#3"}, - "south": {"uv": [14, 0, 16, 6], "texture": "#3"}, - "west": {"uv": [0, 0, 16, 6], "texture": "#3"}, - "up": {"uv": [0, 0, 2, 16], "rotation": 180, "texture": "#particle"}, - "down": {"uv": [14, 0, 16, 16], "texture": "#particle"} - } - }, - { - "name": "Top", - "from": [2, 10, 14], - "to": [14, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 8]}, - "faces": { - "north": {"uv": [2, 0, 14, 6], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 6], "texture": "#3"}, - "up": {"uv": [2, 0, 14, 2], "rotation": 180, "texture": "#particle"}, - "down": {"uv": [2, 0, 14, 2], "texture": "#particle"} - } - }, - { - "name": "Top", - "from": [2, 10, 0], - "to": [14, 16, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 8]}, - "faces": { - "north": {"uv": [2, 0, 14, 6], "texture": "#3"}, - "south": {"uv": [2, 0, 14, 6], "texture": "#3"}, - "up": {"uv": [2, 14, 14, 16], "rotation": 180, "texture": "#particle"}, - "down": {"uv": [2, 14, 14, 16], "texture": "#particle"} - } - }, - { - "name": "F4", - "from": [11, 14, 1.5], - "to": [14, 15, 14.5], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 8.5, 8]}, - "faces": { - "up": {"uv": [6.5, 0, 8, 6.5], "rotation": 180, "texture": "#4"} - } - }, - { - "name": "F5", - "from": [5, 14, 1.5], - "to": [8, 15, 14.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 8]}, - "faces": { - "up": {"uv": [6.5, 0, 8, 6.5], "rotation": 180, "texture": "#4"} - } - }, - { - "name": "F5", - "from": [8, 14, 1.5], - "to": [11, 15, 14.5], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 8.5, 8]}, - "faces": { - "up": {"uv": [6.5, 0, 8, 6.5], "rotation": 180, "texture": "#4"} - } - }, - { - "name": "F6", - "from": [2, 14, 1.5], - "to": [5, 15, 14.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 8]}, - "faces": { - "up": {"uv": [6.5, 0, 8, 6.5], "rotation": 180, "texture": "#4"} - } - }, - { - "name": "BackExtension", - "from": [2, 2, 2], - "to": [14, 6, 14], - "faces": { - "north": {"uv": [13, 10, 15, 16], "rotation": 270, "texture": "#2"}, - "east": {"uv": [13, 10, 15, 16], "rotation": 270, "texture": "#2"}, - "south": {"uv": [13, 10, 15, 16], "rotation": 270, "texture": "#2"}, - "west": {"uv": [13, 10, 15, 16], "rotation": 270, "texture": "#2"}, - "down": {"uv": [9, 0.5, 15, 6.5], "texture": "#2"} - } - }, - { - "name": "MidExtension", - "from": [1, 6, 1], - "to": [15, 10, 15], - "faces": { - "north": {"uv": [11, 9, 13, 16], "rotation": 90, "texture": "#2"}, - "east": {"uv": [11, 9, 13, 16], "rotation": 90, "texture": "#2"}, - "south": {"uv": [11, 9, 13, 16], "rotation": 90, "texture": "#2"}, - "west": {"uv": [11, 9, 13, 16], "rotation": 90, "texture": "#2"}, - "up": {"uv": [0, 9, 7, 16], "rotation": 180, "texture": "#2"}, - "down": {"uv": [8.5, 0, 15.5, 7], "texture": "#2"} - } - }, - { - "name": "Back", - "from": [3, -2, 3], - "to": [13, 2, 13], - "faces": { - "north": {"uv": [9.5, 9, 14.5, 11], "texture": "#4"}, - "east": {"uv": [9.5, 9, 14.5, 11], "texture": "#4"}, - "south": {"uv": [9.5, 9, 14.5, 11], "texture": "#4"}, - "west": {"uv": [9.5, 9, 14.5, 11], "texture": "#4"}, - "down": {"uv": [9.5, 11, 14.5, 16], "texture": "#4"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "thirdperson_lefthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "firstperson_righthand": { - "rotation": [0, 45, 0], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [0, 225, 0], - "scale": [0.4, 0.4, 0.4] - }, - "ground": { - "translation": [0, 3, 0], - "scale": [0.25, 0.25, 0.25] - }, - "gui": { - "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] - }, - "head": { - "rotation": [0, 90, 0] - }, - "fixed": { - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [ - { - "name": "BeltFunnel", - "origin": [9, -4, 8], - "children": [ - { - "name": "FrontSection", - "origin": [9, -4, 8], - "children": [0, 1, 2, 3, - { - "name": "Flap", - "origin": [8, 8, 8], - "children": [4, 5, 6, 7] - } - ] - }, - { - "name": "Extension", - "origin": [9, -4, 8], - "children": [8, 9] - }, - { - "name": "DELETABLEEXTENSION", - "origin": [9, -4, 8], - "children": [] - }, - { - "name": "DELETABLEEXTESNIONMID", - "origin": [35, 12, 4], - "children": [] - }, - { - "name": "Base", - "origin": [9, -4, 8], - "children": [10] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/block/andesite_casing_belt.png b/src/main/resources/assets/create/textures/block/andesite_casing_belt.png index e4f1303ec..f8b25b8c7 100644 Binary files a/src/main/resources/assets/create/textures/block/andesite_casing_belt.png and b/src/main/resources/assets/create/textures/block/andesite_casing_belt.png differ diff --git a/src/main/resources/assets/create/textures/block/andesite_funnel.png b/src/main/resources/assets/create/textures/block/andesite_funnel.png new file mode 100644 index 000000000..9d4f35ea9 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/andesite_funnel.png differ diff --git a/src/main/resources/assets/create/textures/block/andesite_funnel_back.png b/src/main/resources/assets/create/textures/block/andesite_funnel_back.png new file mode 100644 index 000000000..bc3c352ed Binary files /dev/null and b/src/main/resources/assets/create/textures/block/andesite_funnel_back.png differ diff --git a/src/main/resources/assets/create/textures/block/andesite_funnel_plating.png b/src/main/resources/assets/create/textures/block/andesite_funnel_plating.png new file mode 100644 index 000000000..dd858ec5e Binary files /dev/null and b/src/main/resources/assets/create/textures/block/andesite_funnel_plating.png differ diff --git a/src/main/resources/assets/create/textures/block/andesite_funnel_pull.png b/src/main/resources/assets/create/textures/block/andesite_funnel_pull.png new file mode 100644 index 000000000..4207c9e96 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/andesite_funnel_pull.png differ diff --git a/src/main/resources/assets/create/textures/block/andesite_funnel_push.png b/src/main/resources/assets/create/textures/block/andesite_funnel_push.png new file mode 100644 index 000000000..e9648ef74 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/andesite_funnel_push.png differ diff --git a/src/main/resources/assets/create/textures/block/andesite_tunnel.png b/src/main/resources/assets/create/textures/block/andesite_tunnel.png new file mode 100644 index 000000000..36f1f6a14 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/andesite_tunnel.png differ diff --git a/src/main/resources/assets/create/textures/block/belt_funnel.png b/src/main/resources/assets/create/textures/block/belt_funnel.png deleted file mode 100644 index 6b998cc57..000000000 Binary files a/src/main/resources/assets/create/textures/block/belt_funnel.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/belt_support_side.png b/src/main/resources/assets/create/textures/block/belt_support_side.png deleted file mode 100644 index f3d919354..000000000 Binary files a/src/main/resources/assets/create/textures/block/belt_support_side.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/belt_tunnel.png b/src/main/resources/assets/create/textures/block/belt_tunnel.png deleted file mode 100644 index e4272a45f..000000000 Binary files a/src/main/resources/assets/create/textures/block/belt_tunnel.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/funnel_off.png b/src/main/resources/assets/create/textures/block/brass_funnel.png similarity index 100% rename from src/main/resources/assets/create/textures/block/funnel_off.png rename to src/main/resources/assets/create/textures/block/brass_funnel.png diff --git a/src/main/resources/assets/create/textures/block/funnel_back.png b/src/main/resources/assets/create/textures/block/brass_funnel_back.png similarity index 100% rename from src/main/resources/assets/create/textures/block/funnel_back.png rename to src/main/resources/assets/create/textures/block/brass_funnel_back.png diff --git a/src/main/resources/assets/create/textures/block/funnel_plating.png b/src/main/resources/assets/create/textures/block/brass_funnel_plating.png similarity index 100% rename from src/main/resources/assets/create/textures/block/funnel_plating.png rename to src/main/resources/assets/create/textures/block/brass_funnel_plating.png diff --git a/src/main/resources/assets/create/textures/block/funnel_on.png b/src/main/resources/assets/create/textures/block/brass_funnel_powered.png similarity index 100% rename from src/main/resources/assets/create/textures/block/funnel_on.png rename to src/main/resources/assets/create/textures/block/brass_funnel_powered.png diff --git a/src/main/resources/assets/create/textures/block/belt_funnel_pull_off.png b/src/main/resources/assets/create/textures/block/brass_funnel_pull.png similarity index 100% rename from src/main/resources/assets/create/textures/block/belt_funnel_pull_off.png rename to src/main/resources/assets/create/textures/block/brass_funnel_pull.png diff --git a/src/main/resources/assets/create/textures/block/belt_funnel_pull_on.png b/src/main/resources/assets/create/textures/block/brass_funnel_pull_powered.png similarity index 100% rename from src/main/resources/assets/create/textures/block/belt_funnel_pull_on.png rename to src/main/resources/assets/create/textures/block/brass_funnel_pull_powered.png diff --git a/src/main/resources/assets/create/textures/block/belt_funnel_push_off.png b/src/main/resources/assets/create/textures/block/brass_funnel_push.png similarity index 100% rename from src/main/resources/assets/create/textures/block/belt_funnel_push_off.png rename to src/main/resources/assets/create/textures/block/brass_funnel_push.png diff --git a/src/main/resources/assets/create/textures/block/belt_funnel_push_on.png b/src/main/resources/assets/create/textures/block/brass_funnel_push_powered.png similarity index 100% rename from src/main/resources/assets/create/textures/block/belt_funnel_push_on.png rename to src/main/resources/assets/create/textures/block/brass_funnel_push_powered.png diff --git a/src/main/resources/assets/create/textures/block/brass_tunnel.png b/src/main/resources/assets/create/textures/block/brass_tunnel.png new file mode 100644 index 000000000..2631e8c8d Binary files /dev/null and b/src/main/resources/assets/create/textures/block/brass_tunnel.png differ diff --git a/src/main/resources/assets/create/textures/block/funnel_horizontal.png b/src/main/resources/assets/create/textures/block/funnel_horizontal.png deleted file mode 100644 index 90f2019bc..000000000 Binary files a/src/main/resources/assets/create/textures/block/funnel_horizontal.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/funnel_vertical.png b/src/main/resources/assets/create/textures/block/funnel_vertical.png deleted file mode 100644 index 25726f403..000000000 Binary files a/src/main/resources/assets/create/textures/block/funnel_vertical.png and /dev/null differ diff --git a/src/main/resources/data/create/recipes/crafting_shaped/logistics/belt_tunnel.json b/src/main/resources/data/create/recipes/crafting_shaped/logistics/belt_tunnel.json deleted file mode 100644 index c428b7c2b..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/logistics/belt_tunnel.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "BBB", - "PAP" - ], - "key": { - "A": { - "item": "minecraft:dried_kelp" - }, - "P": { - "tag": "forge:plates/brass" - }, - "B": { - "tag": "forge:ingots/brass" - } - }, - "result": { - "item": "create:belt_tunnel", - "count": 4 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/logistics/extractor.json b/src/main/resources/data/create/recipes/crafting_shaped/logistics/extractor.json deleted file mode 100644 index 793f07cb7..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/logistics/extractor.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - " B ", - "SCS", - " I " - ], - "key": { - "S": { - "tag": "forge:plates/brass" - }, - "B": { - "item": "create:electron_tube" - }, - "C": { - "item": "minecraft:dried_kelp" - }, - "I": { - "tag": "minecraft:planks" - } - }, - "result": { - "item": "create:extractor", - "count": 4 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/logistics/funnel.json b/src/main/resources/data/create/recipes/crafting_shaped/logistics/funnel.json deleted file mode 100644 index db043947f..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/logistics/funnel.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - " B ", - "SCS", - "ICI" - ], - "key": { - "S": { - "tag": "forge:plates/brass" - }, - "B": { - "item": "create:electron_tube" - }, - "C": { - "item": "minecraft:dried_kelp" - }, - "I": { - "tag": "minecraft:planks" - } - }, - "result": { - "item": "create:funnel", - "count": 4 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/logistics/transposer.json b/src/main/resources/data/create/recipes/crafting_shaped/logistics/transposer.json deleted file mode 100644 index 463850124..000000000 --- a/src/main/resources/data/create/recipes/crafting_shaped/logistics/transposer.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "SP" - ], - "key": { - "P": { - "item": "create:funnel" - }, - "S": { - "item": "create:extractor" - } - }, - "result": { - "item": "create:transposer", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/linked_extractor.json b/src/main/resources/data/create/recipes/crafting_shapeless/linked_extractor.json deleted file mode 100644 index f87471657..000000000 --- a/src/main/resources/data/create/recipes/crafting_shapeless/linked_extractor.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "create:extractor" - }, - { - "item": "minecraft:redstone_torch" - } - ], - "result": { - "item": "create:linked_extractor", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/linked_transposer.json b/src/main/resources/data/create/recipes/crafting_shapeless/linked_transposer.json deleted file mode 100644 index 6f652f61d..000000000 --- a/src/main/resources/data/create/recipes/crafting_shapeless/linked_transposer.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "create:transposer" - }, - { - "item": "minecraft:redstone_torch" - } - ], - "result": { - "item": "create:linked_transposer", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/transposer.json b/src/main/resources/data/create/recipes/crafting_shapeless/transposer.json deleted file mode 100644 index a2ed2f45f..000000000 --- a/src/main/resources/data/create/recipes/crafting_shapeless/transposer.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "create:linked_transposer" - } - ], - "result": { - "item": "create:transposer", - "count": 1 - } -} \ No newline at end of file