diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 3ff7488e8..481c14fd2 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -411,20 +411,20 @@ a3a11524cd3515fc01d905767b4b7ea782adaf03 assets/create/blockstates/yellow_seat.j 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json 391e1552053f8fbb148b0bdf2e61f74ae4782100 assets/create/lang/en_ud.json -faa365ddd3f8f57c055bf65666c996bc74225394 assets/create/lang/en_us.json -9199b4649bdc7c19c3b79670efe506ff5b3f540b assets/create/lang/unfinished/de_de.json -92b8fc47ecd84423c6b30fbf2df5bd015acd04e1 assets/create/lang/unfinished/es_es.json -36a0f93f1b75555f08543c717dd42f464ef618ff assets/create/lang/unfinished/es_mx.json -676994435f2b6295d7b5e6f25c7b8ef7c36a825a assets/create/lang/unfinished/fr_fr.json -7b2ff91343db8b0f2c06b4702ac704945552b9cc assets/create/lang/unfinished/it_it.json -e467d82809b0ae382139de870e5c82e0a6dd4da6 assets/create/lang/unfinished/ja_jp.json -b21506cd99caa124069146e1a3e7a675daf8cdc2 assets/create/lang/unfinished/ko_kr.json -61d141443e3945445863a8b96b5d9a667060028e assets/create/lang/unfinished/nl_nl.json -843533f614d5ef9167df6ac3c8fa390eaad658cf assets/create/lang/unfinished/pl_pl.json -64bcf724615d0265bcfd55c115dc32b6f45a19cb assets/create/lang/unfinished/pt_br.json -70de883f62946813ef00ef6806d1fdd55808b68f assets/create/lang/unfinished/ru_ru.json -db692d79ab25cc1534b0238effc51b4d9c9f3328 assets/create/lang/unfinished/zh_cn.json -e23bade49d0220f84a5b0c376ebce257bcde3cbb assets/create/lang/unfinished/zh_tw.json +9d41edd2a78d074f0e80fbc95b6eb9f1303ef7f5 assets/create/lang/en_us.json +f05c04c9b1e79c446492af47a9bfcde73cefd138 assets/create/lang/unfinished/de_de.json +3b2ed3f1b4910e5cc03af089bf2ddfc1421cfc1f assets/create/lang/unfinished/es_es.json +e9ad51b0ad0e1088f121fb2444ef2019c11a2e80 assets/create/lang/unfinished/es_mx.json +f6f8a3f4b3bf685e324c9216b5bb0467c68da796 assets/create/lang/unfinished/fr_fr.json +d05b807ead4cc5dbae6444de5e91525a385d9b20 assets/create/lang/unfinished/it_it.json +055d6b4d130fedfe0232c351663bd9a1934d1a46 assets/create/lang/unfinished/ja_jp.json +064c4e1d5923dc5a75b178940cb36c42f764a6ad assets/create/lang/unfinished/ko_kr.json +762c1bdec8a3f2ecb4047fbb5b975ffbc1792374 assets/create/lang/unfinished/nl_nl.json +43c113585d98162f8cbe5ec02af06f6f8ae55cbc assets/create/lang/unfinished/pl_pl.json +3ab83a3d7d925821d73e9ab6064d3b479d7c21e6 assets/create/lang/unfinished/pt_br.json +51c20e7a0c4b2af9242ee31cf0cf1516b9f312a5 assets/create/lang/unfinished/ru_ru.json +95bf20119493721c3067319f165e2542295918c0 assets/create/lang/unfinished/zh_cn.json +9604bfe416e4f747efda84b419ec99f2b38bd544 assets/create/lang/unfinished/zh_tw.json 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 @@ -1680,6 +1680,8 @@ de13a091928d5ab539d567411dd5c522cdcdd668 data/create/advancements/brass_casing.j 9531baa67bb3aee5e2723b1ab0578ff87bcb42b0 data/create/advancements/chromatic_eob.json f37551a788dfb3ff3d65db97a03c0420edf2c041 data/create/advancements/chute.json 0ffacd497176afdb26670783b65d383ac6236c19 data/create/advancements/clockwork_bearing.json +18511a1a11f2b362438cfcd961750963a43b7155 data/create/advancements/clockwork_component.json +df4a08ee0bd8d26977fdf2e45cce1d3b2f972033 data/create/advancements/clockwork_component_eob.json 870ca791c418a1bc24f7b12284f5788c84911b92 data/create/advancements/compact.json d1015e059a2f2008a364b6d045a011a6d671f20d data/create/advancements/copper_casing.json 8e2a12a26218a46665c46f350ef9c3418a901988 data/create/advancements/crafter.json @@ -1688,7 +1690,7 @@ e9e1789de5cd5577a801a09d489a13f2c98779dc data/create/advancements/cuckoo.json 2a96fad5b44b62f233c9af5b4a637faf32ce24af data/create/advancements/deployer.json 20e04d0ac916996efedc35ab80e2b4ac4001582c data/create/advancements/dual_extendo_grip.json 04eaf829696d735244c0e4798dd3bdeb26e13a32 data/create/advancements/electron_tube.json -6cf58b2b705b3db2fe8c2f38d86d82a214eead95 data/create/advancements/extendo_grip.json +23b99d6745120e5ee11bcf6e3f6d55beb1be64f6 data/create/advancements/extendo_grip.json b1699baaadaac7ebce642c09428519d156e21594 data/create/advancements/fan.json 5aa76cba3b40a1c234ffa84a89ecca630990fc0f data/create/advancements/fan_lava.json 716a9816558300a3652ed8d8d568517017813f5c data/create/advancements/fan_smoke.json @@ -1701,8 +1703,6 @@ ea0f8acb7c3692b569269e62927725d968a65251 data/create/advancements/hose_pulley.js 9f642faf92b75a28c564e90be8448b9a4328af5e data/create/advancements/infinite_chocolate.json a933fa5e7217e2ffe123ae035cfbc9210ba69fd5 data/create/advancements/infinite_lava.json a8ab0e4ffba358d23f9efaa9f51245b6d490a8be data/create/advancements/infinite_water.json -86702f4f1bfee988a2fee5647d603c9ea2dfc8b0 data/create/advancements/integrated_circuit.json -b3596d6bdc67fc503ad430f64ad3b7a0a355d3e2 data/create/advancements/integrated_circuit_eob.json 4d7cb129877d6cd68fda66159818e47ca44db078 data/create/advancements/item_drain.json b61d958815f1c2530c11c88c9081d5c794d7f807 data/create/advancements/its_alive.json 9d68fed495a37fc78184e43e432c3181da84d19c data/create/advancements/lava_wheel.json @@ -1719,6 +1719,7 @@ c9c4060ed207226b69fada2d61e01a97d7077eae data/create/advancements/nixie_tube.jso 449eb8a9e6102bb342c96eb8b19e743eb6979bfa data/create/advancements/pipe_collision.json 4b621e5bb48fbb120853ec02c05c915d86bd6dd8 data/create/advancements/pipe_spill.json 72025d8bf73ab8096c29f12d0c8d9a346f09cd64 data/create/advancements/polished_rose_quartz.json +77421567ff8eb4bdbe6c16bc3f0ae0ed1cc29e5e data/create/advancements/potato_cannon.json 62d29ec01eff5d21968636a0479361ecdc11ae30 data/create/advancements/press.json f80479b50e248ee8d6d1abb7d08866cf711ac2b2 data/create/advancements/recipes/building_blocks/andesite.json 5012e9d559439d0d62d0b34c2e39de048e8c7699 data/create/advancements/recipes/building_blocks/blasting/aluminum_ingot_compat_silents_mechanisms.json @@ -2381,7 +2382,7 @@ e0b9edc5e59647e7dd99be17369b263dadf407d4 data/create/advancements/refined_radian fc12b590ab8f5ac901db21c67ba3850f157e1421 data/create/advancements/root.json c1f162e773518f6b1481221e3e63f9ba33fed647 data/create/advancements/shadow_steel.json 6c1a67e193a4c5af356b31a1d5b5e9d3faeca87e data/create/advancements/shifting_gears.json -a7d278d8ce8e2769c0b9c89f547d4775eabe671b data/create/advancements/speed_controller.json +17f0cf050d0024559d0100925e325117bf3b20e3 data/create/advancements/speed_controller.json a203d509a6038f0bad707e232a425388e62e1ae1 data/create/advancements/speedometer.json f7bb8f08a08e22ec1e6bb098d65d06233e8fbcec data/create/advancements/splitter_tunnel.json b69d174d7a5e9eab8ca013b66bc9d02244d7f9a3 data/create/advancements/spout.json diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 6aefb16ea..04be2bdfa 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -630,8 +630,8 @@ "advancement.create.flywheel.desc": "Successfully connect an engine to the Flywheel.", "advancement.create.overstress_flywheel": "High levels of Stress", "advancement.create.overstress_flywheel.desc": "Overstress a Furnace Engine.", - "advancement.create.integrated_circuit": "Complex Calculation", - "advancement.create.integrated_circuit.desc": "Assemble an Integrated Circuit.", + "advancement.create.clockwork_component": "Complex Curiosities", + "advancement.create.clockwork_component.desc": "Assemble a Clockwork Component.", "advancement.create.mechanical_arm": "Busy Hands!", "advancement.create.mechanical_arm.desc": "Craft a Mechanical Arm, select in- and outputs, place it down and give it power; then watch as it does all the work for you.", "advancement.create.musical_arm": "Play Me My Theme Tune!", @@ -646,7 +646,7 @@ "advancement.create.crushing_wheel.desc": "Create some Crushing Wheels to break down more materials more effectively.", "advancement.create.blaze_cake": "Sugar Rush", "advancement.create.blaze_cake.desc": "Bake your blaze burner a special cake.", - "advancement.create.chromatic_compound": "Bipolar Minerals", + "advancement.create.chromatic_compound": "Mysterious Minerals", "advancement.create.chromatic_compound.desc": "Create a Bar of Chromatic Compound.", "advancement.create.shadow_steel": "Void Returner", "advancement.create.shadow_steel.desc": "Create Shadow Steel, a metal bar of nothingness.", @@ -658,6 +658,8 @@ "advancement.create.wand_of_symmetry.desc": "Craft a Staff of Symmetry.", "advancement.create.extendo_grip": "Boioioing!", "advancement.create.extendo_grip.desc": "Get hold of an Extendo Grip.", + "advancement.create.potato_cannon": "Fwoomp!", + "advancement.create.potato_cannon.desc": "Defeat an enemy with your Potato Cannon.", "advancement.create.dual_extendo_grip": "Ultimate Boing-age", "advancement.create.dual_extendo_grip.desc": "Dual wield Extendo Grips for super-human reach.", "advancement.create.eob": "End of Beta", 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 2c2897677..d041cb02d 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: 1088", + "_": "Missing Localizations: 1090", "_": "->------------------------] Game Elements [------------------------<-", @@ -631,8 +631,8 @@ "advancement.create.flywheel.desc": "UNLOCALIZED: Successfully connect an engine to the Flywheel.", "advancement.create.overstress_flywheel": "UNLOCALIZED: High levels of Stress", "advancement.create.overstress_flywheel.desc": "UNLOCALIZED: Overstress a Furnace Engine.", - "advancement.create.integrated_circuit": "UNLOCALIZED: Complex Calculation", - "advancement.create.integrated_circuit.desc": "UNLOCALIZED: Assemble an Integrated Circuit.", + "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", + "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", "advancement.create.mechanical_arm": "UNLOCALIZED: Busy Hands!", "advancement.create.mechanical_arm.desc": "UNLOCALIZED: Craft a Mechanical Arm, select in- and outputs, place it down and give it power; then watch as it does all the work for you.", "advancement.create.musical_arm": "UNLOCALIZED: Play Me My Theme Tune!", @@ -647,7 +647,7 @@ "advancement.create.crushing_wheel.desc": "UNLOCALIZED: Create some Crushing Wheels to break down more materials more effectively.", "advancement.create.blaze_cake": "UNLOCALIZED: Sugar Rush", "advancement.create.blaze_cake.desc": "UNLOCALIZED: Bake your blaze burner a special cake.", - "advancement.create.chromatic_compound": "UNLOCALIZED: Bipolar Minerals", + "advancement.create.chromatic_compound": "UNLOCALIZED: Mysterious Minerals", "advancement.create.chromatic_compound.desc": "UNLOCALIZED: Create a Bar of Chromatic Compound.", "advancement.create.shadow_steel": "UNLOCALIZED: Void Returner", "advancement.create.shadow_steel.desc": "UNLOCALIZED: Create Shadow Steel, a metal bar of nothingness.", @@ -659,6 +659,8 @@ "advancement.create.wand_of_symmetry.desc": "UNLOCALIZED: Craft a Staff of Symmetry.", "advancement.create.extendo_grip": "Boioioing!", "advancement.create.extendo_grip.desc": "Beschaffe einen Extendo Griff.", + "advancement.create.potato_cannon": "UNLOCALIZED: Fwoomp!", + "advancement.create.potato_cannon.desc": "UNLOCALIZED: Defeat an enemy with your Potato Cannon.", "advancement.create.dual_extendo_grip": "Ultimatives Boing-Zeitalter", "advancement.create.dual_extendo_grip.desc": "Schwinge zwei Extendo Griffe gleichzeitig für eine übermenschliche Reichweite.", "advancement.create.eob": "Ende der Beta", 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 ce79f134d..20b84538e 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: 849", + "_": "Missing Localizations: 853", "_": "->------------------------] Game Elements [------------------------<-", @@ -631,8 +631,8 @@ "advancement.create.flywheel.desc": "Conectar con éxito un motor a la rueda de inercia.", "advancement.create.overstress_flywheel": "Altos niveles de estrés", "advancement.create.overstress_flywheel.desc": "Sobrecargar un Motor de Horno.", - "advancement.create.integrated_circuit": "Cálculos complejos", - "advancement.create.integrated_circuit.desc": "Ensamblar un chip de circuito integrado.", + "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", + "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", "advancement.create.mechanical_arm": "Manos ocupadas!", "advancement.create.mechanical_arm.desc": "Crea un brazo mecánico, selecciona las entradas y salidas, colócalo en el suelo y dale energía; luego observa cómo hace todo el trabajo por ti.", "advancement.create.musical_arm": "Tócame la melodía!", @@ -659,6 +659,8 @@ "advancement.create.wand_of_symmetry.desc": "Crear un bastón de simetría.", "advancement.create.extendo_grip": "Boioioing!", "advancement.create.extendo_grip.desc": "Hazte con un Agarre extentido.", + "advancement.create.potato_cannon": "UNLOCALIZED: Fwoomp!", + "advancement.create.potato_cannon.desc": "UNLOCALIZED: Defeat an enemy with your Potato Cannon.", "advancement.create.dual_extendo_grip": "La última edad del boing", "advancement.create.dual_extendo_grip.desc": "Doble Empuñadura extendida para un alcance sobrehumano.", "advancement.create.eob": "Fin de la beta", 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 51cef501e..d72d4c061 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: 1455", + "_": "Missing Localizations: 1457", "_": "->------------------------] Game Elements [------------------------<-", @@ -631,8 +631,8 @@ "advancement.create.flywheel.desc": "UNLOCALIZED: Successfully connect an engine to the Flywheel.", "advancement.create.overstress_flywheel": "UNLOCALIZED: High levels of Stress", "advancement.create.overstress_flywheel.desc": "UNLOCALIZED: Overstress a Furnace Engine.", - "advancement.create.integrated_circuit": "UNLOCALIZED: Complex Calculation", - "advancement.create.integrated_circuit.desc": "UNLOCALIZED: Assemble an Integrated Circuit.", + "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", + "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", "advancement.create.mechanical_arm": "UNLOCALIZED: Busy Hands!", "advancement.create.mechanical_arm.desc": "UNLOCALIZED: Craft a Mechanical Arm, select in- and outputs, place it down and give it power; then watch as it does all the work for you.", "advancement.create.musical_arm": "UNLOCALIZED: Play Me My Theme Tune!", @@ -647,7 +647,7 @@ "advancement.create.crushing_wheel.desc": "UNLOCALIZED: Create some Crushing Wheels to break down more materials more effectively.", "advancement.create.blaze_cake": "UNLOCALIZED: Sugar Rush", "advancement.create.blaze_cake.desc": "UNLOCALIZED: Bake your blaze burner a special cake.", - "advancement.create.chromatic_compound": "UNLOCALIZED: Bipolar Minerals", + "advancement.create.chromatic_compound": "UNLOCALIZED: Mysterious Minerals", "advancement.create.chromatic_compound.desc": "UNLOCALIZED: Create a Bar of Chromatic Compound.", "advancement.create.shadow_steel": "UNLOCALIZED: Void Returner", "advancement.create.shadow_steel.desc": "UNLOCALIZED: Create Shadow Steel, a metal bar of nothingness.", @@ -659,6 +659,8 @@ "advancement.create.wand_of_symmetry.desc": "UNLOCALIZED: Craft a Staff of Symmetry.", "advancement.create.extendo_grip": "UNLOCALIZED: Boioioing!", "advancement.create.extendo_grip.desc": "UNLOCALIZED: Get hold of an Extendo Grip.", + "advancement.create.potato_cannon": "UNLOCALIZED: Fwoomp!", + "advancement.create.potato_cannon.desc": "UNLOCALIZED: Defeat an enemy with your Potato Cannon.", "advancement.create.dual_extendo_grip": "UNLOCALIZED: Ultimate Boing-age", "advancement.create.dual_extendo_grip.desc": "UNLOCALIZED: Dual wield Extendo Grips for super-human reach.", "advancement.create.eob": "UNLOCALIZED: End of Beta", 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 3da26a410..17f930584 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: 1340", + "_": "Missing Localizations: 1342", "_": "->------------------------] Game Elements [------------------------<-", @@ -631,8 +631,8 @@ "advancement.create.flywheel.desc": "UNLOCALIZED: Successfully connect an engine to the Flywheel.", "advancement.create.overstress_flywheel": "UNLOCALIZED: High levels of Stress", "advancement.create.overstress_flywheel.desc": "UNLOCALIZED: Overstress a Furnace Engine.", - "advancement.create.integrated_circuit": "UNLOCALIZED: Complex Calculation", - "advancement.create.integrated_circuit.desc": "UNLOCALIZED: Assemble an Integrated Circuit.", + "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", + "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", "advancement.create.mechanical_arm": "UNLOCALIZED: Busy Hands!", "advancement.create.mechanical_arm.desc": "UNLOCALIZED: Craft a Mechanical Arm, select in- and outputs, place it down and give it power; then watch as it does all the work for you.", "advancement.create.musical_arm": "UNLOCALIZED: Play Me My Theme Tune!", @@ -647,7 +647,7 @@ "advancement.create.crushing_wheel.desc": "UNLOCALIZED: Create some Crushing Wheels to break down more materials more effectively.", "advancement.create.blaze_cake": "UNLOCALIZED: Sugar Rush", "advancement.create.blaze_cake.desc": "UNLOCALIZED: Bake your blaze burner a special cake.", - "advancement.create.chromatic_compound": "UNLOCALIZED: Bipolar Minerals", + "advancement.create.chromatic_compound": "UNLOCALIZED: Mysterious Minerals", "advancement.create.chromatic_compound.desc": "UNLOCALIZED: Create a Bar of Chromatic Compound.", "advancement.create.shadow_steel": "UNLOCALIZED: Void Returner", "advancement.create.shadow_steel.desc": "UNLOCALIZED: Create Shadow Steel, a metal bar of nothingness.", @@ -659,6 +659,8 @@ "advancement.create.wand_of_symmetry.desc": "UNLOCALIZED: Craft a Staff of Symmetry.", "advancement.create.extendo_grip": "UNLOCALIZED: Boioioing!", "advancement.create.extendo_grip.desc": "UNLOCALIZED: Get hold of an Extendo Grip.", + "advancement.create.potato_cannon": "UNLOCALIZED: Fwoomp!", + "advancement.create.potato_cannon.desc": "UNLOCALIZED: Defeat an enemy with your Potato Cannon.", "advancement.create.dual_extendo_grip": "UNLOCALIZED: Ultimate Boing-age", "advancement.create.dual_extendo_grip.desc": "UNLOCALIZED: Dual wield Extendo Grips for super-human reach.", "advancement.create.eob": "UNLOCALIZED: End of Beta", 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 16145b299..8bab297b1 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: 866", + "_": "Missing Localizations: 870", "_": "->------------------------] Game Elements [------------------------<-", @@ -631,8 +631,8 @@ "advancement.create.flywheel.desc": "Collega un motore ad un volano.", "advancement.create.overstress_flywheel": "Alti livelli di stress", "advancement.create.overstress_flywheel.desc": "Sovrastressa un motore fornace.", - "advancement.create.integrated_circuit": "Calcolo complesso", - "advancement.create.integrated_circuit.desc": "Assembla un circuito integrato.", + "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", + "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", "advancement.create.mechanical_arm": "Mani occupate!", "advancement.create.mechanical_arm.desc": "Costruisci un braccio meccanico, seleziona gli input e gli output, piazzalo e alimentalo; poi guardalo mentre fa il lavoro sporco al tuo posto.", "advancement.create.musical_arm": "DJ, metti su la musica!", @@ -659,6 +659,8 @@ "advancement.create.wand_of_symmetry.desc": "Crea un'asta di simmetria.", "advancement.create.extendo_grip": "BOIOIOING", "advancement.create.extendo_grip.desc": "Procurati una presa extendo.", + "advancement.create.potato_cannon": "UNLOCALIZED: Fwoomp!", + "advancement.create.potato_cannon.desc": "UNLOCALIZED: Defeat an enemy with your Potato Cannon.", "advancement.create.dual_extendo_grip": "Boingaggio estremo", "advancement.create.dual_extendo_grip.desc": "Brandisci due prese extendo per raggiungere il superuomo.", "advancement.create.eob": "Fine della beta", 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 236c15cb1..dfd0616e8 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: 232", + "_": "Missing Localizations: 236", "_": "->------------------------] Game Elements [------------------------<-", @@ -631,8 +631,8 @@ "advancement.create.flywheel.desc": "かまどエンジンを勢車に繋ぐ", "advancement.create.overstress_flywheel": "ハイレベル応力", "advancement.create.overstress_flywheel.desc": "かまどエンジンに超過応力をかける", - "advancement.create.integrated_circuit": "複素数の計算", - "advancement.create.integrated_circuit.desc": "集積回路を組み立てる", + "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", + "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", "advancement.create.mechanical_arm": "手が離せない！", "advancement.create.mechanical_arm.desc": "搬入元と搬出先を設定したメカニカルアームを設置して、稼働させ、あなたのために一生懸命労働している様子を見る", "advancement.create.musical_arm": "お気に入りの曲を流して！", @@ -659,6 +659,8 @@ "advancement.create.wand_of_symmetry.desc": "対象の杖を作る", "advancement.create.extendo_grip": "ビヨヨーン！", "advancement.create.extendo_grip.desc": "マジックハンドを手に入れる", + "advancement.create.potato_cannon": "UNLOCALIZED: Fwoomp!", + "advancement.create.potato_cannon.desc": "UNLOCALIZED: Defeat an enemy with your Potato Cannon.", "advancement.create.dual_extendo_grip": "究極のビヨンビヨン時代", "advancement.create.dual_extendo_grip.desc": "二刀流のマジックハンドで超人的なリーチを手に入れる", "advancement.create.eob": "ベータ版はここまで", 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 83cf62cad..dd6dc4268 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: 919", + "_": "Missing Localizations: 923", "_": "->------------------------] Game Elements [------------------------<-", @@ -631,8 +631,8 @@ "advancement.create.flywheel.desc": "화로엔진에 플라이휠을 연결하세요.", "advancement.create.overstress_flywheel": "정말 높은 피로", "advancement.create.overstress_flywheel.desc": "화로 엔진을 과부하하세요.", - "advancement.create.integrated_circuit": "복잡한 계산", - "advancement.create.integrated_circuit.desc": "집적 회로를 제작하세요.", + "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", + "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", "advancement.create.mechanical_arm": "할일이 많아!", "advancement.create.mechanical_arm.desc": "기계 팔을 조합하고, 입력부와 출력부를 정하고, 설치한 다음 돌리세요. 그리고 그것이 작동하는 것을 보세요.", "advancement.create.musical_arm": "볼륨 최대로!", @@ -659,6 +659,8 @@ "advancement.create.wand_of_symmetry.desc": "대칭의 지팡이를 만드세요.", "advancement.create.extendo_grip": "띠요오옹!", "advancement.create.extendo_grip.desc": "외장형 연장 팔을 드세요.", + "advancement.create.potato_cannon": "UNLOCALIZED: Fwoomp!", + "advancement.create.potato_cannon.desc": "UNLOCALIZED: Defeat an enemy with your Potato Cannon.", "advancement.create.dual_extendo_grip": "궁극의 띠용!", "advancement.create.dual_extendo_grip.desc": "쌍으로 외장형 연장 팔을 들어 인간을 뛰어넘은 사거리를 가지세요.", "advancement.create.eob": "End of Beta", 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 d2f495b88..d0630f074 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: 1721", + "_": "Missing Localizations: 1723", "_": "->------------------------] Game Elements [------------------------<-", @@ -631,8 +631,8 @@ "advancement.create.flywheel.desc": "UNLOCALIZED: Successfully connect an engine to the Flywheel.", "advancement.create.overstress_flywheel": "UNLOCALIZED: High levels of Stress", "advancement.create.overstress_flywheel.desc": "UNLOCALIZED: Overstress a Furnace Engine.", - "advancement.create.integrated_circuit": "UNLOCALIZED: Complex Calculation", - "advancement.create.integrated_circuit.desc": "UNLOCALIZED: Assemble an Integrated Circuit.", + "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", + "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", "advancement.create.mechanical_arm": "UNLOCALIZED: Busy Hands!", "advancement.create.mechanical_arm.desc": "UNLOCALIZED: Craft a Mechanical Arm, select in- and outputs, place it down and give it power; then watch as it does all the work for you.", "advancement.create.musical_arm": "UNLOCALIZED: Play Me My Theme Tune!", @@ -647,7 +647,7 @@ "advancement.create.crushing_wheel.desc": "UNLOCALIZED: Create some Crushing Wheels to break down more materials more effectively.", "advancement.create.blaze_cake": "UNLOCALIZED: Sugar Rush", "advancement.create.blaze_cake.desc": "UNLOCALIZED: Bake your blaze burner a special cake.", - "advancement.create.chromatic_compound": "UNLOCALIZED: Bipolar Minerals", + "advancement.create.chromatic_compound": "UNLOCALIZED: Mysterious Minerals", "advancement.create.chromatic_compound.desc": "UNLOCALIZED: Create a Bar of Chromatic Compound.", "advancement.create.shadow_steel": "UNLOCALIZED: Void Returner", "advancement.create.shadow_steel.desc": "UNLOCALIZED: Create Shadow Steel, a metal bar of nothingness.", @@ -659,6 +659,8 @@ "advancement.create.wand_of_symmetry.desc": "UNLOCALIZED: Craft a Staff of Symmetry.", "advancement.create.extendo_grip": "UNLOCALIZED: Boioioing!", "advancement.create.extendo_grip.desc": "UNLOCALIZED: Get hold of an Extendo Grip.", + "advancement.create.potato_cannon": "UNLOCALIZED: Fwoomp!", + "advancement.create.potato_cannon.desc": "UNLOCALIZED: Defeat an enemy with your Potato Cannon.", "advancement.create.dual_extendo_grip": "UNLOCALIZED: Ultimate Boing-age", "advancement.create.dual_extendo_grip.desc": "UNLOCALIZED: Dual wield Extendo Grips for super-human reach.", "advancement.create.eob": "UNLOCALIZED: End of Beta", diff --git a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json index 480e9f9c6..2ef7a4458 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json +++ b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 208", + "_": "Missing Localizations: 212", "_": "->------------------------] Game Elements [------------------------<-", @@ -631,8 +631,8 @@ "advancement.create.flywheel.desc": "Skutecznie podłącz silnik do koła zamachowego.", "advancement.create.overstress_flywheel": "Wysoki poziom obciążenia", "advancement.create.overstress_flywheel.desc": "Przeładuj silnik spalinowy.", - "advancement.create.integrated_circuit": "Skomplikowane obliczenia", - "advancement.create.integrated_circuit.desc": "Złóż układ scalony.", + "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", + "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", "advancement.create.mechanical_arm": "Ręce pełne roboty", "advancement.create.mechanical_arm.desc": "Wytwórz ramię mechaniczne, wybierz miejsca wejścia i wyjścia, postaw je i wpraw w ruch. Patrz jak robi wszystko za Ciebie.", "advancement.create.musical_arm": "Zagraj coś dla mnie!", @@ -659,6 +659,8 @@ "advancement.create.wand_of_symmetry.desc": "Zdobądź różdżkę symetrii.", "advancement.create.extendo_grip": "Dalej dalej ręce Gadżeta!", "advancement.create.extendo_grip.desc": "Złap w ręce Wydłużony Chwytak.", + "advancement.create.potato_cannon": "UNLOCALIZED: Fwoomp!", + "advancement.create.potato_cannon.desc": "UNLOCALIZED: Defeat an enemy with your Potato Cannon.", "advancement.create.dual_extendo_grip": "Bioniczne modyfikacje", "advancement.create.dual_extendo_grip.desc": "Użyj dwóch Wydłużonych Chwytaków, aby posiąść nadludzki zasięg.", "advancement.create.eob": "Koniec Bety", 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 f6ac60547..cd60e31b3 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: 1762", + "_": "Missing Localizations: 1764", "_": "->------------------------] Game Elements [------------------------<-", @@ -631,8 +631,8 @@ "advancement.create.flywheel.desc": "UNLOCALIZED: Successfully connect an engine to the Flywheel.", "advancement.create.overstress_flywheel": "UNLOCALIZED: High levels of Stress", "advancement.create.overstress_flywheel.desc": "UNLOCALIZED: Overstress a Furnace Engine.", - "advancement.create.integrated_circuit": "UNLOCALIZED: Complex Calculation", - "advancement.create.integrated_circuit.desc": "UNLOCALIZED: Assemble an Integrated Circuit.", + "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", + "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", "advancement.create.mechanical_arm": "UNLOCALIZED: Busy Hands!", "advancement.create.mechanical_arm.desc": "UNLOCALIZED: Craft a Mechanical Arm, select in- and outputs, place it down and give it power; then watch as it does all the work for you.", "advancement.create.musical_arm": "UNLOCALIZED: Play Me My Theme Tune!", @@ -647,7 +647,7 @@ "advancement.create.crushing_wheel.desc": "UNLOCALIZED: Create some Crushing Wheels to break down more materials more effectively.", "advancement.create.blaze_cake": "UNLOCALIZED: Sugar Rush", "advancement.create.blaze_cake.desc": "UNLOCALIZED: Bake your blaze burner a special cake.", - "advancement.create.chromatic_compound": "UNLOCALIZED: Bipolar Minerals", + "advancement.create.chromatic_compound": "UNLOCALIZED: Mysterious Minerals", "advancement.create.chromatic_compound.desc": "UNLOCALIZED: Create a Bar of Chromatic Compound.", "advancement.create.shadow_steel": "UNLOCALIZED: Void Returner", "advancement.create.shadow_steel.desc": "UNLOCALIZED: Create Shadow Steel, a metal bar of nothingness.", @@ -659,6 +659,8 @@ "advancement.create.wand_of_symmetry.desc": "UNLOCALIZED: Craft a Staff of Symmetry.", "advancement.create.extendo_grip": "UNLOCALIZED: Boioioing!", "advancement.create.extendo_grip.desc": "UNLOCALIZED: Get hold of an Extendo Grip.", + "advancement.create.potato_cannon": "UNLOCALIZED: Fwoomp!", + "advancement.create.potato_cannon.desc": "UNLOCALIZED: Defeat an enemy with your Potato Cannon.", "advancement.create.dual_extendo_grip": "UNLOCALIZED: Ultimate Boing-age", "advancement.create.dual_extendo_grip.desc": "UNLOCALIZED: Dual wield Extendo Grips for super-human reach.", "advancement.create.eob": "UNLOCALIZED: End of Beta", 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 a5a8eff7f..5229d9134 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: 765", + "_": "Missing Localizations: 769", "_": "->------------------------] Game Elements [------------------------<-", @@ -631,8 +631,8 @@ "advancement.create.flywheel.desc": "Успешно соедините двигатель с маховиком.", "advancement.create.overstress_flywheel": "Перенапряжение", "advancement.create.overstress_flywheel.desc": "Подайте слишком большую нагрузку на печной двигатель.", - "advancement.create.integrated_circuit": "Сложные вычисления", - "advancement.create.integrated_circuit.desc": "Создайте Интегральную схему.", + "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", + "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", "advancement.create.mechanical_arm": "Золотые руки!", "advancement.create.mechanical_arm.desc": "Создайте Механическую руку, выбирете входы и выходы, установите в мире и запитайте. Затем смотрите как она делает за вас всю работу.", "advancement.create.musical_arm": "Сбацай что-нибудь!", @@ -659,6 +659,8 @@ "advancement.create.wand_of_symmetry.desc": "Создайте жезл симметрии.", "advancement.create.extendo_grip": "Кипение!", "advancement.create.extendo_grip.desc": "Возьмите в руки удлинённую руку", + "advancement.create.potato_cannon": "UNLOCALIZED: Fwoomp!", + "advancement.create.potato_cannon.desc": "UNLOCALIZED: Defeat an enemy with your Potato Cannon.", "advancement.create.dual_extendo_grip": "Окончательное выкипание", "advancement.create.dual_extendo_grip.desc": "Две удлинённых руки для сверхчеловеческого охвата.", "advancement.create.eob": "Конец бета-версии", 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 76cb9abf4..42177778b 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: 249", + "_": "Missing Localizations: 253", "_": "->------------------------] Game Elements [------------------------<-", @@ -631,8 +631,8 @@ "advancement.create.flywheel.desc": "将引擎成功连接到飞轮。", "advancement.create.overstress_flywheel": "高压", "advancement.create.overstress_flywheel.desc": "过载熔炉引擎。", - "advancement.create.integrated_circuit": "复杂运算", - "advancement.create.integrated_circuit.desc": "组装集成电路。", + "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", + "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", "advancement.create.mechanical_arm": "忙碌的手！", "advancement.create.mechanical_arm.desc": "制作机械臂，选择输入和输出，放置并给予它动力，然后看着它为你完成所有工作。", "advancement.create.musical_arm": "没人能在我的 BGM 里打败我！", @@ -659,6 +659,8 @@ "advancement.create.wand_of_symmetry.desc": "制作一个对称之杖", "advancement.create.extendo_grip": "biu biu biu!", "advancement.create.extendo_grip.desc": "获得一个伸缩机械手", + "advancement.create.potato_cannon": "UNLOCALIZED: Fwoomp!", + "advancement.create.potato_cannon.desc": "UNLOCALIZED: Defeat an enemy with your Potato Cannon.", "advancement.create.dual_extendo_grip": "biu——biu——biu——", "advancement.create.dual_extendo_grip.desc": "双持伸缩机械手，超人般的触碰距离。", "advancement.create.eob": "Beta 版结束", 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 9aac57dde..a33475dc0 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: 244", + "_": "Missing Localizations: 248", "_": "->------------------------] Game Elements [------------------------<-", @@ -631,8 +631,8 @@ "advancement.create.flywheel.desc": "將引擎成功連接到飛輪。", "advancement.create.overstress_flywheel": "壓力過大", "advancement.create.overstress_flywheel.desc": "超載熔爐引擎。", - "advancement.create.integrated_circuit": "複雜的運算", - "advancement.create.integrated_circuit.desc": "合成ＩＣ板。", + "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", + "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", "advancement.create.mechanical_arm": "忙碌的手！", "advancement.create.mechanical_arm.desc": "製作機械手臂，選擇輸入和輸出，放置並給它動能； 然後看著它完成所有你交代的工作。", "advancement.create.musical_arm": "沒人能在我的BGM裡打敗我！", @@ -659,6 +659,8 @@ "advancement.create.wand_of_symmetry.desc": "製作一個對稱杖", "advancement.create.extendo_grip": "piu piu piu!", "advancement.create.extendo_grip.desc": "拿到一個伸縮機械手", + "advancement.create.potato_cannon": "UNLOCALIZED: Fwoomp!", + "advancement.create.potato_cannon.desc": "UNLOCALIZED: Defeat an enemy with your Potato Cannon.", "advancement.create.dual_extendo_grip": "piu——piu——piu——", "advancement.create.dual_extendo_grip.desc": "雙持伸縮機械手進一步加長觸碰距離", "advancement.create.eob": "Beta版結束", diff --git a/src/generated/resources/data/create/advancements/integrated_circuit.json b/src/generated/resources/data/create/advancements/clockwork_component.json similarity index 76% rename from src/generated/resources/data/create/advancements/integrated_circuit.json rename to src/generated/resources/data/create/advancements/clockwork_component.json index 447fa7e14..0acda4115 100644 --- a/src/generated/resources/data/create/advancements/integrated_circuit.json +++ b/src/generated/resources/data/create/advancements/clockwork_component.json @@ -1,14 +1,14 @@ { - "parent": "create:crafter", + "parent": "create:deployer", "display": { "icon": { "item": "create:clockwork_component" }, "title": { - "translate": "advancement.create.integrated_circuit" + "translate": "advancement.create.clockwork_component" }, "description": { - "translate": "advancement.create.integrated_circuit.desc" + "translate": "advancement.create.clockwork_component.desc" }, "frame": "task", "show_toast": true, diff --git a/src/generated/resources/data/create/advancements/integrated_circuit_eob.json b/src/generated/resources/data/create/advancements/clockwork_component_eob.json similarity index 93% rename from src/generated/resources/data/create/advancements/integrated_circuit_eob.json rename to src/generated/resources/data/create/advancements/clockwork_component_eob.json index 97e59a334..fb730aff8 100644 --- a/src/generated/resources/data/create/advancements/integrated_circuit_eob.json +++ b/src/generated/resources/data/create/advancements/clockwork_component_eob.json @@ -1,5 +1,5 @@ { - "parent": "create:integrated_circuit", + "parent": "create:clockwork_component", "display": { "icon": { "item": "minecraft:oak_sapling" diff --git a/src/generated/resources/data/create/advancements/extendo_grip.json b/src/generated/resources/data/create/advancements/extendo_grip.json index c9176d09b..94a9af017 100644 --- a/src/generated/resources/data/create/advancements/extendo_grip.json +++ b/src/generated/resources/data/create/advancements/extendo_grip.json @@ -1,5 +1,5 @@ { - "parent": "create:crafter", + "parent": "create:clockwork_component", "display": { "icon": { "item": "create:extendo_grip", diff --git a/src/generated/resources/data/create/advancements/potato_cannon.json b/src/generated/resources/data/create/advancements/potato_cannon.json new file mode 100644 index 000000000..eccdc4cfb --- /dev/null +++ b/src/generated/resources/data/create/advancements/potato_cannon.json @@ -0,0 +1,30 @@ +{ + "parent": "create:clockwork_component", + "display": { + "icon": { + "item": "create:potato_cannon", + "nbt": "{Damage:0}" + }, + "title": { + "translate": "advancement.create.potato_cannon" + }, + "description": { + "translate": "advancement.create.potato_cannon.desc" + }, + "frame": "goal", + "show_toast": true, + "announce_to_chat": true, + "hidden": false + }, + "criteria": { + "0": { + "trigger": "create:potato_kill", + "conditions": {} + } + }, + "requirements": [ + [ + "0" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/speed_controller.json b/src/generated/resources/data/create/advancements/speed_controller.json index 694246452..b3cf5f1f0 100644 --- a/src/generated/resources/data/create/advancements/speed_controller.json +++ b/src/generated/resources/data/create/advancements/speed_controller.json @@ -1,5 +1,5 @@ { - "parent": "create:integrated_circuit", + "parent": "create:clockwork_component", "display": { "icon": { "item": "create:rotation_speed_controller" diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/press/BeltPressingCallbacks.java b/src/main/java/com/simibubi/create/content/contraptions/components/press/BeltPressingCallbacks.java index 3bc960959..3c4c63ef4 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/press/BeltPressingCallbacks.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/press/BeltPressingCallbacks.java @@ -12,6 +12,7 @@ import com.simibubi.create.content.contraptions.components.press.MechanicalPress import com.simibubi.create.content.contraptions.processing.InWorldProcessing; import com.simibubi.create.content.contraptions.relays.belt.BeltHelper; import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack; +import com.simibubi.create.foundation.advancement.AllTriggers; import com.simibubi.create.foundation.tileEntity.behaviour.belt.BeltProcessingBehaviour.ProcessingResult; import com.simibubi.create.foundation.tileEntity.behaviour.belt.TransportedItemStackHandlerBehaviour; import com.simibubi.create.foundation.tileEntity.behaviour.belt.TransportedItemStackHandlerBehaviour.TransportedResult; @@ -83,6 +84,7 @@ public class BeltPressingCallbacks { handler.handleProcessingOnItem(transported, TransportedResult.convertToAndLeaveHeld(collect, left)); } + AllTriggers.triggerForNearbyPlayers(AllTriggers.BONK, pressTe.getWorld(), pressTe.getPos(), 4); pressTe.sendData(); return HOLD; } diff --git a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileEntity.java b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileEntity.java index 36dd46492..be80dd36d 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileEntity.java +++ b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileEntity.java @@ -9,6 +9,7 @@ import com.simibubi.create.foundation.utility.VecHelper; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -156,7 +157,9 @@ public class PotatoProjectileEntity extends DamagingProjectileEntity implements if (onServer && owner instanceof ServerPlayerEntity) { ServerPlayerEntity serverplayerentity = (ServerPlayerEntity) owner; - if (!target.isAlive()) + if (!target.isAlive() && target.getType() + .getClassification() == EntityClassification.MONSTER + || (target instanceof PlayerEntity && target != owner)) AllTriggers.POTATO_KILL.trigger(serverplayerentity); } diff --git a/src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java b/src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java index f6a4793c1..56573292e 100644 --- a/src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java +++ b/src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java @@ -334,35 +334,12 @@ public class AllAdvancements implements IDataProvider { .withCriterion("0", AllTriggers.OVERSTRESS_FLYWHEEL.instance()) .register(t, id + ":overstress_flywheel"); - Advancement integrated_circuit = - itemAdvancement("integrated_circuit", AllItems.CLOCKWORK_COMPONENT, TaskType.NORMAL).withParent(crafter) - .register(t, id + ":integrated_circuit"); - - Advancement integrated_circuit_eob = deadEnd().withParent(integrated_circuit) - .withCriterion("0", itemGathered(AllItems.CLOCKWORK_COMPONENT.get())) - .register(t, id + ":integrated_circuit_eob"); - - Advancement speed_controller = - kinecticAdvancement("speed_controller", AllBlocks.ROTATION_SPEED_CONTROLLER.get(), TaskType.NORMAL) - .withParent(integrated_circuit) - .register(t, id + ":speed_controller"); - Advancement clockwork_bearing = advancement("clockwork_bearing", AllBlocks.CLOCKWORK_BEARING.get(), TaskType.NORMAL) .withParent(brass_casing) .withCriterion("0", AllTriggers.CLOCKWORK_BEARING.instance()) .register(t, id + ":clockwork_bearing"); - Advancement extendo_grip = - advancement("extendo_grip", AllItems.EXTENDO_GRIP.get(), TaskType.NORMAL).withParent(crafter) - .withCriterion("0", AllTriggers.EXTENDO.instance()) - .register(t, id + ":extendo_grip"); - - Advancement dual_extendo_grip = - advancement("dual_extendo_grip", AllItems.EXTENDO_GRIP.get(), TaskType.SECRET).withParent(extendo_grip) - .withCriterion("0", AllTriggers.GIGA_EXTENDO.instance()) - .register(t, id + ":dual_extendo_grip"); - Advancement mechanical_arm = advancement("mechanical_arm", AllBlocks.MECHANICAL_ARM.get(), TaskType.MILESTONE) .withCriterion("0", AllTriggers.MECHANICAL_ARM.instance()) .withParent(brass_casing) @@ -386,6 +363,34 @@ public class AllAdvancements implements IDataProvider { Advancement deployer = kinecticAdvancement("deployer", AllBlocks.DEPLOYER.get(), TaskType.MILESTONE).withParent(brass_casing) .register(t, id + ":deployer"); + + Advancement clockwork_component = + itemAdvancement("clockwork_component", AllItems.CLOCKWORK_COMPONENT, TaskType.NORMAL).withParent(deployer) + .register(t, id + ":clockwork_component"); + + Advancement clockwork_component_eob = deadEnd().withParent(clockwork_component) + .withCriterion("0", itemGathered(AllItems.CLOCKWORK_COMPONENT.get())) + .register(t, id + ":clockwork_component_eob"); + + Advancement extendo_grip = + advancement("extendo_grip", AllItems.EXTENDO_GRIP.get(), TaskType.NORMAL).withParent(clockwork_component) + .withCriterion("0", AllTriggers.EXTENDO.instance()) + .register(t, id + ":extendo_grip"); + + Advancement potato_cannon = + advancement("potato_cannon", AllItems.POTATO_CANNON.get(), TaskType.GOAL).withParent(clockwork_component) + .withCriterion("0", AllTriggers.POTATO_KILL.instance()) + .register(t, id + ":potato_cannon"); + + Advancement dual_extendo_grip = + advancement("dual_extendo_grip", AllItems.EXTENDO_GRIP.get(), TaskType.SECRET).withParent(extendo_grip) + .withCriterion("0", AllTriggers.GIGA_EXTENDO.instance()) + .register(t, id + ":dual_extendo_grip"); + + Advancement speed_controller = + kinecticAdvancement("speed_controller", AllBlocks.ROTATION_SPEED_CONTROLLER.get(), TaskType.NORMAL) + .withParent(clockwork_component) + .register(t, id + ":speed_controller"); Advancement fist_bump = advancement("fist_bump", AllBlocks.DEPLOYER.get(), TaskType.SECRET).withParent(deployer) .withCriterion("0", AllTriggers.DEPLOYER_BOOP.instance()) diff --git a/src/main/resources/assets/create/lang/default/advancements.json b/src/main/resources/assets/create/lang/default/advancements.json index 4ee6b87de..d56cccf97 100644 --- a/src/main/resources/assets/create/lang/default/advancements.json +++ b/src/main/resources/assets/create/lang/default/advancements.json @@ -127,8 +127,8 @@ "advancement.create.flywheel.desc": "Successfully connect an engine to the Flywheel.", "advancement.create.overstress_flywheel": "High levels of Stress", "advancement.create.overstress_flywheel.desc": "Overstress a Furnace Engine.", - "advancement.create.integrated_circuit": "Complex Calculation", - "advancement.create.integrated_circuit.desc": "Assemble an Integrated Circuit.", + "advancement.create.clockwork_component": "Complex Curiosities", + "advancement.create.clockwork_component.desc": "Assemble a Clockwork Component.", "advancement.create.mechanical_arm": "Busy Hands!", "advancement.create.mechanical_arm.desc": "Craft a Mechanical Arm, select in- and outputs, place it down and give it power; then watch as it does all the work for you.", "advancement.create.musical_arm": "Play Me My Theme Tune!", @@ -144,7 +144,7 @@ "advancement.create.blaze_cake": "Sugar Rush", "advancement.create.blaze_cake.desc": "Bake your blaze burner a special cake.", - "advancement.create.chromatic_compound": "Bipolar Minerals", + "advancement.create.chromatic_compound": "Mysterious Minerals", "advancement.create.chromatic_compound.desc": "Create a Bar of Chromatic Compound.", "advancement.create.shadow_steel": "Void Returner", "advancement.create.shadow_steel.desc": "Create Shadow Steel, a metal bar of nothingness.", @@ -157,6 +157,8 @@ "advancement.create.wand_of_symmetry.desc": "Craft a Staff of Symmetry.", "advancement.create.extendo_grip": "Boioioing!", "advancement.create.extendo_grip.desc": "Get hold of an Extendo Grip.", + "advancement.create.potato_cannon": "Fwoomp!", + "advancement.create.potato_cannon.desc": "Defeat an enemy with your Potato Cannon.", "advancement.create.dual_extendo_grip": "Ultimate Boing-age", "advancement.create.dual_extendo_grip.desc": "Dual wield Extendo Grips for super-human reach.",