Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev

# Conflicts:
#	src/generated/resources/.cache/cache
This commit is contained in:
Jozufozu 2021-07-04 23:52:06 -07:00
commit d4a4e245bd
110 changed files with 935 additions and 494 deletions

View file

@ -68,7 +68,6 @@ f0031f5e970b3d5695472ed384950b8631b015ed assets/create/blockstates/creative_moto
fe2f78b94c20944399101e7369e2d43324297fb6 assets/create/blockstates/crushing_wheel.json fe2f78b94c20944399101e7369e2d43324297fb6 assets/create/blockstates/crushing_wheel.json
a1dd6cb3daa97ea871290ef7b178d28b564ee2a2 assets/create/blockstates/crushing_wheel_controller.json a1dd6cb3daa97ea871290ef7b178d28b564ee2a2 assets/create/blockstates/crushing_wheel_controller.json
b1126c191877cff86b4e2de83e1fcbd151451cb7 assets/create/blockstates/cuckoo_clock.json b1126c191877cff86b4e2de83e1fcbd151451cb7 assets/create/blockstates/cuckoo_clock.json
e8f1222b21e8e2e67d18252f7d3c9eefa650d3b9 assets/create/blockstates/cursed_bell.json
b496452f2f7dbbba385e1fc10b560ec266e4b5e7 assets/create/blockstates/cyan_sail.json b496452f2f7dbbba385e1fc10b560ec266e4b5e7 assets/create/blockstates/cyan_sail.json
4de72f65bff4e5d9c8153fa3adeee6b61d6f912b assets/create/blockstates/cyan_seat.json 4de72f65bff4e5d9c8153fa3adeee6b61d6f912b assets/create/blockstates/cyan_seat.json
2c04d57e56849f243aec8a1e769574d24daac1e9 assets/create/blockstates/cyan_valve_handle.json 2c04d57e56849f243aec8a1e769574d24daac1e9 assets/create/blockstates/cyan_valve_handle.json
@ -182,6 +181,7 @@ a5ec5401ba9f3e102a2e1b35837f643847afbca4 assets/create/blockstates/gray_seat.jso
13059309684db0cc7a0f1f4fce2407cf06cce80a assets/create/blockstates/green_seat.json 13059309684db0cc7a0f1f4fce2407cf06cce80a assets/create/blockstates/green_seat.json
f4a0fc68e8daaa0a47cdc951ced4310057a874b0 assets/create/blockstates/green_valve_handle.json f4a0fc68e8daaa0a47cdc951ced4310057a874b0 assets/create/blockstates/green_valve_handle.json
6ab675fa06317e6d07c0c1a453e7bb43e3f46b3b assets/create/blockstates/hand_crank.json 6ab675fa06317e6d07c0c1a453e7bb43e3f46b3b assets/create/blockstates/hand_crank.json
a895a7a0b47273301f21090882e06b64600e4e54 assets/create/blockstates/haunted_bell.json
4572b90f5d6c586e145f2c7a55664c3cb734bd2b assets/create/blockstates/honey.json 4572b90f5d6c586e145f2c7a55664c3cb734bd2b assets/create/blockstates/honey.json
be3bef7e091d8b50bfc1c6b7275946d1f636aefd assets/create/blockstates/horizontal_framed_glass.json be3bef7e091d8b50bfc1c6b7275946d1f636aefd assets/create/blockstates/horizontal_framed_glass.json
18d9fdaa1352a7e2ec91135e46dae5c02ccd8f8f assets/create/blockstates/horizontal_framed_glass_pane.json 18d9fdaa1352a7e2ec91135e46dae5c02ccd8f8f assets/create/blockstates/horizontal_framed_glass_pane.json
@ -410,21 +410,21 @@ a3a11524cd3515fc01d905767b4b7ea782adaf03 assets/create/blockstates/yellow_seat.j
6801fa1f466f172700e573e5b8ee8ee5f9ca4583 assets/create/blockstates/yellow_valve_handle.json 6801fa1f466f172700e573e5b8ee8ee5f9ca4583 assets/create/blockstates/yellow_valve_handle.json
7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json
b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json
ec48e6d3d500ae94b910d902eb7ed2c8de652fda assets/create/lang/en_ud.json 34e7619c5f0e1559b30fd74e9ac6b2df0fecebfa assets/create/lang/en_ud.json
95e9847bfc97f2ee8e9e48dbd4be8f988f1d48e9 assets/create/lang/en_us.json ed63be2abd8021a72528d48ade842a0c6d85c86f assets/create/lang/en_us.json
4a1af3b7290cb8bd548033d399496de8f0fc1b93 assets/create/lang/unfinished/de_de.json b9ed3430d65113ad12f950e1d40a3a83fbfb31c3 assets/create/lang/unfinished/de_de.json
0d644f8b37a6986cd6296fb6dc4946a375f8d412 assets/create/lang/unfinished/es_es.json f711933e82d78045c61f06a6127a1b7ae675c489 assets/create/lang/unfinished/es_es.json
32514e1e911174add48b7fcbbf392ee92272dde1 assets/create/lang/unfinished/es_mx.json 541e387b3cfbff383c184bea905ea0773431ebce assets/create/lang/unfinished/es_mx.json
867cd892814aee14f1cc51e2ae8a0985d2fbb014 assets/create/lang/unfinished/fr_fr.json 265820a60d244ba055d7035703a67e2c934e799f assets/create/lang/unfinished/fr_fr.json
4dcb9c9eec28e1b9317b9f1c0b4c3d55399e04e6 assets/create/lang/unfinished/it_it.json 4f37230b84a39c0142dcb1833a719d1a740016bb assets/create/lang/unfinished/it_it.json
f1a4ac058eadf0124bef710c5e7fc63de69b43ee assets/create/lang/unfinished/ja_jp.json 45d16773521011b79743ba068f3a57e4f6028a74 assets/create/lang/unfinished/ja_jp.json
31501180c743cd9104f028228785da5902b1ad6b assets/create/lang/unfinished/ko_kr.json dae91b76b48b91a47a77135c9185901fc579d745 assets/create/lang/unfinished/ko_kr.json
84f6f5d577de562c1cfbed4a4e559548518e4a87 assets/create/lang/unfinished/nl_nl.json acf4d7bfe6dcdbd9515d237daae5a1ba0917fd69 assets/create/lang/unfinished/nl_nl.json
471e6c2caf80e6314b928e9f437445facc754bca assets/create/lang/unfinished/pl_pl.json 95ca0ee6942917dfec8c8229a920e7043bd50f3d assets/create/lang/unfinished/pl_pl.json
89fae2843334e2ce8864129fe8aa92b692670879 assets/create/lang/unfinished/pt_br.json c11d5dbe2042260d93245c622ee7b64f5a827981 assets/create/lang/unfinished/pt_br.json
90607465325ebe61298bd694a89e284f2e01ce42 assets/create/lang/unfinished/ru_ru.json 81fd37851ce0b7d6ec6f385e51c5689e0a056140 assets/create/lang/unfinished/ru_ru.json
ea755903e75859f53cbe38bd0286f4d4fc69abc5 assets/create/lang/unfinished/zh_cn.json e36a36cffbd08d27ced84e3d14057c4b0cb1e68a assets/create/lang/unfinished/zh_cn.json
017a50c4585558f62c296c5e59e6e112a71f51af assets/create/lang/unfinished/zh_tw.json ea0369a293ad2e2c814de9938687ad5a700db9f4 assets/create/lang/unfinished/zh_tw.json
487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json 487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json
b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json
3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json 3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json
@ -1299,7 +1299,6 @@ b359064405d189e2802969715cd5f682ddbf0bb1 assets/create/models/item/crushed_urani
2bb791db62dce6bf2e2227f9b607c131828471fd assets/create/models/item/crushed_zinc_ore.json 2bb791db62dce6bf2e2227f9b607c131828471fd assets/create/models/item/crushed_zinc_ore.json
823c91f63565db54ec3944a1e90e7aee18e41062 assets/create/models/item/crushing_wheel.json 823c91f63565db54ec3944a1e90e7aee18e41062 assets/create/models/item/crushing_wheel.json
dae5cffa4e1263d6a113469f79fba8695fa8232a assets/create/models/item/cuckoo_clock.json dae5cffa4e1263d6a113469f79fba8695fa8232a assets/create/models/item/cuckoo_clock.json
9826c00050ba493f844e8812cc45153a156c5317 assets/create/models/item/cursed_bell.json
3e3edc9ccded444496d3336926b93bbf1234cd84 assets/create/models/item/cyan_seat.json 3e3edc9ccded444496d3336926b93bbf1234cd84 assets/create/models/item/cyan_seat.json
523cd531eadaadc45fb356ca58b99a8fe206c3a7 assets/create/models/item/cyan_valve_handle.json 523cd531eadaadc45fb356ca58b99a8fe206c3a7 assets/create/models/item/cyan_valve_handle.json
f786a43e296d9f10d7c302fe3ae9cddf4ba9984e assets/create/models/item/dark_oak_window.json f786a43e296d9f10d7c302fe3ae9cddf4ba9984e assets/create/models/item/dark_oak_window.json
@ -1419,6 +1418,7 @@ e7daa31c1fc445d542bad476dfe1d6a8811f2070 assets/create/models/item/gray_seat.jso
ecb9f32f62d3fa43fb226ab85adc2eb229fdfb77 assets/create/models/item/green_valve_handle.json ecb9f32f62d3fa43fb226ab85adc2eb229fdfb77 assets/create/models/item/green_valve_handle.json
398b1a7c76c7bdb6a23b1248fdce98f6d835467f assets/create/models/item/hand_crank.json 398b1a7c76c7bdb6a23b1248fdce98f6d835467f assets/create/models/item/hand_crank.json
dee43bf1a9c211a752fac2c07aeba123f7f0c914 assets/create/models/item/handheld_worldshaper.json dee43bf1a9c211a752fac2c07aeba123f7f0c914 assets/create/models/item/handheld_worldshaper.json
bdbc76719ebf3dc28b013d30fb00dc6ce92b0ceb assets/create/models/item/haunted_bell.json
f0d5af58e23e2705b3ef675c30bdf85ed9567c57 assets/create/models/item/honey_bucket.json f0d5af58e23e2705b3ef675c30bdf85ed9567c57 assets/create/models/item/honey_bucket.json
068729724f5f7b276b9bc378e533898a92e8debe assets/create/models/item/honeyed_apple.json 068729724f5f7b276b9bc378e533898a92e8debe assets/create/models/item/honeyed_apple.json
955e8accadb47f9b360e5fd48cd959c507b00f2d assets/create/models/item/horizontal_framed_glass.json 955e8accadb47f9b360e5fd48cd959c507b00f2d assets/create/models/item/horizontal_framed_glass.json
@ -1659,7 +1659,7 @@ d080b1b25e5bc8baf5aee68691b08c7f12ece3b0 assets/create/models/item/windmill_bear
866fbb0ce2878a73e0440d1caf6534c8bd7c384f assets/create/models/item/zinc_ingot.json 866fbb0ce2878a73e0440d1caf6534c8bd7c384f assets/create/models/item/zinc_ingot.json
a80fb25a0b655e76be986b5b49fcb0f03461a1ab assets/create/models/item/zinc_nugget.json a80fb25a0b655e76be986b5b49fcb0f03461a1ab assets/create/models/item/zinc_nugget.json
b1689617190c05ef34bd18456b0c7ae09bb3210f assets/create/models/item/zinc_ore.json b1689617190c05ef34bd18456b0c7ae09bb3210f assets/create/models/item/zinc_ore.json
f3231c27d43ff511b7d8532603111706ebcc155e assets/create/sounds.json bbe7fc4aef29420319f59d02d4cd376a78244e70 assets/create/sounds.json
0f1b4b980afba9bf2caf583b88e261bba8b10313 data/create/advancements/aesthetics.json 0f1b4b980afba9bf2caf583b88e261bba8b10313 data/create/advancements/aesthetics.json
187921fa131b06721bfaf63f2623a28c141aae9a data/create/advancements/andesite_alloy.json 187921fa131b06721bfaf63f2623a28c141aae9a data/create/advancements/andesite_alloy.json
0ea2db7173b5be28b289ea7c9a6a0cf5805c60c7 data/create/advancements/andesite_casing.json 0ea2db7173b5be28b289ea7c9a6a0cf5805c60c7 data/create/advancements/andesite_casing.json
@ -2463,7 +2463,6 @@ ba084fc3c680c9dea0d03fc664a831dfed18e52e data/create/loot_tables/blocks/crimson_
c28fa42746a4d5ca2f824001b67e58673810169e data/create/loot_tables/blocks/crushing_wheel.json c28fa42746a4d5ca2f824001b67e58673810169e data/create/loot_tables/blocks/crushing_wheel.json
205f5899101262f31f5c1a88bb7d954918d08d04 data/create/loot_tables/blocks/crushing_wheel_controller.json 205f5899101262f31f5c1a88bb7d954918d08d04 data/create/loot_tables/blocks/crushing_wheel_controller.json
d370ee874b5b6b98e9a8c368218fe61f644d956d data/create/loot_tables/blocks/cuckoo_clock.json d370ee874b5b6b98e9a8c368218fe61f644d956d data/create/loot_tables/blocks/cuckoo_clock.json
da983da67346f3dda63505a83f59db6f8131f69b data/create/loot_tables/blocks/cursed_bell.json
28ae0ee8a0b1fb6becae6264de687fe17940708e data/create/loot_tables/blocks/cyan_sail.json 28ae0ee8a0b1fb6becae6264de687fe17940708e data/create/loot_tables/blocks/cyan_sail.json
49a14b9e93abdf02a7aef9c0c4085ac89617fae4 data/create/loot_tables/blocks/cyan_seat.json 49a14b9e93abdf02a7aef9c0c4085ac89617fae4 data/create/loot_tables/blocks/cyan_seat.json
fe24fd296812fea3f838defa2ca6270523d9d48e data/create/loot_tables/blocks/cyan_valve_handle.json fe24fd296812fea3f838defa2ca6270523d9d48e data/create/loot_tables/blocks/cyan_valve_handle.json
@ -2577,6 +2576,7 @@ d014357b3a467b23473c8223f32471a04a9ff94c data/create/loot_tables/blocks/gray_sea
a71599eecd3f1179e3d0367623460e798828aa6d data/create/loot_tables/blocks/green_seat.json a71599eecd3f1179e3d0367623460e798828aa6d data/create/loot_tables/blocks/green_seat.json
865ebead9601b29e6326dc9e1d4c1ca92f3b7a3b data/create/loot_tables/blocks/green_valve_handle.json 865ebead9601b29e6326dc9e1d4c1ca92f3b7a3b data/create/loot_tables/blocks/green_valve_handle.json
9bdc47ea3ffc52f037f12f40f387e6b72a352c4e data/create/loot_tables/blocks/hand_crank.json 9bdc47ea3ffc52f037f12f40f387e6b72a352c4e data/create/loot_tables/blocks/hand_crank.json
c61b386376d19aaf89df3447a26b976a672efec5 data/create/loot_tables/blocks/haunted_bell.json
22012e7759f1dbccbb06bcaf0311a54190270825 data/create/loot_tables/blocks/horizontal_framed_glass.json 22012e7759f1dbccbb06bcaf0311a54190270825 data/create/loot_tables/blocks/horizontal_framed_glass.json
5d3f585539942f13bbc458a0a002849c1f034fc1 data/create/loot_tables/blocks/horizontal_framed_glass_pane.json 5d3f585539942f13bbc458a0a002849c1f034fc1 data/create/loot_tables/blocks/horizontal_framed_glass_pane.json
1b28cc5e1e535aa0c62d4a75ad76fcb40bf6232c data/create/loot_tables/blocks/hose_pulley.json 1b28cc5e1e535aa0c62d4a75ad76fcb40bf6232c data/create/loot_tables/blocks/hose_pulley.json
@ -3687,9 +3687,9 @@ d3fdb8ece6cb072a93ddb64a0baad5ac952117a4 data/create/recipes/weathered_limestone
0f3c993eb6dd3f37953f304b8fad15bf60469ef4 data/create/recipes/weathered_limestone_cobblestone_wall_from_weathered_limestone_cobblestone_stonecutting.json 0f3c993eb6dd3f37953f304b8fad15bf60469ef4 data/create/recipes/weathered_limestone_cobblestone_wall_from_weathered_limestone_cobblestone_stonecutting.json
6eceb25fabbb6b389ca35de3b829ad061c9c456a data/create/recipes/weathered_limestone_pillar.json 6eceb25fabbb6b389ca35de3b829ad061c9c456a data/create/recipes/weathered_limestone_pillar.json
11667414f73bc2d00bda7c5c1a7d2934bf6e9165 data/create/recipes/weathered_limestone_pillar_from_weathered_limestone_stonecutting.json 11667414f73bc2d00bda7c5c1a7d2934bf6e9165 data/create/recipes/weathered_limestone_pillar_from_weathered_limestone_stonecutting.json
558c1052ca384f1c014f9b404d21268764a493ee data/create/tags/blocks/brittle.json 6558ef43f28c92cc558fbfc572f38496f1ed479e data/create/tags/blocks/brittle.json
330bfb3850ba3964b10b1bccbc3cbb9b012cae54 data/create/tags/blocks/fan_heaters.json 330bfb3850ba3964b10b1bccbc3cbb9b012cae54 data/create/tags/blocks/fan_heaters.json
3bc64e3a1e7980237435b1770a9ba2102d57fcd4 data/create/tags/blocks/fan_transparent.json 57b942386a15c874d1ca9cd6a8032c11a5599fc2 data/create/tags/blocks/fan_transparent.json
c81ea194e808985847159b201140d4aa4cbcca65 data/create/tags/blocks/safe_nbt.json c81ea194e808985847159b201140d4aa4cbcca65 data/create/tags/blocks/safe_nbt.json
c9ac7e3e5ec18554e7184168d65e9b8e44ef5610 data/create/tags/blocks/sails.json c9ac7e3e5ec18554e7184168d65e9b8e44ef5610 data/create/tags/blocks/sails.json
6cdeeac1689f7b5bfd9bc40b462143d8eaf3ad0b data/create/tags/blocks/seats.json 6cdeeac1689f7b5bfd9bc40b462143d8eaf3ad0b data/create/tags/blocks/seats.json

View file

