From 8fff3d6745958269f1632eee788b238c59ba3d09 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Sat, 1 May 2021 13:19:01 +0200 Subject: [PATCH] The great second purge of Tools - Removed the Blockzapper - Removed the Deforester - Handheld Worldshaper -> Creative Worldshaper - Worldshapers now have a "surface" and "cluster" brush type - Worldshapers now follow the creative colour palette - Some UI touch-ups for tools --- src/generated/resources/.cache/cache | 39 +- .../resources/assets/create/lang/en_ud.json | 4 +- .../resources/assets/create/lang/en_us.json | 70 +--- .../assets/create/lang/unfinished/de_de.json | 68 +-- .../assets/create/lang/unfinished/es_es.json | 68 +-- .../assets/create/lang/unfinished/es_mx.json | 70 +--- .../assets/create/lang/unfinished/fr_fr.json | 68 +-- .../assets/create/lang/unfinished/it_it.json | 68 +-- .../assets/create/lang/unfinished/ja_jp.json | 68 +-- .../assets/create/lang/unfinished/ko_kr.json | 68 +-- .../assets/create/lang/unfinished/nl_nl.json | 72 +--- .../assets/create/lang/unfinished/pt_br.json | 72 +--- .../assets/create/lang/unfinished/ru_ru.json | 68 +-- .../assets/create/lang/unfinished/zh_cn.json | 68 +-- .../assets/create/lang/unfinished/zh_tw.json | 68 +-- .../assets/create/models/item/deforester.json | 3 - .../models/item/handheld_blockzapper.json | 3 - .../resources/assets/create/sounds.json | 52 +-- .../data/create/advancements/deforester.json | 36 -- .../crafting/curiosities/deforester.json | 32 -- .../curiosities/handheld_blockzapper.json | 32 -- .../create/advancements/upgraded_zapper.json | 30 -- .../data/create/advancements/zapper.json | 35 -- .../crafting/curiosities/deforester.json | 22 - .../curiosities/handheld_blockzapper.json | 22 - .../java/com/simibubi/create/AllBlocks.java | 3 + .../java/com/simibubi/create/AllItems.java | 51 +-- .../com/simibubi/create/AllRecipeTypes.java | 3 - .../com/simibubi/create/AllSoundEvents.java | 10 +- .../simibubi/create/compat/jei/CreateJEI.java | 11 - .../category/BlockzapperUpgradeCategory.java | 95 ----- .../symmetry/SymmetryWandScreen.java | 12 +- .../curiosities/tools/AllToolTiers.java | 59 --- .../curiosities/tools/DeforesterItem.java | 75 ---- .../tools/DeforesterItemRenderer.java | 30 -- .../curiosities/tools/DeforesterModel.java | 20 - .../zapper/ZapperInteractionHandler.java | 2 +- .../curiosities/zapper/ZapperItem.java | 10 +- .../zapper/ZapperRenderHandler.java | 4 +- .../curiosities/zapper/ZapperScreen.java | 31 +- .../zapper/blockzapper/BlockzapperItem.java | 396 ------------------ .../blockzapper/BlockzapperItemRenderer.java | 86 ---- .../zapper/blockzapper/BlockzapperModel.java | 32 -- .../blockzapper/BlockzapperRenderHandler.java | 62 --- .../zapper/blockzapper/BlockzapperScreen.java | 114 ----- .../blockzapper/BlockzapperUpgradeRecipe.java | 134 ------ .../zapper/terrainzapper/Brush.java | 24 +- .../zapper/terrainzapper/CuboidBrush.java | 2 +- .../zapper/terrainzapper/CylinderBrush.java | 2 +- .../zapper/terrainzapper/DynamicBrush.java | 147 +++++++ .../zapper/terrainzapper/ShapedBrush.java | 29 ++ .../zapper/terrainzapper/SphereBrush.java | 2 +- .../zapper/terrainzapper/TerrainBrushes.java | 6 +- .../zapper/terrainzapper/TerrainTools.java | 4 +- .../zapper/terrainzapper/WorldshaperItem.java | 6 +- .../WorldshaperRenderHandler.java | 29 +- .../terrainzapper/WorldshaperScreen.java | 190 ++++++--- .../simibubi/create/events/ClientEvents.java | 2 - .../advancement/AllAdvancements.java | 19 - .../foundation/data/BuilderTransformers.java | 2 + .../data/recipe/StandardRecipeGen.java | 30 +- .../create/foundation/gui/AllGuiTextures.java | 6 +- .../foundation/utility/RemapHelper.java | 2 - .../create/lang/default/advancements.json | 6 - .../assets/create/lang/default/messages.json | 44 +- .../assets/create/lang/default/tooltips.json | 12 - .../create/models/item/deforester/core.json | 37 -- .../models/item/deforester/core_glow.json | 34 -- .../create/models/item/deforester/gear.json | 65 --- .../create/models/item/deforester/item.json | 117 ------ .../handheld_blockzapper/accelerator.json | 63 --- .../handheld_blockzapper/amplifier_core.json | 18 - .../amplifier_core_glow.json | 21 - .../item/handheld_blockzapper/body.json | 64 --- .../chorus_accelerator.json | 63 --- .../chorus_amplifier.json | 35 -- .../handheld_blockzapper/chorus_body.json | 64 --- .../chorus_retriever.json | 23 - .../handheld_blockzapper/chorus_scope.json | 38 -- .../item/handheld_blockzapper/core.json | 18 - .../item/handheld_blockzapper/core_glow.json | 21 - .../gold_accelerator.json | 63 --- .../handheld_blockzapper/gold_amplifier.json | 35 -- .../item/handheld_blockzapper/gold_body.json | 64 --- .../handheld_blockzapper/gold_retriever.json | 23 - .../item/handheld_blockzapper/gold_scope.json | 38 -- .../item/handheld_blockzapper/item.json | 71 ---- .../handheld_worldshaper/accelerator.json | 74 ++-- .../item/handheld_worldshaper/item.json | 125 +++--- .../textures/block/blaze_brass_mesh.png | Bin 640 -> 0 bytes .../textures/block/chorus_chrome_mesh.png | Bin 616 -> 0 bytes .../textures/block/terrain_zapper_mesh.png | Bin 620 -> 429 bytes .../create/textures/gui/curiosities.png | Bin 2097 -> 1997 bytes .../create/textures/gui/curiosities_2.png | Bin 1488 -> 0 bytes .../blockzapper_upgrade/gold_accelerator.json | 24 -- .../blockzapper_upgrade/gold_amplifier.json | 24 -- .../blockzapper_upgrade/gold_body.json | 22 - .../blockzapper_upgrade/gold_retriever.json | 24 -- .../blockzapper_upgrade/gold_scope.json | 24 -- .../purpur_accelerator.json | 24 -- .../blockzapper_upgrade/purpur_amplifier.json | 25 -- .../blockzapper_upgrade/purpur_body.json | 22 - .../blockzapper_upgrade/purpur_retriever.json | 24 -- .../blockzapper_upgrade/purpur_scope.json | 24 -- 104 files changed, 811 insertions(+), 3610 deletions(-) delete mode 100644 src/generated/resources/assets/create/models/item/deforester.json delete mode 100644 src/generated/resources/assets/create/models/item/handheld_blockzapper.json delete mode 100644 src/generated/resources/data/create/advancements/deforester.json delete mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/crafting/curiosities/deforester.json delete mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/crafting/curiosities/handheld_blockzapper.json delete mode 100644 src/generated/resources/data/create/advancements/upgraded_zapper.json delete mode 100644 src/generated/resources/data/create/advancements/zapper.json delete mode 100644 src/generated/resources/data/create/recipes/crafting/curiosities/deforester.json delete mode 100644 src/generated/resources/data/create/recipes/crafting/curiosities/handheld_blockzapper.json delete mode 100644 src/main/java/com/simibubi/create/compat/jei/category/BlockzapperUpgradeCategory.java delete mode 100644 src/main/java/com/simibubi/create/content/curiosities/tools/AllToolTiers.java delete mode 100644 src/main/java/com/simibubi/create/content/curiosities/tools/DeforesterItem.java delete mode 100644 src/main/java/com/simibubi/create/content/curiosities/tools/DeforesterItemRenderer.java delete mode 100644 src/main/java/com/simibubi/create/content/curiosities/tools/DeforesterModel.java delete mode 100644 src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItem.java delete mode 100644 src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItemRenderer.java delete mode 100644 src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperModel.java delete mode 100644 src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperRenderHandler.java delete mode 100644 src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperScreen.java delete mode 100644 src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperUpgradeRecipe.java create mode 100644 src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/DynamicBrush.java create mode 100644 src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/ShapedBrush.java delete mode 100644 src/main/resources/assets/create/models/item/deforester/core.json delete mode 100644 src/main/resources/assets/create/models/item/deforester/core_glow.json delete mode 100644 src/main/resources/assets/create/models/item/deforester/gear.json delete mode 100644 src/main/resources/assets/create/models/item/deforester/item.json delete mode 100644 src/main/resources/assets/create/models/item/handheld_blockzapper/accelerator.json delete mode 100644 src/main/resources/assets/create/models/item/handheld_blockzapper/amplifier_core.json delete mode 100644 src/main/resources/assets/create/models/item/handheld_blockzapper/amplifier_core_glow.json delete mode 100644 src/main/resources/assets/create/models/item/handheld_blockzapper/body.json delete mode 100644 src/main/resources/assets/create/models/item/handheld_blockzapper/chorus_accelerator.json delete mode 100644 src/main/resources/assets/create/models/item/handheld_blockzapper/chorus_amplifier.json delete mode 100644 src/main/resources/assets/create/models/item/handheld_blockzapper/chorus_body.json delete mode 100644 src/main/resources/assets/create/models/item/handheld_blockzapper/chorus_retriever.json delete mode 100644 src/main/resources/assets/create/models/item/handheld_blockzapper/chorus_scope.json delete mode 100644 src/main/resources/assets/create/models/item/handheld_blockzapper/core.json delete mode 100644 src/main/resources/assets/create/models/item/handheld_blockzapper/core_glow.json delete mode 100644 src/main/resources/assets/create/models/item/handheld_blockzapper/gold_accelerator.json delete mode 100644 src/main/resources/assets/create/models/item/handheld_blockzapper/gold_amplifier.json delete mode 100644 src/main/resources/assets/create/models/item/handheld_blockzapper/gold_body.json delete mode 100644 src/main/resources/assets/create/models/item/handheld_blockzapper/gold_retriever.json delete mode 100644 src/main/resources/assets/create/models/item/handheld_blockzapper/gold_scope.json delete mode 100644 src/main/resources/assets/create/models/item/handheld_blockzapper/item.json delete mode 100644 src/main/resources/assets/create/textures/block/blaze_brass_mesh.png delete mode 100644 src/main/resources/assets/create/textures/block/chorus_chrome_mesh.png delete mode 100644 src/main/resources/assets/create/textures/gui/curiosities_2.png delete mode 100644 src/main/resources/data/create/recipes/blockzapper_upgrade/gold_accelerator.json delete mode 100644 src/main/resources/data/create/recipes/blockzapper_upgrade/gold_amplifier.json delete mode 100644 src/main/resources/data/create/recipes/blockzapper_upgrade/gold_body.json delete mode 100644 src/main/resources/data/create/recipes/blockzapper_upgrade/gold_retriever.json delete mode 100644 src/main/resources/data/create/recipes/blockzapper_upgrade/gold_scope.json delete mode 100644 src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_accelerator.json delete mode 100644 src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_amplifier.json delete mode 100644 src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_body.json delete mode 100644 src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_retriever.json delete mode 100644 src/main/resources/data/create/recipes/blockzapper_upgrade/purpur_scope.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 448cb418c..f74258d44 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -406,20 +406,20 @@ 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 -97e9ee471ea650f6b7f3d3f39f00201cd5ad752d assets/create/lang/en_ud.json -de5b848a5bb52bb1c85a9123b3f3fbc084e315b8 assets/create/lang/en_us.json -77fc60d2271fe111ccd165ab936da031555a5987 assets/create/lang/unfinished/de_de.json -413556ffe8e3459b75930681f5b6923d9d90c0b6 assets/create/lang/unfinished/es_es.json -b2e5909fc6169fa68968e74d4592834f5e72ae24 assets/create/lang/unfinished/es_mx.json -aa79feefc0d9fd7006079aba9eaab882127478c3 assets/create/lang/unfinished/fr_fr.json -3eded7242f2a47068bf2298ae68dbe645ef405aa assets/create/lang/unfinished/it_it.json -88f3ced413786eea34a1344a4df8b530854f6c39 assets/create/lang/unfinished/ja_jp.json -e3f82fb1de5c4e08a3b7ea2fbecaa43183762e54 assets/create/lang/unfinished/ko_kr.json -c39e821107cced812df201720542f96bcafc3338 assets/create/lang/unfinished/nl_nl.json -0598ab0e3f20a17d8ffec9874b5165b6c40c654c assets/create/lang/unfinished/pt_br.json -bb1e3d00fc19e93813e7437a2c2cea2b0b8c2af1 assets/create/lang/unfinished/ru_ru.json -a8e0dfc2ba5b41cee05636b16b4661e96d5e8b5a assets/create/lang/unfinished/zh_cn.json -74c50139e2274be160a1bd0068f411cc6ec845d5 assets/create/lang/unfinished/zh_tw.json +0e10e87986a76f18efeb1255f2c025d1aad8f8fa assets/create/lang/en_ud.json +949bac58ef9534024eac6d9082f5d241ce5b91f3 assets/create/lang/en_us.json +26ab60b925659e6daac2e449267d202c68cafe94 assets/create/lang/unfinished/de_de.json +78086e1c23ce96db3a9ec3d304d7418f39ed96fa assets/create/lang/unfinished/es_es.json +62fcca040385405c7655ea6e4b524b2a5e652e4c assets/create/lang/unfinished/es_mx.json +0f527cc6472caec6ec090985c5000e6f7f93208f assets/create/lang/unfinished/fr_fr.json +812f7e66a1d5a06a7b81a41216ee2151e678db69 assets/create/lang/unfinished/it_it.json +d5275e066511ce8e99db0d5504ed24e38d98a45f assets/create/lang/unfinished/ja_jp.json +2c3a1bd28a6a08bec850cc36735204c59045b188 assets/create/lang/unfinished/ko_kr.json +27559156601b57cc2e9fae07a92c7f79a7f4e473 assets/create/lang/unfinished/nl_nl.json +fa22d8055979012a45a6648009ef0094be4560d8 assets/create/lang/unfinished/pt_br.json +c3f6825459aa7153a6f65fe23d32c91290ff14f3 assets/create/lang/unfinished/ru_ru.json +2bd50e62c0ed45c7fc109cf7e229207e324912d8 assets/create/lang/unfinished/zh_cn.json +8052350b58969035d456f882fa5624ee16a0024c 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 @@ -1305,7 +1305,6 @@ b50e3471476783be80f28bb4e3543f5a426b9eb6 assets/create/models/item/dark_scoria_b e67fe11e9036c81f0f54d368b41a971822a84a32 assets/create/models/item/dark_scoria_cobblestone_stairs.json 6e6867197215635b7febac7ffca77b763c021cc4 assets/create/models/item/dark_scoria_cobblestone_wall.json f5b2995929ac9dca9857d4618660ffa7778d5618 assets/create/models/item/dark_scoria_pillar.json -f06f56ffb1cd7c9a2b81c65f7796726692e5cc59 assets/create/models/item/deforester.json 2104c1276259ab67b94f3d4fe97e14b6bc6941ac assets/create/models/item/deployer.json 84d87f715efab45dc7bcb2e3c0870ed56fa20ee9 assets/create/models/item/depot.json a97ca9b6fc3e10a9c9409b27458a852222045e4e assets/create/models/item/diorite_bricks.json @@ -1408,7 +1407,6 @@ e7daa31c1fc445d542bad476dfe1d6a8811f2070 assets/create/models/item/gray_seat.jso 1c9c9157a06108bf58967bfc4fb069c35d20e90a assets/create/models/item/green_seat.json ecb9f32f62d3fa43fb226ab85adc2eb229fdfb77 assets/create/models/item/green_valve_handle.json 398b1a7c76c7bdb6a23b1248fdce98f6d835467f assets/create/models/item/hand_crank.json -cfab82a2cf7495d21778c1de9730a26afbdd523d assets/create/models/item/handheld_blockzapper.json dee43bf1a9c211a752fac2c07aeba123f7f0c914 assets/create/models/item/handheld_worldshaper.json f0d5af58e23e2705b3ef675c30bdf85ed9567c57 assets/create/models/item/honey_bucket.json 068729724f5f7b276b9bc378e533898a92e8debe assets/create/models/item/honeyed_apple.json @@ -1648,7 +1646,7 @@ 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 -a3214d60696bcbca721ad4b3ebbdd84ff6f6b32d assets/create/sounds.json +7b73f40a65af0c2288c886928c609ec783c0fc40 assets/create/sounds.json 5d0cc4c0255dc241e61c173b31ddca70c88d08e4 data/create/advancements/aesthetics.json 187921fa131b06721bfaf63f2623a28c141aae9a data/create/advancements/andesite_alloy.json 0ea2db7173b5be28b289ea7c9a6a0cf5805c60c7 data/create/advancements/andesite_casing.json @@ -1674,7 +1672,6 @@ d1015e059a2f2008a364b6d045a011a6d671f20d data/create/advancements/copper_casing. 8e2a12a26218a46665c46f350ef9c3418a901988 data/create/advancements/crafter.json d1fbc14303c7327e9fc02e505e7e434591b7f785 data/create/advancements/crushing_wheel.json e9e1789de5cd5577a801a09d489a13f2c98779dc data/create/advancements/cuckoo.json -0761f3e12d587fec7a2ddf326b43969d262771e3 data/create/advancements/deforester.json 2a96fad5b44b62f233c9af5b4a637faf32ce24af data/create/advancements/deployer.json eb8e7c13163923d2f88c999c6eb5afa4b7d2426e data/create/advancements/dual_extendo_grip.json 04eaf829696d735244c0e4798dd3bdeb26e13a32 data/create/advancements/electron_tube.json @@ -1773,8 +1770,6 @@ c368cadffa9177fefb9e92ff4453b40bc8dd670d data/create/advancements/recipes/create 4bb60ef5e186f12a9d52e61319db8c78300c64ab data/create/advancements/recipes/create.base/blasting/zinc_ingot_from_ore.json dd487f98c411f1ff22cb7fc208b8cc24b27deb2f data/create/advancements/recipes/create.base/crafting/appliances/dough.json 51cdcf168087f47e4458eed7543d227da1ee5ca0 data/create/advancements/recipes/create.base/crafting/appliances/tree_fertilizer.json -eba09a9ca1c5c249517da9b3a883479fd6480ac6 data/create/advancements/recipes/create.base/crafting/curiosities/deforester.json -0479fa3c10130c799269c40df6b18deb3a3d8331 data/create/advancements/recipes/create.base/crafting/curiosities/handheld_blockzapper.json d531f87f425d199aee4777a588c1cd6cab6f5173 data/create/advancements/recipes/create.base/crafting/curiosities/minecart_coupling.json 2eef3201017af03f6a2f0f015645e3ff5e25d9c1 data/create/advancements/recipes/create.base/crafting/curiosities/wand_of_symmetry.json 80155fa8e28e7de87adad3dc2cd79564496d7ef7 data/create/advancements/recipes/create.base/crafting/kinetics/adjustable_chain_gearshift.json @@ -2365,13 +2360,11 @@ b69d174d7a5e9eab8ca013b66bc9d02244d7f9a3 data/create/advancements/spout.json 15f73da913c54cd2f945e4d7402fb8d587cbaa9f data/create/advancements/spout_potion.json 0efdaf483d84791044f085f79197b6bab3e15872 data/create/advancements/stressometer.json 1aceaa6e47709aa03f3d4f606fa5dcaacc899835 data/create/advancements/tunnel.json -42461143b64112fdf6f123b9fcd44b5457df3915 data/create/advancements/upgraded_zapper.json 4fef92dce84fa1a075db31fb33081f5fb8ec7e9e data/create/advancements/upward_chute.json fe37896bb804d2be9b8abf3744c5b9b7bc1c086e data/create/advancements/wand_of_symmetry.json 2c278dc6e6e4c12c0cfce22b5192844586a2d5c1 data/create/advancements/water_wheel.json d6b94fd499cb4fb0ae587b0e9e7088832f67fe01 data/create/advancements/windmill.json 4513d0c4dd40c948028a3fc8e6f3b4d0356c0a90 data/create/advancements/wrench.json -33c1224f4f6a7bb0a3439eb0f8b8af9341b62574 data/create/advancements/zapper.json 054392b614e410c6d1b37c546b4bfd36f50aec4a data/create/loot_tables/blocks/acacia_window.json 64b95066bf96a3f0de95919d526243ba4f5a3ade data/create/loot_tables/blocks/acacia_window_pane.json 113f225f01d45c420ee038e8aad3d6c5e836dea2 data/create/loot_tables/blocks/adjustable_chain_gearshift.json @@ -2846,8 +2839,6 @@ f7879d404d7a848d818278b4e788f285a9087e63 data/create/recipes/compacting/blaze_ca 19526da3a59fc136654ff1bc93c0251581f397a9 data/create/recipes/crafting/appliances/dough.json 7b5f863dda3d05a79cb85943a178eba0bd8a7dc7 data/create/recipes/crafting/appliances/slime_ball.json b159ba84428eee6ef6e23df1766f2a18f2c8a63e data/create/recipes/crafting/appliances/tree_fertilizer.json -8c00fe124ea516511f00a89bcf9e63a6d1fa47e4 data/create/recipes/crafting/curiosities/deforester.json -87a4a5ec53a0f8e125dfdbd77906a418a9b83d9c data/create/recipes/crafting/curiosities/handheld_blockzapper.json 660e92da2b1b6698b1c0df74bd74a56a25fb3eca data/create/recipes/crafting/curiosities/minecart_coupling.json fcbc04d0a7eaf820a74bc7e4736a4a581e0a9dff data/create/recipes/crafting/curiosities/wand_of_symmetry.json cc56d21a25286a9024e506dde9fa161230eaf46d data/create/recipes/crafting/kinetics/adjustable_chain_gearshift.json diff --git a/src/generated/resources/assets/create/lang/en_ud.json b/src/generated/resources/assets/create/lang/en_ud.json index 33c7d7480..5d42d7042 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -449,7 +449,6 @@ "item.create.crushed_tin_ore": "\u01DD\u0279O u\u0131\u27D8 p\u01DD\u0265sn\u0279\u0186", "item.create.crushed_uranium_ore": "\u01DD\u0279O \u026Fn\u0131u\u0250\u0279\u2229 p\u01DD\u0265sn\u0279\u0186", "item.create.crushed_zinc_ore": "\u01DD\u0279O \u0254u\u0131Z p\u01DD\u0265sn\u0279\u0186", - "item.create.deforester": "\u0279\u01DD\u0287s\u01DD\u0279o\u025F\u01DD\u15E1", "item.create.dough": "\u0265bno\u15E1", "item.create.electron_tube": "\u01DDqn\u27D8 uo\u0279\u0287\u0254\u01DD\u05DF\u018E", "item.create.empty_blaze_burner": "\u0279\u01DDu\u0279n\u15FA \u01DDz\u0250\u05DF\u15FA \u028E\u0287d\u026F\u018E", @@ -459,8 +458,7 @@ "item.create.furnace_minecart_contraption": "uo\u0131\u0287d\u0250\u0279\u0287uo\u0186 \u0287\u0279\u0250\u0254\u01DDu\u0131W \u01DD\u0254\u0250u\u0279n\u2132", "item.create.goggles": "s\u01DD\u05DFbbo\u2141 s,\u0279\u01DD\u01DDu\u0131bu\u018E", "item.create.golden_sheet": "\u0287\u01DD\u01DD\u0265S u\u01DDp\u05DFo\u2141", - "item.create.handheld_blockzapper": "\u0279\u01DDdd\u0250z\u029E\u0254o\u05DF\u15FA p\u05DF\u01DD\u0265pu\u0250H", - "item.create.handheld_worldshaper": "\u0279\u01DDd\u0250\u0265sp\u05DF\u0279oM p\u05DF\u01DD\u0265pu\u0250H", + "item.create.handheld_worldshaper": "\u0279\u01DDd\u0250\u0265sp\u05DF\u0279oM \u01DD\u028C\u0131\u0287\u0250\u01DD\u0279\u0186", "item.create.honey_bucket": "\u0287\u01DD\u029E\u0254n\u15FA \u028E\u01DDuoH", "item.create.honeyed_apple": "\u01DD\u05DFdd\u2C6F p\u01DD\u028E\u01DDuoH", "item.create.integrated_circuit": "\u0287\u0131n\u0254\u0279\u0131\u0186 p\u01DD\u0287\u0250\u0279b\u01DD\u0287uI", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index dde4ec38e..99e1675fc 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -455,7 +455,6 @@ "item.create.crushed_tin_ore": "Crushed Tin Ore", "item.create.crushed_uranium_ore": "Crushed Uranium Ore", "item.create.crushed_zinc_ore": "Crushed Zinc Ore", - "item.create.deforester": "Deforester", "item.create.dough": "Dough", "item.create.electron_tube": "Electron Tube", "item.create.empty_blaze_burner": "Empty Blaze Burner", @@ -465,8 +464,7 @@ "item.create.furnace_minecart_contraption": "Furnace Minecart Contraption", "item.create.goggles": "Engineer's Goggles", "item.create.golden_sheet": "Golden Sheet", - "item.create.handheld_blockzapper": "Handheld Blockzapper", - "item.create.handheld_worldshaper": "Handheld Worldshaper", + "item.create.handheld_worldshaper": "Creative Worldshaper", "item.create.honey_bucket": "Honey Bucket", "item.create.honeyed_apple": "Honeyed Apple", "item.create.integrated_circuit": "Integrated Circuit", @@ -644,14 +642,8 @@ "advancement.create.refined_radiance.desc": "Create Refined Radiance, a powerful chromatic substance.", "advancement.create.chromatic_age": "The Chromatic Age", "advancement.create.chromatic_age.desc": "Create casing blocks of the light and dark.", - "advancement.create.zapper": "Building With Style", - "advancement.create.zapper.desc": "Craft a Blockzapper. A radiant laser gun that helps you build.", - "advancement.create.upgraded_zapper": "Radiant Overdrive", - "advancement.create.upgraded_zapper.desc": "Create and activate a fully upgraded Blockzapper.", "advancement.create.wand_of_symmetry": "Radiant Mirrors", "advancement.create.wand_of_symmetry.desc": "Craft a Staff of Symmetry.", - "advancement.create.deforester": "Radiant Chopping", - "advancement.create.deforester.desc": "Craft a Deforester, and say goodbye to the local forest.", "advancement.create.extendo_grip": "Boioioing!", "advancement.create.extendo_grip.desc": "Get hold of an Extendo Grip.", "advancement.create.dual_extendo_grip": "Ultimate Boing-age", @@ -694,7 +686,6 @@ "create.recipe.automatic_shaped": "Automated Shaped Crafting", "create.recipe.block_cutting": "Block Cutting", "create.recipe.wood_cutting": "Wood Cutting", - "create.recipe.blockzapper_upgrade": "Handheld Blockzapper", "create.recipe.sandpaper_polishing": "Sandpaper Polishing", "create.recipe.mystery_conversion": "Mysterious Conversion", "create.recipe.spout_filling": "Filling by Spout", @@ -751,20 +742,16 @@ "create.orientation.alongZ": "Along Z", "create.orientation.alongX": "Along X", - "create.gui.blockzapper.title": "Handheld Blockzapper", - "create.gui.blockzapper.replaceMode": "Replace Mode", - "create.gui.blockzapper.searchDiagonal": "Follow Diagonals", - "create.gui.blockzapper.searchFuzzy": "Ignore Material Borders", - "create.gui.blockzapper.range": "Spread Range", - "create.gui.blockzapper.needsUpgradedAmplifier": "Requires Upgraded Amplifier", - "create.gui.blockzapper.patternSection": "Pattern", - "create.gui.blockzapper.pattern.solid": "Solid", - "create.gui.blockzapper.pattern.checkered": "Checkerboard", - "create.gui.blockzapper.pattern.inversecheckered": "Inverted Checkerboard", - "create.gui.blockzapper.pattern.chance25": "25% Roll", - "create.gui.blockzapper.pattern.chance50": "50% Roll", - "create.gui.blockzapper.pattern.chance75": "75% Roll", - "create.gui.terrainzapper.title": "Handheld Worldshaper", + "create.gui.terrainzapper.title": "Handheld Blockzapper", + "create.gui.terrainzapper.searchDiagonal": "Follow Diagonals", + "create.gui.terrainzapper.searchFuzzy": "Ignore Material Borders", + "create.gui.terrainzapper.patternSection": "Pattern", + "create.gui.terrainzapper.pattern.solid": "Solid", + "create.gui.terrainzapper.pattern.checkered": "Checkerboard", + "create.gui.terrainzapper.pattern.inversecheckered": "Inverted Checkerboard", + "create.gui.terrainzapper.pattern.chance25": "25% Roll", + "create.gui.terrainzapper.pattern.chance50": "50% Roll", + "create.gui.terrainzapper.pattern.chance75": "75% Roll", "create.gui.terrainzapper.placement": "Placement", "create.gui.terrainzapper.placement.merged": "Merged", "create.gui.terrainzapper.placement.attached": "Attached", @@ -773,6 +760,8 @@ "create.gui.terrainzapper.brush.cuboid": "Cuboid", "create.gui.terrainzapper.brush.sphere": "Sphere", "create.gui.terrainzapper.brush.cylinder": "Cylinder", + "create.gui.terrainzapper.brush.surface": "Surface", + "create.gui.terrainzapper.brush.cluster": "Cluster", "create.gui.terrainzapper.tool": "Tool", "create.gui.terrainzapper.tool.fill": "Fill", "create.gui.terrainzapper.tool.place": "Place", @@ -782,19 +771,8 @@ "create.gui.terrainzapper.tool.flatten": "Flatten", "create.terrainzapper.shiftRightClickToSet": "Shift-Right-Click to Select a Shape", - - "create.blockzapper.usingBlock": "Using: %1$s", - "create.blockzapper.componentUpgrades": "Component Upgrades:", - "create.blockzapper.component.body": "Body", - "create.blockzapper.component.amplifier": "Amplifier", - "create.blockzapper.component.accelerator": "Accelerator", - "create.blockzapper.component.retriever": "Retriever", - "create.blockzapper.component.scope": "Scope", - "create.blockzapper.componentTier.none": "None", - "create.blockzapper.componentTier.brass": "Brass", - "create.blockzapper.componentTier.chromatic": "Chromatic", - "create.blockzapper.leftClickToSet": "Left-Click a Block to set Material", - "create.blockzapper.empty": "Out of Blocks!", + "create.terrainzapper.usingBlock": "Using: %1$s", + "create.terrainzapper.leftClickToSet": "Left-Click a Block to set Material", "create.minecart_coupling.two_couplings_max": "Minecarts cannot have more than two couplings each", "create.minecart_coupling.unloaded": "Parts of your train seem to be in unloaded chunks", @@ -1158,9 +1136,9 @@ "create.subtitle.wrench_rotate": "Wrench used", "create.subtitle.mixing": "Mixing Noises", "create.subtitle.mechanical_press_activation_belt": "Mechanical Press bonks", - "create.subtitle.blockzapper_confirm": "Affirmative ding", + "create.subtitle.worldshaper_place": "Worldshaper zaps", "create.subtitle.depot_slide": "Item slides", - "create.subtitle.blockzapper_place": "Blockzapper zaps", + "create.subtitle.deny": "Declining boop", "create.subtitle.blaze_munch": "Blaze Burner munches", "create.subtitle.schematicannon_launch_block": "Schematicannon fires", "create.subtitle.funnel_flap": "Funnel Flaps", @@ -1169,11 +1147,11 @@ "create.subtitle.mechanical_press_activation": "Mechanical Press clangs", "create.subtitle.contraption_assemble": "Contraption moves", "create.subtitle.crafter_craft": "Crafter crafts", - "create.subtitle.blockzapper_deny": "Declining boop", "create.subtitle.cranking": "Hand Crank turns", "create.subtitle.crafter_click": "Crafter clicks", "create.subtitle.wrench_remove": "Component breaks", "create.subtitle.depot_plop": "Item lands", + "create.subtitle.confirm": "Affirmative ding", "_": "->------------------------] Item Descriptions [------------------------<-", @@ -1279,15 +1257,6 @@ "item.create.wand_of_symmetry.tooltip.control3": "R-Click while Sneaking", "item.create.wand_of_symmetry.tooltip.action3": "Opens the _Configuration Interface_", - "item.create.handheld_blockzapper.tooltip": "BLOCKZAPPER", - "item.create.handheld_blockzapper.tooltip.summary": "Novel gadget for placing or exchanging blocks at a distance.", - "item.create.handheld_blockzapper.tooltip.control1": "L-Click at Block", - "item.create.handheld_blockzapper.tooltip.action1": "Sets blocks placed by the tool to the targeted block.", - "item.create.handheld_blockzapper.tooltip.control2": "R-Click at Block", - "item.create.handheld_blockzapper.tooltip.action2": "_Places_ or _Replaces_ the targeted block.", - "item.create.handheld_blockzapper.tooltip.control3": "R-Click while Sneaking", - "item.create.handheld_blockzapper.tooltip.action3": "Opens the _Configuration Interface_.", - "item.create.handheld_worldshaper.tooltip": "HANDHELD WORLDSHAPER", "item.create.handheld_worldshaper.tooltip.summary": "Handy tool for creating _landscapes_ and _terrain features_.", "item.create.handheld_worldshaper.tooltip.control1": "L-Click at Block", @@ -1302,9 +1271,6 @@ "item.create.tree_fertilizer.tooltip.condition1": "When used on a Sapling", "item.create.tree_fertilizer.tooltip.behaviour1": "Grows Trees _regardless_ of their _spacing conditions_", - "item.create.deforester.tooltip": "DEFORESTER", - "item.create.deforester.tooltip.summary": "A _radiant axe_ able to chop down trees in a split second.", - "item.create.extendo_grip.tooltip": "EXTENDO GRIP", "item.create.extendo_grip.tooltip.summary": "Boioioing! Greatly _increases reach distance_ of the wielder.", "item.create.extendo_grip.tooltip.condition1": "When in Off-Hand", 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 1d4498a2c..d28a04eb6 100644 --- a/src/generated/resources/assets/create/lang/unfinished/de_de.json +++ b/src/generated/resources/assets/create/lang/unfinished/de_de.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 927", + "_": "Missing Localizations: 935", "_": "->------------------------] Game Elements [------------------------<-", @@ -456,7 +456,6 @@ "item.create.crushed_tin_ore": "Zerkleinertes Zinnerz", "item.create.crushed_uranium_ore": "Zerkleinertes Uranerz", "item.create.crushed_zinc_ore": "Zerkleinertes Zinkerz", - "item.create.deforester": "Entforster", "item.create.dough": "Teig", "item.create.electron_tube": "Elektronenröhre", "item.create.empty_blaze_burner": "Leerer Lohenbrenner", @@ -466,7 +465,6 @@ "item.create.furnace_minecart_contraption": "Antriebsloren Vorrichtung", "item.create.goggles": "Ingenieursbrille", "item.create.golden_sheet": "Goldblech", - "item.create.handheld_blockzapper": "Blockpistole", "item.create.handheld_worldshaper": "Geländeformer", "item.create.honey_bucket": "Honigeimer", "item.create.honeyed_apple": "Honigapfel", @@ -645,14 +643,8 @@ "advancement.create.refined_radiance.desc": "UNLOCALIZED: Create Refined Radiance, a powerful chromatic substance.", "advancement.create.chromatic_age": "UNLOCALIZED: The Chromatic Age", "advancement.create.chromatic_age.desc": "UNLOCALIZED: Create casing blocks of the light and dark.", - "advancement.create.zapper": "UNLOCALIZED: Building With Style", - "advancement.create.zapper.desc": "UNLOCALIZED: Craft a Blockzapper. A radiant laser gun that helps you build.", - "advancement.create.upgraded_zapper": "UNLOCALIZED: Radiant Overdrive", - "advancement.create.upgraded_zapper.desc": "UNLOCALIZED: Create and activate a fully upgraded Blockzapper.", "advancement.create.wand_of_symmetry": "UNLOCALIZED: Radiant Mirrors", "advancement.create.wand_of_symmetry.desc": "UNLOCALIZED: Craft a Staff of Symmetry.", - "advancement.create.deforester": "UNLOCALIZED: Radiant Chopping", - "advancement.create.deforester.desc": "UNLOCALIZED: Craft a Deforester, and say goodbye to the local forest.", "advancement.create.extendo_grip": "Boioioing!", "advancement.create.extendo_grip.desc": "Beschaffe einen Extendo Griff.", "advancement.create.dual_extendo_grip": "Ultimatives Boing-Zeitalter", @@ -695,7 +687,6 @@ "create.recipe.automatic_shaped": "Automatisiertes Geformtes Bauen", "create.recipe.block_cutting": "Schneiden von Blöcken", "create.recipe.wood_cutting": "Schneiden von Holz", - "create.recipe.blockzapper_upgrade": "Blockpistole", "create.recipe.sandpaper_polishing": "Schleifen", "create.recipe.mystery_conversion": "Mysteriöse Konvertierung", "create.recipe.spout_filling": "Befüllung per Ausguss", @@ -752,20 +743,16 @@ "create.orientation.alongZ": "Entlang Z", "create.orientation.alongX": "Entlang X", - "create.gui.blockzapper.title": "Blockpistole", - "create.gui.blockzapper.replaceMode": "Austauschmodus", - "create.gui.blockzapper.searchDiagonal": "Diagonalen folgen", - "create.gui.blockzapper.searchFuzzy": "Materialgrenzen ignorieren", - "create.gui.blockzapper.range": "Reichweite", - "create.gui.blockzapper.needsUpgradedAmplifier": "Benötigt besseren Verstärker", - "create.gui.blockzapper.patternSection": "Muster", - "create.gui.blockzapper.pattern.solid": "Fest", - "create.gui.blockzapper.pattern.checkered": "Schachbrett", - "create.gui.blockzapper.pattern.inversecheckered": "Inverses Schachbrett", - "create.gui.blockzapper.pattern.chance25": "25%-Chance", - "create.gui.blockzapper.pattern.chance50": "50%-Chance", - "create.gui.blockzapper.pattern.chance75": "75%-Chance", "create.gui.terrainzapper.title": "Tragbarer Geländeformer", + "create.gui.terrainzapper.searchDiagonal": "UNLOCALIZED: Follow Diagonals", + "create.gui.terrainzapper.searchFuzzy": "UNLOCALIZED: Ignore Material Borders", + "create.gui.terrainzapper.patternSection": "UNLOCALIZED: Pattern", + "create.gui.terrainzapper.pattern.solid": "UNLOCALIZED: Solid", + "create.gui.terrainzapper.pattern.checkered": "UNLOCALIZED: Checkerboard", + "create.gui.terrainzapper.pattern.inversecheckered": "UNLOCALIZED: Inverted Checkerboard", + "create.gui.terrainzapper.pattern.chance25": "UNLOCALIZED: 25% Roll", + "create.gui.terrainzapper.pattern.chance50": "UNLOCALIZED: 50% Roll", + "create.gui.terrainzapper.pattern.chance75": "UNLOCALIZED: 75% Roll", "create.gui.terrainzapper.placement": "Platzierung", "create.gui.terrainzapper.placement.merged": "Zusammengeführt", "create.gui.terrainzapper.placement.attached": "Angefügt", @@ -774,6 +761,8 @@ "create.gui.terrainzapper.brush.cuboid": "Quader", "create.gui.terrainzapper.brush.sphere": "Kugel", "create.gui.terrainzapper.brush.cylinder": "Zylinder", + "create.gui.terrainzapper.brush.surface": "UNLOCALIZED: Surface", + "create.gui.terrainzapper.brush.cluster": "UNLOCALIZED: Cluster", "create.gui.terrainzapper.tool": "Werkzeug", "create.gui.terrainzapper.tool.fill": "Füllen", "create.gui.terrainzapper.tool.place": "Platzieren", @@ -783,19 +772,8 @@ "create.gui.terrainzapper.tool.flatten": "Abflachen", "create.terrainzapper.shiftRightClickToSet": "Shift-Rechts-Klick um eine Form auszuwählen", - - "create.blockzapper.usingBlock": "Auswahl: %1$s", - "create.blockzapper.componentUpgrades": "Bauteil-Upgrades:", - "create.blockzapper.component.body": "Rumpf", - "create.blockzapper.component.amplifier": "Verstärker", - "create.blockzapper.component.accelerator": "Beschleuniger", - "create.blockzapper.component.retriever": "Empfänger", - "create.blockzapper.component.scope": "Fernrohr", - "create.blockzapper.componentTier.none": "Nichts", - "create.blockzapper.componentTier.brass": "Messing", - "create.blockzapper.componentTier.chromatic": "Chromatisch", - "create.blockzapper.leftClickToSet": "Linksklick auf einen Block zum Auswählen", - "create.blockzapper.empty": "Keine Blöcke übrig!", + "create.terrainzapper.usingBlock": "UNLOCALIZED: Using: %1$s", + "create.terrainzapper.leftClickToSet": "UNLOCALIZED: Left-Click a Block to set Material", "create.minecart_coupling.two_couplings_max": "Jede Lore kann nicht mehr als zwei Kupplungen haben", "create.minecart_coupling.unloaded": "Teile des Zuges scheinen in nicht geladenen Chunks zu sein", @@ -1159,9 +1137,9 @@ "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", - "create.subtitle.blockzapper_confirm": "Bestätigendes Ding", + "create.subtitle.worldshaper_place": "UNLOCALIZED: Worldshaper zaps", "create.subtitle.depot_slide": "UNLOCALIZED: Item slides", - "create.subtitle.blockzapper_place": "Blöcke zappen an Ort und Stelle", + "create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.blaze_munch": "Lohe kaut glücklich", "create.subtitle.schematicannon_launch_block": "Bauplankanone schießt", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", @@ -1170,11 +1148,11 @@ "create.subtitle.mechanical_press_activation": "Mechanische Presse wird aktiviert", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", - "create.subtitle.blockzapper_deny": "Ablehnendes Boop", "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", "create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks", "create.subtitle.depot_plop": "UNLOCALIZED: Item lands", + "create.subtitle.confirm": "UNLOCALIZED: Affirmative ding", "_": "->------------------------] Item Descriptions [------------------------<-", @@ -1280,15 +1258,6 @@ "item.create.wand_of_symmetry.tooltip.control3": "R-Klick beim Schleichen", "item.create.wand_of_symmetry.tooltip.action3": "Öffnet das _Konfigurationsmenü_", - "item.create.handheld_blockzapper.tooltip": "BLOCKPISTOLE", - "item.create.handheld_blockzapper.tooltip.summary": "Ermöglicht das Platzieren und Austauschen von Blöcken aus großer Entfernung.", - "item.create.handheld_blockzapper.tooltip.control1": "L-Klick auf Block", - "item.create.handheld_blockzapper.tooltip.action1": "Legt die von dem Werkzeug platzierten Blöcke auf den angeschauten Block fest.", - "item.create.handheld_blockzapper.tooltip.control2": "R-Klick auf Block", - "item.create.handheld_blockzapper.tooltip.action2": "_Platziert_ oder _Ersetzt_ den ausgewählten Block.", - "item.create.handheld_blockzapper.tooltip.control3": "R-Klick beim Schleichen", - "item.create.handheld_blockzapper.tooltip.action3": "Öffnet das _Konfigurationsmenü_", - "item.create.handheld_worldshaper.tooltip": "UNLOCALIZED: HANDHELD WORLDSHAPER", "item.create.handheld_worldshaper.tooltip.summary": "UNLOCALIZED: Handy tool for creating _landscapes_ and _terrain features_.", "item.create.handheld_worldshaper.tooltip.control1": "UNLOCALIZED: L-Click at Block", @@ -1303,9 +1272,6 @@ "item.create.tree_fertilizer.tooltip.condition1": "Wenn auf einen Setzling angewendet", "item.create.tree_fertilizer.tooltip.behaviour1": "Lässt Bäume unabhängig vom Platz um sie herum wachsen", - "item.create.deforester.tooltip": "UNLOCALIZED: DEFORESTER", - "item.create.deforester.tooltip.summary": "UNLOCALIZED: A _radiant axe_ able to chop down trees in a split second.", - "item.create.extendo_grip.tooltip": "UNLOCALIZED: EXTENDO GRIP", "item.create.extendo_grip.tooltip.summary": "UNLOCALIZED: Boioioing! Greatly _increases reach distance_ of the wielder.", "item.create.extendo_grip.tooltip.condition1": "UNLOCALIZED: When in Off-Hand", 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 012220dfa..838d09dcf 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_es.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_es.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 620", + "_": "Missing Localizations: 636", "_": "->------------------------] Game Elements [------------------------<-", @@ -456,7 +456,6 @@ "item.create.crushed_tin_ore": "Mineral de estaño molido", "item.create.crushed_uranium_ore": "Mineral de uranio molido", "item.create.crushed_zinc_ore": "Mineral de zinc molido", - "item.create.deforester": "Deforestador", "item.create.dough": "Masilla", "item.create.electron_tube": "Tubo de electrones", "item.create.empty_blaze_burner": "Quemador de Blaze vacío", @@ -466,7 +465,6 @@ "item.create.furnace_minecart_contraption": "Artilugio de vagoneta de horno", "item.create.goggles": "Gafas del Ingeniero", "item.create.golden_sheet": "Lámina de oro", - "item.create.handheld_blockzapper": "Blockzapper", "item.create.handheld_worldshaper": "Worldshaper", "item.create.honey_bucket": "Cubo de miel", "item.create.honeyed_apple": "UNLOCALIZED: Honeyed Apple", @@ -645,14 +643,8 @@ "advancement.create.refined_radiance.desc": "Crea un Resplandor refinado, una poderosa sustancia cromática.", "advancement.create.chromatic_age": "La edad cromática", "advancement.create.chromatic_age.desc": "Crear bloques de revestimiento de la luz y la oscuridad.", - "advancement.create.zapper": "Construir con estilo", - "advancement.create.zapper.desc": "Construye un Blockzapper. Una pistola láser radiante que te ayuda a construir.", - "advancement.create.upgraded_zapper": "Radiante sobrecarga", - "advancement.create.upgraded_zapper.desc": "Crear y activar un Blockzapper totalmente mejorado.", "advancement.create.wand_of_symmetry": "Espejos radiantes", "advancement.create.wand_of_symmetry.desc": "Crear un bastón de simetría.", - "advancement.create.deforester": "Picado radiante", - "advancement.create.deforester.desc": "Crea un Deforestador y despídete del bosque local.", "advancement.create.extendo_grip": "Boioioing!", "advancement.create.extendo_grip.desc": "Hazte con un Agarre extentido.", "advancement.create.dual_extendo_grip": "La última edad del boing", @@ -695,7 +687,6 @@ "create.recipe.automatic_shaped": "Elaboración automatizada de productos con forma", "create.recipe.block_cutting": "Corte de bloques", "create.recipe.wood_cutting": "Corte de maderas", - "create.recipe.blockzapper_upgrade": "Blockzapper", "create.recipe.sandpaper_polishing": "Pulido con papel de lija", "create.recipe.mystery_conversion": "Conversión misteriosa", "create.recipe.spout_filling": "Llenar por el pico", @@ -752,20 +743,16 @@ "create.orientation.alongZ": "A lo largo de Z", "create.orientation.alongX": "A lo largo de X", - "create.gui.blockzapper.title": "Blockzapper", - "create.gui.blockzapper.replaceMode": "Modo de sustitución", - "create.gui.blockzapper.searchDiagonal": "Seguir las diagonales", - "create.gui.blockzapper.searchFuzzy": "Ignorar los bordes del material", - "create.gui.blockzapper.range": "Alcance del margen de maniobra", - "create.gui.blockzapper.needsUpgradedAmplifier": "Requiere un amplificador mejorado", - "create.gui.blockzapper.patternSection": "Patrón", - "create.gui.blockzapper.pattern.solid": "Sólido", - "create.gui.blockzapper.pattern.checkered": "Tablero de ajedrez", - "create.gui.blockzapper.pattern.inversecheckered": "Tablero de ajedrez invertido", - "create.gui.blockzapper.pattern.chance25": "25% Roll", - "create.gui.blockzapper.pattern.chance50": "50% Roll", - "create.gui.blockzapper.pattern.chance75": "75% Roll", "create.gui.terrainzapper.title": "Worldshaper", + "create.gui.terrainzapper.searchDiagonal": "UNLOCALIZED: Follow Diagonals", + "create.gui.terrainzapper.searchFuzzy": "UNLOCALIZED: Ignore Material Borders", + "create.gui.terrainzapper.patternSection": "UNLOCALIZED: Pattern", + "create.gui.terrainzapper.pattern.solid": "UNLOCALIZED: Solid", + "create.gui.terrainzapper.pattern.checkered": "UNLOCALIZED: Checkerboard", + "create.gui.terrainzapper.pattern.inversecheckered": "UNLOCALIZED: Inverted Checkerboard", + "create.gui.terrainzapper.pattern.chance25": "UNLOCALIZED: 25% Roll", + "create.gui.terrainzapper.pattern.chance50": "UNLOCALIZED: 50% Roll", + "create.gui.terrainzapper.pattern.chance75": "UNLOCALIZED: 75% Roll", "create.gui.terrainzapper.placement": "Colocación", "create.gui.terrainzapper.placement.merged": "Fusionado", "create.gui.terrainzapper.placement.attached": "Adjuntado", @@ -774,6 +761,8 @@ "create.gui.terrainzapper.brush.cuboid": "Cuboide", "create.gui.terrainzapper.brush.sphere": "Esfera", "create.gui.terrainzapper.brush.cylinder": "Cilindro", + "create.gui.terrainzapper.brush.surface": "UNLOCALIZED: Surface", + "create.gui.terrainzapper.brush.cluster": "UNLOCALIZED: Cluster", "create.gui.terrainzapper.tool": "Herramienta", "create.gui.terrainzapper.tool.fill": "Llenar", "create.gui.terrainzapper.tool.place": "Sitio", @@ -783,19 +772,8 @@ "create.gui.terrainzapper.tool.flatten": "Aplanar", "create.terrainzapper.shiftRightClickToSet": "Shift+Clic con el botón derecho para seleccionar una forma", - - "create.blockzapper.usingBlock": "Utilizando: %1$s", - "create.blockzapper.componentUpgrades": "Mejoras de componentes:", - "create.blockzapper.component.body": "Cuerpo", - "create.blockzapper.component.amplifier": "Amplificador", - "create.blockzapper.component.accelerator": "Acelerador", - "create.blockzapper.component.retriever": "Recuperador", - "create.blockzapper.component.scope": "Mira telescópica", - "create.blockzapper.componentTier.none": "Ninguno", - "create.blockzapper.componentTier.brass": "Latón", - "create.blockzapper.componentTier.chromatic": "Cromático", - "create.blockzapper.leftClickToSet": "Clic izquierdo en un bloque para establecer el material", - "create.blockzapper.empty": "Sin bloques!", + "create.terrainzapper.usingBlock": "UNLOCALIZED: Using: %1$s", + "create.terrainzapper.leftClickToSet": "UNLOCALIZED: Left-Click a Block to set Material", "create.minecart_coupling.two_couplings_max": "Las vagonetas no pueden tener más de dos enganches cada una", "create.minecart_coupling.unloaded": "Algunas partes de su tren parecen estar en chunks no cargados", @@ -1159,9 +1137,9 @@ "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", - "create.subtitle.blockzapper_confirm": "Ding afirmativo", + "create.subtitle.worldshaper_place": "UNLOCALIZED: Worldshaper zaps", "create.subtitle.depot_slide": "UNLOCALIZED: Item slides", - "create.subtitle.blockzapper_place": "Los bloques se colocan en su sitio", + "create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.blaze_munch": "Blaze mastica felizmente", "create.subtitle.schematicannon_launch_block": "Disparos de Schematicannon", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", @@ -1170,11 +1148,11 @@ "create.subtitle.mechanical_press_activation": "La Prensa Mecánica se activa", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", - "create.subtitle.blockzapper_deny": "Boop declinante", "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", "create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks", "create.subtitle.depot_plop": "UNLOCALIZED: Item lands", + "create.subtitle.confirm": "UNLOCALIZED: Affirmative ding", "_": "->------------------------] Item Descriptions [------------------------<-", @@ -1280,15 +1258,6 @@ "item.create.wand_of_symmetry.tooltip.control3": "Click derecho mientras se agacha", "item.create.wand_of_symmetry.tooltip.action3": "Abre la _Interfaz de Configuración_", - "item.create.handheld_blockzapper.tooltip": "BLOCKZAPPER", - "item.create.handheld_blockzapper.tooltip.summary": "Novedoso artefacto para colocar o intercambiar bloques a distancia", - "item.create.handheld_blockzapper.tooltip.control1": "Click izquierdo en un bloque", - "item.create.handheld_blockzapper.tooltip.action1": "Establece los bloques colocados por la herramienta en el bloque objetivo", - "item.create.handheld_blockzapper.tooltip.control2": "Click derecho en un bloque", - "item.create.handheld_blockzapper.tooltip.action2": "_Coloca_ o _Reemplaza_ el bloque objetivo", - "item.create.handheld_blockzapper.tooltip.control3": "Click derecho mientras se agacha", - "item.create.handheld_blockzapper.tooltip.action3": "Abre la _Interfaz de Configuración_", - "item.create.handheld_worldshaper.tooltip": "WORLDSHAPER", "item.create.handheld_worldshaper.tooltip.summary": "Práctica herramienta para crear _paisajes_ y _características del terreno_", "item.create.handheld_worldshaper.tooltip.control1": "Click izquierdo en un bloque", @@ -1303,9 +1272,6 @@ "item.create.tree_fertilizer.tooltip.condition1": "Cuando se utiliza en un árbol joven", "item.create.tree_fertilizer.tooltip.behaviour1": "Hace crecer los árboles _independientemente_ de sus condiciones de _espacio_", - "item.create.deforester.tooltip": "DEFORESTADOR", - "item.create.deforester.tooltip.summary": "Un hacha _radiante_ capaz de talar árboles en una fracción de segundo", - "item.create.extendo_grip.tooltip": "AGARRE EXTENDIDO", "item.create.extendo_grip.tooltip.summary": "¡Boioioing! Aumenta enormemente la _distancia de alcance_ del portador", "item.create.extendo_grip.tooltip.condition1": "Cuando está fuera de la mano", 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 4fd59a9f5..5e4233492 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_mx.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_mx.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1278", + "_": "Missing Localizations: 1259", "_": "->------------------------] Game Elements [------------------------<-", @@ -456,7 +456,6 @@ "item.create.crushed_tin_ore": "Mineral de Estaño Molido", "item.create.crushed_uranium_ore": "Mineral de Uranio Molido", "item.create.crushed_zinc_ore": "Mineral de Zinc Molido", - "item.create.deforester": "Deforestador", "item.create.dough": "Masa", "item.create.electron_tube": "Válvula Electrónica", "item.create.empty_blaze_burner": "Quemador de Blaze Vacío", @@ -466,7 +465,6 @@ "item.create.furnace_minecart_contraption": "Artefacto de Vagón con Horno", "item.create.goggles": "Gafas de Protección para Ingenieros", "item.create.golden_sheet": "Lámina de Oro", - "item.create.handheld_blockzapper": "Pistola de Manipulación de Bloques", "item.create.handheld_worldshaper": "Pistola de Manipulación de Mundo", "item.create.honey_bucket": "Cubeta de Miel", "item.create.honeyed_apple": "UNLOCALIZED: Honeyed Apple", @@ -645,14 +643,8 @@ "advancement.create.refined_radiance.desc": "UNLOCALIZED: Create Refined Radiance, a powerful chromatic substance.", "advancement.create.chromatic_age": "UNLOCALIZED: The Chromatic Age", "advancement.create.chromatic_age.desc": "UNLOCALIZED: Create casing blocks of the light and dark.", - "advancement.create.zapper": "UNLOCALIZED: Building With Style", - "advancement.create.zapper.desc": "UNLOCALIZED: Craft a Blockzapper. A radiant laser gun that helps you build.", - "advancement.create.upgraded_zapper": "UNLOCALIZED: Radiant Overdrive", - "advancement.create.upgraded_zapper.desc": "UNLOCALIZED: Create and activate a fully upgraded Blockzapper.", "advancement.create.wand_of_symmetry": "UNLOCALIZED: Radiant Mirrors", "advancement.create.wand_of_symmetry.desc": "UNLOCALIZED: Craft a Staff of Symmetry.", - "advancement.create.deforester": "UNLOCALIZED: Radiant Chopping", - "advancement.create.deforester.desc": "UNLOCALIZED: Craft a Deforester, and say goodbye to the local forest.", "advancement.create.extendo_grip": "UNLOCALIZED: Boioioing!", "advancement.create.extendo_grip.desc": "UNLOCALIZED: Get hold of an Extendo Grip.", "advancement.create.dual_extendo_grip": "UNLOCALIZED: Ultimate Boing-age", @@ -695,7 +687,6 @@ "create.recipe.automatic_shaped": "UNLOCALIZED: Automated Shaped Crafting", "create.recipe.block_cutting": "UNLOCALIZED: Block Cutting", "create.recipe.wood_cutting": "UNLOCALIZED: Wood Cutting", - "create.recipe.blockzapper_upgrade": "UNLOCALIZED: Handheld Blockzapper", "create.recipe.sandpaper_polishing": "UNLOCALIZED: Sandpaper Polishing", "create.recipe.mystery_conversion": "UNLOCALIZED: Mysterious Conversion", "create.recipe.spout_filling": "UNLOCALIZED: Filling by Spout", @@ -752,20 +743,16 @@ "create.orientation.alongZ": "UNLOCALIZED: Along Z", "create.orientation.alongX": "UNLOCALIZED: Along X", - "create.gui.blockzapper.title": "UNLOCALIZED: Handheld Blockzapper", - "create.gui.blockzapper.replaceMode": "UNLOCALIZED: Replace Mode", - "create.gui.blockzapper.searchDiagonal": "UNLOCALIZED: Follow Diagonals", - "create.gui.blockzapper.searchFuzzy": "UNLOCALIZED: Ignore Material Borders", - "create.gui.blockzapper.range": "UNLOCALIZED: Spread Range", - "create.gui.blockzapper.needsUpgradedAmplifier": "UNLOCALIZED: Requires Upgraded Amplifier", - "create.gui.blockzapper.patternSection": "UNLOCALIZED: Pattern", - "create.gui.blockzapper.pattern.solid": "UNLOCALIZED: Solid", - "create.gui.blockzapper.pattern.checkered": "UNLOCALIZED: Checkerboard", - "create.gui.blockzapper.pattern.inversecheckered": "UNLOCALIZED: Inverted Checkerboard", - "create.gui.blockzapper.pattern.chance25": "UNLOCALIZED: 25% Roll", - "create.gui.blockzapper.pattern.chance50": "UNLOCALIZED: 50% Roll", - "create.gui.blockzapper.pattern.chance75": "UNLOCALIZED: 75% Roll", - "create.gui.terrainzapper.title": "UNLOCALIZED: Handheld Worldshaper", + "create.gui.terrainzapper.title": "UNLOCALIZED: Handheld Blockzapper", + "create.gui.terrainzapper.searchDiagonal": "UNLOCALIZED: Follow Diagonals", + "create.gui.terrainzapper.searchFuzzy": "UNLOCALIZED: Ignore Material Borders", + "create.gui.terrainzapper.patternSection": "UNLOCALIZED: Pattern", + "create.gui.terrainzapper.pattern.solid": "UNLOCALIZED: Solid", + "create.gui.terrainzapper.pattern.checkered": "UNLOCALIZED: Checkerboard", + "create.gui.terrainzapper.pattern.inversecheckered": "UNLOCALIZED: Inverted Checkerboard", + "create.gui.terrainzapper.pattern.chance25": "UNLOCALIZED: 25% Roll", + "create.gui.terrainzapper.pattern.chance50": "UNLOCALIZED: 50% Roll", + "create.gui.terrainzapper.pattern.chance75": "UNLOCALIZED: 75% Roll", "create.gui.terrainzapper.placement": "UNLOCALIZED: Placement", "create.gui.terrainzapper.placement.merged": "UNLOCALIZED: Merged", "create.gui.terrainzapper.placement.attached": "UNLOCALIZED: Attached", @@ -774,6 +761,8 @@ "create.gui.terrainzapper.brush.cuboid": "UNLOCALIZED: Cuboid", "create.gui.terrainzapper.brush.sphere": "UNLOCALIZED: Sphere", "create.gui.terrainzapper.brush.cylinder": "UNLOCALIZED: Cylinder", + "create.gui.terrainzapper.brush.surface": "UNLOCALIZED: Surface", + "create.gui.terrainzapper.brush.cluster": "UNLOCALIZED: Cluster", "create.gui.terrainzapper.tool": "UNLOCALIZED: Tool", "create.gui.terrainzapper.tool.fill": "UNLOCALIZED: Fill", "create.gui.terrainzapper.tool.place": "UNLOCALIZED: Place", @@ -783,19 +772,8 @@ "create.gui.terrainzapper.tool.flatten": "UNLOCALIZED: Flatten", "create.terrainzapper.shiftRightClickToSet": "UNLOCALIZED: Shift-Right-Click to Select a Shape", - - "create.blockzapper.usingBlock": "UNLOCALIZED: Using: %1$s", - "create.blockzapper.componentUpgrades": "UNLOCALIZED: Component Upgrades:", - "create.blockzapper.component.body": "UNLOCALIZED: Body", - "create.blockzapper.component.amplifier": "UNLOCALIZED: Amplifier", - "create.blockzapper.component.accelerator": "UNLOCALIZED: Accelerator", - "create.blockzapper.component.retriever": "UNLOCALIZED: Retriever", - "create.blockzapper.component.scope": "UNLOCALIZED: Scope", - "create.blockzapper.componentTier.none": "UNLOCALIZED: None", - "create.blockzapper.componentTier.brass": "UNLOCALIZED: Brass", - "create.blockzapper.componentTier.chromatic": "UNLOCALIZED: Chromatic", - "create.blockzapper.leftClickToSet": "UNLOCALIZED: Left-Click a Block to set Material", - "create.blockzapper.empty": "UNLOCALIZED: Out of Blocks!", + "create.terrainzapper.usingBlock": "UNLOCALIZED: Using: %1$s", + "create.terrainzapper.leftClickToSet": "UNLOCALIZED: Left-Click a Block to set Material", "create.minecart_coupling.two_couplings_max": "UNLOCALIZED: Minecarts cannot have more than two couplings each", "create.minecart_coupling.unloaded": "UNLOCALIZED: Parts of your train seem to be in unloaded chunks", @@ -1159,9 +1137,9 @@ "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", - "create.subtitle.blockzapper_confirm": "UNLOCALIZED: Affirmative ding", + "create.subtitle.worldshaper_place": "UNLOCALIZED: Worldshaper zaps", "create.subtitle.depot_slide": "UNLOCALIZED: Item slides", - "create.subtitle.blockzapper_place": "UNLOCALIZED: Blockzapper zaps", + "create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.blaze_munch": "UNLOCALIZED: Blaze Burner munches", "create.subtitle.schematicannon_launch_block": "UNLOCALIZED: Schematicannon fires", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", @@ -1170,11 +1148,11 @@ "create.subtitle.mechanical_press_activation": "UNLOCALIZED: Mechanical Press clangs", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", - "create.subtitle.blockzapper_deny": "UNLOCALIZED: Declining boop", "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", "create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks", "create.subtitle.depot_plop": "UNLOCALIZED: Item lands", + "create.subtitle.confirm": "UNLOCALIZED: Affirmative ding", "_": "->------------------------] Item Descriptions [------------------------<-", @@ -1280,15 +1258,6 @@ "item.create.wand_of_symmetry.tooltip.control3": "Click Derecho cuando se esta agachado", "item.create.wand_of_symmetry.tooltip.action3": "Abre la _Interfaz_ _de_ _Configuración_", - "item.create.handheld_blockzapper.tooltip": "BLOCKZAPPER", - "item.create.handheld_blockzapper.tooltip.summary": "Novedoso artilugio para colocar o intercambiar bloques a distancia.", - "item.create.handheld_blockzapper.tooltip.control1": "Click Izquierdo a un bloque", - "item.create.handheld_blockzapper.tooltip.action1": "Establece los bloques que serán colocados por la herramienta en el bloque objetivo.", - "item.create.handheld_blockzapper.tooltip.control2": "Click Derecho en un bloque", - "item.create.handheld_blockzapper.tooltip.action2": "_Coloca_ o _reemplaza_ el bloque objetivo.", - "item.create.handheld_blockzapper.tooltip.control3": "Click Derecho mientras se está agachado", - "item.create.handheld_blockzapper.tooltip.action3": "Abre la _Interfaz_ _de_ _Configuración._", - "item.create.handheld_worldshaper.tooltip": "HANDHELD WORLDSHAPER", "item.create.handheld_worldshaper.tooltip.summary": "Una herramienta útil para crear _paisajes_ y _características_ en el _terreno._", "item.create.handheld_worldshaper.tooltip.control1": "Click Izquierdo a un bloque", @@ -1303,9 +1272,6 @@ "item.create.tree_fertilizer.tooltip.condition1": "Cuando se usa en un retoño de árbol", "item.create.tree_fertilizer.tooltip.behaviour1": "Hace crecer los árboles, sin importar el espacio entre ellos.", - "item.create.deforester.tooltip": "DEFORESTER", - "item.create.deforester.tooltip.summary": "Un _hacha_ _radiante_ capaz de cortar árboles en una fracción de segundo.", - "item.create.extendo_grip.tooltip": "EXTENDO GRIP", "item.create.extendo_grip.tooltip.summary": "Boioioing! En gran medida, _aumenta_ _la_ _distancia_ _de_ _alcance_ del portador.", "item.create.extendo_grip.tooltip.condition1": "Cuando está en la mano secundaria", 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 b59bbd5f4..5dbf5571b 100644 --- a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json +++ b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1177", + "_": "Missing Localizations: 1187", "_": "->------------------------] Game Elements [------------------------<-", @@ -456,7 +456,6 @@ "item.create.crushed_tin_ore": "Etain concassé", "item.create.crushed_uranium_ore": "Uranium concassé", "item.create.crushed_zinc_ore": "Zinc concassé", - "item.create.deforester": "Déforesteur", "item.create.dough": "Pâte", "item.create.electron_tube": "Tube électronique", "item.create.empty_blaze_burner": "Brûleur à blaze vide", @@ -466,7 +465,6 @@ "item.create.furnace_minecart_contraption": "Engin de wagon avec fourneau", "item.create.goggles": "Lunettes d'ingénieur", "item.create.golden_sheet": "Feuille d'or", - "item.create.handheld_blockzapper": "Blockzappeur portable", "item.create.handheld_worldshaper": "Térraformeur portable", "item.create.honey_bucket": "Seau de miel", "item.create.honeyed_apple": "UNLOCALIZED: Honeyed Apple", @@ -645,14 +643,8 @@ "advancement.create.refined_radiance.desc": "UNLOCALIZED: Create Refined Radiance, a powerful chromatic substance.", "advancement.create.chromatic_age": "UNLOCALIZED: The Chromatic Age", "advancement.create.chromatic_age.desc": "UNLOCALIZED: Create casing blocks of the light and dark.", - "advancement.create.zapper": "UNLOCALIZED: Building With Style", - "advancement.create.zapper.desc": "UNLOCALIZED: Craft a Blockzapper. A radiant laser gun that helps you build.", - "advancement.create.upgraded_zapper": "UNLOCALIZED: Radiant Overdrive", - "advancement.create.upgraded_zapper.desc": "UNLOCALIZED: Create and activate a fully upgraded Blockzapper.", "advancement.create.wand_of_symmetry": "UNLOCALIZED: Radiant Mirrors", "advancement.create.wand_of_symmetry.desc": "UNLOCALIZED: Craft a Staff of Symmetry.", - "advancement.create.deforester": "UNLOCALIZED: Radiant Chopping", - "advancement.create.deforester.desc": "UNLOCALIZED: Craft a Deforester, and say goodbye to the local forest.", "advancement.create.extendo_grip": "UNLOCALIZED: Boioioing!", "advancement.create.extendo_grip.desc": "UNLOCALIZED: Get hold of an Extendo Grip.", "advancement.create.dual_extendo_grip": "UNLOCALIZED: Ultimate Boing-age", @@ -695,7 +687,6 @@ "create.recipe.automatic_shaped": "UNLOCALIZED: Automated Shaped Crafting", "create.recipe.block_cutting": "Coupe de bloc", "create.recipe.wood_cutting": "UNLOCALIZED: Wood Cutting", - "create.recipe.blockzapper_upgrade": "Blockzappeur portable", "create.recipe.sandpaper_polishing": "Polissage au papier de verre", "create.recipe.mystery_conversion": "Métamorphose chromatique", "create.recipe.spout_filling": "Remplissage par un bec verseur", @@ -752,20 +743,16 @@ "create.orientation.alongZ": "Sur Z", "create.orientation.alongX": "Sur X", - "create.gui.blockzapper.title": "Blockzappeur portable", - "create.gui.blockzapper.replaceMode": "Mode de remplacement", - "create.gui.blockzapper.searchDiagonal": "Suivez les diagonales", - "create.gui.blockzapper.searchFuzzy": "Ignorer les bordures de matériau", - "create.gui.blockzapper.range": "Plage de propagation", - "create.gui.blockzapper.needsUpgradedAmplifier": "Nécessite un amplificateur amélioré", - "create.gui.blockzapper.patternSection": "Motif", - "create.gui.blockzapper.pattern.solid": "Solide", - "create.gui.blockzapper.pattern.checkered": "Quamechanical_drillage", - "create.gui.blockzapper.pattern.inversecheckered": "Quamechanical_drillage inversé", - "create.gui.blockzapper.pattern.chance25": "25%", - "create.gui.blockzapper.pattern.chance50": "50%", - "create.gui.blockzapper.pattern.chance75": "75%", "create.gui.terrainzapper.title": "Térraformeur portable", + "create.gui.terrainzapper.searchDiagonal": "UNLOCALIZED: Follow Diagonals", + "create.gui.terrainzapper.searchFuzzy": "UNLOCALIZED: Ignore Material Borders", + "create.gui.terrainzapper.patternSection": "UNLOCALIZED: Pattern", + "create.gui.terrainzapper.pattern.solid": "UNLOCALIZED: Solid", + "create.gui.terrainzapper.pattern.checkered": "UNLOCALIZED: Checkerboard", + "create.gui.terrainzapper.pattern.inversecheckered": "UNLOCALIZED: Inverted Checkerboard", + "create.gui.terrainzapper.pattern.chance25": "UNLOCALIZED: 25% Roll", + "create.gui.terrainzapper.pattern.chance50": "UNLOCALIZED: 50% Roll", + "create.gui.terrainzapper.pattern.chance75": "UNLOCALIZED: 75% Roll", "create.gui.terrainzapper.placement": "Placement", "create.gui.terrainzapper.placement.merged": "Fusionner", "create.gui.terrainzapper.placement.attached": "Attacher", @@ -774,6 +761,8 @@ "create.gui.terrainzapper.brush.cuboid": "Cuboïde", "create.gui.terrainzapper.brush.sphere": "Sphère", "create.gui.terrainzapper.brush.cylinder": "Cylindre", + "create.gui.terrainzapper.brush.surface": "UNLOCALIZED: Surface", + "create.gui.terrainzapper.brush.cluster": "UNLOCALIZED: Cluster", "create.gui.terrainzapper.tool": "Outil", "create.gui.terrainzapper.tool.fill": "Remplir", "create.gui.terrainzapper.tool.place": "Placer", @@ -783,19 +772,8 @@ "create.gui.terrainzapper.tool.flatten": "Applatir", "create.terrainzapper.shiftRightClickToSet": "Maj + clic droit pour sélectionner une forme", - - "create.blockzapper.usingBlock": "Utilisation: %1$s", - "create.blockzapper.componentUpgrades": "Mises à niveau des composants:", - "create.blockzapper.component.body": "Corps", - "create.blockzapper.component.amplifier": "Amplifieur", - "create.blockzapper.component.accelerator": "Accélérateur", - "create.blockzapper.component.retriever": "Récupérateur", - "create.blockzapper.component.scope": "Lunette", - "create.blockzapper.componentTier.none": "Aucun", - "create.blockzapper.componentTier.brass": "Laiton", - "create.blockzapper.componentTier.chromatic": "Chromatique", - "create.blockzapper.leftClickToSet": "Clic gauche sur un bloc pour en définir le matériau", - "create.blockzapper.empty": "Plus de blocs!", + "create.terrainzapper.usingBlock": "UNLOCALIZED: Using: %1$s", + "create.terrainzapper.leftClickToSet": "UNLOCALIZED: Left-Click a Block to set Material", "create.minecart_coupling.two_couplings_max": "UNLOCALIZED: Minecarts cannot have more than two couplings each", "create.minecart_coupling.unloaded": "UNLOCALIZED: Parts of your train seem to be in unloaded chunks", @@ -1159,9 +1137,9 @@ "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", - "create.subtitle.blockzapper_confirm": "Ding d'affirmation", + "create.subtitle.worldshaper_place": "UNLOCALIZED: Worldshaper zaps", "create.subtitle.depot_slide": "UNLOCALIZED: Item slides", - "create.subtitle.blockzapper_place": "Blocs se zappant en place", + "create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.blaze_munch": "UNLOCALIZED: Blaze Burner munches", "create.subtitle.schematicannon_launch_block": "Tir de schémacanon", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", @@ -1170,11 +1148,11 @@ "create.subtitle.mechanical_press_activation": "Activation de la presse mechanique", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", - "create.subtitle.blockzapper_deny": "Boop de déclin", "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", "create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks", "create.subtitle.depot_plop": "UNLOCALIZED: Item lands", + "create.subtitle.confirm": "UNLOCALIZED: Affirmative ding", "_": "->------------------------] Item Descriptions [------------------------<-", @@ -1280,15 +1258,6 @@ "item.create.wand_of_symmetry.tooltip.control3": "Clic droit en étant accroupi", "item.create.wand_of_symmetry.tooltip.action3": "Ouvre l'_interface_ _de_ _configuration_", - "item.create.handheld_blockzapper.tooltip": "BLOCKZAPPEUR", - "item.create.handheld_blockzapper.tooltip.summary": "Nouveau gadget pour placer ou échanger des blocs à distance.", - "item.create.handheld_blockzapper.tooltip.control1": "Clic gauche sur un bloc", - "item.create.handheld_blockzapper.tooltip.action1": "Définit les blocs placés par l'outil sur le bloc ciblé.", - "item.create.handheld_blockzapper.tooltip.control2": "Clic droit sur un bloc", - "item.create.handheld_blockzapper.tooltip.action2": "_Place_ ou _remplace_ le bloc ciblé.", - "item.create.handheld_blockzapper.tooltip.control3": "Clic droit en étant accroupi", - "item.create.handheld_blockzapper.tooltip.action3": "Ouvre l'_interface_ _de_ _configuration_.", - "item.create.handheld_worldshaper.tooltip": "TERRAFORMEUR", "item.create.handheld_worldshaper.tooltip.summary": "Outil pratique pour créer des _paysage_ et _caractéristiques_ _de_ _terrain_.", "item.create.handheld_worldshaper.tooltip.control1": "Clic gauche sur un bloc", @@ -1303,9 +1272,6 @@ "item.create.tree_fertilizer.tooltip.condition1": "Lorsqu'utilisé sur une pousse d'rotor", "item.create.tree_fertilizer.tooltip.behaviour1": "Fait pousser des rotors _indépendamment_ de leurs _conditions_ _d'emplacement_", - "item.create.deforester.tooltip": "DÉFORESTEUR", - "item.create.deforester.tooltip.summary": "Une _hache_ _rayonnante_ capable d'abattre des rotors en une fraction de seconde.", - "item.create.extendo_grip.tooltip": "UNLOCALIZED: EXTENDO GRIP", "item.create.extendo_grip.tooltip.summary": "UNLOCALIZED: Boioioing! Greatly _increases reach distance_ of the wielder.", "item.create.extendo_grip.tooltip.condition1": "UNLOCALIZED: When in Off-Hand", 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 eef42803f..82e91b1f4 100644 --- a/src/generated/resources/assets/create/lang/unfinished/it_it.json +++ b/src/generated/resources/assets/create/lang/unfinished/it_it.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 637", + "_": "Missing Localizations: 653", "_": "->------------------------] Game Elements [------------------------<-", @@ -456,7 +456,6 @@ "item.create.crushed_tin_ore": "Stagno grezzo frantumato", "item.create.crushed_uranium_ore": "Uranio grezzo frantumato", "item.create.crushed_zinc_ore": "Zinco grezzo frantumato", - "item.create.deforester": "Deforestatore", "item.create.dough": "Impasto", "item.create.electron_tube": "Valvola", "item.create.empty_blaze_burner": "Inceneritore di blaze vuoto", @@ -466,7 +465,6 @@ "item.create.furnace_minecart_contraption": "Contrazione per carrello da miniera con fornace", "item.create.goggles": "Occhiali da ingegnere", "item.create.golden_sheet": "Lamiera d'oro", - "item.create.handheld_blockzapper": "Zapper di blocchi portatile", "item.create.handheld_worldshaper": "Plasmatore del mondo portatile", "item.create.honey_bucket": "Secchio di miele", "item.create.honeyed_apple": "UNLOCALIZED: Honeyed Apple", @@ -645,14 +643,8 @@ "advancement.create.refined_radiance.desc": "Crea la radiance raffinata, una sostanza cromatica potente.", "advancement.create.chromatic_age": "L'era cromatica", "advancement.create.chromatic_age.desc": "Crea involucri di luce e d'ombra.", - "advancement.create.zapper": "Stile nella costruzione", - "advancement.create.zapper.desc": "Crea uno zapper di blocchi. Una pistola laser che ti aiuta a costruire.", - "advancement.create.upgraded_zapper": "Overdrive", - "advancement.create.upgraded_zapper.desc": "Crea e attiva uno zapper di blocchi potenziato al massimo.", "advancement.create.wand_of_symmetry": "Perfettamente simmetrico", "advancement.create.wand_of_symmetry.desc": "Crea un'asta di simmetria.", - "advancement.create.deforester": "Deforestazione avanzata", - "advancement.create.deforester.desc": "Crea un deforestatore. Ciao ciao alberelli...", "advancement.create.extendo_grip": "BOIOIOING", "advancement.create.extendo_grip.desc": "Procurati una presa extendo.", "advancement.create.dual_extendo_grip": "Boingaggio estremo", @@ -695,7 +687,6 @@ "create.recipe.automatic_shaped": "Costruzione con forma automatizzata", "create.recipe.block_cutting": "Taglio di blocchi", "create.recipe.wood_cutting": "UNLOCALIZED: Wood Cutting", - "create.recipe.blockzapper_upgrade": "Zapper di blocchi portatile", "create.recipe.sandpaper_polishing": "Levigamento da carta vetrata", "create.recipe.mystery_conversion": "Metamorfosi cromatica", "create.recipe.spout_filling": "Riempimento da spruzzo", @@ -752,20 +743,16 @@ "create.orientation.alongZ": "Lungo Z", "create.orientation.alongX": "Lungo X", - "create.gui.blockzapper.title": "Zapper di blocchi", - "create.gui.blockzapper.replaceMode": "Modalità sostituzione", - "create.gui.blockzapper.searchDiagonal": "Segui diagonali", - "create.gui.blockzapper.searchFuzzy": "Ignora i bordi dei materiali", - "create.gui.blockzapper.range": "Gamma diffusione", - "create.gui.blockzapper.needsUpgradedAmplifier": "Richiede aggiornamento dell'amplificatore", - "create.gui.blockzapper.patternSection": "Schema", - "create.gui.blockzapper.pattern.solid": "Solido", - "create.gui.blockzapper.pattern.checkered": "Scacchiera", - "create.gui.blockzapper.pattern.inversecheckered": "Scacchiera invertita", - "create.gui.blockzapper.pattern.chance25": "Riempito al 25%", - "create.gui.blockzapper.pattern.chance50": "Riempito al 50%", - "create.gui.blockzapper.pattern.chance75": "Riempito al 75%", "create.gui.terrainzapper.title": "Plasmatore del mondo", + "create.gui.terrainzapper.searchDiagonal": "UNLOCALIZED: Follow Diagonals", + "create.gui.terrainzapper.searchFuzzy": "UNLOCALIZED: Ignore Material Borders", + "create.gui.terrainzapper.patternSection": "UNLOCALIZED: Pattern", + "create.gui.terrainzapper.pattern.solid": "UNLOCALIZED: Solid", + "create.gui.terrainzapper.pattern.checkered": "UNLOCALIZED: Checkerboard", + "create.gui.terrainzapper.pattern.inversecheckered": "UNLOCALIZED: Inverted Checkerboard", + "create.gui.terrainzapper.pattern.chance25": "UNLOCALIZED: 25% Roll", + "create.gui.terrainzapper.pattern.chance50": "UNLOCALIZED: 50% Roll", + "create.gui.terrainzapper.pattern.chance75": "UNLOCALIZED: 75% Roll", "create.gui.terrainzapper.placement": "Piazzamento", "create.gui.terrainzapper.placement.merged": "Fuso", "create.gui.terrainzapper.placement.attached": "Attaccato", @@ -774,6 +761,8 @@ "create.gui.terrainzapper.brush.cuboid": "Cuboide", "create.gui.terrainzapper.brush.sphere": "Sferico", "create.gui.terrainzapper.brush.cylinder": "Cilindrico", + "create.gui.terrainzapper.brush.surface": "UNLOCALIZED: Surface", + "create.gui.terrainzapper.brush.cluster": "UNLOCALIZED: Cluster", "create.gui.terrainzapper.tool": "Strumento", "create.gui.terrainzapper.tool.fill": "Riempi", "create.gui.terrainzapper.tool.place": "Piazza", @@ -783,19 +772,8 @@ "create.gui.terrainzapper.tool.flatten": "Appiattisci", "create.terrainzapper.shiftRightClickToSet": "Clic destro e shift per selezionare una forma", - - "create.blockzapper.usingBlock": "In utilizzo: %1$s", - "create.blockzapper.componentUpgrades": "Componenti:", - "create.blockzapper.component.body": "Corpo", - "create.blockzapper.component.amplifier": "Amplificatore", - "create.blockzapper.component.accelerator": "Acceleratore", - "create.blockzapper.component.retriever": "Retriever", - "create.blockzapper.component.scope": "Portata", - "create.blockzapper.componentTier.none": "Nessuno", - "create.blockzapper.componentTier.brass": "Ottone", - "create.blockzapper.componentTier.chromatic": "Cromatico", - "create.blockzapper.leftClickToSet": "Clic sinistro su un blocco per impostare il materiale", - "create.blockzapper.empty": "Fuori dai blocchi!", + "create.terrainzapper.usingBlock": "UNLOCALIZED: Using: %1$s", + "create.terrainzapper.leftClickToSet": "UNLOCALIZED: Left-Click a Block to set Material", "create.minecart_coupling.two_couplings_max": "I carrelli da miniera non possono avere più di due agganci ciascuno", "create.minecart_coupling.unloaded": "Parti del tuo treno sembrano essere in mezzo a chunk non caricati", @@ -1159,9 +1137,9 @@ "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", - "create.subtitle.blockzapper_confirm": "Ding affermativo", + "create.subtitle.worldshaper_place": "UNLOCALIZED: Worldshaper zaps", "create.subtitle.depot_slide": "UNLOCALIZED: Item slides", - "create.subtitle.blockzapper_place": "Posiziona blocchi nello spazio", + "create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.blaze_munch": "Il blaze lo gusta felicemente", "create.subtitle.schematicannon_launch_block": "Tiri del cannoneschematico", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", @@ -1170,11 +1148,11 @@ "create.subtitle.mechanical_press_activation": "Pressa meccanica attiva", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", - "create.subtitle.blockzapper_deny": "Boop in calo", "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", "create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks", "create.subtitle.depot_plop": "UNLOCALIZED: Item lands", + "create.subtitle.confirm": "UNLOCALIZED: Affirmative ding", "_": "->------------------------] Item Descriptions [------------------------<-", @@ -1280,15 +1258,6 @@ "item.create.wand_of_symmetry.tooltip.control3": "Clic destro da accovacciato", "item.create.wand_of_symmetry.tooltip.action3": "Apre l'_interfaccia_ _di_ _configurazione_", - "item.create.handheld_blockzapper.tooltip": "ZAPPER DI BLOCCHI PORTATILE", - "item.create.handheld_blockzapper.tooltip.summary": "Nuovo gadget per posizionare o scambiare blocchi a distanza.", - "item.create.handheld_blockzapper.tooltip.control1": "Clic sinistro su un blocco", - "item.create.handheld_blockzapper.tooltip.action1": "Imposta i blocchi posizionati dallo strumento sul blocco selezionato.", - "item.create.handheld_blockzapper.tooltip.control2": "Clic destro su un blocco", - "item.create.handheld_blockzapper.tooltip.action2": "_Piazza_ o _sostituisce_ il blocco selezionato.", - "item.create.handheld_blockzapper.tooltip.control3": "Clic destro da accovacciato", - "item.create.handheld_blockzapper.tooltip.action3": "Apre l'_interfaccia_ _di_ _configurazione_.", - "item.create.handheld_worldshaper.tooltip": "PLASMATORE DEL MONDO PORTATILE", "item.create.handheld_worldshaper.tooltip.summary": "Strumento per la creazione di _paesaggi_ e _caratteristiche_ _del_ _terreno_.", "item.create.handheld_worldshaper.tooltip.control1": "Clic sinistro su un blocco", @@ -1303,9 +1272,6 @@ "item.create.tree_fertilizer.tooltip.condition1": "Se utilizzato su un arboscello", "item.create.tree_fertilizer.tooltip.behaviour1": "Fa crescere gli alberi _indipendentemente_ dalle _condizioni_ _di_ _spazio_", - "item.create.deforester.tooltip": "DEFORESTATORE", - "item.create.deforester.tooltip.summary": "Un'_ascia_ _radiante_ in grado di abbattere alberi in una frazione di secondo.", - "item.create.extendo_grip.tooltip": "PRESA EXTENDO", "item.create.extendo_grip.tooltip.summary": "Boioioing! _Incrementa notevolmente la distanza per piazzare_ di chi lo brandisce.", "item.create.extendo_grip.tooltip.condition1": "Quando in mano secondaria", 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 dd556f5a6..1076dfbcd 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json +++ b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 619", + "_": "Missing Localizations: 635", "_": "->------------------------] Game Elements [------------------------<-", @@ -456,7 +456,6 @@ "item.create.crushed_tin_ore": "砕いた錫鉱石", "item.create.crushed_uranium_ore": "砕いたウラン鉱石", "item.create.crushed_zinc_ore": "砕いた亜鉛鉱石", - "item.create.deforester": "デフォレスター", "item.create.dough": "生地", "item.create.electron_tube": "電子管", "item.create.empty_blaze_burner": "空のブレイズバーナー", @@ -466,7 +465,6 @@ "item.create.furnace_minecart_contraption": "からくりかまど付きトロッコ", "item.create.goggles": "エンジニアのゴーグル", "item.create.golden_sheet": "金板", - "item.create.handheld_blockzapper": "携帯型ブロックザッパー", "item.create.handheld_worldshaper": "携帯型ワールドシェーパー", "item.create.honey_bucket": "ハチミツ入りバケツ", "item.create.honeyed_apple": "UNLOCALIZED: Honeyed Apple", @@ -645,14 +643,8 @@ "advancement.create.refined_radiance.desc": "究極の色彩物質、「洗練された極光体」を作る", "advancement.create.chromatic_age": "色彩の時代", "advancement.create.chromatic_age.desc": "光と闇のケーシングを作る", - "advancement.create.zapper": "風格ある建築", - "advancement.create.zapper.desc": "建築に役立つレーザー銃、ブロックザッパーを作る", - "advancement.create.upgraded_zapper": "究極の輝き", - "advancement.create.upgraded_zapper.desc": "ブロックザッパーを最大までアップグレードする", "advancement.create.wand_of_symmetry": "輝く鏡", "advancement.create.wand_of_symmetry.desc": "対象の杖を作る", - "advancement.create.deforester": "輝く斧", - "advancement.create.deforester.desc": "デフォレスターを作って、地元の森に別れを告げる", "advancement.create.extendo_grip": "ビヨヨーン！", "advancement.create.extendo_grip.desc": "マジックハンドを手に入れる", "advancement.create.dual_extendo_grip": "究極のビヨンビヨン時代", @@ -695,7 +687,6 @@ "create.recipe.automatic_shaped": "自動定形クラフト", "create.recipe.block_cutting": "自動石切", "create.recipe.wood_cutting": "自動製材", - "create.recipe.blockzapper_upgrade": "携帯型ブロックザッパー", "create.recipe.sandpaper_polishing": "紙やすりでの研磨", "create.recipe.mystery_conversion": "不思議な変換", "create.recipe.spout_filling": "アイテム注液口による注入", @@ -752,20 +743,16 @@ "create.orientation.alongZ": "Z に沿る", "create.orientation.alongX": "X に沿る", - "create.gui.blockzapper.title": "携帯型ブロックザッパー", - "create.gui.blockzapper.replaceMode": "置換モード", - "create.gui.blockzapper.searchDiagonal": "対角線にフォロー", - "create.gui.blockzapper.searchFuzzy": "素材の境界を無視", - "create.gui.blockzapper.range": "範囲", - "create.gui.blockzapper.needsUpgradedAmplifier": "増幅アップグレードが必要", - "create.gui.blockzapper.patternSection": "模様", - "create.gui.blockzapper.pattern.solid": "敷き詰め", - "create.gui.blockzapper.pattern.checkered": "市松模様", - "create.gui.blockzapper.pattern.inversecheckered": "逆市松模様", - "create.gui.blockzapper.pattern.chance25": "25%", - "create.gui.blockzapper.pattern.chance50": "50%", - "create.gui.blockzapper.pattern.chance75": "75%", "create.gui.terrainzapper.title": "携帯型ワールドシェイパー", + "create.gui.terrainzapper.searchDiagonal": "UNLOCALIZED: Follow Diagonals", + "create.gui.terrainzapper.searchFuzzy": "UNLOCALIZED: Ignore Material Borders", + "create.gui.terrainzapper.patternSection": "UNLOCALIZED: Pattern", + "create.gui.terrainzapper.pattern.solid": "UNLOCALIZED: Solid", + "create.gui.terrainzapper.pattern.checkered": "UNLOCALIZED: Checkerboard", + "create.gui.terrainzapper.pattern.inversecheckered": "UNLOCALIZED: Inverted Checkerboard", + "create.gui.terrainzapper.pattern.chance25": "UNLOCALIZED: 25% Roll", + "create.gui.terrainzapper.pattern.chance50": "UNLOCALIZED: 50% Roll", + "create.gui.terrainzapper.pattern.chance75": "UNLOCALIZED: 75% Roll", "create.gui.terrainzapper.placement": "配置", "create.gui.terrainzapper.placement.merged": "合併", "create.gui.terrainzapper.placement.attached": "添える", @@ -774,6 +761,8 @@ "create.gui.terrainzapper.brush.cuboid": "直方体", "create.gui.terrainzapper.brush.sphere": "球体", "create.gui.terrainzapper.brush.cylinder": "円筒", + "create.gui.terrainzapper.brush.surface": "UNLOCALIZED: Surface", + "create.gui.terrainzapper.brush.cluster": "UNLOCALIZED: Cluster", "create.gui.terrainzapper.tool": "ツール", "create.gui.terrainzapper.tool.fill": "埋立", "create.gui.terrainzapper.tool.place": "設置", @@ -783,19 +772,8 @@ "create.gui.terrainzapper.tool.flatten": "なだらかに", "create.terrainzapper.shiftRightClickToSet": "シフト-右クリックで形状を選択", - - "create.blockzapper.usingBlock": "使用中: %1$s", - "create.blockzapper.componentUpgrades": "コンポーネントアップグレード:", - "create.blockzapper.component.body": "ボディー", - "create.blockzapper.component.amplifier": "増幅", - "create.blockzapper.component.accelerator": "加速", - "create.blockzapper.component.retriever": "レトリーバー", - "create.blockzapper.component.scope": "範囲", - "create.blockzapper.componentTier.none": "無し", - "create.blockzapper.componentTier.brass": "真鍮", - "create.blockzapper.componentTier.chromatic": "色彩", - "create.blockzapper.leftClickToSet": "ブロックをスニークせず左クリックでブロックを選択", - "create.blockzapper.empty": "ブロック不足！", + "create.terrainzapper.usingBlock": "UNLOCALIZED: Using: %1$s", + "create.terrainzapper.leftClickToSet": "UNLOCALIZED: Left-Click a Block to set Material", "create.minecart_coupling.two_couplings_max": "トロッコを2つ以上連結させることはできません", "create.minecart_coupling.unloaded": "列車の一部のあるチャンクがロードされていません", @@ -1159,9 +1137,9 @@ "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", - "create.subtitle.blockzapper_confirm": "成功音", + "create.subtitle.worldshaper_place": "UNLOCALIZED: Worldshaper zaps", "create.subtitle.depot_slide": "UNLOCALIZED: Item slides", - "create.subtitle.blockzapper_place": "ブロックを発射して設置する", + "create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.blaze_munch": "ブレイズの咀嚼音", "create.subtitle.schematicannon_launch_block": "概略図砲が発射する", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", @@ -1170,11 +1148,11 @@ "create.subtitle.mechanical_press_activation": "メカニカルプレスが作動する", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", - "create.subtitle.blockzapper_deny": "失敗音", "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", "create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks", "create.subtitle.depot_plop": "UNLOCALIZED: Item lands", + "create.subtitle.confirm": "UNLOCALIZED: Affirmative ding", "_": "->------------------------] Item Descriptions [------------------------<-", @@ -1280,15 +1258,6 @@ "item.create.wand_of_symmetry.tooltip.control3": "スニークしながら右クリックしたとき", "item.create.wand_of_symmetry.tooltip.action3": "_設定インターフェース_を開きます。", - "item.create.handheld_blockzapper.tooltip": "携帯型ブロックザッパー", - "item.create.handheld_blockzapper.tooltip.summary": "離れた場所にブロックを設置または交換する新しいガジェット。", - "item.create.handheld_blockzapper.tooltip.control1": "ブロックを左クリックしたとき", - "item.create.handheld_blockzapper.tooltip.action1": "ターゲットのブロックをこのツールに設定します。", - "item.create.handheld_blockzapper.tooltip.control2": "ブロックを右クリックしたとき", - "item.create.handheld_blockzapper.tooltip.action2": "ターゲットブロックを_配置_または_置換_します。", - "item.create.handheld_blockzapper.tooltip.control3": "スニークしながら右クリックしたとき。", - "item.create.handheld_blockzapper.tooltip.action3": "_設定インターフェース_を開きます。", - "item.create.handheld_worldshaper.tooltip": "携帯型ワールドシェーパー", "item.create.handheld_worldshaper.tooltip.summary": "特色ある_風景_や_地形_を作成する便利なツール。", "item.create.handheld_worldshaper.tooltip.control1": "ブロックを左クリックしたとき", @@ -1303,9 +1272,6 @@ "item.create.tree_fertilizer.tooltip.condition1": "苗木に使ったとき", "item.create.tree_fertilizer.tooltip.behaviour1": "_間隔の条件_に_関係なく_ツリーを成長させる", - "item.create.deforester.tooltip": "デフォレスター", - "item.create.deforester.tooltip.summary": "一瞬で木を切り倒すことができる_輝く斧_。", - "item.create.extendo_grip.tooltip": "マジックハンド", "item.create.extendo_grip.tooltip.summary": "ビヨヨーン！使用者の_射程_を大幅に_伸ばし_ます。", "item.create.extendo_grip.tooltip.condition1": "オフハンドに装備したとき", 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 0191967b5..ee9042656 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json +++ b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 690", + "_": "Missing Localizations: 706", "_": "->------------------------] Game Elements [------------------------<-", @@ -456,7 +456,6 @@ "item.create.crushed_tin_ore": "UNLOCALIZED: Crushed Tin Ore", "item.create.crushed_uranium_ore": "UNLOCALIZED: Crushed Uranium Ore", "item.create.crushed_zinc_ore": "분쇄된 아연 광석", - "item.create.deforester": "산림파괴자", "item.create.dough": "반죽", "item.create.electron_tube": "전지 튜브", "item.create.empty_blaze_burner": "빈 블레이즈 버너", @@ -466,7 +465,6 @@ "item.create.furnace_minecart_contraption": "화로가 실린 광산 수레 장치", "item.create.goggles": "엔지니어의 고글", "item.create.golden_sheet": "금 판", - "item.create.handheld_blockzapper": "휴대용 블록발사기", "item.create.handheld_worldshaper": "휴대용 세계편집기", "item.create.honey_bucket": "꿀 양동이", "item.create.honeyed_apple": "UNLOCALIZED: Honeyed Apple", @@ -645,14 +643,8 @@ "advancement.create.refined_radiance.desc": "강력한 색채 물질, 정제된 빛을 생성하세요.", "advancement.create.chromatic_age": "양극 시대", "advancement.create.chromatic_age.desc": "빛과 어둠의 케이스를 제작하세요.", - "advancement.create.zapper": "나는 스타일있게 건축해", - "advancement.create.zapper.desc": "당신의 건축을 도와줄 멋진 레이저 건, 휴대용 블록발사기를 만드세요.", - "advancement.create.upgraded_zapper": "화려한 빛이 날 감싸네", - "advancement.create.upgraded_zapper.desc": "완전히 업그레이드된 휴대용 블록발사기를 만들고 써보세요.", "advancement.create.wand_of_symmetry": "빛나는 건축", "advancement.create.wand_of_symmetry.desc": "대칭의 지팡이를 만드세요.", - "advancement.create.deforester": "빛나는 벌목", - "advancement.create.deforester.desc": "산림파괴자를 만들고, 숲에게 작별인사를 하세요.", "advancement.create.extendo_grip": "띠요오옹!", "advancement.create.extendo_grip.desc": "외장형 연장 팔을 드세요.", "advancement.create.dual_extendo_grip": "궁극의 띠용!", @@ -695,7 +687,6 @@ "create.recipe.automatic_shaped": "유형 자동 조합", "create.recipe.block_cutting": "블 절단", "create.recipe.wood_cutting": "UNLOCALIZED: Wood Cutting", - "create.recipe.blockzapper_upgrade": "휴대용 블록발사기 업그레이드", "create.recipe.sandpaper_polishing": "사포질", "create.recipe.mystery_conversion": "?", "create.recipe.spout_filling": "채우기", @@ -752,20 +743,16 @@ "create.orientation.alongZ": "Z좌표를 따라", "create.orientation.alongX": "X좌표를 따라", - "create.gui.blockzapper.title": "휴대용 블록발사기", - "create.gui.blockzapper.replaceMode": "대체 모드", - "create.gui.blockzapper.searchDiagonal": "대각선을 따라", - "create.gui.blockzapper.searchFuzzy": "물질 경계 무시", - "create.gui.blockzapper.range": "범위", - "create.gui.blockzapper.needsUpgradedAmplifier": "업그레이드가 필요합니다", - "create.gui.blockzapper.patternSection": "패턴 설정", - "create.gui.blockzapper.pattern.solid": "원형", - "create.gui.blockzapper.pattern.checkered": "체스판", - "create.gui.blockzapper.pattern.inversecheckered": "반전된 체스판", - "create.gui.blockzapper.pattern.chance25": "랜덤으로 25% 채우기", - "create.gui.blockzapper.pattern.chance50": "랜덤으로 50% 채우기", - "create.gui.blockzapper.pattern.chance75": "랜덤으로 75% 채우기", "create.gui.terrainzapper.title": "휴대용 세계편집기", + "create.gui.terrainzapper.searchDiagonal": "UNLOCALIZED: Follow Diagonals", + "create.gui.terrainzapper.searchFuzzy": "UNLOCALIZED: Ignore Material Borders", + "create.gui.terrainzapper.patternSection": "UNLOCALIZED: Pattern", + "create.gui.terrainzapper.pattern.solid": "UNLOCALIZED: Solid", + "create.gui.terrainzapper.pattern.checkered": "UNLOCALIZED: Checkerboard", + "create.gui.terrainzapper.pattern.inversecheckered": "UNLOCALIZED: Inverted Checkerboard", + "create.gui.terrainzapper.pattern.chance25": "UNLOCALIZED: 25% Roll", + "create.gui.terrainzapper.pattern.chance50": "UNLOCALIZED: 50% Roll", + "create.gui.terrainzapper.pattern.chance75": "UNLOCALIZED: 75% Roll", "create.gui.terrainzapper.placement": "설치방식", "create.gui.terrainzapper.placement.merged": "선택한 블록에", "create.gui.terrainzapper.placement.attached": "선택한 블록 옆에", @@ -774,6 +761,8 @@ "create.gui.terrainzapper.brush.cuboid": "정육면체", "create.gui.terrainzapper.brush.sphere": "구", "create.gui.terrainzapper.brush.cylinder": "원통", + "create.gui.terrainzapper.brush.surface": "UNLOCALIZED: Surface", + "create.gui.terrainzapper.brush.cluster": "UNLOCALIZED: Cluster", "create.gui.terrainzapper.tool": "도구", "create.gui.terrainzapper.tool.fill": "채우기", "create.gui.terrainzapper.tool.place": "설치", @@ -783,19 +772,8 @@ "create.gui.terrainzapper.tool.flatten": "평탄화", "create.terrainzapper.shiftRightClickToSet": "쉬프트-우클릭으로 모양 설정하기", - - "create.blockzapper.usingBlock": "현재 블록: %1$s", - "create.blockzapper.componentUpgrades": "부품 업그레이드:", - "create.blockzapper.component.body": "몸통", - "create.blockzapper.component.amplifier": "증폭기", - "create.blockzapper.component.accelerator": "가속기", - "create.blockzapper.component.retriever": "회수기", - "create.blockzapper.component.scope": "스코프", - "create.blockzapper.componentTier.none": "없음", - "create.blockzapper.componentTier.brass": "황동", - "create.blockzapper.componentTier.chromatic": "혼돈의 결정체", - "create.blockzapper.leftClickToSet": "좌클릭으로 블록 설정하기", - "create.blockzapper.empty": "블록이 없습니다!", + "create.terrainzapper.usingBlock": "UNLOCALIZED: Using: %1$s", + "create.terrainzapper.leftClickToSet": "UNLOCALIZED: Left-Click a Block to set Material", "create.minecart_coupling.two_couplings_max": "광산 수레는 최대 2개의 커플링만 가질 수 있습니다", "create.minecart_coupling.unloaded": "열차 일부분이 로딩되지 않은 청크에 있는 것 같습니다", @@ -1159,9 +1137,9 @@ "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", - "create.subtitle.blockzapper_confirm": "확인 효과음", + "create.subtitle.worldshaper_place": "UNLOCALIZED: Worldshaper zaps", "create.subtitle.depot_slide": "UNLOCALIZED: Item slides", - "create.subtitle.blockzapper_place": "블록이 순간이동됨", + "create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.blaze_munch": "블레이즈가 행복하게 섭취함", "create.subtitle.schematicannon_launch_block": "청사진 대포가 발포함", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", @@ -1170,11 +1148,11 @@ "create.subtitle.mechanical_press_activation": "압착기가 가동됨", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", - "create.subtitle.blockzapper_deny": "취소 효과음", "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", "create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks", "create.subtitle.depot_plop": "UNLOCALIZED: Item lands", + "create.subtitle.confirm": "UNLOCALIZED: Affirmative ding", "_": "->------------------------] Item Descriptions [------------------------<-", @@ -1280,15 +1258,6 @@ "item.create.wand_of_symmetry.tooltip.control3": "웅크린 상태에서 우클릭", "item.create.wand_of_symmetry.tooltip.action3": "_설정_ _창_을 엽니다.", - "item.create.handheld_blockzapper.tooltip": "BLOCKZAPPER", - "item.create.handheld_blockzapper.tooltip.summary": "멀리있는 블록을 교체, 설치하는 놀라운 도구입니다.", - "item.create.handheld_blockzapper.tooltip.control1": "블록을 보고 좌클릭", - "item.create.handheld_blockzapper.tooltip.action1": "이 도구로 설치할 블록을 설정합니다.", - "item.create.handheld_blockzapper.tooltip.control2": "블록을 보고 우클릭", - "item.create.handheld_blockzapper.tooltip.action2": "해당 위치에 설정된 블록으로 설치하거나 교체합니다.", - "item.create.handheld_blockzapper.tooltip.control3": "웅크린 상태에서 우클릭", - "item.create.handheld_blockzapper.tooltip.action3": "_설정_ _창_을 엽니다.", - "item.create.handheld_worldshaper.tooltip": "HANDHELD WORLDSHAPER", "item.create.handheld_worldshaper.tooltip.summary": "_지형경관_을 만들 때 좋은 간편한 도구입니다.", "item.create.handheld_worldshaper.tooltip.control1": "블록을 보고 좌클릭", @@ -1303,9 +1272,6 @@ "item.create.tree_fertilizer.tooltip.condition1": "묘목에 사용했을 때", "item.create.tree_fertilizer.tooltip.behaviour1": "묘목을 주위 공간과 _상관없이_ 성장시킵니다.", - "item.create.deforester.tooltip": "DEFORESTER", - "item.create.deforester.tooltip.summary": "수 초 만에 나무를 쓰러뜨리는 _놀라운_ _도끼_입니다.", - "item.create.extendo_grip.tooltip": "EXTENDO GRIP", "item.create.extendo_grip.tooltip.summary": "띠요오옹! 사용자의 _사거리_를 늘려줍니다.", "item.create.extendo_grip.tooltip.condition1": "다른 손에 있을 때", 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 91eca1428..a1da4d3be 100644 --- a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json +++ b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1567", + "_": "Missing Localizations: 1570", "_": "->------------------------] Game Elements [------------------------<-", @@ -456,7 +456,6 @@ "item.create.crushed_tin_ore": "UNLOCALIZED: Crushed Tin Ore", "item.create.crushed_uranium_ore": "UNLOCALIZED: Crushed Uranium Ore", "item.create.crushed_zinc_ore": "UNLOCALIZED: Crushed Zinc Ore", - "item.create.deforester": "Ontbosser", "item.create.dough": "Deeg", "item.create.electron_tube": "UNLOCALIZED: Electron Tube", "item.create.empty_blaze_burner": "UNLOCALIZED: Empty Blaze Burner", @@ -466,8 +465,7 @@ "item.create.furnace_minecart_contraption": "UNLOCALIZED: Furnace Minecart Contraption", "item.create.goggles": "Ingenieur's Bril", "item.create.golden_sheet": "UNLOCALIZED: Golden Sheet", - "item.create.handheld_blockzapper": "Blokzapper", - "item.create.handheld_worldshaper": "UNLOCALIZED: Handheld Worldshaper", + "item.create.handheld_worldshaper": "UNLOCALIZED: Creative Worldshaper", "item.create.honey_bucket": "UNLOCALIZED: Honey Bucket", "item.create.honeyed_apple": "UNLOCALIZED: Honeyed Apple", "item.create.integrated_circuit": "UNLOCALIZED: Integrated Circuit", @@ -645,14 +643,8 @@ "advancement.create.refined_radiance.desc": "UNLOCALIZED: Create Refined Radiance, a powerful chromatic substance.", "advancement.create.chromatic_age": "UNLOCALIZED: The Chromatic Age", "advancement.create.chromatic_age.desc": "UNLOCALIZED: Create casing blocks of the light and dark.", - "advancement.create.zapper": "UNLOCALIZED: Building With Style", - "advancement.create.zapper.desc": "UNLOCALIZED: Craft a Blockzapper. A radiant laser gun that helps you build.", - "advancement.create.upgraded_zapper": "UNLOCALIZED: Radiant Overdrive", - "advancement.create.upgraded_zapper.desc": "UNLOCALIZED: Create and activate a fully upgraded Blockzapper.", "advancement.create.wand_of_symmetry": "UNLOCALIZED: Radiant Mirrors", "advancement.create.wand_of_symmetry.desc": "UNLOCALIZED: Craft a Staff of Symmetry.", - "advancement.create.deforester": "UNLOCALIZED: Radiant Chopping", - "advancement.create.deforester.desc": "UNLOCALIZED: Craft a Deforester, and say goodbye to the local forest.", "advancement.create.extendo_grip": "UNLOCALIZED: Boioioing!", "advancement.create.extendo_grip.desc": "UNLOCALIZED: Get hold of an Extendo Grip.", "advancement.create.dual_extendo_grip": "UNLOCALIZED: Ultimate Boing-age", @@ -695,7 +687,6 @@ "create.recipe.automatic_shaped": "UNLOCALIZED: Automated Shaped Crafting", "create.recipe.block_cutting": "Blok Zagen", "create.recipe.wood_cutting": "UNLOCALIZED: Wood Cutting", - "create.recipe.blockzapper_upgrade": "Blokzapper", "create.recipe.sandpaper_polishing": "UNLOCALIZED: Sandpaper Polishing", "create.recipe.mystery_conversion": "UNLOCALIZED: Mysterious Conversion", "create.recipe.spout_filling": "UNLOCALIZED: Filling by Spout", @@ -752,20 +743,16 @@ "create.orientation.alongZ": "Langs Z-as", "create.orientation.alongX": "Langs X-as", - "create.gui.blockzapper.title": "Blokzapper", - "create.gui.blockzapper.replaceMode": "Vervang Modus", - "create.gui.blockzapper.searchDiagonal": "Volg Diagonalen", - "create.gui.blockzapper.searchFuzzy": "Negeer materiaal granzen", - "create.gui.blockzapper.range": "Verspreid bereik", - "create.gui.blockzapper.needsUpgradedAmplifier": "Benodigd een opgewaardeerde versterker", - "create.gui.blockzapper.patternSection": "Patronen", - "create.gui.blockzapper.pattern.solid": "Vast", - "create.gui.blockzapper.pattern.checkered": "Schaakbord", - "create.gui.blockzapper.pattern.inversecheckered": "Omgekeerd Schaakbord", - "create.gui.blockzapper.pattern.chance25": "25% Gedraaid", - "create.gui.blockzapper.pattern.chance50": "50% Gedraaid", - "create.gui.blockzapper.pattern.chance75": "75% Gedraaid", - "create.gui.terrainzapper.title": "UNLOCALIZED: Handheld Worldshaper", + "create.gui.terrainzapper.title": "UNLOCALIZED: Handheld Blockzapper", + "create.gui.terrainzapper.searchDiagonal": "UNLOCALIZED: Follow Diagonals", + "create.gui.terrainzapper.searchFuzzy": "UNLOCALIZED: Ignore Material Borders", + "create.gui.terrainzapper.patternSection": "UNLOCALIZED: Pattern", + "create.gui.terrainzapper.pattern.solid": "UNLOCALIZED: Solid", + "create.gui.terrainzapper.pattern.checkered": "UNLOCALIZED: Checkerboard", + "create.gui.terrainzapper.pattern.inversecheckered": "UNLOCALIZED: Inverted Checkerboard", + "create.gui.terrainzapper.pattern.chance25": "UNLOCALIZED: 25% Roll", + "create.gui.terrainzapper.pattern.chance50": "UNLOCALIZED: 50% Roll", + "create.gui.terrainzapper.pattern.chance75": "UNLOCALIZED: 75% Roll", "create.gui.terrainzapper.placement": "UNLOCALIZED: Placement", "create.gui.terrainzapper.placement.merged": "UNLOCALIZED: Merged", "create.gui.terrainzapper.placement.attached": "UNLOCALIZED: Attached", @@ -774,6 +761,8 @@ "create.gui.terrainzapper.brush.cuboid": "UNLOCALIZED: Cuboid", "create.gui.terrainzapper.brush.sphere": "UNLOCALIZED: Sphere", "create.gui.terrainzapper.brush.cylinder": "UNLOCALIZED: Cylinder", + "create.gui.terrainzapper.brush.surface": "UNLOCALIZED: Surface", + "create.gui.terrainzapper.brush.cluster": "UNLOCALIZED: Cluster", "create.gui.terrainzapper.tool": "UNLOCALIZED: Tool", "create.gui.terrainzapper.tool.fill": "UNLOCALIZED: Fill", "create.gui.terrainzapper.tool.place": "UNLOCALIZED: Place", @@ -783,19 +772,8 @@ "create.gui.terrainzapper.tool.flatten": "UNLOCALIZED: Flatten", "create.terrainzapper.shiftRightClickToSet": "UNLOCALIZED: Shift-Right-Click to Select a Shape", - - "create.blockzapper.usingBlock": "Gebruikt: %1$s", - "create.blockzapper.componentUpgrades": "Component Upgrades:", - "create.blockzapper.component.body": "Lichaam", - "create.blockzapper.component.amplifier": "Versterker", - "create.blockzapper.component.accelerator": "Accelerator", - "create.blockzapper.component.retriever": "Ontvanger", - "create.blockzapper.component.scope": "Omvang", - "create.blockzapper.componentTier.none": "Geen", - "create.blockzapper.componentTier.brass": "UNLOCALIZED: Brass", - "create.blockzapper.componentTier.chromatic": "UNLOCALIZED: Chromatic", - "create.blockzapper.leftClickToSet": "Klik met links op een Blok om een Materiaal te kiezen", - "create.blockzapper.empty": "De Blokken zijn op!", + "create.terrainzapper.usingBlock": "UNLOCALIZED: Using: %1$s", + "create.terrainzapper.leftClickToSet": "UNLOCALIZED: Left-Click a Block to set Material", "create.minecart_coupling.two_couplings_max": "UNLOCALIZED: Minecarts cannot have more than two couplings each", "create.minecart_coupling.unloaded": "UNLOCALIZED: Parts of your train seem to be in unloaded chunks", @@ -1159,9 +1137,9 @@ "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", - "create.subtitle.blockzapper_confirm": "UNLOCALIZED: Affirmative ding", + "create.subtitle.worldshaper_place": "UNLOCALIZED: Worldshaper zaps", "create.subtitle.depot_slide": "UNLOCALIZED: Item slides", - "create.subtitle.blockzapper_place": "UNLOCALIZED: Blockzapper zaps", + "create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.blaze_munch": "UNLOCALIZED: Blaze Burner munches", "create.subtitle.schematicannon_launch_block": "UNLOCALIZED: Schematicannon fires", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", @@ -1170,11 +1148,11 @@ "create.subtitle.mechanical_press_activation": "UNLOCALIZED: Mechanical Press clangs", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", - "create.subtitle.blockzapper_deny": "UNLOCALIZED: Declining boop", "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", "create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks", "create.subtitle.depot_plop": "UNLOCALIZED: Item lands", + "create.subtitle.confirm": "UNLOCALIZED: Affirmative ding", "_": "->------------------------] Item Descriptions [------------------------<-", @@ -1280,15 +1258,6 @@ "item.create.wand_of_symmetry.tooltip.control3": "R-Klik terwijl je Sluipt", "item.create.wand_of_symmetry.tooltip.action3": "Opent de _Configuratie_ _Interface_", - "item.create.handheld_blockzapper.tooltip": "BLOKZAPPER", - "item.create.handheld_blockzapper.tooltip.summary": "Ongebruikelijke gadget voor het plaatsen en verwissel van blokken over een afstand", - "item.create.handheld_blockzapper.tooltip.control1": "L-Klik op een Blok", - "item.create.handheld_blockzapper.tooltip.action1": "Zet het doelwit blok om naar het geselecteerde blok.", - "item.create.handheld_blockzapper.tooltip.control2": "R-Klik op een Blok", - "item.create.handheld_blockzapper.tooltip.action2": "_Plaatst_ of _Vervangt_ het doelwit blok.", - "item.create.handheld_blockzapper.tooltip.control3": "R-Click while Sneaking", - "item.create.handheld_blockzapper.tooltip.action3": "Opent de _Configuratie_ _Interface_", - "item.create.handheld_worldshaper.tooltip": "UNLOCALIZED: HANDHELD WORLDSHAPER", "item.create.handheld_worldshaper.tooltip.summary": "UNLOCALIZED: Handy tool for creating _landscapes_ and _terrain features_.", "item.create.handheld_worldshaper.tooltip.control1": "UNLOCALIZED: L-Click at Block", @@ -1303,9 +1272,6 @@ "item.create.tree_fertilizer.tooltip.condition1": "Wanneer gebruikt op Kiemplanten", "item.create.tree_fertilizer.tooltip.behaviour1": "Groeit bomen onafhankelijk van beschikbare ruimte", - "item.create.deforester.tooltip": "UNLOCALIZED: DEFORESTER", - "item.create.deforester.tooltip.summary": "UNLOCALIZED: A _radiant axe_ able to chop down trees in a split second.", - "item.create.extendo_grip.tooltip": "UNLOCALIZED: EXTENDO GRIP", "item.create.extendo_grip.tooltip.summary": "UNLOCALIZED: Boioioing! Greatly _increases reach distance_ of the wielder.", "item.create.extendo_grip.tooltip.condition1": "UNLOCALIZED: When in Off-Hand", 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 36899f42b..338fb9e10 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_br.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_br.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1621", + "_": "Missing Localizations: 1622", "_": "->------------------------] Game Elements [------------------------<-", @@ -456,7 +456,6 @@ "item.create.crushed_tin_ore": "UNLOCALIZED: Crushed Tin Ore", "item.create.crushed_uranium_ore": "UNLOCALIZED: Crushed Uranium Ore", "item.create.crushed_zinc_ore": "UNLOCALIZED: Crushed Zinc Ore", - "item.create.deforester": "UNLOCALIZED: Deforester", "item.create.dough": "Massa", "item.create.electron_tube": "UNLOCALIZED: Electron Tube", "item.create.empty_blaze_burner": "UNLOCALIZED: Empty Blaze Burner", @@ -466,8 +465,7 @@ "item.create.furnace_minecart_contraption": "UNLOCALIZED: Furnace Minecart Contraption", "item.create.goggles": "UNLOCALIZED: Engineer's Goggles", "item.create.golden_sheet": "UNLOCALIZED: Golden Sheet", - "item.create.handheld_blockzapper": "Blockzapper Portátil", - "item.create.handheld_worldshaper": "UNLOCALIZED: Handheld Worldshaper", + "item.create.handheld_worldshaper": "UNLOCALIZED: Creative Worldshaper", "item.create.honey_bucket": "UNLOCALIZED: Honey Bucket", "item.create.honeyed_apple": "UNLOCALIZED: Honeyed Apple", "item.create.integrated_circuit": "UNLOCALIZED: Integrated Circuit", @@ -645,14 +643,8 @@ "advancement.create.refined_radiance.desc": "UNLOCALIZED: Create Refined Radiance, a powerful chromatic substance.", "advancement.create.chromatic_age": "UNLOCALIZED: The Chromatic Age", "advancement.create.chromatic_age.desc": "UNLOCALIZED: Create casing blocks of the light and dark.", - "advancement.create.zapper": "UNLOCALIZED: Building With Style", - "advancement.create.zapper.desc": "UNLOCALIZED: Craft a Blockzapper. A radiant laser gun that helps you build.", - "advancement.create.upgraded_zapper": "UNLOCALIZED: Radiant Overdrive", - "advancement.create.upgraded_zapper.desc": "UNLOCALIZED: Create and activate a fully upgraded Blockzapper.", "advancement.create.wand_of_symmetry": "UNLOCALIZED: Radiant Mirrors", "advancement.create.wand_of_symmetry.desc": "UNLOCALIZED: Craft a Staff of Symmetry.", - "advancement.create.deforester": "UNLOCALIZED: Radiant Chopping", - "advancement.create.deforester.desc": "UNLOCALIZED: Craft a Deforester, and say goodbye to the local forest.", "advancement.create.extendo_grip": "UNLOCALIZED: Boioioing!", "advancement.create.extendo_grip.desc": "UNLOCALIZED: Get hold of an Extendo Grip.", "advancement.create.dual_extendo_grip": "UNLOCALIZED: Ultimate Boing-age", @@ -695,7 +687,6 @@ "create.recipe.automatic_shaped": "UNLOCALIZED: Automated Shaped Crafting", "create.recipe.block_cutting": "UNLOCALIZED: Block Cutting", "create.recipe.wood_cutting": "UNLOCALIZED: Wood Cutting", - "create.recipe.blockzapper_upgrade": "Blockzapper Portátil", "create.recipe.sandpaper_polishing": "UNLOCALIZED: Sandpaper Polishing", "create.recipe.mystery_conversion": "UNLOCALIZED: Mysterious Conversion", "create.recipe.spout_filling": "UNLOCALIZED: Filling by Spout", @@ -752,20 +743,16 @@ "create.orientation.alongZ": "Através de Z", "create.orientation.alongX": "Através de X", - "create.gui.blockzapper.title": "Blockzapper Portátil", - "create.gui.blockzapper.replaceMode": "Modo de Substituição", - "create.gui.blockzapper.searchDiagonal": "Seguir as Diagonais", - "create.gui.blockzapper.searchFuzzy": "Ignorar Material nas Bordas", - "create.gui.blockzapper.range": "Raio de Expansão", - "create.gui.blockzapper.needsUpgradedAmplifier": "UNLOCALIZED: Requires Upgraded Amplifier", - "create.gui.blockzapper.patternSection": "Padrões", - "create.gui.blockzapper.pattern.solid": "Sólido", - "create.gui.blockzapper.pattern.checkered": "Xadrez", - "create.gui.blockzapper.pattern.inversecheckered": "Xadrez invertido", - "create.gui.blockzapper.pattern.chance25": "25% de chance", - "create.gui.blockzapper.pattern.chance50": "50% de chance", - "create.gui.blockzapper.pattern.chance75": "75% de chance", - "create.gui.terrainzapper.title": "UNLOCALIZED: Handheld Worldshaper", + "create.gui.terrainzapper.title": "UNLOCALIZED: Handheld Blockzapper", + "create.gui.terrainzapper.searchDiagonal": "UNLOCALIZED: Follow Diagonals", + "create.gui.terrainzapper.searchFuzzy": "UNLOCALIZED: Ignore Material Borders", + "create.gui.terrainzapper.patternSection": "UNLOCALIZED: Pattern", + "create.gui.terrainzapper.pattern.solid": "UNLOCALIZED: Solid", + "create.gui.terrainzapper.pattern.checkered": "UNLOCALIZED: Checkerboard", + "create.gui.terrainzapper.pattern.inversecheckered": "UNLOCALIZED: Inverted Checkerboard", + "create.gui.terrainzapper.pattern.chance25": "UNLOCALIZED: 25% Roll", + "create.gui.terrainzapper.pattern.chance50": "UNLOCALIZED: 50% Roll", + "create.gui.terrainzapper.pattern.chance75": "UNLOCALIZED: 75% Roll", "create.gui.terrainzapper.placement": "UNLOCALIZED: Placement", "create.gui.terrainzapper.placement.merged": "UNLOCALIZED: Merged", "create.gui.terrainzapper.placement.attached": "UNLOCALIZED: Attached", @@ -774,6 +761,8 @@ "create.gui.terrainzapper.brush.cuboid": "UNLOCALIZED: Cuboid", "create.gui.terrainzapper.brush.sphere": "UNLOCALIZED: Sphere", "create.gui.terrainzapper.brush.cylinder": "UNLOCALIZED: Cylinder", + "create.gui.terrainzapper.brush.surface": "UNLOCALIZED: Surface", + "create.gui.terrainzapper.brush.cluster": "UNLOCALIZED: Cluster", "create.gui.terrainzapper.tool": "UNLOCALIZED: Tool", "create.gui.terrainzapper.tool.fill": "UNLOCALIZED: Fill", "create.gui.terrainzapper.tool.place": "UNLOCALIZED: Place", @@ -783,19 +772,8 @@ "create.gui.terrainzapper.tool.flatten": "UNLOCALIZED: Flatten", "create.terrainzapper.shiftRightClickToSet": "UNLOCALIZED: Shift-Right-Click to Select a Shape", - - "create.blockzapper.usingBlock": "Usando: %1$s", - "create.blockzapper.componentUpgrades": "Melhorias do Componente:", - "create.blockzapper.component.body": "Corpo", - "create.blockzapper.component.amplifier": "Amplificador", - "create.blockzapper.component.accelerator": "Acelerador", - "create.blockzapper.component.retriever": "Retornador", - "create.blockzapper.component.scope": "Mira", - "create.blockzapper.componentTier.none": "Nada", - "create.blockzapper.componentTier.brass": "UNLOCALIZED: Brass", - "create.blockzapper.componentTier.chromatic": "UNLOCALIZED: Chromatic", - "create.blockzapper.leftClickToSet": "Botão-Esquerdo em um Bloco para selecionar Material", - "create.blockzapper.empty": "Sem Blocos!", + "create.terrainzapper.usingBlock": "UNLOCALIZED: Using: %1$s", + "create.terrainzapper.leftClickToSet": "UNLOCALIZED: Left-Click a Block to set Material", "create.minecart_coupling.two_couplings_max": "UNLOCALIZED: Minecarts cannot have more than two couplings each", "create.minecart_coupling.unloaded": "UNLOCALIZED: Parts of your train seem to be in unloaded chunks", @@ -1159,9 +1137,9 @@ "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", - "create.subtitle.blockzapper_confirm": "UNLOCALIZED: Affirmative ding", + "create.subtitle.worldshaper_place": "UNLOCALIZED: Worldshaper zaps", "create.subtitle.depot_slide": "UNLOCALIZED: Item slides", - "create.subtitle.blockzapper_place": "UNLOCALIZED: Blockzapper zaps", + "create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.blaze_munch": "UNLOCALIZED: Blaze Burner munches", "create.subtitle.schematicannon_launch_block": "UNLOCALIZED: Schematicannon fires", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", @@ -1170,11 +1148,11 @@ "create.subtitle.mechanical_press_activation": "UNLOCALIZED: Mechanical Press clangs", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", - "create.subtitle.blockzapper_deny": "UNLOCALIZED: Declining boop", "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", "create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks", "create.subtitle.depot_plop": "UNLOCALIZED: Item lands", + "create.subtitle.confirm": "UNLOCALIZED: Affirmative ding", "_": "->------------------------] Item Descriptions [------------------------<-", @@ -1280,15 +1258,6 @@ "item.create.wand_of_symmetry.tooltip.control3": "B-Direito enquanto Abaixado", "item.create.wand_of_symmetry.tooltip.action3": "Abre _Interface_ de _Configuração_", - "item.create.handheld_blockzapper.tooltip": "BLOCKZAPPER", - "item.create.handheld_blockzapper.tooltip.summary": "Gadget imaginário para colocar ou substituir blocos a distância.", - "item.create.handheld_blockzapper.tooltip.control1": "B-Esquerdo no Bloco", - "item.create.handheld_blockzapper.tooltip.action1": "Define os blocos colocados pela ferramenta no bloco de destino.", - "item.create.handheld_blockzapper.tooltip.control2": "B-Direito em Bloco", - "item.create.handheld_blockzapper.tooltip.action2": "_Coloca_ ou _Substitui_ o bloco alvo.", - "item.create.handheld_blockzapper.tooltip.control3": "B-Direito equando Abaixado", - "item.create.handheld_blockzapper.tooltip.action3": "Abre _Interface_ de _Configuração_", - "item.create.handheld_worldshaper.tooltip": "UNLOCALIZED: HANDHELD WORLDSHAPER", "item.create.handheld_worldshaper.tooltip.summary": "UNLOCALIZED: Handy tool for creating _landscapes_ and _terrain features_.", "item.create.handheld_worldshaper.tooltip.control1": "UNLOCALIZED: L-Click at Block", @@ -1303,9 +1272,6 @@ "item.create.tree_fertilizer.tooltip.condition1": "Quando usada em Mudas", "item.create.tree_fertilizer.tooltip.behaviour1": "Cresce Arvores independentemente das suas Regras de espaço", - "item.create.deforester.tooltip": "UNLOCALIZED: DEFORESTER", - "item.create.deforester.tooltip.summary": "UNLOCALIZED: A _radiant axe_ able to chop down trees in a split second.", - "item.create.extendo_grip.tooltip": "UNLOCALIZED: EXTENDO GRIP", "item.create.extendo_grip.tooltip.summary": "UNLOCALIZED: Boioioing! Greatly _increases reach distance_ of the wielder.", "item.create.extendo_grip.tooltip.condition1": "UNLOCALIZED: When in Off-Hand", 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 89c218e6d..3bf313cbe 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json +++ b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 534", + "_": "Missing Localizations: 550", "_": "->------------------------] Game Elements [------------------------<-", @@ -456,7 +456,6 @@ "item.create.crushed_tin_ore": "Дроблёная оловянная руда", "item.create.crushed_uranium_ore": "Дроблёная урановая руда", "item.create.crushed_zinc_ore": "Дроблёная цинковая руда", - "item.create.deforester": "Уничтожитель леса", "item.create.dough": "Тесто", "item.create.electron_tube": "Электронная лампа", "item.create.empty_blaze_burner": "Пустая горелека Всполоха", @@ -466,7 +465,6 @@ "item.create.furnace_minecart_contraption": "Печно-вагонеточная штуковина", "item.create.goggles": "Инженерные очки", "item.create.golden_sheet": "Золотой лист", - "item.create.handheld_blockzapper": "Ручная блоковая пушка", "item.create.handheld_worldshaper": "Ручной редактор мира", "item.create.honey_bucket": "Ведро мёда", "item.create.honeyed_apple": "Яблоко в меду", @@ -645,14 +643,8 @@ "advancement.create.refined_radiance.desc": "Создайте изысканное сияние, мощное хроматическое вещество.", "advancement.create.chromatic_age": "Хроматический век", "advancement.create.chromatic_age.desc": "Создайте блоки корпуса из света и тьмы.", - "advancement.create.zapper": "Строительство со стилем", - "advancement.create.zapper.desc": "Создайте ручную блоковую пушку, которая поможет вам строить.", - "advancement.create.upgraded_zapper": "Сияющий овердрайв", - "advancement.create.upgraded_zapper.desc": "Создайте и активируйте полностью модернизированную ручную блоковую пушку.", "advancement.create.wand_of_symmetry": "Сияющие зеркала", "advancement.create.wand_of_symmetry.desc": "Создайте жезл симметрии.", - "advancement.create.deforester": "Лучистая рубка", - "advancement.create.deforester.desc": "Создайте уничтожитель леса и попрощайтесь с местным лесом.", "advancement.create.extendo_grip": "Кипение!", "advancement.create.extendo_grip.desc": "Возьмите в руки удлинённую руку", "advancement.create.dual_extendo_grip": "Окончательное выкипание", @@ -695,7 +687,6 @@ "create.recipe.automatic_shaped": "Автоматическая форменная сборка", "create.recipe.block_cutting": "Резка блока", "create.recipe.wood_cutting": "UNLOCALIZED: Wood Cutting", - "create.recipe.blockzapper_upgrade": "Ручная блоковая пушка", "create.recipe.sandpaper_polishing": "Полировка наждачной бумагой", "create.recipe.mystery_conversion": "Хроматический метаморфоз", "create.recipe.spout_filling": "Заполнение дозатором", @@ -752,20 +743,16 @@ "create.orientation.alongZ": "Вдоль Z", "create.orientation.alongX": "Вдоль X", - "create.gui.blockzapper.title": "Ручная блоковая пушка", - "create.gui.blockzapper.replaceMode": "Режим замены", - "create.gui.blockzapper.searchDiagonal": "Следовать по диагонали", - "create.gui.blockzapper.searchFuzzy": "Игнорировать границы материала", - "create.gui.blockzapper.range": "Диапазон распространения", - "create.gui.blockzapper.needsUpgradedAmplifier": "Требуется модернизированный усилитель", - "create.gui.blockzapper.patternSection": "Шаблон", - "create.gui.blockzapper.pattern.solid": "Всё", - "create.gui.blockzapper.pattern.checkered": "Шахматная доска", - "create.gui.blockzapper.pattern.inversecheckered": "Перевернутая шахматная доска", - "create.gui.blockzapper.pattern.chance25": "25% крен", - "create.gui.blockzapper.pattern.chance50": "50% крен", - "create.gui.blockzapper.pattern.chance75": "75% крен", "create.gui.terrainzapper.title": "Ручной редактор мира", + "create.gui.terrainzapper.searchDiagonal": "UNLOCALIZED: Follow Diagonals", + "create.gui.terrainzapper.searchFuzzy": "UNLOCALIZED: Ignore Material Borders", + "create.gui.terrainzapper.patternSection": "UNLOCALIZED: Pattern", + "create.gui.terrainzapper.pattern.solid": "UNLOCALIZED: Solid", + "create.gui.terrainzapper.pattern.checkered": "UNLOCALIZED: Checkerboard", + "create.gui.terrainzapper.pattern.inversecheckered": "UNLOCALIZED: Inverted Checkerboard", + "create.gui.terrainzapper.pattern.chance25": "UNLOCALIZED: 25% Roll", + "create.gui.terrainzapper.pattern.chance50": "UNLOCALIZED: 50% Roll", + "create.gui.terrainzapper.pattern.chance75": "UNLOCALIZED: 75% Roll", "create.gui.terrainzapper.placement": "Размещение", "create.gui.terrainzapper.placement.merged": "Слитый", "create.gui.terrainzapper.placement.attached": "Прикреплённый", @@ -774,6 +761,8 @@ "create.gui.terrainzapper.brush.cuboid": "Куб", "create.gui.terrainzapper.brush.sphere": "Сфера", "create.gui.terrainzapper.brush.cylinder": "Цилиндр", + "create.gui.terrainzapper.brush.surface": "UNLOCALIZED: Surface", + "create.gui.terrainzapper.brush.cluster": "UNLOCALIZED: Cluster", "create.gui.terrainzapper.tool": "Инструмент", "create.gui.terrainzapper.tool.fill": "Заполнить", "create.gui.terrainzapper.tool.place": "Поставить", @@ -783,19 +772,8 @@ "create.gui.terrainzapper.tool.flatten": "Выравнивание", "create.terrainzapper.shiftRightClickToSet": "ПКМ крадучись, чтобы выбрать форму", - - "create.blockzapper.usingBlock": "С помощью: %1$s", - "create.blockzapper.componentUpgrades": "Обновления компонентов:", - "create.blockzapper.component.body": "Корпус", - "create.blockzapper.component.amplifier": "Усилитель", - "create.blockzapper.component.accelerator": "Ускоритель", - "create.blockzapper.component.retriever": "Поисковик", - "create.blockzapper.component.scope": "Объем", - "create.blockzapper.componentTier.none": "Нет", - "create.blockzapper.componentTier.brass": "Латунный", - "create.blockzapper.componentTier.chromatic": "Хроматический", - "create.blockzapper.leftClickToSet": "Щелкните ЛКМ по блоку, чтобы выбрать материал", - "create.blockzapper.empty": "Вне блоков!", + "create.terrainzapper.usingBlock": "UNLOCALIZED: Using: %1$s", + "create.terrainzapper.leftClickToSet": "UNLOCALIZED: Left-Click a Block to set Material", "create.minecart_coupling.two_couplings_max": "Вагонетки могут иметь только две связи", "create.minecart_coupling.unloaded": "Кажется, часть вашего поезда в незагруженных чанках", @@ -1159,9 +1137,9 @@ "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", - "create.subtitle.blockzapper_confirm": "Утвердительный динь", + "create.subtitle.worldshaper_place": "UNLOCALIZED: Worldshaper zaps", "create.subtitle.depot_slide": "UNLOCALIZED: Item slides", - "create.subtitle.blockzapper_place": "Блок запрыгивает на место", + "create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.blaze_munch": "Всполох радостно жуёт", "create.subtitle.schematicannon_launch_block": "Выстрелы схематичной пушки", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", @@ -1170,11 +1148,11 @@ "create.subtitle.mechanical_press_activation": "Механический пресс активирован", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", - "create.subtitle.blockzapper_deny": "Тихий буп", "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", "create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks", "create.subtitle.depot_plop": "UNLOCALIZED: Item lands", + "create.subtitle.confirm": "UNLOCALIZED: Affirmative ding", "_": "->------------------------] Item Descriptions [------------------------<-", @@ -1280,15 +1258,6 @@ "item.create.wand_of_symmetry.tooltip.control3": "ПКМ крадучись", "item.create.wand_of_symmetry.tooltip.action3": "Открывает _интерфейс_ _конфигурации_", - "item.create.handheld_blockzapper.tooltip": "BLOCKZAPPER", - "item.create.handheld_blockzapper.tooltip.summary": "Новейшее устройство для размещения или замены блоков на расстоянии.", - "item.create.handheld_blockzapper.tooltip.control1": "ЛКМ на блок", - "item.create.handheld_blockzapper.tooltip.action1": "Устанавливает выбранный блок как материал.", - "item.create.handheld_blockzapper.tooltip.control2": "ПКМ на блок", - "item.create.handheld_blockzapper.tooltip.action2": "_Размещает_ или _Замещает_ блок.", - "item.create.handheld_blockzapper.tooltip.control3": "ПКМ крадучись", - "item.create.handheld_blockzapper.tooltip.action3": "Открывает _интерфейс_ _конфигурации_", - "item.create.handheld_worldshaper.tooltip": "HANDHELD WORLDSHAPER", "item.create.handheld_worldshaper.tooltip.summary": "Удобный инструмент для создания _ландшафтов_ и _рельефа_ _местности_.", "item.create.handheld_worldshaper.tooltip.control1": "ЛКМ на блок", @@ -1303,9 +1272,6 @@ "item.create.tree_fertilizer.tooltip.condition1": "При использовании на саженце", "item.create.tree_fertilizer.tooltip.behaviour1": "Выращивает деревья,_независимо_ от _условий_ _их_ _расположения_", - "item.create.deforester.tooltip": "DEFORESTER", - "item.create.deforester.tooltip.summary": "_Уничтожитель_ _леса_, способен рубить деревья за доли секунды.", - "item.create.extendo_grip.tooltip": "EXTENDO GRIP", "item.create.extendo_grip.tooltip.summary": "Бойоиоинг! Значительно _увеличивает_ _досягаемость_ владельца.", "item.create.extendo_grip.tooltip.condition1": "Находясь в другой руке", 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 e557f4c8b..73926ad0b 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 634", + "_": "Missing Localizations: 650", "_": "->------------------------] Game Elements [------------------------<-", @@ -456,7 +456,6 @@ "item.create.crushed_tin_ore": "粉碎锡矿石", "item.create.crushed_uranium_ore": "粉碎铀矿石", "item.create.crushed_zinc_ore": "粉碎锌矿石", - "item.create.deforester": "树林毁灭者", "item.create.dough": "面团", "item.create.electron_tube": "电子管", "item.create.empty_blaze_burner": "空的烈焰人燃烧室", @@ -466,7 +465,6 @@ "item.create.furnace_minecart_contraption": "装配过的动力矿车", "item.create.goggles": "工程师护目镜", "item.create.golden_sheet": "金板", - "item.create.handheld_blockzapper": "手持式方块放置器", "item.create.handheld_worldshaper": "手持式环境塑形器", "item.create.honey_bucket": "蜂蜜桶", "item.create.honeyed_apple": "UNLOCALIZED: Honeyed Apple", @@ -645,14 +643,8 @@ "advancement.create.refined_radiance.desc": "制作一个光辉石", "advancement.create.chromatic_age": "异彩纪元", "advancement.create.chromatic_age.desc": "创造出光与影的机壳。", - "advancement.create.zapper": "讲究的建筑师", - "advancement.create.zapper.desc": "制作一个非常方便的手持方块放置器", - "advancement.create.upgraded_zapper": "来自异世界的超频", - "advancement.create.upgraded_zapper.desc": "制作一个完全升级的手持方块放置器", "advancement.create.wand_of_symmetry": "简单的镜面几何学", "advancement.create.wand_of_symmetry.desc": "制作一个对称之杖", - "advancement.create.deforester": "超时空砍伐", - "advancement.create.deforester.desc": "制作一个森林毁灭者，然后跟你后院的树林说再见吧", "advancement.create.extendo_grip": "biu biu biu!", "advancement.create.extendo_grip.desc": "获得一个伸缩机械手", "advancement.create.dual_extendo_grip": "biu——biu——biu——", @@ -695,7 +687,6 @@ "create.recipe.automatic_shaped": "自动合成", "create.recipe.block_cutting": "方块切割", "create.recipe.wood_cutting": "UNLOCALIZED: Wood Cutting", - "create.recipe.blockzapper_upgrade": "手持式方块放置器", "create.recipe.sandpaper_polishing": "砂纸打磨", "create.recipe.mystery_conversion": "神秘转化", "create.recipe.spout_filling": "注液", @@ -752,20 +743,16 @@ "create.orientation.alongZ": "以z轴对齐", "create.orientation.alongX": "以x轴对齐", - "create.gui.blockzapper.title": "手持式方块放置机", - "create.gui.blockzapper.replaceMode": "替换模式", - "create.gui.blockzapper.searchDiagonal": "对角线延伸", - "create.gui.blockzapper.searchFuzzy": "忽视种类分界", - "create.gui.blockzapper.range": "延伸范围", - "create.gui.blockzapper.needsUpgradedAmplifier": "需要升级范围扩大器", - "create.gui.blockzapper.patternSection": "模式", - "create.gui.blockzapper.pattern.solid": "实心", - "create.gui.blockzapper.pattern.checkered": "棋盘", - "create.gui.blockzapper.pattern.inversecheckered": "反转棋盘", - "create.gui.blockzapper.pattern.chance25": "25% ", - "create.gui.blockzapper.pattern.chance50": "50% ", - "create.gui.blockzapper.pattern.chance75": "75% ", "create.gui.terrainzapper.title": "手持式环境塑形器", + "create.gui.terrainzapper.searchDiagonal": "UNLOCALIZED: Follow Diagonals", + "create.gui.terrainzapper.searchFuzzy": "UNLOCALIZED: Ignore Material Borders", + "create.gui.terrainzapper.patternSection": "UNLOCALIZED: Pattern", + "create.gui.terrainzapper.pattern.solid": "UNLOCALIZED: Solid", + "create.gui.terrainzapper.pattern.checkered": "UNLOCALIZED: Checkerboard", + "create.gui.terrainzapper.pattern.inversecheckered": "UNLOCALIZED: Inverted Checkerboard", + "create.gui.terrainzapper.pattern.chance25": "UNLOCALIZED: 25% Roll", + "create.gui.terrainzapper.pattern.chance50": "UNLOCALIZED: 50% Roll", + "create.gui.terrainzapper.pattern.chance75": "UNLOCALIZED: 75% Roll", "create.gui.terrainzapper.placement": "放置模式", "create.gui.terrainzapper.placement.merged": "结合", "create.gui.terrainzapper.placement.attached": "依附", @@ -774,6 +761,8 @@ "create.gui.terrainzapper.brush.cuboid": "矩形体", "create.gui.terrainzapper.brush.sphere": "球体", "create.gui.terrainzapper.brush.cylinder": "圆柱体", + "create.gui.terrainzapper.brush.surface": "UNLOCALIZED: Surface", + "create.gui.terrainzapper.brush.cluster": "UNLOCALIZED: Cluster", "create.gui.terrainzapper.tool": "填充类型", "create.gui.terrainzapper.tool.fill": "填充", "create.gui.terrainzapper.tool.place": "复写", @@ -783,19 +772,8 @@ "create.gui.terrainzapper.tool.flatten": "平整", "create.terrainzapper.shiftRightClickToSet": "Shift+鼠标右键以设置塑形类型", - - "create.blockzapper.usingBlock": "使用:%1$s", - "create.blockzapper.componentUpgrades": "组件升级：", - "create.blockzapper.component.body": "放置器机体", - "create.blockzapper.component.amplifier": "范围扩大器", - "create.blockzapper.component.accelerator": "射击加速器", - "create.blockzapper.component.retriever": "物品回捡器", - "create.blockzapper.component.scope": "距离观察镜", - "create.blockzapper.componentTier.none": "无", - "create.blockzapper.componentTier.brass": "黄铜", - "create.blockzapper.componentTier.chromatic": "异彩化合物", - "create.blockzapper.leftClickToSet": "左击方块将其设定为放置方块", - "create.blockzapper.empty": "方块不足！", + "create.terrainzapper.usingBlock": "UNLOCALIZED: Using: %1$s", + "create.terrainzapper.leftClickToSet": "UNLOCALIZED: Left-Click a Block to set Material", "create.minecart_coupling.two_couplings_max": "矿车无法被连接两个以上的矿车连轴器", "create.minecart_coupling.unloaded": "有一部分火车存在于未加载区块中", @@ -1159,9 +1137,9 @@ "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", - "create.subtitle.blockzapper_confirm": "选择方块", + "create.subtitle.worldshaper_place": "UNLOCALIZED: Worldshaper zaps", "create.subtitle.depot_slide": "UNLOCALIZED: Item slides", - "create.subtitle.blockzapper_place": "放置方块", + "create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.blaze_munch": "烈焰人：开心地咀嚼着", "create.subtitle.schematicannon_launch_block": "蓝图加农炮：发射", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", @@ -1170,11 +1148,11 @@ "create.subtitle.mechanical_press_activation": "辊压机：工作中", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", - "create.subtitle.blockzapper_deny": "放置失败", "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", "create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks", "create.subtitle.depot_plop": "UNLOCALIZED: Item lands", + "create.subtitle.confirm": "UNLOCALIZED: Affirmative ding", "_": "->------------------------] Item Descriptions [------------------------<-", @@ -1280,15 +1258,6 @@ "item.create.wand_of_symmetry.tooltip.control3": "当潜行右键时", "item.create.wand_of_symmetry.tooltip.action3": "打开_配置界面_。", - "item.create.handheld_blockzapper.tooltip": "手持式方块放置器", - "item.create.handheld_blockzapper.tooltip.summary": "新颖的小工具，可以远距离放置或更换方块。", - "item.create.handheld_blockzapper.tooltip.control1": "当左击方块时", - "item.create.handheld_blockzapper.tooltip.action1": "将工具放置的方块设置为该方块。", - "item.create.handheld_blockzapper.tooltip.control2": "当右击方块时", - "item.create.handheld_blockzapper.tooltip.action2": "_放置_或_替换_目标方块。", - "item.create.handheld_blockzapper.tooltip.control3": "当潜行右击时", - "item.create.handheld_blockzapper.tooltip.action3": "打开_配置界面_。", - "item.create.handheld_worldshaper.tooltip": "手持式环境塑形器", "item.create.handheld_worldshaper.tooltip.summary": "_创造_大陆和山脉的手持工具", "item.create.handheld_worldshaper.tooltip.control1": "当左击方块时", @@ -1303,9 +1272,6 @@ "item.create.tree_fertilizer.tooltip.condition1": "在树苗上使用时", "item.create.tree_fertilizer.tooltip.behaviour1": "使得该树_无视_它的_生长空间条件_，立刻长大。", - "item.create.deforester.tooltip": "树林毁灭者", - "item.create.deforester.tooltip.summary": "一把_光辉四溢的斧子_，能够瞬间砍倒一棵树", - "item.create.extendo_grip.tooltip": "伸缩机械手", "item.create.extendo_grip.tooltip.summary": "biubiubiu! 大幅度_增加了_使用者的_触碰距离_。", "item.create.extendo_grip.tooltip.condition1": "放置于副手栏时", 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 a6cca6523..2beea3cc9 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_tw.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_tw.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 639", + "_": "Missing Localizations: 655", "_": "->------------------------] Game Elements [------------------------<-", @@ -456,7 +456,6 @@ "item.create.crushed_tin_ore": "碎狀錫礦石", "item.create.crushed_uranium_ore": "碎狀鈾礦石", "item.create.crushed_zinc_ore": "碎狀鋅礦石", - "item.create.deforester": "連根拔樹斧", "item.create.dough": "麵團", "item.create.electron_tube": "真空管", "item.create.empty_blaze_burner": "空的烈焰使者動力爐", @@ -466,7 +465,6 @@ "item.create.furnace_minecart_contraption": "裝配過的機械礦車", "item.create.goggles": "MR護目鏡", "item.create.golden_sheet": "金板", - "item.create.handheld_blockzapper": "方塊放置器", "item.create.handheld_worldshaper": "地形雕塑器", "item.create.honey_bucket": "蜂蜜桶", "item.create.honeyed_apple": "UNLOCALIZED: Honeyed Apple", @@ -645,14 +643,8 @@ "advancement.create.refined_radiance.desc": "製作光輝石", "advancement.create.chromatic_age": "繽紛時代", "advancement.create.chromatic_age.desc": "創造出光與影的機殼。", - "advancement.create.zapper": "專業的建築師", - "advancement.create.zapper.desc": "製作一個非常方便的方塊放置器", - "advancement.create.upgraded_zapper": "來自異世界的超頻", - "advancement.create.upgraded_zapper.desc": "製作一個完全升級的方塊放置器", "advancement.create.wand_of_symmetry": "簡單的鏡面幾何學", "advancement.create.wand_of_symmetry.desc": "製作一個對稱杖", - "advancement.create.deforester": "超時空砍伐", - "advancement.create.deforester.desc": "製作一個連根拔樹斧，然後跟你後院的樹林道別吧", "advancement.create.extendo_grip": "piu piu piu!", "advancement.create.extendo_grip.desc": "拿到一個伸縮機械手", "advancement.create.dual_extendo_grip": "piu——piu——piu——", @@ -695,7 +687,6 @@ "create.recipe.automatic_shaped": "自動合成", "create.recipe.block_cutting": "方塊切割", "create.recipe.wood_cutting": "UNLOCALIZED: Wood Cutting", - "create.recipe.blockzapper_upgrade": "方塊放置器", "create.recipe.sandpaper_polishing": "砂紙打磨", "create.recipe.mystery_conversion": "神秘轉化", "create.recipe.spout_filling": "注液", @@ -752,20 +743,16 @@ "create.orientation.alongZ": "以z軸對齊", "create.orientation.alongX": "以x軸對齊", - "create.gui.blockzapper.title": "方塊放置機", - "create.gui.blockzapper.replaceMode": "替換模式", - "create.gui.blockzapper.searchDiagonal": "對角線延伸", - "create.gui.blockzapper.searchFuzzy": "忽視種類分界", - "create.gui.blockzapper.range": "延伸範圍", - "create.gui.blockzapper.needsUpgradedAmplifier": "需要升級範圍擴大器", - "create.gui.blockzapper.patternSection": "模式", - "create.gui.blockzapper.pattern.solid": "實心", - "create.gui.blockzapper.pattern.checkered": "棋盤", - "create.gui.blockzapper.pattern.inversecheckered": "反轉棋盤", - "create.gui.blockzapper.pattern.chance25": "25% ", - "create.gui.blockzapper.pattern.chance50": "50% ", - "create.gui.blockzapper.pattern.chance75": "75% ", "create.gui.terrainzapper.title": "地形雕塑器", + "create.gui.terrainzapper.searchDiagonal": "UNLOCALIZED: Follow Diagonals", + "create.gui.terrainzapper.searchFuzzy": "UNLOCALIZED: Ignore Material Borders", + "create.gui.terrainzapper.patternSection": "UNLOCALIZED: Pattern", + "create.gui.terrainzapper.pattern.solid": "UNLOCALIZED: Solid", + "create.gui.terrainzapper.pattern.checkered": "UNLOCALIZED: Checkerboard", + "create.gui.terrainzapper.pattern.inversecheckered": "UNLOCALIZED: Inverted Checkerboard", + "create.gui.terrainzapper.pattern.chance25": "UNLOCALIZED: 25% Roll", + "create.gui.terrainzapper.pattern.chance50": "UNLOCALIZED: 50% Roll", + "create.gui.terrainzapper.pattern.chance75": "UNLOCALIZED: 75% Roll", "create.gui.terrainzapper.placement": "放置模式", "create.gui.terrainzapper.placement.merged": "結合", "create.gui.terrainzapper.placement.attached": "依附", @@ -774,6 +761,8 @@ "create.gui.terrainzapper.brush.cuboid": "矩形體", "create.gui.terrainzapper.brush.sphere": "球體", "create.gui.terrainzapper.brush.cylinder": "圓柱體", + "create.gui.terrainzapper.brush.surface": "UNLOCALIZED: Surface", + "create.gui.terrainzapper.brush.cluster": "UNLOCALIZED: Cluster", "create.gui.terrainzapper.tool": "填充類型", "create.gui.terrainzapper.tool.fill": "填充", "create.gui.terrainzapper.tool.place": "覆寫", @@ -783,19 +772,8 @@ "create.gui.terrainzapper.tool.flatten": "平整", "create.terrainzapper.shiftRightClickToSet": "Shift+滑鼠右鍵 以設定雕塑類型", - - "create.blockzapper.usingBlock": "使用:%1$s", - "create.blockzapper.componentUpgrades": "零件升級:", - "create.blockzapper.component.body": "放置器機體", - "create.blockzapper.component.amplifier": "範圍擴大器", - "create.blockzapper.component.accelerator": "射擊加速器", - "create.blockzapper.component.retriever": "物品撿回器", - "create.blockzapper.component.scope": "距離觀察鏡", - "create.blockzapper.componentTier.none": "無", - "create.blockzapper.componentTier.brass": "黃銅", - "create.blockzapper.componentTier.chromatic": "異彩化合物", - "create.blockzapper.leftClickToSet": "左鍵點擊方塊以設定方塊種類", - "create.blockzapper.empty": "方塊不足！", + "create.terrainzapper.usingBlock": "UNLOCALIZED: Using: %1$s", + "create.terrainzapper.leftClickToSet": "UNLOCALIZED: Left-Click a Block to set Material", "create.minecart_coupling.two_couplings_max": "礦車無法被連接兩個以上的礦車連結器", "create.minecart_coupling.unloaded": "有一部份礦車存在於未讀取區塊中", @@ -1159,9 +1137,9 @@ "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", - "create.subtitle.blockzapper_confirm": "選擇方塊", + "create.subtitle.worldshaper_place": "UNLOCALIZED: Worldshaper zaps", "create.subtitle.depot_slide": "UNLOCALIZED: Item slides", - "create.subtitle.blockzapper_place": "放置方塊", + "create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.blaze_munch": "烈焰使者開心地吃著", "create.subtitle.schematicannon_launch_block": "藍圖大炮發射", "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps", @@ -1170,11 +1148,11 @@ "create.subtitle.mechanical_press_activation": "液壓機工作", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", - "create.subtitle.blockzapper_deny": "放置失敗", "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", "create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks", "create.subtitle.depot_plop": "UNLOCALIZED: Item lands", + "create.subtitle.confirm": "UNLOCALIZED: Affirmative ding", "_": "->------------------------] Item Descriptions [------------------------<-", @@ -1280,15 +1258,6 @@ "item.create.wand_of_symmetry.tooltip.control3": "當潛行右鍵時", "item.create.wand_of_symmetry.tooltip.action3": "打開_gui界面_", - "item.create.handheld_blockzapper.tooltip": "方塊放置器", - "item.create.handheld_blockzapper.tooltip.summary": "新穎的小工具，可以遠距離放置或更換方塊。", - "item.create.handheld_blockzapper.tooltip.control1": "當左鍵方塊時", - "item.create.handheld_blockzapper.tooltip.action1": "設定放置此方塊。", - "item.create.handheld_blockzapper.tooltip.control2": "當右鍵方塊時", - "item.create.handheld_blockzapper.tooltip.action2": "_放置_或_替換_目標方塊。", - "item.create.handheld_blockzapper.tooltip.control3": "當潛行右鍵時", - "item.create.handheld_blockzapper.tooltip.action3": "打開_gui界面_", - "item.create.handheld_worldshaper.tooltip": "環境塑形器", "item.create.handheld_worldshaper.tooltip.summary": "_大面積_更改地形的手持工具", "item.create.handheld_worldshaper.tooltip.control1": "當左鍵方塊時", @@ -1303,9 +1272,6 @@ "item.create.tree_fertilizer.tooltip.condition1": "在樹苗上使用時", "item.create.tree_fertilizer.tooltip.behaviour1": "無論_生長時間_多少，直接長大", - "item.create.deforester.tooltip": "連根拔樹斧", - "item.create.deforester.tooltip.summary": "_連根拔樹斧_，從最根砍樹時，能夠瞬間連根拔起一棵樹", - "item.create.extendo_grip.tooltip": "伸縮機械手", "item.create.extendo_grip.tooltip.summary": "biubiubiu! 大幅度_增加了_使用者的_觸碰距離_。", "item.create.extendo_grip.tooltip.condition1": "放置於副手欄時", diff --git a/src/generated/resources/assets/create/models/item/deforester.json b/src/generated/resources/assets/create/models/item/deforester.json deleted file mode 100644 index 00fa0cc0c..000000000 --- a/src/generated/resources/assets/create/models/item/deforester.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:item/deforester/item" -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/handheld_blockzapper.json b/src/generated/resources/assets/create/models/item/handheld_blockzapper.json deleted file mode 100644 index a48ce16e4..000000000 --- a/src/generated/resources/assets/create/models/item/handheld_blockzapper.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:item/handheld_blockzapper/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 aea8a9701..24f47e279 100644 --- a/src/generated/resources/assets/create/sounds.json +++ b/src/generated/resources/assets/create/sounds.json @@ -8,38 +8,20 @@ ], "subtitle": "create.subtitle.blaze_munch" }, - "blockzapper_confirm": { + "cogs": { + "sounds": [ + "create:cogs" + ], + "subtitle": "create.subtitle.cogs" + }, + "confirm": { "sounds": [ { "name": "minecraft:block.note_block.bell", "type": "event" } ], - "subtitle": "create.subtitle.blockzapper_confirm" - }, - "blockzapper_deny": { - "sounds": [ - { - "name": "minecraft:block.note_block.bass", - "type": "event" - } - ], - "subtitle": "create.subtitle.blockzapper_deny" - }, - "blockzapper_place": { - "sounds": [ - { - "name": "minecraft:block.note_block.basedrum", - "type": "event" - } - ], - "subtitle": "create.subtitle.blockzapper_place" - }, - "cogs": { - "sounds": [ - "create:cogs" - ], - "subtitle": "create.subtitle.cogs" + "subtitle": "create.subtitle.confirm" }, "contraption_assemble": { "sounds": [ @@ -110,6 +92,15 @@ } ] }, + "deny": { + "sounds": [ + { + "name": "minecraft:block.note_block.bass", + "type": "event" + } + ], + "subtitle": "create.subtitle.deny" + }, "depot_plop": { "sounds": [ { @@ -232,6 +223,15 @@ ], "subtitle": "create.subtitle.slime_added" }, + "worldshaper_place": { + "sounds": [ + { + "name": "minecraft:block.note_block.basedrum", + "type": "event" + } + ], + "subtitle": "create.subtitle.worldshaper_place" + }, "wrench_remove": { "sounds": [ { diff --git a/src/generated/resources/data/create/advancements/deforester.json b/src/generated/resources/data/create/advancements/deforester.json deleted file mode 100644 index c0db60900..000000000 --- a/src/generated/resources/data/create/advancements/deforester.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "parent": "create:refined_radiance", - "display": { - "icon": { - "item": "create:deforester", - "nbt": "{Damage:0}" - }, - "title": { - "translate": "advancement.create.deforester" - }, - "description": { - "translate": "advancement.create.deforester.desc" - }, - "frame": "task", - "show_toast": true, - "announce_to_chat": false, - "hidden": false - }, - "criteria": { - "0": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "create:deforester" - } - ] - } - } - }, - "requirements": [ - [ - "0" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/curiosities/deforester.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/curiosities/deforester.json deleted file mode 100644 index 31d8dbe0f..000000000 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/curiosities/deforester.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:crafting/curiosities/deforester" - ] - }, - "criteria": { - "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "create:refined_radiance" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "create:crafting/curiosities/deforester" - } - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/curiosities/handheld_blockzapper.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/curiosities/handheld_blockzapper.json deleted file mode 100644 index 737429783..000000000 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/curiosities/handheld_blockzapper.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:crafting/curiosities/handheld_blockzapper" - ] - }, - "criteria": { - "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "create:refined_radiance" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "create:crafting/curiosities/handheld_blockzapper" - } - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/upgraded_zapper.json b/src/generated/resources/data/create/advancements/upgraded_zapper.json deleted file mode 100644 index 870723d1a..000000000 --- a/src/generated/resources/data/create/advancements/upgraded_zapper.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "parent": "create:zapper", - "display": { - "icon": { - "item": "create:handheld_blockzapper", - "nbt": "{Retriever:\"Chromatic\",Scope:\"Chromatic\",Amplifier:\"Chromatic\",Body:\"Chromatic\",Accelerator:\"Chromatic\"}" - }, - "title": { - "translate": "advancement.create.upgraded_zapper" - }, - "description": { - "translate": "advancement.create.upgraded_zapper.desc" - }, - "frame": "challenge", - "show_toast": true, - "announce_to_chat": true, - "hidden": false - }, - "criteria": { - "0": { - "trigger": "create:upgraded_zapper", - "conditions": {} - } - }, - "requirements": [ - [ - "0" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/zapper.json b/src/generated/resources/data/create/advancements/zapper.json deleted file mode 100644 index 07313062d..000000000 --- a/src/generated/resources/data/create/advancements/zapper.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "create:refined_radiance", - "display": { - "icon": { - "item": "create:handheld_blockzapper" - }, - "title": { - "translate": "advancement.create.zapper" - }, - "description": { - "translate": "advancement.create.zapper.desc" - }, - "frame": "task", - "show_toast": true, - "announce_to_chat": false, - "hidden": false - }, - "criteria": { - "0": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "create:handheld_blockzapper" - } - ] - } - } - }, - "requirements": [ - [ - "0" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/curiosities/deforester.json b/src/generated/resources/data/create/recipes/crafting/curiosities/deforester.json deleted file mode 100644 index de44f0a44..000000000 --- a/src/generated/resources/data/create/recipes/crafting/curiosities/deforester.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "EG", - "EO", - " O" - ], - "key": { - "E": { - "item": "create:refined_radiance" - }, - "G": { - "item": "create:cogwheel" - }, - "O": { - "tag": "forge:obsidian" - } - }, - "result": { - "item": "create:deforester" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/curiosities/handheld_blockzapper.json b/src/generated/resources/data/create/recipes/crafting/curiosities/handheld_blockzapper.json deleted file mode 100644 index 02b7a8cd0..000000000 --- a/src/generated/resources/data/create/recipes/crafting/curiosities/handheld_blockzapper.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " E", - " O ", - "OA " - ], - "key": { - "E": { - "item": "create:refined_radiance" - }, - "A": { - "item": "create:andesite_alloy" - }, - "O": { - "tag": "forge:obsidian" - } - }, - "result": { - "item": "create:handheld_blockzapper" - } -} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index fb06bd42f..bf7e9dc14 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -179,6 +179,7 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.data.ShapedRecipeBuilder; import net.minecraft.item.DyeColor; import net.minecraft.item.Item; +import net.minecraft.item.Rarity; import net.minecraft.state.properties.PistonType; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; @@ -336,6 +337,7 @@ public class AllBlocks { .blockstate(new CreativeMotorGenerator()::generate) .transform(StressConfigDefaults.setCapacity(16384.0)) .item() + .properties(p -> p.rarity(Rarity.EPIC)) .transform(customItemModel()) .register(); @@ -644,6 +646,7 @@ public class AllBlocks { .onRegister(CreateRegistrate.blockModel(() -> FluidTankModel::creative)) .addLayer(() -> RenderType::getCutoutMipped) .item(FluidTankItem::new) + .properties(p -> p.rarity(Rarity.EPIC)) .model((c, p) -> p.withExistingParent(c.getName(), p.modLoc("block/fluid_tank/block_single_window")) .texture("5", p.modLoc("block/creative_fluid_tank_window_single")) .texture("1", p.modLoc("block/creative_fluid_tank")) diff --git a/src/main/java/com/simibubi/create/AllItems.java b/src/main/java/com/simibubi/create/AllItems.java index 6554462e0..9d68df344 100644 --- a/src/main/java/com/simibubi/create/AllItems.java +++ b/src/main/java/com/simibubi/create/AllItems.java @@ -31,14 +31,10 @@ import com.simibubi.create.content.curiosities.ShadowSteelItem; import com.simibubi.create.content.curiosities.TreeFertilizerItem; import com.simibubi.create.content.curiosities.symmetry.SymmetryWandItem; import com.simibubi.create.content.curiosities.symmetry.client.SymmetryWandModel; -import com.simibubi.create.content.curiosities.tools.DeforesterItem; -import com.simibubi.create.content.curiosities.tools.DeforesterModel; import com.simibubi.create.content.curiosities.tools.ExtendoGripItem; import com.simibubi.create.content.curiosities.tools.ExtendoGripModel; import com.simibubi.create.content.curiosities.tools.SandPaperItem; import com.simibubi.create.content.curiosities.tools.SandPaperItemRenderer.SandPaperModel; -import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem; -import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperModel; import com.simibubi.create.content.curiosities.zapper.terrainzapper.WorldshaperItem; import com.simibubi.create.content.curiosities.zapper.terrainzapper.WorldshaperModel; import com.simibubi.create.content.logistics.item.filter.FilterItem; @@ -208,6 +204,25 @@ public class AllItems { .model(AssetLookup.itemModelWithPartials()) .register(); + public static final ItemEntry EXTENDO_GRIP = REGISTRATE.item("extendo_grip", ExtendoGripItem::new) + .transform(CreateRegistrate.customRenderedItem(() -> ExtendoGripModel::new)) + .model(AssetLookup.itemModelWithPartials()) + .register(); + + public static final ItemEntry WAND_OF_SYMMETRY = + REGISTRATE.item("wand_of_symmetry", SymmetryWandItem::new) + .transform(CreateRegistrate.customRenderedItem(() -> SymmetryWandModel::new)) + .model(AssetLookup.itemModelWithPartials()) + .register(); + + public static final ItemEntry WORLDSHAPER = + REGISTRATE.item("handheld_worldshaper", WorldshaperItem::new) + .properties(p -> p.rarity(Rarity.EPIC)) + .transform(CreateRegistrate.customRenderedItem(() -> WorldshaperModel::new)) + .lang("Creative Worldshaper") + .model(AssetLookup.itemModelWithPartials()) + .register(); + public static final ItemEntry MINECART_CONTRAPTION = REGISTRATE.item("minecart_contraption", MinecartContraptionItem::rideable) .register(); @@ -245,34 +260,6 @@ public class AllItems { REGISTRATE.item("tree_fertilizer", TreeFertilizerItem::new) .register(); - public static final ItemEntry BLOCKZAPPER = - REGISTRATE.item("handheld_blockzapper", BlockzapperItem::new) - .transform(CreateRegistrate.customRenderedItem(() -> BlockzapperModel::new)) - .model(AssetLookup.itemModelWithPartials()) - .register(); - - public static final ItemEntry WORLDSHAPER = - REGISTRATE.item("handheld_worldshaper", WorldshaperItem::new) - .transform(CreateRegistrate.customRenderedItem(() -> WorldshaperModel::new)) - .model(AssetLookup.itemModelWithPartials()) - .register(); - - public static final ItemEntry DEFORESTER = REGISTRATE.item("deforester", DeforesterItem::new) - .transform(CreateRegistrate.customRenderedItem(() -> DeforesterModel::new)) - .model(AssetLookup.itemModelWithPartials()) - .register(); - - public static final ItemEntry WAND_OF_SYMMETRY = - REGISTRATE.item("wand_of_symmetry", SymmetryWandItem::new) - .transform(CreateRegistrate.customRenderedItem(() -> SymmetryWandModel::new)) - .model(AssetLookup.itemModelWithPartials()) - .register(); - - public static final ItemEntry EXTENDO_GRIP = REGISTRATE.item("extendo_grip", ExtendoGripItem::new) - .transform(CreateRegistrate.customRenderedItem(() -> ExtendoGripModel::new)) - .model(AssetLookup.itemModelWithPartials()) - .register(); - // Schematics static { diff --git a/src/main/java/com/simibubi/create/AllRecipeTypes.java b/src/main/java/com/simibubi/create/AllRecipeTypes.java index 908e39e87..910241dd6 100644 --- a/src/main/java/com/simibubi/create/AllRecipeTypes.java +++ b/src/main/java/com/simibubi/create/AllRecipeTypes.java @@ -19,7 +19,6 @@ import com.simibubi.create.content.contraptions.processing.ProcessingRecipe; import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder.ProcessingRecipeFactory; import com.simibubi.create.content.contraptions.processing.ProcessingRecipeSerializer; import com.simibubi.create.content.curiosities.tools.SandPaperPolishingRecipe; -import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperUpgradeRecipe; import com.simibubi.create.foundation.utility.Lang; import net.minecraft.inventory.IInventory; @@ -34,9 +33,7 @@ import net.minecraftforge.event.RegistryEvent; public enum AllRecipeTypes { - BLOCKZAPPER_UPGRADE(BlockzapperUpgradeRecipe.Serializer::new, IRecipeType.CRAFTING), MECHANICAL_CRAFTING(MechanicalCraftingRecipe.Serializer::new), - CONVERSION(processingSerializer(ConversionRecipe::new)), CRUSHING(processingSerializer(CrushingRecipe::new)), CUTTING(processingSerializer(CuttingRecipe::new)), diff --git a/src/main/java/com/simibubi/create/AllSoundEvents.java b/src/main/java/com/simibubi/create/AllSoundEvents.java index 51f00ef71..32976ac3f 100644 --- a/src/main/java/com/simibubi/create/AllSoundEvents.java +++ b/src/main/java/com/simibubi/create/AllSoundEvents.java @@ -91,7 +91,7 @@ public class AllSoundEvents { .category(SoundCategory.BLOCKS) .build(), - BLOCKZAPPER_PLACE = create("blockzapper_place").subtitle("Blockzapper zaps") + WORLDSHAPER_PLACE = create("worldshaper_place").subtitle("Worldshaper zaps") .playExisting(SoundEvents.BLOCK_NOTE_BLOCK_BASEDRUM) .category(SoundCategory.PLAYERS) .build(), @@ -101,12 +101,12 @@ public class AllSoundEvents { .category(SoundCategory.PLAYERS) .build(), - BLOCKZAPPER_CONFIRM = create("blockzapper_confirm").subtitle("Affirmative ding") + CONFIRM = create("confirm").subtitle("Affirmative ding") .playExisting(SoundEvents.BLOCK_NOTE_BLOCK_BELL, 0.5f, 0.8f) .category(SoundCategory.PLAYERS) .build(), - BLOCKZAPPER_DENY = create("blockzapper_deny").subtitle("Declining boop") + DENY = create("deny").subtitle("Declining boop") .playExisting(SoundEvents.BLOCK_NOTE_BLOCK_BASS, 1f, 0.5f) .category(SoundCategory.PLAYERS) .build(), @@ -136,13 +136,13 @@ public class AllSoundEvents { .playExisting(SoundEvents.BLOCK_NETHERITE_BLOCK_HIT, .25f, .75f) .category(SoundCategory.BLOCKS) .build(), - + CRAFTER_CLICK = create("crafter_click").subtitle("Crafter clicks") .playExisting(SoundEvents.BLOCK_NETHERITE_BLOCK_HIT, .25f, 1) .playExisting(SoundEvents.BLOCK_WOODEN_TRAPDOOR_OPEN, .125f, 1) .category(SoundCategory.BLOCKS) .build(), - + CRAFTER_CRAFT = create("crafter_craft").subtitle("Crafter crafts") .playExisting(SoundEvents.ENTITY_ITEM_BREAK, .125f, .75f) .category(SoundCategory.BLOCKS) diff --git a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java index adbcf7883..6e8b8d227 100644 --- a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java +++ b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java @@ -17,7 +17,6 @@ import com.simibubi.create.AllRecipeTypes; import com.simibubi.create.Create; import com.simibubi.create.compat.jei.category.BlockCuttingCategory; import com.simibubi.create.compat.jei.category.BlockCuttingCategory.CondensedBlockCuttingRecipe; -import com.simibubi.create.compat.jei.category.BlockzapperUpgradeCategory; import com.simibubi.create.compat.jei.category.CreateRecipeCategory; import com.simibubi.create.compat.jei.category.CrushingCategory; import com.simibubi.create.compat.jei.category.FanBlastingCategory; @@ -110,11 +109,6 @@ public class CreateJEI implements IModPlugin { .catalystStack(ProcessingViaFanCategory.getFan("fan_blasting")) .build(), - blockzapper = register("blockzapper_upgrade", BlockzapperUpgradeCategory::new) - .recipes(AllRecipeTypes.BLOCKZAPPER_UPGRADE.serializer.getRegistryName()) - .catalyst(AllItems.BLOCKZAPPER::get) - .build(), - mixing = register("mixing", MixingCategory::standard).recipes(AllRecipeTypes.MIXING::getType) .catalyst(AllBlocks.MECHANICAL_MIXER::get) .catalyst(AllBlocks.BASIN::get) @@ -208,11 +202,6 @@ public class CreateJEI implements IModPlugin { return new CategoryBuilder(name, supplier); } - @Override - public void registerItemSubtypes(ISubtypeRegistration registration) { - registration.useNbtForSubtypes(AllItems.BLOCKZAPPER.get()); - } - @Override public void registerCategories(IRecipeCategoryRegistration registration) { ALL.forEach(registration::addRecipeCategories); diff --git a/src/main/java/com/simibubi/create/compat/jei/category/BlockzapperUpgradeCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/BlockzapperUpgradeCategory.java deleted file mode 100644 index 581ebc9cd..000000000 --- a/src/main/java/com/simibubi/create/compat/jei/category/BlockzapperUpgradeCategory.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.simibubi.create.compat.jei.category; - -import static com.simibubi.create.foundation.gui.AllGuiTextures.BLOCKZAPPER_UPGRADE_RECIPE; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.AllItems; -import com.simibubi.create.compat.jei.ScreenResourceWrapper; -import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperUpgradeRecipe; -import com.simibubi.create.foundation.gui.GuiGameElement; -import com.simibubi.create.foundation.utility.Lang; - -import mezz.jei.api.constants.VanillaTypes; -import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.gui.ingredient.IGuiItemStackGroup; -import mezz.jei.api.ingredients.IIngredients; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.item.crafting.ShapedRecipe; -import net.minecraft.util.NonNullList; -import net.minecraft.util.text.IFormattableTextComponent; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; - -public class BlockzapperUpgradeCategory extends CreateRecipeCategory { - - public BlockzapperUpgradeCategory() { - super(itemIcon(AllItems.BLOCKZAPPER.get()), new ScreenResourceWrapper(BLOCKZAPPER_UPGRADE_RECIPE)); - } - - @Override - public Class getRecipeClass() { - return BlockzapperUpgradeRecipe.class; - } - - @Override - public void setIngredients(BlockzapperUpgradeRecipe recipe, IIngredients ingredients) { - ingredients.setInputIngredients(recipe.getIngredients()); - ingredients.setOutput(VanillaTypes.ITEM, recipe.getRecipeOutput()); - } - - @Override - public void setRecipe(IRecipeLayout recipeLayout, BlockzapperUpgradeRecipe recipe, IIngredients ingredients) { - IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks(); - ShapedRecipe shape = recipe.getRecipe(); - NonNullList shapedIngredients = shape.getIngredients(); - - int top = 0; - int left = 0; - - int i = 0; - for (int y = 0; y < shape.getRecipeHeight(); y++) { - for (int x = 0; x < shape.getRecipeWidth(); x++) { - itemStacks.init(i, true, left + x * 18, top + y * 18); - itemStacks.set(i, Arrays.asList(shapedIngredients.get(i) - .getMatchingStacks())); - i++; - } - } - } - - @Override - public List getTooltipStrings(BlockzapperUpgradeRecipe recipe, double mouseX, double mouseY) { - List list = new ArrayList<>(); - if (mouseX < 91 || mouseX > 91 + 52 || mouseY < 1 || mouseY > 53) - return list; - list.addAll(recipe.getRecipeOutput() - .getTooltip(Minecraft.getInstance().player, - Minecraft.getInstance().gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED - : ITooltipFlag.TooltipFlags.NORMAL)); - return list; - } - - @Override - public void draw(BlockzapperUpgradeRecipe recipe, MatrixStack matrixStack, double mouseX, double mouseY) { - FontRenderer font = Minecraft.getInstance().fontRenderer; - - IFormattableTextComponent textComponent = - new StringTextComponent("+ ") - .append(Lang.translate("blockzapper.component." + Lang.asId(recipe.getUpgradedComponent().name()))) - .formatted(recipe.getTier().color); - - font.drawWithShadow(matrixStack, textComponent, (BLOCKZAPPER_UPGRADE_RECIPE.width - font.getStringWidth(textComponent.getString())) / 2f, 57, 0x8B8B8B); - - GuiGameElement.of(recipe.getRecipeOutput()) - .at(90, 0) - .scale(3.5) - .render(matrixStack); - } -} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java b/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java index 3c95f62ec..ecae91299 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java +++ b/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java @@ -60,9 +60,9 @@ public class SymmetryWandScreen extends AbstractSimiScreen { AllGuiTextures background = AllGuiTextures.WAND_OF_SYMMETRY; this.setWindowSize(background.width + 50, background.height + 50); - labelType = new Label(guiLeft + 49, guiTop + 26, StringTextComponent.EMPTY).colored(0xFFFFFFFF) + labelType = new Label(guiLeft + 49, guiTop + 28, StringTextComponent.EMPTY).colored(0xFFFFFFFF) .withShadow(); - labelAlign = new Label(guiLeft + 49, guiTop + 48, StringTextComponent.EMPTY).colored(0xFFFFFFFF) + labelAlign = new Label(guiLeft + 49, guiTop + 50, StringTextComponent.EMPTY).colored(0xFFFFFFFF) .withShadow(); int state = @@ -118,12 +118,10 @@ public class SymmetryWandScreen extends AbstractSimiScreen { @Override protected void renderWindow(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { AllGuiTextures.WAND_OF_SYMMETRY.draw(matrixStack, this, guiLeft, guiTop); - - textRenderer.drawWithShadow(matrixStack, wand.getDisplayName(), guiLeft + 11, guiTop + 3, 0xffffff); - + textRenderer.draw(matrixStack, wand.getDisplayName(), guiLeft + 11, guiTop + 4, 0x6B3802); renderBlock(matrixStack); GuiGameElement.of(wand) - .at(guiLeft + 190, guiTop + 420, -150) + .at(guiLeft + 170, guiTop + 490, -150) .scale(4) .rotate(-70, 20, 20) .render(matrixStack); @@ -131,7 +129,7 @@ public class SymmetryWandScreen extends AbstractSimiScreen { protected void renderBlock(MatrixStack ms) { ms.push(); - ms.translate(guiLeft + 26f, guiTop + 37, 20); + ms.translate(guiLeft + 26f, guiTop + 39, 20); ms.scale(16, 16, 16); ms.multiply(new Vector3f(.3f, 1f, 0f).getDegreesQuaternion(-22.5f)); currentElement.applyModelTransform(ms); diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/AllToolTiers.java b/src/main/java/com/simibubi/create/content/curiosities/tools/AllToolTiers.java deleted file mode 100644 index 22ba52060..000000000 --- a/src/main/java/com/simibubi/create/content/curiosities/tools/AllToolTiers.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.simibubi.create.content.curiosities.tools; - -import java.util.function.Supplier; - -import com.simibubi.create.AllItems; - -import net.minecraft.item.IItemTier; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.LazyValue; - -public enum AllToolTiers implements IItemTier { - - RADIANT(4, 1024, 16.0F, 3.5F, 10, () -> { - return Ingredient.fromItems(AllItems.REFINED_RADIANCE.get()); - }), - - ; - - private final int harvestLevel; - private final int maxUses; - private final float efficiency; - private final float attackDamage; - private final int enchantability; - private final LazyValue repairMaterial; - - private AllToolTiers(int harvestLevelIn, int maxUsesIn, float efficiencyIn, float attackDamageIn, - int enchantabilityIn, Supplier repairMaterialIn) { - this.harvestLevel = harvestLevelIn; - this.maxUses = maxUsesIn; - this.efficiency = efficiencyIn; - this.attackDamage = attackDamageIn; - this.enchantability = enchantabilityIn; - this.repairMaterial = new LazyValue<>(repairMaterialIn); - } - - public int getMaxUses() { - return this.maxUses; - } - - public float getEfficiency() { - return this.efficiency; - } - - public float getAttackDamage() { - return this.attackDamage; - } - - public int getHarvestLevel() { - return this.harvestLevel; - } - - public int getEnchantability() { - return this.enchantability; - } - - public Ingredient getRepairMaterial() { - return this.repairMaterial.getValue(); - } -} diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/DeforesterItem.java b/src/main/java/com/simibubi/create/content/curiosities/tools/DeforesterItem.java deleted file mode 100644 index 862b11161..000000000 --- a/src/main/java/com/simibubi/create/content/curiosities/tools/DeforesterItem.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.simibubi.create.content.curiosities.tools; - -import javax.annotation.ParametersAreNonnullByDefault; - -import com.simibubi.create.AllItems; -import com.simibubi.create.AllTags; -import com.simibubi.create.foundation.utility.TreeCutter; -import com.simibubi.create.foundation.utility.VecHelper; - -import mcp.MethodsReturnNonnullByDefault; -import net.minecraft.block.BlockState; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.AxeItem; -import net.minecraft.item.ItemStack; -import net.minecraft.tags.BlockTags; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.world.IWorld; -import net.minecraft.world.World; -import net.minecraftforge.event.world.BlockEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus; - - -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@EventBusSubscriber(bus = Bus.FORGE) -public class DeforesterItem extends AxeItem { - private static boolean deforesting = false; // required as to not run into "recursions" over forge events on tree cutting - - public DeforesterItem(Properties builder) { - super(AllToolTiers.RADIANT, 5.0F, -3.1F, builder); - } - - // Moved away from Item#onBlockDestroyed as it does not get called in Creative - public static void destroyTree(IWorld iWorld, BlockState state, BlockPos pos, - PlayerEntity player) { - - if (deforesting ||!(state.isIn(BlockTags.LOGS) || AllTags.AllBlockTags.SLIMY_LOGS.matches(state)) || player.isSneaking() || !(iWorld instanceof World)) - return; - World worldIn = (World) iWorld; - Vector3d vec = player.getLookVec(); - - deforesting = true; - TreeCutter.findTree(worldIn, pos).destroyBlocks(worldIn, player, (dropPos, item) -> dropItemFromCutTree(worldIn, pos, vec, dropPos, item)); - deforesting = false; - } - - @SubscribeEvent - public static void onBlockDestroyed(BlockEvent.BreakEvent event) { - ItemStack heldItemMainhand = event.getPlayer().getHeldItemMainhand(); - if (!AllItems.DEFORESTER.isIn(heldItemMainhand)) - return; - destroyTree(event.getWorld(), event.getState(), event.getPos(), event.getPlayer()); - } - - public static void dropItemFromCutTree(World world, BlockPos breakingPos, Vector3d fallDirection, BlockPos pos, - ItemStack stack) { - float distance = (float) Math.sqrt(pos.distanceSq(breakingPos)); - Vector3d dropPos = VecHelper.getCenterOf(pos); - ItemEntity entity = new ItemEntity(world, dropPos.x, dropPos.y, dropPos.z, stack); - entity.setMotion(fallDirection.scale(distance / 20f)); - world.addEntity(entity); - } - - @Override - public boolean onBlockDestroyed(ItemStack stack, World world, BlockState state, BlockPos pos, LivingEntity entity) { - if (!state.isIn(BlockTags.LEAVES)) - super.onBlockDestroyed(stack, world, state, pos, entity); - return true; - } -} diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/DeforesterItemRenderer.java b/src/main/java/com/simibubi/create/content/curiosities/tools/DeforesterItemRenderer.java deleted file mode 100644 index 46712178b..000000000 --- a/src/main/java/com/simibubi/create/content/curiosities/tools/DeforesterItemRenderer.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.simibubi.create.content.curiosities.tools; - -import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.foundation.block.render.CustomRenderedItemModelRenderer; -import com.simibubi.create.foundation.item.PartialItemModelRenderer; -import com.simibubi.create.foundation.utility.AnimationTickHolder; - -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.vector.Vector3f; - -public class DeforesterItemRenderer extends CustomRenderedItemModelRenderer { - - @Override - protected void render(ItemStack stack, DeforesterModel model, PartialItemModelRenderer renderer, - MatrixStack ms, IRenderTypeBuffer buffer, int light, int overlay) { - int maxLight = 0xF000F0; - float worldTime = AnimationTickHolder.getRenderTime(); - - renderer.renderSolid(model.getBakedModel(), light); - renderer.renderSolidGlowing(model.getPartial("core"), maxLight); - renderer.renderGlowing(model.getPartial("core_glow"), maxLight); - - float angle = worldTime * -.5f % 360; - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(angle)); - renderer.renderSolid(model.getPartial("gear"), light); - } - - -} diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/DeforesterModel.java b/src/main/java/com/simibubi/create/content/curiosities/tools/DeforesterModel.java deleted file mode 100644 index 5fad1cfac..000000000 --- a/src/main/java/com/simibubi/create/content/curiosities/tools/DeforesterModel.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.simibubi.create.content.curiosities.tools; - -import com.simibubi.create.foundation.block.render.CustomRenderedItemModel; - -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer; - -public class DeforesterModel extends CustomRenderedItemModel { - - public DeforesterModel(IBakedModel template) { - super(template, "deforester"); - addPartials("gear", "core", "core_glow"); - } - - @Override - public ItemStackTileEntityRenderer createRenderer() { - return new DeforesterItemRenderer(); - } - -} diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperInteractionHandler.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperInteractionHandler.java index 5b1de8daf..c56d86a0e 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperInteractionHandler.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperInteractionHandler.java @@ -98,7 +98,7 @@ public class ZapperInteractionHandler { else tag.put("BlockData", data); - AllSoundEvents.BLOCKZAPPER_CONFIRM.playOnServer(player.world, player.getBlockPos()); + AllSoundEvents.CONFIRM.playOnServer(player.world, player.getBlockPos()); return true; } diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperItem.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperItem.java index ac7229898..f6e573b8e 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperItem.java @@ -21,7 +21,6 @@ import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; -import net.minecraft.item.Rarity; import net.minecraft.item.UseAction; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.NBTUtil; @@ -49,8 +48,7 @@ import net.minecraftforge.fml.network.PacketDistributor; public abstract class ZapperItem extends Item { public ZapperItem(Properties properties) { - super(properties.maxStackSize(1) - .rarity(Rarity.UNCOMMON)); + super(properties.maxStackSize(1)); } @Override @@ -63,7 +61,7 @@ public abstract class ZapperItem extends Item { .getBlock() .getTranslationKey(); ItemDescription.add(tooltip, - Lang.translate("blockzapper.usingBlock", + Lang.translate("terrainzapper.usingBlock", new TranslationTextComponent(usedblock).formatted(TextFormatting.GRAY)) .formatted(TextFormatting.DARK_GRAY)); } @@ -143,7 +141,7 @@ public abstract class ZapperItem extends Item { // Check if can be used ITextComponent msg = validateUsage(item); if (msg != null) { - AllSoundEvents.BLOCKZAPPER_DENY.play(world, player, player.getBlockPos()); + AllSoundEvents.DENY.play(world, player, player.getBlockPos()); player.sendStatusMessage(msg.copy().formatted(TextFormatting.RED), true); return new ActionResult<>(ActionResultType.FAIL, item); } @@ -202,7 +200,7 @@ public abstract class ZapperItem extends Item { public ITextComponent validateUsage(ItemStack item) { CompoundNBT tag = item.getOrCreateTag(); if (!canActivateWithoutSelectedBlock(item) && !tag.contains("BlockUsed")) - return Lang.createTranslationTextComponent("blockzapper.leftClickToSet"); + return Lang.createTranslationTextComponent("terrainzapper.leftClickToSet"); return null; } diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperRenderHandler.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperRenderHandler.java index bcf8f8e5c..f69316011 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperRenderHandler.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperRenderHandler.java @@ -113,9 +113,9 @@ public class ZapperRenderHandler { } public static void playSound(Hand hand, BlockPos position) { - float pitch = hand == Hand.MAIN_HAND ? 2f : 0.9f; + float pitch = hand == Hand.MAIN_HAND ? 0.1f : 0.9f; Minecraft mc = Minecraft.getInstance(); - AllSoundEvents.BLOCKZAPPER_PLACE.play(mc.world, mc.player, position, 0.8f, pitch); + AllSoundEvents.WORLDSHAPER_PLACE.play(mc.world, mc.player, position, 0.1f, pitch); } public static void addBeam(LaserBeam beam) { diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java index bb5a6f3c7..7589047be 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java @@ -30,8 +30,8 @@ public class ZapperScreen extends AbstractSimiScreen { protected float animationProgress; protected AllGuiTextures background; private IconButton confirmButton; - - protected final ITextComponent patternSection = Lang.translate("gui.blockzapper.patternSection"); + + protected final ITextComponent patternSection = Lang.translate("gui.terrainzapper.patternSection"); protected ITextComponent title; protected Vector patternButtons; @@ -51,14 +51,15 @@ public class ZapperScreen extends AbstractSimiScreen { @Override protected void init() { animationProgress = 0; - setWindowSize(background.width + 40, background.height); + setWindowSize(background.width, background.height); super.init(); widgets.clear(); - - confirmButton = new IconButton(guiLeft + background.width - 53, guiTop + background.height - 24, AllIcons.I_CONFIRM); + + confirmButton = + new IconButton(guiLeft + background.width - 43, guiTop + background.height - 24, AllIcons.I_CONFIRM); widgets.add(confirmButton); - int i = guiLeft - 20; + int i = guiLeft - 10; int j = guiTop; CompoundNBT nbt = zapper.getOrCreateTag(); @@ -67,9 +68,10 @@ public class ZapperScreen extends AbstractSimiScreen { for (int col = 0; col <= 2; col++) { int id = patternButtons.size(); PlacementPatterns pattern = PlacementPatterns.values()[id]; - patternButtons.add(new IconButton(i + background.width - 76 + col * 18, j + 19 + row * 18, pattern.icon)); + patternButtons + .add(new IconButton(i + background.width - 76 + col * 18, j + 21 + row * 18, pattern.icon)); patternButtons.get(id) - .setToolTip(Lang.translate("gui.blockzapper.pattern." + pattern.translationKey)); + .setToolTip(Lang.translate("gui.terrainzapper.pattern." + pattern.translationKey)); } } @@ -82,7 +84,7 @@ public class ZapperScreen extends AbstractSimiScreen { @Override protected void renderWindow(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { - int i = guiLeft - 20; + int i = guiLeft - 10; int j = guiTop; background.draw(matrixStack, this, i, j); @@ -93,7 +95,7 @@ public class ZapperScreen extends AbstractSimiScreen { } protected void drawOnBackground(MatrixStack matrixStack, int i, int j) { - textRenderer.drawWithShadow(matrixStack, title, i + 11, j + 3, brightColor); + textRenderer.draw(matrixStack, title, i + 11, j + 4, 0x54214F); } @Override @@ -122,7 +124,7 @@ public class ZapperScreen extends AbstractSimiScreen { nbt.putString("Pattern", PlacementPatterns.values()[patternButtons.indexOf(patternButton)].name()); } } - + if (confirmButton.isHovered()) { onClose(); return true; @@ -133,15 +135,16 @@ public class ZapperScreen extends AbstractSimiScreen { protected void renderZapper(MatrixStack matrixStack) { GuiGameElement.of(zapper) - .at((this.width - this.sWidth) / 2 + 200, this.height / 2 - this.sHeight / 4 + 25, -150) + .at((this.width - this.sWidth) / 2 + 220, this.height / 2 - this.sHeight / 4 + 27, -150) .scale(4) .render(matrixStack); } protected void renderBlock(MatrixStack matrixStack) { matrixStack.push(); - matrixStack.translate(guiLeft + 7f, guiTop + 43.5f, 120); - matrixStack.multiply(new Vector3f(.5f, .9f, -.1f).getDegreesQuaternion(-30f)); + matrixStack.translate(guiLeft + 22f, guiTop + 42f, 120); + matrixStack.multiply(new Vector3f(1f, 0, 0).getDegreesQuaternion(-25f)); + matrixStack.multiply(new Vector3f(0, 1f, 0).getDegreesQuaternion(-45f)); matrixStack.scale(20, 20, 20); BlockState state = Blocks.AIR.getDefaultState(); diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItem.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItem.java deleted file mode 100644 index 1a8cdb843..000000000 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItem.java +++ /dev/null @@ -1,396 +0,0 @@ -package com.simibubi.create.content.curiosities.zapper.blockzapper; - -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; - -import com.simibubi.create.AllItems; -import com.simibubi.create.Create; -import com.simibubi.create.content.curiosities.zapper.PlacementPatterns; -import com.simibubi.create.content.curiosities.zapper.ZapperInteractionHandler; -import com.simibubi.create.content.curiosities.zapper.ZapperItem; -import com.simibubi.create.foundation.advancement.AllTriggers; -import com.simibubi.create.foundation.gui.ScreenOpener; -import com.simibubi.create.foundation.item.ItemDescription; -import com.simibubi.create.foundation.utility.BlockHelper; -import com.simibubi.create.foundation.utility.Iterate; -import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.foundation.utility.NBTHelper; - -import net.minecraft.advancements.CriteriaTriggers; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.fluid.FluidState; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.RayTraceContext; -import net.minecraft.util.math.RayTraceContext.BlockMode; -import net.minecraft.util.math.RayTraceContext.FluidMode; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.common.util.BlockSnapshot; -import net.minecraftforge.common.util.Constants.BlockFlags; -import net.minecraftforge.event.ForgeEventFactory; - -public class BlockzapperItem extends ZapperItem { - - public BlockzapperItem(Properties properties) { - super(properties); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World worldIn, List tooltip, ITooltipFlag flagIn) { - super.addInformation(stack, worldIn, tooltip, flagIn); - if (Screen.hasShiftDown()) { - - tooltip.add(new StringTextComponent("")); - ItemDescription.add(tooltip, Lang.translate("blockzapper.componentUpgrades").formatted(TextFormatting.WHITE)); - - for (Components c : Components.values()) { - ComponentTier tier = getTier(c, stack); - ITextComponent componentName = - Lang.translate("blockzapper.component." + Lang.asId(c.name())).formatted(TextFormatting.GRAY); - ITextComponent tierName = Lang.translate("blockzapper.componentTier." + Lang.asId(tier.name())).formatted(tier.color); - ItemDescription.add(tooltip, new StringTextComponent("> ").append(componentName).append(": ").append(tierName)); - } - } - } - - @Override - public void fillItemGroup(ItemGroup group, NonNullList items) { - if (group != Create.baseCreativeTab && group != ItemGroup.SEARCH) - return; - - ItemStack gunWithoutStuff = new ItemStack(this); - items.add(gunWithoutStuff); - - ItemStack gunWithGoldStuff = new ItemStack(this); - for (Components c : Components.values()) - setTier(c, ComponentTier.Brass, gunWithGoldStuff); - items.add(gunWithGoldStuff); - - ItemStack gunWithPurpurStuff = new ItemStack(this); - for (Components c : Components.values()) - setTier(c, ComponentTier.Chromatic, gunWithPurpurStuff); - items.add(gunWithPurpurStuff); - } - - @Override - protected boolean activate(World world, PlayerEntity player, ItemStack stack, BlockState selectedState, - BlockRayTraceResult raytrace, CompoundNBT data) { - CompoundNBT nbt = stack.getOrCreateTag(); - boolean replace = nbt.contains("Replace") && nbt.getBoolean("Replace"); - - List selectedBlocks = getSelectedBlocks(stack, world, player); - PlacementPatterns.applyPattern(selectedBlocks, stack); - Direction face = raytrace.getFace(); - - for (BlockPos placed : selectedBlocks) { - if (world.getBlockState(placed) == selectedState) - continue; - if (!selectedState.isValidPosition(world, placed)) - continue; - if (!player.isCreative() && !canBreak(stack, world.getBlockState(placed), world, placed,player)) - continue; - if (!player.isCreative() && BlockHelper.findAndRemoveInInventory(selectedState, player, 1) == 0) { - player.getCooldownTracker() - .setCooldown(stack.getItem(), 20); - player.sendStatusMessage( Lang.translate("blockzapper.empty").formatted(TextFormatting.RED), true); - return false; - } - - if (!player.isCreative() && replace) - dropBlocks(world, player, stack, face, placed); - - BlockState state = selectedState; - for (Direction updateDirection : Iterate.directions) - state = state.updatePostPlacement(updateDirection, - world.getBlockState(placed.offset(updateDirection)), world, placed, placed.offset(updateDirection)); - - BlockSnapshot blocksnapshot = BlockSnapshot.create(world.getRegistryKey(), world, placed); - FluidState FluidState = world.getFluidState(placed); - world.setBlockState(placed, FluidState.getBlockState(), BlockFlags.UPDATE_NEIGHBORS); - world.setBlockState(placed, state); - - if (ForgeEventFactory.onBlockPlace(player, blocksnapshot, Direction.UP)) { - blocksnapshot.restore(true, false); - return false; - } - setTileData(world, placed, state, data, player); - - if (player instanceof ServerPlayerEntity && world instanceof ServerWorld) { - ServerPlayerEntity serverPlayer = (ServerPlayerEntity) player; - CriteriaTriggers.PLACED_BLOCK.trigger(serverPlayer, placed, new ItemStack(state.getBlock())); - - boolean fullyUpgraded = true; - for (Components c : Components.values()) { - if (getTier(c, stack) != ComponentTier.Chromatic) { - fullyUpgraded = false; - break; - } - } - if (fullyUpgraded) - AllTriggers.UPGRADED_ZAPPER.trigger(serverPlayer); - } - } - for (BlockPos placed : selectedBlocks) { - world.neighborChanged(placed, selectedState.getBlock(), placed); - } - - return true; - } - - @Override - public void inventoryTick(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) { - if (AllItems.BLOCKZAPPER.isIn(stack)) { - CompoundNBT nbt = stack.getOrCreateTag(); - if (!nbt.contains("Replace")) - nbt.putBoolean("Replace", false); - if (!nbt.contains("Pattern")) - nbt.putString("Pattern", PlacementPatterns.Solid.name()); - if (!nbt.contains("SearchDiagonal")) - nbt.putBoolean("SearchDiagonal", false); - if (!nbt.contains("SearchMaterial")) - nbt.putBoolean("SearchMaterial", false); - if (!nbt.contains("SearchDistance")) - nbt.putInt("SearchDistance", 1); - } - } - - @Override - @OnlyIn(Dist.CLIENT) - protected void openHandgunGUI(ItemStack handgun, boolean offhand) { - ScreenOpener.open(new BlockzapperScreen(handgun, offhand)); - } - - public static List getSelectedBlocks(ItemStack stack, World worldIn, PlayerEntity player) { - List list = new LinkedList<>(); - CompoundNBT tag = stack.getTag(); - if (tag == null) - return list; - - boolean searchDiagonals = tag.contains("SearchDiagonal") && tag.getBoolean("SearchDiagonal"); - boolean searchAcrossMaterials = tag.contains("SearchFuzzy") && tag.getBoolean("SearchFuzzy"); - boolean replace = tag.contains("Replace") && tag.getBoolean("Replace"); - int searchRange = tag.contains("SearchDistance") ? tag.getInt("SearchDistance") : 0; - - Set visited = new HashSet<>(); - List frontier = new LinkedList<>(); - - Vector3d start = player.getPositionVec() - .add(0, player.getEyeHeight(), 0); - Vector3d range = player.getLookVec() - .scale(ZapperInteractionHandler.getRange(stack)); - BlockRayTraceResult raytrace = player.world - .rayTraceBlocks(new RayTraceContext(start, start.add(range), BlockMode.COLLIDER, FluidMode.NONE, player)); - BlockPos pos = raytrace.getPos() - .toImmutable(); - - if (pos == null) - return list; - - BlockState state = worldIn.getBlockState(pos); - Direction face = raytrace.getFace(); - List offsets = new LinkedList<>(); - - for (int x = -1; x <= 1; x++) - for (int y = -1; y <= 1; y++) - for (int z = -1; z <= 1; z++) - if (Math.abs(x) + Math.abs(y) + Math.abs(z) < 2 || searchDiagonals) - if (face.getAxis() - .getCoordinate(x, y, z) == 0) - offsets.add(new BlockPos(x, y, z)); - - BlockPos startPos = replace ? pos : pos.offset(face); - frontier.add(startPos); - - while (!frontier.isEmpty()) { - BlockPos currentPos = frontier.remove(0); - if (visited.contains(currentPos)) - continue; - visited.add(currentPos); - if (!currentPos.withinDistance(startPos, searchRange)) - continue; - - // Replace Mode - if (replace) { - BlockState stateToReplace = worldIn.getBlockState(currentPos); - BlockState stateAboveStateToReplace = worldIn.getBlockState(currentPos.offset(face)); - - // Criteria - if (stateToReplace.getBlockHardness(worldIn, currentPos) == -1) - continue; - if (stateToReplace.getBlock() != state.getBlock() && !searchAcrossMaterials) - continue; - if (stateToReplace.getMaterial() - .isReplaceable()) - continue; - if (stateAboveStateToReplace.isSolid()) - continue; - list.add(currentPos); - - // Search adjacent spaces - for (BlockPos offset : offsets) - frontier.add(currentPos.add(offset)); - continue; - } - - // Place Mode - BlockState stateToPlaceAt = worldIn.getBlockState(currentPos); - BlockState stateToPlaceOn = worldIn.getBlockState(currentPos.offset(face.getOpposite())); - - // Criteria - if (stateToPlaceOn.getMaterial() - .isReplaceable()) - continue; - if (stateToPlaceOn.getBlock() != state.getBlock() && !searchAcrossMaterials) - continue; - if (!stateToPlaceAt.getMaterial() - .isReplaceable()) - continue; - list.add(currentPos); - - // Search adjacent spaces - for (BlockPos offset : offsets) - frontier.add(currentPos.add(offset)); - continue; - } - - return list; - } - - public static boolean canBreak(ItemStack stack, BlockState state, World world, BlockPos pos,PlayerEntity player) { - ComponentTier tier = getTier(Components.Body, stack); - float blockHardness = state.getBlockHardness(world, pos); - //If we can't change the block (e.g chunk protection) - if (!isAllowedToPlace(world,pos,player)){ - return false; - } - if (blockHardness == -1) - return false; - if (tier == ComponentTier.None) - return blockHardness < 3; - if (tier == ComponentTier.Brass) - return blockHardness < 6; - if (tier == ComponentTier.Chromatic) - return true; - - return false; - } - - public static boolean isAllowedToPlace(World world, BlockPos pos,PlayerEntity player){ - BlockSnapshot blocksnapshot = BlockSnapshot.create(world.getRegistryKey(), world, pos); - if (ForgeEventFactory.onBlockPlace(player, blocksnapshot, Direction.UP)) { - return false; - } - return true; - } - - public static int getMaxAoe(ItemStack stack) { - ComponentTier tier = getTier(Components.Amplifier, stack); - if (tier == ComponentTier.None) - return 2; - if (tier == ComponentTier.Brass) - return 4; - if (tier == ComponentTier.Chromatic) - return 8; - - return 0; - } - - @Override - protected int getCooldownDelay(ItemStack stack) { - return getCooldown(stack); - } - - public static int getCooldown(ItemStack stack) { - ComponentTier tier = getTier(Components.Accelerator, stack); - if (tier == ComponentTier.None) - return 10; - if (tier == ComponentTier.Brass) - return 6; - if (tier == ComponentTier.Chromatic) - return 2; - - return 20; - } - - @Override - protected int getZappingRange(ItemStack stack) { - ComponentTier tier = getTier(Components.Scope, stack); - if (tier == ComponentTier.None) - return 15; - if (tier == ComponentTier.Brass) - return 30; - if (tier == ComponentTier.Chromatic) - return 100; - - return 0; - } - - protected static void dropBlocks(World worldIn, PlayerEntity playerIn, ItemStack item, Direction face, - BlockPos placed) { - TileEntity tileentity = worldIn.getBlockState(placed) - .hasTileEntity() ? worldIn.getTileEntity(placed) : null; - - if (getTier(Components.Retriever, item) == ComponentTier.None) { - Block.spawnDrops(worldIn.getBlockState(placed), worldIn, placed.offset(face), tileentity); - } - - if (getTier(Components.Retriever, item) == ComponentTier.Brass) - Block.spawnDrops(worldIn.getBlockState(placed), worldIn, playerIn.getBlockPos(), tileentity); - - if (getTier(Components.Retriever, item) == ComponentTier.Chromatic) - for (ItemStack stack : Block.getDrops(worldIn.getBlockState(placed), (ServerWorld) worldIn, placed, - tileentity)) - if (!playerIn.inventory.addItemStackToInventory(stack)) - Block.spawnAsEntity(worldIn, placed, stack); - } - - public static ComponentTier getTier(Components component, ItemStack stack) { - if (!stack.hasTag() || !stack.getTag() - .contains(component.name())) - stack.getOrCreateTag() - .putString(component.name(), ComponentTier.None.name()); - return NBTHelper.readEnum(stack.getTag(), component.name(), ComponentTier.class); - } - - public static void setTier(Components component, ComponentTier tier, ItemStack stack) { - NBTHelper.writeEnum(stack.getOrCreateTag(), component.name(), tier); - } - - public static enum ComponentTier { - None(TextFormatting.DARK_GRAY), Brass(TextFormatting.GOLD), Chromatic(TextFormatting.LIGHT_PURPLE); - - public TextFormatting color; - - private ComponentTier(TextFormatting color) { - this.color = color; - } - - } - - public static enum Components { - Body, Amplifier, Accelerator, Retriever, Scope - } - -} diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItemRenderer.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItemRenderer.java deleted file mode 100644 index e59924335..000000000 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItemRenderer.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.simibubi.create.content.curiosities.zapper.blockzapper; - -import static com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem.Components.Accelerator; -import static com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem.Components.Amplifier; -import static com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem.Components.Body; -import static com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem.Components.Retriever; -import static com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem.Components.Scope; -import static java.lang.Math.max; -import static net.minecraft.util.math.MathHelper.clamp; - -import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.content.curiosities.zapper.ZapperItemRenderer; -import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem.ComponentTier; -import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem.Components; -import com.simibubi.create.foundation.item.PartialItemModelRenderer; -import com.simibubi.create.foundation.utility.AnimationTickHolder; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.player.ClientPlayerEntity; -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.LightTexture; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.item.ItemStack; -import net.minecraft.util.HandSide; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.vector.Vector3f; - -public class BlockzapperItemRenderer extends ZapperItemRenderer { - - @Override - protected void render(ItemStack stack, BlockzapperModel model, PartialItemModelRenderer renderer, MatrixStack ms, - IRenderTypeBuffer buffer, int light, int overlay) { - super.render(stack, model, renderer, ms, buffer, light, overlay); - - float pt = AnimationTickHolder.getPartialTicks(); - float worldTime = AnimationTickHolder.getRenderTime() / 20; - - renderer.render(model.getBakedModel(), light); - renderComponent(stack, model, Body, renderer, light); - renderComponent(stack, model, Amplifier, renderer, light); - renderComponent(stack, model, Retriever, renderer, light); - renderComponent(stack, model, Scope, renderer, light); - - ClientPlayerEntity player = Minecraft.getInstance().player; - boolean leftHanded = player.getPrimaryHand() == HandSide.LEFT; - boolean mainHand = player.getHeldItemMainhand() == stack; - boolean offHand = player.getHeldItemOffhand() == stack; - float animation = getAnimationProgress(pt, leftHanded, mainHand); - - // Core glows - float multiplier = MathHelper.sin(worldTime * 5); - if (mainHand || offHand) - multiplier = animation; - - int lightItensity = (int) (15 * clamp(multiplier, 0, 1)); - int glowLight = LightTexture.pack(lightItensity, max(lightItensity, 4)); - renderer.renderSolidGlowing(model.getPartial("core"), glowLight); - renderer.renderGlowing(model.getPartial("core_glow"), glowLight); - - if (BlockzapperItem.getTier(Amplifier, stack) != ComponentTier.None) { - renderer.renderSolidGlowing(model.getPartial("amplifier_core"), glowLight); - renderer.renderGlowing(model.getPartial("amplifier_core_glow"), glowLight); - } - - // Accelerator spins - float angle = worldTime * -25; - if (mainHand || offHand) - angle += 360 * animation; - - angle %= 360; - float offset = -.155f; - ms.translate(0, offset, 0); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(angle)); - ms.translate(0, -offset, 0); - renderComponent(stack, model, Accelerator, renderer, light); - } - - public void renderComponent(ItemStack stack, BlockzapperModel model, Components component, - PartialItemModelRenderer renderer, int light) { - ComponentTier tier = BlockzapperItem.getTier(component, stack); - IBakedModel partial = model.getComponentPartial(tier, component); - if (partial != null) - renderer.render(partial, light); - } - -} diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperModel.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperModel.java deleted file mode 100644 index f5688e9f6..000000000 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperModel.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.simibubi.create.content.curiosities.zapper.blockzapper; - -import javax.annotation.Nullable; - -import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem.ComponentTier; -import com.simibubi.create.foundation.block.render.CustomRenderedItemModel; -import com.simibubi.create.foundation.utility.Lang; - -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer; - -public class BlockzapperModel extends CustomRenderedItemModel { - - public BlockzapperModel(IBakedModel template) { - super(template, "handheld_blockzapper"); - addPartials("core", "core_glow", "body", "amplifier_core", "amplifier_core_glow", "accelerator", "gold_body", - "gold_scope", "gold_amplifier", "gold_retriever", "gold_accelerator", "chorus_body", "chorus_scope", - "chorus_amplifier", "chorus_retriever", "chorus_accelerator"); - } - - @Override - public ItemStackTileEntityRenderer createRenderer() { - return new BlockzapperItemRenderer(); - } - - @Nullable - IBakedModel getComponentPartial(BlockzapperItem.ComponentTier tier, BlockzapperItem.Components component) { - String prefix = tier == ComponentTier.Chromatic ? "chorus_" : tier == ComponentTier.Brass ? "gold_" : ""; - return getPartial(prefix + Lang.asId(component.name())); - } - -} diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperRenderHandler.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperRenderHandler.java deleted file mode 100644 index f897956a3..000000000 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperRenderHandler.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.simibubi.create.content.curiosities.zapper.blockzapper; - -import java.util.Collections; -import java.util.List; - -import com.simibubi.create.AllItems; -import com.simibubi.create.AllSpecialTextures; -import com.simibubi.create.CreateClient; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.player.ClientPlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.math.BlockPos; - -public class BlockzapperRenderHandler { - - private static List renderedShape; - - public static void tick() { - gatherSelectedBlocks(); - if (renderedShape.isEmpty()) - return; - - CreateClient.outliner.showCluster("blockzapper", renderedShape) - .colored(0xbfbfbf) - .lineWidth(1 / 32f) - .withFaceTexture(AllSpecialTextures.CHECKERED); - } - - protected static void gatherSelectedBlocks() { - ClientPlayerEntity player = Minecraft.getInstance().player; - ItemStack heldMain = player.getHeldItemMainhand(); - ItemStack heldOff = player.getHeldItemOffhand(); - boolean zapperInMain = AllItems.BLOCKZAPPER.isIn(heldMain); - boolean zapperInOff = AllItems.BLOCKZAPPER.isIn(heldOff); - - if (zapperInMain) { - CompoundNBT tag = heldMain.getOrCreateTag(); - if (!tag.contains("_Swap") || !zapperInOff) { - createOutline(player, heldMain); - return; - } - } - - if (zapperInOff) { - createOutline(player, heldOff); - return; - } - - renderedShape = Collections.emptyList(); - } - - private static void createOutline(ClientPlayerEntity player, ItemStack held) { - if (!held.getOrCreateTag().contains("BlockUsed")) { - renderedShape = Collections.emptyList(); - return; - } - renderedShape = BlockzapperItem.getSelectedBlocks(held, player.world, player); - } - -} diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperScreen.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperScreen.java deleted file mode 100644 index 3bdc13ee5..000000000 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperScreen.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.simibubi.create.content.curiosities.zapper.blockzapper; - -import java.util.Collections; - -import com.simibubi.create.content.curiosities.zapper.ZapperScreen; -import com.simibubi.create.foundation.gui.AllGuiTextures; -import com.simibubi.create.foundation.gui.AllIcons; -import com.simibubi.create.foundation.gui.widgets.IconButton; -import com.simibubi.create.foundation.gui.widgets.Indicator; -import com.simibubi.create.foundation.gui.widgets.Indicator.State; -import com.simibubi.create.foundation.gui.widgets.Label; -import com.simibubi.create.foundation.gui.widgets.ScrollInput; -import com.simibubi.create.foundation.utility.Lang; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TextFormatting; - -public class BlockzapperScreen extends ZapperScreen { - - private final ITextComponent needsUpgradedAmplifier = Lang.translate("gui.blockzapper.needsUpgradedAmplifier"); - - private IconButton replaceModeButton; - private Indicator replaceModeIndicator; - private IconButton spreadDiagonallyButton; - private Indicator spreadDiagonallyIndicator; - private IconButton spreadMaterialButton; - private Indicator spreadMaterialIndicator; - - private ScrollInput spreadRangeInput; - private Label spreadRangeLabel; - - public BlockzapperScreen(ItemStack zapper, boolean offhand) { - super(AllGuiTextures.BLOCKZAPPER, zapper, offhand); - title = Lang.translate("gui.blockzapper.title"); - } - - @Override - protected void init() { - super.init(); - - int i = guiLeft - 20; - int j = guiTop; - CompoundNBT nbt = zapper.getOrCreateTag(); - - replaceModeIndicator = new Indicator(i + 49, j + 67, StringTextComponent.EMPTY); - replaceModeButton = new IconButton(i + 49, j + 73, AllIcons.I_REPLACE_SOLID); - if (nbt.contains("Replace") && nbt.getBoolean("Replace")) - replaceModeIndicator.state = State.ON; - replaceModeButton.setToolTip(Lang.translate("gui.blockzapper.replaceMode")); - - spreadDiagonallyIndicator = new Indicator(i + 8, j + 67, StringTextComponent.EMPTY); - spreadDiagonallyButton = new IconButton(i + 8, j + 73, AllIcons.I_FOLLOW_DIAGONAL); - if (nbt.contains("SearchDiagonal") && nbt.getBoolean("SearchDiagonal")) - spreadDiagonallyIndicator.state = State.ON; - spreadDiagonallyButton.setToolTip(Lang.translate("gui.blockzapper.searchDiagonal")); - - spreadMaterialIndicator = new Indicator(i + 26, j + 67, StringTextComponent.EMPTY); - spreadMaterialButton = new IconButton(i + 26, j + 73, AllIcons.I_FOLLOW_MATERIAL); - if (nbt.contains("SearchFuzzy") && nbt.getBoolean("SearchFuzzy")) - spreadMaterialIndicator.state = State.ON; - spreadMaterialButton.setToolTip(Lang.translate("gui.blockzapper.searchFuzzy")); - - spreadRangeLabel = new Label(i + 79, j + 78, StringTextComponent.EMPTY).withShadow().withSuffix("m"); - spreadRangeInput = new ScrollInput(i + 73, j + 73, 26, 18).withRange(1, BlockzapperItem.getMaxAoe(zapper)) - .setState(1).titled(Lang.translate("gui.blockzapper.range")).writingTo(spreadRangeLabel); - - if (nbt.contains("SearchDistance")) - spreadRangeInput.setState(nbt.getInt("SearchDistance")); - if (BlockzapperItem.getMaxAoe(zapper) == 2) - spreadRangeInput.getToolTip().add(1,needsUpgradedAmplifier.copy().formatted(TextFormatting.RED)); - - Collections.addAll(widgets, replaceModeButton, replaceModeIndicator, spreadDiagonallyButton, - spreadDiagonallyIndicator, spreadMaterialButton, spreadMaterialIndicator, spreadRangeLabel, - spreadRangeInput); - } - - @Override - public boolean mouseClicked(double x, double y, int button) { - CompoundNBT nbt = zapper.getTag(); - - if (replaceModeButton.isHovered()) { - boolean mode = nbt.contains("Replace") && nbt.getBoolean("Replace"); - mode = !mode; - replaceModeIndicator.state = mode ? State.ON : State.OFF; - nbt.putBoolean("Replace", mode); - } - - if (spreadDiagonallyButton.isHovered()) { - boolean mode = nbt.contains("SearchDiagonal") && nbt.getBoolean("SearchDiagonal"); - mode = !mode; - spreadDiagonallyIndicator.state = mode ? State.ON : State.OFF; - nbt.putBoolean("SearchDiagonal", mode); - } - - if (spreadMaterialButton.isHovered()) { - boolean mode = nbt.contains("SearchFuzzy") && nbt.getBoolean("SearchFuzzy"); - mode = !mode; - spreadMaterialIndicator.state = mode ? State.ON : State.OFF; - nbt.putBoolean("SearchFuzzy", mode); - } - - return super.mouseClicked(x, y, button); - } - - - @Override - protected void writeAdditionalOptions(CompoundNBT nbt) { - nbt.putInt("SearchDistance", spreadRangeInput.getState()); - } - -} diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperUpgradeRecipe.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperUpgradeRecipe.java deleted file mode 100644 index 41b736a41..000000000 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperUpgradeRecipe.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.simibubi.create.content.curiosities.zapper.blockzapper; - -import com.google.gson.JsonObject; -import com.simibubi.create.AllItems; -import com.simibubi.create.AllRecipeTypes; -import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem.ComponentTier; -import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem.Components; - -import net.minecraft.inventory.CraftingInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.ICraftingRecipe; -import net.minecraft.item.crafting.IRecipeSerializer; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.item.crafting.ShapedRecipe; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.JSONUtils; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import net.minecraftforge.registries.ForgeRegistryEntry; - -public class BlockzapperUpgradeRecipe implements ICraftingRecipe { - - private ShapedRecipe recipe; - private Components component; - private ComponentTier tier; - - public BlockzapperUpgradeRecipe(ShapedRecipe recipe, Components component, ComponentTier tier) { - this.recipe = recipe; - this.component = component; - this.tier = tier; - } - - @Override - public boolean matches(CraftingInventory inv, World worldIn) { - return getRecipe().matches(inv, worldIn); - } - - @Override - public NonNullList getIngredients() { - return recipe.getIngredients(); - } - - @Override - public ItemStack getCraftingResult(CraftingInventory inv) { - for (int slot = 0; slot < inv.getSizeInventory(); slot++) { - ItemStack handgun = inv.getStackInSlot(slot).copy(); - if (!AllItems.BLOCKZAPPER.isIn(handgun)) - continue; - BlockzapperItem.setTier(getUpgradedComponent(), getTier(), handgun); - return handgun; - } - return ItemStack.EMPTY; - } - - @Override - public ItemStack getRecipeOutput() { - ItemStack handgun = new ItemStack(AllItems.BLOCKZAPPER.get()); - BlockzapperItem.setTier(getUpgradedComponent(), getTier(), handgun); - return handgun; - } - - @Override - public boolean isDynamic() { - return true; - } - - @Override - public ResourceLocation getId() { - return getRecipe().getId(); - } - -// @Override -// public IRecipeType getType() { -// return AllRecipes.Types.BLOCKZAPPER_UPGRADE; -// } - - @Override - public IRecipeSerializer getSerializer() { - return AllRecipeTypes.BLOCKZAPPER_UPGRADE.serializer; - } - - public static class Serializer extends ForgeRegistryEntry> implements IRecipeSerializer { - - @Override - public BlockzapperUpgradeRecipe read(ResourceLocation recipeId, JsonObject json) { - ShapedRecipe recipe = IRecipeSerializer.CRAFTING_SHAPED.read(recipeId, json); - - Components component = Components.valueOf(JSONUtils.getString(json, "component")); - ComponentTier tier = ComponentTier.valueOf(JSONUtils.getString(json, "tier")); - return new BlockzapperUpgradeRecipe(recipe, component, tier); - } - - @Override - public BlockzapperUpgradeRecipe read(ResourceLocation recipeId, PacketBuffer buffer) { - ShapedRecipe recipe = IRecipeSerializer.CRAFTING_SHAPED.read(recipeId, buffer); - - Components component = Components.valueOf(buffer.readString(buffer.readInt())); - ComponentTier tier = ComponentTier.valueOf(buffer.readString(buffer.readInt())); - return new BlockzapperUpgradeRecipe(recipe, component, tier); - } - - @Override - public void write(PacketBuffer buffer, BlockzapperUpgradeRecipe recipe) { - IRecipeSerializer.CRAFTING_SHAPED.write(buffer, recipe.getRecipe()); - - String name = recipe.getUpgradedComponent().name(); - String name2 = recipe.getTier().name(); - buffer.writeInt(name.length()); - buffer.writeString(name); - buffer.writeInt(name2.length()); - buffer.writeString(name2); - } - - } - - @Override - public boolean canFit(int width, int height) { - return getRecipe().canFit(width, height); - } - - public ShapedRecipe getRecipe() { - return recipe; - } - - public Components getUpgradedComponent() { - return component; - } - - public ComponentTier getTier() { - return tier; - } - -} diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/Brush.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/Brush.java index f2cb47c88..8ff5ac568 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/Brush.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/Brush.java @@ -1,6 +1,6 @@ package com.simibubi.create.content.curiosities.zapper.terrainzapper; -import java.util.List; +import java.util.Collection; import com.simibubi.create.foundation.utility.Lang; @@ -8,6 +8,7 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.text.ITextComponent; +import net.minecraft.world.IWorld; public abstract class Brush { @@ -26,6 +27,22 @@ public abstract class Brush { this.param2 = param2; } + public TerrainTools[] getSupportedTools() { + return TerrainTools.values(); + } + + public TerrainTools redirectTool(TerrainTools tool) { + return tool; + } + + public boolean hasPlacementOptions() { + return true; + } + + public boolean hasConnectivityOptions() { + return false; + } + int getMax(int paramIndex) { return Integer.MAX_VALUE; } @@ -36,7 +53,7 @@ public abstract class Brush { ITextComponent getParamLabel(int paramIndex) { return Lang - .translate(paramIndex == 0 ? "generic.width" : paramIndex == 1 ? "generic.height" : "generic.length"); + .translate(paramIndex == 0 ? "generic.width" : paramIndex == 1 ? "generic.height" : "generic.length"); } public int get(int paramIndex) { @@ -47,6 +64,7 @@ public abstract class Brush { return BlockPos.ZERO; } - abstract List getIncludedPositions(); + public abstract Collection addToGlobalPositions(IWorld world, BlockPos targetPos, Direction targetFace, + Collection affectedPositions, TerrainTools usedTool); } diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/CuboidBrush.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/CuboidBrush.java index 67e0f82c3..af409cc5a 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/CuboidBrush.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/CuboidBrush.java @@ -9,7 +9,7 @@ import net.minecraft.util.Direction.AxisDirection; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; -public class CuboidBrush extends Brush { +public class CuboidBrush extends ShapedBrush { public static final int MAX_SIZE = 32; private List positions; diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/CylinderBrush.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/CylinderBrush.java index c2b7beb19..0ec8b4f99 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/CylinderBrush.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/CylinderBrush.java @@ -17,7 +17,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.text.ITextComponent; -public class CylinderBrush extends Brush { +public class CylinderBrush extends ShapedBrush { public static final int MAX_RADIUS = 8; public static final int MAX_HEIGHT = 8; diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/DynamicBrush.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/DynamicBrush.java new file mode 100644 index 000000000..5305a65e5 --- /dev/null +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/DynamicBrush.java @@ -0,0 +1,147 @@ +package com.simibubi.create.content.curiosities.zapper.terrainzapper; + +import java.util.Collection; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; + +import com.simibubi.create.foundation.utility.BlockHelper; +import com.simibubi.create.foundation.utility.Lang; + +import net.minecraft.block.BlockState; +import net.minecraft.util.Direction; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.world.IWorld; + +public class DynamicBrush extends Brush { + + public static final int MAX_RADIUS = 10; + + private boolean surface; + + public DynamicBrush(boolean surface) { + super(1); + this.surface = surface; + } + + ITextComponent getParamLabel(int paramIndex) { + return Lang.translate("generic.range"); + } + + @Override + public TerrainTools[] getSupportedTools() { + return surface ? new TerrainTools[] { TerrainTools.Overlay, TerrainTools.Replace, TerrainTools.Clear } + : new TerrainTools[] { TerrainTools.Replace, TerrainTools.Clear }; + } + + @Override + public boolean hasPlacementOptions() { + return false; + } + + @Override + public boolean hasConnectivityOptions() { + return true; + } + + @Override + int getMax(int paramIndex) { + return MAX_RADIUS; + } + + @Override + int getMin(int paramIndex) { + return 1; + } + + @Override + public TerrainTools redirectTool(TerrainTools tool) { + if (tool == TerrainTools.Overlay) + return TerrainTools.Place; + return super.redirectTool(tool); + } + + @Override + public Collection addToGlobalPositions(IWorld world, BlockPos targetPos, Direction targetFace, + Collection affectedPositions, TerrainTools usedTool) { + + boolean searchDiagonals = param1 == 0; + boolean fuzzy = param2 == 0; + boolean replace = usedTool != TerrainTools.Overlay; + int searchRange = param0; + + Set visited = new HashSet<>(); + List frontier = new LinkedList<>(); + + BlockState state = world.getBlockState(targetPos); + List offsets = new LinkedList<>(); + + for (int x = -1; x <= 1; x++) + for (int y = -1; y <= 1; y++) + for (int z = -1; z <= 1; z++) + if (Math.abs(x) + Math.abs(y) + Math.abs(z) < 2 || searchDiagonals) + if (targetFace.getAxis() + .getCoordinate(x, y, z) == 0 || !surface) + offsets.add(new BlockPos(x, y, z)); + + BlockPos startPos = replace ? targetPos : targetPos.offset(targetFace); + frontier.add(startPos); + + while (!frontier.isEmpty()) { + BlockPos currentPos = frontier.remove(0); + if (visited.contains(currentPos)) + continue; + visited.add(currentPos); + if (!currentPos.withinDistance(startPos, searchRange)) + continue; + + // Replace Mode + if (replace) { + BlockState stateToReplace = world.getBlockState(currentPos); + BlockState stateAboveStateToReplace = world.getBlockState(currentPos.offset(targetFace)); + + // Criteria + if (stateToReplace.getBlockHardness(world, currentPos) == -1) + continue; + if (stateToReplace.getBlock() != state.getBlock() && !fuzzy) + continue; + if (stateToReplace.getMaterial() + .isReplaceable()) + continue; + if (BlockHelper.hasBlockSolidSide(stateAboveStateToReplace, world, currentPos.offset(targetFace), + targetFace.getOpposite()) && surface) + continue; + affectedPositions.add(currentPos); + + // Search adjacent spaces + for (BlockPos offset : offsets) + frontier.add(currentPos.add(offset)); + continue; + } + + // Place Mode + BlockState stateToPlaceAt = world.getBlockState(currentPos); + BlockState stateToPlaceOn = world.getBlockState(currentPos.offset(targetFace.getOpposite())); + + // Criteria + if (stateToPlaceOn.getMaterial() + .isReplaceable()) + continue; + if (stateToPlaceOn.getBlock() != state.getBlock() && !fuzzy) + continue; + if (!stateToPlaceAt.getMaterial() + .isReplaceable()) + continue; + affectedPositions.add(currentPos); + + // Search adjacent spaces + for (BlockPos offset : offsets) + frontier.add(currentPos.add(offset)); + continue; + } + + return affectedPositions; + } +} diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/ShapedBrush.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/ShapedBrush.java new file mode 100644 index 000000000..f0e67f3c2 --- /dev/null +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/ShapedBrush.java @@ -0,0 +1,29 @@ +package com.simibubi.create.content.curiosities.zapper.terrainzapper; + +import java.util.Collection; +import java.util.List; + +import net.minecraft.util.Direction; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IWorld; + +public abstract class ShapedBrush extends Brush { + + public ShapedBrush(int amtParams) { + super(amtParams); + } + + @Override + public Collection addToGlobalPositions(IWorld world, BlockPos targetPos, Direction targetFace, + Collection affectedPositions, TerrainTools usedTool) { + List includedPositions = getIncludedPositions(); + if (includedPositions == null) + return affectedPositions; + for (BlockPos blockPos : includedPositions) + affectedPositions.add(targetPos.add(blockPos)); + return affectedPositions; + } + + abstract List getIncludedPositions(); + +} diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/SphereBrush.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/SphereBrush.java index b7865c5ac..be7657398 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/SphereBrush.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/SphereBrush.java @@ -13,7 +13,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.text.ITextComponent; -public class SphereBrush extends Brush { +public class SphereBrush extends ShapedBrush { public static final int MAX_RADIUS = 10; private Map> cachedBrushes; diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainBrushes.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainBrushes.java index 0088d025d..fa11468b6 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainBrushes.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainBrushes.java @@ -5,6 +5,8 @@ public enum TerrainBrushes { Cuboid(new CuboidBrush()), Sphere(new SphereBrush()), Cylinder(new CylinderBrush()), + Surface(new DynamicBrush(true)), + Cluster(new DynamicBrush(false)), ; @@ -15,10 +17,6 @@ public enum TerrainBrushes { } public Brush get() { -// if (this == Cylinder) -// brush = new CylinderBrush(); -// if (this == Sphere) -// brush = new SphereBrush(); return brush; } diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainTools.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainTools.java index 3abb7fe27..43ba4e9f5 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainTools.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/TerrainTools.java @@ -23,8 +23,10 @@ public enum TerrainTools { Replace(AllIcons.I_REPLACE), Clear(AllIcons.I_CLEAR), Overlay(AllIcons.I_OVERLAY), - Flatten(AllIcons.I_FLATTEN); + Flatten(AllIcons.I_FLATTEN), + ; + public String translationKey; public AllIcons icon; diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperItem.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperItem.java index 4e5df7686..86d74a5c6 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperItem.java @@ -74,10 +74,10 @@ public class WorldshaperItem extends ZapperItem { brush.set(params.getX(), params.getY(), params.getZ()); targetPos = targetPos.add(brush.getOffset(player.getLookVec(), raytrace.getFace(), option)); - for (BlockPos blockPos : brush.getIncludedPositions()) - affectedPositions.add(targetPos.add(blockPos)); + brush.addToGlobalPositions(world, targetPos, raytrace.getFace(), affectedPositions, tool); PlacementPatterns.applyPattern(affectedPositions, stack); - tool.run(world, affectedPositions, raytrace.getFace(), stateToUse, data, player); + brush.redirectTool(tool) + .run(world, affectedPositions, raytrace.getFace(), stateToUse, data, player); return true; } diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperRenderHandler.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperRenderHandler.java index 30566128b..9edd53a8d 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperRenderHandler.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperRenderHandler.java @@ -1,7 +1,8 @@ package com.simibubi.create.content.curiosities.zapper.terrainzapper; -import java.util.List; -import java.util.stream.Collectors; +import java.util.ArrayList; +import java.util.Collection; +import java.util.function.Supplier; import com.simibubi.create.AllItems; import com.simibubi.create.AllSpecialTextures; @@ -23,18 +24,16 @@ import net.minecraft.util.math.vector.Vector3d; public class WorldshaperRenderHandler { - private static List renderedShape; - private static BlockPos renderedPosition; + private static Supplier> renderedPositions; public static void tick() { gatherSelectedBlocks(); - if (renderedPosition == null) + if (renderedPositions == null) return; - CreateClient.outliner.showCluster("terrainZapper", renderedShape.stream() - .map(pos -> pos.add(renderedPosition)) - .collect(Collectors.toList())) + CreateClient.outliner.showCluster("terrainZapper", renderedPositions.get()) .colored(0xbfbfbf) + .disableNormals() .lineWidth(1 / 32f) .withFaceTexture(AllSpecialTextures.CHECKERED); } @@ -60,21 +59,21 @@ public class WorldshaperRenderHandler { return; } - renderedPosition = null; + renderedPositions = null; } public static void createBrushOutline(CompoundNBT tag, ClientPlayerEntity player, ItemStack zapper) { if (!tag.contains("BrushParams")) { - renderedPosition = null; + renderedPositions = null; return; } Brush brush = NBTHelper.readEnum(tag, "Brush", TerrainBrushes.class) .get(); PlacementOptions placement = NBTHelper.readEnum(tag, "Placement", PlacementOptions.class); + TerrainTools tool = NBTHelper.readEnum(tag, "Tool", TerrainTools.class); BlockPos params = NBTUtil.readBlockPos(tag.getCompound("BrushParams")); brush.set(params.getX(), params.getY(), params.getZ()); - renderedShape = brush.getIncludedPositions(); Vector3d start = player.getPositionVec() .add(0, player.getEyeHeight(), 0); @@ -83,12 +82,14 @@ public class WorldshaperRenderHandler { BlockRayTraceResult raytrace = player.world .rayTraceBlocks(new RayTraceContext(start, start.add(range), BlockMode.OUTLINE, FluidMode.NONE, player)); if (raytrace == null || raytrace.getType() == Type.MISS) { - renderedPosition = null; + renderedPositions = null; return; } - BlockPos pos = raytrace.getPos(); - renderedPosition = pos.add(brush.getOffset(player.getLookVec(), raytrace.getFace(), placement)); + BlockPos pos = raytrace.getPos() + .add(brush.getOffset(player.getLookVec(), raytrace.getFace(), placement)); + renderedPositions = + () -> brush.addToGlobalPositions(player.world, pos, raytrace.getFace(), new ArrayList<>(), tool); } } diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperScreen.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperScreen.java index 5a7c70d7f..6937f719d 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperScreen.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperScreen.java @@ -6,7 +6,10 @@ import java.util.Vector; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.content.curiosities.zapper.ZapperScreen; import com.simibubi.create.foundation.gui.AllGuiTextures; +import com.simibubi.create.foundation.gui.AllIcons; import com.simibubi.create.foundation.gui.widgets.IconButton; +import com.simibubi.create.foundation.gui.widgets.Indicator; +import com.simibubi.create.foundation.gui.widgets.Indicator.State; import com.simibubi.create.foundation.gui.widgets.Label; import com.simibubi.create.foundation.gui.widgets.ScrollInput; import com.simibubi.create.foundation.gui.widgets.SelectionScrollInput; @@ -26,7 +29,7 @@ public class WorldshaperScreen extends ZapperScreen { protected final ITextComponent placementSection = Lang.translate("gui.terrainzapper.placement"); protected final ITextComponent toolSection = Lang.translate("gui.terrainzapper.tool"); protected final List brushOptions = - Lang.translatedOptions("gui.terrainzapper.brush", "cuboid", "sphere", "cylinder"); + Lang.translatedOptions("gui.terrainzapper.brush", "cuboid", "sphere", "cylinder", "surface", "cluster"); protected Vector toolButtons; protected Vector placementButtons; @@ -35,6 +38,11 @@ public class WorldshaperScreen extends ZapperScreen { protected Label brushLabel; protected Vector brushParams; protected Vector