diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index a712665a2..7aaffed16 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -304,6 +304,7 @@ c17d334e938dcb742550ba8307ca8266a1fc9b49 assets/create/blockstates/paved_weather cb23aef25f3106b06c8fa8f152c638bb0d2185d8 assets/create/blockstates/paved_weathered_limestone_slab.json d62b0992cec1de45dad1f2c273132225f4ef33a0 assets/create/blockstates/paved_weathered_limestone_stairs.json e29e245d06c46dac94fcd0e01a9bf7fa8e02fb87 assets/create/blockstates/paved_weathered_limestone_wall.json +7734d96271a199579e3ebb0bebf8bcd1cbec0992 assets/create/blockstates/peculiar_bell.json 30971f2f76fe56f144178c33ad6bde5fc9fb61c3 assets/create/blockstates/pink_sail.json 919a79e4a4a5fab0aac3ef48e1c786017d6aa001 assets/create/blockstates/pink_seat.json 471a3bb474a0ae0453143888d561256cce894e3f assets/create/blockstates/pink_valve_handle.json @@ -409,20 +410,20 @@ a3a11524cd3515fc01d905767b4b7ea782adaf03 assets/create/blockstates/yellow_seat.j 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json e6152504e06696dd5e67fc7711c8a35a0e89adc1 assets/create/lang/en_ud.json -00337b04d0232065f83af04be1602a4bbca41a9a assets/create/lang/en_us.json -72c1bdf241a2a1714012629313a7dca832f16543 assets/create/lang/unfinished/de_de.json -b5dba799882a10acabba2da1364f13c6315a2faf assets/create/lang/unfinished/es_es.json -e120bf71ae293dc52d3c3bce580f62f26342ff70 assets/create/lang/unfinished/es_mx.json -1ecb0ec82bb47c06d0aa70a91e8e41ccf6732ac4 assets/create/lang/unfinished/fr_fr.json -e351b0007f1a81b52dc665ee7e602c70674cbb1a assets/create/lang/unfinished/it_it.json -23356bb29f55045b67593be4b33373a9fdb5321b assets/create/lang/unfinished/ja_jp.json -237d03e301ec70dfec0e9c1350090f33d362b598 assets/create/lang/unfinished/ko_kr.json -8cd5ab5eadc7ef36415af7cc006afae47d0b84eb assets/create/lang/unfinished/nl_nl.json -eaa616c53638b79981efb639e5c1774bb71a3b64 assets/create/lang/unfinished/pl_pl.json -30bbe746564f86680c352df4bfca0a2b35e26e22 assets/create/lang/unfinished/pt_br.json -01ed0cf0d98ea2c51279419a566218a1d81ae491 assets/create/lang/unfinished/ru_ru.json -5dfb89943acd1b569516e95ce35acb0b686aaa41 assets/create/lang/unfinished/zh_cn.json -91b105a5e2a184e27e48be907a4f80ef3123e16f assets/create/lang/unfinished/zh_tw.json +4d7ec7006116a592c33b7b7af0993928c85d3943 assets/create/lang/en_us.json +584ba74d18b1bdd51f943c2ef90ceac25df60b4b assets/create/lang/unfinished/de_de.json +18a8e656082e0f34f313d551e32ed57a8f42f5ba assets/create/lang/unfinished/es_es.json +88da824ad125a1a6914b1e945d17485f97ea1543 assets/create/lang/unfinished/es_mx.json +790f6fafb21a2290adbe6da075c9894b4cd9ce9e assets/create/lang/unfinished/fr_fr.json +b3801b0e37c3a93014d0b209b3c20d0eb4982550 assets/create/lang/unfinished/it_it.json +190bf21a8e82f264db0e1aa32f0516e43725e725 assets/create/lang/unfinished/ja_jp.json +bb68c5668957aeb7feff85c64adb7ee1beecd076 assets/create/lang/unfinished/ko_kr.json +4857d98dd044d09780c1dfad653ba62cb1db7c1e assets/create/lang/unfinished/nl_nl.json +e96765630f6aa460142ac9d59c0ded91e2bb3264 assets/create/lang/unfinished/pl_pl.json +a758699740d59f90dab2858f767d8c170cb1b2c8 assets/create/lang/unfinished/pt_br.json +a13cf78eaae1cd494dd350b46753e833e5a85f50 assets/create/lang/unfinished/ru_ru.json +77bdd9d870abb3933eec633c454ff2b5b920802d assets/create/lang/unfinished/zh_cn.json +ea1f932652bd254a592af703801dd3501407277c assets/create/lang/unfinished/zh_tw.json 487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json 3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json @@ -1537,6 +1538,7 @@ d60c4fb6e0e68d8f6c137a0c601145c342236c18 assets/create/models/item/paved_limesto 5ec22c676e301a7004ff7d127d20b46f49063c64 assets/create/models/item/paved_weathered_limestone_slab.json d81f85aea5e683539a0f3c805c154b76a9d88a9d assets/create/models/item/paved_weathered_limestone_stairs.json 910eaf2f571bae883b888d13f305bd848d278577 assets/create/models/item/paved_weathered_limestone_wall.json +2c0c9e7b131d9eb87b595abcbd68d2c55c443e58 assets/create/models/item/peculiar_bell.json 9664f171c7856661776c5c4ef0b6880a77db648e assets/create/models/item/pink_seat.json 7d12cc24b86fcb3f0ca6fee650d1dee683859c0d assets/create/models/item/pink_valve_handle.json 04ce23dc141bedccc75b4512263da8b498f13205 assets/create/models/item/piston_extension_pole.json @@ -1656,8 +1658,8 @@ d080b1b25e5bc8baf5aee68691b08c7f12ece3b0 assets/create/models/item/windmill_bear 866fbb0ce2878a73e0440d1caf6534c8bd7c384f assets/create/models/item/zinc_ingot.json a80fb25a0b655e76be986b5b49fcb0f03461a1ab assets/create/models/item/zinc_nugget.json b1689617190c05ef34bd18456b0c7ae09bb3210f assets/create/models/item/zinc_ore.json -f4c38d16e998aa2dbad4a827035fd5754c060104 assets/create/sounds.json -5d0cc4c0255dc241e61c173b31ddca70c88d08e4 data/create/advancements/aesthetics.json +60e8433e4fecca8ff5002978844169eefc929394 assets/create/sounds.json +0f1b4b980afba9bf2caf583b88e261bba8b10313 data/create/advancements/aesthetics.json 187921fa131b06721bfaf63f2623a28c141aae9a data/create/advancements/andesite_alloy.json 0ea2db7173b5be28b289ea7c9a6a0cf5805c60c7 data/create/advancements/andesite_casing.json 83c046bd200623933545c9e4326f782fb02c87fa data/create/advancements/arm_blaze_burner.json @@ -1789,6 +1791,7 @@ dd487f98c411f1ff22cb7fc208b8cc24b27deb2f data/create/advancements/recipes/create 911159091a9674c36e8cd49f56f63e5442988e84 data/create/advancements/recipes/create.base/crafting/appliances/linked_controller.json 51cdcf168087f47e4458eed7543d227da1ee5ca0 data/create/advancements/recipes/create.base/crafting/appliances/tree_fertilizer.json d531f87f425d199aee4777a588c1cd6cab6f5173 data/create/advancements/recipes/create.base/crafting/curiosities/minecart_coupling.json +a8c72e7e02fd0843d33fa4c5d43de81f29bc3aa4 data/create/advancements/recipes/create.base/crafting/curiosities/peculiar_bell.json 2eef3201017af03f6a2f0f015645e3ff5e25d9c1 data/create/advancements/recipes/create.base/crafting/curiosities/wand_of_symmetry.json 80155fa8e28e7de87adad3dc2cd79564496d7ef7 data/create/advancements/recipes/create.base/crafting/kinetics/adjustable_chain_gearshift.json 92416ced6ede6965fd728e1c7336bb05a3e41ea2 data/create/advancements/recipes/create.base/crafting/kinetics/analog_lever.json @@ -2874,6 +2877,7 @@ c077375d16b4505e52548613fbc9356993556e6b data/create/recipes/crafting/appliances 7b5f863dda3d05a79cb85943a178eba0bd8a7dc7 data/create/recipes/crafting/appliances/slime_ball.json b159ba84428eee6ef6e23df1766f2a18f2c8a63e data/create/recipes/crafting/appliances/tree_fertilizer.json 660e92da2b1b6698b1c0df74bd74a56a25fb3eca data/create/recipes/crafting/curiosities/minecart_coupling.json +23ad6016273c0a1aefc8950187caf321f55ce738 data/create/recipes/crafting/curiosities/peculiar_bell.json fcbc04d0a7eaf820a74bc7e4736a4a581e0a9dff data/create/recipes/crafting/curiosities/wand_of_symmetry.json cc56d21a25286a9024e506dde9fa161230eaf46d data/create/recipes/crafting/kinetics/adjustable_chain_gearshift.json 88de51b451469698665b7319e5b9cfb9a87ae3e0 data/create/recipes/crafting/kinetics/analog_lever.json diff --git a/src/generated/resources/assets/create/blockstates/peculiar_bell.json b/src/generated/resources/assets/create/blockstates/peculiar_bell.json new file mode 100644 index 000000000..1c4ad76a6 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/peculiar_bell.json @@ -0,0 +1,124 @@ +{ + "variants": { + "attachment=floor,facing=north,powered=false": { + "model": "create:block/peculiar_bell/block_floor" + }, + "attachment=ceiling,facing=north,powered=false": { + "model": "create:block/peculiar_bell/block_ceiling" + }, + "attachment=single_wall,facing=north,powered=false": { + "model": "create:block/peculiar_bell/block_single_wall" + }, + "attachment=double_wall,facing=north,powered=false": { + "model": "create:block/peculiar_bell/block_double_wall" + }, + "attachment=floor,facing=south,powered=false": { + "model": "create:block/peculiar_bell/block_floor", + "y": 180 + }, + "attachment=ceiling,facing=south,powered=false": { + "model": "create:block/peculiar_bell/block_ceiling", + "y": 180 + }, + "attachment=single_wall,facing=south,powered=false": { + "model": "create:block/peculiar_bell/block_single_wall", + "y": 180 + }, + "attachment=double_wall,facing=south,powered=false": { + "model": "create:block/peculiar_bell/block_double_wall", + "y": 180 + }, + "attachment=floor,facing=west,powered=false": { + "model": "create:block/peculiar_bell/block_floor", + "y": 270 + }, + "attachment=ceiling,facing=west,powered=false": { + "model": "create:block/peculiar_bell/block_ceiling", + "y": 270 + }, + "attachment=single_wall,facing=west,powered=false": { + "model": "create:block/peculiar_bell/block_single_wall", + "y": 270 + }, + "attachment=double_wall,facing=west,powered=false": { + "model": "create:block/peculiar_bell/block_double_wall", + "y": 270 + }, + "attachment=floor,facing=east,powered=false": { + "model": "create:block/peculiar_bell/block_floor", + "y": 90 + }, + "attachment=ceiling,facing=east,powered=false": { + "model": "create:block/peculiar_bell/block_ceiling", + "y": 90 + }, + "attachment=single_wall,facing=east,powered=false": { + "model": "create:block/peculiar_bell/block_single_wall", + "y": 90 + }, + "attachment=double_wall,facing=east,powered=false": { + "model": "create:block/peculiar_bell/block_double_wall", + "y": 90 + }, + "attachment=floor,facing=north,powered=true": { + "model": "create:block/peculiar_bell/block_floor" + }, + "attachment=ceiling,facing=north,powered=true": { + "model": "create:block/peculiar_bell/block_ceiling" + }, + "attachment=single_wall,facing=north,powered=true": { + "model": "create:block/peculiar_bell/block_single_wall" + }, + "attachment=double_wall,facing=north,powered=true": { + "model": "create:block/peculiar_bell/block_double_wall" + }, + "attachment=floor,facing=south,powered=true": { + "model": "create:block/peculiar_bell/block_floor", + "y": 180 + }, + "attachment=ceiling,facing=south,powered=true": { + "model": "create:block/peculiar_bell/block_ceiling", + "y": 180 + }, + "attachment=single_wall,facing=south,powered=true": { + "model": "create:block/peculiar_bell/block_single_wall", + "y": 180 + }, + "attachment=double_wall,facing=south,powered=true": { + "model": "create:block/peculiar_bell/block_double_wall", + "y": 180 + }, + "attachment=floor,facing=west,powered=true": { + "model": "create:block/peculiar_bell/block_floor", + "y": 270 + }, + "attachment=ceiling,facing=west,powered=true": { + "model": "create:block/peculiar_bell/block_ceiling", + "y": 270 + }, + "attachment=single_wall,facing=west,powered=true": { + "model": "create:block/peculiar_bell/block_single_wall", + "y": 270 + }, + "attachment=double_wall,facing=west,powered=true": { + "model": "create:block/peculiar_bell/block_double_wall", + "y": 270 + }, + "attachment=floor,facing=east,powered=true": { + "model": "create:block/peculiar_bell/block_floor", + "y": 90 + }, + "attachment=ceiling,facing=east,powered=true": { + "model": "create:block/peculiar_bell/block_ceiling", + "y": 90 + }, + "attachment=single_wall,facing=east,powered=true": { + "model": "create:block/peculiar_bell/block_single_wall", + "y": 90 + }, + "attachment=double_wall,facing=east,powered=true": { + "model": "create:block/peculiar_bell/block_double_wall", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 7b33d6913..4360a2b90 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -1169,6 +1169,7 @@ "create.subtitle.saw_idle": "Mechanical Saw turns", "create.subtitle.contraption_disassemble": "Contraption stops", + "create.subtitle.peculiar_bell_use": "Peculiar Bell tolls", "create.subtitle.mixing": "Mixing Noises", "create.subtitle.mechanical_press_activation_belt": "Mechanical Press bonks", "create.subtitle.fwoomp": "Potato Launcher fwoomps", @@ -1193,6 +1194,8 @@ "create.subtitle.controller_click": "Controller clicks", "create.subtitle.schematicannon_launch_block": "Schematicannon fires", "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.mechanical_press_activation": "Mechanical Press clangs", "create.subtitle.contraption_assemble": "Contraption moves", "create.subtitle.crafter_click": "Crafter clicks", @@ -1389,7 +1392,7 @@ "item.create.linked_controller.tooltip.behaviour3": "Enables _Bind Mode_, press one of the _six controls_ to bind it to the _Links' Frequency_.", "item.create.diving_helmet.tooltip": "DIVING HELMET", - "item.create.diving_helmet.tooltip.summary": "Together with a _Copper_ _Backtank_, allows the weilder to _breathe_ _underwater_ for an extended amount of time.", + "item.create.diving_helmet.tooltip.summary": "Together with a _Copper_ _Backtank_, allows the wielder to _breathe_ _underwater_ for an extended amount of time.", "item.create.diving_helmet.tooltip.condition1": "When Worn", "item.create.diving_helmet.tooltip.behaviour1": "Provides the _Water Breathing_ effect, slowly draining _Air Pressure_ from the Backtank.", @@ -1403,7 +1406,7 @@ "item.create.diving_boots.tooltip": "DIVING BOOTS", "item.create.diving_boots.tooltip.summary": "A pair of _heavy_ _boots_, allowing for better traversal of the Ocean floor.", "item.create.diving_boots.tooltip.condition1": "When Worn", - "item.create.diving_boots.tooltip.behaviour1": "Weilder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Weilder also is no longer affected by _Mechanical_ _Belts_.", + "item.create.diving_boots.tooltip.behaviour1": "Wielder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.", "item.create.crafting_blueprint.tooltip": "CRAFTING BLUEPRINT", "item.create.crafting_blueprint.tooltip.summary": "_Placed_ on a wall, it can be used to _specify_ _ingredient_ _arrangements_ for easier manual crafting. Each slot represents a Recipe.", @@ -1417,6 +1420,14 @@ "item.create.minecart_coupling.tooltip.condition1": "When Used on Minecart", "item.create.minecart_coupling.tooltip.behaviour1": "_Couples_ two Minecarts together, attempting to keep them at a _constant distance_ while moving.", + "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.cursed_bell.tooltip": "CURSED BELL", + "block.create.cursed_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.cursed_bell.tooltip.behaviour1": "Highlights nearby dark spots on which Hostile Mobs could spawn.", + "_": "->------------------------] Ponder Content [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/de_de.json b/src/generated/resources/assets/create/lang/unfinished/de_de.json index be2a1c5e6..7bec5cd38 100644 --- a/src/generated/resources/assets/create/lang/unfinished/de_de.json +++ b/src/generated/resources/assets/create/lang/unfinished/de_de.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1064", + "_": "Missing Localizations: 1073", "_": "->------------------------] Game Elements [------------------------<-", @@ -1170,6 +1170,7 @@ "create.subtitle.saw_idle": "UNLOCALIZED: Mechanical Saw turns", "create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops", + "create.subtitle.peculiar_bell_use": "UNLOCALIZED: Peculiar Bell tolls", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", "create.subtitle.fwoomp": "UNLOCALIZED: Potato Launcher fwoomps", @@ -1194,6 +1195,8 @@ "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.schematicannon_launch_block": "Bauplankanone schießt", "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.mechanical_press_activation": "Mechanische Presse wird aktiviert", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", @@ -1390,7 +1393,7 @@ "item.create.linked_controller.tooltip.behaviour3": "UNLOCALIZED: Enables _Bind Mode_, press one of the _six controls_ to bind it to the _Links' Frequency_.", "item.create.diving_helmet.tooltip": "UNLOCALIZED: DIVING HELMET", - "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the weilder to _breathe_ _underwater_ for an extended amount of time.", + "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the wielder to _breathe_ _underwater_ for an extended amount of time.", "item.create.diving_helmet.tooltip.condition1": "UNLOCALIZED: When Worn", "item.create.diving_helmet.tooltip.behaviour1": "UNLOCALIZED: Provides the _Water Breathing_ effect, slowly draining _Air Pressure_ from the Backtank.", @@ -1404,7 +1407,7 @@ "item.create.diving_boots.tooltip": "UNLOCALIZED: DIVING BOOTS", "item.create.diving_boots.tooltip.summary": "UNLOCALIZED: A pair of _heavy_ _boots_, allowing for better traversal of the Ocean floor.", "item.create.diving_boots.tooltip.condition1": "UNLOCALIZED: When Worn", - "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Weilder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Weilder also is no longer affected by _Mechanical_ _Belts_.", + "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Wielder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.", "item.create.crafting_blueprint.tooltip": "UNLOCALIZED: CRAFTING BLUEPRINT", "item.create.crafting_blueprint.tooltip.summary": "UNLOCALIZED: _Placed_ on a wall, it can be used to _specify_ _ingredient_ _arrangements_ for easier manual crafting. Each slot represents a Recipe.", @@ -1418,6 +1421,14 @@ "item.create.minecart_coupling.tooltip.condition1": "UNLOCALIZED: When Used on Minecart", "item.create.minecart_coupling.tooltip.behaviour1": "UNLOCALIZED: _Couples_ two Minecarts together, attempting to keep them at a _constant distance_ while moving.", + "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.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", + "block.create.cursed_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.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", + "_": "->------------------------] Ponder Content [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/es_es.json b/src/generated/resources/assets/create/lang/unfinished/es_es.json index 7c6566c57..8983ea9da 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_es.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_es.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 825", + "_": "Missing Localizations: 834", "_": "->------------------------] Game Elements [------------------------<-", @@ -1170,6 +1170,7 @@ "create.subtitle.saw_idle": "UNLOCALIZED: Mechanical Saw turns", "create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops", + "create.subtitle.peculiar_bell_use": "UNLOCALIZED: Peculiar Bell tolls", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", "create.subtitle.fwoomp": "UNLOCALIZED: Potato Launcher fwoomps", @@ -1194,6 +1195,8 @@ "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.schematicannon_launch_block": "Disparos de Schematicannon", "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.mechanical_press_activation": "La Prensa Mecánica se activa", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", @@ -1390,7 +1393,7 @@ "item.create.linked_controller.tooltip.behaviour3": "UNLOCALIZED: Enables _Bind Mode_, press one of the _six controls_ to bind it to the _Links' Frequency_.", "item.create.diving_helmet.tooltip": "UNLOCALIZED: DIVING HELMET", - "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the weilder to _breathe_ _underwater_ for an extended amount of time.", + "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the wielder to _breathe_ _underwater_ for an extended amount of time.", "item.create.diving_helmet.tooltip.condition1": "UNLOCALIZED: When Worn", "item.create.diving_helmet.tooltip.behaviour1": "UNLOCALIZED: Provides the _Water Breathing_ effect, slowly draining _Air Pressure_ from the Backtank.", @@ -1404,7 +1407,7 @@ "item.create.diving_boots.tooltip": "UNLOCALIZED: DIVING BOOTS", "item.create.diving_boots.tooltip.summary": "UNLOCALIZED: A pair of _heavy_ _boots_, allowing for better traversal of the Ocean floor.", "item.create.diving_boots.tooltip.condition1": "UNLOCALIZED: When Worn", - "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Weilder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Weilder also is no longer affected by _Mechanical_ _Belts_.", + "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Wielder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.", "item.create.crafting_blueprint.tooltip": "UNLOCALIZED: CRAFTING BLUEPRINT", "item.create.crafting_blueprint.tooltip.summary": "UNLOCALIZED: _Placed_ on a wall, it can be used to _specify_ _ingredient_ _arrangements_ for easier manual crafting. Each slot represents a Recipe.", @@ -1418,6 +1421,14 @@ "item.create.minecart_coupling.tooltip.condition1": "Cuando se utiliza en Vagonetas", "item.create.minecart_coupling.tooltip.behaviour1": "_Acopla_ dos Vagonetas, intentando mantenerlas a una _distancia constante_ mientras se mueven", + "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.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", + "block.create.cursed_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.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", + "_": "->------------------------] Ponder Content [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/es_mx.json b/src/generated/resources/assets/create/lang/unfinished/es_mx.json index 141c95beb..705f47f8d 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_mx.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_mx.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1431", + "_": "Missing Localizations: 1440", "_": "->------------------------] Game Elements [------------------------<-", @@ -1170,6 +1170,7 @@ "create.subtitle.saw_idle": "UNLOCALIZED: Mechanical Saw turns", "create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops", + "create.subtitle.peculiar_bell_use": "UNLOCALIZED: Peculiar Bell tolls", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", "create.subtitle.fwoomp": "UNLOCALIZED: Potato Launcher fwoomps", @@ -1194,6 +1195,8 @@ "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.schematicannon_launch_block": "UNLOCALIZED: Schematicannon fires", "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.mechanical_press_activation": "UNLOCALIZED: Mechanical Press clangs", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", @@ -1390,7 +1393,7 @@ "item.create.linked_controller.tooltip.behaviour3": "UNLOCALIZED: Enables _Bind Mode_, press one of the _six controls_ to bind it to the _Links' Frequency_.", "item.create.diving_helmet.tooltip": "UNLOCALIZED: DIVING HELMET", - "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the weilder to _breathe_ _underwater_ for an extended amount of time.", + "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the wielder to _breathe_ _underwater_ for an extended amount of time.", "item.create.diving_helmet.tooltip.condition1": "UNLOCALIZED: When Worn", "item.create.diving_helmet.tooltip.behaviour1": "UNLOCALIZED: Provides the _Water Breathing_ effect, slowly draining _Air Pressure_ from the Backtank.", @@ -1404,7 +1407,7 @@ "item.create.diving_boots.tooltip": "UNLOCALIZED: DIVING BOOTS", "item.create.diving_boots.tooltip.summary": "UNLOCALIZED: A pair of _heavy_ _boots_, allowing for better traversal of the Ocean floor.", "item.create.diving_boots.tooltip.condition1": "UNLOCALIZED: When Worn", - "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Weilder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Weilder also is no longer affected by _Mechanical_ _Belts_.", + "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Wielder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.", "item.create.crafting_blueprint.tooltip": "UNLOCALIZED: CRAFTING BLUEPRINT", "item.create.crafting_blueprint.tooltip.summary": "UNLOCALIZED: _Placed_ on a wall, it can be used to _specify_ _ingredient_ _arrangements_ for easier manual crafting. Each slot represents a Recipe.", @@ -1418,6 +1421,14 @@ "item.create.minecart_coupling.tooltip.condition1": "UNLOCALIZED: When Used on Minecart", "item.create.minecart_coupling.tooltip.behaviour1": "UNLOCALIZED: _Couples_ two Minecarts together, attempting to keep them at a _constant distance_ while moving.", + "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.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", + "block.create.cursed_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.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", + "_": "->------------------------] Ponder Content [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json index 4cc2b8505..aeada7ee7 100644 --- a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json +++ b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1316", + "_": "Missing Localizations: 1325", "_": "->------------------------] Game Elements [------------------------<-", @@ -1170,6 +1170,7 @@ "create.subtitle.saw_idle": "UNLOCALIZED: Mechanical Saw turns", "create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops", + "create.subtitle.peculiar_bell_use": "UNLOCALIZED: Peculiar Bell tolls", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", "create.subtitle.fwoomp": "UNLOCALIZED: Potato Launcher fwoomps", @@ -1194,6 +1195,8 @@ "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.schematicannon_launch_block": "Tir de schémacanon", "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.mechanical_press_activation": "Activation de la presse mechanique", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", @@ -1390,7 +1393,7 @@ "item.create.linked_controller.tooltip.behaviour3": "UNLOCALIZED: Enables _Bind Mode_, press one of the _six controls_ to bind it to the _Links' Frequency_.", "item.create.diving_helmet.tooltip": "UNLOCALIZED: DIVING HELMET", - "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the weilder to _breathe_ _underwater_ for an extended amount of time.", + "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the wielder to _breathe_ _underwater_ for an extended amount of time.", "item.create.diving_helmet.tooltip.condition1": "UNLOCALIZED: When Worn", "item.create.diving_helmet.tooltip.behaviour1": "UNLOCALIZED: Provides the _Water Breathing_ effect, slowly draining _Air Pressure_ from the Backtank.", @@ -1404,7 +1407,7 @@ "item.create.diving_boots.tooltip": "UNLOCALIZED: DIVING BOOTS", "item.create.diving_boots.tooltip.summary": "UNLOCALIZED: A pair of _heavy_ _boots_, allowing for better traversal of the Ocean floor.", "item.create.diving_boots.tooltip.condition1": "UNLOCALIZED: When Worn", - "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Weilder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Weilder also is no longer affected by _Mechanical_ _Belts_.", + "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Wielder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.", "item.create.crafting_blueprint.tooltip": "UNLOCALIZED: CRAFTING BLUEPRINT", "item.create.crafting_blueprint.tooltip.summary": "UNLOCALIZED: _Placed_ on a wall, it can be used to _specify_ _ingredient_ _arrangements_ for easier manual crafting. Each slot represents a Recipe.", @@ -1418,6 +1421,14 @@ "item.create.minecart_coupling.tooltip.condition1": "UNLOCALIZED: When Used on Minecart", "item.create.minecart_coupling.tooltip.behaviour1": "UNLOCALIZED: _Couples_ two Minecarts together, attempting to keep them at a _constant distance_ while moving.", + "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.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", + "block.create.cursed_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.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", + "_": "->------------------------] Ponder Content [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/it_it.json b/src/generated/resources/assets/create/lang/unfinished/it_it.json index c6416dd3b..0664d2120 100644 --- a/src/generated/resources/assets/create/lang/unfinished/it_it.json +++ b/src/generated/resources/assets/create/lang/unfinished/it_it.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 842", + "_": "Missing Localizations: 851", "_": "->------------------------] Game Elements [------------------------<-", @@ -1170,6 +1170,7 @@ "create.subtitle.saw_idle": "UNLOCALIZED: Mechanical Saw turns", "create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops", + "create.subtitle.peculiar_bell_use": "UNLOCALIZED: Peculiar Bell tolls", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", "create.subtitle.fwoomp": "UNLOCALIZED: Potato Launcher fwoomps", @@ -1194,6 +1195,8 @@ "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.schematicannon_launch_block": "Tiri del cannoneschematico", "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.mechanical_press_activation": "Pressa meccanica attiva", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", @@ -1390,7 +1393,7 @@ "item.create.linked_controller.tooltip.behaviour3": "UNLOCALIZED: Enables _Bind Mode_, press one of the _six controls_ to bind it to the _Links' Frequency_.", "item.create.diving_helmet.tooltip": "UNLOCALIZED: DIVING HELMET", - "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the weilder to _breathe_ _underwater_ for an extended amount of time.", + "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the wielder to _breathe_ _underwater_ for an extended amount of time.", "item.create.diving_helmet.tooltip.condition1": "UNLOCALIZED: When Worn", "item.create.diving_helmet.tooltip.behaviour1": "UNLOCALIZED: Provides the _Water Breathing_ effect, slowly draining _Air Pressure_ from the Backtank.", @@ -1404,7 +1407,7 @@ "item.create.diving_boots.tooltip": "UNLOCALIZED: DIVING BOOTS", "item.create.diving_boots.tooltip.summary": "UNLOCALIZED: A pair of _heavy_ _boots_, allowing for better traversal of the Ocean floor.", "item.create.diving_boots.tooltip.condition1": "UNLOCALIZED: When Worn", - "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Weilder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Weilder also is no longer affected by _Mechanical_ _Belts_.", + "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Wielder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.", "item.create.crafting_blueprint.tooltip": "UNLOCALIZED: CRAFTING BLUEPRINT", "item.create.crafting_blueprint.tooltip.summary": "UNLOCALIZED: _Placed_ on a wall, it can be used to _specify_ _ingredient_ _arrangements_ for easier manual crafting. Each slot represents a Recipe.", @@ -1418,6 +1421,14 @@ "item.create.minecart_coupling.tooltip.condition1": "Quando usato su un carrello da miniera", "item.create.minecart_coupling.tooltip.behaviour1": "_Concatena_ due carrelli insieme, provando a tenerli uniti a una _distanza costante_ mentre si muovono.", + "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.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", + "block.create.cursed_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.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", + "_": "->------------------------] Ponder Content [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json index 9e642886d..80f6217ea 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json +++ b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 208", + "_": "Missing Localizations: 217", "_": "->------------------------] Game Elements [------------------------<-", @@ -1170,6 +1170,7 @@ "create.subtitle.saw_idle": "UNLOCALIZED: Mechanical Saw turns", "create.subtitle.contraption_disassemble": "からくりが止まる", + "create.subtitle.peculiar_bell_use": "UNLOCALIZED: Peculiar Bell tolls", "create.subtitle.mixing": "混ぜる音", "create.subtitle.mechanical_press_activation_belt": "メカニカルプレスがボンと鳴る", "create.subtitle.fwoomp": "UNLOCALIZED: Potato Launcher fwoomps", @@ -1194,6 +1195,8 @@ "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.schematicannon_launch_block": "概略図砲が発射する", "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.mechanical_press_activation": "メカニカルプレスがガーンと鳴る", "create.subtitle.contraption_assemble": "からくりが動く", "create.subtitle.crafter_click": "メカニカルクラフターのカチカチ音", @@ -1390,7 +1393,7 @@ "item.create.linked_controller.tooltip.behaviour3": "UNLOCALIZED: Enables _Bind Mode_, press one of the _six controls_ to bind it to the _Links' Frequency_.", "item.create.diving_helmet.tooltip": "UNLOCALIZED: DIVING HELMET", - "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the weilder to _breathe_ _underwater_ for an extended amount of time.", + "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the wielder to _breathe_ _underwater_ for an extended amount of time.", "item.create.diving_helmet.tooltip.condition1": "UNLOCALIZED: When Worn", "item.create.diving_helmet.tooltip.behaviour1": "UNLOCALIZED: Provides the _Water Breathing_ effect, slowly draining _Air Pressure_ from the Backtank.", @@ -1404,7 +1407,7 @@ "item.create.diving_boots.tooltip": "UNLOCALIZED: DIVING BOOTS", "item.create.diving_boots.tooltip.summary": "UNLOCALIZED: A pair of _heavy_ _boots_, allowing for better traversal of the Ocean floor.", "item.create.diving_boots.tooltip.condition1": "UNLOCALIZED: When Worn", - "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Weilder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Weilder also is no longer affected by _Mechanical_ _Belts_.", + "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Wielder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.", "item.create.crafting_blueprint.tooltip": "UNLOCALIZED: CRAFTING BLUEPRINT", "item.create.crafting_blueprint.tooltip.summary": "UNLOCALIZED: _Placed_ on a wall, it can be used to _specify_ _ingredient_ _arrangements_ for easier manual crafting. Each slot represents a Recipe.", @@ -1418,6 +1421,14 @@ "item.create.minecart_coupling.tooltip.condition1": "トロッコに使ったとき", "item.create.minecart_coupling.tooltip.behaviour1": "_2台_のトロッコを連結します。それらは移動中に_一定_の_距離_を保とうします。", + "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.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", + "block.create.cursed_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.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", + "_": "->------------------------] Ponder Content [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json index 69aa8e6bb..5e3d46541 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json +++ b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 895", + "_": "Missing Localizations: 904", "_": "->------------------------] Game Elements [------------------------<-", @@ -1170,6 +1170,7 @@ "create.subtitle.saw_idle": "UNLOCALIZED: Mechanical Saw turns", "create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops", + "create.subtitle.peculiar_bell_use": "UNLOCALIZED: Peculiar Bell tolls", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", "create.subtitle.fwoomp": "UNLOCALIZED: Potato Launcher fwoomps", @@ -1194,6 +1195,8 @@ "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.schematicannon_launch_block": "청사진 대포가 발포함", "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.mechanical_press_activation": "압착기가 가동됨", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", @@ -1390,7 +1393,7 @@ "item.create.linked_controller.tooltip.behaviour3": "UNLOCALIZED: Enables _Bind Mode_, press one of the _six controls_ to bind it to the _Links' Frequency_.", "item.create.diving_helmet.tooltip": "UNLOCALIZED: DIVING HELMET", - "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the weilder to _breathe_ _underwater_ for an extended amount of time.", + "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the wielder to _breathe_ _underwater_ for an extended amount of time.", "item.create.diving_helmet.tooltip.condition1": "UNLOCALIZED: When Worn", "item.create.diving_helmet.tooltip.behaviour1": "UNLOCALIZED: Provides the _Water Breathing_ effect, slowly draining _Air Pressure_ from the Backtank.", @@ -1404,7 +1407,7 @@ "item.create.diving_boots.tooltip": "UNLOCALIZED: DIVING BOOTS", "item.create.diving_boots.tooltip.summary": "UNLOCALIZED: A pair of _heavy_ _boots_, allowing for better traversal of the Ocean floor.", "item.create.diving_boots.tooltip.condition1": "UNLOCALIZED: When Worn", - "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Weilder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Weilder also is no longer affected by _Mechanical_ _Belts_.", + "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Wielder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.", "item.create.crafting_blueprint.tooltip": "UNLOCALIZED: CRAFTING BLUEPRINT", "item.create.crafting_blueprint.tooltip.summary": "UNLOCALIZED: _Placed_ on a wall, it can be used to _specify_ _ingredient_ _arrangements_ for easier manual crafting. Each slot represents a Recipe.", @@ -1418,6 +1421,14 @@ "item.create.minecart_coupling.tooltip.condition1": "광산 수레에 사용할 때", "item.create.minecart_coupling.tooltip.behaviour1": "_두 수레를 묶어_ 이동할 때 고정된 _거리를 유지하게_ 합니다.", + "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.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", + "block.create.cursed_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.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", + "_": "->------------------------] Ponder Content [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json index 38d1be513..18dc46c7f 100644 --- a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json +++ b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1699", + "_": "Missing Localizations: 1708", "_": "->------------------------] Game Elements [------------------------<-", @@ -1170,6 +1170,7 @@ "create.subtitle.saw_idle": "UNLOCALIZED: Mechanical Saw turns", "create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops", + "create.subtitle.peculiar_bell_use": "UNLOCALIZED: Peculiar Bell tolls", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", "create.subtitle.fwoomp": "UNLOCALIZED: Potato Launcher fwoomps", @@ -1194,6 +1195,8 @@ "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.schematicannon_launch_block": "UNLOCALIZED: Schematicannon fires", "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.mechanical_press_activation": "UNLOCALIZED: Mechanical Press clangs", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", @@ -1390,7 +1393,7 @@ "item.create.linked_controller.tooltip.behaviour3": "UNLOCALIZED: Enables _Bind Mode_, press one of the _six controls_ to bind it to the _Links' Frequency_.", "item.create.diving_helmet.tooltip": "UNLOCALIZED: DIVING HELMET", - "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the weilder to _breathe_ _underwater_ for an extended amount of time.", + "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the wielder to _breathe_ _underwater_ for an extended amount of time.", "item.create.diving_helmet.tooltip.condition1": "UNLOCALIZED: When Worn", "item.create.diving_helmet.tooltip.behaviour1": "UNLOCALIZED: Provides the _Water Breathing_ effect, slowly draining _Air Pressure_ from the Backtank.", @@ -1404,7 +1407,7 @@ "item.create.diving_boots.tooltip": "UNLOCALIZED: DIVING BOOTS", "item.create.diving_boots.tooltip.summary": "UNLOCALIZED: A pair of _heavy_ _boots_, allowing for better traversal of the Ocean floor.", "item.create.diving_boots.tooltip.condition1": "UNLOCALIZED: When Worn", - "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Weilder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Weilder also is no longer affected by _Mechanical_ _Belts_.", + "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Wielder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.", "item.create.crafting_blueprint.tooltip": "UNLOCALIZED: CRAFTING BLUEPRINT", "item.create.crafting_blueprint.tooltip.summary": "UNLOCALIZED: _Placed_ on a wall, it can be used to _specify_ _ingredient_ _arrangements_ for easier manual crafting. Each slot represents a Recipe.", @@ -1418,6 +1421,14 @@ "item.create.minecart_coupling.tooltip.condition1": "UNLOCALIZED: When Used on Minecart", "item.create.minecart_coupling.tooltip.behaviour1": "UNLOCALIZED: _Couples_ two Minecarts together, attempting to keep them at a _constant distance_ while moving.", + "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.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", + "block.create.cursed_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.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", + "_": "->------------------------] Ponder Content [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json index cd502ef1f..8f52c7ed1 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json +++ b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 184", + "_": "Missing Localizations: 193", "_": "->------------------------] Game Elements [------------------------<-", @@ -1170,6 +1170,7 @@ "create.subtitle.saw_idle": "UNLOCALIZED: Mechanical Saw turns", "create.subtitle.contraption_disassemble": "Maszyna staje", + "create.subtitle.peculiar_bell_use": "UNLOCALIZED: Peculiar Bell tolls", "create.subtitle.mixing": "Dźwięki mieszania", "create.subtitle.mechanical_press_activation_belt": "Mechaniczna prasa stuka", "create.subtitle.fwoomp": "UNLOCALIZED: Potato Launcher fwoomps", @@ -1194,6 +1195,8 @@ "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.schematicannon_launch_block": "Schematoarmata strzela", "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.mechanical_press_activation": "Mechaniczna prasa się uruchamia", "create.subtitle.contraption_assemble": "Maszyna przesuwa się", "create.subtitle.crafter_click": "Mechaniczny stół rzemieślniczy stuka", @@ -1390,7 +1393,7 @@ "item.create.linked_controller.tooltip.behaviour3": "UNLOCALIZED: Enables _Bind Mode_, press one of the _six controls_ to bind it to the _Links' Frequency_.", "item.create.diving_helmet.tooltip": "UNLOCALIZED: DIVING HELMET", - "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the weilder to _breathe_ _underwater_ for an extended amount of time.", + "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the wielder to _breathe_ _underwater_ for an extended amount of time.", "item.create.diving_helmet.tooltip.condition1": "UNLOCALIZED: When Worn", "item.create.diving_helmet.tooltip.behaviour1": "UNLOCALIZED: Provides the _Water Breathing_ effect, slowly draining _Air Pressure_ from the Backtank.", @@ -1404,7 +1407,7 @@ "item.create.diving_boots.tooltip": "UNLOCALIZED: DIVING BOOTS", "item.create.diving_boots.tooltip.summary": "UNLOCALIZED: A pair of _heavy_ _boots_, allowing for better traversal of the Ocean floor.", "item.create.diving_boots.tooltip.condition1": "UNLOCALIZED: When Worn", - "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Weilder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Weilder also is no longer affected by _Mechanical_ _Belts_.", + "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Wielder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.", "item.create.crafting_blueprint.tooltip": "UNLOCALIZED: CRAFTING BLUEPRINT", "item.create.crafting_blueprint.tooltip.summary": "UNLOCALIZED: _Placed_ on a wall, it can be used to _specify_ _ingredient_ _arrangements_ for easier manual crafting. Each slot represents a Recipe.", @@ -1418,6 +1421,14 @@ "item.create.minecart_coupling.tooltip.condition1": "Kiedy użyto na wagoniku", "item.create.minecart_coupling.tooltip.behaviour1": "_Łączy_ dwa wagoniki, próbując utrzymać je w stałej odległości od siebie.", + "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.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", + "block.create.cursed_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.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", + "_": "->------------------------] Ponder Content [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/pt_br.json b/src/generated/resources/assets/create/lang/unfinished/pt_br.json index f4d947e1c..1cc98da4e 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_br.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_br.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1740", + "_": "Missing Localizations: 1749", "_": "->------------------------] Game Elements [------------------------<-", @@ -1170,6 +1170,7 @@ "create.subtitle.saw_idle": "UNLOCALIZED: Mechanical Saw turns", "create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops", + "create.subtitle.peculiar_bell_use": "UNLOCALIZED: Peculiar Bell tolls", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", "create.subtitle.fwoomp": "UNLOCALIZED: Potato Launcher fwoomps", @@ -1194,6 +1195,8 @@ "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.schematicannon_launch_block": "UNLOCALIZED: Schematicannon fires", "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.mechanical_press_activation": "UNLOCALIZED: Mechanical Press clangs", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", @@ -1390,7 +1393,7 @@ "item.create.linked_controller.tooltip.behaviour3": "UNLOCALIZED: Enables _Bind Mode_, press one of the _six controls_ to bind it to the _Links' Frequency_.", "item.create.diving_helmet.tooltip": "UNLOCALIZED: DIVING HELMET", - "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the weilder to _breathe_ _underwater_ for an extended amount of time.", + "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the wielder to _breathe_ _underwater_ for an extended amount of time.", "item.create.diving_helmet.tooltip.condition1": "UNLOCALIZED: When Worn", "item.create.diving_helmet.tooltip.behaviour1": "UNLOCALIZED: Provides the _Water Breathing_ effect, slowly draining _Air Pressure_ from the Backtank.", @@ -1404,7 +1407,7 @@ "item.create.diving_boots.tooltip": "UNLOCALIZED: DIVING BOOTS", "item.create.diving_boots.tooltip.summary": "UNLOCALIZED: A pair of _heavy_ _boots_, allowing for better traversal of the Ocean floor.", "item.create.diving_boots.tooltip.condition1": "UNLOCALIZED: When Worn", - "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Weilder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Weilder also is no longer affected by _Mechanical_ _Belts_.", + "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Wielder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.", "item.create.crafting_blueprint.tooltip": "UNLOCALIZED: CRAFTING BLUEPRINT", "item.create.crafting_blueprint.tooltip.summary": "UNLOCALIZED: _Placed_ on a wall, it can be used to _specify_ _ingredient_ _arrangements_ for easier manual crafting. Each slot represents a Recipe.", @@ -1418,6 +1421,14 @@ "item.create.minecart_coupling.tooltip.condition1": "UNLOCALIZED: When Used on Minecart", "item.create.minecart_coupling.tooltip.behaviour1": "UNLOCALIZED: _Couples_ two Minecarts together, attempting to keep them at a _constant distance_ while moving.", + "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.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", + "block.create.cursed_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.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", + "_": "->------------------------] Ponder Content [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json index 8129776c1..cafaf0ce0 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json +++ b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 741", + "_": "Missing Localizations: 750", "_": "->------------------------] Game Elements [------------------------<-", @@ -1170,6 +1170,7 @@ "create.subtitle.saw_idle": "UNLOCALIZED: Mechanical Saw turns", "create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops", + "create.subtitle.peculiar_bell_use": "UNLOCALIZED: Peculiar Bell tolls", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", "create.subtitle.fwoomp": "UNLOCALIZED: Potato Launcher fwoomps", @@ -1194,6 +1195,8 @@ "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.schematicannon_launch_block": "Выстрелы схематичной пушки", "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.mechanical_press_activation": "Механический пресс активирован", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", @@ -1390,7 +1393,7 @@ "item.create.linked_controller.tooltip.behaviour3": "UNLOCALIZED: Enables _Bind Mode_, press one of the _six controls_ to bind it to the _Links' Frequency_.", "item.create.diving_helmet.tooltip": "UNLOCALIZED: DIVING HELMET", - "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the weilder to _breathe_ _underwater_ for an extended amount of time.", + "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the wielder to _breathe_ _underwater_ for an extended amount of time.", "item.create.diving_helmet.tooltip.condition1": "UNLOCALIZED: When Worn", "item.create.diving_helmet.tooltip.behaviour1": "UNLOCALIZED: Provides the _Water Breathing_ effect, slowly draining _Air Pressure_ from the Backtank.", @@ -1404,7 +1407,7 @@ "item.create.diving_boots.tooltip": "UNLOCALIZED: DIVING BOOTS", "item.create.diving_boots.tooltip.summary": "UNLOCALIZED: A pair of _heavy_ _boots_, allowing for better traversal of the Ocean floor.", "item.create.diving_boots.tooltip.condition1": "UNLOCALIZED: When Worn", - "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Weilder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Weilder also is no longer affected by _Mechanical_ _Belts_.", + "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Wielder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.", "item.create.crafting_blueprint.tooltip": "UNLOCALIZED: CRAFTING BLUEPRINT", "item.create.crafting_blueprint.tooltip.summary": "UNLOCALIZED: _Placed_ on a wall, it can be used to _specify_ _ingredient_ _arrangements_ for easier manual crafting. Each slot represents a Recipe.", @@ -1418,6 +1421,14 @@ "item.create.minecart_coupling.tooltip.condition1": "При использовании на вагонетке", "item.create.minecart_coupling.tooltip.behaviour1": "_Соединяет_ две вагонетки вместе, пытаясь держать их на _определенной дистанции_ при движении.", + "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.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", + "block.create.cursed_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.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", + "_": "->------------------------] Ponder Content [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json index 5830abeb2..d926ba980 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 225", + "_": "Missing Localizations: 234", "_": "->------------------------] Game Elements [------------------------<-", @@ -1170,6 +1170,7 @@ "create.subtitle.saw_idle": "UNLOCALIZED: Mechanical Saw turns", "create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops", + "create.subtitle.peculiar_bell_use": "UNLOCALIZED: Peculiar Bell tolls", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", "create.subtitle.fwoomp": "UNLOCALIZED: Potato Launcher fwoomps", @@ -1194,6 +1195,8 @@ "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.schematicannon_launch_block": "蓝图加农炮：发射", "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.mechanical_press_activation": "辊压机：工作中", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", @@ -1390,7 +1393,7 @@ "item.create.linked_controller.tooltip.behaviour3": "UNLOCALIZED: Enables _Bind Mode_, press one of the _six controls_ to bind it to the _Links' Frequency_.", "item.create.diving_helmet.tooltip": "UNLOCALIZED: DIVING HELMET", - "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the weilder to _breathe_ _underwater_ for an extended amount of time.", + "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the wielder to _breathe_ _underwater_ for an extended amount of time.", "item.create.diving_helmet.tooltip.condition1": "UNLOCALIZED: When Worn", "item.create.diving_helmet.tooltip.behaviour1": "UNLOCALIZED: Provides the _Water Breathing_ effect, slowly draining _Air Pressure_ from the Backtank.", @@ -1404,7 +1407,7 @@ "item.create.diving_boots.tooltip": "UNLOCALIZED: DIVING BOOTS", "item.create.diving_boots.tooltip.summary": "UNLOCALIZED: A pair of _heavy_ _boots_, allowing for better traversal of the Ocean floor.", "item.create.diving_boots.tooltip.condition1": "UNLOCALIZED: When Worn", - "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Weilder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Weilder also is no longer affected by _Mechanical_ _Belts_.", + "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Wielder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.", "item.create.crafting_blueprint.tooltip": "UNLOCALIZED: CRAFTING BLUEPRINT", "item.create.crafting_blueprint.tooltip.summary": "UNLOCALIZED: _Placed_ on a wall, it can be used to _specify_ _ingredient_ _arrangements_ for easier manual crafting. Each slot represents a Recipe.", @@ -1418,6 +1421,14 @@ "item.create.minecart_coupling.tooltip.condition1": "作用与矿车时", "item.create.minecart_coupling.tooltip.behaviour1": "将两个矿车耦合在一起，在移动时将它们保持_恒定的距离_。", + "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.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", + "block.create.cursed_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.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", + "_": "->------------------------] Ponder Content [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_tw.json b/src/generated/resources/assets/create/lang/unfinished/zh_tw.json index 1335de63d..5b7cb3978 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_tw.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_tw.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 220", + "_": "Missing Localizations: 229", "_": "->------------------------] Game Elements [------------------------<-", @@ -1170,6 +1170,7 @@ "create.subtitle.saw_idle": "UNLOCALIZED: Mechanical Saw turns", "create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops", + "create.subtitle.peculiar_bell_use": "UNLOCALIZED: Peculiar Bell tolls", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mechanical_press_activation_belt": "液壓機工作", "create.subtitle.fwoomp": "UNLOCALIZED: Potato Launcher fwoomps", @@ -1194,6 +1195,8 @@ "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.schematicannon_launch_block": "藍圖大炮發射", "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.mechanical_press_activation": "液壓機工作", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", @@ -1390,7 +1393,7 @@ "item.create.linked_controller.tooltip.behaviour3": "UNLOCALIZED: Enables _Bind Mode_, press one of the _six controls_ to bind it to the _Links' Frequency_.", "item.create.diving_helmet.tooltip": "UNLOCALIZED: DIVING HELMET", - "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the weilder to _breathe_ _underwater_ for an extended amount of time.", + "item.create.diving_helmet.tooltip.summary": "UNLOCALIZED: Together with a _Copper_ _Backtank_, allows the wielder to _breathe_ _underwater_ for an extended amount of time.", "item.create.diving_helmet.tooltip.condition1": "UNLOCALIZED: When Worn", "item.create.diving_helmet.tooltip.behaviour1": "UNLOCALIZED: Provides the _Water Breathing_ effect, slowly draining _Air Pressure_ from the Backtank.", @@ -1404,7 +1407,7 @@ "item.create.diving_boots.tooltip": "UNLOCALIZED: DIVING BOOTS", "item.create.diving_boots.tooltip.summary": "UNLOCALIZED: A pair of _heavy_ _boots_, allowing for better traversal of the Ocean floor.", "item.create.diving_boots.tooltip.condition1": "UNLOCALIZED: When Worn", - "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Weilder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Weilder also is no longer affected by _Mechanical_ _Belts_.", + "item.create.diving_boots.tooltip.behaviour1": "UNLOCALIZED: Wielder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.", "item.create.crafting_blueprint.tooltip": "UNLOCALIZED: CRAFTING BLUEPRINT", "item.create.crafting_blueprint.tooltip.summary": "UNLOCALIZED: _Placed_ on a wall, it can be used to _specify_ _ingredient_ _arrangements_ for easier manual crafting. Each slot represents a Recipe.", @@ -1418,6 +1421,14 @@ "item.create.minecart_coupling.tooltip.condition1": "作用與礦車時", "item.create.minecart_coupling.tooltip.behaviour1": "將兩個礦車耦合在一起，在移動時將它們保持_恒定的距離_。", + "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.cursed_bell.tooltip": "UNLOCALIZED: CURSED BELL", + "block.create.cursed_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.cursed_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby dark spots on which Hostile Mobs could spawn.", + "_": "->------------------------] Ponder Content [------------------------<-", diff --git a/src/generated/resources/assets/create/models/item/peculiar_bell.json b/src/generated/resources/assets/create/models/item/peculiar_bell.json new file mode 100644 index 000000000..686bce88e --- /dev/null +++ b/src/generated/resources/assets/create/models/item/peculiar_bell.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/peculiar_bell/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/sounds.json b/src/generated/resources/assets/create/sounds.json index 9734980b3..cbfc13e27 100644 --- a/src/generated/resources/assets/create/sounds.json +++ b/src/generated/resources/assets/create/sounds.json @@ -110,6 +110,18 @@ } ] }, + "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": { "sounds": [ { @@ -220,6 +232,15 @@ } ] }, + "peculiar_bell_use": { + "sounds": [ + { + "name": "minecraft:block.bell.use", + "type": "event" + } + ], + "subtitle": "create.subtitle.peculiar_bell_use" + }, "potato_hit": { "sounds": [ { diff --git a/src/generated/resources/data/create/advancements/aesthetics.json b/src/generated/resources/data/create/advancements/aesthetics.json index 59a86f429..d723cbe38 100644 --- a/src/generated/resources/data/create/advancements/aesthetics.json +++ b/src/generated/resources/data/create/advancements/aesthetics.json @@ -28,8 +28,8 @@ "trigger": "create:bracket_apply", "conditions": { "accepted_entries": [ - "create:large_cogwheel", - "create:cogwheel" + "create:cogwheel", + "create:large_cogwheel" ] } }, diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/curiosities/peculiar_bell.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/curiosities/peculiar_bell.json new file mode 100644 index 000000000..e0c6e6747 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/curiosities/peculiar_bell.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:crafting/curiosities/peculiar_bell" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:crafting/curiosities/peculiar_bell" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/curiosities/peculiar_bell.json b/src/generated/resources/data/create/recipes/crafting/curiosities/peculiar_bell.json new file mode 100644 index 000000000..926890ce2 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crafting/curiosities/peculiar_bell.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " I ", + "IGI", + "S S" + ], + "key": { + "I": { + "tag": "forge:ingots/brass" + }, + "S": { + "tag": "forge:plates/brass" + }, + "G": { + "item": "minecraft:ghast_tear" + } + }, + "result": { + "item": "create:peculiar_bell" + } +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllBlockPartials.java b/src/main/java/com/simibubi/create/AllBlockPartials.java index 5c2dcb29b..c198f1bc3 100644 --- a/src/main/java/com/simibubi/create/AllBlockPartials.java +++ b/src/main/java/com/simibubi/create/AllBlockPartials.java @@ -93,7 +93,8 @@ public class AllBlockPartials { SPOUT_TOP = get("spout/top"), SPOUT_MIDDLE = get("spout/middle"), SPOUT_BOTTOM = get("spout/bottom"), - BELL = get("cursed_bell/bell"), + PECULIAR_BELL = get("peculiar_bell/bell"), + CURSED_BELL = get("cursed_bell/bell"), SPEED_CONTROLLER_BRACKET = get("rotation_speed_controller/bracket"), diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 6b17ca7ff..6cc651e20 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -194,7 +194,6 @@ import net.minecraft.loot.conditions.ILootCondition.IBuilder; import net.minecraft.loot.conditions.SurvivesExplosion; import net.minecraft.loot.functions.CopyName; import net.minecraft.loot.functions.CopyNbt; -import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.state.properties.PistonType; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; @@ -1308,14 +1307,14 @@ public class AllBlocks { public static final BlockEntry PECULIAR_BELL = REGISTRATE.block("peculiar_bell", PeculiarBellBlock::new) .initialProperties(SharedProperties::softMetal) - .properties(Block.Properties::nonOpaque) + .properties(p -> p.nonOpaque() + .sound(SoundType.ANVIL)) .addLayer(() -> RenderType::getCutoutMipped) .tag(AllBlockTags.BRITTLE.tag) - .onRegister(addMovementBehaviour(new BellMovementBehaviour(PeculiarBellBlock::playSound))) - .blockstate((c, p) -> {}) + .onRegister(addMovementBehaviour(new BellMovementBehaviour())) + .blockstate(BlockStateGen.bell()) .item() - .model((c, p) -> {}) - .build() + .transform(customItemModel()) .register(); public static final BlockEntry CURSED_BELL = diff --git a/src/main/java/com/simibubi/create/AllSoundEvents.java b/src/main/java/com/simibubi/create/AllSoundEvents.java index 8682a553e..80822308c 100644 --- a/src/main/java/com/simibubi/create/AllSoundEvents.java +++ b/src/main/java/com/simibubi/create/AllSoundEvents.java @@ -196,6 +196,19 @@ public class AllSoundEvents { BLAZE_MUNCH = create("blaze_munch").subtitle("Blaze Burner munches") .playExisting(SoundEvents.ENTITY_GENERIC_EAT, .5f, 1f) + .category(SoundCategory.BLOCKS) + .build(), + + PECULIAR_BELL_USE = create("peculiar_bell_use").subtitle("Peculiar Bell tolls") + .playExisting(SoundEvents.BLOCK_BELL_USE) + .category(SoundCategory.BLOCKS) + .build(), + + CURSED_BELL_CONVERT = create("cursed_bell_convert").subtitle("Cursed Bell awakens") + .category(SoundCategory.BLOCKS) + .build(), + + CURSED_BELL_USE = create("cursed_bell_use").subtitle("Cursed Bell tolls") .category(SoundCategory.BLOCKS) .build(); diff --git a/src/main/java/com/simibubi/create/AllTileEntities.java b/src/main/java/com/simibubi/create/AllTileEntities.java index 2fd983e15..179998138 100644 --- a/src/main/java/com/simibubi/create/AllTileEntities.java +++ b/src/main/java/com/simibubi/create/AllTileEntities.java @@ -119,7 +119,7 @@ import com.simibubi.create.content.contraptions.relays.gearbox.GearshiftTileEnti import com.simibubi.create.content.curiosities.armor.CopperBacktankInstance; import com.simibubi.create.content.curiosities.armor.CopperBacktankRenderer; import com.simibubi.create.content.curiosities.armor.CopperBacktankTileEntity; -import com.simibubi.create.content.curiosities.bell.AbstractBellRenderer; +import com.simibubi.create.content.curiosities.bell.BellRenderer; import com.simibubi.create.content.curiosities.bell.CursedBellTileEntity; import com.simibubi.create.content.curiosities.bell.PeculiarBellTileEntity; import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelInstance; @@ -670,12 +670,13 @@ public class AllTileEntities { public static final TileEntityEntry PECULIAR_BELL = Create.registrate() .tileEntity("peculiar_bell", PeculiarBellTileEntity::new) .validBlocks(AllBlocks.PECULIAR_BELL) + .renderer(() -> BellRenderer::new) .register(); public static final TileEntityEntry CURSED_BELL = Create.registrate() .tileEntity("cursed_bell", CursedBellTileEntity::new) .validBlocks(AllBlocks.CURSED_BELL) - .renderer(() -> AbstractBellRenderer::new) + .renderer(() -> BellRenderer::new) .register(); public static void register() {} diff --git a/src/main/java/com/simibubi/create/compat/jei/category/MysteriousItemConversionCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/MysteriousItemConversionCategory.java index 621bc3594..16d2d67dd 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/MysteriousItemConversionCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/MysteriousItemConversionCategory.java @@ -23,9 +23,10 @@ public class MysteriousItemConversionCategory extends CreateRecipeCategory soundPlayer; - public static final BiConsumer VANILLA_SOUND = (world, pos) -> { - world.playSound(null, pos, SoundEvents.BLOCK_BELL_USE, SoundCategory.BLOCKS, - 2.0F, 1.0F); - }; - - public BellMovementBehaviour(BiConsumer soundPlayer) { - this.soundPlayer = soundPlayer; - } - - public BellMovementBehaviour() { - this(VANILLA_SOUND); - } - @Override public boolean renderAsNormalTileEntity() { return true; @@ -37,12 +23,26 @@ public class BellMovementBehaviour extends MovementBehaviour { double dotProduct = oldMotion.dotProduct(motion); if (dotProduct <= 0 && (context.relativeMotion.length() != 0) || context.firstMovement) - soundPlayer.accept(context.world, new BlockPos(context.position)); + playSound(context); } @Override public void stopMoving(MovementContext context) { if (context.position != null) - soundPlayer.accept(context.world, new BlockPos(context.position)); + playSound(context); + } + + public static void playSound(MovementContext context) { + World world = context.world; + BlockPos pos = new BlockPos(context.position); + Block block = context.state.getBlock(); + + if (block instanceof AbstractBellBlock) { + ((AbstractBellBlock) block).playSound(world, pos); + } else { + // Vanilla bell sound + world.playSound(null, pos, SoundEvents.BLOCK_BELL_USE, + SoundCategory.BLOCKS, 2f, 1f); + } } } diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellBlock.java b/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellBlock.java index 518a374ee..8897b5ce3 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellBlock.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellBlock.java @@ -6,11 +6,13 @@ import com.simibubi.create.foundation.block.ITE; import net.minecraft.block.BellBlock; import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.state.properties.BellAttachment; +import net.minecraft.stats.Stats; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.math.shapes.VoxelShapes; @@ -44,27 +46,47 @@ public abstract class AbstractBellBlock exten } @Override - public boolean ring(World world, BlockPos pos, @Nullable Direction direction) { - if (direction == null) { + public boolean ring(World world, BlockState state, BlockRayTraceResult hit, @Nullable PlayerEntity player, boolean flag) { + BlockPos pos = hit.getPos(); + Direction direction = hit.getFace(); + if (direction == null) direction = world.getBlockState(pos).get(field_220133_a); + + if (!this.canRingFrom(state, direction, hit.getHitVec().y - (double)pos.getY())) + return false; + + TE te = getTileEntity(world, pos); + if (te == null || !te.ring(world, pos, direction)) + return false; + + if (!world.isRemote) { + playSound(world, pos); + if (player != null) + player.addStat(Stats.BELL_RING); } - - if (!ringInner(world, pos, direction)) - return false; - - if (world.isRemote) - return false; - - playSound(world, pos); return true; } - public static void playSound(World world, BlockPos pos) { - world.playSound(null, pos, SoundEvents.BLOCK_BELL_USE, SoundCategory.BLOCKS, 2.0F, 1.0F); + public boolean canRingFrom(BlockState state, Direction hitDir, double heightChange) { + if (hitDir.getAxis() == Direction.Axis.Y) + return false; + if (heightChange > 0.8124) + return false; + + Direction direction = state.get(field_220133_a); + BellAttachment bellattachment = state.get(field_220134_b); + switch(bellattachment) { + case FLOOR: + case CEILING: + return direction.getAxis() == hitDir.getAxis(); + case SINGLE_WALL: + case DOUBLE_WALL: + return direction.getAxis() != hitDir.getAxis(); + default: + return false; + } } - protected boolean ringInner(World world, BlockPos pos, Direction direction) { - TE te = getTileEntity(world, pos); - return te != null && te.ring(world, pos, direction); - } + public abstract void playSound(World world, BlockPos pos); + } diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellTileEntity.java b/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellTileEntity.java index 3da76a6e0..86403ece5 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellTileEntity.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellTileEntity.java @@ -1,7 +1,9 @@ package com.simibubi.create.content.curiosities.bell; -import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import java.util.List; +import com.jozufozu.flywheel.core.PartialModel; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import net.minecraft.tileentity.TileEntityType; @@ -9,11 +11,9 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.List; - public abstract class AbstractBellTileEntity extends SmartTileEntity { - public static final int RING_DURATION = 50; + public static final int RING_DURATION = 74; public boolean isRinging; public int ringingTicks; @@ -47,4 +47,6 @@ public abstract class AbstractBellTileEntity extends SmartTileEntity { } } + public abstract PartialModel getBellPartial(); + } diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellRenderer.java b/src/main/java/com/simibubi/create/content/curiosities/bell/BellRenderer.java similarity index 56% rename from src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellRenderer.java rename to src/main/java/com/simibubi/create/content/curiosities/bell/BellRenderer.java index 48fe66ed2..558444652 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellRenderer.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/BellRenderer.java @@ -2,12 +2,9 @@ package com.simibubi.create.content.curiosities.bell; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; -import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.content.logistics.block.redstone.AnalogLeverBlock; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; - import com.simibubi.create.foundation.utility.AngleHelper; import net.minecraft.block.BellBlock; @@ -16,42 +13,40 @@ import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.state.properties.BellAttachment; import net.minecraft.util.Direction; import net.minecraft.util.math.MathHelper; -public class AbstractBellRenderer extends SafeTileEntityRenderer { +public class BellRenderer extends SafeTileEntityRenderer { - public AbstractBellRenderer(TileEntityRendererDispatcher dispatcher) { + public BellRenderer(TileEntityRendererDispatcher dispatcher) { super(dispatcher); } @Override protected void renderSafe(TE te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffer, int light, int overlay) { BlockState state = te.getBlockState(); - int lightCoords = WorldRenderer.getLightmapCoordinates(te.getWorld(), state, te.getPos()); - IVertexBuilder vb = buffer.getBuffer(RenderType.getCutout()); + Direction facing = state.get(BellBlock.field_220133_a); + BellAttachment attachment = state.get(BellBlock.field_220134_b); - SuperByteBuffer bell = PartialBufferer.get(AllBlockPartials.BELL, state); + SuperByteBuffer bell = PartialBufferer.get(te.getBellPartial(), state); - float rY = AngleHelper.horizontalAngle(state.get(BellBlock.field_220133_a)); + if (te.isRinging) + bell.rotateCentered(te.ringDirection.rotateYCCW(), getSwingAngle(te.ringingTicks + partialTicks)); + + float rY = AngleHelper.horizontalAngle(facing); + if (attachment == BellAttachment.SINGLE_WALL || attachment == BellAttachment.DOUBLE_WALL) + rY += 90; bell.rotateCentered(Direction.UP, (float) (rY / 180 * Math.PI)); - float ringingTicks = (float)te.ringingTicks + partialTicks; - if (te.isRinging) { - float swing = MathHelper.sin(ringingTicks / (float)Math.PI) / (4.0F + ringingTicks / 3.0F); -// if (te.ringDirection == Direction.NORTH) { -// rX = -swing; -// } else if (te.ringDirection == Direction.SOUTH) { -// rX = swing; -// } else if (te.ringDirection == Direction.EAST) { -// rZ = -swing; -// } else if (te.ringDirection == Direction.WEST) { -// rZ = swing; -// } - bell.rotateCentered(te.ringDirection, swing); - } - + IVertexBuilder vb = buffer.getBuffer(RenderType.getCutout()); + int lightCoords = WorldRenderer.getLightmapCoordinates(te.getWorld(), state, te.getPos()); bell.light(lightCoords).renderInto(ms, vb); } + public static float getSwingAngle(float time) { + float t = time / 1.5f; + return 1.2f * MathHelper.sin(t / (float)Math.PI) / (2.5f + t / 3.0f); + } + } diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellBlock.java b/src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellBlock.java index 9fbede200..82962ec5b 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellBlock.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellBlock.java @@ -1,12 +1,10 @@ package com.simibubi.create.content.curiosities.bell; +import com.simibubi.create.AllSoundEvents; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.foundation.block.ITE; - import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; @@ -27,4 +25,15 @@ public class CursedBellBlock extends AbstractBellBlock { return CursedBellTileEntity.class; } + @Override + public void playSound(World world, BlockPos pos) { + AllSoundEvents.CURSED_BELL_USE.playOnServer(world, pos, 4f, 1f); + } + + @Override + public void onBlockAdded(BlockState state, World world, BlockPos pos, BlockState oldState, boolean isMoving) { + if (oldState.getBlock() != this) + withTileEntityDo(world, pos, CursedBellTileEntity::startEffect); + } + } diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellMovementBehaviour.java b/src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellMovementBehaviour.java index d93662846..9e7fa722e 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellMovementBehaviour.java @@ -1,5 +1,6 @@ package com.simibubi.create.content.curiosities.bell; +import com.simibubi.create.content.contraptions.components.actors.BellMovementBehaviour; import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour; import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; @@ -21,7 +22,7 @@ public class CursedBellMovementBehaviour extends MovementBehaviour { if (!context.world.isRemote && getRecharge(context) == 0) { SoulPulseEffectHandler.sendPulsePacket(context.world, pos, DISTANCE, true); setRecharge(context, CursedBellTileEntity.RECHARGE_TICKS); - CursedBellBlock.playSound(context.world, pos); + BellMovementBehaviour.playSound(context); } } diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellTileEntity.java b/src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellTileEntity.java index cb1993634..7bfe6ba71 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellTileEntity.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellTileEntity.java @@ -1,24 +1,29 @@ package com.simibubi.create.content.curiosities.bell; import java.util.List; +import java.util.Random; -import com.simibubi.create.CreateClient; +import com.jozufozu.flywheel.core.PartialModel; +import com.simibubi.create.AllBlockPartials; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; -import com.sun.org.apache.regexp.internal.RE; - import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; +import net.minecraft.particles.ParticleTypes; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.SoundEvents; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class CursedBellTileEntity extends AbstractBellTileEntity { public static final int DISTANCE = 5; - public static final int RECHARGE_TICKS = 60; - public int rechargeTicks = 0; + public static final int RECHARGE_TICKS = 65; + public static final int EFFECT_TICKS = 20; + + public int effectTicks = 0; public CursedBellTileEntity(TileEntityType type) { super(type); @@ -28,33 +33,69 @@ public class CursedBellTileEntity extends AbstractBellTileEntity { public void addBehaviours(List behaviours) { } @Override - protected void fromTag(BlockState state, CompoundNBT compound, boolean clientPacket) { - rechargeTicks = compound.getInt("Recharge"); + public PartialModel getBellPartial() { + return AllBlockPartials.CURSED_BELL; } @Override - public void write(CompoundNBT compound, boolean clientPacket) { - compound.putInt("Recharge", rechargeTicks); + public boolean ring(World world, BlockPos pos, Direction direction) { + if (isRinging && ringingTicks < RECHARGE_TICKS) + return false; + + if (!super.ring(world, pos, direction)) + return false; + + if (!world.isRemote) + SoulPulseEffectHandler.sendPulsePacket(world, pos, DISTANCE, true); + + startEffect(); + + return true; + } + + public void startEffect() { + effectTicks = EFFECT_TICKS; + sendData(); + } + + @Override + protected void write(CompoundNBT compound, boolean clientPacket) { + super.write(compound, clientPacket); + compound.putInt("EffectTicks", effectTicks); + } + + @Override + protected void fromTag(BlockState state, CompoundNBT compound, boolean clientPacket) { + super.fromTag(state, compound, clientPacket); + effectTicks = compound.getInt("EffectTicks"); } @Override public void tick() { super.tick(); - if (rechargeTicks > 0) - rechargeTicks--; - } - @Override - public boolean ring(World world, BlockPos pos, Direction direction) { - if (rechargeTicks > 0) - return false; + if (effectTicks <= 0) + return; + effectTicks--; - if (!world.isRemote) { - SoulPulseEffectHandler.sendPulsePacket(world, pos, DISTANCE, true); - rechargeTicks = RECHARGE_TICKS; - sendData(); - } - return super.ring(world, pos, direction); + if (!world.isRemote) + return; + + Random rand = world.getRandom(); + if (rand.nextFloat() > 1/4f) + return; + + double x = pos.getX() + rand.nextDouble(); + double y = pos.getY() + 0.5; + double z = pos.getZ() + rand.nextDouble(); + double vx = rand.nextDouble()*0.04 - 0.02; + double vy = 0.1; + double vz = rand.nextDouble()*0.04 - 0.02; + this.world.addParticle(ParticleTypes.SOUL, x, y, z, vx, vy, vz); + + float vol = rand.nextFloat() * 0.4F + rand.nextFloat() > 0.9F ? 0.6F : 0.0F; + float pitch = 0.6F + rand.nextFloat() * 0.4F; + world.playSound(null, pos, SoundEvents.PARTICLE_SOUL_ESCAPE, SoundCategory.BLOCKS, vol, pitch); } } diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellBlock.java b/src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellBlock.java index 0c79bad5a..bcd3a0e27 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellBlock.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellBlock.java @@ -1,15 +1,23 @@ package com.simibubi.create.content.curiosities.bell; -import com.simibubi.create.AllTileEntities; -import com.simibubi.create.foundation.block.ITE; +import java.util.Random; +import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllSoundEvents; +import com.simibubi.create.AllTileEntities; + +import net.minecraft.block.BellBlock; +import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.item.BlockItemUseContext; +import net.minecraft.particles.ParticleTypes; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.IBlockReader; +import net.minecraft.world.IWorld; import net.minecraft.world.World; public class PeculiarBellBlock extends AbstractBellBlock { @@ -26,4 +34,55 @@ public class PeculiarBellBlock extends AbstractBellBlock @Override public Class getTileEntityClass() { return PeculiarBellTileEntity.class; } + @Override + public void playSound(World world, BlockPos pos) { + AllSoundEvents.PECULIAR_BELL_USE.playOnServer(world, pos, 2f, 0.94f); + } + + @Override + public BlockState getStateForPlacement(BlockItemUseContext ctx) { + World world = ctx.getWorld(); + BlockPos pos = ctx.getPos(); + return tryConvert(world, pos, super.getStateForPlacement(ctx), world.getBlockState(pos.offset(Direction.DOWN))); + } + + @Override + public BlockState updatePostPlacement(BlockState state, Direction facing, BlockState facingState, IWorld world, + BlockPos currentPos, BlockPos facingPos) { + BlockState newState = super.updatePostPlacement(state, facing, facingState, world, currentPos, facingPos); + if (facing != Direction.DOWN) + return newState; + + return tryConvert(world, currentPos, newState, facingState); + } + + protected BlockState tryConvert(IWorld world, BlockPos pos, BlockState state, BlockState underState) { + Block underBlock = underState.getBlock(); + if (!(Blocks.SOUL_FIRE.is(underBlock) || Blocks.SOUL_CAMPFIRE.is(underBlock))) + return state; + + if (world.isRemote()) { + spawnConversionParticles(world, pos); + } else if (world instanceof World) { + AllSoundEvents.CURSED_BELL_CONVERT.playOnServer((World) world, pos); + } + + return AllBlocks.CURSED_BELL.getDefaultState() + .with(BellBlock.field_220133_a, state.get(BellBlock.field_220133_a)) + .with(BellBlock.field_220134_b, state.get(BellBlock.field_220134_b)) + .with(BellBlock.POWERED, state.get(BellBlock.POWERED)); + } + + public void spawnConversionParticles(IWorld world, BlockPos blockPos) { + Random random = world.getRandom(); + int num = random.nextInt(10) + 15; + for (int i = 0; i < num; i++) { + float pitch = random.nextFloat()*120 - 90; + float yaw = random.nextFloat()*360; + Vector3d vel = Vector3d.fromPitchYaw(pitch, yaw).scale(random.nextDouble()*0.1 + 0.1); + Vector3d pos = Vector3d.ofCenter(blockPos); + world.addParticle(ParticleTypes.SOUL_FIRE_FLAME, pos.x, pos.y, pos.z, vel.x, vel.y, vel.z); + } + } + } diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellTileEntity.java b/src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellTileEntity.java index 8522bbb73..065519374 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellTileEntity.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellTileEntity.java @@ -1,9 +1,9 @@ package com.simibubi.create.content.curiosities.bell; +import com.jozufozu.flywheel.core.PartialModel; +import com.simibubi.create.AllBlockPartials; + import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; public class PeculiarBellTileEntity extends AbstractBellTileEntity { @@ -11,4 +11,9 @@ public class PeculiarBellTileEntity extends AbstractBellTileEntity { super(type); } + @Override + public PartialModel getBellPartial() { + return AllBlockPartials.PECULIAR_BELL; + } + } diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/SoulPulseEffect.java b/src/main/java/com/simibubi/create/content/curiosities/bell/SoulPulseEffect.java index 59f779041..6f076222c 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/SoulPulseEffect.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/SoulPulseEffect.java @@ -1,14 +1,15 @@ package com.simibubi.create.content.curiosities.bell; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; import net.minecraft.entity.EntitySpawnPlacementRegistry; import net.minecraft.entity.EntityType; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.LightType; import net.minecraft.world.World; @@ -19,30 +20,25 @@ public class SoulPulseEffect { public static final int MAX_DISTANCE = 5; private static final List> LAYERS = genLayers(); - private static final int WAITING_TICKS = 120; - public static final int TICKS_PER_LAYER = 4; + private static final int WAITING_TICKS = 100; + public static final int TICKS_PER_LAYER = 6; private int ticks; public final BlockPos pos; public final int distance; - private List added; + public final List added; - public SoulPulseEffect(BlockPos pos, int distance, boolean overlaps) { + public SoulPulseEffect(BlockPos pos, int distance, boolean canOverlap) { this.ticks = TICKS_PER_LAYER * distance; this.pos = pos; this.distance = distance; - this.added = overlaps ? null : new ArrayList<>(); + this.added = canOverlap ? null : new ArrayList<>(); } public boolean finished() { return ticks <= -WAITING_TICKS; } - public boolean overlaps() { return added == null; } - - public void removeAdded(Collection positions) { - if (!overlaps()) - positions.removeAll(added); - } + public boolean canOverlap() { return added == null; } public List tick(World world) { if (finished()) @@ -57,10 +53,6 @@ public class SoulPulseEffect { ticks -= TICKS_PER_LAYER; spawns.addAll(getSoulSpawns(world)); } - - if (!overlaps()) - added.addAll(spawns); - return spawns; } @@ -78,11 +70,18 @@ public class SoulPulseEffect { } public static boolean canSpawnSoulAt(World world, BlockPos at) { + EntityType dummy = EntityType.ZOMBIE; + double dummyWidth = 0.2, dummyHeight = 0.75; + double w2 = dummyWidth / 2; + return world != null - && WorldEntitySpawner.canCreatureTypeSpawnAtLocation( - EntitySpawnPlacementRegistry.PlacementType.ON_GROUND, - world, at, EntityType.ZOMBIE) - && world.getLightLevel(LightType.BLOCK, at) < 8; + && WorldEntitySpawner.canCreatureTypeSpawnAtLocation( + EntitySpawnPlacementRegistry.PlacementType.ON_GROUND, world, at, dummy) + && world.getLightLevel(LightType.BLOCK, at) < 8 + && world.getBlockCollisions(null, new AxisAlignedBB( + at.getX() + 0.5 - w2, at.getY(), at.getZ() + 0.5 - w2, + at.getX() + 0.5 + w2, at.getY() + dummyHeight, at.getZ() + 0.5 + w2 + ), (a,b) -> true).allMatch(VoxelShape::isEmpty); } public static void spawnParticles(World world, BlockPos at) { @@ -90,7 +89,7 @@ public class SoulPulseEffect { return; Vector3d p = Vector3d.of(at); - world.addParticle(new SoulParticle.Data(), p.x + 0.5, p.y + 0.5, p.z + 0.5, 0, 0, 0); + world.addOptionalParticle(new SoulParticle.Data(), p.x + 0.5, p.y + 0.5, p.z + 0.5, 0, 0, 0); world.addParticle(new SoulBaseParticle.Data(), p.x + 0.5, p.y + 0.01, p.z + 0.5, 0, 0, 0); } diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/SoulPulseEffectHandler.java b/src/main/java/com/simibubi/create/content/curiosities/bell/SoulPulseEffectHandler.java index 95f74d2cd..feb43836f 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/SoulPulseEffectHandler.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/SoulPulseEffectHandler.java @@ -3,18 +3,13 @@ package com.simibubi.create.content.curiosities.bell; import java.util.ArrayList; import java.util.HashSet; import java.util.List; -import java.util.Map; -import java.util.Objects; import java.util.Set; import java.util.function.Supplier; -import java.util.stream.Collectors; import com.simibubi.create.CreateClient; import com.simibubi.create.foundation.networking.AllPackets; import com.simibubi.create.foundation.networking.SimplePacketBase; -import com.sun.org.apache.xpath.internal.operations.Bool; - import net.minecraft.network.PacketBuffer; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -34,29 +29,31 @@ public class SoulPulseEffectHandler { public void tick(World world) { for (SoulPulseEffect pulse : pulses) { - List added = pulse.tick(world); - if (added == null) + List spawns = pulse.tick(world); + if (spawns == null) continue; - if (pulse.overlaps()) { - for (BlockPos pos : added) { + if (pulse.canOverlap()) { + for (BlockPos pos : spawns) { SoulPulseEffect.spawnParticles(world, pos); } } else { - for (BlockPos pos : added) { + for (BlockPos pos : spawns) { if (occupied.contains(pos)) continue; + SoulPulseEffect.spawnParticles(world, pos); + pulse.added.add(pos); occupied.add(pos); } } } - Map> split = pulses.stream() - .collect(Collectors.partitioningBy(SoulPulseEffect::finished)); - for (SoulPulseEffect finished : split.get(true)) - finished.removeAdded(occupied); - pulses = split.get(false); + for (SoulPulseEffect pulse : pulses) { + if (pulse.finished() && !pulse.canOverlap()) + occupied.removeAll(pulse.added); + } + pulses.removeIf(SoulPulseEffect::finished); } public void refresh() { @@ -64,9 +61,9 @@ public class SoulPulseEffectHandler { occupied.clear(); } - public static void sendPulsePacket(World world, BlockPos at, int distance, boolean overlaps) { + public static void sendPulsePacket(World world, BlockPos at, int distance, boolean canOverlap) { Chunk chunk = world.getChunkAt(at); - AllPackets.channel.send(PacketDistributor.TRACKING_CHUNK.with(() -> chunk), new Packet(at, distance, overlaps)); + AllPackets.channel.send(PacketDistributor.TRACKING_CHUNK.with(() -> chunk), new Packet(at, distance, canOverlap)); } private void handlePulse(BlockPos pos, int distance, boolean overlaps) { diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java index 7c7e9050b..276b4a465 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java @@ -56,7 +56,7 @@ public class StandardRecipeGen extends CreateRecipeProvider { /* * Recipes are added through fields, so one can navigate to the right one easily - * + * * (Ctrl-o) in Eclipse */ @@ -172,7 +172,15 @@ public class StandardRecipeGen extends CreateRecipeProvider { .key('O', I.ironSheet()) .patternLine(" E") .patternLine(" O ") - .patternLine("E ")) + .patternLine("E ")), + + PECULIAR_BELL = create(AllBlocks.PECULIAR_BELL).unlockedByTag(I::brass) + .viaShaped(b -> b.key('I', I.brass()) + .key('S', I.brassSheet()) + .key('G', Items.GHAST_TEAR) + .patternLine(" I ") + .patternLine("IGI") + .patternLine("S S")) ; @@ -969,14 +977,14 @@ public class StandardRecipeGen extends CreateRecipeProvider { .patternLine("P P") .patternLine("P P") .patternLine("G G")), - + LINKED_CONTROLLER = create(AllItems.LINKED_CONTROLLER).unlockedBy(AllBlocks.REDSTONE_LINK::get) .viaShaped(b -> b.key('S', ItemTags.WOODEN_BUTTONS) .key('P', AllBlocks.REDSTONE_LINK.get()) .patternLine("SSS") .patternLine(" P ") .patternLine("SSS")), - + CRAFTING_BLUEPRINT = create(AllItems.CRAFTING_BLUEPRINT).unlockedBy(() -> Items.CRAFTING_TABLE) .viaShapeless(b -> b.addIngredient(Items.PAINTING) .addIngredient(Items.CRAFTING_TABLE)), diff --git a/src/main/resources/assets/create/lang/default/tooltips.json b/src/main/resources/assets/create/lang/default/tooltips.json index 4ac29920b..69aa10b5e 100644 --- a/src/main/resources/assets/create/lang/default/tooltips.json +++ b/src/main/resources/assets/create/lang/default/tooltips.json @@ -187,7 +187,7 @@ "item.create.linked_controller.tooltip.behaviour3": "Enables _Bind Mode_, press one of the _six controls_ to bind it to the _Links' Frequency_.", "item.create.diving_helmet.tooltip": "DIVING HELMET", - "item.create.diving_helmet.tooltip.summary": "Together with a _Copper_ _Backtank_, allows the weilder to _breathe_ _underwater_ for an extended amount of time.", + "item.create.diving_helmet.tooltip.summary": "Together with a _Copper_ _Backtank_, allows the wielder to _breathe_ _underwater_ for an extended amount of time.", "item.create.diving_helmet.tooltip.condition1": "When Worn", "item.create.diving_helmet.tooltip.behaviour1": "Provides the _Water Breathing_ effect, slowly draining _Air Pressure_ from the Backtank.", @@ -201,7 +201,7 @@ "item.create.diving_boots.tooltip": "DIVING BOOTS", "item.create.diving_boots.tooltip.summary": "A pair of _heavy_ _boots_, allowing for better traversal of the Ocean floor.", "item.create.diving_boots.tooltip.condition1": "When Worn", - "item.create.diving_boots.tooltip.behaviour1": "Weilder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Weilder also is no longer affected by _Mechanical_ _Belts_.", + "item.create.diving_boots.tooltip.behaviour1": "Wielder _sinks_ _faster_ and _cannot_ _swim_. Grants the ability to _walk_ and _jump_ underwater. Wielder also is no longer affected by _Mechanical_ _Belts_.", "item.create.crafting_blueprint.tooltip": "CRAFTING BLUEPRINT", "item.create.crafting_blueprint.tooltip.summary": "_Placed_ on a wall, it can be used to _specify_ _ingredient_ _arrangements_ for easier manual crafting. Each slot represents a Recipe.", @@ -215,6 +215,14 @@ "item.create.minecart_coupling.tooltip.condition1": "When Used on Minecart", "item.create.minecart_coupling.tooltip.behaviour1": "_Couples_ two Minecarts together, attempting to keep them at a _constant distance_ while moving.", + "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.cursed_bell.tooltip": "CURSED BELL", + "block.create.cursed_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.cursed_bell.tooltip.behaviour1": "Highlights nearby dark spots on which Hostile Mobs could spawn.", + "create.gui.chromatic_projector.title": "Chromatic Projector", "create.gui.chromatic_projector.filter.invert": "Invert", "create.gui.chromatic_projector.filter.sepia": "Sepia", @@ -233,5 +241,5 @@ "create.gui.chromatic_projector.density": "Density", "create.gui.chromatic_projector.fade": "Fade", "create.gui.chromatic_projector.blend": "Blend" - + } diff --git a/src/main/resources/assets/create/models/block/cursed_bell/bell.json b/src/main/resources/assets/create/models/block/cursed_bell/bell.json index dd1b4168c..161de430f 100644 --- a/src/main/resources/assets/create/models/block/cursed_bell/bell.json +++ b/src/main/resources/assets/create/models/block/cursed_bell/bell.json @@ -1,92 +1,436 @@ { "credit": "Made with Blockbench", "textures": { - "0": "create:block/bell", + "0": "create:block/bell_anim", "particle": "create:block/bell" }, "elements": [ { - "from": [14, 7, 7], - "to": [16, 9, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "from": [ + 14, + 7, + 7 + ], + "to": [ + 16, + 9, + 9 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 8, + 8 + ] + }, "faces": { - "north": {"uv": [10.5, 6, 9.5, 7], "texture": "#0"}, - "east": {"uv": [9.5, 7, 10.5, 8], "rotation": 90, "texture": "#0"}, - "south": {"uv": [9.5, 6, 10.5, 7], "texture": "#0"}, - "west": {"uv": [10, 7, 10.5, 7.5], "texture": "#0"}, - "up": {"uv": [9.5, 5, 10.5, 6], "texture": "#0"}, - "down": {"uv": [9.5, 7, 10.5, 8], "texture": "#0"} + "north": { + "uv": [ + 10.5, + 6, + 9.5, + 7 + ], + "texture": "#0" + }, + "east": { + "uv": [ + 9.5, + 7, + 10.5, + 8 + ], + "rotation": 90, + "texture": "#0" + }, + "south": { + "uv": [ + 9.5, + 6, + 10.5, + 7 + ], + "texture": "#0" + }, + "west": { + "uv": [ + 10, + 7, + 10.5, + 7.5 + ], + "texture": "#0" + }, + "up": { + "uv": [ + 9.5, + 5, + 10.5, + 6 + ], + "texture": "#0" + }, + "down": { + "uv": [ + 9.5, + 7, + 10.5, + 8 + ], + "texture": "#0" + } } }, { - "from": [0, 7, 7], - "to": [2, 9, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "from": [ + 0, + 7, + 7 + ], + "to": [ + 2, + 9, + 9 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 8, + 8 + ] + }, "faces": { - "north": {"uv": [9.5, 6, 10.5, 7], "texture": "#0"}, - "east": {"uv": [10, 7, 10.5, 7.5], "texture": "#0"}, - "south": {"uv": [10.5, 6, 9.5, 7], "texture": "#0"}, - "west": {"uv": [9.5, 7, 10.5, 8], "rotation": 90, "texture": "#0"}, - "up": {"uv": [9.5, 5, 10.5, 6], "rotation": 180, "texture": "#0"}, - "down": {"uv": [9.5, 7, 10.5, 8], "rotation": 180, "texture": "#0"} + "north": { + "uv": [ + 9.5, + 6, + 10.5, + 7 + ], + "texture": "#0" + }, + "east": { + "uv": [ + 10, + 7, + 10.5, + 7.5 + ], + "texture": "#0" + }, + "south": { + "uv": [ + 10.5, + 6, + 9.5, + 7 + ], + "texture": "#0" + }, + "west": { + "uv": [ + 9.5, + 7, + 10.5, + 8 + ], + "rotation": 90, + "texture": "#0" + }, + "up": { + "uv": [ + 9.5, + 5, + 10.5, + 6 + ], + "rotation": 180, + "texture": "#0" + }, + "down": { + "uv": [ + 9.5, + 7, + 10.5, + 8 + ], + "rotation": 180, + "texture": "#0" + } } }, { - "from": [3, 0, 3], - "to": [13, 2, 13], + "from": [ + 3, + 0, + 3 + ], + "to": [ + 13, + 2, + 13 + ], "faces": { - "north": {"uv": [0, 15, 5, 16], "texture": "#0"}, - "east": {"uv": [0, 15, 5, 16], "texture": "#0"}, - "south": {"uv": [0, 15, 5, 16], "texture": "#0"}, - "west": {"uv": [0, 15, 5, 16], "texture": "#0"}, - "up": {"uv": [0, 10, 5, 15], "texture": "#0"}, - "down": {"uv": [5, 10, 10, 15], "texture": "#0"} + "north": { + "uv": [ + 0, + 15, + 5, + 16 + ], + "texture": "#0" + }, + "east": { + "uv": [ + 0, + 15, + 5, + 16 + ], + "texture": "#0" + }, + "south": { + "uv": [ + 0, + 15, + 5, + 16 + ], + "texture": "#0" + }, + "west": { + "uv": [ + 0, + 15, + 5, + 16 + ], + "texture": "#0" + }, + "up": { + "uv": [ + 0, + 10, + 5, + 15 + ], + "texture": "#0" + }, + "down": { + "uv": [ + 5, + 10, + 10, + 15 + ], + "texture": "#0" + } } }, { - "from": [4, 2, 4], - "to": [12, 11, 12], + "from": [ + 4, + 2, + 4 + ], + "to": [ + 12, + 11, + 12 + ], "faces": { - "north": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, - "east": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, - "south": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, - "west": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, - "up": {"uv": [12, 0, 16, 4], "texture": "#0"} + "north": { + "uv": [ + 8, + 0, + 12, + 4.5 + ], + "texture": "#0" + }, + "east": { + "uv": [ + 8, + 0, + 12, + 4.5 + ], + "texture": "#0" + }, + "south": { + "uv": [ + 8, + 0, + 12, + 4.5 + ], + "texture": "#0" + }, + "west": { + "uv": [ + 8, + 0, + 12, + 4.5 + ], + "texture": "#0" + }, + "up": { + "uv": [ + 12, + 0, + 16, + 4 + ], + "texture": "#0" + } } }, { - "from": [7, 11, 7], - "to": [9, 15, 9], + "from": [ + 7, + 11, + 7 + ], + "to": [ + 9, + 15, + 9 + ], "faces": { - "north": {"uv": [8, 6, 9, 8], "texture": "#0"}, - "east": {"uv": [8, 6, 9, 8], "texture": "#0"}, - "south": {"uv": [8, 6, 9, 8], "texture": "#0"}, - "west": {"uv": [8, 6, 9, 8], "texture": "#0"}, - "up": {"uv": [8, 5, 9, 6], "texture": "#0"} + "north": { + "uv": [ + 8, + 6, + 9, + 8 + ], + "texture": "#0" + }, + "east": { + "uv": [ + 8, + 6, + 9, + 8 + ], + "texture": "#0" + }, + "south": { + "uv": [ + 8, + 6, + 9, + 8 + ], + "texture": "#0" + }, + "west": { + "uv": [ + 8, + 6, + 9, + 8 + ], + "texture": "#0" + }, + "up": { + "uv": [ + 8, + 5, + 9, + 6 + ], + "texture": "#0" + } } }, { - "from": [0, 0, 8], - "to": [16, 16, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.5]}, + "from": [ + 0, + 0, + 8 + ], + "to": [ + 16, + 16, + 9 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 8, + 8.5 + ] + }, "faces": { - "north": {"uv": [0, 0, 8, 8], "texture": "#0"} + "north": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#0" + } } }, { - "from": [0, 0, 7], - "to": [16, 16, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.5]}, + "from": [ + 0, + 0, + 7 + ], + "to": [ + 16, + 16, + 8 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 8, + 8.5 + ] + }, "faces": { - "south": {"uv": [0, 0, 8, 8], "texture": "#0"} + "south": { + "uv": [ + 0, + 0, + 8, + 8 + ], + "texture": "#0" + } } } ], "groups": [ { "name": "Bell", - "origin": [8, 8, 8], - "children": [0, 1, 2, 3, 4, 5, 6] + "origin": [ + 8, + 8, + 8 + ], + "children": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6 + ] } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/models/block/cursed_bell/block_ceiling.json b/src/main/resources/assets/create/models/block/cursed_bell/block_ceiling.json index c3879f2cc..2616af7a7 100644 --- a/src/main/resources/assets/create/models/block/cursed_bell/block_ceiling.json +++ b/src/main/resources/assets/create/models/block/cursed_bell/block_ceiling.json @@ -2,7 +2,8 @@ "credit": "Made with Blockbench", "textures": { "1": "create:block/bell_frame_side", - "2": "create:block/bell_frame" + "2": "create:block/bell_frame", + "particle": "create:block/bell" }, "elements": [ { @@ -33,4 +34,4 @@ "children": [0, 1] } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/models/block/cursed_bell/block_double_wall.json b/src/main/resources/assets/create/models/block/cursed_bell/block_double_wall.json index 990f666e1..52a9e266d 100644 --- a/src/main/resources/assets/create/models/block/cursed_bell/block_double_wall.json +++ b/src/main/resources/assets/create/models/block/cursed_bell/block_double_wall.json @@ -1,6 +1,32 @@ { - "credit": "Made with Blockbench", - "textures": {}, - "elements": [], - "groups": [] + "credit": "Made with Blockbench", + "textures": { + "1": "create:block/bell_frame_side", + "particle": "create:block/bell" + }, + "elements": [ + { + "from": [0.1, 0, 0], + "to": [15.9, 16, 16], + "faces": { + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "north": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, + { + "from": [15.9, 0, 0], + "to": [0.1, 16, 16], + "faces": { + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "north": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + } + ], + "groups": [ + { + "name": "Frame", + "origin": [8, 8, 8], + "children": [0, 1] + } + ] } diff --git a/src/main/resources/assets/create/models/block/cursed_bell/block_floor.json b/src/main/resources/assets/create/models/block/cursed_bell/block_floor.json index f18e39060..6738c29b4 100644 --- a/src/main/resources/assets/create/models/block/cursed_bell/block_floor.json +++ b/src/main/resources/assets/create/models/block/cursed_bell/block_floor.json @@ -2,7 +2,8 @@ "credit": "Made with Blockbench", "textures": { "1": "create:block/bell_frame_side", - "2": "create:block/bell_frame" + "2": "create:block/bell_frame", + "particle": "create:block/bell" }, "elements": [ { @@ -31,4 +32,4 @@ "children": [0, 1] } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/models/block/cursed_bell/block_single_wall.json b/src/main/resources/assets/create/models/block/cursed_bell/block_single_wall.json index 420017990..7bee57b84 100644 --- a/src/main/resources/assets/create/models/block/cursed_bell/block_single_wall.json +++ b/src/main/resources/assets/create/models/block/cursed_bell/block_single_wall.json @@ -1,6 +1,30 @@ { "credit": "Made with Blockbench", - "textures": {}, - "elements": [], - "groups": [] + "textures": { + "1": "create:block/bell_frame_side", + "particle": "create:block/bell" + }, + "elements": [ + { + "from": [0.1, 0, 0], + "to": [15.9, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, + { + "from": [15.9, 0, 0], + "to": [0.1, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + } + ], + "groups": [ + { + "name": "Frame", + "origin": [8, 8, 8], + "children": [0, 1] + } + ] } diff --git a/src/main/resources/assets/create/models/block/cursed_bell/item.json b/src/main/resources/assets/create/models/block/cursed_bell/item.json index dd1b4168c..9a589a6b2 100644 --- a/src/main/resources/assets/create/models/block/cursed_bell/item.json +++ b/src/main/resources/assets/create/models/block/cursed_bell/item.json @@ -1,7 +1,8 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "textures": { - "0": "create:block/bell", + "0": "create:block/bell_anim", "particle": "create:block/bell" }, "elements": [ @@ -89,4 +90,4 @@ "children": [0, 1, 2, 3, 4, 5, 6] } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/create/models/block/peculiar_bell/bell.json b/src/main/resources/assets/create/models/block/peculiar_bell/bell.json new file mode 100644 index 000000000..d6e26bbc3 --- /dev/null +++ b/src/main/resources/assets/create/models/block/peculiar_bell/bell.json @@ -0,0 +1,92 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "create:block/bell", + "particle": "create:block/bell" + }, + "elements": [ + { + "from": [14, 7, 7], + "to": [16, 9, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [10.5, 6, 9.5, 7], "texture": "#0"}, + "east": {"uv": [9.5, 7, 10.5, 8], "rotation": 90, "texture": "#0"}, + "south": {"uv": [9.5, 6, 10.5, 7], "texture": "#0"}, + "west": {"uv": [10, 7, 10.5, 7.5], "texture": "#0"}, + "up": {"uv": [9.5, 5, 10.5, 6], "texture": "#0"}, + "down": {"uv": [9.5, 7, 10.5, 8], "texture": "#0"} + } + }, + { + "from": [0, 7, 7], + "to": [2, 9, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [9.5, 6, 10.5, 7], "texture": "#0"}, + "east": {"uv": [10, 7, 10.5, 7.5], "texture": "#0"}, + "south": {"uv": [10.5, 6, 9.5, 7], "texture": "#0"}, + "west": {"uv": [9.5, 7, 10.5, 8], "rotation": 90, "texture": "#0"}, + "up": {"uv": [9.5, 5, 10.5, 6], "rotation": 180, "texture": "#0"}, + "down": {"uv": [9.5, 7, 10.5, 8], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [3, 0, 3], + "to": [13, 2, 13], + "faces": { + "north": {"uv": [0, 15, 5, 16], "texture": "#0"}, + "east": {"uv": [0, 15, 5, 16], "texture": "#0"}, + "south": {"uv": [0, 15, 5, 16], "texture": "#0"}, + "west": {"uv": [0, 15, 5, 16], "texture": "#0"}, + "up": {"uv": [0, 10, 5, 15], "texture": "#0"}, + "down": {"uv": [5, 10, 10, 15], "texture": "#0"} + } + }, + { + "from": [4, 2, 4], + "to": [12, 11, 12], + "faces": { + "north": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, + "east": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, + "south": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, + "west": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, + "up": {"uv": [12, 0, 16, 4], "texture": "#0"} + } + }, + { + "from": [7, 11, 7], + "to": [9, 15, 9], + "faces": { + "north": {"uv": [8, 6, 9, 8], "texture": "#0"}, + "east": {"uv": [8, 6, 9, 8], "texture": "#0"}, + "south": {"uv": [8, 6, 9, 8], "texture": "#0"}, + "west": {"uv": [8, 6, 9, 8], "texture": "#0"}, + "up": {"uv": [8, 5, 9, 6], "texture": "#0"} + } + }, + { + "from": [0, 0, 8], + "to": [16, 16, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.5]}, + "faces": { + "north": {"uv": [0, 0, 8, 8], "texture": "#0"} + } + }, + { + "from": [0, 0, 7], + "to": [16, 16, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.5]}, + "faces": { + "south": {"uv": [0, 0, 8, 8], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "Bell", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4, 5, 6] + } + ] +} diff --git a/src/main/resources/assets/create/models/block/peculiar_bell/block_ceiling.json b/src/main/resources/assets/create/models/block/peculiar_bell/block_ceiling.json new file mode 100644 index 000000000..2616af7a7 --- /dev/null +++ b/src/main/resources/assets/create/models/block/peculiar_bell/block_ceiling.json @@ -0,0 +1,37 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "create:block/bell_frame_side", + "2": "create:block/bell_frame", + "particle": "create:block/bell" + }, + "elements": [ + { + "from": [0.1, 0, 0], + "to": [15.9, 16, 16], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "east": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#1"}, + "west": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#1"}, + "up": {"uv": [0, 0, 15.8, 16], "texture": "#2"} + } + }, + { + "from": [15.9, 0, 0], + "to": [0.1, 16, 16], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "east": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#1"}, + "west": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#2"} + } + } + ], + "groups": [ + { + "name": "Frame", + "origin": [8, 8, 8], + "children": [0, 1] + } + ] +} diff --git a/src/main/resources/assets/create/models/block/peculiar_bell/block_double_wall.json b/src/main/resources/assets/create/models/block/peculiar_bell/block_double_wall.json new file mode 100644 index 000000000..52a9e266d --- /dev/null +++ b/src/main/resources/assets/create/models/block/peculiar_bell/block_double_wall.json @@ -0,0 +1,32 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "create:block/bell_frame_side", + "particle": "create:block/bell" + }, + "elements": [ + { + "from": [0.1, 0, 0], + "to": [15.9, 16, 16], + "faces": { + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "north": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, + { + "from": [15.9, 0, 0], + "to": [0.1, 16, 16], + "faces": { + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "north": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + } + ], + "groups": [ + { + "name": "Frame", + "origin": [8, 8, 8], + "children": [0, 1] + } + ] +} diff --git a/src/main/resources/assets/create/models/block/peculiar_bell/block_floor.json b/src/main/resources/assets/create/models/block/peculiar_bell/block_floor.json new file mode 100644 index 000000000..6738c29b4 --- /dev/null +++ b/src/main/resources/assets/create/models/block/peculiar_bell/block_floor.json @@ -0,0 +1,35 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "create:block/bell_frame_side", + "2": "create:block/bell_frame", + "particle": "create:block/bell" + }, + "elements": [ + { + "from": [0.1, 0, 0], + "to": [15.9, 16, 16], + "faces": { + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 15.8, 16], "texture": "#2"} + } + }, + { + "from": [15.9, 0, 0], + "to": [0.1, 16, 16], + "faces": { + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#2"} + } + } + ], + "groups": [ + { + "name": "Frame", + "origin": [8, 8, 8], + "children": [0, 1] + } + ] +} diff --git a/src/main/resources/assets/create/models/block/peculiar_bell/block_single_wall.json b/src/main/resources/assets/create/models/block/peculiar_bell/block_single_wall.json new file mode 100644 index 000000000..7bee57b84 --- /dev/null +++ b/src/main/resources/assets/create/models/block/peculiar_bell/block_single_wall.json @@ -0,0 +1,30 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "create:block/bell_frame_side", + "particle": "create:block/bell" + }, + "elements": [ + { + "from": [0.1, 0, 0], + "to": [15.9, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, + { + "from": [15.9, 0, 0], + "to": [0.1, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + } + ], + "groups": [ + { + "name": "Frame", + "origin": [8, 8, 8], + "children": [0, 1] + } + ] +} diff --git a/src/main/resources/assets/create/models/block/peculiar_bell/item.json b/src/main/resources/assets/create/models/block/peculiar_bell/item.json new file mode 100644 index 000000000..f79362efc --- /dev/null +++ b/src/main/resources/assets/create/models/block/peculiar_bell/item.json @@ -0,0 +1,93 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "create:block/bell", + "particle": "create:block/bell" + }, + "elements": [ + { + "from": [14, 7, 7], + "to": [16, 9, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [10.5, 6, 9.5, 7], "texture": "#0"}, + "east": {"uv": [9.5, 7, 10.5, 8], "rotation": 90, "texture": "#0"}, + "south": {"uv": [9.5, 6, 10.5, 7], "texture": "#0"}, + "west": {"uv": [10, 7, 10.5, 7.5], "texture": "#0"}, + "up": {"uv": [9.5, 5, 10.5, 6], "texture": "#0"}, + "down": {"uv": [9.5, 7, 10.5, 8], "texture": "#0"} + } + }, + { + "from": [0, 7, 7], + "to": [2, 9, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [9.5, 6, 10.5, 7], "texture": "#0"}, + "east": {"uv": [10, 7, 10.5, 7.5], "texture": "#0"}, + "south": {"uv": [10.5, 6, 9.5, 7], "texture": "#0"}, + "west": {"uv": [9.5, 7, 10.5, 8], "rotation": 90, "texture": "#0"}, + "up": {"uv": [9.5, 5, 10.5, 6], "rotation": 180, "texture": "#0"}, + "down": {"uv": [9.5, 7, 10.5, 8], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [3, 0, 3], + "to": [13, 2, 13], + "faces": { + "north": {"uv": [0, 15, 5, 16], "texture": "#0"}, + "east": {"uv": [0, 15, 5, 16], "texture": "#0"}, + "south": {"uv": [0, 15, 5, 16], "texture": "#0"}, + "west": {"uv": [0, 15, 5, 16], "texture": "#0"}, + "up": {"uv": [0, 10, 5, 15], "texture": "#0"}, + "down": {"uv": [5, 10, 10, 15], "texture": "#0"} + } + }, + { + "from": [4, 2, 4], + "to": [12, 11, 12], + "faces": { + "north": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, + "east": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, + "south": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, + "west": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, + "up": {"uv": [12, 0, 16, 4], "texture": "#0"} + } + }, + { + "from": [7, 11, 7], + "to": [9, 15, 9], + "faces": { + "north": {"uv": [8, 6, 9, 8], "texture": "#0"}, + "east": {"uv": [8, 6, 9, 8], "texture": "#0"}, + "south": {"uv": [8, 6, 9, 8], "texture": "#0"}, + "west": {"uv": [8, 6, 9, 8], "texture": "#0"}, + "up": {"uv": [8, 5, 9, 6], "texture": "#0"} + } + }, + { + "from": [0, 0, 8], + "to": [16, 16, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.5]}, + "faces": { + "north": {"uv": [0, 0, 8, 8], "texture": "#0"} + } + }, + { + "from": [0, 0, 7], + "to": [16, 16, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.5]}, + "faces": { + "south": {"uv": [0, 0, 8, 8], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "Bell", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4, 5, 6] + } + ] +} diff --git a/src/main/resources/assets/create/sounds/cursed_bell_convert.ogg b/src/main/resources/assets/create/sounds/cursed_bell_convert.ogg new file mode 100644 index 000000000..171df3dc9 Binary files /dev/null and b/src/main/resources/assets/create/sounds/cursed_bell_convert.ogg differ diff --git a/src/main/resources/assets/create/sounds/cursed_bell_use.ogg b/src/main/resources/assets/create/sounds/cursed_bell_use.ogg new file mode 100644 index 000000000..a82907e9c Binary files /dev/null and b/src/main/resources/assets/create/sounds/cursed_bell_use.ogg differ diff --git a/src/main/resources/assets/create/textures/block/bell_anim.png b/src/main/resources/assets/create/textures/block/bell_anim.png new file mode 100644 index 000000000..7ed660e49 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/bell_anim.png differ diff --git a/src/main/resources/assets/create/textures/block/bell_anim.png.mcmeta b/src/main/resources/assets/create/textures/block/bell_anim.png.mcmeta new file mode 100644 index 000000000..c6f8b9bd5 --- /dev/null +++ b/src/main/resources/assets/create/textures/block/bell_anim.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 2 + } +} \ No newline at end of file