@ -1,123 +1,123 @@
{ {
"variants": { "variants": {
"attachment=floor,facing=north,powered=false": { "attachment=floor,facing=north,powered=false": {
"model": "create:block/cursed_bell/block_floor" "model": "create:block/haunted_bell/block_floor"
}, },
"attachment=ceiling,facing=north,powered=false": { "attachment=ceiling,facing=north,powered=false": {
"model": "create:block/cursed_bell/block_ceiling" "model": "create:block/haunted_bell/block_ceiling"
}, },
"attachment=single_wall,facing=north,powered=false": { "attachment=single_wall,facing=north,powered=false": {
"model": "create:block/cursed_bell/block_single_wall" "model": "create:block/haunted_bell/block_single_wall"
}, },
"attachment=double_wall,facing=north,powered=false": { "attachment=double_wall,facing=north,powered=false": {
"model": "create:block/cursed_bell/block_double_wall" "model": "create:block/haunted_bell/block_double_wall"
}, },
"attachment=floor,facing=south,powered=false": { "attachment=floor,facing=south,powered=false": {
"model": "create:block/cursed_bell/block_floor", "model": "create:block/haunted_bell/block_floor",
"y": 180 "y": 180
}, },
"attachment=ceiling,facing=south,powered=false": { "attachment=ceiling,facing=south,powered=false": {
"model": "create:block/cursed_bell/block_ceiling", "model": "create:block/haunted_bell/block_ceiling",
"y": 180 "y": 180
}, },
"attachment=single_wall,facing=south,powered=false": { "attachment=single_wall,facing=south,powered=false": {
"model": "create:block/cursed_bell/block_single_wall", "model": "create:block/haunted_bell/block_single_wall",
"y": 180 "y": 180
}, },
"attachment=double_wall,facing=south,powered=false": { "attachment=double_wall,facing=south,powered=false": {
"model": "create:block/cursed_bell/block_double_wall", "model": "create:block/haunted_bell/block_double_wall",
"y": 180 "y": 180
}, },
"attachment=floor,facing=west,powered=false": { "attachment=floor,facing=west,powered=false": {
"model": "create:block/cursed_bell/block_floor", "model": "create:block/haunted_bell/block_floor",
"y": 270 "y": 270
}, },
"attachment=ceiling,facing=west,powered=false": { "attachment=ceiling,facing=west,powered=false": {
"model": "create:block/cursed_bell/block_ceiling", "model": "create:block/haunted_bell/block_ceiling",
"y": 270 "y": 270
}, },
"attachment=single_wall,facing=west,powered=false": { "attachment=single_wall,facing=west,powered=false": {
"model": "create:block/cursed_bell/block_single_wall", "model": "create:block/haunted_bell/block_single_wall",
"y": 270 "y": 270
}, },
"attachment=double_wall,facing=west,powered=false": { "attachment=double_wall,facing=west,powered=false": {
"model": "create:block/cursed_bell/block_double_wall", "model": "create:block/haunted_bell/block_double_wall",
"y": 270 "y": 270
}, },
"attachment=floor,facing=east,powered=false": { "attachment=floor,facing=east,powered=false": {
"model": "create:block/cursed_bell/block_floor", "model": "create:block/haunted_bell/block_floor",
"y": 90 "y": 90
}, },
"attachment=ceiling,facing=east,powered=false": { "attachment=ceiling,facing=east,powered=false": {
"model": "create:block/cursed_bell/block_ceiling", "model": "create:block/haunted_bell/block_ceiling",
"y": 90 "y": 90
}, },
"attachment=single_wall,facing=east,powered=false": { "attachment=single_wall,facing=east,powered=false": {
"model": "create:block/cursed_bell/block_single_wall", "model": "create:block/haunted_bell/block_single_wall",
"y": 90 "y": 90
}, },
"attachment=double_wall,facing=east,powered=false": { "attachment=double_wall,facing=east,powered=false": {
"model": "create:block/cursed_bell/block_double_wall", "model": "create:block/haunted_bell/block_double_wall",
"y": 90 "y": 90
}, },
"attachment=floor,facing=north,powered=true": { "attachment=floor,facing=north,powered=true": {
"model": "create:block/cursed_bell/block_floor" "model": "create:block/haunted_bell/block_floor"
}, },
"attachment=ceiling,facing=north,powered=true": { "attachment=ceiling,facing=north,powered=true": {
"model": "create:block/cursed_bell/block_ceiling" "model": "create:block/haunted_bell/block_ceiling"
}, },
"attachment=single_wall,facing=north,powered=true": { "attachment=single_wall,facing=north,powered=true": {
"model": "create:block/cursed_bell/block_single_wall" "model": "create:block/haunted_bell/block_single_wall"
}, },
"attachment=double_wall,facing=north,powered=true": { "attachment=double_wall,facing=north,powered=true": {
"model": "create:block/cursed_bell/block_double_wall" "model": "create:block/haunted_bell/block_double_wall"
}, },
"attachment=floor,facing=south,powered=true": { "attachment=floor,facing=south,powered=true": {
"model": "create:block/cursed_bell/block_floor", "model": "create:block/haunted_bell/block_floor",
"y": 180 "y": 180
}, },
"attachment=ceiling,facing=south,powered=true": { "attachment=ceiling,facing=south,powered=true": {
"model": "create:block/cursed_bell/block_ceiling", "model": "create:block/haunted_bell/block_ceiling",
"y": 180 "y": 180
}, },
"attachment=single_wall,facing=south,powered=true": { "attachment=single_wall,facing=south,powered=true": {
"model": "create:block/cursed_bell/block_single_wall", "model": "create:block/haunted_bell/block_single_wall",
"y": 180 "y": 180
}, },
"attachment=double_wall,facing=south,powered=true": { "attachment=double_wall,facing=south,powered=true": {
"model": "create:block/cursed_bell/block_double_wall", "model": "create:block/haunted_bell/block_double_wall",
"y": 180 "y": 180
}, },
"attachment=floor,facing=west,powered=true": { "attachment=floor,facing=west,powered=true": {
"model": "create:block/cursed_bell/block_floor", "model": "create:block/haunted_bell/block_floor",
"y": 270 "y": 270
}, },
"attachment=ceiling,facing=west,powered=true": { "attachment=ceiling,facing=west,powered=true": {
"model": "create:block/cursed_bell/block_ceiling", "model": "create:block/haunted_bell/block_ceiling",
"y": 270 "y": 270
}, },
"attachment=single_wall,facing=west,powered=true": { "attachment=single_wall,facing=west,powered=true": {
"model": "create:block/cursed_bell/block_single_wall", "model": "create:block/haunted_bell/block_single_wall",
"y": 270 "y": 270
}, },
"attachment=double_wall,facing=west,powered=true": { "attachment=double_wall,facing=west,powered=true": {
"model": "create:block/cursed_bell/block_double_wall", "model": "create:block/haunted_bell/block_double_wall",
"y": 270 "y": 270
}, },
"attachment=floor,facing=east,powered=true": { "attachment=floor,facing=east,powered=true": {
"model": "create:block/cursed_bell/block_floor", "model": "create:block/haunted_bell/block_floor",
"y": 90 "y": 90
}, },
"attachment=ceiling,facing=east,powered=true": { "attachment=ceiling,facing=east,powered=true": {
"model": "create:block/cursed_bell/block_ceiling", "model": "create:block/haunted_bell/block_ceiling",
"y": 90 "y": 90
}, },
"attachment=single_wall,facing=east,powered=true": { "attachment=single_wall,facing=east,powered=true": {
"model": "create:block/cursed_bell/block_single_wall", "model": "create:block/haunted_bell/block_single_wall",
"y": 90 "y": 90
}, },
"attachment=double_wall,facing=east,powered=true": { "attachment=double_wall,facing=east,powered=true": {
"model": "create:block/cursed_bell/block_double_wall", "model": "create:block/haunted_bell/block_double_wall",
"y": 90 "y": 90
} }
} }

View file

@ -69,7 +69,6 @@
"block.create.crushing_wheel": "\u05DF\u01DD\u01DD\u0265M bu\u0131\u0265sn\u0279\u0186", "block.create.crushing_wheel": "\u05DF\u01DD\u01DD\u0265M bu\u0131\u0265sn\u0279\u0186",
"block.create.crushing_wheel_controller": "\u0279\u01DD\u05DF\u05DFo\u0279\u0287uo\u0186 \u05DF\u01DD\u01DD\u0265M bu\u0131\u0265sn\u0279\u0186", "block.create.crushing_wheel_controller": "\u0279\u01DD\u05DF\u05DFo\u0279\u0287uo\u0186 \u05DF\u01DD\u01DD\u0265M bu\u0131\u0265sn\u0279\u0186",
"block.create.cuckoo_clock": "\u029E\u0254o\u05DF\u0186 oo\u029E\u0254n\u0186", "block.create.cuckoo_clock": "\u029E\u0254o\u05DF\u0186 oo\u029E\u0254n\u0186",
"block.create.cursed_bell": "\u05DF\u05DF\u01DD\u15FA p\u01DDs\u0279n\u0186",
"block.create.cyan_sail": "\u05DF\u0131\u0250S u\u0250\u028E\u0186", "block.create.cyan_sail": "\u05DF\u0131\u0250S u\u0250\u028E\u0186",
"block.create.cyan_seat": "\u0287\u0250\u01DDS u\u0250\u028E\u0186", "block.create.cyan_seat": "\u0287\u0250\u01DDS u\u0250\u028E\u0186",
"block.create.cyan_valve_handle": "\u01DD\u05DFpu\u0250H \u01DD\u028C\u05DF\u0250\u039B u\u0250\u028E\u0186", "block.create.cyan_valve_handle": "\u01DD\u05DFpu\u0250H \u01DD\u028C\u05DF\u0250\u039B u\u0250\u028E\u0186",
@ -183,6 +182,7 @@
"block.create.green_seat": "\u0287\u0250\u01DDS u\u01DD\u01DD\u0279\u2141", "block.create.green_seat": "\u0287\u0250\u01DDS u\u01DD\u01DD\u0279\u2141",
"block.create.green_valve_handle": "\u01DD\u05DFpu\u0250H \u01DD\u028C\u05DF\u0250\u039B u\u01DD\u01DD\u0279\u2141", "block.create.green_valve_handle": "\u01DD\u05DFpu\u0250H \u01DD\u028C\u05DF\u0250\u039B u\u01DD\u01DD\u0279\u2141",
"block.create.hand_crank": "\u029Eu\u0250\u0279\u0186 pu\u0250H", "block.create.hand_crank": "\u029Eu\u0250\u0279\u0186 pu\u0250H",
"block.create.haunted_bell": "\u05DF\u05DF\u01DD\u15FA p\u01DD\u0287un\u0250H",
"block.create.honey": "\u028E\u01DDuoH", "block.create.honey": "\u028E\u01DDuoH",
"block.create.horizontal_framed_glass": "ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132 \u05DF\u0250\u0287uoz\u0131\u0279oH", "block.create.horizontal_framed_glass": "ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132 \u05DF\u0250\u0287uoz\u0131\u0279oH",
"block.create.horizontal_framed_glass_pane": "\u01DDu\u0250\u0500 ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132 \u05DF\u0250\u0287uoz\u0131\u0279oH", "block.create.horizontal_framed_glass_pane": "\u01DDu\u0250\u0500 ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132 \u05DF\u0250\u0287uoz\u0131\u0279oH",

View file

@ -72,7 +72,6 @@
"block.create.crushing_wheel": "Crushing Wheel", "block.create.crushing_wheel": "Crushing Wheel",
"block.create.crushing_wheel_controller": "Crushing Wheel Controller", "block.create.crushing_wheel_controller": "Crushing Wheel Controller",
"block.create.cuckoo_clock": "Cuckoo Clock", "block.create.cuckoo_clock": "Cuckoo Clock",
"block.create.cursed_bell": "Cursed Bell",
"block.create.cyan_sail": "Cyan Sail", "block.create.cyan_sail": "Cyan Sail",
"block.create.cyan_seat": "Cyan Seat", "block.create.cyan_seat": "Cyan Seat",
"block.create.cyan_valve_handle": "Cyan Valve Handle", "block.create.cyan_valve_handle": "Cyan Valve Handle",
@ -186,6 +185,7 @@
"block.create.green_seat": "Green Seat", "block.create.green_seat": "Green Seat",
"block.create.green_valve_handle": "Green Valve Handle", "block.create.green_valve_handle": "Green Valve Handle",
"block.create.hand_crank": "Hand Crank", "block.create.hand_crank": "Hand Crank",
"block.create.haunted_bell": "Haunted Bell",
"block.create.honey": "Honey", "block.create.honey": "Honey",
"block.create.horizontal_framed_glass": "Horizontal Framed Glass", "block.create.horizontal_framed_glass": "Horizontal Framed Glass",
"block.create.horizontal_framed_glass_pane": "Horizontal Framed Glass Pane", "block.create.horizontal_framed_glass_pane": "Horizontal Framed Glass Pane",
@ -1193,6 +1193,7 @@
"create.subtitle.blaze_munch": "Blaze Burner munches", "create.subtitle.blaze_munch": "Blaze Burner munches",
"create.subtitle.funnel_flap": "Funnel Flaps", "create.subtitle.funnel_flap": "Funnel Flaps",
"create.subtitle.schematicannon_finish": "Schematicannon dings", "create.subtitle.schematicannon_finish": "Schematicannon dings",
"create.subtitle.haunted_bell_use": "Haunted Bell tolls",
"create.subtitle.scroll_value": "Scroll-input clicks", "create.subtitle.scroll_value": "Scroll-input clicks",
"create.subtitle.crafter_craft": "Crafter crafts", "create.subtitle.crafter_craft": "Crafter crafts",
"create.subtitle.controller_put": "Controller thumps", "create.subtitle.controller_put": "Controller thumps",
@ -1203,13 +1204,12 @@
"create.subtitle.wrench_rotate": "Wrench used", "create.subtitle.wrench_rotate": "Wrench used",
"create.subtitle.potato_hit": "Vegetable impacts", "create.subtitle.potato_hit": "Vegetable impacts",
"create.subtitle.saw_activate_wood": "Mechanical Saw activates", "create.subtitle.saw_activate_wood": "Mechanical Saw activates",
"create.subtitle.haunted_bell_convert": "Haunted Bell awakens",
"create.subtitle.deployer_polish": "Deployer applies polish", "create.subtitle.deployer_polish": "Deployer applies polish",
"create.subtitle.deny": "Declining boop", "create.subtitle.deny": "Declining boop",
"create.subtitle.controller_click": "Controller clicks", "create.subtitle.controller_click": "Controller clicks",
"create.subtitle.schematicannon_launch_block": "Schematicannon fires", "create.subtitle.schematicannon_launch_block": "Schematicannon fires",
"create.subtitle.copper_armor_equip": "Diving equipment clinks", "create.subtitle.copper_armor_equip": "Diving equipment clinks",
"create.subtitle.cursed_bell_use": "Cursed Bell tolls",
"create.subtitle.cursed_bell_convert": "Cursed Bell awakens",
"create.subtitle.controller_take": "Lectern empties", "create.subtitle.controller_take": "Lectern empties",
"create.subtitle.mechanical_press_activation": "Mechanical Press clangs", "create.subtitle.mechanical_press_activation": "Mechanical Press clangs",
"create.subtitle.contraption_assemble": "Contraption moves", "create.subtitle.contraption_assemble": "Contraption moves",
@ -1440,10 +1440,10 @@
"block.create.peculiar_bell.tooltip": "PECULIAR BELL", "block.create.peculiar_bell.tooltip": "PECULIAR BELL",
"block.create.peculiar_bell.tooltip.summary": "A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", "block.create.peculiar_bell.tooltip.summary": "A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...",
"block.create.cursed_bell.tooltip": "CURSED BELL", "block.create.haunted_bell.tooltip": "HAUNTED BELL",
"block.create.cursed_bell.tooltip.summary": "A spooky brass bell haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.summary": "A spooky brass bell haunted by lost souls of the Nether.",
"block.create.cursed_bell.tooltip.condition1": "When Held or Rang", "block.create.haunted_bell.tooltip.condition1": "When Held or Rang",
"block.create.cursed_bell.tooltip.behaviour1": "Highlights nearby dark spots on which Hostile Mobs could spawn.", "block.create.haunted_bell.tooltip.behaviour1": "Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.",
"_": "->------------------------] Ponder Content [------------------------<-", "_": "->------------------------] Ponder Content [------------------------<-",

View file

@ -73,7 +73,6 @@
"block.create.crushing_wheel": "Mahlwerkrad", "block.create.crushing_wheel": "Mahlwerkrad",
"block.create.crushing_wheel_controller": "Mahlwerkrad Steurung", "block.create.crushing_wheel_controller": "Mahlwerkrad Steurung",
"block.create.cuckoo_clock": "Kuckucksuhr", "block.create.cuckoo_clock": "Kuckucksuhr",
"block.create.cursed_bell": "UNLOCALIZED: Cursed Bell",
"block.create.cyan_sail": "Türkises Segel", "block.create.cyan_sail": "Türkises Segel",
"block.create.cyan_seat": "Türkiser Sitz", "block.create.cyan_seat": "Türkiser Sitz",
"block.create.cyan_valve_handle": "Türkiser Ventilgriff", "block.create.cyan_valve_handle": "Türkiser Ventilgriff",
@ -187,6 +186,7 @@
"block.create.green_seat": "Grüner Sitz", "block.create.green_seat": "Grüner Sitz",
"block.create.green_valve_handle": "Grüner Ventilgriff", "block.create.green_valve_handle": "Grüner Ventilgriff",
"block.create.hand_crank": "Handkurbel", "block.create.hand_crank": "Handkurbel",
"block.create.haunted_bell": "UNLOCALIZED: Haunted Bell",
"block.create.honey": "Honig", "block.create.honey": "Honig",
"block.create.horizontal_framed_glass": "Horizontal Gerahmtes Glas", "block.create.horizontal_framed_glass": "Horizontal Gerahmtes Glas",
"block.create.horizontal_framed_glass_pane": "Horizontal Gerahmte Glasscheibe", "block.create.horizontal_framed_glass_pane": "Horizontal Gerahmte Glasscheibe",
@ -1194,6 +1194,7 @@
"create.subtitle.blaze_munch": "Lohe kaut glücklich", "create.subtitle.blaze_munch": "Lohe kaut glücklich",
"create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps",
"create.subtitle.schematicannon_finish": "Bauplankanone endet", "create.subtitle.schematicannon_finish": "Bauplankanone endet",
"create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls",
"create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks",
"create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts",
"create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps",
@ -1204,13 +1205,12 @@
"create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used",
"create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts",
"create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates",
"create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens",
"create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish", "create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish",
"create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.deny": "UNLOCALIZED: Declining boop",
"create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks",
"create.subtitle.schematicannon_launch_block": "Bauplankanone schießt", "create.subtitle.schematicannon_launch_block": "Bauplankanone schießt",
"create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks", "create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks",
"create.subtitle.cursed_bell_use": "UNLOCALIZED: Cursed Bell tolls",
"create.subtitle.cursed_bell_convert": "UNLOCALIZED: Cursed Bell awakens",
"create.subtitle.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.controller_take": "UNLOCALIZED: Lectern empties",
"create.subtitle.mechanical_press_activation": "Mechanische Presse wird aktiviert", "create.subtitle.mechanical_press_activation": "Mechanische Presse wird aktiviert",
"create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves",
@ -1441,10 +1441,10 @@
"block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL",
"block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...",
"block.create.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL",
"block.create.cursed_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.",
"block.create.cursed_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang",
"block.create.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.",
"_": "->------------------------] Ponder Content [------------------------<-", "_": "->------------------------] Ponder Content [------------------------<-",

View file

@ -73,7 +73,6 @@
"block.create.crushing_wheel": "Rueda trituradora", "block.create.crushing_wheel": "Rueda trituradora",
"block.create.crushing_wheel_controller": "Controlador de Rueda trituradora", "block.create.crushing_wheel_controller": "Controlador de Rueda trituradora",
"block.create.cuckoo_clock": "Reloj Cucú", "block.create.cuckoo_clock": "Reloj Cucú",
"block.create.cursed_bell": "UNLOCALIZED: Cursed Bell",
"block.create.cyan_sail": "Vela cian", "block.create.cyan_sail": "Vela cian",
"block.create.cyan_seat": "Asiento cian", "block.create.cyan_seat": "Asiento cian",
"block.create.cyan_valve_handle": "Asa de válvula cian", "block.create.cyan_valve_handle": "Asa de válvula cian",
@ -187,6 +186,7 @@
"block.create.green_seat": "Asiento verde", "block.create.green_seat": "Asiento verde",
"block.create.green_valve_handle": "Asa de válvula verde", "block.create.green_valve_handle": "Asa de válvula verde",
"block.create.hand_crank": "Manivela", "block.create.hand_crank": "Manivela",
"block.create.haunted_bell": "UNLOCALIZED: Haunted Bell",
"block.create.honey": "Miel", "block.create.honey": "Miel",
"block.create.horizontal_framed_glass": "Cristal con marco horizontal", "block.create.horizontal_framed_glass": "Cristal con marco horizontal",
"block.create.horizontal_framed_glass_pane": "Panel de cristal con marco horizontal", "block.create.horizontal_framed_glass_pane": "Panel de cristal con marco horizontal",
@ -1194,6 +1194,7 @@
"create.subtitle.blaze_munch": "Blaze mastica felizmente", "create.subtitle.blaze_munch": "Blaze mastica felizmente",
"create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps",
"create.subtitle.schematicannon_finish": "Acabados de Schematicannon", "create.subtitle.schematicannon_finish": "Acabados de Schematicannon",
"create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls",
"create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks",
"create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts",
"create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps",
@ -1204,13 +1205,12 @@
"create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used",
"create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts",
"create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates",
"create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens",
"create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish", "create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish",
"create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.deny": "UNLOCALIZED: Declining boop",
"create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks",
"create.subtitle.schematicannon_launch_block": "Disparos de Schematicannon", "create.subtitle.schematicannon_launch_block": "Disparos de Schematicannon",
"create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks", "create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks",
"create.subtitle.cursed_bell_use": "UNLOCALIZED: Cursed Bell tolls",
"create.subtitle.cursed_bell_convert": "UNLOCALIZED: Cursed Bell awakens",
"create.subtitle.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.controller_take": "UNLOCALIZED: Lectern empties",
"create.subtitle.mechanical_press_activation": "La Prensa Mecánica se activa", "create.subtitle.mechanical_press_activation": "La Prensa Mecánica se activa",
"create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves",
@ -1441,10 +1441,10 @@
"block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL",
"block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...",
"block.create.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL",
"block.create.cursed_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.",
"block.create.cursed_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang",
"block.create.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.",
"_": "->------------------------] Ponder Content [------------------------<-", "_": "->------------------------] Ponder Content [------------------------<-",

View file

@ -73,7 +73,6 @@
"block.create.crushing_wheel": "Rueda Trituradora", "block.create.crushing_wheel": "Rueda Trituradora",
"block.create.crushing_wheel_controller": "UNLOCALIZED:Crushing Wheel Controller", "block.create.crushing_wheel_controller": "UNLOCALIZED:Crushing Wheel Controller",
"block.create.cuckoo_clock": "Reloj Cuco", "block.create.cuckoo_clock": "Reloj Cuco",
"block.create.cursed_bell": "UNLOCALIZED: Cursed Bell",
"block.create.cyan_sail": "Vela Cian", "block.create.cyan_sail": "Vela Cian",
"block.create.cyan_seat": "Asiento Cian", "block.create.cyan_seat": "Asiento Cian",
"block.create.cyan_valve_handle": "Manija de Válvula Cian", "block.create.cyan_valve_handle": "Manija de Válvula Cian",
@ -187,6 +186,7 @@
"block.create.green_seat": "Asiento Verde", "block.create.green_seat": "Asiento Verde",
"block.create.green_valve_handle": "Manija de Válvula Verde", "block.create.green_valve_handle": "Manija de Válvula Verde",
"block.create.hand_crank": "Manivela", "block.create.hand_crank": "Manivela",
"block.create.haunted_bell": "UNLOCALIZED: Haunted Bell",
"block.create.honey": "Miel", "block.create.honey": "Miel",
"block.create.horizontal_framed_glass": "Vidrio Enmarcado Horizontal", "block.create.horizontal_framed_glass": "Vidrio Enmarcado Horizontal",
"block.create.horizontal_framed_glass_pane": "Panel de Vidrio Enmarcado Horizontal", "block.create.horizontal_framed_glass_pane": "Panel de Vidrio Enmarcado Horizontal",
@ -1194,6 +1194,7 @@
"create.subtitle.blaze_munch": "UNLOCALIZED: Blaze Burner munches", "create.subtitle.blaze_munch": "UNLOCALIZED: Blaze Burner munches",
"create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps",
"create.subtitle.schematicannon_finish": "UNLOCALIZED: Schematicannon dings", "create.subtitle.schematicannon_finish": "UNLOCALIZED: Schematicannon dings",
"create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls",
"create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks",
"create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts",
"create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps",
@ -1204,13 +1205,12 @@
"create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used",
"create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts",
"create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates",
"create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens",
"create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish", "create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish",
"create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.deny": "UNLOCALIZED: Declining boop",
"create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks",
"create.subtitle.schematicannon_launch_block": "UNLOCALIZED: Schematicannon fires", "create.subtitle.schematicannon_launch_block": "UNLOCALIZED: Schematicannon fires",
"create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks", "create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks",
"create.subtitle.cursed_bell_use": "UNLOCALIZED: Cursed Bell tolls",
"create.subtitle.cursed_bell_convert": "UNLOCALIZED: Cursed Bell awakens",
"create.subtitle.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.controller_take": "UNLOCALIZED: Lectern empties",
"create.subtitle.mechanical_press_activation": "UNLOCALIZED: Mechanical Press clangs", "create.subtitle.mechanical_press_activation": "UNLOCALIZED: Mechanical Press clangs",
"create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves",
@ -1441,10 +1441,10 @@
"block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL",
"block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...",
"block.create.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL",
"block.create.cursed_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.",
"block.create.cursed_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang",
"block.create.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.",
"_": "->------------------------] Ponder Content [------------------------<-", "_": "->------------------------] Ponder Content [------------------------<-",

View file

@ -73,7 +73,6 @@
"block.create.crushing_wheel": "Roue de concassage", "block.create.crushing_wheel": "Roue de concassage",
"block.create.crushing_wheel_controller": "Contrôleur de roue de concassage", "block.create.crushing_wheel_controller": "Contrôleur de roue de concassage",
"block.create.cuckoo_clock": "Horloge à coucou", "block.create.cuckoo_clock": "Horloge à coucou",
"block.create.cursed_bell": "UNLOCALIZED: Cursed Bell",
"block.create.cyan_sail": "Voile cyan", "block.create.cyan_sail": "Voile cyan",
"block.create.cyan_seat": "Siège cyan", "block.create.cyan_seat": "Siège cyan",
"block.create.cyan_valve_handle": "Vanne cyan", "block.create.cyan_valve_handle": "Vanne cyan",
@ -187,6 +186,7 @@
"block.create.green_seat": "UNLOCALIZED: Green Seat", "block.create.green_seat": "UNLOCALIZED: Green Seat",
"block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle", "block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle",
"block.create.hand_crank": "Manivelle", "block.create.hand_crank": "Manivelle",
"block.create.haunted_bell": "UNLOCALIZED: Haunted Bell",
"block.create.honey": "UNLOCALIZED: Honey", "block.create.honey": "UNLOCALIZED: Honey",
"block.create.horizontal_framed_glass": "Fenêtre en verre horizontale", "block.create.horizontal_framed_glass": "Fenêtre en verre horizontale",
"block.create.horizontal_framed_glass_pane": "Vitre encadrée horizontale", "block.create.horizontal_framed_glass_pane": "Vitre encadrée horizontale",
@ -1194,6 +1194,7 @@
"create.subtitle.blaze_munch": "UNLOCALIZED: Blaze Burner munches", "create.subtitle.blaze_munch": "UNLOCALIZED: Blaze Burner munches",
"create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps",
"create.subtitle.schematicannon_finish": "Fin de schémacanon", "create.subtitle.schematicannon_finish": "Fin de schémacanon",
"create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls",
"create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks",
"create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts",
"create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps",
@ -1204,13 +1205,12 @@
"create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used",
"create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts",
"create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates",
"create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens",
"create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish", "create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish",
"create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.deny": "UNLOCALIZED: Declining boop",
"create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks",
"create.subtitle.schematicannon_launch_block": "Tir de schémacanon", "create.subtitle.schematicannon_launch_block": "Tir de schémacanon",
"create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks", "create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks",
"create.subtitle.cursed_bell_use": "UNLOCALIZED: Cursed Bell tolls",
"create.subtitle.cursed_bell_convert": "UNLOCALIZED: Cursed Bell awakens",
"create.subtitle.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.controller_take": "UNLOCALIZED: Lectern empties",
"create.subtitle.mechanical_press_activation": "Activation de la presse mechanique", "create.subtitle.mechanical_press_activation": "Activation de la presse mechanique",
"create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves",
@ -1441,10 +1441,10 @@
"block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL",
"block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...",
"block.create.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL",
"block.create.cursed_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.",
"block.create.cursed_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang",
"block.create.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.",
"_": "->------------------------] Ponder Content [------------------------<-", "_": "->------------------------] Ponder Content [------------------------<-",

View file

@ -73,7 +73,6 @@
"block.create.crushing_wheel": "Ruota di frantumazione", "block.create.crushing_wheel": "Ruota di frantumazione",
"block.create.crushing_wheel_controller": "Telecomando per ruota di frantumazione", "block.create.crushing_wheel_controller": "Telecomando per ruota di frantumazione",
"block.create.cuckoo_clock": "Orologio a cucù", "block.create.cuckoo_clock": "Orologio a cucù",
"block.create.cursed_bell": "UNLOCALIZED: Cursed Bell",
"block.create.cyan_sail": "Vela ciano", "block.create.cyan_sail": "Vela ciano",
"block.create.cyan_seat": "Sedile ciano", "block.create.cyan_seat": "Sedile ciano",
"block.create.cyan_valve_handle": "Maniglia per valvola ciano", "block.create.cyan_valve_handle": "Maniglia per valvola ciano",
@ -187,6 +186,7 @@
"block.create.green_seat": "Sedile verde", "block.create.green_seat": "Sedile verde",
"block.create.green_valve_handle": "Maniglia per valvola verde", "block.create.green_valve_handle": "Maniglia per valvola verde",
"block.create.hand_crank": "Manovella", "block.create.hand_crank": "Manovella",
"block.create.haunted_bell": "UNLOCALIZED: Haunted Bell",
"block.create.honey": "Miele", "block.create.honey": "Miele",
"block.create.horizontal_framed_glass": "Finestra di vetro orizzontale", "block.create.horizontal_framed_glass": "Finestra di vetro orizzontale",
"block.create.horizontal_framed_glass_pane": "Pannello di finestra di vetro orizzontale", "block.create.horizontal_framed_glass_pane": "Pannello di finestra di vetro orizzontale",
@ -1194,6 +1194,7 @@
"create.subtitle.blaze_munch": "Il blaze lo gusta felicemente", "create.subtitle.blaze_munch": "Il blaze lo gusta felicemente",
"create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps",
"create.subtitle.schematicannon_finish": "Finiture cannoneschematico", "create.subtitle.schematicannon_finish": "Finiture cannoneschematico",
"create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls",
"create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks",
"create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts",
"create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps",
@ -1204,13 +1205,12 @@
"create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used",
"create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts",
"create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates",
"create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens",
"create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish", "create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish",
"create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.deny": "UNLOCALIZED: Declining boop",
"create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks",
"create.subtitle.schematicannon_launch_block": "Tiri del cannoneschematico", "create.subtitle.schematicannon_launch_block": "Tiri del cannoneschematico",
"create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks", "create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks",
"create.subtitle.cursed_bell_use": "UNLOCALIZED: Cursed Bell tolls",
"create.subtitle.cursed_bell_convert": "UNLOCALIZED: Cursed Bell awakens",
"create.subtitle.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.controller_take": "UNLOCALIZED: Lectern empties",
"create.subtitle.mechanical_press_activation": "Pressa meccanica attiva", "create.subtitle.mechanical_press_activation": "Pressa meccanica attiva",
"create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves",
@ -1441,10 +1441,10 @@
"block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL",
"block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...",
"block.create.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL",
"block.create.cursed_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.",
"block.create.cursed_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang",
"block.create.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.",
"_": "->------------------------] Ponder Content [------------------------<-", "_": "->------------------------] Ponder Content [------------------------<-",

View file

@ -73,7 +73,6 @@
"block.create.crushing_wheel": "破砕ホイール", "block.create.crushing_wheel": "破砕ホイール",
"block.create.crushing_wheel_controller": "破砕ホイールコントローラー", "block.create.crushing_wheel_controller": "破砕ホイールコントローラー",
"block.create.cuckoo_clock": "鳩時計", "block.create.cuckoo_clock": "鳩時計",
"block.create.cursed_bell": "UNLOCALIZED: Cursed Bell",
"block.create.cyan_sail": "水色の帆", "block.create.cyan_sail": "水色の帆",
"block.create.cyan_seat": "水色のシート", "block.create.cyan_seat": "水色のシート",
"block.create.cyan_valve_handle": "水色のバルブハンドル", "block.create.cyan_valve_handle": "水色のバルブハンドル",
@ -187,6 +186,7 @@
"block.create.green_seat": "緑色のシート", "block.create.green_seat": "緑色のシート",
"block.create.green_valve_handle": "緑色のバルブハンドル", "block.create.green_valve_handle": "緑色のバルブハンドル",
"block.create.hand_crank": "ハンドクランク", "block.create.hand_crank": "ハンドクランク",
"block.create.haunted_bell": "UNLOCALIZED: Haunted Bell",
"block.create.honey": "ハチミツ", "block.create.honey": "ハチミツ",
"block.create.horizontal_framed_glass": "横型ガラス窓", "block.create.horizontal_framed_glass": "横型ガラス窓",
"block.create.horizontal_framed_glass_pane": "横型ガラス窓板", "block.create.horizontal_framed_glass_pane": "横型ガラス窓板",
@ -1194,6 +1194,7 @@
"create.subtitle.blaze_munch": "ブレイズの咀嚼音", "create.subtitle.blaze_munch": "ブレイズの咀嚼音",
"create.subtitle.funnel_flap": "ファンネルがはためく", "create.subtitle.funnel_flap": "ファンネルがはためく",
"create.subtitle.schematicannon_finish": "概略図砲が作業を終える", "create.subtitle.schematicannon_finish": "概略図砲が作業を終える",
"create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls",
"create.subtitle.scroll_value": "スクロールのカチカチ音", "create.subtitle.scroll_value": "スクロールのカチカチ音",
"create.subtitle.crafter_craft": "メカニカルクラフターがクラフトする", "create.subtitle.crafter_craft": "メカニカルクラフターがクラフトする",
"create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps",
@ -1204,13 +1205,12 @@
"create.subtitle.wrench_rotate": "レンチを使う", "create.subtitle.wrench_rotate": "レンチを使う",
"create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts",
"create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates",
"create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens",
"create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish", "create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish",
"create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.deny": "UNLOCALIZED: Declining boop",
"create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks",
"create.subtitle.schematicannon_launch_block": "概略図砲が発射する", "create.subtitle.schematicannon_launch_block": "概略図砲が発射する",
"create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks", "create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks",
"create.subtitle.cursed_bell_use": "UNLOCALIZED: Cursed Bell tolls",
"create.subtitle.cursed_bell_convert": "UNLOCALIZED: Cursed Bell awakens",
"create.subtitle.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.controller_take": "UNLOCALIZED: Lectern empties",
"create.subtitle.mechanical_press_activation": "メカニカルプレスがガーンと鳴る", "create.subtitle.mechanical_press_activation": "メカニカルプレスがガーンと鳴る",
"create.subtitle.contraption_assemble": "からくりが動く", "create.subtitle.contraption_assemble": "からくりが動く",
@ -1441,10 +1441,10 @@
"block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL",
"block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...",
"block.create.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL",
"block.create.cursed_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.",
"block.create.cursed_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang",
"block.create.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.",
"_": "->------------------------] Ponder Content [------------------------<-", "_": "->------------------------] Ponder Content [------------------------<-",

View file

@ -73,7 +73,6 @@
"block.create.crushing_wheel": "분쇄 휠", "block.create.crushing_wheel": "분쇄 휠",
"block.create.crushing_wheel_controller": "분쇄 휠 컨트롤러", "block.create.crushing_wheel_controller": "분쇄 휠 컨트롤러",
"block.create.cuckoo_clock": "뻐꾸기 시계", "block.create.cuckoo_clock": "뻐꾸기 시계",
"block.create.cursed_bell": "UNLOCALIZED: Cursed Bell",
"block.create.cyan_sail": "청록색 날개", "block.create.cyan_sail": "청록색 날개",
"block.create.cyan_seat": "청록색 좌석", "block.create.cyan_seat": "청록색 좌석",
"block.create.cyan_valve_handle": "청록색 밸브 손잡이", "block.create.cyan_valve_handle": "청록색 밸브 손잡이",
@ -187,6 +186,7 @@
"block.create.green_seat": "초록색 좌석", "block.create.green_seat": "초록색 좌석",
"block.create.green_valve_handle": "초록색 밸브 손잡이", "block.create.green_valve_handle": "초록색 밸브 손잡이",
"block.create.hand_crank": "핸드 크랭크", "block.create.hand_crank": "핸드 크랭크",
"block.create.haunted_bell": "UNLOCALIZED: Haunted Bell",
"block.create.honey": "꿀", "block.create.honey": "꿀",
"block.create.horizontal_framed_glass": "수평 유리", "block.create.horizontal_framed_glass": "수평 유리",
"block.create.horizontal_framed_glass_pane": "수평 유리판", "block.create.horizontal_framed_glass_pane": "수평 유리판",
@ -1194,6 +1194,7 @@
"create.subtitle.blaze_munch": "블레이즈가 행복하게 섭취함", "create.subtitle.blaze_munch": "블레이즈가 행복하게 섭취함",
"create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps",
"create.subtitle.schematicannon_finish": "청사진 대포가 끝남", "create.subtitle.schematicannon_finish": "청사진 대포가 끝남",
"create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls",
"create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks",
"create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts",
"create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps",
@ -1204,13 +1205,12 @@
"create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used",
"create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts",
"create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates",
"create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens",
"create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish", "create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish",
"create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.deny": "UNLOCALIZED: Declining boop",
"create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks",
"create.subtitle.schematicannon_launch_block": "청사진 대포가 발포함", "create.subtitle.schematicannon_launch_block": "청사진 대포가 발포함",
"create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks", "create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks",
"create.subtitle.cursed_bell_use": "UNLOCALIZED: Cursed Bell tolls",
"create.subtitle.cursed_bell_convert": "UNLOCALIZED: Cursed Bell awakens",
"create.subtitle.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.controller_take": "UNLOCALIZED: Lectern empties",
"create.subtitle.mechanical_press_activation": "압착기가 가동됨", "create.subtitle.mechanical_press_activation": "압착기가 가동됨",
"create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves",
@ -1441,10 +1441,10 @@
"block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL",
"block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...",
"block.create.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL",
"block.create.cursed_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.",
"block.create.cursed_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang",
"block.create.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.",
"_": "->------------------------] Ponder Content [------------------------<-", "_": "->------------------------] Ponder Content [------------------------<-",

View file

@ -73,7 +73,6 @@
"block.create.crushing_wheel": "Verpulveraar", "block.create.crushing_wheel": "Verpulveraar",
"block.create.crushing_wheel_controller": "UNLOCALIZED: Crushing Wheel Controller", "block.create.crushing_wheel_controller": "UNLOCALIZED: Crushing Wheel Controller",
"block.create.cuckoo_clock": "UNLOCALIZED: Cuckoo Clock", "block.create.cuckoo_clock": "UNLOCALIZED: Cuckoo Clock",
"block.create.cursed_bell": "UNLOCALIZED: Cursed Bell",
"block.create.cyan_sail": "UNLOCALIZED: Cyan Sail", "block.create.cyan_sail": "UNLOCALIZED: Cyan Sail",
"block.create.cyan_seat": "UNLOCALIZED: Cyan Seat", "block.create.cyan_seat": "UNLOCALIZED: Cyan Seat",
"block.create.cyan_valve_handle": "UNLOCALIZED: Cyan Valve Handle", "block.create.cyan_valve_handle": "UNLOCALIZED: Cyan Valve Handle",
@ -187,6 +186,7 @@
"block.create.green_seat": "UNLOCALIZED: Green Seat", "block.create.green_seat": "UNLOCALIZED: Green Seat",
"block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle", "block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle",
"block.create.hand_crank": "UNLOCALIZED: Hand Crank", "block.create.hand_crank": "UNLOCALIZED: Hand Crank",
"block.create.haunted_bell": "UNLOCALIZED: Haunted Bell",
"block.create.honey": "UNLOCALIZED: Honey", "block.create.honey": "UNLOCALIZED: Honey",
"block.create.horizontal_framed_glass": "UNLOCALIZED: Horizontal Framed Glass", "block.create.horizontal_framed_glass": "UNLOCALIZED: Horizontal Framed Glass",
"block.create.horizontal_framed_glass_pane": "UNLOCALIZED: Horizontal Framed Glass Pane", "block.create.horizontal_framed_glass_pane": "UNLOCALIZED: Horizontal Framed Glass Pane",
@ -1194,6 +1194,7 @@
"create.subtitle.blaze_munch": "UNLOCALIZED: Blaze Burner munches", "create.subtitle.blaze_munch": "UNLOCALIZED: Blaze Burner munches",
"create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps",
"create.subtitle.schematicannon_finish": "UNLOCALIZED: Schematicannon dings", "create.subtitle.schematicannon_finish": "UNLOCALIZED: Schematicannon dings",
"create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls",
"create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks",
"create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts",
"create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps",
@ -1204,13 +1205,12 @@
"create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used",
"create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts",
"create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates",
"create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens",
"create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish", "create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish",
"create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.deny": "UNLOCALIZED: Declining boop",
"create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks",
"create.subtitle.schematicannon_launch_block": "UNLOCALIZED: Schematicannon fires", "create.subtitle.schematicannon_launch_block": "UNLOCALIZED: Schematicannon fires",
"create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks", "create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks",
"create.subtitle.cursed_bell_use": "UNLOCALIZED: Cursed Bell tolls",
"create.subtitle.cursed_bell_convert": "UNLOCALIZED: Cursed Bell awakens",
"create.subtitle.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.controller_take": "UNLOCALIZED: Lectern empties",
"create.subtitle.mechanical_press_activation": "UNLOCALIZED: Mechanical Press clangs", "create.subtitle.mechanical_press_activation": "UNLOCALIZED: Mechanical Press clangs",
"create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves",
@ -1441,10 +1441,10 @@
"block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL",
"block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...",
"block.create.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL",
"block.create.cursed_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.",
"block.create.cursed_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang",
"block.create.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.",
"_": "->------------------------] Ponder Content [------------------------<-", "_": "->------------------------] Ponder Content [------------------------<-",

View file

@ -73,7 +73,6 @@
"block.create.crushing_wheel": "Koło kruszące", "block.create.crushing_wheel": "Koło kruszące",
"block.create.crushing_wheel_controller": "Sterownik koła kruszącego", "block.create.crushing_wheel_controller": "Sterownik koła kruszącego",
"block.create.cuckoo_clock": "Zegar z kukułką", "block.create.cuckoo_clock": "Zegar z kukułką",
"block.create.cursed_bell": "UNLOCALIZED: Cursed Bell",
"block.create.cyan_sail": "Błękitny żagiel", "block.create.cyan_sail": "Błękitny żagiel",
"block.create.cyan_seat": "Błękitne siedzenie", "block.create.cyan_seat": "Błękitne siedzenie",
"block.create.cyan_valve_handle": "Błękitne pokrętło", "block.create.cyan_valve_handle": "Błękitne pokrętło",
@ -187,6 +186,7 @@
"block.create.green_seat": "Zielone siedzenie", "block.create.green_seat": "Zielone siedzenie",
"block.create.green_valve_handle": "Zielone pokrętło", "block.create.green_valve_handle": "Zielone pokrętło",
"block.create.hand_crank": "Ręczna korba", "block.create.hand_crank": "Ręczna korba",
"block.create.haunted_bell": "UNLOCALIZED: Haunted Bell",
"block.create.honey": "Miód", "block.create.honey": "Miód",
"block.create.horizontal_framed_glass": "Poziome oprawione szkło", "block.create.horizontal_framed_glass": "Poziome oprawione szkło",
"block.create.horizontal_framed_glass_pane": "Pozioma oprawiona szyba", "block.create.horizontal_framed_glass_pane": "Pozioma oprawiona szyba",
@ -1194,6 +1194,7 @@
"create.subtitle.blaze_munch": "Płomyk szczęśliwie przeżuwa", "create.subtitle.blaze_munch": "Płomyk szczęśliwie przeżuwa",
"create.subtitle.funnel_flap": "Lejek trzepocze", "create.subtitle.funnel_flap": "Lejek trzepocze",
"create.subtitle.schematicannon_finish": "Schematoarmata skończyła", "create.subtitle.schematicannon_finish": "Schematoarmata skończyła",
"create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls",
"create.subtitle.scroll_value": "Kliknięcie", "create.subtitle.scroll_value": "Kliknięcie",
"create.subtitle.crafter_craft": "Mechaniczny stół rzemieślniczy konstruuje", "create.subtitle.crafter_craft": "Mechaniczny stół rzemieślniczy konstruuje",
"create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps",
@ -1204,13 +1205,12 @@
"create.subtitle.wrench_rotate": "Klucz skrzypi", "create.subtitle.wrench_rotate": "Klucz skrzypi",
"create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts",
"create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates",
"create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens",
"create.subtitle.deployer_polish": "Aplikator poleruje", "create.subtitle.deployer_polish": "Aplikator poleruje",
"create.subtitle.deny": "Dźwięk odmowy", "create.subtitle.deny": "Dźwięk odmowy",
"create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks",
"create.subtitle.schematicannon_launch_block": "Schematoarmata strzela", "create.subtitle.schematicannon_launch_block": "Schematoarmata strzela",
"create.subtitle.copper_armor_equip": "Sprzęt do nurkowania pobrzękuje", "create.subtitle.copper_armor_equip": "Sprzęt do nurkowania pobrzękuje",
"create.subtitle.cursed_bell_use": "UNLOCALIZED: Cursed Bell tolls",
"create.subtitle.cursed_bell_convert": "UNLOCALIZED: Cursed Bell awakens",
"create.subtitle.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.controller_take": "UNLOCALIZED: Lectern empties",
"create.subtitle.mechanical_press_activation": "Mechaniczna prasa się uruchamia", "create.subtitle.mechanical_press_activation": "Mechaniczna prasa się uruchamia",
"create.subtitle.contraption_assemble": "Maszyna przesuwa się", "create.subtitle.contraption_assemble": "Maszyna przesuwa się",
@ -1441,10 +1441,10 @@
"block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL",
"block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...",
"block.create.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL",
"block.create.cursed_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.",
"block.create.cursed_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang",
"block.create.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.",
"_": "->------------------------] Ponder Content [------------------------<-", "_": "->------------------------] Ponder Content [------------------------<-",

View file

@ -73,7 +73,6 @@
"block.create.crushing_wheel": "Roda de Moer", "block.create.crushing_wheel": "Roda de Moer",
"block.create.crushing_wheel_controller": "UNLOCALIZED: Crushing Wheel Controller", "block.create.crushing_wheel_controller": "UNLOCALIZED: Crushing Wheel Controller",
"block.create.cuckoo_clock": "UNLOCALIZED: Cuckoo Clock", "block.create.cuckoo_clock": "UNLOCALIZED: Cuckoo Clock",
"block.create.cursed_bell": "UNLOCALIZED: Cursed Bell",
"block.create.cyan_sail": "UNLOCALIZED: Cyan Sail", "block.create.cyan_sail": "UNLOCALIZED: Cyan Sail",
"block.create.cyan_seat": "UNLOCALIZED: Cyan Seat", "block.create.cyan_seat": "UNLOCALIZED: Cyan Seat",
"block.create.cyan_valve_handle": "UNLOCALIZED: Cyan Valve Handle", "block.create.cyan_valve_handle": "UNLOCALIZED: Cyan Valve Handle",
@ -187,6 +186,7 @@
"block.create.green_seat": "UNLOCALIZED: Green Seat", "block.create.green_seat": "UNLOCALIZED: Green Seat",
"block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle", "block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle",
"block.create.hand_crank": "UNLOCALIZED: Hand Crank", "block.create.hand_crank": "UNLOCALIZED: Hand Crank",
"block.create.haunted_bell": "UNLOCALIZED: Haunted Bell",
"block.create.honey": "UNLOCALIZED: Honey", "block.create.honey": "UNLOCALIZED: Honey",
"block.create.horizontal_framed_glass": "UNLOCALIZED: Horizontal Framed Glass", "block.create.horizontal_framed_glass": "UNLOCALIZED: Horizontal Framed Glass",
"block.create.horizontal_framed_glass_pane": "UNLOCALIZED: Horizontal Framed Glass Pane", "block.create.horizontal_framed_glass_pane": "UNLOCALIZED: Horizontal Framed Glass Pane",
@ -1194,6 +1194,7 @@
"create.subtitle.blaze_munch": "UNLOCALIZED: Blaze Burner munches", "create.subtitle.blaze_munch": "UNLOCALIZED: Blaze Burner munches",
"create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps",
"create.subtitle.schematicannon_finish": "UNLOCALIZED: Schematicannon dings", "create.subtitle.schematicannon_finish": "UNLOCALIZED: Schematicannon dings",
"create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls",
"create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks",
"create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts",
"create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps",
@ -1204,13 +1205,12 @@
"create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used",
"create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts",
"create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates",
"create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens",
"create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish", "create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish",
"create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.deny": "UNLOCALIZED: Declining boop",
"create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks",
"create.subtitle.schematicannon_launch_block": "UNLOCALIZED: Schematicannon fires", "create.subtitle.schematicannon_launch_block": "UNLOCALIZED: Schematicannon fires",
"create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks", "create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks",
"create.subtitle.cursed_bell_use": "UNLOCALIZED: Cursed Bell tolls",
"create.subtitle.cursed_bell_convert": "UNLOCALIZED: Cursed Bell awakens",
"create.subtitle.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.controller_take": "UNLOCALIZED: Lectern empties",
"create.subtitle.mechanical_press_activation": "UNLOCALIZED: Mechanical Press clangs", "create.subtitle.mechanical_press_activation": "UNLOCALIZED: Mechanical Press clangs",
"create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves",
@ -1441,10 +1441,10 @@
"block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL",
"block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...",
"block.create.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL",
"block.create.cursed_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.",
"block.create.cursed_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang",
"block.create.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.",
"_": "->------------------------] Ponder Content [------------------------<-", "_": "->------------------------] Ponder Content [------------------------<-",

View file

@ -73,7 +73,6 @@
"block.create.crushing_wheel": "Колесо дробления", "block.create.crushing_wheel": "Колесо дробления",
"block.create.crushing_wheel_controller": "Контроллер колеса дробления", "block.create.crushing_wheel_controller": "Контроллер колеса дробления",
"block.create.cuckoo_clock": "Часы с кукушкой", "block.create.cuckoo_clock": "Часы с кукушкой",
"block.create.cursed_bell": "UNLOCALIZED: Cursed Bell",
"block.create.cyan_sail": "Бирюзовый парус", "block.create.cyan_sail": "Бирюзовый парус",
"block.create.cyan_seat": "Бирюзовое сииденье", "block.create.cyan_seat": "Бирюзовое сииденье",
"block.create.cyan_valve_handle": "Бирюзовый ручной вентиль", "block.create.cyan_valve_handle": "Бирюзовый ручной вентиль",
@ -187,6 +186,7 @@
"block.create.green_seat": "Зелёное сиденье", "block.create.green_seat": "Зелёное сиденье",
"block.create.green_valve_handle": "Зелёный ручной вентиль", "block.create.green_valve_handle": "Зелёный ручной вентиль",
"block.create.hand_crank": "Рукоятка", "block.create.hand_crank": "Рукоятка",
"block.create.haunted_bell": "UNLOCALIZED: Haunted Bell",
"block.create.honey": "Мёд", "block.create.honey": "Мёд",
"block.create.horizontal_framed_glass": "Горизонтальное обрамлённое стекло", "block.create.horizontal_framed_glass": "Горизонтальное обрамлённое стекло",
"block.create.horizontal_framed_glass_pane": "Горизонтальная обрамлённая стеклянная панель", "block.create.horizontal_framed_glass_pane": "Горизонтальная обрамлённая стеклянная панель",
@ -1194,6 +1194,7 @@
"create.subtitle.blaze_munch": "Всполох радостно жуёт", "create.subtitle.blaze_munch": "Всполох радостно жуёт",
"create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps",
"create.subtitle.schematicannon_finish": "Схематичная пушка закончила работу", "create.subtitle.schematicannon_finish": "Схематичная пушка закончила работу",
"create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls",
"create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks",
"create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts",
"create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps",
@ -1204,13 +1205,12 @@
"create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used",
"create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts",
"create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates",
"create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens",
"create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish", "create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish",
"create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.deny": "UNLOCALIZED: Declining boop",
"create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks",
"create.subtitle.schematicannon_launch_block": "Выстрелы схематичной пушки", "create.subtitle.schematicannon_launch_block": "Выстрелы схематичной пушки",
"create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks", "create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks",
"create.subtitle.cursed_bell_use": "UNLOCALIZED: Cursed Bell tolls",
"create.subtitle.cursed_bell_convert": "UNLOCALIZED: Cursed Bell awakens",
"create.subtitle.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.controller_take": "UNLOCALIZED: Lectern empties",
"create.subtitle.mechanical_press_activation": "Механический пресс активирован", "create.subtitle.mechanical_press_activation": "Механический пресс активирован",
"create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves",
@ -1441,10 +1441,10 @@
"block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL",
"block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...",
"block.create.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL",
"block.create.cursed_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.",
"block.create.cursed_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang",
"block.create.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.",
"_": "->------------------------] Ponder Content [------------------------<-", "_": "->------------------------] Ponder Content [------------------------<-",

View file

@ -73,7 +73,6 @@
"block.create.crushing_wheel": "粉碎轮", "block.create.crushing_wheel": "粉碎轮",
"block.create.crushing_wheel_controller": "粉碎轮控制器", "block.create.crushing_wheel_controller": "粉碎轮控制器",
"block.create.cuckoo_clock": "布谷鸟闹钟", "block.create.cuckoo_clock": "布谷鸟闹钟",
"block.create.cursed_bell": "UNLOCALIZED: Cursed Bell",
"block.create.cyan_sail": "青色风帆", "block.create.cyan_sail": "青色风帆",
"block.create.cyan_seat": "青色坐垫", "block.create.cyan_seat": "青色坐垫",
"block.create.cyan_valve_handle": "青色阀门手轮", "block.create.cyan_valve_handle": "青色阀门手轮",
@ -187,6 +186,7 @@
"block.create.green_seat": "绿色坐垫", "block.create.green_seat": "绿色坐垫",
"block.create.green_valve_handle": "绿色阀门手轮", "block.create.green_valve_handle": "绿色阀门手轮",
"block.create.hand_crank": "手摇曲柄", "block.create.hand_crank": "手摇曲柄",
"block.create.haunted_bell": "UNLOCALIZED: Haunted Bell",
"block.create.honey": "蜂蜜", "block.create.honey": "蜂蜜",
"block.create.horizontal_framed_glass": "竖直边框玻璃", "block.create.horizontal_framed_glass": "竖直边框玻璃",
"block.create.horizontal_framed_glass_pane": "竖直边框玻璃板", "block.create.horizontal_framed_glass_pane": "竖直边框玻璃板",
@ -1194,6 +1194,7 @@
"create.subtitle.blaze_munch": "烈焰人:咀嚼", "create.subtitle.blaze_munch": "烈焰人:咀嚼",
"create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps",
"create.subtitle.schematicannon_finish": "蓝图加农炮:叮", "create.subtitle.schematicannon_finish": "蓝图加农炮:叮",
"create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls",
"create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks",
"create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts",
"create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps",
@ -1204,13 +1205,12 @@
"create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used",
"create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts",
"create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates",
"create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens",
"create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish", "create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish",
"create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.deny": "UNLOCALIZED: Declining boop",
"create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks",
"create.subtitle.schematicannon_launch_block": "蓝图加农炮:发射", "create.subtitle.schematicannon_launch_block": "蓝图加农炮:发射",
"create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks", "create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks",
"create.subtitle.cursed_bell_use": "UNLOCALIZED: Cursed Bell tolls",
"create.subtitle.cursed_bell_convert": "UNLOCALIZED: Cursed Bell awakens",
"create.subtitle.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.controller_take": "UNLOCALIZED: Lectern empties",
"create.subtitle.mechanical_press_activation": "辊压机:工作中", "create.subtitle.mechanical_press_activation": "辊压机:工作中",
"create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves",
@ -1441,10 +1441,10 @@
"block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL",
"block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...",
"block.create.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL",
"block.create.cursed_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.",
"block.create.cursed_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang",
"block.create.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.",
"_": "->------------------------] Ponder Content [------------------------<-", "_": "->------------------------] Ponder Content [------------------------<-",

View file

@ -73,7 +73,6 @@
"block.create.crushing_wheel": "粉碎輪", "block.create.crushing_wheel": "粉碎輪",
"block.create.crushing_wheel_controller": "粉碎輪控制器", "block.create.crushing_wheel_controller": "粉碎輪控制器",
"block.create.cuckoo_clock": "布穀鳥鐘", "block.create.cuckoo_clock": "布穀鳥鐘",
"block.create.cursed_bell": "UNLOCALIZED: Cursed Bell",
"block.create.cyan_sail": "藍綠色風帆", "block.create.cyan_sail": "藍綠色風帆",
"block.create.cyan_seat": "藍綠色坐墊", "block.create.cyan_seat": "藍綠色坐墊",
"block.create.cyan_valve_handle": "藍綠色閥門開關", "block.create.cyan_valve_handle": "藍綠色閥門開關",
@ -187,6 +186,7 @@
"block.create.green_seat": "綠色坐墊", "block.create.green_seat": "綠色坐墊",
"block.create.green_valve_handle": "綠色閥門開關", "block.create.green_valve_handle": "綠色閥門開關",
"block.create.hand_crank": "手搖把手", "block.create.hand_crank": "手搖把手",
"block.create.haunted_bell": "UNLOCALIZED: Haunted Bell",
"block.create.honey": "蜂蜜", "block.create.honey": "蜂蜜",
"block.create.horizontal_framed_glass": "豎直邊框玻璃", "block.create.horizontal_framed_glass": "豎直邊框玻璃",
"block.create.horizontal_framed_glass_pane": "豎直邊框玻璃片", "block.create.horizontal_framed_glass_pane": "豎直邊框玻璃片",
@ -1194,6 +1194,7 @@
"create.subtitle.blaze_munch": "烈焰使者開心地吃著", "create.subtitle.blaze_munch": "烈焰使者開心地吃著",
"create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps",
"create.subtitle.schematicannon_finish": "藍圖大炮完成任務", "create.subtitle.schematicannon_finish": "藍圖大炮完成任務",
"create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls",
"create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks",
"create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts",
"create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps",
@ -1204,13 +1205,12 @@
"create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used",
"create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts",
"create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates",
"create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens",
"create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish", "create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish",
"create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.deny": "UNLOCALIZED: Declining boop",
"create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks",
"create.subtitle.schematicannon_launch_block": "藍圖大炮發射", "create.subtitle.schematicannon_launch_block": "藍圖大炮發射",
"create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks", "create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks",
"create.subtitle.cursed_bell_use": "UNLOCALIZED: Cursed Bell tolls",
"create.subtitle.cursed_bell_convert": "UNLOCALIZED: Cursed Bell awakens",
"create.subtitle.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.controller_take": "UNLOCALIZED: Lectern empties",
"create.subtitle.mechanical_press_activation": "液壓機工作", "create.subtitle.mechanical_press_activation": "液壓機工作",
"create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves",
@ -1441,10 +1441,10 @@
"block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL",
"block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...",
"block.create.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL",
"block.create.cursed_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.",
"block.create.cursed_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang",
"block.create.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.",
"_": "->------------------------] Ponder Content [------------------------<-", "_": "->------------------------] Ponder Content [------------------------<-",

View file

@ -1,3 +0,0 @@
{
"parent": "create:block/cursed_bell/item"
}

View file

@ -0,0 +1,3 @@
{
"parent": "create:block/haunted_bell/item"
}

View file

@ -128,18 +128,6 @@
} }
] ]
}, },
"cursed_bell_convert": {
"sounds": [
"create:cursed_bell_convert"
],
"subtitle": "create.subtitle.cursed_bell_convert"
},
"cursed_bell_use": {
"sounds": [
"create:cursed_bell_use"
],
"subtitle": "create.subtitle.cursed_bell_use"
},
"deny": { "deny": {
"sounds": [ "sounds": [
{ {
@ -199,6 +187,18 @@
], ],
"subtitle": "create.subtitle.fwoomp" "subtitle": "create.subtitle.fwoomp"
}, },
"haunted_bell_convert": {
"sounds": [
"create:haunted_bell_convert"
],
"subtitle": "create.subtitle.haunted_bell_convert"
},
"haunted_bell_use": {
"sounds": [
"create:haunted_bell_use"
],
"subtitle": "create.subtitle.haunted_bell_use"
},
"mechanical_press_activation": { "mechanical_press_activation": {
"sounds": [ "sounds": [
{ {

View file

@ -6,7 +6,7 @@
"entries": [ "entries": [
{ {
"type": "minecraft:item", "type": "minecraft:item",
"name": "create:cursed_bell" "name": "create:haunted_bell"
} }
], ],
"conditions": [ "conditions": [

View file

@ -25,7 +25,7 @@
"create:furnace_engine", "create:furnace_engine",
"create:redstone_link", "create:redstone_link",
"create:peculiar_bell", "create:peculiar_bell",
"create:cursed_bell", "create:haunted_bell",
"#minecraft:doors", "#minecraft:doors",
"#minecraft:beds", "#minecraft:beds",
"minecraft:flower_pot", "minecraft:flower_pot",

View file

@ -5,6 +5,8 @@
"create:lit_blaze_burner", "create:lit_blaze_burner",
"create:sail_frame", "create:sail_frame",
"#minecraft:fences", "#minecraft:fences",
"minecraft:iron_bars" "minecraft:iron_bars",
"minecraft:campfire",
"minecraft:soul_campfire"
] ]
} }

View file

@ -94,7 +94,7 @@ public class AllBlockPartials {
SPOUT_TOP = get("spout/top"), SPOUT_MIDDLE = get("spout/middle"), SPOUT_BOTTOM = get("spout/bottom"), SPOUT_TOP = get("spout/top"), SPOUT_MIDDLE = get("spout/middle"), SPOUT_BOTTOM = get("spout/bottom"),
PECULIAR_BELL = get("peculiar_bell/bell"), PECULIAR_BELL = get("peculiar_bell/bell"),
CURSED_BELL = get("cursed_bell/bell"), HAUNTED_BELL = get("haunted_bell/bell"),
SPEED_CONTROLLER_BRACKET = get("rotation_speed_controller/bracket"), SPEED_CONTROLLER_BRACKET = get("rotation_speed_controller/bracket"),

View file

@ -115,8 +115,8 @@ import com.simibubi.create.content.contraptions.relays.gauge.GaugeBlock;
import com.simibubi.create.content.contraptions.relays.gauge.GaugeGenerator; import com.simibubi.create.content.contraptions.relays.gauge.GaugeGenerator;
import com.simibubi.create.content.contraptions.relays.gearbox.GearboxBlock; import com.simibubi.create.content.contraptions.relays.gearbox.GearboxBlock;
import com.simibubi.create.content.curiosities.armor.CopperBacktankBlock; import com.simibubi.create.content.curiosities.armor.CopperBacktankBlock;
import com.simibubi.create.content.curiosities.bell.CursedBellBlock; import com.simibubi.create.content.curiosities.bell.HauntedBellBlock;
import com.simibubi.create.content.curiosities.bell.CursedBellMovementBehaviour; import com.simibubi.create.content.curiosities.bell.HauntedBellMovementBehaviour;
import com.simibubi.create.content.curiosities.bell.PeculiarBellBlock; import com.simibubi.create.content.curiosities.bell.PeculiarBellBlock;
import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock; import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock;
import com.simibubi.create.content.logistics.block.belts.tunnel.BrassTunnelBlock; import com.simibubi.create.content.logistics.block.belts.tunnel.BrassTunnelBlock;
@ -1320,10 +1320,10 @@ public class AllBlocks {
.onRegister(addMovementBehaviour(new BellMovementBehaviour())) .onRegister(addMovementBehaviour(new BellMovementBehaviour()))
.register(); .register();
public static final BlockEntry<CursedBellBlock> CURSED_BELL = public static final BlockEntry<HauntedBellBlock> HAUNTED_BELL =
REGISTRATE.block("cursed_bell", CursedBellBlock::new) REGISTRATE.block("haunted_bell", HauntedBellBlock::new)
.transform(BuilderTransformers.bell()) .transform(BuilderTransformers.bell())
.onRegister(addMovementBehaviour(new CursedBellMovementBehaviour())) .onRegister(addMovementBehaviour(new HauntedBellMovementBehaviour()))
.register(); .register();
// Materials // Materials

View file

@ -47,7 +47,7 @@ public class AllEntityTypes {
public static final EntityEntry<PotatoProjectileEntity> POTATO_PROJECTILE = public static final EntityEntry<PotatoProjectileEntity> POTATO_PROJECTILE =
register("potato_projectile", PotatoProjectileEntity::new, () -> PotatoProjectileRenderer::new, register("potato_projectile", PotatoProjectileEntity::new, () -> PotatoProjectileRenderer::new,
EntityClassification.MISC, 4, 20, true, true, PotatoProjectileEntity::build).register(); EntityClassification.MISC, 4, 20, true, false, PotatoProjectileEntity::build).register();
public static final EntityEntry<SeatEntity> SEAT = register("seat", SeatEntity::new, () -> SeatEntity.Render::new, public static final EntityEntry<SeatEntity> SEAT = register("seat", SeatEntity::new, () -> SeatEntity.Render::new,
EntityClassification.MISC, 0, Integer.MAX_VALUE, false, true, SeatEntity::build).register(); EntityClassification.MISC, 0, Integer.MAX_VALUE, false, true, SeatEntity::build).register();

View file

@ -204,11 +204,11 @@ public class AllSoundEvents {
.category(SoundCategory.BLOCKS) .category(SoundCategory.BLOCKS)
.build(), .build(),
CURSED_BELL_CONVERT = create("cursed_bell_convert").subtitle("Cursed Bell awakens") HAUNTED_BELL_CONVERT = create("haunted_bell_convert").subtitle("Haunted Bell awakens")
.category(SoundCategory.BLOCKS) .category(SoundCategory.BLOCKS)
.build(), .build(),
CURSED_BELL_USE = create("cursed_bell_use").subtitle("Cursed Bell tolls") HAUNTED_BELL_USE = create("haunted_bell_use").subtitle("Haunted Bell tolls")
.category(SoundCategory.BLOCKS) .category(SoundCategory.BLOCKS)
.build(); .build();

View file

@ -215,7 +215,7 @@ public class AllTags {
AllBlockTags.BRITTLE.add(Blocks.FLOWER_POT, Blocks.BELL, Blocks.COCOA); AllBlockTags.BRITTLE.add(Blocks.FLOWER_POT, Blocks.BELL, Blocks.COCOA);
AllBlockTags.FAN_TRANSPARENT.includeAll(BlockTags.FENCES); AllBlockTags.FAN_TRANSPARENT.includeAll(BlockTags.FENCES);
AllBlockTags.FAN_TRANSPARENT.add(Blocks.IRON_BARS); AllBlockTags.FAN_TRANSPARENT.add(Blocks.IRON_BARS, Blocks.CAMPFIRE, Blocks.SOUL_CAMPFIRE);
AllBlockTags.FAN_HEATERS.add(Blocks.MAGMA_BLOCK, Blocks.CAMPFIRE, Blocks.LAVA, Blocks.FIRE, Blocks.SOUL_FIRE, AllBlockTags.FAN_HEATERS.add(Blocks.MAGMA_BLOCK, Blocks.CAMPFIRE, Blocks.LAVA, Blocks.FIRE, Blocks.SOUL_FIRE,
Blocks.SOUL_CAMPFIRE); Blocks.SOUL_CAMPFIRE);

View file

@ -120,7 +120,7 @@ import com.simibubi.create.content.curiosities.armor.CopperBacktankInstance;
import com.simibubi.create.content.curiosities.armor.CopperBacktankRenderer; import com.simibubi.create.content.curiosities.armor.CopperBacktankRenderer;
import com.simibubi.create.content.curiosities.armor.CopperBacktankTileEntity; import com.simibubi.create.content.curiosities.armor.CopperBacktankTileEntity;
import com.simibubi.create.content.curiosities.bell.BellRenderer; import com.simibubi.create.content.curiosities.bell.BellRenderer;
import com.simibubi.create.content.curiosities.bell.CursedBellTileEntity; import com.simibubi.create.content.curiosities.bell.HauntedBellTileEntity;
import com.simibubi.create.content.curiosities.bell.PeculiarBellTileEntity; import com.simibubi.create.content.curiosities.bell.PeculiarBellTileEntity;
import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelInstance; import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelInstance;
import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelRenderer; import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelRenderer;
@ -683,9 +683,9 @@ public class AllTileEntities {
.renderer(() -> BellRenderer::new) .renderer(() -> BellRenderer::new)
.register(); .register();
public static final TileEntityEntry<CursedBellTileEntity> CURSED_BELL = Create.registrate() public static final TileEntityEntry<HauntedBellTileEntity> HAUNTED_BELL = Create.registrate()
.tileEntity("cursed_bell", CursedBellTileEntity::new) .tileEntity("cursed_bell", HauntedBellTileEntity::new)
.validBlocks(AllBlocks.CURSED_BELL) .validBlocks(AllBlocks.HAUNTED_BELL)
.renderer(() -> BellRenderer::new) .renderer(() -> BellRenderer::new)
.register(); .register();

View file

@ -23,7 +23,7 @@ public class MysteriousItemConversionCategory extends CreateRecipeCategory<Conve
recipes.add(ConversionRecipe.create(AllItems.EMPTY_BLAZE_BURNER.asStack(), AllBlocks.BLAZE_BURNER.asStack())); recipes.add(ConversionRecipe.create(AllItems.EMPTY_BLAZE_BURNER.asStack(), AllBlocks.BLAZE_BURNER.asStack()));
recipes.add(ConversionRecipe.create(AllItems.CHROMATIC_COMPOUND.asStack(), AllItems.SHADOW_STEEL.asStack())); recipes.add(ConversionRecipe.create(AllItems.CHROMATIC_COMPOUND.asStack(), AllItems.SHADOW_STEEL.asStack()));
recipes.add(ConversionRecipe.create(AllItems.CHROMATIC_COMPOUND.asStack(), AllItems.REFINED_RADIANCE.asStack())); recipes.add(ConversionRecipe.create(AllItems.CHROMATIC_COMPOUND.asStack(), AllItems.REFINED_RADIANCE.asStack()));
recipes.add(ConversionRecipe.create(AllBlocks.PECULIAR_BELL.asStack(), AllBlocks.CURSED_BELL.asStack())); recipes.add(ConversionRecipe.create(AllBlocks.PECULIAR_BELL.asStack(), AllBlocks.HAUNTED_BELL.asStack()));
return recipes; return recipes;
} }

View file

@ -16,6 +16,7 @@ import com.simibubi.create.foundation.utility.BlockFace;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.FlowingFluidBlock; import net.minecraft.block.FlowingFluidBlock;
import net.minecraft.entity.LivingEntity; import net.minecraft.entity.LivingEntity;
import net.minecraft.fluid.Fluid;
import net.minecraft.fluid.FluidState; import net.minecraft.fluid.FluidState;
import net.minecraft.fluid.Fluids; import net.minecraft.fluid.Fluids;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -31,6 +32,7 @@ import net.minecraft.util.SoundEvents;
import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.Tags;
import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler;
@ -139,7 +141,9 @@ public class OpenEndedPipe extends FlowSource {
if (simulate) if (simulate)
return true; return true;
if (world.getDimension().isUltrawarm() && fluid.getFluid() if (world.getDimension()
.isUltrawarm()
&& fluid.getFluid()
.isIn(FluidTags.WATER)) { .isIn(FluidTags.WATER)) {
int i = outputPos.getX(); int i = outputPos.getX();
int j = outputPos.getY(); int j = outputPos.getY();
@ -163,13 +167,33 @@ public class OpenEndedPipe extends FlowSource {
return true; return true;
} }
private void applyEffects(World world, FluidStack fluid) { private boolean canApplyEffects(World world, FluidStack fluid) {
if (!fluid.getFluid() Fluid fluidType = fluid.getFluid();
.isEquivalentTo(AllFluids.POTION.get())) { if (fluidType.isEquivalentTo(AllFluids.POTION.get()))
// other fx return true;
return; if (Tags.Fluids.MILK.contains(fluidType))
return true;
return false;
} }
private void applyEffects(World world, FluidStack fluid) {
Fluid fluidType = fluid.getFluid();
if (fluidType.isEquivalentTo(AllFluids.POTION.get()))
applyPotionEffects(world, fluid);
if (Tags.Fluids.MILK.contains(fluidType)) {
if (world.getGameTime() % 5 != 0)
return;
List<LivingEntity> list =
world.getEntitiesWithinAABB(LivingEntity.class, aoe, LivingEntity::canBeHitWithPotion);
ItemStack curativeItem = new ItemStack(Items.MILK_BUCKET);
for (LivingEntity livingentity : list)
livingentity.curePotionEffects(curativeItem);
}
}
private void applyPotionEffects(World world, FluidStack fluid) {
if (cachedFluid == null || cachedEffects == null || !fluid.isFluidEqual(cachedFluid)) { if (cachedFluid == null || cachedEffects == null || !fluid.isFluidEqual(cachedFluid)) {
FluidStack copy = fluid.copy(); FluidStack copy = fluid.copy();
copy.setAmount(250); copy.setAmount(250);
@ -181,7 +205,7 @@ public class OpenEndedPipe extends FlowSource {
return; return;
List<LivingEntity> list = List<LivingEntity> list =
this.world.getEntitiesWithinAABB(LivingEntity.class, aoe, LivingEntity::canBeHitWithPotion); world.getEntitiesWithinAABB(LivingEntity.class, aoe, LivingEntity::canBeHitWithPotion);
for (LivingEntity livingentity : list) { for (LivingEntity livingentity : list) {
for (EffectInstance effectinstance : cachedEffects) { for (EffectInstance effectinstance : cachedEffects) {
Effect effect = effectinstance.getPotion(); Effect effect = effectinstance.getPotion();
@ -192,7 +216,6 @@ public class OpenEndedPipe extends FlowSource {
livingentity.addPotionEffect(new EffectInstance(effectinstance)); livingentity.addPotionEffect(new EffectInstance(effectinstance));
} }
} }
} }
@Override @Override
@ -234,14 +257,19 @@ public class OpenEndedPipe extends FlowSource {
if (!provideFluidToSpace(resource, true)) if (!provideFluidToSpace(resource, true))
return 0; return 0;
if (!getFluid().isEmpty() && !getFluid().isFluidEqual(resource)) FluidStack containedFluidStack = getFluid();
if (!containedFluidStack.isEmpty() && !containedFluidStack.isFluidEqual(resource))
setFluid(FluidStack.EMPTY); setFluid(FluidStack.EMPTY);
if (wasPulling) if (wasPulling)
wasPulling = false; wasPulling = false;
if (canApplyEffects(world, resource))
resource = FluidHelper.copyStackWithAmount(resource, 1);
int fill = super.fill(resource, action); int fill = super.fill(resource, action);
if (action.execute() && (getFluidAmount() == 1000 || !FluidHelper.hasBlockState(getFluid().getFluid())) if (action.simulate())
&& provideFluidToSpace(getFluid(), false)) return fill;
if (getFluidAmount() == 1000 || !FluidHelper.hasBlockState(containedFluidStack.getFluid()))
if (provideFluidToSpace(containedFluidStack, false))
setFluid(FluidStack.EMPTY); setFluid(FluidStack.EMPTY);
return fill; return fill;
} }

View file

@ -1,7 +1,14 @@
package com.simibubi.create.content.curiosities.armor; package com.simibubi.create.content.curiosities.armor;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import com.google.common.collect.Streams;
import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.config.AllConfigs;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.inventory.EquipmentSlotType;
import net.minecraft.item.BlockItem; import net.minecraft.item.BlockItem;
import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemGroup;
@ -11,10 +18,16 @@ import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.ActionResultType; import net.minecraft.util.ActionResultType;
import net.minecraft.util.NonNullList; import net.minecraft.util.NonNullList;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import net.minecraftforge.event.TickEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.LogicalSide;
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
@EventBusSubscriber
public class CopperBacktankItem extends CopperArmorItem { public class CopperBacktankItem extends CopperArmorItem {
public static final int DURABILITY_BAR = 0xefefef; public static final int DURABILITY_BAR = 0xefefef;
public static final int RECHARGES_PER_TICK = 4;
private BlockItem blockItem; private BlockItem blockItem;
public CopperBacktankItem(Properties p_i48534_3_, BlockItem blockItem) { public CopperBacktankItem(Properties p_i48534_3_, BlockItem blockItem) {
@ -65,4 +78,39 @@ public class CopperBacktankItem extends CopperArmorItem {
return orCreateTag.getInt("Air"); return orCreateTag.getInt("Air");
} }
@SubscribeEvent
public static void rechargePneumaticTools(TickEvent.PlayerTickEvent event) {
PlayerEntity player = event.player;
if (event.phase != TickEvent.Phase.START)
return;
if (event.side != LogicalSide.SERVER)
return;
if (player.isSpectator())
return;
ItemStack tankStack = BackTankUtil.get(player);
if (tankStack.isEmpty())
return;
PlayerInventory inv = player.inventory;
List<ItemStack> toCharge = Streams.concat(Stream.of(player.getHeldItemMainhand()), inv.offHandInventory.stream(),
inv.armorInventory.stream(), inv.mainInventory.stream())
.filter(s -> s.getItem() instanceof IBackTankRechargeable && s.isDamaged())
.collect(Collectors.toList());
int charges = RECHARGES_PER_TICK;
for (ItemStack stack : toCharge) {
while (stack.isDamaged()) {
if (BackTankUtil.canAbsorbDamage(event.player, ((IBackTankRechargeable) stack.getItem()).maxUses())) {
stack.setDamage(stack.getDamage() - 1);
charges--;
if (charges <= 0)
return;
} else {
return;
}
}
}
}
} }

View file

@ -0,0 +1,7 @@
package com.simibubi.create.content.curiosities.armor;
public interface IBackTankRechargeable {
int maxUses();
}

View file

@ -9,31 +9,31 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockReader; import net.minecraft.world.IBlockReader;
import net.minecraft.world.World; import net.minecraft.world.World;
public class CursedBellBlock extends AbstractBellBlock<CursedBellTileEntity> { public class HauntedBellBlock extends AbstractBellBlock<HauntedBellTileEntity> {
public CursedBellBlock(Properties properties) { public HauntedBellBlock(Properties properties) {
super(properties); super(properties);
} }
@Override @Override
public TileEntity createTileEntity(BlockState state, IBlockReader world) { public TileEntity createTileEntity(BlockState state, IBlockReader world) {
return AllTileEntities.CURSED_BELL.create(); return AllTileEntities.HAUNTED_BELL.create();
} }
@Override @Override
public Class<CursedBellTileEntity> getTileEntityClass() { public Class<HauntedBellTileEntity> getTileEntityClass() {
return CursedBellTileEntity.class; return HauntedBellTileEntity.class;
} }
@Override @Override
public void playSound(World world, BlockPos pos) { public void playSound(World world, BlockPos pos) {
AllSoundEvents.CURSED_BELL_USE.playOnServer(world, pos, 4f, 1f); AllSoundEvents.HAUNTED_BELL_USE.playOnServer(world, pos, 4f, 1f);
} }
@Override @Override
public void onBlockAdded(BlockState state, World world, BlockPos pos, BlockState oldState, boolean isMoving) { public void onBlockAdded(BlockState state, World world, BlockPos pos, BlockState oldState, boolean isMoving) {
if (oldState.getBlock() != this) if (oldState.getBlock() != this)
withTileEntityDo(world, pos, CursedBellTileEntity::startEffect); withTileEntityDo(world, pos, HauntedBellTileEntity::startEffect);
} }
} }

View file

@ -5,7 +5,7 @@ import com.simibubi.create.content.contraptions.components.structureMovement.Mov
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
public class CursedBellMovementBehaviour extends BellMovementBehaviour { public class HauntedBellMovementBehaviour extends BellMovementBehaviour {
public static final int DISTANCE = 3; public static final int DISTANCE = 3;
@ -19,8 +19,8 @@ public class CursedBellMovementBehaviour extends BellMovementBehaviour {
@Override @Override
public void visitNewPosition(MovementContext context, BlockPos pos) { public void visitNewPosition(MovementContext context, BlockPos pos) {
if (!context.world.isRemote && getRecharge(context) == 0) { if (!context.world.isRemote && getRecharge(context) == 0) {
CursedBellPulser.sendPulse(context.world, pos, DISTANCE, true); HauntedBellPulser.sendPulse(context.world, pos, DISTANCE, true);
setRecharge(context, CursedBellTileEntity.RECHARGE_TICKS); setRecharge(context, HauntedBellTileEntity.RECHARGE_TICKS);
playSound(context); playSound(context);
} }
} }

View file

@ -13,13 +13,13 @@ import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
import net.minecraftforge.fml.network.PacketDistributor; import net.minecraftforge.fml.network.PacketDistributor;
@EventBusSubscriber @EventBusSubscriber
public class CursedBellPulser { public class HauntedBellPulser {
public static final int DISTANCE = 3; public static final int DISTANCE = 3;
public static final int RECHARGE_TICKS = 8; public static final int RECHARGE_TICKS = 8;
@SubscribeEvent @SubscribeEvent
public static void cursedBellCreatesPulse(TickEvent.PlayerTickEvent event) { public static void hauntedBellCreatesPulse(TickEvent.PlayerTickEvent event) {
if (event.phase != TickEvent.Phase.END) if (event.phase != TickEvent.Phase.END)
return; return;
if (event.side != LogicalSide.SERVER) if (event.side != LogicalSide.SERVER)
@ -30,7 +30,7 @@ public class CursedBellPulser {
if (event.player.world.getGameTime() % RECHARGE_TICKS != 0) if (event.player.world.getGameTime() % RECHARGE_TICKS != 0)
return; return;
if (event.player.isHolding(AllBlocks.CURSED_BELL::is)) if (event.player.isHolding(AllBlocks.HAUNTED_BELL::is))
sendPulse(event.player.world, event.player.getBlockPos(), DISTANCE, false); sendPulse(event.player.world, event.player.getBlockPos(), DISTANCE, false);
} }

View file

@ -17,7 +17,7 @@ import net.minecraft.util.SoundEvents;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
public class CursedBellTileEntity extends AbstractBellTileEntity { public class HauntedBellTileEntity extends AbstractBellTileEntity {
public static final int DISTANCE = 10; public static final int DISTANCE = 10;
public static final int RECHARGE_TICKS = 65; public static final int RECHARGE_TICKS = 65;
@ -25,7 +25,7 @@ public class CursedBellTileEntity extends AbstractBellTileEntity {
public int effectTicks = 0; public int effectTicks = 0;
public CursedBellTileEntity(TileEntityType<?> type) { public HauntedBellTileEntity(TileEntityType<?> type) {
super(type); super(type);
} }
@ -34,7 +34,7 @@ public class CursedBellTileEntity extends AbstractBellTileEntity {
@Override @Override
public PartialModel getBellModel() { public PartialModel getBellModel() {
return AllBlockPartials.CURSED_BELL; return AllBlockPartials.HAUNTED_BELL;
} }
@Override @Override
@ -46,7 +46,7 @@ public class CursedBellTileEntity extends AbstractBellTileEntity {
return false; return false;
if (!world.isRemote) if (!world.isRemote)
CursedBellPulser.sendPulse(world, pos, DISTANCE, true); HauntedBellPulser.sendPulse(world, pos, DISTANCE, true);
startEffect(); startEffect();

View file

@ -69,13 +69,13 @@ public class PeculiarBellBlock extends AbstractBellBlock<PeculiarBellTileEntity>
if (world.isRemote()) { if (world.isRemote()) {
spawnConversionParticles(world, pos); spawnConversionParticles(world, pos);
} else if (world instanceof World) { } else if (world instanceof World) {
AllSoundEvents.CURSED_BELL_CONVERT.playOnServer((World) world, pos); AllSoundEvents.HAUNTED_BELL_CONVERT.playOnServer((World) world, pos);
} }
return AllBlocks.CURSED_BELL.getDefaultState() return AllBlocks.HAUNTED_BELL.getDefaultState()
.with(CursedBellBlock.field_220133_a, state.get(field_220133_a)) .with(HauntedBellBlock.field_220133_a, state.get(field_220133_a))
.with(CursedBellBlock.field_220134_b, state.get(field_220134_b)) .with(HauntedBellBlock.field_220134_b, state.get(field_220134_b))
.with(CursedBellBlock.POWERED, state.get(POWERED)); .with(HauntedBellBlock.POWERED, state.get(POWERED));
} }
public void spawnConversionParticles(IWorld world, BlockPos blockPos) { public void spawnConversionParticles(IWorld world, BlockPos blockPos) {

View file

@ -6,6 +6,7 @@ import net.minecraft.client.particle.IAnimatedSprite;
import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.ActiveRenderInfo;
import net.minecraft.client.world.ClientWorld; import net.minecraft.client.world.ClientWorld;
import net.minecraft.particles.ParticleType; import net.minecraft.particles.ParticleType;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.vector.Quaternion; import net.minecraft.util.math.vector.Quaternion;
import net.minecraft.util.math.vector.Vector3f; import net.minecraft.util.math.vector.Vector3f;
@ -27,11 +28,11 @@ public class SoulBaseParticle extends CustomRotationParticle {
@Override @Override
public void tick() { public void tick() {
if (this.age++ >= this.maxAge) { selectSpriteLoopingWithAge(animatedSprite);
this.setExpired();
} else { BlockPos pos = new BlockPos(posX, posY, posZ);
this.selectSpriteLoopingWithAge(animatedSprite); if (age++ >= maxAge || !SoulPulseEffect.canSpawnSoulAt(world, pos))
} setExpired();
} }
@Override @Override

View file

@ -8,7 +8,6 @@ import net.minecraft.client.world.ClientWorld;
import net.minecraft.particles.ParticleType; import net.minecraft.particles.ParticleType;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.vector.Quaternion; import net.minecraft.util.math.vector.Quaternion;
import net.minecraft.world.LightType;
public class SoulParticle extends CustomRotationParticle { public class SoulParticle extends CustomRotationParticle {
@ -54,20 +53,18 @@ public class SoulParticle extends CustomRotationParticle {
@Override @Override
public void tick() { public void tick() {
animationStage.tick();
this.animationStage.tick(); animationStage = animationStage.getNext();
this.animationStage = animationStage.getNext(); BlockPos pos = new BlockPos(posX, posY, posZ);
if (animationStage == null || !SoulPulseEffect.canSpawnSoulAt(world, pos))
if (animationStage == null) setExpired();
this.setExpired();
if (world.getLightLevel(LightType.BLOCK, new BlockPos(posX, posY, posZ)) > 7)
this.setExpired();
} }
public void setFrame(int frame) { public void setFrame(int frame) {
if (frame >= 0 && frame < totalFrames) if (frame >= 0 && frame < totalFrames)
this.setSprite(animatedSprite.get(frame, totalFrames)); setSprite(animatedSprite.get(frame, totalFrames));
} }
@Override @Override

View file

@ -71,7 +71,7 @@ public class SoulPulseEffect {
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
public boolean canSpawnSoulAt(World world, BlockPos at) { public static boolean canSpawnSoulAt(World world, BlockPos at) {
EntityType<?> dummy = EntityType.ZOMBIE; EntityType<?> dummy = EntityType.ZOMBIE;
double dummyWidth = 0.2, dummyHeight = 0.75; double dummyWidth = 0.2, dummyHeight = 0.75;
double w2 = dummyWidth / 2; double w2 = dummyWidth / 2;

View file

@ -6,6 +6,7 @@ import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import com.simibubi.create.AllItems; import com.simibubi.create.AllItems;
import com.simibubi.create.content.curiosities.armor.BackTankUtil; import com.simibubi.create.content.curiosities.armor.BackTankUtil;
import com.simibubi.create.content.curiosities.armor.IBackTankRechargeable;
import com.simibubi.create.foundation.advancement.AllTriggers; import com.simibubi.create.foundation.advancement.AllTriggers;
import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.config.AllConfigs;
import com.simibubi.create.foundation.networking.AllPackets; import com.simibubi.create.foundation.networking.AllPackets;
@ -26,7 +27,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.item.Rarity; import net.minecraft.item.Rarity;
import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.DamageSource; import net.minecraft.util.DamageSource;
import net.minecraft.util.Hand;
import net.minecraft.util.LazyValue; import net.minecraft.util.LazyValue;
import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.BlockRayTraceResult;
@ -50,7 +50,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod.EventBusSubscriber; import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
@EventBusSubscriber @EventBusSubscriber
public class ExtendoGripItem extends Item { public class ExtendoGripItem extends Item implements IBackTankRechargeable {
private static DamageSource lastActiveDamageSource; private static DamageSource lastActiveDamageSource;
public static final int MAX_DAMAGE = 200; public static final int MAX_DAMAGE = 200;
@ -86,8 +86,8 @@ public class ExtendoGripItem extends Item {
PlayerEntity player = (PlayerEntity) event.getEntityLiving(); PlayerEntity player = (PlayerEntity) event.getEntityLiving();
CompoundNBT persistentData = player.getPersistentData(); CompoundNBT persistentData = player.getPersistentData();
boolean inOff = AllItems.EXTENDO_GRIP.isIn(player.getHeldItemOffhand()); boolean inOff = isActiveExtendoGrip(player.getHeldItemOffhand());
boolean inMain = AllItems.EXTENDO_GRIP.isIn(player.getHeldItemMainhand()); boolean inMain = isActiveExtendoGrip(player.getHeldItemMainhand());
boolean holdingDualExtendo = inOff && inMain; boolean holdingDualExtendo = inOff && inMain;
boolean holdingExtendo = inOff ^ inMain; boolean holdingExtendo = inOff ^ inMain;
holdingExtendo &= !holdingDualExtendo; holdingExtendo &= !holdingDualExtendo;
@ -198,17 +198,14 @@ public class ExtendoGripItem extends Item {
return; return;
if (player.world.isRemote) if (player.world.isRemote)
return; return;
Hand hand = Hand.MAIN_HAND; ItemStack main = player.getHeldItemMainhand();
ItemStack extendo = player.getHeldItemMainhand(); ItemStack off = player.getHeldItemOffhand();
if (!AllItems.EXTENDO_GRIP.isIn(extendo)) { for (ItemStack stack : new ItemStack[]{main, off}) {
extendo = player.getHeldItemOffhand(); if (isActiveExtendoGrip(stack)) {
hand = Hand.OFF_HAND; if (!BackTankUtil.canAbsorbDamage(player, ((IBackTankRechargeable) stack.getItem()).maxUses()))
stack.damageItem(1, player, p -> {});
}
} }
if (!AllItems.EXTENDO_GRIP.isIn(extendo))
return;
final Hand h = hand;
if (!BackTankUtil.canAbsorbDamage(player, maxUses()))
extendo.damageItem(1, player, p -> p.sendBreakAnimation(h));
} }
@Override @Override
@ -226,7 +223,8 @@ public class ExtendoGripItem extends Item {
return BackTankUtil.showDurabilityBar(stack, maxUses()); return BackTankUtil.showDurabilityBar(stack, maxUses());
} }
private static int maxUses() { @Override
public int maxUses() {
return AllConfigs.SERVER.curiosities.maxExtendoGripActions.get(); return AllConfigs.SERVER.curiosities.maxExtendoGripActions.get();
} }
@ -314,9 +312,13 @@ public class ExtendoGripItem extends Item {
.sendToServer(new ExtendoGripInteractionPacket(target, event.getHand(), event.getLocalPos())); .sendToServer(new ExtendoGripInteractionPacket(target, event.getHand(), event.getLocalPos()));
} }
public static boolean isActiveExtendoGrip(ItemStack stack) {
return AllItems.EXTENDO_GRIP.isIn(stack) && stack.getDamage() != stack.getMaxDamage() - 1;
}
public static boolean isHoldingExtendoGrip(PlayerEntity player) { public static boolean isHoldingExtendoGrip(PlayerEntity player) {
boolean inOff = AllItems.EXTENDO_GRIP.isIn(player.getHeldItemOffhand()); boolean inOff = isActiveExtendoGrip(player.getHeldItemOffhand());
boolean inMain = AllItems.EXTENDO_GRIP.isIn(player.getHeldItemMainhand()); boolean inMain = isActiveExtendoGrip(player.getHeldItemMainhand());
boolean holdingGrip = inOff || inMain; boolean holdingGrip = inOff || inMain;
return holdingGrip; return holdingGrip;
} }

View file

@ -59,8 +59,8 @@ public class ExtendoGripRenderHandler {
boolean rightHand = event.getHand() == Hand.MAIN_HAND ^ player.getPrimaryHand() == HandSide.LEFT; boolean rightHand = event.getHand() == Hand.MAIN_HAND ^ player.getPrimaryHand() == HandSide.LEFT;
ItemStack offhandItem = getRenderedOffHandStack(); ItemStack offhandItem = getRenderedOffHandStack();
boolean notInOffhand = !AllItems.EXTENDO_GRIP.isIn(offhandItem); boolean notInOffhand = !ExtendoGripItem.isActiveExtendoGrip(offhandItem);
if (notInOffhand && !AllItems.EXTENDO_GRIP.isIn(heldItem)) if (notInOffhand && !ExtendoGripItem.isActiveExtendoGrip(heldItem))
return; return;
MatrixStack ms = event.getMatrixStack(); MatrixStack ms = event.getMatrixStack();

View file

@ -8,6 +8,7 @@ import com.simibubi.create.AllEntityTypes;
import com.simibubi.create.Create; import com.simibubi.create.Create;
import com.simibubi.create.CreateClient; import com.simibubi.create.CreateClient;
import com.simibubi.create.content.curiosities.armor.BackTankUtil; import com.simibubi.create.content.curiosities.armor.BackTankUtil;
import com.simibubi.create.content.curiosities.armor.IBackTankRechargeable;
import com.simibubi.create.content.curiosities.zapper.ShootableGadgetItemMethods; import com.simibubi.create.content.curiosities.zapper.ShootableGadgetItemMethods;
import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.config.AllConfigs;
import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.AnimationTickHolder;
@ -25,6 +26,7 @@ import net.minecraft.item.ShootableItem;
import net.minecraft.item.UseAction; import net.minecraft.item.UseAction;
import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResult;
import net.minecraft.util.ActionResultType; import net.minecraft.util.ActionResultType;
import net.minecraft.util.Direction.Axis;
import net.minecraft.util.Hand; import net.minecraft.util.Hand;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.vector.Vector3d;
@ -36,7 +38,7 @@ import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.api.distmarker.OnlyIn;
public class PotatoCannonItem extends ShootableItem { public class PotatoCannonItem extends ShootableItem implements IBackTankRechargeable {
public static ItemStack CLIENT_CURRENT_AMMO = ItemStack.EMPTY; public static ItemStack CLIENT_CURRENT_AMMO = ItemStack.EMPTY;
public static final int MAX_DAMAGE = 100; public static final int MAX_DAMAGE = 100;
@ -76,7 +78,8 @@ public class PotatoCannonItem extends ShootableItem {
return BackTankUtil.showDurabilityBar(stack, maxUses()); return BackTankUtil.showDurabilityBar(stack, maxUses());
} }
private int maxUses() { @Override
public int maxUses() {
return AllConfigs.SERVER.curiosities.maxPotatoCannonShots.get(); return AllConfigs.SERVER.curiosities.maxPotatoCannonShots.get();
} }
@ -97,6 +100,9 @@ public class PotatoCannonItem extends ShootableItem {
@Override @Override
public ActionResult<ItemStack> onItemRightClick(World world, PlayerEntity player, Hand hand) { public ActionResult<ItemStack> onItemRightClick(World world, PlayerEntity player, Hand hand) {
ItemStack stack = player.getHeldItem(hand); ItemStack stack = player.getHeldItem(hand);
if (stack.getDamage() == getMaxDamage(stack) - 1)
return ActionResult.pass(stack);
return findAmmoInInventory(world, player, stack).map(itemStack -> { return findAmmoInInventory(world, player, stack).map(itemStack -> {
if (ShootableGadgetItemMethods.shouldSwap(player, stack, hand, this::isCannon)) if (ShootableGadgetItemMethods.shouldSwap(player, stack, hand, this::isCannon))
@ -114,21 +120,31 @@ public class PotatoCannonItem extends ShootableItem {
.subtract(player.getPositionVec() .subtract(player.getPositionVec()
.add(0, player.getEyeHeight(), 0)); .add(0, player.getEyeHeight(), 0));
Vector3d lookVec = player.getLookVec();
PotatoCannonProjectileTypes projectileType = PotatoCannonProjectileTypes.getProjectileTypeOf(itemStack) PotatoCannonProjectileTypes projectileType = PotatoCannonProjectileTypes.getProjectileTypeOf(itemStack)
.orElse(PotatoCannonProjectileTypes.FALLBACK); .orElse(PotatoCannonProjectileTypes.FALLBACK);
Vector3d lookVec = player.getLookVec();
Vector3d motion = lookVec.add(correction).normalize().scale(projectileType.getVelocityMultiplier());
float soundPitch = projectileType.getSoundPitch() + (Create.RANDOM.nextFloat() - .5f) / 4f; float soundPitch = projectileType.getSoundPitch() + (Create.RANDOM.nextFloat() - .5f) / 4f;
boolean spray = projectileType.getSplit() > 1; boolean spray = projectileType.getSplit() > 1;
Vector3d sprayBase = VecHelper.rotate(new Vector3d(0,0.1,0),
360*Create.RANDOM.nextFloat(), Axis.Z);
float sprayChange = 360f / projectileType.getSplit();
for (int i = 0; i < projectileType.getSplit(); i++) { for (int i = 0; i < projectileType.getSplit(); i++) {
PotatoProjectileEntity projectile = AllEntityTypes.POTATO_PROJECTILE.create(world); PotatoProjectileEntity projectile = AllEntityTypes.POTATO_PROJECTILE.create(world);
projectile.setItem(itemStack); projectile.setItem(itemStack);
Vector3d motion = lookVec.scale(projectileType.getVelocityMultiplier())
.add(correction); Vector3d splitMotion = motion;
if (spray) if (spray) {
motion = VecHelper.offsetRandomly(motion, Create.RANDOM, 0.25f); float imperfection = 40*(Create.RANDOM.nextFloat() - 0.5f);
Vector3d sprayOffset = VecHelper.rotate(sprayBase, i * sprayChange + imperfection, Axis.Z);
splitMotion = splitMotion.add(VecHelper.lookAt(sprayOffset, motion));
}
projectile.setPosition(barrelPos.x, barrelPos.y, barrelPos.z); projectile.setPosition(barrelPos.x, barrelPos.y, barrelPos.z);
projectile.setMotion(motion); projectile.setMotion(splitMotion);
projectile.setShooter(player); projectile.setShooter(player);
world.addEntity(projectile); world.addEntity(projectile);
} }
@ -139,8 +155,7 @@ public class PotatoCannonItem extends ShootableItem {
player.inventory.deleteStack(itemStack); player.inventory.deleteStack(itemStack);
} }
if (!BackTankUtil.canAbsorbDamage(player, maxUses())) stack.damageItem(1, player, p -> {});
stack.damageItem(1, player, p -> p.sendBreakAnimation(hand));
Integer cooldown = Integer cooldown =
findAmmoInInventory(world, player, stack).flatMap(PotatoCannonProjectileTypes::getProjectileTypeOf) findAmmoInInventory(world, player, stack).flatMap(PotatoCannonProjectileTypes::getProjectileTypeOf)

View file

@ -6,6 +6,8 @@ import java.util.Optional;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import java.util.function.Consumer; import java.util.function.Consumer;
import com.mojang.datafixers.util.Pair;
import com.simibubi.create.AllItems;
import com.simibubi.create.Create; import com.simibubi.create.Create;
import net.minecraft.block.Block; import net.minecraft.block.Block;
@ -13,7 +15,10 @@ import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.LivingEntity; import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.item.FallingBlockEntity;
import net.minecraft.entity.passive.FoxEntity; import net.minecraft.entity.passive.FoxEntity;
import net.minecraft.item.Food;
import net.minecraft.item.Foods;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.Items; import net.minecraft.item.Items;
@ -46,7 +51,7 @@ public class PotatoCannonProjectileTypes {
FALLBACK = create("fallback").damage(0) FALLBACK = create("fallback").damage(0)
.register(), .register(),
POTATO = create("potato").damage(4) POTATO = create("potato").damage(5)
.reloadTicks(15) .reloadTicks(15)
.velocity(1.25f) .velocity(1.25f)
.knockback(1.5f) .knockback(1.5f)
@ -54,32 +59,32 @@ public class PotatoCannonProjectileTypes {
.onBlockHit(plantCrop(Blocks.POTATOES.delegate)) .onBlockHit(plantCrop(Blocks.POTATOES.delegate))
.registerAndAssign(Items.POTATO), .registerAndAssign(Items.POTATO),
BAKED_POTATO = create("baked_potato").damage(3) BAKED_POTATO = create("baked_potato").damage(5)
.reloadTicks(15) .reloadTicks(15)
.velocity(1.05f) .velocity(1.25f)
.knockback(0.5f) .knockback(0.5f)
.renderTumbling() .renderTumbling()
.onEntityHit(ray -> ray.getEntity() .onEntityHit(ray -> ray.getEntity().setFire(3))
.setFireTicks(10))
.registerAndAssign(Items.BAKED_POTATO), .registerAndAssign(Items.BAKED_POTATO),
CARROT = create("carrot").damage(3) CARROT = create("carrot").damage(4)
.renderTowardMotion(140, 1) .reloadTicks(12)
.velocity(1.45f) .velocity(1.45f)
.knockback(0.5f) .knockback(0.3f)
.soundPitch(1.25f) .renderTowardMotion(140, 1)
.soundPitch(1.5f)
.onBlockHit(plantCrop(Blocks.CARROTS.delegate)) .onBlockHit(plantCrop(Blocks.CARROTS.delegate))
.registerAndAssign(Items.CARROT), .registerAndAssign(Items.CARROT),
GOLDEN_CARROT = create("golden_carrot").damage(8) GOLDEN_CARROT = create("golden_carrot").damage(12)
.reloadTicks(20) .reloadTicks(15)
.knockback(0.5f)
.velocity(1.45f) .velocity(1.45f)
.knockback(0.5f)
.renderTowardMotion(140, 2) .renderTowardMotion(140, 2)
.soundPitch(1.25f) .soundPitch(1.5f)
.registerAndAssign(Items.GOLDEN_CARROT), .registerAndAssign(Items.GOLDEN_CARROT),
SWEET_BERRIES = create("sweet_berry").damage(1) SWEET_BERRIES = create("sweet_berry").damage(3)
.reloadTicks(10) .reloadTicks(10)
.knockback(0.1f) .knockback(0.1f)
.velocity(1.05f) .velocity(1.05f)
@ -88,22 +93,108 @@ public class PotatoCannonProjectileTypes {
.soundPitch(1.25f) .soundPitch(1.25f)
.registerAndAssign(Items.SWEET_BERRIES), .registerAndAssign(Items.SWEET_BERRIES),
CHOCOLATE_BERRIES = create("chocolate_berry").damage(4)
.reloadTicks(10)
.knockback(0.2f)
.velocity(1.05f)
.renderTumbling()
.splitInto(3)
.soundPitch(1.25f)
.registerAndAssign(AllItems.CHOCOLATE_BERRIES.get()),
POISON_POTATO = create("poison_potato").damage(5) POISON_POTATO = create("poison_potato").damage(5)
.reloadTicks(15) .reloadTicks(15)
.knockback(0.05f) .knockback(0.05f)
.velocity(1.25f) .velocity(1.25f)
.renderTumbling() .renderTumbling()
.onEntityHit(potion(Effects.POISON, 4)) .onEntityHit(potion(Effects.POISON, 1,160))
.registerAndAssign(Items.POISONOUS_POTATO), .registerAndAssign(Items.POISONOUS_POTATO),
CHORUS_FRUIT = create("chorus_fruit").damage(2) CHORUS_FRUIT = create("chorus_fruit").damage(3)
.reloadTicks(15) .reloadTicks(15)
.velocity(1.20f) .velocity(1.20f)
.knockback(0.05f) .knockback(0.05f)
.renderTumbling() .renderTumbling()
.onEntityHit(chorusTeleport(20)) .onEntityHit(chorusTeleport(20))
.registerAndAssign(Items.CHORUS_FRUIT) .registerAndAssign(Items.CHORUS_FRUIT),
APPLE = create("apple").damage(5)
.reloadTicks(10)
.velocity(1.45f)
.knockback(0.5f)
.renderTumbling()
.soundPitch(1.1f)
.registerAndAssign(Items.APPLE),
HONEYED_APPLE = create("honeyed_apple").damage(6)
.reloadTicks(15)
.velocity(1.35f)
.knockback(0.1f)
.renderTumbling()
.soundPitch(1.1f)
.onEntityHit(potion(Effects.SLOWNESS, 2,160))
.registerAndAssign(AllItems.HONEYED_APPLE.get()),
GOLDEN_APPLE = create("golden_apple").damage(1)
.reloadTicks(100)
.velocity(1.45f)
.knockback(0.05f)
.renderTumbling()
.soundPitch(1.1f)
.onEntityHit(foodEffects(Foods.GOLDEN_APPLE))
.registerAndAssign(Items.GOLDEN_APPLE),
ENCHANTED_GOLDEN_APPLE = create("enchanted_golden_apple").damage(1)
.reloadTicks(100)
.velocity(1.45f)
.knockback(0.05f)
.renderTumbling()
.soundPitch(1.1f)
.onEntityHit(foodEffects(Foods.ENCHANTED_GOLDEN_APPLE))
.registerAndAssign(Items.ENCHANTED_GOLDEN_APPLE),
BEETROOT = create("beetroot").damage(2)
.reloadTicks(5)
.velocity(1.6f)
.knockback(0.1f)
.renderTowardMotion(140, 2)
.soundPitch(1.6f)
.registerAndAssign(Items.BEETROOT),
MELON_SLICE = create("melon_slice").damage(3)
.reloadTicks(8)
.knockback(0.1f)
.velocity(1.45f)
.renderTumbling()
.soundPitch(1.5f)
.registerAndAssign(Items.MELON_SLICE),
GLISTENING_MELON = create("glistening_melon").damage(5)
.reloadTicks(8)
.knockback(0.1f)
.velocity(1.45f)
.renderTumbling()
.soundPitch(1.5f)
.onEntityHit(potion(Effects.GLOWING, 1, 100))
.registerAndAssign(Items.GLISTERING_MELON_SLICE),
MELON_BLOCK = create("melon_block").damage(8)
.reloadTicks(20)
.knockback(2.0f)
.velocity(0.95f)
.renderTumbling()
.soundPitch(0.9f)
.onBlockHit(placeBlockOnGround(Blocks.MELON.delegate))
.registerAndAssign(Blocks.MELON),
PUMPKIN_BLOCK = create("pumpkin_block").damage(6)
.reloadTicks(15)
.knockback(2.0f)
.velocity(0.95f)
.renderTumbling()
.soundPitch(0.9f)
.onBlockHit(placeBlockOnGround(Blocks.PUMPKIN.delegate))
.registerAndAssign(Blocks.PUMPKIN)
; ;
public static void registerType(ResourceLocation resLoc, PotatoCannonProjectileTypes type) { public static void registerType(ResourceLocation resLoc, PotatoCannonProjectileTypes type) {
@ -184,30 +275,72 @@ public class PotatoCannonProjectileTypes {
onBlockHit.accept(world, ray); onBlockHit.accept(world, ray);
} }
private static Consumer<EntityRayTraceResult> potion(Effect effect, int seconds) { private static Consumer<EntityRayTraceResult> potion(Effect effect, int level, int ticks) {
return ray -> { return ray -> {
Entity entity = ray.getEntity(); Entity entity = ray.getEntity();
if (entity instanceof LivingEntity) if (entity instanceof LivingEntity)
((LivingEntity) entity).addPotionEffect(new EffectInstance(effect, seconds)); ((LivingEntity) entity).addPotionEffect(new EffectInstance(effect, ticks, level - 1));
};
}
private static Consumer<EntityRayTraceResult> foodEffects(Food food) {
return ray -> {
Entity entity = ray.getEntity();
if (entity instanceof LivingEntity) {
for (Pair<EffectInstance, Float> effect : food.getEffects()) {
if (Create.RANDOM.nextFloat() < effect.getSecond())
((LivingEntity) entity).addPotionEffect(effect.getFirst());
}
}
}; };
} }
private static BiConsumer<IWorld, BlockRayTraceResult> plantCrop(IRegistryDelegate<? extends Block> cropBlock) { private static BiConsumer<IWorld, BlockRayTraceResult> plantCrop(IRegistryDelegate<? extends Block> cropBlock) {
return (world, ray) -> { return (world, ray) -> {
BlockPos pos = ray.getPos(); BlockPos hitPos = ray.getPos();
if (!world.isAreaLoaded(pos, 1)) if (!world.isAreaLoaded(hitPos, 1))
return; return;
BlockState blockState = world.getBlockState(pos); Direction face = ray.getFace();
if (!world.getBlockState(pos.up()) BlockPos placePos = hitPos.offset(face);
if (!world.getBlockState(placePos)
.getMaterial() .getMaterial()
.isReplaceable()) .isReplaceable())
return; return;
if (!(cropBlock.get() instanceof IPlantable)) if (!(cropBlock.get() instanceof IPlantable))
return; return;
if (!blockState.canSustainPlant(world, pos, Direction.UP, (IPlantable) cropBlock.get())) BlockState blockState = world.getBlockState(hitPos);
if (!blockState.canSustainPlant(world, hitPos, face, (IPlantable) cropBlock.get()))
return; return;
world.setBlockState(pos.up(), cropBlock.get() world.setBlockState(placePos, cropBlock.get().getDefaultState(), 3);
.getDefaultState(), 3); };
}
private static BiConsumer<IWorld, BlockRayTraceResult> placeBlockOnGround(IRegistryDelegate<? extends Block> block) {
return (world, ray) -> {
BlockPos hitPos = ray.getPos();
if (!world.isAreaLoaded(hitPos, 1))
return;
Direction face = ray.getFace();
BlockPos placePos = hitPos.offset(face);
if (!world.getBlockState(placePos)
.getMaterial()
.isReplaceable())
return;
if (face == Direction.UP) {
world.setBlockState(placePos, block.get().getDefaultState(), 3);
} else if (world instanceof World) {
double y = ray.getHitVec().y - 0.5;
if (!world.isAirBlock(placePos.up()))
y = Math.min(y, placePos.getY());
if (!world.isAirBlock(placePos.down()))
y = Math.max(y, placePos.getY());
FallingBlockEntity falling = new FallingBlockEntity((World) world, placePos.getX() + 0.5, y,
placePos.getZ() + 0.5, block.get().getDefaultState());
falling.fallTime = 1;
world.addEntity(falling);
}
}; };
} }

View file

@ -134,6 +134,10 @@ public class PotatoProjectileEntity extends DamagingProjectileEntity implements
} }
LivingEntity livingentity = (LivingEntity) target; LivingEntity livingentity = (LivingEntity) target;
if (type.getReloadTicks() < 10)
livingentity.hurtResistantTime = type.getReloadTicks() + 10;
if (knockback > 0) { if (knockback > 0) {
Vector3d appliedMotion = this.getMotion() Vector3d appliedMotion = this.getMotion()
.mul(1.0D, 0.0D, 1.0D) .mul(1.0D, 0.0D, 1.0D)
@ -184,8 +188,10 @@ public class PotatoProjectileEntity extends DamagingProjectileEntity implements
} }
@Override @Override
public boolean attackEntityFrom(DamageSource p_70097_1_, float p_70097_2_) { public boolean attackEntityFrom(DamageSource source, float amt) {
if (this.isInvulnerableTo(p_70097_1_)) if (source == DamageSource.IN_FIRE || source == DamageSource.ON_FIRE)
return false;
if (this.isInvulnerableTo(source))
return false; return false;
pop(getPositionVec()); pop(getPositionVec());
remove(); remove();

View file

@ -1,9 +1,14 @@
package com.simibubi.create.content.logistics.item; package com.simibubi.create.content.logistics.item;
import java.util.ArrayList;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import com.simibubi.create.AllItems;
import com.simibubi.create.AllSoundEvents; import com.simibubi.create.AllSoundEvents;
import com.simibubi.create.AllTileEntities; import com.simibubi.create.AllTileEntities;
import com.simibubi.create.content.schematics.ISpecialBlockItemRequirement;
import com.simibubi.create.content.schematics.ItemRequirement;
import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.block.ITE;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
@ -16,10 +21,11 @@ import net.minecraft.util.ActionResultType;
import net.minecraft.util.Hand; import net.minecraft.util.Hand;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.IBlockReader; import net.minecraft.world.IBlockReader;
import net.minecraft.world.World; import net.minecraft.world.World;
public class LecternControllerBlock extends LecternBlock implements ITE<LecternControllerTileEntity> { public class LecternControllerBlock extends LecternBlock implements ITE<LecternControllerTileEntity>, ISpecialBlockItemRequirement {
public LecternControllerBlock(Properties properties) { public LecternControllerBlock(Properties properties) {
super(properties); super(properties);
@ -89,4 +95,16 @@ public class LecternControllerBlock extends LecternBlock implements ITE<LecternC
.with(POWERED, state.get(POWERED))); .with(POWERED, state.get(POWERED)));
} }
@Override
public ItemStack getPickBlock(BlockState state, RayTraceResult target, IBlockReader world, BlockPos pos, PlayerEntity player) {
return Blocks.LECTERN.getPickBlock(state, target, world, pos, player);
}
@Override
public ItemRequirement getRequiredItems(BlockState state, TileEntity te) {
ArrayList<ItemStack> requiredItems = new ArrayList<>();
requiredItems.add(new ItemStack(Blocks.LECTERN));
requiredItems.add(new ItemStack(AllItems.LINKED_CONTROLLER.get()));
return new ItemRequirement(ItemRequirement.ItemUseType.CONSUME, requiredItems);
}
} }

View file

@ -48,6 +48,12 @@ public class LecternControllerTileEntity extends SmartTileEntity {
compound.putUniqueId("User", user); compound.putUniqueId("User", user);
} }
@Override
public void writeSafe(CompoundNBT compound, boolean clientPacket) {
super.writeSafe(compound, clientPacket);
compound.put("Controller", controller.write(new CompoundNBT()));
}
@Override @Override
protected void fromTag(BlockState state, CompoundNBT compound, boolean clientPacket) { protected void fromTag(BlockState state, CompoundNBT compound, boolean clientPacket) {
super.fromTag(state, compound, clientPacket); super.fromTag(state, compound, clientPacket);

View file

@ -22,7 +22,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Direction; import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MutableBoundingBox; import net.minecraft.util.math.MutableBoundingBox;
import net.minecraft.util.math.vector.Vector3i;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.gen.feature.template.PlacementSettings; import net.minecraft.world.gen.feature.template.PlacementSettings;
import net.minecraft.world.gen.feature.template.Template; import net.minecraft.world.gen.feature.template.Template;
@ -119,7 +118,8 @@ public class SchematicPrinter {
} }
public boolean isWorldEmpty() { public boolean isWorldEmpty() {
return blockReader.getBounds().getLength().equals(new Vector3i(0,0,0)); return blockReader.getAllPositions().isEmpty();
//return blockReader.getBounds().getLength().equals(new Vector3i(0,0,0));
} }
@FunctionalInterface @FunctionalInterface

View file

@ -48,6 +48,10 @@ public class CClient extends ConfigBase {
public ConfigBool comfyReading = public ConfigBool comfyReading =
b(false, "comfyReading", "Slow down a ponder scene whenever there is text on screen."); b(false, "comfyReading", "Slow down a ponder scene whenever there is text on screen.");
public ConfigGroup sound = group(1, "sound", "Sound settings");
public ConfigBool enableAmbientSounds = b(true, "enableAmbientSounds", "Make cogs rumble and machines clatter.");
public ConfigFloat ambientVolumeCap = f(.1f, 0, 1, "ambientVolumeCap", "Maximum volume modifier of Ambient noise");
@Override @Override
public String getName() { public String getName() {
return "client"; return "client";

View file

@ -3,6 +3,7 @@ package com.simibubi.create.foundation.sound;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.simibubi.create.foundation.config.AllConfigs;
import com.simibubi.create.foundation.sound.SoundScapes.AmbienceGroup; import com.simibubi.create.foundation.sound.SoundScapes.AmbienceGroup;
import com.simibubi.create.foundation.sound.SoundScapes.PitchGroup; import com.simibubi.create.foundation.sound.SoundScapes.PitchGroup;
import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.AnimationTickHolder;
@ -89,8 +90,9 @@ class SoundScape {
distanceMultiplier = (float) MathHelper.lerp(distanceTo / SoundScapes.MAX_AMBIENT_SOURCE_DISTANCE, 2, 0); distanceMultiplier = (float) MathHelper.lerp(distanceTo / SoundScapes.MAX_AMBIENT_SOURCE_DISTANCE, 2, 0);
} }
int soundCount = SoundScapes.getSoundCount(group, pitchGroup); int soundCount = SoundScapes.getSoundCount(group, pitchGroup);
float max = AllConfigs.CLIENT.ambientVolumeCap.getF();
float argMax = (float) SoundScapes.SOUND_VOLUME_ARG_MAX; float argMax = (float) SoundScapes.SOUND_VOLUME_ARG_MAX;
return MathHelper.clamp(soundCount / (argMax * 10f), 0.025f, .15f) * distanceMultiplier; return MathHelper.clamp(soundCount / (argMax * 10f), 0.025f, max) * distanceMultiplier;
} }
} }

View file

@ -11,6 +11,7 @@ import java.util.Set;
import java.util.function.BiFunction; import java.util.function.BiFunction;
import com.simibubi.create.AllSoundEvents; import com.simibubi.create.AllSoundEvents;
import com.simibubi.create.foundation.config.AllConfigs;
import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.AnimationTickHolder;
import com.simibubi.create.foundation.utility.Pair; import com.simibubi.create.foundation.utility.Pair;
@ -60,6 +61,8 @@ public class SoundScapes {
private static Map<Pair<AmbienceGroup, PitchGroup>, SoundScape> activeSounds = new HashMap<>(); private static Map<Pair<AmbienceGroup, PitchGroup>, SoundScape> activeSounds = new HashMap<>();
public static void play(AmbienceGroup group, BlockPos pos, float pitch) { public static void play(AmbienceGroup group, BlockPos pos, float pitch) {
if (!AllConfigs.CLIENT.enableAmbientSounds.get())
return;
if (!outOfRange(pos)) if (!outOfRange(pos))
addSound(group, pos, pitch); addSound(group, pos, pitch);
} }
@ -71,6 +74,7 @@ public class SoundScapes {
if (AnimationTickHolder.getTicks() % UPDATE_INTERVAL != 0) if (AnimationTickHolder.getTicks() % UPDATE_INTERVAL != 0)
return; return;
boolean disable = !AllConfigs.CLIENT.enableAmbientSounds.get();
for (Iterator<Entry<Pair<AmbienceGroup, PitchGroup>, SoundScape>> iterator = activeSounds.entrySet() for (Iterator<Entry<Pair<AmbienceGroup, PitchGroup>, SoundScape>> iterator = activeSounds.entrySet()
.iterator(); iterator.hasNext();) { .iterator(); iterator.hasNext();) {
@ -78,7 +82,7 @@ public class SoundScapes {
Pair<AmbienceGroup, PitchGroup> key = entry.getKey(); Pair<AmbienceGroup, PitchGroup> key = entry.getKey();
SoundScape value = entry.getValue(); SoundScape value = entry.getValue();
if (getSoundCount(key.getFirst(), key.getSecond()) == 0) { if (disable || getSoundCount(key.getFirst(), key.getSecond()) == 0) {
value.remove(); value.remove();
iterator.remove(); iterator.remove();
} }

View file

@ -60,10 +60,23 @@ public class VecHelper {
return vec; return vec;
} }
public static Vector3d lookAt(Vector3d vec, Vector3d fwd) {
fwd = fwd.normalize();
Vector3d up = new Vector3d(0,1,0);
double dot = fwd.dotProduct(up);
if (Math.abs(dot) > 1 - 1.0E-3)
up = new Vector3d(0, 0, dot > 0 ? 1 : -1);
Vector3d right = fwd.crossProduct(up).normalize();
up = right.crossProduct(fwd).normalize();
double x = vec.x * right.x + vec.y * up.x + vec.z * fwd.x;
double y = vec.x * right.y + vec.y * up.y + vec.z * fwd.y;
double z = vec.x * right.z + vec.y * up.z + vec.z * fwd.z;
return new Vector3d(x, y, z);
}
public static boolean isVecPointingTowards(Vector3d vec, Direction direction) { public static boolean isVecPointingTowards(Vector3d vec, Direction direction) {
return Vector3d.of(direction.getDirectionVec()) return Vector3d.of(direction.getDirectionVec())
.dotProduct(vec.normalize()) > 0; .dotProduct(vec.normalize()) > 0.125; // slight tolerance to activate perpendicular movement actors
// return new Vector3d(direction.getDirectionVec()).distanceTo(vec.normalize()) < .75;
} }
public static Vector3d getCenterOf(Vector3i pos) { public static Vector3d getCenterOf(Vector3i pos) {

View file

@ -220,10 +220,10 @@
"block.create.peculiar_bell.tooltip": "PECULIAR BELL", "block.create.peculiar_bell.tooltip": "PECULIAR BELL",
"block.create.peculiar_bell.tooltip.summary": "A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", "block.create.peculiar_bell.tooltip.summary": "A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...",
"block.create.cursed_bell.tooltip": "CURSED BELL", "block.create.haunted_bell.tooltip": "HAUNTED BELL",
"block.create.cursed_bell.tooltip.summary": "A spooky brass bell haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.summary": "A spooky brass bell haunted by lost souls of the Nether.",
"block.create.cursed_bell.tooltip.condition1": "When Held or Rang", "block.create.haunted_bell.tooltip.condition1": "When Held or Rang",
"block.create.cursed_bell.tooltip.behaviour1": "Highlights nearby dark spots on which Hostile Mobs could spawn.", "block.create.haunted_bell.tooltip.behaviour1": "Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.",
"create.gui.chromatic_projector.title": "Chromatic Projector", "create.gui.chromatic_projector.title": "Chromatic Projector",
"create.gui.chromatic_projector.filter.invert": "Invert", "create.gui.chromatic_projector.filter.invert": "Invert",

View file

@ -6,8 +6,8 @@
}, },
"elements": [ "elements": [
{ {
"from": [14, 7, 7], "from": [13, 7, 7],
"to": [16, 9, 9], "to": [15, 9, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": { "faces": {
"north": {"uv": [10.5, 6, 9.5, 7], "texture": "#0"}, "north": {"uv": [10.5, 6, 9.5, 7], "texture": "#0"},
@ -19,8 +19,8 @@
} }
}, },
{ {
"from": [0, 7, 7], "from": [1, 7, 7],
"to": [2, 9, 9], "to": [3, 9, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": { "faces": {
"north": {"uv": [9.5, 6, 10.5, 7], "texture": "#0"}, "north": {"uv": [9.5, 6, 10.5, 7], "texture": "#0"},
@ -32,8 +32,8 @@
} }
}, },
{ {
"from": [3, 0, 3], "from": [3, 1, 3],
"to": [13, 2, 13], "to": [13, 3, 13],
"faces": { "faces": {
"north": {"uv": [0, 15, 5, 16], "texture": "#0"}, "north": {"uv": [0, 15, 5, 16], "texture": "#0"},
"east": {"uv": [0, 15, 5, 16], "texture": "#0"}, "east": {"uv": [0, 15, 5, 16], "texture": "#0"},
@ -44,8 +44,8 @@
} }
}, },
{ {
"from": [4, 2, 4], "from": [4, 3, 4],
"to": [12, 11, 12], "to": [12, 12, 12],
"faces": { "faces": {
"north": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, "north": {"uv": [8, 0, 12, 4.5], "texture": "#0"},
"east": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, "east": {"uv": [8, 0, 12, 4.5], "texture": "#0"},
@ -55,8 +55,8 @@
} }
}, },
{ {
"from": [7, 11, 7], "from": [7, 12, 7],
"to": [9, 15, 9], "to": [9, 16, 9],
"faces": { "faces": {
"north": {"uv": [8, 6, 9, 8], "texture": "#0"}, "north": {"uv": [8, 6, 9, 8], "texture": "#0"},
"east": {"uv": [8, 6, 9, 8], "texture": "#0"}, "east": {"uv": [8, 6, 9, 8], "texture": "#0"},
@ -86,6 +86,7 @@
{ {
"name": "Bell", "name": "Bell",
"origin": [8, 8, 8], "origin": [8, 8, 8],
"color": 0,
"children": [0, 1, 2, 3, 4, 5, 6] "children": [0, 1, 2, 3, 4, 5, 6]
} }
] ]

View file

@ -7,31 +7,63 @@
}, },
"elements": [ "elements": [
{ {
"from": [0.1, 0, 0], "from": [15, 4, 4],
"to": [15.9, 16, 16], "to": [16, 12, 12],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": { "faces": {
"east": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#1"}, "north": {"uv": [16, 8, 15, 0], "texture": "#2"},
"west": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#1"}, "east": {"uv": [0, 8, 8, 0], "texture": "#2"},
"up": {"uv": [0, 0, 15.8, 16], "texture": "#2"} "south": {"uv": [1, 8, 0, 0], "texture": "#2"},
"west": {"uv": [16, 8, 8, 0], "texture": "#2"},
"up": {"uv": [4, 11, 12, 12], "rotation": 270, "texture": "#1"},
"down": {"uv": [4, 4, 12, 5], "rotation": 90, "texture": "#1"}
} }
}, },
{ {
"from": [15.9, 0, 0], "from": [0, 4, 4],
"to": [0.1, 16, 16], "to": [1, 12, 12],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": { "faces": {
"east": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#1"}, "north": {"uv": [16, 8, 15, 0], "texture": "#2"},
"west": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#1"}, "east": {"uv": [8, 8, 16, 0], "texture": "#2"},
"up": {"uv": [0, 0, 16, 16], "texture": "#2"} "south": {"uv": [1, 8, 0, 0], "texture": "#2"},
"west": {"uv": [8, 8, 0, 0], "texture": "#2"},
"up": {"uv": [4, 11, 12, 12], "rotation": 270, "texture": "#1"},
"down": {"uv": [4, 4, 12, 5], "rotation": 90, "texture": "#1"}
}
},
{
"from": [0, 12, 2],
"to": [2, 16, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"north": {"uv": [14, 16, 16, 12], "texture": "#2"},
"east": {"uv": [0, 16, 12, 12], "texture": "#2"},
"south": {"uv": [14, 16, 12, 12], "texture": "#2"},
"west": {"uv": [12, 12, 0, 8], "texture": "#2"},
"up": {"uv": [11, 14, 0, 12], "rotation": 90, "texture": "#1"},
"down": {"uv": [12, 14, 0, 16], "rotation": 270, "texture": "#1"}
}
},
{
"from": [14, 12, 2],
"to": [16, 16, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"north": {"uv": [16, 16, 14, 12], "texture": "#2"},
"east": {"uv": [0, 12, 12, 8], "texture": "#2"},
"south": {"uv": [12, 16, 14, 12], "texture": "#2"},
"west": {"uv": [12, 16, 0, 12], "texture": "#2"},
"up": {"uv": [11, 12, 0, 14], "rotation": 90, "texture": "#1"},
"down": {"uv": [12, 16, 0, 14], "rotation": 270, "texture": "#1"}
} }
} }
], ],
"groups": [ "groups": [
{ {
"name": "Frame", "name": "block_double_wall",
"origin": [8, 8, 8], "origin": [8, 8, 8],
"color": 0,
"children": [0, 1] "children": [0, 1]
} }, 2, 3]
]
} }

View file

@ -6,19 +6,27 @@
}, },
"elements": [ "elements": [
{ {
"from": [0.1, 0, 0], "from": [4, 4, 0],
"to": [15.9, 16, 16], "to": [12, 12, 1],
"faces": { "faces": {
"south": {"uv": [0, 0, 16, 16], "texture": "#1"}, "north": {"uv": [4, 4, 12, 12], "texture": "#1"},
"north": {"uv": [0, 0, 16, 16], "texture": "#1"} "east": {"uv": [5, 4, 4, 12], "texture": "#1"},
"south": {"uv": [12, 4, 4, 12], "texture": "#1"},
"west": {"uv": [12, 4, 11, 12], "texture": "#1"},
"up": {"uv": [12, 4, 4, 5], "texture": "#1"},
"down": {"uv": [12, 11, 4, 12], "texture": "#1"}
} }
}, },
{ {
"from": [15.9, 0, 0], "from": [4, 4, 15],
"to": [0.1, 16, 16], "to": [12, 12, 16],
"faces": { "faces": {
"south": {"uv": [0, 0, 16, 16], "texture": "#1"}, "north": {"uv": [4, 4, 12, 12], "texture": "#1"},
"north": {"uv": [0, 0, 16, 16], "texture": "#1"} "east": {"uv": [5, 4, 4, 12], "texture": "#1"},
"south": {"uv": [12, 4, 4, 12], "texture": "#1"},
"west": {"uv": [12, 4, 11, 12], "texture": "#1"},
"up": {"uv": [12, 4, 4, 5], "texture": "#1"},
"down": {"uv": [12, 11, 4, 12], "texture": "#1"}
} }
} }
], ],
@ -26,7 +34,7 @@
{ {
"name": "Frame", "name": "Frame",
"origin": [8, 8, 8], "origin": [8, 8, 8],
"children": [0, 1] "color": 0,
} "children": []
] }, 0, 1]
} }

View file

@ -7,29 +7,59 @@
}, },
"elements": [ "elements": [
{ {
"from": [0.1, 0, 0], "from": [15, 4, 4],
"to": [15.9, 16, 16], "to": [16, 12, 12],
"faces": { "faces": {
"east": {"uv": [0, 0, 16, 16], "texture": "#1"}, "north": {"uv": [16, 0, 15, 8], "texture": "#2"},
"west": {"uv": [0, 0, 16, 16], "texture": "#1"}, "east": {"uv": [0, 0, 8, 8], "texture": "#2"},
"down": {"uv": [0, 0, 15.8, 16], "texture": "#2"} "south": {"uv": [1, 0, 0, 8], "texture": "#2"},
"west": {"uv": [16, 0, 8, 8], "texture": "#2"},
"up": {"uv": [12, 4, 4, 5], "rotation": 90, "texture": "#1"},
"down": {"uv": [12, 11, 4, 12], "rotation": 270, "texture": "#1"}
} }
}, },
{ {
"from": [15.9, 0, 0], "from": [0, 4, 4],
"to": [0.1, 16, 16], "to": [1, 12, 12],
"faces": { "faces": {
"east": {"uv": [0, 0, 16, 16], "texture": "#1"}, "north": {"uv": [16, 0, 15, 8], "texture": "#2"},
"west": {"uv": [0, 0, 16, 16], "texture": "#1"}, "east": {"uv": [8, 0, 16, 8], "texture": "#2"},
"down": {"uv": [0, 0, 16, 16], "texture": "#2"} "south": {"uv": [1, 0, 0, 8], "texture": "#2"},
"west": {"uv": [8, 0, 0, 8], "texture": "#2"},
"up": {"uv": [12, 4, 4, 5], "rotation": 90, "texture": "#1"},
"down": {"uv": [12, 11, 4, 12], "rotation": 270, "texture": "#1"}
}
},
{
"from": [0, 0, 2],
"to": [2, 4, 14],
"faces": {
"north": {"uv": [14, 12, 16, 16], "texture": "#2"},
"east": {"uv": [0, 12, 12, 16], "texture": "#2"},
"south": {"uv": [14, 12, 12, 16], "texture": "#2"},
"west": {"uv": [12, 8, 0, 12], "texture": "#2"},
"up": {"uv": [0, 14, 12, 16], "rotation": 270, "texture": "#1"},
"down": {"uv": [0, 14, 11, 12], "rotation": 90, "texture": "#1"}
}
},
{
"from": [14, 0, 2],
"to": [16, 4, 14],
"faces": {
"north": {"uv": [16, 12, 14, 16], "texture": "#2"},
"east": {"uv": [0, 8, 12, 12], "texture": "#2"},
"south": {"uv": [12, 12, 14, 16], "texture": "#2"},
"west": {"uv": [12, 12, 0, 16], "texture": "#2"},
"up": {"uv": [0, 16, 12, 14], "rotation": 270, "texture": "#1"},
"down": {"uv": [0, 12, 11, 14], "rotation": 90, "texture": "#1"}
} }
} }
], ],
"groups": [ "groups": [
{ {
"name": "Frame", "name": "block_double_wall",
"origin": [8, 8, 8], "origin": [8, 8, 8],
"color": 0,
"children": [0, 1] "children": [0, 1]
} }, 2, 3]
]
} }

View file

@ -6,17 +6,15 @@
}, },
"elements": [ "elements": [
{ {
"from": [0.1, 0, 0], "from": [4, 4, 0],
"to": [15.9, 16, 16], "to": [12, 12, 1],
"faces": { "faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#1"} "north": {"uv": [4, 4, 12, 12], "texture": "#1"},
} "east": {"uv": [4, 4, 5, 12], "texture": "#1"},
}, "south": {"uv": [12, 4, 4, 12], "texture": "#1"},
{ "west": {"uv": [11, 4, 12, 12], "texture": "#1"},
"from": [15.9, 0, 0], "up": {"uv": [12, 4, 4, 5], "texture": "#1"},
"to": [0.1, 16, 16], "down": {"uv": [12, 11, 4, 12], "texture": "#1"}
"faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#1"}
} }
} }
], ],
@ -24,7 +22,8 @@
{ {
"name": "Frame", "name": "Frame",
"origin": [8, 8, 8], "origin": [8, 8, 8],
"children": [0, 1] "color": 0,
"children": [0]
} }
] ]
} }

View file

@ -7,8 +7,8 @@
}, },
"elements": [ "elements": [
{ {
"from": [14, 7, 7], "from": [13, 7, 7],
"to": [16, 9, 9], "to": [15, 9, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": { "faces": {
"north": {"uv": [10.5, 6, 9.5, 7], "texture": "#0"}, "north": {"uv": [10.5, 6, 9.5, 7], "texture": "#0"},
@ -20,8 +20,8 @@
} }
}, },
{ {
"from": [0, 7, 7], "from": [1, 7, 7],
"to": [2, 9, 9], "to": [3, 9, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": { "faces": {
"north": {"uv": [9.5, 6, 10.5, 7], "texture": "#0"}, "north": {"uv": [9.5, 6, 10.5, 7], "texture": "#0"},
@ -33,8 +33,8 @@
} }
}, },
{ {
"from": [3, 0, 3], "from": [3, 1, 3],
"to": [13, 2, 13], "to": [13, 3, 13],
"faces": { "faces": {
"north": {"uv": [0, 15, 5, 16], "texture": "#0"}, "north": {"uv": [0, 15, 5, 16], "texture": "#0"},
"east": {"uv": [0, 15, 5, 16], "texture": "#0"}, "east": {"uv": [0, 15, 5, 16], "texture": "#0"},
@ -45,8 +45,8 @@
} }
}, },
{ {
"from": [4, 2, 4], "from": [4, 3, 4],
"to": [12, 11, 12], "to": [12, 12, 12],
"faces": { "faces": {
"north": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, "north": {"uv": [8, 0, 12, 4.5], "texture": "#0"},
"east": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, "east": {"uv": [8, 0, 12, 4.5], "texture": "#0"},
@ -56,8 +56,8 @@
} }
}, },
{ {
"from": [7, 11, 7], "from": [7, 12, 7],
"to": [9, 15, 9], "to": [9, 16, 9],
"faces": { "faces": {
"north": {"uv": [8, 6, 9, 8], "texture": "#0"}, "north": {"uv": [8, 6, 9, 8], "texture": "#0"},
"east": {"uv": [8, 6, 9, 8], "texture": "#0"}, "east": {"uv": [8, 6, 9, 8], "texture": "#0"},
@ -87,6 +87,7 @@
{ {
"name": "Bell", "name": "Bell",
"origin": [8, 8, 8], "origin": [8, 8, 8],
"color": 0,
"children": [0, 1, 2, 3, 4, 5, 6] "children": [0, 1, 2, 3, 4, 5, 6]
} }
] ]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 836 B

After

Width:  |  Height:  |  Size: 727 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 561 B

After

Width:  |  Height:  |  Size: 782 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 586 B

After

Width:  |  Height:  |  Size: 700 B

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "atmospheric:aspen_planks", "item": "atmospheric:aspen_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "atmospheric:grimwood_planks", "item": "atmospheric:grimwood_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "atmospheric:kousa_planks", "item": "atmospheric:kousa_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "atmospheric:rosewood_planks", "item": "atmospheric:rosewood_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "atmospheric:yucca_planks", "item": "atmospheric:yucca_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "autumnity:maple_planks", "item": "autumnity:maple_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "bloomful:wisteria_planks", "item": "bloomful:wisteria_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "biomesoplenty:cherry_planks", "item": "biomesoplenty:cherry_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "biomesoplenty:dead_planks", "item": "biomesoplenty:dead_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "biomesoplenty:fir_planks", "item": "biomesoplenty:fir_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "biomesoplenty:hellbark_planks", "item": "biomesoplenty:hellbark_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "biomesoplenty:jacaranda_planks", "item": "biomesoplenty:jacaranda_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "biomesoplenty:magic_planks", "item": "biomesoplenty:magic_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "biomesoplenty:mahogany_planks", "item": "biomesoplenty:mahogany_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "biomesoplenty:palm_planks", "item": "biomesoplenty:palm_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "biomesoplenty:redwood_planks", "item": "biomesoplenty:redwood_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "biomesoplenty:umbran_planks", "item": "biomesoplenty:umbran_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "biomesoplenty:willow_planks", "item": "biomesoplenty:willow_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "druidcraft:darkwood_planks", "item": "druidcraft:darkwood_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "druidcraft:elder_planks", "item": "druidcraft:elder_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "endergetic:poise_planks", "item": "endergetic:poise_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "projectvibrantjourneys:aspen_planks", "item": "projectvibrantjourneys:aspen_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "projectvibrantjourneys:baobab_planks", "item": "projectvibrantjourneys:baobab_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "projectvibrantjourneys:cottonwood_planks", "item": "projectvibrantjourneys:cottonwood_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "projectvibrantjourneys:fir_planks", "item": "projectvibrantjourneys:fir_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "projectvibrantjourneys:juniper_planks", "item": "projectvibrantjourneys:juniper_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "projectvibrantjourneys:mangrove_planks", "item": "projectvibrantjourneys:mangrove_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "projectvibrantjourneys:maple_planks", "item": "projectvibrantjourneys:maple_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

View file

@ -14,8 +14,8 @@
"results": [ "results": [
{ {
"item": "projectvibrantjourneys:palm_planks", "item": "projectvibrantjourneys:palm_planks",
"count": 5 "count": 6
} }
], ],
"processingTime": 100 "processingTime": 50
} }

Some files were not shown because too many files have changed in this diff Show more