From d458b50c294755579a6859457f230ec6d414ee93 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Sun, 4 Jul 2021 15:11:13 +0200 Subject: [PATCH 1/6] Traverse compat - Added cutting recipes to process Fir Logs from traverse - Adjusted other log cutting recipes to match vanilla's --- .../cutting/stripped_aspen_log.json | 4 ++-- .../cutting/stripped_grimwood_log.json | 4 ++-- .../cutting/stripped_kousa_log.json | 4 ++-- .../cutting/stripped_rosewood_log.json | 4 ++-- .../cutting/stripped_yucca_log.json | 4 ++-- .../autumnity/cutting/stripped_maple_log.json | 4 ++-- .../cutting/stripped_wisteria_log.json | 4 ++-- .../bop/cutting/stripped_cherry_log.json | 4 ++-- .../compat/bop/cutting/stripped_dead_log.json | 4 ++-- .../compat/bop/cutting/stripped_fir_log.json | 4 ++-- .../bop/cutting/stripped_hellbark_log.json | 4 ++-- .../bop/cutting/stripped_jacaranda_log.json | 4 ++-- .../bop/cutting/stripped_magic_log.json | 4 ++-- .../bop/cutting/stripped_mahogany_log.json | 4 ++-- .../compat/bop/cutting/stripped_palm_log.json | 4 ++-- .../bop/cutting/stripped_redwood_log.json | 4 ++-- .../bop/cutting/stripped_umbran_log.json | 4 ++-- .../bop/cutting/stripped_willow_log.json | 4 ++-- .../cutting/stripped_darkwood_log.json | 4 ++-- .../cutting/stripped_elder_log.json | 4 ++-- .../cutting/stripped_poise_stem.json | 4 ++-- .../cutting/stripped_aspen_log.json | 4 ++-- .../cutting/stripped_baobab_log.json | 4 ++-- .../cutting/stripped_cottonwood_log.json | 4 ++-- .../cutting/stripped_fir_log.json | 4 ++-- .../cutting/stripped_juniper_log.json | 4 ++-- .../cutting/stripped_mangrove_log.json | 4 ++-- .../cutting/stripped_maple_log.json | 4 ++-- .../cutting/stripped_palm_log.json | 4 ++-- .../cutting/stripped_pine_log.json | 4 ++-- .../cutting/stripped_redwood_log.json | 4 ++-- .../cutting/stripped_willow_log.json | 4 ++-- .../cutting/stripped_willow_log.json | 4 ++-- .../compat/traverse/cutting/fir_log.json | 21 +++++++++++++++++++ .../compat/traverse/cutting/fir_wood.json | 21 +++++++++++++++++++ .../traverse/cutting/stripped_fir_log.json | 21 +++++++++++++++++++ .../traverse/cutting/stripped_fir_wood.json | 21 +++++++++++++++++++ .../cutting/stripped_driftwood_log.json | 4 ++-- .../cutting/stripped_river_log.json | 4 ++-- 39 files changed, 154 insertions(+), 70 deletions(-) create mode 100644 src/main/resources/data/create/recipes/compat/traverse/cutting/fir_log.json create mode 100644 src/main/resources/data/create/recipes/compat/traverse/cutting/fir_wood.json create mode 100644 src/main/resources/data/create/recipes/compat/traverse/cutting/stripped_fir_log.json create mode 100644 src/main/resources/data/create/recipes/compat/traverse/cutting/stripped_fir_wood.json diff --git a/src/main/resources/data/create/recipes/compat/atmospheric/cutting/stripped_aspen_log.json b/src/main/resources/data/create/recipes/compat/atmospheric/cutting/stripped_aspen_log.json index 5f72d093b..9d2a5bfe6 100644 --- a/src/main/resources/data/create/recipes/compat/atmospheric/cutting/stripped_aspen_log.json +++ b/src/main/resources/data/create/recipes/compat/atmospheric/cutting/stripped_aspen_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "atmospheric:aspen_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/atmospheric/cutting/stripped_grimwood_log.json b/src/main/resources/data/create/recipes/compat/atmospheric/cutting/stripped_grimwood_log.json index 861940bad..74840a8f1 100644 --- a/src/main/resources/data/create/recipes/compat/atmospheric/cutting/stripped_grimwood_log.json +++ b/src/main/resources/data/create/recipes/compat/atmospheric/cutting/stripped_grimwood_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "atmospheric:grimwood_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/atmospheric/cutting/stripped_kousa_log.json b/src/main/resources/data/create/recipes/compat/atmospheric/cutting/stripped_kousa_log.json index c6cf8fae3..3451f9019 100644 --- a/src/main/resources/data/create/recipes/compat/atmospheric/cutting/stripped_kousa_log.json +++ b/src/main/resources/data/create/recipes/compat/atmospheric/cutting/stripped_kousa_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "atmospheric:kousa_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/atmospheric/cutting/stripped_rosewood_log.json b/src/main/resources/data/create/recipes/compat/atmospheric/cutting/stripped_rosewood_log.json index e8e3b4902..019a88bac 100644 --- a/src/main/resources/data/create/recipes/compat/atmospheric/cutting/stripped_rosewood_log.json +++ b/src/main/resources/data/create/recipes/compat/atmospheric/cutting/stripped_rosewood_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "atmospheric:rosewood_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/atmospheric/cutting/stripped_yucca_log.json b/src/main/resources/data/create/recipes/compat/atmospheric/cutting/stripped_yucca_log.json index 2a0c23af8..8f1105198 100644 --- a/src/main/resources/data/create/recipes/compat/atmospheric/cutting/stripped_yucca_log.json +++ b/src/main/resources/data/create/recipes/compat/atmospheric/cutting/stripped_yucca_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "atmospheric:yucca_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/autumnity/cutting/stripped_maple_log.json b/src/main/resources/data/create/recipes/compat/autumnity/cutting/stripped_maple_log.json index 18a07715c..74cfa54af 100644 --- a/src/main/resources/data/create/recipes/compat/autumnity/cutting/stripped_maple_log.json +++ b/src/main/resources/data/create/recipes/compat/autumnity/cutting/stripped_maple_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "autumnity:maple_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/bloomful/cutting/stripped_wisteria_log.json b/src/main/resources/data/create/recipes/compat/bloomful/cutting/stripped_wisteria_log.json index f939c1e5b..7d71013cd 100644 --- a/src/main/resources/data/create/recipes/compat/bloomful/cutting/stripped_wisteria_log.json +++ b/src/main/resources/data/create/recipes/compat/bloomful/cutting/stripped_wisteria_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "bloomful:wisteria_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_cherry_log.json b/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_cherry_log.json index 8061be745..a138be111 100644 --- a/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_cherry_log.json +++ b/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_cherry_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "biomesoplenty:cherry_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_dead_log.json b/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_dead_log.json index ffd900338..aabb0b0fb 100644 --- a/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_dead_log.json +++ b/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_dead_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "biomesoplenty:dead_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_fir_log.json b/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_fir_log.json index 149eb504a..b1387f163 100644 --- a/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_fir_log.json +++ b/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_fir_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "biomesoplenty:fir_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_hellbark_log.json b/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_hellbark_log.json index bbac5da4e..d1533fbf1 100644 --- a/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_hellbark_log.json +++ b/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_hellbark_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "biomesoplenty:hellbark_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_jacaranda_log.json b/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_jacaranda_log.json index 4032c3779..a46d1db69 100644 --- a/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_jacaranda_log.json +++ b/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_jacaranda_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "biomesoplenty:jacaranda_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_magic_log.json b/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_magic_log.json index fe1b2fcd8..4a48c17a7 100644 --- a/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_magic_log.json +++ b/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_magic_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "biomesoplenty:magic_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_mahogany_log.json b/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_mahogany_log.json index 4e4d2f531..48d13fff8 100644 --- a/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_mahogany_log.json +++ b/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_mahogany_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "biomesoplenty:mahogany_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_palm_log.json b/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_palm_log.json index bbc5da5fa..e06bd1c2f 100644 --- a/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_palm_log.json +++ b/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_palm_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "biomesoplenty:palm_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_redwood_log.json b/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_redwood_log.json index a235bdf37..304dbecf1 100644 --- a/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_redwood_log.json +++ b/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_redwood_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "biomesoplenty:redwood_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_umbran_log.json b/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_umbran_log.json index 718cf57ea..69c3d4b2a 100644 --- a/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_umbran_log.json +++ b/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_umbran_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "biomesoplenty:umbran_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_willow_log.json b/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_willow_log.json index 431885d1e..3ffbdf854 100644 --- a/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_willow_log.json +++ b/src/main/resources/data/create/recipes/compat/bop/cutting/stripped_willow_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "biomesoplenty:willow_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/druidcraft/cutting/stripped_darkwood_log.json b/src/main/resources/data/create/recipes/compat/druidcraft/cutting/stripped_darkwood_log.json index 6d3244f85..19a15e8fd 100644 --- a/src/main/resources/data/create/recipes/compat/druidcraft/cutting/stripped_darkwood_log.json +++ b/src/main/resources/data/create/recipes/compat/druidcraft/cutting/stripped_darkwood_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "druidcraft:darkwood_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/druidcraft/cutting/stripped_elder_log.json b/src/main/resources/data/create/recipes/compat/druidcraft/cutting/stripped_elder_log.json index e5a2c5084..fd3bbf015 100644 --- a/src/main/resources/data/create/recipes/compat/druidcraft/cutting/stripped_elder_log.json +++ b/src/main/resources/data/create/recipes/compat/druidcraft/cutting/stripped_elder_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "druidcraft:elder_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/endergetic/cutting/stripped_poise_stem.json b/src/main/resources/data/create/recipes/compat/endergetic/cutting/stripped_poise_stem.json index 0599cce9d..3fa18d40e 100644 --- a/src/main/resources/data/create/recipes/compat/endergetic/cutting/stripped_poise_stem.json +++ b/src/main/resources/data/create/recipes/compat/endergetic/cutting/stripped_poise_stem.json @@ -14,8 +14,8 @@ "results": [ { "item": "endergetic:poise_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_aspen_log.json b/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_aspen_log.json index 2679b5538..de7ab1983 100644 --- a/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_aspen_log.json +++ b/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_aspen_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "projectvibrantjourneys:aspen_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_baobab_log.json b/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_baobab_log.json index 1f5799d13..99b154419 100644 --- a/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_baobab_log.json +++ b/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_baobab_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "projectvibrantjourneys:baobab_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_cottonwood_log.json b/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_cottonwood_log.json index 8dd22e6bb..fab0bc42a 100644 --- a/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_cottonwood_log.json +++ b/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_cottonwood_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "projectvibrantjourneys:cottonwood_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_fir_log.json b/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_fir_log.json index f84e6acc1..8bb909152 100644 --- a/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_fir_log.json +++ b/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_fir_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "projectvibrantjourneys:fir_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_juniper_log.json b/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_juniper_log.json index 24b6e1d3a..1bf3205e8 100644 --- a/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_juniper_log.json +++ b/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_juniper_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "projectvibrantjourneys:juniper_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_mangrove_log.json b/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_mangrove_log.json index a7e11054b..386805201 100644 --- a/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_mangrove_log.json +++ b/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_mangrove_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "projectvibrantjourneys:mangrove_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_maple_log.json b/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_maple_log.json index c82ebf136..d1d630b6a 100644 --- a/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_maple_log.json +++ b/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_maple_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "projectvibrantjourneys:maple_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_palm_log.json b/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_palm_log.json index a6299ce69..87ec633da 100644 --- a/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_palm_log.json +++ b/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_palm_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "projectvibrantjourneys:palm_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_pine_log.json b/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_pine_log.json index 2ca583202..0a168c62d 100644 --- a/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_pine_log.json +++ b/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_pine_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "projectvibrantjourneys:pine_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_redwood_log.json b/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_redwood_log.json index b37f06e20..b9ab0965f 100644 --- a/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_redwood_log.json +++ b/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_redwood_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "projectvibrantjourneys:redwood_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_willow_log.json b/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_willow_log.json index 66b6aa646..f70c5f243 100644 --- a/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_willow_log.json +++ b/src/main/resources/data/create/recipes/compat/projectvibrantjourneys/cutting/stripped_willow_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "projectvibrantjourneys:willow_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/swampexpansion/cutting/stripped_willow_log.json b/src/main/resources/data/create/recipes/compat/swampexpansion/cutting/stripped_willow_log.json index 943443551..1d9c996ef 100644 --- a/src/main/resources/data/create/recipes/compat/swampexpansion/cutting/stripped_willow_log.json +++ b/src/main/resources/data/create/recipes/compat/swampexpansion/cutting/stripped_willow_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "swampexpansion:willow_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/traverse/cutting/fir_log.json b/src/main/resources/data/create/recipes/compat/traverse/cutting/fir_log.json new file mode 100644 index 000000000..a8bce8050 --- /dev/null +++ b/src/main/resources/data/create/recipes/compat/traverse/cutting/fir_log.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "traverse" + } + ], + "type": "create:cutting", + "ingredients": [ + { + "item": "traverse:fir_log" + } + ], + "results": [ + { + "item": "traverse:stripped_fir_log", + "count": 1 + } + ], + "processingTime": 50 +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/traverse/cutting/fir_wood.json b/src/main/resources/data/create/recipes/compat/traverse/cutting/fir_wood.json new file mode 100644 index 000000000..9e7060b9d --- /dev/null +++ b/src/main/resources/data/create/recipes/compat/traverse/cutting/fir_wood.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "traverse" + } + ], + "type": "create:cutting", + "ingredients": [ + { + "item": "traverse:fir_wood" + } + ], + "results": [ + { + "item": "traverse:stripped_fir_wood", + "count": 1 + } + ], + "processingTime": 50 +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/traverse/cutting/stripped_fir_log.json b/src/main/resources/data/create/recipes/compat/traverse/cutting/stripped_fir_log.json new file mode 100644 index 000000000..6b13ccb1d --- /dev/null +++ b/src/main/resources/data/create/recipes/compat/traverse/cutting/stripped_fir_log.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "traverse" + } + ], + "type": "create:cutting", + "ingredients": [ + { + "item": "traverse:stripped_fir_log" + } + ], + "results": [ + { + "item": "traverse:fir_planks", + "count": 6 + } + ], + "processingTime": 50 +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/traverse/cutting/stripped_fir_wood.json b/src/main/resources/data/create/recipes/compat/traverse/cutting/stripped_fir_wood.json new file mode 100644 index 000000000..71046bb70 --- /dev/null +++ b/src/main/resources/data/create/recipes/compat/traverse/cutting/stripped_fir_wood.json @@ -0,0 +1,21 @@ +{ + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "traverse" + } + ], + "type": "create:cutting", + "ingredients": [ + { + "item": "traverse:stripped_fir_wood" + } + ], + "results": [ + { + "item": "traverse:fir_planks", + "count": 6 + } + ], + "processingTime": 50 +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/upgrade_aquatic/cutting/stripped_driftwood_log.json b/src/main/resources/data/create/recipes/compat/upgrade_aquatic/cutting/stripped_driftwood_log.json index 648d7c3ff..02ec056eb 100644 --- a/src/main/resources/data/create/recipes/compat/upgrade_aquatic/cutting/stripped_driftwood_log.json +++ b/src/main/resources/data/create/recipes/compat/upgrade_aquatic/cutting/stripped_driftwood_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "upgrade_aquatic:driftwood_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/upgrade_aquatic/cutting/stripped_river_log.json b/src/main/resources/data/create/recipes/compat/upgrade_aquatic/cutting/stripped_river_log.json index faae38dff..61433a68c 100644 --- a/src/main/resources/data/create/recipes/compat/upgrade_aquatic/cutting/stripped_river_log.json +++ b/src/main/resources/data/create/recipes/compat/upgrade_aquatic/cutting/stripped_river_log.json @@ -14,8 +14,8 @@ "results": [ { "item": "upgrade_aquatic:river_planks", - "count": 5 + "count": 6 } ], - "processingTime": 100 + "processingTime": 50 } \ No newline at end of file From 5179aad4fe6e531b937633f92bfc7007c2fb7a4e Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Sun, 4 Jul 2021 16:30:46 +0200 Subject: [PATCH 2/6] Tweaks - Added config control for ambient sounds - Spilled milk off a pipe end now clears effects on entities - Non-placeable fluids now exit an open pipe at a fixed rate of 1mb/t - Air currents can now pass through Campfires vertically - Fixed perpendicular movement actors not activating consistently --- src/generated/resources/.cache/cache | 4 +- .../data/create/advancements/aesthetics.json | 4 +- .../create/tags/blocks/fan_transparent.json | 4 +- .../java/com/simibubi/create/AllTags.java | 2 +- .../contraptions/fluids/OpenEndedPipe.java | 58 ++++++++++++++----- .../create/foundation/config/CClient.java | 4 ++ .../create/foundation/sound/SoundScape.java | 4 +- .../create/foundation/sound/SoundScapes.java | 6 +- .../create/foundation/utility/VecHelper.java | 3 +- 9 files changed, 64 insertions(+), 25 deletions(-) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index a0fe1e44d..ac128f123 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1660,7 +1660,7 @@ d080b1b25e5bc8baf5aee68691b08c7f12ece3b0 assets/create/models/item/windmill_bear a80fb25a0b655e76be986b5b49fcb0f03461a1ab assets/create/models/item/zinc_nugget.json b1689617190c05ef34bd18456b0c7ae09bb3210f assets/create/models/item/zinc_ore.json f3231c27d43ff511b7d8532603111706ebcc155e assets/create/sounds.json -0f1b4b980afba9bf2caf583b88e261bba8b10313 data/create/advancements/aesthetics.json +5d0cc4c0255dc241e61c173b31ddca70c88d08e4 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 @@ -3687,7 +3687,7 @@ d3fdb8ece6cb072a93ddb64a0baad5ac952117a4 data/create/recipes/weathered_limestone 11667414f73bc2d00bda7c5c1a7d2934bf6e9165 data/create/recipes/weathered_limestone_pillar_from_weathered_limestone_stonecutting.json 558c1052ca384f1c014f9b404d21268764a493ee data/create/tags/blocks/brittle.json 330bfb3850ba3964b10b1bccbc3cbb9b012cae54 data/create/tags/blocks/fan_heaters.json -3bc64e3a1e7980237435b1770a9ba2102d57fcd4 data/create/tags/blocks/fan_transparent.json +57b942386a15c874d1ca9cd6a8032c11a5599fc2 data/create/tags/blocks/fan_transparent.json c81ea194e808985847159b201140d4aa4cbcca65 data/create/tags/blocks/safe_nbt.json c9ac7e3e5ec18554e7184168d65e9b8e44ef5610 data/create/tags/blocks/sails.json 6cdeeac1689f7b5bfd9bc40b462143d8eaf3ad0b data/create/tags/blocks/seats.json diff --git a/src/generated/resources/data/create/advancements/aesthetics.json b/src/generated/resources/data/create/advancements/aesthetics.json index d723cbe38..59a86f429 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:cogwheel", - "create:large_cogwheel" + "create:large_cogwheel", + "create:cogwheel" ] } }, diff --git a/src/generated/resources/data/create/tags/blocks/fan_transparent.json b/src/generated/resources/data/create/tags/blocks/fan_transparent.json index 5e6279801..6c8dfd4aa 100644 --- a/src/generated/resources/data/create/tags/blocks/fan_transparent.json +++ b/src/generated/resources/data/create/tags/blocks/fan_transparent.json @@ -5,6 +5,8 @@ "create:lit_blaze_burner", "create:sail_frame", "#minecraft:fences", - "minecraft:iron_bars" + "minecraft:iron_bars", + "minecraft:campfire", + "minecraft:soul_campfire" ] } \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllTags.java b/src/main/java/com/simibubi/create/AllTags.java index fc6f202f2..2fa0b7294 100644 --- a/src/main/java/com/simibubi/create/AllTags.java +++ b/src/main/java/com/simibubi/create/AllTags.java @@ -215,7 +215,7 @@ public class AllTags { AllBlockTags.BRITTLE.add(Blocks.FLOWER_POT, Blocks.BELL, Blocks.COCOA); AllBlockTags.FAN_TRANSPARENT.includeAll(BlockTags.FENCES); - AllBlockTags.FAN_TRANSPARENT.add(Blocks.IRON_BARS); + AllBlockTags.FAN_TRANSPARENT.add(Blocks.IRON_BARS, Blocks.CAMPFIRE, Blocks.SOUL_CAMPFIRE); AllBlockTags.FAN_HEATERS.add(Blocks.MAGMA_BLOCK, Blocks.CAMPFIRE, Blocks.LAVA, Blocks.FIRE, Blocks.SOUL_FIRE, Blocks.SOUL_CAMPFIRE); diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java index affb969e3..1aa0ecd7c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java @@ -16,6 +16,7 @@ import com.simibubi.create.foundation.utility.BlockFace; import net.minecraft.block.BlockState; import net.minecraft.block.FlowingFluidBlock; import net.minecraft.entity.LivingEntity; +import net.minecraft.fluid.Fluid; import net.minecraft.fluid.FluidState; import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemStack; @@ -31,6 +32,7 @@ import net.minecraft.util.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.common.Tags; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.IFluidHandler; @@ -74,7 +76,7 @@ public class OpenEndedPipe extends FlowSource { BlockState state = world.getBlockState(outputPos); FluidState fluidState = state.getFluidState(); boolean waterlog = state.contains(WATERLOGGED); - + if (state.contains(HONEY_LEVEL) && state.get(HONEY_LEVEL) >= 5) { if (!simulate) world.setBlockState(outputPos, state.with(HONEY_LEVEL, 0), 3); @@ -139,8 +141,10 @@ public class OpenEndedPipe extends FlowSource { if (simulate) return true; - if (world.getDimension().isUltrawarm() && fluid.getFluid() - .isIn(FluidTags.WATER)) { + if (world.getDimension() + .isUltrawarm() + && fluid.getFluid() + .isIn(FluidTags.WATER)) { int i = outputPos.getX(); int j = outputPos.getY(); int k = outputPos.getZ(); @@ -163,13 +167,33 @@ public class OpenEndedPipe extends FlowSource { return true; } - private void applyEffects(World world, FluidStack fluid) { - if (!fluid.getFluid() - .isEquivalentTo(AllFluids.POTION.get())) { - // other fx - return; - } + private boolean canApplyEffects(World world, FluidStack fluid) { + Fluid fluidType = fluid.getFluid(); + if (fluidType.isEquivalentTo(AllFluids.POTION.get())) + return true; + if (Tags.Fluids.MILK.contains(fluidType)) + return true; + return false; + } + private void applyEffects(World world, FluidStack fluid) { + Fluid fluidType = fluid.getFluid(); + + if (fluidType.isEquivalentTo(AllFluids.POTION.get())) + applyPotionEffects(world, fluid); + + if (Tags.Fluids.MILK.contains(fluidType)) { + if (world.getGameTime() % 5 != 0) + return; + List list = + world.getEntitiesWithinAABB(LivingEntity.class, aoe, LivingEntity::canBeHitWithPotion); + ItemStack curativeItem = new ItemStack(Items.MILK_BUCKET); + for (LivingEntity livingentity : list) + livingentity.curePotionEffects(curativeItem); + } + } + + private void applyPotionEffects(World world, FluidStack fluid) { if (cachedFluid == null || cachedEffects == null || !fluid.isFluidEqual(cachedFluid)) { FluidStack copy = fluid.copy(); copy.setAmount(250); @@ -181,7 +205,7 @@ public class OpenEndedPipe extends FlowSource { return; List list = - this.world.getEntitiesWithinAABB(LivingEntity.class, aoe, LivingEntity::canBeHitWithPotion); + world.getEntitiesWithinAABB(LivingEntity.class, aoe, LivingEntity::canBeHitWithPotion); for (LivingEntity livingentity : list) { for (EffectInstance effectinstance : cachedEffects) { Effect effect = effectinstance.getPotion(); @@ -192,7 +216,6 @@ public class OpenEndedPipe extends FlowSource { livingentity.addPotionEffect(new EffectInstance(effectinstance)); } } - } @Override @@ -234,15 +257,20 @@ public class OpenEndedPipe extends FlowSource { if (!provideFluidToSpace(resource, true)) return 0; - if (!getFluid().isEmpty() && !getFluid().isFluidEqual(resource)) + FluidStack containedFluidStack = getFluid(); + if (!containedFluidStack.isEmpty() && !containedFluidStack.isFluidEqual(resource)) setFluid(FluidStack.EMPTY); if (wasPulling) wasPulling = false; + if (canApplyEffects(world, resource)) + resource = FluidHelper.copyStackWithAmount(resource, 1); int fill = super.fill(resource, action); - if (action.execute() && (getFluidAmount() == 1000 || !FluidHelper.hasBlockState(getFluid().getFluid())) - && provideFluidToSpace(getFluid(), false)) - setFluid(FluidStack.EMPTY); + if (action.simulate()) + return fill; + if (getFluidAmount() == 1000 || !FluidHelper.hasBlockState(containedFluidStack.getFluid())) + if (provideFluidToSpace(containedFluidStack, false)) + setFluid(FluidStack.EMPTY); return fill; } diff --git a/src/main/java/com/simibubi/create/foundation/config/CClient.java b/src/main/java/com/simibubi/create/foundation/config/CClient.java index ebe8f1e31..5ec4fe323 100644 --- a/src/main/java/com/simibubi/create/foundation/config/CClient.java +++ b/src/main/java/com/simibubi/create/foundation/config/CClient.java @@ -47,6 +47,10 @@ public class CClient extends ConfigBase { public ConfigGroup ponder = group(1, "ponder", "Ponder settings"); public ConfigBool comfyReading = b(false, "comfyReading", "Slow down a ponder scene whenever there is text on screen."); + + public ConfigGroup sound = group(1, "sound", "Sound settings"); + public ConfigBool enableAmbientSounds = b(true, "enableAmbientSounds", "Make cogs rumble and machines clatter."); + public ConfigFloat ambientVolumeCap = f(.1f, 0, 1, "ambientVolumeCap", "Maximum volume modifier of Ambient noise"); @Override public String getName() { diff --git a/src/main/java/com/simibubi/create/foundation/sound/SoundScape.java b/src/main/java/com/simibubi/create/foundation/sound/SoundScape.java index 96ea0b8d9..3b68a728b 100644 --- a/src/main/java/com/simibubi/create/foundation/sound/SoundScape.java +++ b/src/main/java/com/simibubi/create/foundation/sound/SoundScape.java @@ -3,6 +3,7 @@ package com.simibubi.create.foundation.sound; import java.util.ArrayList; import java.util.List; +import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.sound.SoundScapes.AmbienceGroup; import com.simibubi.create.foundation.sound.SoundScapes.PitchGroup; import com.simibubi.create.foundation.utility.AnimationTickHolder; @@ -89,8 +90,9 @@ class SoundScape { distanceMultiplier = (float) MathHelper.lerp(distanceTo / SoundScapes.MAX_AMBIENT_SOURCE_DISTANCE, 2, 0); } int soundCount = SoundScapes.getSoundCount(group, pitchGroup); + float max = AllConfigs.CLIENT.ambientVolumeCap.getF(); float argMax = (float) SoundScapes.SOUND_VOLUME_ARG_MAX; - return MathHelper.clamp(soundCount / (argMax * 10f), 0.025f, .15f) * distanceMultiplier; + return MathHelper.clamp(soundCount / (argMax * 10f), 0.025f, max) * distanceMultiplier; } } \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/foundation/sound/SoundScapes.java b/src/main/java/com/simibubi/create/foundation/sound/SoundScapes.java index eec64b4e5..e83bef0a9 100644 --- a/src/main/java/com/simibubi/create/foundation/sound/SoundScapes.java +++ b/src/main/java/com/simibubi/create/foundation/sound/SoundScapes.java @@ -11,6 +11,7 @@ import java.util.Set; import java.util.function.BiFunction; import com.simibubi.create.AllSoundEvents; +import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.Pair; @@ -60,6 +61,8 @@ public class SoundScapes { private static Map, SoundScape> activeSounds = new HashMap<>(); public static void play(AmbienceGroup group, BlockPos pos, float pitch) { + if (!AllConfigs.CLIENT.enableAmbientSounds.get()) + return; if (!outOfRange(pos)) addSound(group, pos, pitch); } @@ -71,6 +74,7 @@ public class SoundScapes { if (AnimationTickHolder.getTicks() % UPDATE_INTERVAL != 0) return; + boolean disable = !AllConfigs.CLIENT.enableAmbientSounds.get(); for (Iterator, SoundScape>> iterator = activeSounds.entrySet() .iterator(); iterator.hasNext();) { @@ -78,7 +82,7 @@ public class SoundScapes { Pair key = entry.getKey(); SoundScape value = entry.getValue(); - if (getSoundCount(key.getFirst(), key.getSecond()) == 0) { + if (disable || getSoundCount(key.getFirst(), key.getSecond()) == 0) { value.remove(); iterator.remove(); } diff --git a/src/main/java/com/simibubi/create/foundation/utility/VecHelper.java b/src/main/java/com/simibubi/create/foundation/utility/VecHelper.java index 2809bf0b6..7491d635c 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/VecHelper.java +++ b/src/main/java/com/simibubi/create/foundation/utility/VecHelper.java @@ -62,8 +62,7 @@ public class VecHelper { public static boolean isVecPointingTowards(Vector3d vec, Direction direction) { return Vector3d.of(direction.getDirectionVec()) - .dotProduct(vec.normalize()) > 0; - // return new Vector3d(direction.getDirectionVec()).distanceTo(vec.normalize()) < .75; + .dotProduct(vec.normalize()) > 0.125; // slight tolerance to activate perpendicular movement actors } public static Vector3d getCenterOf(Vector3i pos) { From abd6e9780161851d2fac4cf47d287caa0b72b8b9 Mon Sep 17 00:00:00 2001 From: Daniel Amberson Date: Sun, 4 Jul 2021 12:15:29 -0500 Subject: [PATCH 3/6] polished bell assets: part 1 the currently named "peculiar bell" has been tweaked, and the stands for the bell have been completely remodeled the cursed bell has not been touched, waiting on an animated texture from kryppers before proceeding --- .../models/block/peculiar_bell/bell.json | 25 ++++--- .../block/peculiar_bell/block_ceiling.json | 66 ++++++++++++----- .../peculiar_bell/block_double_wall.json | 70 ++++++++++-------- .../block/peculiar_bell/block_floor.json | 60 +++++++++++---- .../peculiar_bell/block_single_wall.json | 57 +++++++------- .../models/block/peculiar_bell/item.json | 25 ++++--- .../assets/create/textures/block/bell.png | Bin 836 -> 727 bytes .../create/textures/block/bell_frame.png | Bin 561 -> 782 bytes .../create/textures/block/bell_frame_side.png | Bin 586 -> 700 bytes 9 files changed, 187 insertions(+), 116 deletions(-) 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 index d6e26bbc3..2e6436a27 100644 --- a/src/main/resources/assets/create/models/block/peculiar_bell/bell.json +++ b/src/main/resources/assets/create/models/block/peculiar_bell/bell.json @@ -2,12 +2,12 @@ "credit": "Made with Blockbench", "textures": { "0": "create:block/bell", - "particle": "create:block/bell" + "particle": "create:block/bell" }, "elements": [ { - "from": [14, 7, 7], - "to": [16, 9, 9], + "from": [13, 7, 7], + "to": [15, 9, 9], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { "north": {"uv": [10.5, 6, 9.5, 7], "texture": "#0"}, @@ -19,8 +19,8 @@ } }, { - "from": [0, 7, 7], - "to": [2, 9, 9], + "from": [1, 7, 7], + "to": [3, 9, 9], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { "north": {"uv": [9.5, 6, 10.5, 7], "texture": "#0"}, @@ -32,8 +32,8 @@ } }, { - "from": [3, 0, 3], - "to": [13, 2, 13], + "from": [3, 1, 3], + "to": [13, 3, 13], "faces": { "north": {"uv": [0, 15, 5, 16], "texture": "#0"}, "east": {"uv": [0, 15, 5, 16], "texture": "#0"}, @@ -44,8 +44,8 @@ } }, { - "from": [4, 2, 4], - "to": [12, 11, 12], + "from": [4, 3, 4], + "to": [12, 12, 12], "faces": { "north": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, "east": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, @@ -55,8 +55,8 @@ } }, { - "from": [7, 11, 7], - "to": [9, 15, 9], + "from": [7, 12, 7], + "to": [9, 16, 9], "faces": { "north": {"uv": [8, 6, 9, 8], "texture": "#0"}, "east": {"uv": [8, 6, 9, 8], "texture": "#0"}, @@ -86,7 +86,8 @@ { "name": "Bell", "origin": [8, 8, 8], + "color": 0, "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/block_ceiling.json b/src/main/resources/assets/create/models/block/peculiar_bell/block_ceiling.json index 2616af7a7..97d3b5e92 100644 --- 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 @@ -3,35 +3,67 @@ "textures": { "1": "create:block/bell_frame_side", "2": "create:block/bell_frame", - "particle": "create:block/bell" + "particle": "create:block/bell" }, "elements": [ { - "from": [0.1, 0, 0], - "to": [15.9, 16, 16], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]}, + "from": [15, 4, 4], + "to": [16, 12, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, "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"} + "north": {"uv": [16, 8, 15, 0], "texture": "#2"}, + "east": {"uv": [0, 8, 8, 0], "texture": "#2"}, + "south": {"uv": [1, 8, 0, 0], "texture": "#2"}, + "west": {"uv": [16, 8, 8, 0], "texture": "#2"}, + "up": {"uv": [4, 11, 12, 12], "rotation": 270, "texture": "#1"}, + "down": {"uv": [4, 4, 12, 5], "rotation": 90, "texture": "#1"} } }, { - "from": [15.9, 0, 0], - "to": [0.1, 16, 16], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]}, + "from": [0, 4, 4], + "to": [1, 12, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, "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"} + "north": {"uv": [16, 8, 15, 0], "texture": "#2"}, + "east": {"uv": [8, 8, 16, 0], "texture": "#2"}, + "south": {"uv": [1, 8, 0, 0], "texture": "#2"}, + "west": {"uv": [8, 8, 0, 0], "texture": "#2"}, + "up": {"uv": [4, 11, 12, 12], "rotation": 270, "texture": "#1"}, + "down": {"uv": [4, 4, 12, 5], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [0, 12, 2], + "to": [2, 16, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [14, 16, 16, 12], "texture": "#2"}, + "east": {"uv": [0, 16, 12, 12], "texture": "#2"}, + "south": {"uv": [14, 16, 12, 12], "texture": "#2"}, + "west": {"uv": [12, 12, 0, 8], "texture": "#2"}, + "up": {"uv": [11, 14, 0, 12], "rotation": 90, "texture": "#1"}, + "down": {"uv": [12, 14, 0, 16], "rotation": 270, "texture": "#1"} + } + }, + { + "from": [14, 12, 2], + "to": [16, 16, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [16, 16, 14, 12], "texture": "#2"}, + "east": {"uv": [0, 12, 12, 8], "texture": "#2"}, + "south": {"uv": [12, 16, 14, 12], "texture": "#2"}, + "west": {"uv": [12, 16, 0, 12], "texture": "#2"}, + "up": {"uv": [11, 12, 0, 14], "rotation": 90, "texture": "#1"}, + "down": {"uv": [12, 16, 0, 14], "rotation": 270, "texture": "#1"} } } ], "groups": [ { - "name": "Frame", + "name": "block_double_wall", "origin": [8, 8, 8], + "color": 0, "children": [0, 1] - } - ] -} + }, 2, 3] +} \ No newline at end of file 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 index 52a9e266d..623a83eb7 100644 --- 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 @@ -1,32 +1,40 @@ { - "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] - } - ] -} + "credit": "Made with Blockbench", + "textures": { + "1": "create:block/bell_frame_side", + "particle": "create:block/bell" + }, + "elements": [ + { + "from": [4, 4, 0], + "to": [12, 12, 1], + "faces": { + "north": {"uv": [4, 4, 12, 12], "texture": "#1"}, + "east": {"uv": [5, 4, 4, 12], "texture": "#1"}, + "south": {"uv": [12, 4, 4, 12], "texture": "#1"}, + "west": {"uv": [12, 4, 11, 12], "texture": "#1"}, + "up": {"uv": [12, 4, 4, 5], "texture": "#1"}, + "down": {"uv": [12, 11, 4, 12], "texture": "#1"} + } + }, + { + "from": [4, 4, 15], + "to": [12, 12, 16], + "faces": { + "north": {"uv": [4, 4, 12, 12], "texture": "#1"}, + "east": {"uv": [5, 4, 4, 12], "texture": "#1"}, + "south": {"uv": [12, 4, 4, 12], "texture": "#1"}, + "west": {"uv": [12, 4, 11, 12], "texture": "#1"}, + "up": {"uv": [12, 4, 4, 5], "texture": "#1"}, + "down": {"uv": [12, 11, 4, 12], "texture": "#1"} + } + } + ], + "groups": [ + { + "name": "Frame", + "origin": [8, 8, 8], + "color": 0, + "children": [] + }, 0, 1] +} \ No newline at end of file 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 index 6738c29b4..63cc96caa 100644 --- 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 @@ -3,33 +3,63 @@ "textures": { "1": "create:block/bell_frame_side", "2": "create:block/bell_frame", - "particle": "create:block/bell" + "particle": "create:block/bell" }, "elements": [ { - "from": [0.1, 0, 0], - "to": [15.9, 16, 16], + "from": [15, 4, 4], + "to": [16, 12, 12], "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"} + "north": {"uv": [16, 0, 15, 8], "texture": "#2"}, + "east": {"uv": [0, 0, 8, 8], "texture": "#2"}, + "south": {"uv": [1, 0, 0, 8], "texture": "#2"}, + "west": {"uv": [16, 0, 8, 8], "texture": "#2"}, + "up": {"uv": [12, 4, 4, 5], "rotation": 90, "texture": "#1"}, + "down": {"uv": [12, 11, 4, 12], "rotation": 270, "texture": "#1"} } }, { - "from": [15.9, 0, 0], - "to": [0.1, 16, 16], + "from": [0, 4, 4], + "to": [1, 12, 12], "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"} + "north": {"uv": [16, 0, 15, 8], "texture": "#2"}, + "east": {"uv": [8, 0, 16, 8], "texture": "#2"}, + "south": {"uv": [1, 0, 0, 8], "texture": "#2"}, + "west": {"uv": [8, 0, 0, 8], "texture": "#2"}, + "up": {"uv": [12, 4, 4, 5], "rotation": 90, "texture": "#1"}, + "down": {"uv": [12, 11, 4, 12], "rotation": 270, "texture": "#1"} + } + }, + { + "from": [0, 0, 2], + "to": [2, 4, 14], + "faces": { + "north": {"uv": [14, 12, 16, 16], "texture": "#2"}, + "east": {"uv": [0, 12, 12, 16], "texture": "#2"}, + "south": {"uv": [14, 12, 12, 16], "texture": "#2"}, + "west": {"uv": [12, 8, 0, 12], "texture": "#2"}, + "up": {"uv": [0, 14, 12, 16], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 14, 11, 12], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [14, 0, 2], + "to": [16, 4, 14], + "faces": { + "north": {"uv": [16, 12, 14, 16], "texture": "#2"}, + "east": {"uv": [0, 8, 12, 12], "texture": "#2"}, + "south": {"uv": [12, 12, 14, 16], "texture": "#2"}, + "west": {"uv": [12, 12, 0, 16], "texture": "#2"}, + "up": {"uv": [0, 16, 12, 14], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 12, 11, 14], "rotation": 90, "texture": "#1"} } } ], "groups": [ { - "name": "Frame", + "name": "block_double_wall", "origin": [8, 8, 8], + "color": 0, "children": [0, 1] - } - ] -} + }, 2, 3] +} \ No newline at end of file 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 index 7bee57b84..605614397 100644 --- 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 @@ -1,30 +1,29 @@ { - "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] - } - ] -} + "credit": "Made with Blockbench", + "textures": { + "1": "create:block/bell_frame_side", + "particle": "create:block/bell" + }, + "elements": [ + { + "from": [4, 4, 0], + "to": [12, 12, 1], + "faces": { + "north": {"uv": [4, 4, 12, 12], "texture": "#1"}, + "east": {"uv": [4, 4, 5, 12], "texture": "#1"}, + "south": {"uv": [12, 4, 4, 12], "texture": "#1"}, + "west": {"uv": [11, 4, 12, 12], "texture": "#1"}, + "up": {"uv": [12, 4, 4, 5], "texture": "#1"}, + "down": {"uv": [12, 11, 4, 12], "texture": "#1"} + } + } + ], + "groups": [ + { + "name": "Frame", + "origin": [8, 8, 8], + "color": 0, + "children": [0] + } + ] +} \ No newline at end of file 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 index f79362efc..d4d7060da 100644 --- a/src/main/resources/assets/create/models/block/peculiar_bell/item.json +++ b/src/main/resources/assets/create/models/block/peculiar_bell/item.json @@ -1,14 +1,14 @@ { "credit": "Made with Blockbench", - "parent": "block/block", + "parent": "block/block", "textures": { "0": "create:block/bell", "particle": "create:block/bell" }, "elements": [ { - "from": [14, 7, 7], - "to": [16, 9, 9], + "from": [13, 7, 7], + "to": [15, 9, 9], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { "north": {"uv": [10.5, 6, 9.5, 7], "texture": "#0"}, @@ -20,8 +20,8 @@ } }, { - "from": [0, 7, 7], - "to": [2, 9, 9], + "from": [1, 7, 7], + "to": [3, 9, 9], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { "north": {"uv": [9.5, 6, 10.5, 7], "texture": "#0"}, @@ -33,8 +33,8 @@ } }, { - "from": [3, 0, 3], - "to": [13, 2, 13], + "from": [3, 1, 3], + "to": [13, 3, 13], "faces": { "north": {"uv": [0, 15, 5, 16], "texture": "#0"}, "east": {"uv": [0, 15, 5, 16], "texture": "#0"}, @@ -45,8 +45,8 @@ } }, { - "from": [4, 2, 4], - "to": [12, 11, 12], + "from": [4, 3, 4], + "to": [12, 12, 12], "faces": { "north": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, "east": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, @@ -56,8 +56,8 @@ } }, { - "from": [7, 11, 7], - "to": [9, 15, 9], + "from": [7, 12, 7], + "to": [9, 16, 9], "faces": { "north": {"uv": [8, 6, 9, 8], "texture": "#0"}, "east": {"uv": [8, 6, 9, 8], "texture": "#0"}, @@ -87,7 +87,8 @@ { "name": "Bell", "origin": [8, 8, 8], + "color": 0, "children": [0, 1, 2, 3, 4, 5, 6] } ] -} +} \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/block/bell.png b/src/main/resources/assets/create/textures/block/bell.png index cd05091a99c2ccee7bb9cdfd7e98f2d81da5b7af..df12de3909e7ae10e17e643b1be53528516654d5 100644 GIT binary patch delta 683 zcmV;c0#yCP2G<3UBpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPks%m=Y)M2xR9Hvt zmpe-&K@i7l7Q@>>Gx5cOnfORfK@klM48%k<5Wm1(Bp9e%Vj`!3(TRQmAGjhW1_lO- zD5!~Yn0bi1D;jyh92lH1H~*Tcxpth{?Vbrt{J}y$s=FRtT|H}&kK-IT-1u`r_dknt zx^vB4p?jo->RKC!K7HnYzGV&Y+Qso6Cs$iVP0d-VYj5Pa`>O)o-Pm;d@WTDLdBB^L zPQN=m`k54O!j@jLr?Rk@ejxR(`6_!RDP4Jv@hT)c{pFI}nobc65Pq zESTOn38E4OJccYHBCv8q#*JPWQ4WO?)&J2bPzD2-1eKHnk&!ij0TIf9crGCaXk!d> zYygn+(jijT&ka-9052S7=&nJeaOMcRfVSiT=fL{%)tjU%2V}8EIA1$)4JvXwd^BF@ z3v6)b#M>ma&Q^!K>*vz-Wv^lm0Cf!rk`Va0AW9C8f5%=!9A$8gFfg`sq-B7*My{HQ znj<=i%~xx(x9ydGSLJ{#*7)62Xn9-?uApw%t?aDj*xwz59tBFq)$>MVkUvk4HrdaA zX}45Lt)HM2l{DPeC8z^Qfro;4YeH%Ra2@4JN~ldpZ9so-HUEH|vk9pUfKpShKlnf; zcnjj5SG9_T9~D8B(W?Cl{2EruV)fxcDZRUW@@G7nay7w!H>2)@CS-IzEFc3TqLc%S zVGc5;Xx9N45v5$foQ^YL5*MN$`C*#**5UV(lh}YHbw7&41}w~9(&pALzn2_s1K=^T zJr2x4#*~cCA_+IHT9grT4U-(n`xl~De=cJ_t+Bajfzic^`g<*;@k|e*e~%EX$Z9lW R1poj507*p#PDHLkV1gvc$Q&AK?FJv@>oeUwCf?KH(p%tmY4vymB zs0C+#2GK#mS=2=Y6~S3M6zY`0!9ggAm@Y=?Rwzjg-RuxY;d#Gv-*ayy$-!-MXGmzc=Kl)91rFK%k`<z(WTz1pp@5bd$iu9a9fJ%GC%!R2|4{(4Llie`(e1FhdLuS@8AEWz$ra z&fRQGY(VP8Z7|1m*6oXlXbS@rnv*+)Rl_`&s0b!r9@tN#xJ|2lAY~1L4*%#(xdbmZ zzfVsJTkCH9w5x>kGKPV!-Hu}v{^v9fv2gH2!DIZ{y5*e+aOyV91vqwOXYrF801qSt zXLqLoVvpi9e-;Vd_pdr`hTZKZJeb@7R_e!Xm^HiSeNMkPuG|2yC6DN+0(mMBtlz&F z{(GT}y5iPCcPB3uYR7ea9yPSXSmZ_2-LcQ5xR5+_@V*0xR@>ZUkH1l*VIa5-vs_H>Q97=J z8Jq{vO5Oa%t6dmMG_Erw@c0<&0rx8yhKZ+E+7r$rwyG5E0|IwC*U$bWhcr)S>fPht ZUj&)85vR6~L*M`a002ovPDHLkV1j#>e^USe diff --git a/src/main/resources/assets/create/textures/block/bell_frame.png b/src/main/resources/assets/create/textures/block/bell_frame.png index 4855d47a15ec8551ca5c5c221bc62b1d2c7a9cd7..959d0d165aad7b4bf3b7ecf28ef2719c52faa674 100644 GIT binary patch delta 707 zcmV;!0zCb(1daxfEhSKLZ)Rz1WdHyu&y|rqNW(xJ#a~mkA{9Y9NO8zeoh%d;ag->L zQZ9d};K6Y}-ralLy#s`LnQ2y64A6AjOvNQJn_CeBujoM-gAfsunPnu>3mJ4AU-$6w z^)AY@@W0Wo<}C*JMB-Uym^Se`@${x`aNZ{lv68G3pA(OpbV1@rt}7nDaW1+n@XU~z zNzD<5h{a+XD{ah5rbawP98oo$@`bF&D(8PK&RV(3n)l={4CeLaG}md4AdW>Okfe?j zRI!0FY(#0*NwJWkeW`;#?D~`BQpmLdMvi$@ph0&1;D7MDTdOcR;Uxtnp!>yfK1PAS zF3_ks&iAq7G)@5jGjOH1{FOQ|^GSNGrA3Z_fo`H!`LZN>E zyr0oG<$$4Epl{Xdt+|iW2OvXTE!_YIhrn2ove!DiySKf!KhL=RLHYsFg>uc~kyOwC z000SaNLh0L01FcU01FcV0GgZ_0003mNklKR`BICgvKKeHsI;y z$50Ve@buy%2D2Dz27K}?P&SzJ@Xmi{hWpR|FgVx>g2h05Gcb#R;n>=%U^y6w&d~?U zGeP-aj#aQWSmMCp_fSy;0BKf~WPxKCfExe;AXk7eDFAK&%z4;s2LX_`JaV2BZmOy91Pu3_t;h3$TFVSXvjNsBESWR2TwaF#vx8p$#73 z^uWmI!Uz=t1IGXV_xyi)d>uR*u>p{u!A`df!eRhgLPC!PWdBO*$}%wWR-ziPs@VQN zast5zK=B{edl1!tlhb|v<8nGWfJL8KMghaA856)XI2w`T6&Jvz2A&Q;3h-eR0L!JI p+}Igq{U5?39)Q9Ek~dfw00?Y{03*jds!$<0e(*o|-K|-ioN$wZaiIIfwm(LJ zz%J0N+xGXdZ8uK<|1)ruc)TT1i* z000JJOGiWiDgY_~Dx6b>IsgCw32;bRa{vGf6951U69E94oEQKA00(qQO+^Rg1{xA1 z3N$7iYybcNElET{R5;6HJUQLxKLa!cfQf-Zzyf2KXKrC6MI+4R6uV&5fKdYmhXITO ao*M!F=?Qo4#Z3tS0000L zQZ9d};K6Y}-ralLy#s`LnQ2y64A6AjOvNQJn_CeBujoM-gAfsunPnu>3mJ4AU-$6w z^)AY@@W0Wo<}C*JMB-Uym^Se`@${x`aNZ{lv68G3pA(OpbV1@rt}7nDaW1+n@XU~z zNzD<5h{a+XD{ah5rbawP98oo$@`bF&D(8PK&RV(3n)l={4CeLaG}md4AdW>Okfe?j zRI!0FY(#0*NwJWkeW`;#?D~`BQpmLdMvi$@ph0&1;D7MDTdOcR;Uxtnp!>yfK1PAS zF3_ks&iAq7G)@5jGjOH1{FOQ|^GSNGrA3Z_fo`H!`LZN>E zyr0oG<$$4Epl{Xdt+|iW2OvXTE!_YIhrn2ove!DiySKf!KhL=RLHYsFg>uc~kyOwC z000SaNLh0L01FcU01FcV0GgZ_0002pNklee^!@C!s89smi4OM?Rqya`4{QunkpMl2|%0mOd@L=SvMA3uQ08pS| z1E7F3&)kBdhY3n!fMaW~GAx~P5spCs6btA8rvaeoQj}zYV_X2I0mK5F1~}LXGRUj& z!Z9v@(*S9GITVZwV8p_zV*CFf|KkGX%Z{Q(BOwjw0Nns4QZ!=&jIbQHx?w;ELui8s zR2Tt3i3*e^Kys&+9K}dTj3=l2{Ku9+&;ckWK?Y{03*jds!$<0e(*o|-K|-ioN$wZaiIIfwm(LJ zz%J0N+xGXdZ8uK<|1)ruc)TT1i* z000JJOGiWiDgY_~Dx6b>IsgCw32;bRa{vGf6951U69E94oEQKA00(qQO+^Rg1{xA0 z6CVsCYXATMMoC0LR5;6HU>F619Gp#@?(_fTbf5qD)G*@HjLbLB+=5jt6Q!9|-)#kR{00000NkvXXu0mjf6~5;2 From 202f81aa7c23f1623644d2647fd0a45889f42360 Mon Sep 17 00:00:00 2001 From: reidbhuntley Date: Sun, 4 Jul 2021 14:23:34 -0400 Subject: [PATCH 4/6] The Polishing - Added new Potato Cannon projectile types and tweaked values of existing types - Potato projectiles can now catch fire and ignite entities like arrows - Made splitting potato projectiles more consistent - Lectern Controller can now be pick-blocked in creative and be placed by Schematicannon - Fixed Schematicannon treating schematics with a single block in them as empty - Soul base particles now also disappear early if their location gets lit - Renamed Cursed Bell to Haunted Bell --- src/generated/resources/.cache/cache | 42 ++--- .../{cursed_bell.json => haunted_bell.json} | 64 +++---- .../resources/assets/create/lang/en_ud.json | 2 +- .../resources/assets/create/lang/en_us.json | 14 +- .../assets/create/lang/unfinished/de_de.json | 14 +- .../assets/create/lang/unfinished/es_es.json | 14 +- .../assets/create/lang/unfinished/es_mx.json | 14 +- .../assets/create/lang/unfinished/fr_fr.json | 14 +- .../assets/create/lang/unfinished/it_it.json | 14 +- .../assets/create/lang/unfinished/ja_jp.json | 14 +- .../assets/create/lang/unfinished/ko_kr.json | 14 +- .../assets/create/lang/unfinished/nl_nl.json | 14 +- .../assets/create/lang/unfinished/pl_pl.json | 14 +- .../assets/create/lang/unfinished/pt_br.json | 14 +- .../assets/create/lang/unfinished/ru_ru.json | 14 +- .../assets/create/lang/unfinished/zh_cn.json | 14 +- .../assets/create/lang/unfinished/zh_tw.json | 14 +- .../create/models/item/cursed_bell.json | 3 - .../create/models/item/haunted_bell.json | 3 + .../resources/assets/create/sounds.json | 24 +-- .../data/create/advancements/aesthetics.json | 4 +- .../{cursed_bell.json => haunted_bell.json} | 2 +- .../data/create/tags/blocks/brittle.json | 2 +- .../com/simibubi/create/AllBlockPartials.java | 2 +- .../java/com/simibubi/create/AllBlocks.java | 10 +- .../com/simibubi/create/AllEntityTypes.java | 2 +- .../com/simibubi/create/AllSoundEvents.java | 4 +- .../com/simibubi/create/AllTileEntities.java | 8 +- .../MysteriousItemConversionCategory.java | 2 +- ...edBellBlock.java => HauntedBellBlock.java} | 14 +- ...java => HauntedBellMovementBehaviour.java} | 6 +- ...BellPulser.java => HauntedBellPulser.java} | 6 +- ...Entity.java => HauntedBellTileEntity.java} | 8 +- .../curiosities/bell/PeculiarBellBlock.java | 10 +- .../curiosities/bell/SoulBaseParticle.java | 11 +- .../curiosities/bell/SoulParticle.java | 15 +- .../curiosities/bell/SoulPulseEffect.java | 2 +- .../curiosities/weapons/PotatoCannonItem.java | 25 ++- .../weapons/PotatoCannonProjectileTypes.java | 171 +++++++++++++++--- .../weapons/PotatoProjectileEntity.java | 10 +- .../item/LecternControllerBlock.java | 20 +- .../item/LecternControllerTileEntity.java | 6 + .../content/schematics/SchematicPrinter.java | 4 +- .../create/foundation/utility/VecHelper.java | 14 ++ .../assets/create/lang/default/tooltips.json | 8 +- .../{cursed_bell => haunted_bell}/bell.json | 0 .../block_ceiling.json | 0 .../block_double_wall.json | 0 .../block_floor.json | 0 .../block_single_wall.json | 0 .../{cursed_bell => haunted_bell}/item.json | 0 ...l_convert.ogg => haunted_bell_convert.ogg} | Bin ...rsed_bell_use.ogg => haunted_bell_use.ogg} | Bin 53 files changed, 436 insertions(+), 264 deletions(-) rename src/generated/resources/assets/create/blockstates/{cursed_bell.json => haunted_bell.json} (55%) delete mode 100644 src/generated/resources/assets/create/models/item/cursed_bell.json create mode 100644 src/generated/resources/assets/create/models/item/haunted_bell.json rename src/generated/resources/data/create/loot_tables/blocks/{cursed_bell.json => haunted_bell.json} (86%) rename src/main/java/com/simibubi/create/content/curiosities/bell/{CursedBellBlock.java => HauntedBellBlock.java} (63%) rename src/main/java/com/simibubi/create/content/curiosities/bell/{CursedBellMovementBehaviour.java => HauntedBellMovementBehaviour.java} (84%) rename src/main/java/com/simibubi/create/content/curiosities/bell/{CursedBellPulser.java => HauntedBellPulser.java} (87%) rename src/main/java/com/simibubi/create/content/curiosities/bell/{CursedBellTileEntity.java => HauntedBellTileEntity.java} (91%) rename src/main/resources/assets/create/models/block/{cursed_bell => haunted_bell}/bell.json (100%) rename src/main/resources/assets/create/models/block/{cursed_bell => haunted_bell}/block_ceiling.json (100%) rename src/main/resources/assets/create/models/block/{cursed_bell => haunted_bell}/block_double_wall.json (100%) rename src/main/resources/assets/create/models/block/{cursed_bell => haunted_bell}/block_floor.json (100%) rename src/main/resources/assets/create/models/block/{cursed_bell => haunted_bell}/block_single_wall.json (100%) rename src/main/resources/assets/create/models/block/{cursed_bell => haunted_bell}/item.json (100%) rename src/main/resources/assets/create/sounds/{cursed_bell_convert.ogg => haunted_bell_convert.ogg} (100%) rename src/main/resources/assets/create/sounds/{cursed_bell_use.ogg => haunted_bell_use.ogg} (100%) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index ac128f123..2c3e2d5e0 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -68,7 +68,6 @@ f0031f5e970b3d5695472ed384950b8631b015ed assets/create/blockstates/creative_moto fe2f78b94c20944399101e7369e2d43324297fb6 assets/create/blockstates/crushing_wheel.json a1dd6cb3daa97ea871290ef7b178d28b564ee2a2 assets/create/blockstates/crushing_wheel_controller.json b1126c191877cff86b4e2de83e1fcbd151451cb7 assets/create/blockstates/cuckoo_clock.json -e8f1222b21e8e2e67d18252f7d3c9eefa650d3b9 assets/create/blockstates/cursed_bell.json b496452f2f7dbbba385e1fc10b560ec266e4b5e7 assets/create/blockstates/cyan_sail.json 4de72f65bff4e5d9c8153fa3adeee6b61d6f912b assets/create/blockstates/cyan_seat.json 2c04d57e56849f243aec8a1e769574d24daac1e9 assets/create/blockstates/cyan_valve_handle.json @@ -182,6 +181,7 @@ a5ec5401ba9f3e102a2e1b35837f643847afbca4 assets/create/blockstates/gray_seat.jso 13059309684db0cc7a0f1f4fce2407cf06cce80a assets/create/blockstates/green_seat.json f4a0fc68e8daaa0a47cdc951ced4310057a874b0 assets/create/blockstates/green_valve_handle.json 6ab675fa06317e6d07c0c1a453e7bb43e3f46b3b assets/create/blockstates/hand_crank.json +a895a7a0b47273301f21090882e06b64600e4e54 assets/create/blockstates/haunted_bell.json 4572b90f5d6c586e145f2c7a55664c3cb734bd2b assets/create/blockstates/honey.json be3bef7e091d8b50bfc1c6b7275946d1f636aefd assets/create/blockstates/horizontal_framed_glass.json 18d9fdaa1352a7e2ec91135e46dae5c02ccd8f8f assets/create/blockstates/horizontal_framed_glass_pane.json @@ -410,21 +410,21 @@ a3a11524cd3515fc01d905767b4b7ea782adaf03 assets/create/blockstates/yellow_seat.j 6801fa1f466f172700e573e5b8ee8ee5f9ca4583 assets/create/blockstates/yellow_valve_handle.json 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json -391e1552053f8fbb148b0bdf2e61f74ae4782100 assets/create/lang/en_ud.json -9d41edd2a78d074f0e80fbc95b6eb9f1303ef7f5 assets/create/lang/en_us.json -f05c04c9b1e79c446492af47a9bfcde73cefd138 assets/create/lang/unfinished/de_de.json -3b2ed3f1b4910e5cc03af089bf2ddfc1421cfc1f assets/create/lang/unfinished/es_es.json -e9ad51b0ad0e1088f121fb2444ef2019c11a2e80 assets/create/lang/unfinished/es_mx.json -f6f8a3f4b3bf685e324c9216b5bb0467c68da796 assets/create/lang/unfinished/fr_fr.json -d05b807ead4cc5dbae6444de5e91525a385d9b20 assets/create/lang/unfinished/it_it.json -055d6b4d130fedfe0232c351663bd9a1934d1a46 assets/create/lang/unfinished/ja_jp.json -064c4e1d5923dc5a75b178940cb36c42f764a6ad assets/create/lang/unfinished/ko_kr.json -762c1bdec8a3f2ecb4047fbb5b975ffbc1792374 assets/create/lang/unfinished/nl_nl.json -43c113585d98162f8cbe5ec02af06f6f8ae55cbc assets/create/lang/unfinished/pl_pl.json -3ab83a3d7d925821d73e9ab6064d3b479d7c21e6 assets/create/lang/unfinished/pt_br.json -51c20e7a0c4b2af9242ee31cf0cf1516b9f312a5 assets/create/lang/unfinished/ru_ru.json -95bf20119493721c3067319f165e2542295918c0 assets/create/lang/unfinished/zh_cn.json -9604bfe416e4f747efda84b419ec99f2b38bd544 assets/create/lang/unfinished/zh_tw.json +adf2c2d7bc22ad8a655f8e69bbd87c80c4302c61 assets/create/lang/en_ud.json +bdb41187a99a7d7af5dde2a26eb6e644dfd10629 assets/create/lang/en_us.json +5c8a02adbe232cec72e6d7d899bacaf0c282ea29 assets/create/lang/unfinished/de_de.json +3963e65414c527a0e4e92da8d55c96ff42213be9 assets/create/lang/unfinished/es_es.json +fbea2bf4a74ebe23ffda354c45784fd2c3b3804c assets/create/lang/unfinished/es_mx.json +b29c33e9df2cfc7dd868ca8f4cc901e1de3f3062 assets/create/lang/unfinished/fr_fr.json +37f1232f8546b27421b1dc9b695afe3794008abf assets/create/lang/unfinished/it_it.json +30c99e865611944878eda5d76fe4a25db3169f4e assets/create/lang/unfinished/ja_jp.json +415152cfe1167a4cb7d6bbed86ba9f93e5ddab33 assets/create/lang/unfinished/ko_kr.json +4892bbd017e2eb57d7d21a864d44e12e5e372feb assets/create/lang/unfinished/nl_nl.json +0f5a4a40a433042bdfe1ab4c1145eb4c0315f567 assets/create/lang/unfinished/pl_pl.json +87c7009c0ff6cec3e7566f79adc7d46b791e04c2 assets/create/lang/unfinished/pt_br.json +3e7c8a28ae968f1953f611878ab002722f17dd51 assets/create/lang/unfinished/ru_ru.json +e7191fb4ea0a56f638b99f5bc5b7cf21bf487f45 assets/create/lang/unfinished/zh_cn.json +11d4948953f19bfe823238790d573895ddc4fb16 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 @@ -1299,7 +1299,6 @@ b359064405d189e2802969715cd5f682ddbf0bb1 assets/create/models/item/crushed_urani 2bb791db62dce6bf2e2227f9b607c131828471fd assets/create/models/item/crushed_zinc_ore.json 823c91f63565db54ec3944a1e90e7aee18e41062 assets/create/models/item/crushing_wheel.json dae5cffa4e1263d6a113469f79fba8695fa8232a assets/create/models/item/cuckoo_clock.json -9826c00050ba493f844e8812cc45153a156c5317 assets/create/models/item/cursed_bell.json 3e3edc9ccded444496d3336926b93bbf1234cd84 assets/create/models/item/cyan_seat.json 523cd531eadaadc45fb356ca58b99a8fe206c3a7 assets/create/models/item/cyan_valve_handle.json f786a43e296d9f10d7c302fe3ae9cddf4ba9984e assets/create/models/item/dark_oak_window.json @@ -1419,6 +1418,7 @@ e7daa31c1fc445d542bad476dfe1d6a8811f2070 assets/create/models/item/gray_seat.jso ecb9f32f62d3fa43fb226ab85adc2eb229fdfb77 assets/create/models/item/green_valve_handle.json 398b1a7c76c7bdb6a23b1248fdce98f6d835467f assets/create/models/item/hand_crank.json dee43bf1a9c211a752fac2c07aeba123f7f0c914 assets/create/models/item/handheld_worldshaper.json +bdbc76719ebf3dc28b013d30fb00dc6ce92b0ceb assets/create/models/item/haunted_bell.json f0d5af58e23e2705b3ef675c30bdf85ed9567c57 assets/create/models/item/honey_bucket.json 068729724f5f7b276b9bc378e533898a92e8debe assets/create/models/item/honeyed_apple.json 955e8accadb47f9b360e5fd48cd959c507b00f2d assets/create/models/item/horizontal_framed_glass.json @@ -1659,8 +1659,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 -f3231c27d43ff511b7d8532603111706ebcc155e assets/create/sounds.json -5d0cc4c0255dc241e61c173b31ddca70c88d08e4 data/create/advancements/aesthetics.json +bbe7fc4aef29420319f59d02d4cd376a78244e70 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 @@ -2463,7 +2463,6 @@ ba084fc3c680c9dea0d03fc664a831dfed18e52e data/create/loot_tables/blocks/crimson_ c28fa42746a4d5ca2f824001b67e58673810169e data/create/loot_tables/blocks/crushing_wheel.json 205f5899101262f31f5c1a88bb7d954918d08d04 data/create/loot_tables/blocks/crushing_wheel_controller.json d370ee874b5b6b98e9a8c368218fe61f644d956d data/create/loot_tables/blocks/cuckoo_clock.json -da983da67346f3dda63505a83f59db6f8131f69b data/create/loot_tables/blocks/cursed_bell.json 28ae0ee8a0b1fb6becae6264de687fe17940708e data/create/loot_tables/blocks/cyan_sail.json 49a14b9e93abdf02a7aef9c0c4085ac89617fae4 data/create/loot_tables/blocks/cyan_seat.json fe24fd296812fea3f838defa2ca6270523d9d48e data/create/loot_tables/blocks/cyan_valve_handle.json @@ -2577,6 +2576,7 @@ d014357b3a467b23473c8223f32471a04a9ff94c data/create/loot_tables/blocks/gray_sea a71599eecd3f1179e3d0367623460e798828aa6d data/create/loot_tables/blocks/green_seat.json 865ebead9601b29e6326dc9e1d4c1ca92f3b7a3b data/create/loot_tables/blocks/green_valve_handle.json 9bdc47ea3ffc52f037f12f40f387e6b72a352c4e data/create/loot_tables/blocks/hand_crank.json +c61b386376d19aaf89df3447a26b976a672efec5 data/create/loot_tables/blocks/haunted_bell.json 22012e7759f1dbccbb06bcaf0311a54190270825 data/create/loot_tables/blocks/horizontal_framed_glass.json 5d3f585539942f13bbc458a0a002849c1f034fc1 data/create/loot_tables/blocks/horizontal_framed_glass_pane.json 1b28cc5e1e535aa0c62d4a75ad76fcb40bf6232c data/create/loot_tables/blocks/hose_pulley.json @@ -3685,7 +3685,7 @@ d3fdb8ece6cb072a93ddb64a0baad5ac952117a4 data/create/recipes/weathered_limestone 0f3c993eb6dd3f37953f304b8fad15bf60469ef4 data/create/recipes/weathered_limestone_cobblestone_wall_from_weathered_limestone_cobblestone_stonecutting.json 6eceb25fabbb6b389ca35de3b829ad061c9c456a data/create/recipes/weathered_limestone_pillar.json 11667414f73bc2d00bda7c5c1a7d2934bf6e9165 data/create/recipes/weathered_limestone_pillar_from_weathered_limestone_stonecutting.json -558c1052ca384f1c014f9b404d21268764a493ee data/create/tags/blocks/brittle.json +6558ef43f28c92cc558fbfc572f38496f1ed479e data/create/tags/blocks/brittle.json 330bfb3850ba3964b10b1bccbc3cbb9b012cae54 data/create/tags/blocks/fan_heaters.json 57b942386a15c874d1ca9cd6a8032c11a5599fc2 data/create/tags/blocks/fan_transparent.json c81ea194e808985847159b201140d4aa4cbcca65 data/create/tags/blocks/safe_nbt.json diff --git a/src/generated/resources/assets/create/blockstates/cursed_bell.json b/src/generated/resources/assets/create/blockstates/haunted_bell.json similarity index 55% rename from src/generated/resources/assets/create/blockstates/cursed_bell.json rename to src/generated/resources/assets/create/blockstates/haunted_bell.json index 707d3c41f..5f0997b92 100644 --- a/src/generated/resources/assets/create/blockstates/cursed_bell.json +++ b/src/generated/resources/assets/create/blockstates/haunted_bell.json @@ -1,123 +1,123 @@ { "variants": { "attachment=floor,facing=north,powered=false": { - "model": "create:block/cursed_bell/block_floor" + "model": "create:block/haunted_bell/block_floor" }, "attachment=ceiling,facing=north,powered=false": { - "model": "create:block/cursed_bell/block_ceiling" + "model": "create:block/haunted_bell/block_ceiling" }, "attachment=single_wall,facing=north,powered=false": { - "model": "create:block/cursed_bell/block_single_wall" + "model": "create:block/haunted_bell/block_single_wall" }, "attachment=double_wall,facing=north,powered=false": { - "model": "create:block/cursed_bell/block_double_wall" + "model": "create:block/haunted_bell/block_double_wall" }, "attachment=floor,facing=south,powered=false": { - "model": "create:block/cursed_bell/block_floor", + "model": "create:block/haunted_bell/block_floor", "y": 180 }, "attachment=ceiling,facing=south,powered=false": { - "model": "create:block/cursed_bell/block_ceiling", + "model": "create:block/haunted_bell/block_ceiling", "y": 180 }, "attachment=single_wall,facing=south,powered=false": { - "model": "create:block/cursed_bell/block_single_wall", + "model": "create:block/haunted_bell/block_single_wall", "y": 180 }, "attachment=double_wall,facing=south,powered=false": { - "model": "create:block/cursed_bell/block_double_wall", + "model": "create:block/haunted_bell/block_double_wall", "y": 180 }, "attachment=floor,facing=west,powered=false": { - "model": "create:block/cursed_bell/block_floor", + "model": "create:block/haunted_bell/block_floor", "y": 270 }, "attachment=ceiling,facing=west,powered=false": { - "model": "create:block/cursed_bell/block_ceiling", + "model": "create:block/haunted_bell/block_ceiling", "y": 270 }, "attachment=single_wall,facing=west,powered=false": { - "model": "create:block/cursed_bell/block_single_wall", + "model": "create:block/haunted_bell/block_single_wall", "y": 270 }, "attachment=double_wall,facing=west,powered=false": { - "model": "create:block/cursed_bell/block_double_wall", + "model": "create:block/haunted_bell/block_double_wall", "y": 270 }, "attachment=floor,facing=east,powered=false": { - "model": "create:block/cursed_bell/block_floor", + "model": "create:block/haunted_bell/block_floor", "y": 90 }, "attachment=ceiling,facing=east,powered=false": { - "model": "create:block/cursed_bell/block_ceiling", + "model": "create:block/haunted_bell/block_ceiling", "y": 90 }, "attachment=single_wall,facing=east,powered=false": { - "model": "create:block/cursed_bell/block_single_wall", + "model": "create:block/haunted_bell/block_single_wall", "y": 90 }, "attachment=double_wall,facing=east,powered=false": { - "model": "create:block/cursed_bell/block_double_wall", + "model": "create:block/haunted_bell/block_double_wall", "y": 90 }, "attachment=floor,facing=north,powered=true": { - "model": "create:block/cursed_bell/block_floor" + "model": "create:block/haunted_bell/block_floor" }, "attachment=ceiling,facing=north,powered=true": { - "model": "create:block/cursed_bell/block_ceiling" + "model": "create:block/haunted_bell/block_ceiling" }, "attachment=single_wall,facing=north,powered=true": { - "model": "create:block/cursed_bell/block_single_wall" + "model": "create:block/haunted_bell/block_single_wall" }, "attachment=double_wall,facing=north,powered=true": { - "model": "create:block/cursed_bell/block_double_wall" + "model": "create:block/haunted_bell/block_double_wall" }, "attachment=floor,facing=south,powered=true": { - "model": "create:block/cursed_bell/block_floor", + "model": "create:block/haunted_bell/block_floor", "y": 180 }, "attachment=ceiling,facing=south,powered=true": { - "model": "create:block/cursed_bell/block_ceiling", + "model": "create:block/haunted_bell/block_ceiling", "y": 180 }, "attachment=single_wall,facing=south,powered=true": { - "model": "create:block/cursed_bell/block_single_wall", + "model": "create:block/haunted_bell/block_single_wall", "y": 180 }, "attachment=double_wall,facing=south,powered=true": { - "model": "create:block/cursed_bell/block_double_wall", + "model": "create:block/haunted_bell/block_double_wall", "y": 180 }, "attachment=floor,facing=west,powered=true": { - "model": "create:block/cursed_bell/block_floor", + "model": "create:block/haunted_bell/block_floor", "y": 270 }, "attachment=ceiling,facing=west,powered=true": { - "model": "create:block/cursed_bell/block_ceiling", + "model": "create:block/haunted_bell/block_ceiling", "y": 270 }, "attachment=single_wall,facing=west,powered=true": { - "model": "create:block/cursed_bell/block_single_wall", + "model": "create:block/haunted_bell/block_single_wall", "y": 270 }, "attachment=double_wall,facing=west,powered=true": { - "model": "create:block/cursed_bell/block_double_wall", + "model": "create:block/haunted_bell/block_double_wall", "y": 270 }, "attachment=floor,facing=east,powered=true": { - "model": "create:block/cursed_bell/block_floor", + "model": "create:block/haunted_bell/block_floor", "y": 90 }, "attachment=ceiling,facing=east,powered=true": { - "model": "create:block/cursed_bell/block_ceiling", + "model": "create:block/haunted_bell/block_ceiling", "y": 90 }, "attachment=single_wall,facing=east,powered=true": { - "model": "create:block/cursed_bell/block_single_wall", + "model": "create:block/haunted_bell/block_single_wall", "y": 90 }, "attachment=double_wall,facing=east,powered=true": { - "model": "create:block/cursed_bell/block_double_wall", + "model": "create:block/haunted_bell/block_double_wall", "y": 90 } } diff --git a/src/generated/resources/assets/create/lang/en_ud.json b/src/generated/resources/assets/create/lang/en_ud.json index 42c97f237..da95af074 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -69,7 +69,6 @@ "block.create.crushing_wheel": "\u05DF\u01DD\u01DD\u0265M bu\u0131\u0265sn\u0279\u0186", "block.create.crushing_wheel_controller": "\u0279\u01DD\u05DF\u05DFo\u0279\u0287uo\u0186 \u05DF\u01DD\u01DD\u0265M bu\u0131\u0265sn\u0279\u0186", "block.create.cuckoo_clock": "\u029E\u0254o\u05DF\u0186 oo\u029E\u0254n\u0186", - "block.create.cursed_bell": "\u05DF\u05DF\u01DD\u15FA p\u01DDs\u0279n\u0186", "block.create.cyan_sail": "\u05DF\u0131\u0250S u\u0250\u028E\u0186", "block.create.cyan_seat": "\u0287\u0250\u01DDS u\u0250\u028E\u0186", "block.create.cyan_valve_handle": "\u01DD\u05DFpu\u0250H \u01DD\u028C\u05DF\u0250\u039B u\u0250\u028E\u0186", @@ -183,6 +182,7 @@ "block.create.green_seat": "\u0287\u0250\u01DDS u\u01DD\u01DD\u0279\u2141", "block.create.green_valve_handle": "\u01DD\u05DFpu\u0250H \u01DD\u028C\u05DF\u0250\u039B u\u01DD\u01DD\u0279\u2141", "block.create.hand_crank": "\u029Eu\u0250\u0279\u0186 pu\u0250H", + "block.create.haunted_bell": "\u05DF\u05DF\u01DD\u15FA p\u01DD\u0287un\u0250H", "block.create.honey": "\u028E\u01DDuoH", "block.create.horizontal_framed_glass": "ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132 \u05DF\u0250\u0287uoz\u0131\u0279oH", "block.create.horizontal_framed_glass_pane": "\u01DDu\u0250\u0500 ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132 \u05DF\u0250\u0287uoz\u0131\u0279oH", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 04be2bdfa..22a6fa3d6 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -72,7 +72,6 @@ "block.create.crushing_wheel": "Crushing Wheel", "block.create.crushing_wheel_controller": "Crushing Wheel Controller", "block.create.cuckoo_clock": "Cuckoo Clock", - "block.create.cursed_bell": "Cursed Bell", "block.create.cyan_sail": "Cyan Sail", "block.create.cyan_seat": "Cyan Seat", "block.create.cyan_valve_handle": "Cyan Valve Handle", @@ -186,6 +185,7 @@ "block.create.green_seat": "Green Seat", "block.create.green_valve_handle": "Green Valve Handle", "block.create.hand_crank": "Hand Crank", + "block.create.haunted_bell": "Haunted Bell", "block.create.honey": "Honey", "block.create.horizontal_framed_glass": "Horizontal Framed Glass", "block.create.horizontal_framed_glass_pane": "Horizontal Framed Glass Pane", @@ -1191,6 +1191,7 @@ "create.subtitle.blaze_munch": "Blaze Burner munches", "create.subtitle.funnel_flap": "Funnel Flaps", "create.subtitle.schematicannon_finish": "Schematicannon dings", + "create.subtitle.haunted_bell_use": "Haunted Bell tolls", "create.subtitle.scroll_value": "Scroll-input clicks", "create.subtitle.crafter_craft": "Crafter crafts", "create.subtitle.controller_put": "Controller thumps", @@ -1201,13 +1202,12 @@ "create.subtitle.wrench_rotate": "Wrench used", "create.subtitle.potato_hit": "Vegetable impacts", "create.subtitle.saw_activate_wood": "Mechanical Saw activates", + "create.subtitle.haunted_bell_convert": "Haunted Bell awakens", "create.subtitle.deployer_polish": "Deployer applies polish", "create.subtitle.deny": "Declining boop", "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.controller_take": "Lectern empties", "create.subtitle.mechanical_press_activation": "Mechanical Press clangs", "create.subtitle.contraption_assemble": "Contraption moves", @@ -1438,10 +1438,10 @@ "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.", + "block.create.haunted_bell.tooltip": "HAUNTED BELL", + "block.create.haunted_bell.tooltip.summary": "A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.condition1": "When Held or Rang", + "block.create.haunted_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 d041cb02d..ba0f1d8ff 100644 --- a/src/generated/resources/assets/create/lang/unfinished/de_de.json +++ b/src/generated/resources/assets/create/lang/unfinished/de_de.json @@ -73,7 +73,6 @@ "block.create.crushing_wheel": "Mahlwerkrad", "block.create.crushing_wheel_controller": "Mahlwerkrad Steurung", "block.create.cuckoo_clock": "Kuckucksuhr", - "block.create.cursed_bell": "UNLOCALIZED: Cursed Bell", "block.create.cyan_sail": "Türkises Segel", "block.create.cyan_seat": "Türkiser Sitz", "block.create.cyan_valve_handle": "Türkiser Ventilgriff", @@ -187,6 +186,7 @@ "block.create.green_seat": "Grüner Sitz", "block.create.green_valve_handle": "Grüner Ventilgriff", "block.create.hand_crank": "Handkurbel", + "block.create.haunted_bell": "UNLOCALIZED: Haunted Bell", "block.create.honey": "Honig", "block.create.horizontal_framed_glass": "Horizontal Gerahmtes Glas", "block.create.horizontal_framed_glass_pane": "Horizontal Gerahmte Glasscheibe", @@ -1192,6 +1192,7 @@ "create.subtitle.blaze_munch": "Lohe kaut glücklich", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", "create.subtitle.schematicannon_finish": "Bauplankanone endet", + "create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", @@ -1202,13 +1203,12 @@ "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", + "create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens", "create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish", "create.subtitle.deny": "UNLOCALIZED: Declining boop", "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.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.mechanical_press_activation": "Mechanische Presse wird aktiviert", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", @@ -1439,10 +1439,10 @@ "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.", + "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", + "block.create.haunted_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 20b84538e..da7917f72 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_es.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_es.json @@ -73,7 +73,6 @@ "block.create.crushing_wheel": "Rueda trituradora", "block.create.crushing_wheel_controller": "Controlador de Rueda trituradora", "block.create.cuckoo_clock": "Reloj Cucú", - "block.create.cursed_bell": "UNLOCALIZED: Cursed Bell", "block.create.cyan_sail": "Vela cian", "block.create.cyan_seat": "Asiento cian", "block.create.cyan_valve_handle": "Asa de válvula cian", @@ -187,6 +186,7 @@ "block.create.green_seat": "Asiento verde", "block.create.green_valve_handle": "Asa de válvula verde", "block.create.hand_crank": "Manivela", + "block.create.haunted_bell": "UNLOCALIZED: Haunted Bell", "block.create.honey": "Miel", "block.create.horizontal_framed_glass": "Cristal con marco horizontal", "block.create.horizontal_framed_glass_pane": "Panel de cristal con marco horizontal", @@ -1192,6 +1192,7 @@ "create.subtitle.blaze_munch": "Blaze mastica felizmente", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", "create.subtitle.schematicannon_finish": "Acabados de Schematicannon", + "create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", @@ -1202,13 +1203,12 @@ "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", + "create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens", "create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish", "create.subtitle.deny": "UNLOCALIZED: Declining boop", "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.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.mechanical_press_activation": "La Prensa Mecánica se activa", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", @@ -1439,10 +1439,10 @@ "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.", + "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", + "block.create.haunted_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 d72d4c061..8b5ccfdd7 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_mx.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_mx.json @@ -73,7 +73,6 @@ "block.create.crushing_wheel": "Rueda Trituradora", "block.create.crushing_wheel_controller": "UNLOCALIZED:Crushing Wheel Controller", "block.create.cuckoo_clock": "Reloj Cuco", - "block.create.cursed_bell": "UNLOCALIZED: Cursed Bell", "block.create.cyan_sail": "Vela Cian", "block.create.cyan_seat": "Asiento Cian", "block.create.cyan_valve_handle": "Manija de Válvula Cian", @@ -187,6 +186,7 @@ "block.create.green_seat": "Asiento Verde", "block.create.green_valve_handle": "Manija de Válvula Verde", "block.create.hand_crank": "Manivela", + "block.create.haunted_bell": "UNLOCALIZED: Haunted Bell", "block.create.honey": "Miel", "block.create.horizontal_framed_glass": "Vidrio Enmarcado Horizontal", "block.create.horizontal_framed_glass_pane": "Panel de Vidrio Enmarcado Horizontal", @@ -1192,6 +1192,7 @@ "create.subtitle.blaze_munch": "UNLOCALIZED: Blaze Burner munches", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", "create.subtitle.schematicannon_finish": "UNLOCALIZED: Schematicannon dings", + "create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", @@ -1202,13 +1203,12 @@ "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", + "create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens", "create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish", "create.subtitle.deny": "UNLOCALIZED: Declining boop", "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.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.mechanical_press_activation": "UNLOCALIZED: Mechanical Press clangs", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", @@ -1439,10 +1439,10 @@ "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.", + "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", + "block.create.haunted_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 17f930584..87de2a97f 100644 --- a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json +++ b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json @@ -73,7 +73,6 @@ "block.create.crushing_wheel": "Roue de concassage", "block.create.crushing_wheel_controller": "Contrôleur de roue de concassage", "block.create.cuckoo_clock": "Horloge à coucou", - "block.create.cursed_bell": "UNLOCALIZED: Cursed Bell", "block.create.cyan_sail": "Voile cyan", "block.create.cyan_seat": "Siège cyan", "block.create.cyan_valve_handle": "Vanne cyan", @@ -187,6 +186,7 @@ "block.create.green_seat": "UNLOCALIZED: Green Seat", "block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle", "block.create.hand_crank": "Manivelle", + "block.create.haunted_bell": "UNLOCALIZED: Haunted Bell", "block.create.honey": "UNLOCALIZED: Honey", "block.create.horizontal_framed_glass": "Fenêtre en verre horizontale", "block.create.horizontal_framed_glass_pane": "Vitre encadrée horizontale", @@ -1192,6 +1192,7 @@ "create.subtitle.blaze_munch": "UNLOCALIZED: Blaze Burner munches", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", "create.subtitle.schematicannon_finish": "Fin de schémacanon", + "create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", @@ -1202,13 +1203,12 @@ "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", + "create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens", "create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish", "create.subtitle.deny": "UNLOCALIZED: Declining boop", "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.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.mechanical_press_activation": "Activation de la presse mechanique", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", @@ -1439,10 +1439,10 @@ "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.", + "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", + "block.create.haunted_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 8bab297b1..260bed699 100644 --- a/src/generated/resources/assets/create/lang/unfinished/it_it.json +++ b/src/generated/resources/assets/create/lang/unfinished/it_it.json @@ -73,7 +73,6 @@ "block.create.crushing_wheel": "Ruota di frantumazione", "block.create.crushing_wheel_controller": "Telecomando per ruota di frantumazione", "block.create.cuckoo_clock": "Orologio a cucù", - "block.create.cursed_bell": "UNLOCALIZED: Cursed Bell", "block.create.cyan_sail": "Vela ciano", "block.create.cyan_seat": "Sedile ciano", "block.create.cyan_valve_handle": "Maniglia per valvola ciano", @@ -187,6 +186,7 @@ "block.create.green_seat": "Sedile verde", "block.create.green_valve_handle": "Maniglia per valvola verde", "block.create.hand_crank": "Manovella", + "block.create.haunted_bell": "UNLOCALIZED: Haunted Bell", "block.create.honey": "Miele", "block.create.horizontal_framed_glass": "Finestra di vetro orizzontale", "block.create.horizontal_framed_glass_pane": "Pannello di finestra di vetro orizzontale", @@ -1192,6 +1192,7 @@ "create.subtitle.blaze_munch": "Il blaze lo gusta felicemente", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", "create.subtitle.schematicannon_finish": "Finiture cannoneschematico", + "create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", @@ -1202,13 +1203,12 @@ "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", + "create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens", "create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish", "create.subtitle.deny": "UNLOCALIZED: Declining boop", "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.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.mechanical_press_activation": "Pressa meccanica attiva", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", @@ -1439,10 +1439,10 @@ "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.", + "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", + "block.create.haunted_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 dfd0616e8..bdda4720a 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json +++ b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json @@ -73,7 +73,6 @@ "block.create.crushing_wheel": "破砕ホイール", "block.create.crushing_wheel_controller": "破砕ホイールコントローラー", "block.create.cuckoo_clock": "鳩時計", - "block.create.cursed_bell": "UNLOCALIZED: Cursed Bell", "block.create.cyan_sail": "水色の帆", "block.create.cyan_seat": "水色のシート", "block.create.cyan_valve_handle": "水色のバルブハンドル", @@ -187,6 +186,7 @@ "block.create.green_seat": "緑色のシート", "block.create.green_valve_handle": "緑色のバルブハンドル", "block.create.hand_crank": "ハンドクランク", + "block.create.haunted_bell": "UNLOCALIZED: Haunted Bell", "block.create.honey": "ハチミツ", "block.create.horizontal_framed_glass": "横型ガラス窓", "block.create.horizontal_framed_glass_pane": "横型ガラス窓板", @@ -1192,6 +1192,7 @@ "create.subtitle.blaze_munch": "ブレイズの咀嚼音", "create.subtitle.funnel_flap": "ファンネルがはためく", "create.subtitle.schematicannon_finish": "概略図砲が作業を終える", + "create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls", "create.subtitle.scroll_value": "スクロールのカチカチ音", "create.subtitle.crafter_craft": "メカニカルクラフターがクラフトする", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", @@ -1202,13 +1203,12 @@ "create.subtitle.wrench_rotate": "レンチを使う", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", + "create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens", "create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish", "create.subtitle.deny": "UNLOCALIZED: Declining boop", "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.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.mechanical_press_activation": "メカニカルプレスがガーンと鳴る", "create.subtitle.contraption_assemble": "からくりが動く", @@ -1439,10 +1439,10 @@ "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.", + "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", + "block.create.haunted_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 dd6dc4268..4eba546a8 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json +++ b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json @@ -73,7 +73,6 @@ "block.create.crushing_wheel": "분쇄 휠", "block.create.crushing_wheel_controller": "분쇄 휠 컨트롤러", "block.create.cuckoo_clock": "뻐꾸기 시계", - "block.create.cursed_bell": "UNLOCALIZED: Cursed Bell", "block.create.cyan_sail": "청록색 날개", "block.create.cyan_seat": "청록색 좌석", "block.create.cyan_valve_handle": "청록색 밸브 손잡이", @@ -187,6 +186,7 @@ "block.create.green_seat": "초록색 좌석", "block.create.green_valve_handle": "초록색 밸브 손잡이", "block.create.hand_crank": "핸드 크랭크", + "block.create.haunted_bell": "UNLOCALIZED: Haunted Bell", "block.create.honey": "꿀", "block.create.horizontal_framed_glass": "수평 유리", "block.create.horizontal_framed_glass_pane": "수평 유리판", @@ -1192,6 +1192,7 @@ "create.subtitle.blaze_munch": "블레이즈가 행복하게 섭취함", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", "create.subtitle.schematicannon_finish": "청사진 대포가 끝남", + "create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", @@ -1202,13 +1203,12 @@ "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", + "create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens", "create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish", "create.subtitle.deny": "UNLOCALIZED: Declining boop", "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.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.mechanical_press_activation": "압착기가 가동됨", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", @@ -1439,10 +1439,10 @@ "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.", + "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", + "block.create.haunted_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 d0630f074..bd61167df 100644 --- a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json +++ b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json @@ -73,7 +73,6 @@ "block.create.crushing_wheel": "Verpulveraar", "block.create.crushing_wheel_controller": "UNLOCALIZED: Crushing Wheel Controller", "block.create.cuckoo_clock": "UNLOCALIZED: Cuckoo Clock", - "block.create.cursed_bell": "UNLOCALIZED: Cursed Bell", "block.create.cyan_sail": "UNLOCALIZED: Cyan Sail", "block.create.cyan_seat": "UNLOCALIZED: Cyan Seat", "block.create.cyan_valve_handle": "UNLOCALIZED: Cyan Valve Handle", @@ -187,6 +186,7 @@ "block.create.green_seat": "UNLOCALIZED: Green Seat", "block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle", "block.create.hand_crank": "UNLOCALIZED: Hand Crank", + "block.create.haunted_bell": "UNLOCALIZED: Haunted Bell", "block.create.honey": "UNLOCALIZED: Honey", "block.create.horizontal_framed_glass": "UNLOCALIZED: Horizontal Framed Glass", "block.create.horizontal_framed_glass_pane": "UNLOCALIZED: Horizontal Framed Glass Pane", @@ -1192,6 +1192,7 @@ "create.subtitle.blaze_munch": "UNLOCALIZED: Blaze Burner munches", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", "create.subtitle.schematicannon_finish": "UNLOCALIZED: Schematicannon dings", + "create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", @@ -1202,13 +1203,12 @@ "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", + "create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens", "create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish", "create.subtitle.deny": "UNLOCALIZED: Declining boop", "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.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.mechanical_press_activation": "UNLOCALIZED: Mechanical Press clangs", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", @@ -1439,10 +1439,10 @@ "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.", + "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", + "block.create.haunted_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 2ef7a4458..940c00f7c 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json +++ b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json @@ -73,7 +73,6 @@ "block.create.crushing_wheel": "Koło kruszące", "block.create.crushing_wheel_controller": "Sterownik koła kruszącego", "block.create.cuckoo_clock": "Zegar z kukułką", - "block.create.cursed_bell": "UNLOCALIZED: Cursed Bell", "block.create.cyan_sail": "Błękitny żagiel", "block.create.cyan_seat": "Błękitne siedzenie", "block.create.cyan_valve_handle": "Błękitne pokrętło", @@ -187,6 +186,7 @@ "block.create.green_seat": "Zielone siedzenie", "block.create.green_valve_handle": "Zielone pokrętło", "block.create.hand_crank": "Ręczna korba", + "block.create.haunted_bell": "UNLOCALIZED: Haunted Bell", "block.create.honey": "Miód", "block.create.horizontal_framed_glass": "Poziome oprawione szkło", "block.create.horizontal_framed_glass_pane": "Pozioma oprawiona szyba", @@ -1192,6 +1192,7 @@ "create.subtitle.blaze_munch": "Płomyk szczęśliwie przeżuwa", "create.subtitle.funnel_flap": "Lejek trzepocze", "create.subtitle.schematicannon_finish": "Schematoarmata skończyła", + "create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls", "create.subtitle.scroll_value": "Kliknięcie", "create.subtitle.crafter_craft": "Mechaniczny stół rzemieślniczy konstruuje", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", @@ -1202,13 +1203,12 @@ "create.subtitle.wrench_rotate": "Klucz skrzypi", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", + "create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens", "create.subtitle.deployer_polish": "Aplikator poleruje", "create.subtitle.deny": "Dźwięk odmowy", "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.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.mechanical_press_activation": "Mechaniczna prasa się uruchamia", "create.subtitle.contraption_assemble": "Maszyna przesuwa się", @@ -1439,10 +1439,10 @@ "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.", + "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", + "block.create.haunted_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 cd60e31b3..a27f10296 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_br.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_br.json @@ -73,7 +73,6 @@ "block.create.crushing_wheel": "Roda de Moer", "block.create.crushing_wheel_controller": "UNLOCALIZED: Crushing Wheel Controller", "block.create.cuckoo_clock": "UNLOCALIZED: Cuckoo Clock", - "block.create.cursed_bell": "UNLOCALIZED: Cursed Bell", "block.create.cyan_sail": "UNLOCALIZED: Cyan Sail", "block.create.cyan_seat": "UNLOCALIZED: Cyan Seat", "block.create.cyan_valve_handle": "UNLOCALIZED: Cyan Valve Handle", @@ -187,6 +186,7 @@ "block.create.green_seat": "UNLOCALIZED: Green Seat", "block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle", "block.create.hand_crank": "UNLOCALIZED: Hand Crank", + "block.create.haunted_bell": "UNLOCALIZED: Haunted Bell", "block.create.honey": "UNLOCALIZED: Honey", "block.create.horizontal_framed_glass": "UNLOCALIZED: Horizontal Framed Glass", "block.create.horizontal_framed_glass_pane": "UNLOCALIZED: Horizontal Framed Glass Pane", @@ -1192,6 +1192,7 @@ "create.subtitle.blaze_munch": "UNLOCALIZED: Blaze Burner munches", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", "create.subtitle.schematicannon_finish": "UNLOCALIZED: Schematicannon dings", + "create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", @@ -1202,13 +1203,12 @@ "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", + "create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens", "create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish", "create.subtitle.deny": "UNLOCALIZED: Declining boop", "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.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.mechanical_press_activation": "UNLOCALIZED: Mechanical Press clangs", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", @@ -1439,10 +1439,10 @@ "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.", + "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", + "block.create.haunted_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 5229d9134..b22e1adb9 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json +++ b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json @@ -73,7 +73,6 @@ "block.create.crushing_wheel": "Колесо дробления", "block.create.crushing_wheel_controller": "Контроллер колеса дробления", "block.create.cuckoo_clock": "Часы с кукушкой", - "block.create.cursed_bell": "UNLOCALIZED: Cursed Bell", "block.create.cyan_sail": "Бирюзовый парус", "block.create.cyan_seat": "Бирюзовое сииденье", "block.create.cyan_valve_handle": "Бирюзовый ручной вентиль", @@ -187,6 +186,7 @@ "block.create.green_seat": "Зелёное сиденье", "block.create.green_valve_handle": "Зелёный ручной вентиль", "block.create.hand_crank": "Рукоятка", + "block.create.haunted_bell": "UNLOCALIZED: Haunted Bell", "block.create.honey": "Мёд", "block.create.horizontal_framed_glass": "Горизонтальное обрамлённое стекло", "block.create.horizontal_framed_glass_pane": "Горизонтальная обрамлённая стеклянная панель", @@ -1192,6 +1192,7 @@ "create.subtitle.blaze_munch": "Всполох радостно жуёт", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", "create.subtitle.schematicannon_finish": "Схематичная пушка закончила работу", + "create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", @@ -1202,13 +1203,12 @@ "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", + "create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens", "create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish", "create.subtitle.deny": "UNLOCALIZED: Declining boop", "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.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.mechanical_press_activation": "Механический пресс активирован", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", @@ -1439,10 +1439,10 @@ "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.", + "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", + "block.create.haunted_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 42177778b..00a2bd401 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json @@ -73,7 +73,6 @@ "block.create.crushing_wheel": "粉碎轮", "block.create.crushing_wheel_controller": "粉碎轮控制器", "block.create.cuckoo_clock": "布谷鸟闹钟", - "block.create.cursed_bell": "UNLOCALIZED: Cursed Bell", "block.create.cyan_sail": "青色风帆", "block.create.cyan_seat": "青色坐垫", "block.create.cyan_valve_handle": "青色阀门手轮", @@ -187,6 +186,7 @@ "block.create.green_seat": "绿色坐垫", "block.create.green_valve_handle": "绿色阀门手轮", "block.create.hand_crank": "手摇曲柄", + "block.create.haunted_bell": "UNLOCALIZED: Haunted Bell", "block.create.honey": "蜂蜜", "block.create.horizontal_framed_glass": "竖直边框玻璃", "block.create.horizontal_framed_glass_pane": "竖直边框玻璃板", @@ -1192,6 +1192,7 @@ "create.subtitle.blaze_munch": "烈焰人：咀嚼", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", "create.subtitle.schematicannon_finish": "蓝图加农炮：叮", + "create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", @@ -1202,13 +1203,12 @@ "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", + "create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens", "create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish", "create.subtitle.deny": "UNLOCALIZED: Declining boop", "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.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.mechanical_press_activation": "辊压机：工作中", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", @@ -1439,10 +1439,10 @@ "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.", + "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", + "block.create.haunted_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 a33475dc0..6282f594a 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_tw.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_tw.json @@ -73,7 +73,6 @@ "block.create.crushing_wheel": "粉碎輪", "block.create.crushing_wheel_controller": "粉碎輪控制器", "block.create.cuckoo_clock": "布穀鳥鐘", - "block.create.cursed_bell": "UNLOCALIZED: Cursed Bell", "block.create.cyan_sail": "藍綠色風帆", "block.create.cyan_seat": "藍綠色坐墊", "block.create.cyan_valve_handle": "藍綠色閥門開關", @@ -187,6 +186,7 @@ "block.create.green_seat": "綠色坐墊", "block.create.green_valve_handle": "綠色閥門開關", "block.create.hand_crank": "手搖把手", + "block.create.haunted_bell": "UNLOCALIZED: Haunted Bell", "block.create.honey": "蜂蜜", "block.create.horizontal_framed_glass": "豎直邊框玻璃", "block.create.horizontal_framed_glass_pane": "豎直邊框玻璃片", @@ -1192,6 +1192,7 @@ "create.subtitle.blaze_munch": "烈焰使者開心地吃著", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", "create.subtitle.schematicannon_finish": "藍圖大炮完成任務", + "create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", @@ -1202,13 +1203,12 @@ "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", + "create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens", "create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish", "create.subtitle.deny": "UNLOCALIZED: Declining boop", "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.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.mechanical_press_activation": "液壓機工作", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", @@ -1439,10 +1439,10 @@ "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.", + "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", + "block.create.haunted_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/cursed_bell.json b/src/generated/resources/assets/create/models/item/cursed_bell.json deleted file mode 100644 index 91c68bdc6..000000000 --- a/src/generated/resources/assets/create/models/item/cursed_bell.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/cursed_bell/item" -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/haunted_bell.json b/src/generated/resources/assets/create/models/item/haunted_bell.json new file mode 100644 index 000000000..eba6aa5d0 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/haunted_bell.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/haunted_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 134c2f29f..bfcbfc44e 100644 --- a/src/generated/resources/assets/create/sounds.json +++ b/src/generated/resources/assets/create/sounds.json @@ -128,18 +128,6 @@ } ] }, - "cursed_bell_convert": { - "sounds": [ - "create:cursed_bell_convert" - ], - "subtitle": "create.subtitle.cursed_bell_convert" - }, - "cursed_bell_use": { - "sounds": [ - "create:cursed_bell_use" - ], - "subtitle": "create.subtitle.cursed_bell_use" - }, "deny": { "sounds": [ { @@ -199,6 +187,18 @@ ], "subtitle": "create.subtitle.fwoomp" }, + "haunted_bell_convert": { + "sounds": [ + "create:haunted_bell_convert" + ], + "subtitle": "create.subtitle.haunted_bell_convert" + }, + "haunted_bell_use": { + "sounds": [ + "create:haunted_bell_use" + ], + "subtitle": "create.subtitle.haunted_bell_use" + }, "mechanical_press_activation": { "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/loot_tables/blocks/cursed_bell.json b/src/generated/resources/data/create/loot_tables/blocks/haunted_bell.json similarity index 86% rename from src/generated/resources/data/create/loot_tables/blocks/cursed_bell.json rename to src/generated/resources/data/create/loot_tables/blocks/haunted_bell.json index ce719523e..ec8bd3826 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/cursed_bell.json +++ b/src/generated/resources/data/create/loot_tables/blocks/haunted_bell.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "create:cursed_bell" + "name": "create:haunted_bell" } ], "conditions": [ diff --git a/src/generated/resources/data/create/tags/blocks/brittle.json b/src/generated/resources/data/create/tags/blocks/brittle.json index 9372a9a4f..4cc8d6e48 100644 --- a/src/generated/resources/data/create/tags/blocks/brittle.json +++ b/src/generated/resources/data/create/tags/blocks/brittle.json @@ -25,7 +25,7 @@ "create:furnace_engine", "create:redstone_link", "create:peculiar_bell", - "create:cursed_bell", + "create:haunted_bell", "#minecraft:doors", "#minecraft:beds", "minecraft:flower_pot", diff --git a/src/main/java/com/simibubi/create/AllBlockPartials.java b/src/main/java/com/simibubi/create/AllBlockPartials.java index c198f1bc3..49fcaceca 100644 --- a/src/main/java/com/simibubi/create/AllBlockPartials.java +++ b/src/main/java/com/simibubi/create/AllBlockPartials.java @@ -94,7 +94,7 @@ public class AllBlockPartials { SPOUT_TOP = get("spout/top"), SPOUT_MIDDLE = get("spout/middle"), SPOUT_BOTTOM = get("spout/bottom"), PECULIAR_BELL = get("peculiar_bell/bell"), - CURSED_BELL = get("cursed_bell/bell"), + HAUNTED_BELL = get("haunted_bell/bell"), SPEED_CONTROLLER_BRACKET = get("rotation_speed_controller/bracket"), diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 5a7c66cd7..18befa726 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -115,8 +115,8 @@ import com.simibubi.create.content.contraptions.relays.gauge.GaugeBlock; import com.simibubi.create.content.contraptions.relays.gauge.GaugeGenerator; import com.simibubi.create.content.contraptions.relays.gearbox.GearboxBlock; import com.simibubi.create.content.curiosities.armor.CopperBacktankBlock; -import com.simibubi.create.content.curiosities.bell.CursedBellBlock; -import com.simibubi.create.content.curiosities.bell.CursedBellMovementBehaviour; +import com.simibubi.create.content.curiosities.bell.HauntedBellBlock; +import com.simibubi.create.content.curiosities.bell.HauntedBellMovementBehaviour; import com.simibubi.create.content.curiosities.bell.PeculiarBellBlock; import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock; import com.simibubi.create.content.logistics.block.belts.tunnel.BrassTunnelBlock; @@ -1320,10 +1320,10 @@ public class AllBlocks { .onRegister(addMovementBehaviour(new BellMovementBehaviour())) .register(); - public static final BlockEntry CURSED_BELL = - REGISTRATE.block("cursed_bell", CursedBellBlock::new) + public static final BlockEntry HAUNTED_BELL = + REGISTRATE.block("haunted_bell", HauntedBellBlock::new) .transform(BuilderTransformers.bell()) - .onRegister(addMovementBehaviour(new CursedBellMovementBehaviour())) + .onRegister(addMovementBehaviour(new HauntedBellMovementBehaviour())) .register(); // Materials diff --git a/src/main/java/com/simibubi/create/AllEntityTypes.java b/src/main/java/com/simibubi/create/AllEntityTypes.java index bb6268498..0b763e565 100644 --- a/src/main/java/com/simibubi/create/AllEntityTypes.java +++ b/src/main/java/com/simibubi/create/AllEntityTypes.java @@ -47,7 +47,7 @@ public class AllEntityTypes { public static final EntityEntry POTATO_PROJECTILE = register("potato_projectile", PotatoProjectileEntity::new, () -> PotatoProjectileRenderer::new, - EntityClassification.MISC, 4, 20, true, true, PotatoProjectileEntity::build).register(); + EntityClassification.MISC, 4, 20, true, false, PotatoProjectileEntity::build).register(); public static final EntityEntry SEAT = register("seat", SeatEntity::new, () -> SeatEntity.Render::new, EntityClassification.MISC, 0, Integer.MAX_VALUE, false, true, SeatEntity::build).register(); diff --git a/src/main/java/com/simibubi/create/AllSoundEvents.java b/src/main/java/com/simibubi/create/AllSoundEvents.java index d98fbe2d9..2d7b4afa0 100644 --- a/src/main/java/com/simibubi/create/AllSoundEvents.java +++ b/src/main/java/com/simibubi/create/AllSoundEvents.java @@ -204,11 +204,11 @@ public class AllSoundEvents { .category(SoundCategory.BLOCKS) .build(), - CURSED_BELL_CONVERT = create("cursed_bell_convert").subtitle("Cursed Bell awakens") + HAUNTED_BELL_CONVERT = create("haunted_bell_convert").subtitle("Haunted Bell awakens") .category(SoundCategory.BLOCKS) .build(), - CURSED_BELL_USE = create("cursed_bell_use").subtitle("Cursed Bell tolls") + HAUNTED_BELL_USE = create("haunted_bell_use").subtitle("Haunted Bell tolls") .category(SoundCategory.BLOCKS) .build(); diff --git a/src/main/java/com/simibubi/create/AllTileEntities.java b/src/main/java/com/simibubi/create/AllTileEntities.java index 7ec222efc..51c604488 100644 --- a/src/main/java/com/simibubi/create/AllTileEntities.java +++ b/src/main/java/com/simibubi/create/AllTileEntities.java @@ -120,7 +120,7 @@ import com.simibubi.create.content.curiosities.armor.CopperBacktankInstance; import com.simibubi.create.content.curiosities.armor.CopperBacktankRenderer; import com.simibubi.create.content.curiosities.armor.CopperBacktankTileEntity; import com.simibubi.create.content.curiosities.bell.BellRenderer; -import com.simibubi.create.content.curiosities.bell.CursedBellTileEntity; +import com.simibubi.create.content.curiosities.bell.HauntedBellTileEntity; import com.simibubi.create.content.curiosities.bell.PeculiarBellTileEntity; import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelInstance; import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelRenderer; @@ -683,9 +683,9 @@ public class AllTileEntities { .renderer(() -> BellRenderer::new) .register(); - public static final TileEntityEntry CURSED_BELL = Create.registrate() - .tileEntity("cursed_bell", CursedBellTileEntity::new) - .validBlocks(AllBlocks.CURSED_BELL) + public static final TileEntityEntry HAUNTED_BELL = Create.registrate() + .tileEntity("cursed_bell", HauntedBellTileEntity::new) + .validBlocks(AllBlocks.HAUNTED_BELL) .renderer(() -> BellRenderer::new) .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 16d2d67dd..079191032 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,7 +23,7 @@ public class MysteriousItemConversionCategory extends CreateRecipeCategory { +public class HauntedBellBlock extends AbstractBellBlock { - public CursedBellBlock(Properties properties) { + public HauntedBellBlock(Properties properties) { super(properties); } @Override public TileEntity createTileEntity(BlockState state, IBlockReader world) { - return AllTileEntities.CURSED_BELL.create(); + return AllTileEntities.HAUNTED_BELL.create(); } @Override - public Class getTileEntityClass() { - return CursedBellTileEntity.class; + public Class getTileEntityClass() { + return HauntedBellTileEntity.class; } @Override public void playSound(World world, BlockPos pos) { - AllSoundEvents.CURSED_BELL_USE.playOnServer(world, pos, 4f, 1f); + AllSoundEvents.HAUNTED_BELL_USE.playOnServer(world, pos, 4f, 1f); } @Override public void onBlockAdded(BlockState state, World world, BlockPos pos, BlockState oldState, boolean isMoving) { if (oldState.getBlock() != this) - withTileEntityDo(world, pos, CursedBellTileEntity::startEffect); + withTileEntityDo(world, pos, HauntedBellTileEntity::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/HauntedBellMovementBehaviour.java similarity index 84% rename from src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellMovementBehaviour.java rename to src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellMovementBehaviour.java index 7976cf8a1..506e9ae1e 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellMovementBehaviour.java @@ -5,7 +5,7 @@ import com.simibubi.create.content.contraptions.components.structureMovement.Mov import net.minecraft.util.math.BlockPos; -public class CursedBellMovementBehaviour extends BellMovementBehaviour { +public class HauntedBellMovementBehaviour extends BellMovementBehaviour { public static final int DISTANCE = 3; @@ -19,8 +19,8 @@ public class CursedBellMovementBehaviour extends BellMovementBehaviour { @Override public void visitNewPosition(MovementContext context, BlockPos pos) { if (!context.world.isRemote && getRecharge(context) == 0) { - CursedBellPulser.sendPulse(context.world, pos, DISTANCE, true); - setRecharge(context, CursedBellTileEntity.RECHARGE_TICKS); + HauntedBellPulser.sendPulse(context.world, pos, DISTANCE, true); + setRecharge(context, HauntedBellTileEntity.RECHARGE_TICKS); playSound(context); } } diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellPulser.java b/src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellPulser.java similarity index 87% rename from src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellPulser.java rename to src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellPulser.java index 3948d8491..6c0ef3d79 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellPulser.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellPulser.java @@ -13,13 +13,13 @@ import net.minecraftforge.fml.common.Mod.EventBusSubscriber; import net.minecraftforge.fml.network.PacketDistributor; @EventBusSubscriber -public class CursedBellPulser { +public class HauntedBellPulser { public static final int DISTANCE = 3; public static final int RECHARGE_TICKS = 8; @SubscribeEvent - public static void cursedBellCreatesPulse(TickEvent.PlayerTickEvent event) { + public static void hauntedBellCreatesPulse(TickEvent.PlayerTickEvent event) { if (event.phase != TickEvent.Phase.END) return; if (event.side != LogicalSide.SERVER) @@ -30,7 +30,7 @@ public class CursedBellPulser { if (event.player.world.getGameTime() % RECHARGE_TICKS != 0) return; - if (event.player.isHolding(AllBlocks.CURSED_BELL::is)) + if (event.player.isHolding(AllBlocks.HAUNTED_BELL::is)) sendPulse(event.player.world, event.player.getBlockPos(), DISTANCE, false); } diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellTileEntity.java b/src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellTileEntity.java similarity index 91% rename from src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellTileEntity.java rename to src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellTileEntity.java index c99d1cf64..486a2445c 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellTileEntity.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellTileEntity.java @@ -17,7 +17,7 @@ import net.minecraft.util.SoundEvents; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class CursedBellTileEntity extends AbstractBellTileEntity { +public class HauntedBellTileEntity extends AbstractBellTileEntity { public static final int DISTANCE = 10; public static final int RECHARGE_TICKS = 65; @@ -25,7 +25,7 @@ public class CursedBellTileEntity extends AbstractBellTileEntity { public int effectTicks = 0; - public CursedBellTileEntity(TileEntityType type) { + public HauntedBellTileEntity(TileEntityType type) { super(type); } @@ -34,7 +34,7 @@ public class CursedBellTileEntity extends AbstractBellTileEntity { @Override public PartialModel getBellModel() { - return AllBlockPartials.CURSED_BELL; + return AllBlockPartials.HAUNTED_BELL; } @Override @@ -46,7 +46,7 @@ public class CursedBellTileEntity extends AbstractBellTileEntity { return false; if (!world.isRemote) - CursedBellPulser.sendPulse(world, pos, DISTANCE, true); + HauntedBellPulser.sendPulse(world, pos, DISTANCE, true); startEffect(); 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 ae11068e0..8033bc7b6 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 @@ -69,13 +69,13 @@ public class PeculiarBellBlock extends AbstractBellBlock if (world.isRemote()) { spawnConversionParticles(world, pos); } else if (world instanceof World) { - AllSoundEvents.CURSED_BELL_CONVERT.playOnServer((World) world, pos); + AllSoundEvents.HAUNTED_BELL_CONVERT.playOnServer((World) world, pos); } - return AllBlocks.CURSED_BELL.getDefaultState() - .with(CursedBellBlock.field_220133_a, state.get(field_220133_a)) - .with(CursedBellBlock.field_220134_b, state.get(field_220134_b)) - .with(CursedBellBlock.POWERED, state.get(POWERED)); + return AllBlocks.HAUNTED_BELL.getDefaultState() + .with(HauntedBellBlock.field_220133_a, state.get(field_220133_a)) + .with(HauntedBellBlock.field_220134_b, state.get(field_220134_b)) + .with(HauntedBellBlock.POWERED, state.get(POWERED)); } public void spawnConversionParticles(IWorld world, BlockPos blockPos) { diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/SoulBaseParticle.java b/src/main/java/com/simibubi/create/content/curiosities/bell/SoulBaseParticle.java index ce3f4820f..fd17c7d16 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/SoulBaseParticle.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/SoulBaseParticle.java @@ -6,6 +6,7 @@ import net.minecraft.client.particle.IAnimatedSprite; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.world.ClientWorld; import net.minecraft.particles.ParticleType; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Quaternion; import net.minecraft.util.math.vector.Vector3f; @@ -27,11 +28,11 @@ public class SoulBaseParticle extends CustomRotationParticle { @Override public void tick() { - if (this.age++ >= this.maxAge) { - this.setExpired(); - } else { - this.selectSpriteLoopingWithAge(animatedSprite); - } + selectSpriteLoopingWithAge(animatedSprite); + + BlockPos pos = new BlockPos(posX, posY, posZ); + if (age++ >= maxAge || !SoulPulseEffect.canSpawnSoulAt(world, pos)) + setExpired(); } @Override diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/SoulParticle.java b/src/main/java/com/simibubi/create/content/curiosities/bell/SoulParticle.java index ce36d72b4..302ecc398 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/SoulParticle.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/SoulParticle.java @@ -8,7 +8,6 @@ import net.minecraft.client.world.ClientWorld; import net.minecraft.particles.ParticleType; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Quaternion; -import net.minecraft.world.LightType; public class SoulParticle extends CustomRotationParticle { @@ -54,20 +53,18 @@ public class SoulParticle extends CustomRotationParticle { @Override public void tick() { + animationStage.tick(); - this.animationStage.tick(); + animationStage = animationStage.getNext(); - this.animationStage = animationStage.getNext(); - - if (animationStage == null) - this.setExpired(); - if (world.getLightLevel(LightType.BLOCK, new BlockPos(posX, posY, posZ)) > 7) - this.setExpired(); + BlockPos pos = new BlockPos(posX, posY, posZ); + if (animationStage == null || !SoulPulseEffect.canSpawnSoulAt(world, pos)) + setExpired(); } public void setFrame(int frame) { if (frame >= 0 && frame < totalFrames) - this.setSprite(animatedSprite.get(frame, totalFrames)); + setSprite(animatedSprite.get(frame, totalFrames)); } @Override 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 13923f0e3..7fbacdffa 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 @@ -71,7 +71,7 @@ public class SoulPulseEffect { .collect(Collectors.toList()); } - public boolean canSpawnSoulAt(World world, BlockPos at) { + public static boolean canSpawnSoulAt(World world, BlockPos at) { EntityType dummy = EntityType.ZOMBIE; double dummyWidth = 0.2, dummyHeight = 0.75; double w2 = dummyWidth / 2; diff --git a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItem.java b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItem.java index 578378447..403fc88be 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItem.java @@ -25,6 +25,7 @@ import net.minecraft.item.ShootableItem; import net.minecraft.item.UseAction; import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; +import net.minecraft.util.Direction.Axis; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; @@ -113,22 +114,32 @@ public class PotatoCannonItem extends ShootableItem { ShootableGadgetItemMethods.getGunBarrelVec(player, hand == Hand.MAIN_HAND, new Vector3d(-.05f, 0, 0)) .subtract(player.getPositionVec() .add(0, player.getEyeHeight(), 0)); - - Vector3d lookVec = player.getLookVec(); PotatoCannonProjectileTypes projectileType = PotatoCannonProjectileTypes.getProjectileTypeOf(itemStack) .orElse(PotatoCannonProjectileTypes.FALLBACK); + Vector3d lookVec = player.getLookVec(); + Vector3d motion = lookVec.add(correction).normalize().scale(projectileType.getVelocityMultiplier()); + float soundPitch = projectileType.getSoundPitch() + (Create.RANDOM.nextFloat() - .5f) / 4f; + boolean spray = projectileType.getSplit() > 1; + Vector3d sprayBase = VecHelper.rotate(new Vector3d(0,0.1,0), + 360*Create.RANDOM.nextFloat(), Axis.Z); + float sprayChange = 360f / projectileType.getSplit(); + for (int i = 0; i < projectileType.getSplit(); i++) { PotatoProjectileEntity projectile = AllEntityTypes.POTATO_PROJECTILE.create(world); projectile.setItem(itemStack); - Vector3d motion = lookVec.scale(projectileType.getVelocityMultiplier()) - .add(correction); - if (spray) - motion = VecHelper.offsetRandomly(motion, Create.RANDOM, 0.25f); + + Vector3d splitMotion = motion; + if (spray) { + float imperfection = 40*(Create.RANDOM.nextFloat() - 0.5f); + Vector3d sprayOffset = VecHelper.rotate(sprayBase, i * sprayChange + imperfection, Axis.Z); + splitMotion = splitMotion.add(VecHelper.lookAt(sprayOffset, motion)); + } + projectile.setPosition(barrelPos.x, barrelPos.y, barrelPos.z); - projectile.setMotion(motion); + projectile.setMotion(splitMotion); projectile.setShooter(player); world.addEntity(projectile); } diff --git a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonProjectileTypes.java b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonProjectileTypes.java index 6c43183d5..ff466020f 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonProjectileTypes.java +++ b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonProjectileTypes.java @@ -6,6 +6,8 @@ import java.util.Optional; import java.util.function.BiConsumer; import java.util.function.Consumer; +import com.mojang.datafixers.util.Pair; +import com.simibubi.create.AllItems; import com.simibubi.create.Create; import net.minecraft.block.Block; @@ -14,6 +16,8 @@ import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.passive.FoxEntity; +import net.minecraft.item.Food; +import net.minecraft.item.Foods; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -46,7 +50,7 @@ public class PotatoCannonProjectileTypes { FALLBACK = create("fallback").damage(0) .register(), - POTATO = create("potato").damage(4) + POTATO = create("potato").damage(5) .reloadTicks(15) .velocity(1.25f) .knockback(1.5f) @@ -54,32 +58,32 @@ public class PotatoCannonProjectileTypes { .onBlockHit(plantCrop(Blocks.POTATOES.delegate)) .registerAndAssign(Items.POTATO), - BAKED_POTATO = create("baked_potato").damage(3) + BAKED_POTATO = create("baked_potato").damage(5) .reloadTicks(15) - .velocity(1.05f) + .velocity(1.25f) .knockback(0.5f) .renderTumbling() - .onEntityHit(ray -> ray.getEntity() - .setFireTicks(10)) + .onEntityHit(ray -> ray.getEntity().setFire(3)) .registerAndAssign(Items.BAKED_POTATO), - CARROT = create("carrot").damage(3) - .renderTowardMotion(140, 1) + CARROT = create("carrot").damage(4) + .reloadTicks(12) .velocity(1.45f) - .knockback(0.5f) - .soundPitch(1.25f) + .knockback(0.3f) + .renderTowardMotion(140, 1) + .soundPitch(1.5f) .onBlockHit(plantCrop(Blocks.CARROTS.delegate)) .registerAndAssign(Items.CARROT), - GOLDEN_CARROT = create("golden_carrot").damage(8) - .reloadTicks(20) - .knockback(0.5f) + GOLDEN_CARROT = create("golden_carrot").damage(12) + .reloadTicks(15) .velocity(1.45f) + .knockback(0.5f) .renderTowardMotion(140, 2) - .soundPitch(1.25f) + .soundPitch(1.5f) .registerAndAssign(Items.GOLDEN_CARROT), - SWEET_BERRIES = create("sweet_berry").damage(1) + SWEET_BERRIES = create("sweet_berry").damage(3) .reloadTicks(10) .knockback(0.1f) .velocity(1.05f) @@ -88,22 +92,108 @@ public class PotatoCannonProjectileTypes { .soundPitch(1.25f) .registerAndAssign(Items.SWEET_BERRIES), + CHOCOLATE_BERRIES = create("chocolate_berry").damage(4) + .reloadTicks(10) + .knockback(0.2f) + .velocity(1.05f) + .renderTumbling() + .splitInto(3) + .soundPitch(1.25f) + .registerAndAssign(AllItems.CHOCOLATE_BERRIES.get()), + POISON_POTATO = create("poison_potato").damage(5) .reloadTicks(15) .knockback(0.05f) .velocity(1.25f) .renderTumbling() - .onEntityHit(potion(Effects.POISON, 4)) + .onEntityHit(potion(Effects.POISON, 1,160)) .registerAndAssign(Items.POISONOUS_POTATO), - CHORUS_FRUIT = create("chorus_fruit").damage(2) + CHORUS_FRUIT = create("chorus_fruit").damage(3) .reloadTicks(15) .velocity(1.20f) .knockback(0.05f) .renderTumbling() .onEntityHit(chorusTeleport(20)) - .registerAndAssign(Items.CHORUS_FRUIT) + .registerAndAssign(Items.CHORUS_FRUIT), + APPLE = create("apple").damage(5) + .reloadTicks(10) + .velocity(1.45f) + .knockback(0.5f) + .renderTumbling() + .soundPitch(1.1f) + .registerAndAssign(Items.APPLE), + + HONEYED_APPLE = create("honeyed_apple").damage(6) + .reloadTicks(15) + .velocity(1.35f) + .knockback(0.1f) + .renderTumbling() + .soundPitch(1.1f) + .onEntityHit(potion(Effects.SLOWNESS, 2,160)) + .registerAndAssign(AllItems.HONEYED_APPLE.get()), + + GOLDEN_APPLE = create("golden_apple").damage(1) + .reloadTicks(100) + .velocity(1.45f) + .knockback(0.05f) + .renderTumbling() + .soundPitch(1.1f) + .onEntityHit(foodEffects(Foods.GOLDEN_APPLE)) + .registerAndAssign(Items.GOLDEN_APPLE), + + ENCHANTED_GOLDEN_APPLE = create("enchanted_golden_apple").damage(1) + .reloadTicks(100) + .velocity(1.45f) + .knockback(0.05f) + .renderTumbling() + .soundPitch(1.1f) + .onEntityHit(foodEffects(Foods.ENCHANTED_GOLDEN_APPLE)) + .registerAndAssign(Items.ENCHANTED_GOLDEN_APPLE), + + BEETROOT = create("beetroot").damage(2) + .reloadTicks(5) + .velocity(1.6f) + .knockback(0.1f) + .renderTowardMotion(140, 2) + .soundPitch(1.6f) + .registerAndAssign(Items.BEETROOT), + + MELON_SLICE = create("melon_slice").damage(3) + .reloadTicks(8) + .knockback(0.1f) + .velocity(1.45f) + .renderTumbling() + .soundPitch(1.5f) + .registerAndAssign(Items.MELON_SLICE), + + GLISTENING_MELON = create("glistening_melon").damage(5) + .reloadTicks(8) + .knockback(0.1f) + .velocity(1.45f) + .renderTumbling() + .soundPitch(1.5f) + .onEntityHit(potion(Effects.GLOWING, 1, 100)) + .registerAndAssign(Items.GLISTERING_MELON_SLICE), + + MELON_BLOCK = create("melon_block").damage(8) + .reloadTicks(20) + .knockback(2.0f) + .velocity(0.95f) + .renderTumbling() + .soundPitch(0.9f) + .onBlockHit(placeBlockOnGround(Blocks.MELON.delegate)) + .registerAndAssign(Blocks.MELON), + + PUMPKIN_BLOCK = create("pumpkin_block").damage(6) + .reloadTicks(15) + .knockback(2.0f) + .velocity(0.95f) + .renderTumbling() + .soundPitch(0.9f) + .onBlockHit(placeBlockOnGround(Blocks.PUMPKIN.delegate)) + .registerAndAssign(Blocks.PUMPKIN) ; public static void registerType(ResourceLocation resLoc, PotatoCannonProjectileTypes type) { @@ -184,30 +274,59 @@ public class PotatoCannonProjectileTypes { onBlockHit.accept(world, ray); } - private static Consumer potion(Effect effect, int seconds) { + private static Consumer potion(Effect effect, int level, int ticks) { return ray -> { Entity entity = ray.getEntity(); if (entity instanceof LivingEntity) - ((LivingEntity) entity).addPotionEffect(new EffectInstance(effect, seconds)); + ((LivingEntity) entity).addPotionEffect(new EffectInstance(effect, ticks, level - 1)); + }; + } + + private static Consumer foodEffects(Food food) { + return ray -> { + Entity entity = ray.getEntity(); + if (entity instanceof LivingEntity) { + for (Pair effect : food.getEffects()) { + if (Create.RANDOM.nextFloat() < effect.getSecond()) + ((LivingEntity) entity).addPotionEffect(effect.getFirst()); + } + } }; } private static BiConsumer plantCrop(IRegistryDelegate cropBlock) { return (world, ray) -> { - BlockPos pos = ray.getPos(); - if (!world.isAreaLoaded(pos, 1)) + BlockPos hitPos = ray.getPos(); + if (!world.isAreaLoaded(hitPos, 1)) return; - BlockState blockState = world.getBlockState(pos); - if (!world.getBlockState(pos.up()) + Direction face = ray.getFace(); + BlockPos placePos = hitPos.offset(face); + if (!world.getBlockState(placePos) .getMaterial() .isReplaceable()) return; if (!(cropBlock.get() instanceof IPlantable)) return; - if (!blockState.canSustainPlant(world, pos, Direction.UP, (IPlantable) cropBlock.get())) + BlockState blockState = world.getBlockState(hitPos); + if (!blockState.canSustainPlant(world, hitPos, face, (IPlantable) cropBlock.get())) return; - world.setBlockState(pos.up(), cropBlock.get() - .getDefaultState(), 3); + world.setBlockState(placePos, cropBlock.get().getDefaultState(), 3); + }; + } + + private static BiConsumer placeBlockOnGround(IRegistryDelegate block) { + return (world, ray) -> { + if (ray.getFace() != Direction.UP) + return; + BlockPos hitPos = ray.getPos(); + if (!world.isAreaLoaded(hitPos, 1)) + return; + BlockPos placePos = hitPos.up(); + if (!world.getBlockState(placePos) + .getMaterial() + .isReplaceable()) + return; + world.setBlockState(placePos, block.get().getDefaultState(), 3); }; } diff --git a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileEntity.java b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileEntity.java index be80dd36d..6640b7b57 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileEntity.java +++ b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileEntity.java @@ -134,6 +134,10 @@ public class PotatoProjectileEntity extends DamagingProjectileEntity implements } LivingEntity livingentity = (LivingEntity) target; + + if (type.getReloadTicks() < 10) + livingentity.hurtResistantTime = type.getReloadTicks() + 10; + if (knockback > 0) { Vector3d appliedMotion = this.getMotion() .mul(1.0D, 0.0D, 1.0D) @@ -184,8 +188,10 @@ public class PotatoProjectileEntity extends DamagingProjectileEntity implements } @Override - public boolean attackEntityFrom(DamageSource p_70097_1_, float p_70097_2_) { - if (this.isInvulnerableTo(p_70097_1_)) + public boolean attackEntityFrom(DamageSource source, float amt) { + if (source == DamageSource.IN_FIRE || source == DamageSource.ON_FIRE) + return false; + if (this.isInvulnerableTo(source)) return false; pop(getPositionVec()); remove(); diff --git a/src/main/java/com/simibubi/create/content/logistics/item/LecternControllerBlock.java b/src/main/java/com/simibubi/create/content/logistics/item/LecternControllerBlock.java index 989fe2d92..339806dbb 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/LecternControllerBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/LecternControllerBlock.java @@ -1,9 +1,14 @@ package com.simibubi.create.content.logistics.item; +import java.util.ArrayList; + import javax.annotation.Nullable; +import com.simibubi.create.AllItems; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.AllTileEntities; +import com.simibubi.create.content.schematics.ISpecialBlockItemRequirement; +import com.simibubi.create.content.schematics.ItemRequirement; import com.simibubi.create.foundation.block.ITE; import net.minecraft.block.BlockState; @@ -16,10 +21,11 @@ import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -public class LecternControllerBlock extends LecternBlock implements ITE { +public class LecternControllerBlock extends LecternBlock implements ITE, ISpecialBlockItemRequirement { public LecternControllerBlock(Properties properties) { super(properties); @@ -89,4 +95,16 @@ public class LecternControllerBlock extends LecternBlock implements ITE requiredItems = new ArrayList<>(); + requiredItems.add(new ItemStack(Blocks.LECTERN)); + requiredItems.add(new ItemStack(AllItems.LINKED_CONTROLLER.get())); + return new ItemRequirement(ItemRequirement.ItemUseType.CONSUME, requiredItems); + } } diff --git a/src/main/java/com/simibubi/create/content/logistics/item/LecternControllerTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/item/LecternControllerTileEntity.java index 9329019de..029a6688e 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/LecternControllerTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/LecternControllerTileEntity.java @@ -48,6 +48,12 @@ public class LecternControllerTileEntity extends SmartTileEntity { compound.putUniqueId("User", user); } + @Override + public void writeSafe(CompoundNBT compound, boolean clientPacket) { + super.writeSafe(compound, clientPacket); + compound.put("Controller", controller.write(new CompoundNBT())); + } + @Override protected void fromTag(BlockState state, CompoundNBT compound, boolean clientPacket) { super.fromTag(state, compound, clientPacket); diff --git a/src/main/java/com/simibubi/create/content/schematics/SchematicPrinter.java b/src/main/java/com/simibubi/create/content/schematics/SchematicPrinter.java index 4006b976a..50c05fb04 100644 --- a/src/main/java/com/simibubi/create/content/schematics/SchematicPrinter.java +++ b/src/main/java/com/simibubi/create/content/schematics/SchematicPrinter.java @@ -22,7 +22,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MutableBoundingBox; -import net.minecraft.util.math.vector.Vector3i; import net.minecraft.world.World; import net.minecraft.world.gen.feature.template.PlacementSettings; import net.minecraft.world.gen.feature.template.Template; @@ -119,7 +118,8 @@ public class SchematicPrinter { } public boolean isWorldEmpty() { - return blockReader.getBounds().getLength().equals(new Vector3i(0,0,0)); + return blockReader.getAllPositions().isEmpty(); + //return blockReader.getBounds().getLength().equals(new Vector3i(0,0,0)); } @FunctionalInterface diff --git a/src/main/java/com/simibubi/create/foundation/utility/VecHelper.java b/src/main/java/com/simibubi/create/foundation/utility/VecHelper.java index 7491d635c..a2cb48d26 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/VecHelper.java +++ b/src/main/java/com/simibubi/create/foundation/utility/VecHelper.java @@ -60,6 +60,20 @@ public class VecHelper { return vec; } + public static Vector3d lookAt(Vector3d vec, Vector3d fwd) { + fwd = fwd.normalize(); + Vector3d up = new Vector3d(0,1,0); + double dot = fwd.dotProduct(up); + if (Math.abs(dot) > 1 - 1.0E-3) + up = new Vector3d(0, 0, dot > 0 ? 1 : -1); + Vector3d right = fwd.crossProduct(up).normalize(); + up = right.crossProduct(fwd).normalize(); + double x = vec.x * right.x + vec.y * up.x + vec.z * fwd.x; + double y = vec.x * right.y + vec.y * up.y + vec.z * fwd.y; + double z = vec.x * right.z + vec.y * up.z + vec.z * fwd.z; + return new Vector3d(x, y, z); + } + public static boolean isVecPointingTowards(Vector3d vec, Direction direction) { return Vector3d.of(direction.getDirectionVec()) .dotProduct(vec.normalize()) > 0.125; // slight tolerance to activate perpendicular movement actors diff --git a/src/main/resources/assets/create/lang/default/tooltips.json b/src/main/resources/assets/create/lang/default/tooltips.json index de63406a8..6fca14d13 100644 --- a/src/main/resources/assets/create/lang/default/tooltips.json +++ b/src/main/resources/assets/create/lang/default/tooltips.json @@ -220,10 +220,10 @@ "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.", + "block.create.haunted_bell.tooltip": "HAUNTED BELL", + "block.create.haunted_bell.tooltip.summary": "A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.condition1": "When Held or Rang", + "block.create.haunted_bell.tooltip.behaviour1": "Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.", "create.gui.chromatic_projector.title": "Chromatic Projector", "create.gui.chromatic_projector.filter.invert": "Invert", diff --git a/src/main/resources/assets/create/models/block/cursed_bell/bell.json b/src/main/resources/assets/create/models/block/haunted_bell/bell.json similarity index 100% rename from src/main/resources/assets/create/models/block/cursed_bell/bell.json rename to src/main/resources/assets/create/models/block/haunted_bell/bell.json diff --git a/src/main/resources/assets/create/models/block/cursed_bell/block_ceiling.json b/src/main/resources/assets/create/models/block/haunted_bell/block_ceiling.json similarity index 100% rename from src/main/resources/assets/create/models/block/cursed_bell/block_ceiling.json rename to src/main/resources/assets/create/models/block/haunted_bell/block_ceiling.json diff --git a/src/main/resources/assets/create/models/block/cursed_bell/block_double_wall.json b/src/main/resources/assets/create/models/block/haunted_bell/block_double_wall.json similarity index 100% rename from src/main/resources/assets/create/models/block/cursed_bell/block_double_wall.json rename to src/main/resources/assets/create/models/block/haunted_bell/block_double_wall.json diff --git a/src/main/resources/assets/create/models/block/cursed_bell/block_floor.json b/src/main/resources/assets/create/models/block/haunted_bell/block_floor.json similarity index 100% rename from src/main/resources/assets/create/models/block/cursed_bell/block_floor.json rename to src/main/resources/assets/create/models/block/haunted_bell/block_floor.json diff --git a/src/main/resources/assets/create/models/block/cursed_bell/block_single_wall.json b/src/main/resources/assets/create/models/block/haunted_bell/block_single_wall.json similarity index 100% rename from src/main/resources/assets/create/models/block/cursed_bell/block_single_wall.json rename to src/main/resources/assets/create/models/block/haunted_bell/block_single_wall.json diff --git a/src/main/resources/assets/create/models/block/cursed_bell/item.json b/src/main/resources/assets/create/models/block/haunted_bell/item.json similarity index 100% rename from src/main/resources/assets/create/models/block/cursed_bell/item.json rename to src/main/resources/assets/create/models/block/haunted_bell/item.json diff --git a/src/main/resources/assets/create/sounds/cursed_bell_convert.ogg b/src/main/resources/assets/create/sounds/haunted_bell_convert.ogg similarity index 100% rename from src/main/resources/assets/create/sounds/cursed_bell_convert.ogg rename to src/main/resources/assets/create/sounds/haunted_bell_convert.ogg diff --git a/src/main/resources/assets/create/sounds/cursed_bell_use.ogg b/src/main/resources/assets/create/sounds/haunted_bell_use.ogg similarity index 100% rename from src/main/resources/assets/create/sounds/cursed_bell_use.ogg rename to src/main/resources/assets/create/sounds/haunted_bell_use.ogg From 1a273753eb6e3794c4322c9848c4166896eca68a Mon Sep 17 00:00:00 2001 From: reidbhuntley Date: Sun, 4 Jul 2021 21:56:18 -0400 Subject: [PATCH 5/6] Top-up - Copper Backtank now recharges the durability of pneumatic tools in the wearer's inventory rather than being used as a separate durability source - Potato Cannon and Extendo Grip now become inactive instead of breaking when running out of durability --- .../curiosities/armor/CopperBacktankItem.java | 50 ++++++++++++++++++- .../armor/IBackTankRechargeable.java | 7 +++ .../curiosities/tools/ExtendoGripItem.java | 38 +++++++------- .../tools/ExtendoGripRenderHandler.java | 4 +- .../curiosities/weapons/PotatoCannonItem.java | 12 +++-- 5 files changed, 86 insertions(+), 25 deletions(-) create mode 100644 src/main/java/com/simibubi/create/content/curiosities/armor/IBackTankRechargeable.java diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/CopperBacktankItem.java b/src/main/java/com/simibubi/create/content/curiosities/armor/CopperBacktankItem.java index 7e537816d..a17233f13 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/armor/CopperBacktankItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/armor/CopperBacktankItem.java @@ -1,7 +1,14 @@ package com.simibubi.create.content.curiosities.armor; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import com.google.common.collect.Streams; import com.simibubi.create.foundation.config.AllConfigs; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemGroup; @@ -11,10 +18,16 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ActionResultType; import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; +import net.minecraftforge.event.TickEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.LogicalSide; +import net.minecraftforge.fml.common.Mod.EventBusSubscriber; +@EventBusSubscriber public class CopperBacktankItem extends CopperArmorItem { public static final int DURABILITY_BAR = 0xefefef; + public static final int RECHARGES_PER_TICK = 4; private BlockItem blockItem; public CopperBacktankItem(Properties p_i48534_3_, BlockItem blockItem) { @@ -41,7 +54,7 @@ public class CopperBacktankItem extends CopperArmorItem { public void fillItemGroup(ItemGroup p_150895_1_, NonNullList p_150895_2_) { if (!isInGroup(p_150895_1_)) return; - + ItemStack stack = new ItemStack(this); CompoundNBT nbt = new CompoundNBT(); nbt.putInt("Air", AllConfigs.SERVER.curiosities.maxAirInBacktank.get()); @@ -65,4 +78,39 @@ public class CopperBacktankItem extends CopperArmorItem { return orCreateTag.getInt("Air"); } + @SubscribeEvent + public static void rechargePneumaticTools(TickEvent.PlayerTickEvent event) { + PlayerEntity player = event.player; + if (event.phase != TickEvent.Phase.START) + return; + if (event.side != LogicalSide.SERVER) + return; + if (player.isSpectator()) + return; + ItemStack tankStack = BackTankUtil.get(player); + if (tankStack.isEmpty()) + return; + + PlayerInventory inv = player.inventory; + + List toCharge = Streams.concat(Stream.of(player.getHeldItemMainhand()), inv.offHandInventory.stream(), + inv.armorInventory.stream(), inv.mainInventory.stream()) + .filter(s -> s.getItem() instanceof IBackTankRechargeable && s.isDamaged()) + .collect(Collectors.toList()); + + int charges = RECHARGES_PER_TICK; + for (ItemStack stack : toCharge) { + while (stack.isDamaged()) { + if (BackTankUtil.canAbsorbDamage(event.player, ((IBackTankRechargeable) stack.getItem()).maxUses())) { + stack.setDamage(stack.getDamage() - 1); + charges--; + if (charges <= 0) + return; + } else { + return; + } + } + } + + } } diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/IBackTankRechargeable.java b/src/main/java/com/simibubi/create/content/curiosities/armor/IBackTankRechargeable.java new file mode 100644 index 000000000..eb0c753a8 --- /dev/null +++ b/src/main/java/com/simibubi/create/content/curiosities/armor/IBackTankRechargeable.java @@ -0,0 +1,7 @@ +package com.simibubi.create.content.curiosities.armor; + +public interface IBackTankRechargeable { + + int maxUses(); + +} diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java b/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java index 1cf868e5a..de6e50ad4 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java @@ -6,6 +6,7 @@ import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; import com.simibubi.create.AllItems; import com.simibubi.create.content.curiosities.armor.BackTankUtil; +import com.simibubi.create.content.curiosities.armor.IBackTankRechargeable; import com.simibubi.create.foundation.advancement.AllTriggers; import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.networking.AllPackets; @@ -26,7 +27,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Rarity; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.DamageSource; -import net.minecraft.util.Hand; import net.minecraft.util.LazyValue; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockRayTraceResult; @@ -50,7 +50,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; @EventBusSubscriber -public class ExtendoGripItem extends Item { +public class ExtendoGripItem extends Item implements IBackTankRechargeable { private static DamageSource lastActiveDamageSource; public static final int MAX_DAMAGE = 200; @@ -86,8 +86,8 @@ public class ExtendoGripItem extends Item { PlayerEntity player = (PlayerEntity) event.getEntityLiving(); CompoundNBT persistentData = player.getPersistentData(); - boolean inOff = AllItems.EXTENDO_GRIP.isIn(player.getHeldItemOffhand()); - boolean inMain = AllItems.EXTENDO_GRIP.isIn(player.getHeldItemMainhand()); + boolean inOff = isActiveExtendoGrip(player.getHeldItemOffhand()); + boolean inMain = isActiveExtendoGrip(player.getHeldItemMainhand()); boolean holdingDualExtendo = inOff && inMain; boolean holdingExtendo = inOff ^ inMain; holdingExtendo &= !holdingDualExtendo; @@ -198,17 +198,14 @@ public class ExtendoGripItem extends Item { return; if (player.world.isRemote) return; - Hand hand = Hand.MAIN_HAND; - ItemStack extendo = player.getHeldItemMainhand(); - if (!AllItems.EXTENDO_GRIP.isIn(extendo)) { - extendo = player.getHeldItemOffhand(); - hand = Hand.OFF_HAND; + ItemStack main = player.getHeldItemMainhand(); + ItemStack off = player.getHeldItemOffhand(); + for (ItemStack stack : new ItemStack[]{main, off}) { + if (isActiveExtendoGrip(stack)) { + if (!BackTankUtil.canAbsorbDamage(player, ((IBackTankRechargeable) stack.getItem()).maxUses())) + stack.damageItem(1, player, p -> {}); + } } - if (!AllItems.EXTENDO_GRIP.isIn(extendo)) - return; - final Hand h = hand; - if (!BackTankUtil.canAbsorbDamage(player, maxUses())) - extendo.damageItem(1, player, p -> p.sendBreakAnimation(h)); } @Override @@ -226,7 +223,8 @@ public class ExtendoGripItem extends Item { return BackTankUtil.showDurabilityBar(stack, maxUses()); } - private static int maxUses() { + @Override + public int maxUses() { return AllConfigs.SERVER.curiosities.maxExtendoGripActions.get(); } @@ -244,7 +242,7 @@ public class ExtendoGripItem extends Item { public static void bufferLivingAttackEvent(LivingAttackEvent event) { // Workaround for removed patch to get the attacking entity. lastActiveDamageSource = event.getSource(); - + DamageSource source = event.getSource(); if (source == null) return; @@ -314,9 +312,13 @@ public class ExtendoGripItem extends Item { .sendToServer(new ExtendoGripInteractionPacket(target, event.getHand(), event.getLocalPos())); } + public static boolean isActiveExtendoGrip(ItemStack stack) { + return AllItems.EXTENDO_GRIP.isIn(stack) && stack.getDamage() != stack.getMaxDamage() - 1; + } + public static boolean isHoldingExtendoGrip(PlayerEntity player) { - boolean inOff = AllItems.EXTENDO_GRIP.isIn(player.getHeldItemOffhand()); - boolean inMain = AllItems.EXTENDO_GRIP.isIn(player.getHeldItemMainhand()); + boolean inOff = isActiveExtendoGrip(player.getHeldItemOffhand()); + boolean inMain = isActiveExtendoGrip(player.getHeldItemMainhand()); boolean holdingGrip = inOff || inMain; return holdingGrip; } diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripRenderHandler.java b/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripRenderHandler.java index 17fadd6c2..5113e063a 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripRenderHandler.java +++ b/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripRenderHandler.java @@ -59,8 +59,8 @@ public class ExtendoGripRenderHandler { boolean rightHand = event.getHand() == Hand.MAIN_HAND ^ player.getPrimaryHand() == HandSide.LEFT; ItemStack offhandItem = getRenderedOffHandStack(); - boolean notInOffhand = !AllItems.EXTENDO_GRIP.isIn(offhandItem); - if (notInOffhand && !AllItems.EXTENDO_GRIP.isIn(heldItem)) + boolean notInOffhand = !ExtendoGripItem.isActiveExtendoGrip(offhandItem); + if (notInOffhand && !ExtendoGripItem.isActiveExtendoGrip(heldItem)) return; MatrixStack ms = event.getMatrixStack(); diff --git a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItem.java b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItem.java index 403fc88be..ae9cb8c0b 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItem.java @@ -8,6 +8,7 @@ import com.simibubi.create.AllEntityTypes; import com.simibubi.create.Create; import com.simibubi.create.CreateClient; import com.simibubi.create.content.curiosities.armor.BackTankUtil; +import com.simibubi.create.content.curiosities.armor.IBackTankRechargeable; import com.simibubi.create.content.curiosities.zapper.ShootableGadgetItemMethods; import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.utility.AnimationTickHolder; @@ -37,7 +38,7 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public class PotatoCannonItem extends ShootableItem { +public class PotatoCannonItem extends ShootableItem implements IBackTankRechargeable { public static ItemStack CLIENT_CURRENT_AMMO = ItemStack.EMPTY; public static final int MAX_DAMAGE = 100; @@ -77,7 +78,8 @@ public class PotatoCannonItem extends ShootableItem { return BackTankUtil.showDurabilityBar(stack, maxUses()); } - private int maxUses() { + @Override + public int maxUses() { return AllConfigs.SERVER.curiosities.maxPotatoCannonShots.get(); } @@ -98,6 +100,9 @@ public class PotatoCannonItem extends ShootableItem { @Override public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); + if (stack.getDamage() == getMaxDamage(stack) - 1) + return ActionResult.pass(stack); + return findAmmoInInventory(world, player, stack).map(itemStack -> { if (ShootableGadgetItemMethods.shouldSwap(player, stack, hand, this::isCannon)) @@ -150,8 +155,7 @@ public class PotatoCannonItem extends ShootableItem { player.inventory.deleteStack(itemStack); } - if (!BackTankUtil.canAbsorbDamage(player, maxUses())) - stack.damageItem(1, player, p -> p.sendBreakAnimation(hand)); + stack.damageItem(1, player, p -> {}); Integer cooldown = findAmmoInInventory(world, player, stack).flatMap(PotatoCannonProjectileTypes::getProjectileTypeOf) From e561ac8e73fd50096e3d99d9c4b2f9149a477712 Mon Sep 17 00:00:00 2001 From: reidbhuntley Date: Sun, 4 Jul 2021 23:34:04 -0400 Subject: [PATCH 6/6] Immersive pumpkin chuckin' - Block items shot by the Potato Cannon now spawn a FallingBlock entity when they hit the side of a block --- .../weapons/PotatoCannonProjectileTypes.java | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonProjectileTypes.java b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonProjectileTypes.java index ff466020f..676293c6b 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonProjectileTypes.java +++ b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonProjectileTypes.java @@ -15,6 +15,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.item.FallingBlockEntity; import net.minecraft.entity.passive.FoxEntity; import net.minecraft.item.Food; import net.minecraft.item.Foods; @@ -316,17 +317,30 @@ public class PotatoCannonProjectileTypes { private static BiConsumer placeBlockOnGround(IRegistryDelegate block) { return (world, ray) -> { - if (ray.getFace() != Direction.UP) - return; BlockPos hitPos = ray.getPos(); if (!world.isAreaLoaded(hitPos, 1)) return; - BlockPos placePos = hitPos.up(); + Direction face = ray.getFace(); + BlockPos placePos = hitPos.offset(face); if (!world.getBlockState(placePos) - .getMaterial() - .isReplaceable()) + .getMaterial() + .isReplaceable()) return; - world.setBlockState(placePos, block.get().getDefaultState(), 3); + + if (face == Direction.UP) { + world.setBlockState(placePos, block.get().getDefaultState(), 3); + } else if (world instanceof World) { + double y = ray.getHitVec().y - 0.5; + if (!world.isAirBlock(placePos.up())) + y = Math.min(y, placePos.getY()); + if (!world.isAirBlock(placePos.down())) + y = Math.max(y, placePos.getY()); + + FallingBlockEntity falling = new FallingBlockEntity((World) world, placePos.getX() + 0.5, y, + placePos.getZ() + 0.5, block.get().getDefaultState()); + falling.fallTime = 1; + world.addEntity(falling); + } }; }