From 737578a90e471b581576dbdc3109ffbba5cf6ccf Mon Sep 17 00:00:00 2001 From: Xavier Stouder Date: Tue, 13 Sep 2022 23:33:32 +0200 Subject: [PATCH 1/4] fix: item duplication bug Avoid ejecting the grid if mechanical crafter is moving. Should fix #3741 --- .../components/crafter/MechanicalCrafterBlock.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java index 47062a61b..c2bea46c5 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java @@ -3,6 +3,7 @@ package com.simibubi.create.content.contraptions.components.crafter; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; import com.simibubi.create.AllTileEntities; +import com.simibubi.create.Create; import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.components.crafter.ConnectedInputHandler.ConnectedInput; @@ -95,12 +96,15 @@ public class MechanicalCrafterBlock extends HorizontalKineticBlock } } + Create.LOGGER.info("onRemove:" + (isMoving ? "moving" : "not moving")); + if (state.hasBlockEntity() && state.getBlock() != newState.getBlock()) { MechanicalCrafterTileEntity crafter = CrafterHelper.getCrafter(worldIn, pos); if (crafter != null) { if (crafter.covered) Block.popResource(worldIn, pos, AllItems.CRAFTER_SLOT_COVER.asStack()); - crafter.ejectWholeGrid(); + if (!isMoving) + crafter.ejectWholeGrid(); } for (Direction direction : Iterate.directions) { From 5ae74c6810fe2bec9af52f3522e1b76913773490 Mon Sep 17 00:00:00 2001 From: Xavier Stouder Date: Tue, 13 Sep 2022 23:40:22 +0200 Subject: [PATCH 2/4] chore: remove debug logs --- .../components/crafter/MechanicalCrafterBlock.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java index c2bea46c5..8668795c7 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java @@ -3,7 +3,6 @@ package com.simibubi.create.content.contraptions.components.crafter; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.Create; import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.components.crafter.ConnectedInputHandler.ConnectedInput; @@ -96,8 +95,6 @@ public class MechanicalCrafterBlock extends HorizontalKineticBlock } } - Create.LOGGER.info("onRemove:" + (isMoving ? "moving" : "not moving")); - if (state.hasBlockEntity() && state.getBlock() != newState.getBlock()) { MechanicalCrafterTileEntity crafter = CrafterHelper.getCrafter(worldIn, pos); if (crafter != null) { From 6338d28feb1372f7d686d6c998a15bf855fee0fd Mon Sep 17 00:00:00 2001 From: 435THz <48797892+435THz@users.noreply.github.com> Date: Thu, 22 Sep 2022 18:31:49 +0200 Subject: [PATCH 3/4] Updates to it_it.json by 435THz (#3775) --- .../resources/assets/create/lang/it_it.json | 47 ++++++++++--------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/src/main/resources/assets/create/lang/it_it.json b/src/main/resources/assets/create/lang/it_it.json index 7ebee699e..1fad33241 100644 --- a/src/main/resources/assets/create/lang/it_it.json +++ b/src/main/resources/assets/create/lang/it_it.json @@ -1,5 +1,5 @@ { - "_": "->------------------------] Game Elements [------------------------<-", + "_": "->------------------------] Game Elements [------------------------<-", "block.create.acacia_window": "Finestra di acacia", "block.create.acacia_window_pane": "Pannello di finestra di acacia", @@ -20,13 +20,13 @@ "block.create.belt": "Nastro", "block.create.birch_window": "Finestra di betulla", "block.create.birch_window_pane": "Pannello di finestra di betulla", - "block.create.black_nixie_tube": "Tubo di Nixie nero", + "block.create.black_nixie_tube": "Tubo Nixie nero", "block.create.black_sail": "Vela nera", "block.create.black_seat": "Sedile nero", "block.create.black_toolbox": "Cassetta degli attrezzi nera", "block.create.black_valve_handle": "Maniglia per valvola nera", "block.create.blaze_burner": "Inceneritore a blaze", - "block.create.blue_nixie_tube": "Tubo di Nixie blu", + "block.create.blue_nixie_tube": "Tubo Nixie blu", "block.create.blue_sail": "Vela blu", "block.create.blue_seat": "Sedile blu", "block.create.blue_toolbox": "Cassetta degli attrezzi blu", @@ -40,7 +40,7 @@ "block.create.brass_funnel": "Imbuto di ottone", "block.create.brass_ladder": "Scala a pioli in ottone", "block.create.brass_tunnel": "Tunnel di ottone", - "block.create.brown_nixie_tube": "Tubo di Nixie marrone", + "block.create.brown_nixie_tube": "Tubo Nixie marrone", "block.create.brown_sail": "Vela marrone", "block.create.brown_seat": "Sedile marrone", "block.create.brown_toolbox": "Cassetta degli attrezzi marrone", @@ -187,7 +187,7 @@ "block.create.cut_veridium_slab": "Lastra di veridio tagliato", "block.create.cut_veridium_stairs": "Scalini di veridio tagliato", "block.create.cut_veridium_wall": "Muretto di veridio tagliato", - "block.create.cyan_nixie_tube": "Tubo di Nixie ciano", + "block.create.cyan_nixie_tube": "Tubo Nixie ciano", "block.create.cyan_sail": "Vela ciano", "block.create.cyan_seat": "Sedile ciano", "block.create.cyan_toolbox": "Cassetta degli attrezzi ciano", @@ -226,12 +226,12 @@ "block.create.gearshift": "Cambio", "block.create.glass_fluid_pipe": "Tubo per fluidi con vetrata", "block.create.granite_pillar": "Pilastro di granito", - "block.create.gray_nixie_tube": "Tubo di Nixie grigio", + "block.create.gray_nixie_tube": "Tubo Nixie grigio", "block.create.gray_sail": "Vela grigia", "block.create.gray_seat": "Sedile grigio", "block.create.gray_toolbox": "Cassetta degli attrezzi grigia", "block.create.gray_valve_handle": "Maniglia per valvola grigia", - "block.create.green_nixie_tube": "Tubo di Nixie verde", + "block.create.green_nixie_tube": "Tubo Nixie verde", "block.create.green_sail": "Vela verde", "block.create.green_seat": "Sedile verde", "block.create.green_toolbox": "Cassetta degli attrezzi verde", @@ -263,17 +263,17 @@ "block.create.layered_tuff": "Tufo stratificato", "block.create.layered_veridium": "Veridio stratificato", "block.create.lectern_controller": "Leggio con pulsantiera", - "block.create.light_blue_nixie_tube": "Tubo di Nixie azzurro", + "block.create.light_blue_nixie_tube": "Tubo Nixie azzurro", "block.create.light_blue_sail": "Vela azzurra", "block.create.light_blue_seat": "Sedile azzurro", "block.create.light_blue_toolbox": "Cassetta degli attrezzi azzurra", "block.create.light_blue_valve_handle": "Maniglia per valvola azzurra", - "block.create.light_gray_nixie_tube": "Tubo di Nixie grigio chiaro", + "block.create.light_gray_nixie_tube": "Tubo Nixie grigio chiaro", "block.create.light_gray_sail": "Vela grigio chiaro", "block.create.light_gray_seat": "Sedile grigio chiaro", "block.create.light_gray_toolbox": "Cassetta degli attrezzi grigia chiaro", "block.create.light_gray_valve_handle": "Maniglia per valvola grigio chiaro", - "block.create.lime_nixie_tube": "Tubo di Nixie lime", + "block.create.lime_nixie_tube": "Tubo Nixie lime", "block.create.lime_sail": "Vela lime", "block.create.lime_seat": "Sedile lime", "block.create.lime_toolbox": "Cassetta degli attrezzi lime", @@ -282,7 +282,7 @@ "block.create.limestone_pillar": "Pilastro di calcare", "block.create.linear_chassis": "Telaio lineare", "block.create.lit_blaze_burner": "Inceneritore a blaze acceso", - "block.create.magenta_nixie_tube": "Tubo di Nixie magenta", + "block.create.magenta_nixie_tube": "Tubo Nixie magenta", "block.create.magenta_sail": "Vela magenta", "block.create.magenta_seat": "Sedile magenta", "block.create.magenta_toolbox": "Cassetta degli attrezzi magenta", @@ -305,7 +305,7 @@ "block.create.millstone": "Macina", "block.create.minecart_anchor": "Ancora per carrello da miniera", "block.create.mysterious_cuckoo_clock": "Orologio a cucù misterioso", - "block.create.nixie_tube": "Tubo di Nixie", + "block.create.nixie_tube": "Tubo Nixie", "block.create.nozzle": "Dispersore", "block.create.oak_window": "Finestra di quercia", "block.create.oak_window_pane": "Pannello di finestra di quercia", @@ -324,7 +324,7 @@ "block.create.oxidized_copper_tile_stairs": "Scalini di mattonelle di rame ossidato", "block.create.oxidized_copper_tiles": "Mattonelle di rame ossidato", "block.create.peculiar_bell": "Campana peculiare", - "block.create.pink_nixie_tube": "Tubo di Nixie rosa", + "block.create.pink_nixie_tube": "Tubo Nixie rosa", "block.create.pink_sail": "Vela rosa", "block.create.pink_seat": "Sedile rosa", "block.create.pink_toolbox": "Cassetta degli attrezzi rosa", @@ -395,7 +395,7 @@ "block.create.pulley_magnet": "Magnete della carrucola", "block.create.pulse_extender": "Estensore di impulsi", "block.create.pulse_repeater": "Ripetitore di impulsi", - "block.create.purple_nixie_tube": "Tubo di Nixie viola", + "block.create.purple_nixie_tube": "Tubo Nixie viola", "block.create.purple_sail": "Vela viola", "block.create.purple_seat": "Sedile viola", "block.create.purple_toolbox": "Cassetta degli attrezzi viola", @@ -403,7 +403,7 @@ "block.create.radial_chassis": "Telaio radiale", "block.create.railway_casing": "Rivestimento di treno", "block.create.raw_zinc_block": "Blocco di zinco grezzo", - "block.create.red_nixie_tube": "Tubo di Nixie rosso", + "block.create.red_nixie_tube": "Tubo Nixie rosso", "block.create.red_sail": "Vela rossa", "block.create.red_seat": "Sedile rosso", "block.create.red_toolbox": "Cassetta degli attrezzi rossa", @@ -547,14 +547,14 @@ "block.create.weathered_copper_tile_stairs": "Scalini di mattonelle di rame corroso", "block.create.weathered_copper_tiles": "Mattonelle di rame corroso", "block.create.weighted_ejector": "Espulsore di pesi", - "block.create.white_nixie_tube": "Tubo di Nixie bianco", + "block.create.white_nixie_tube": "Tubo Nixie bianco", "block.create.white_sail": "Vela bianca", "block.create.white_seat": "Sedile bianco", "block.create.white_toolbox": "Cassetta degli attrezzi bianca", "block.create.white_valve_handle": "Maniglia per valvola bianca", "block.create.windmill_bearing": "Supporto per mulino a vento", "block.create.wooden_bracket": "Supporto di legno", - "block.create.yellow_nixie_tube": "Tubo di Nixie giallo", + "block.create.yellow_nixie_tube": "Tubo Nixie giallo", "block.create.yellow_sail": "Vela gialla", "block.create.yellow_seat": "Sedile giallo", "block.create.yellow_toolbox": "Cassetta degli attrezzi gialla", @@ -1258,6 +1258,8 @@ "create.item_attributes.smokable.inverted": "non può essere affumicato", "create.item_attributes.blastable": "è fondibile in un forno fusorio", "create.item_attributes.blastable.inverted": "non è fondibile in un forno fusorio", + "create.item_attributes.compostable": "può essere gettato in una compstiera", + "create.item_attributes.compostable.inverted": "non può essere gettato in una compstiera", "create.item_attributes.shulker_level": "è uno shulker %1$s", "create.item_attributes.shulker_level.inverted": "non è uno shulker %1$s", "create.item_attributes.shulker_level.full": "pieno", @@ -1364,6 +1366,10 @@ "create.tooltip.chute.fans_pull_up": "Il ventilatore tira da sopra", "create.tooltip.chute.fans_pull_down": "Il ventilatore tira da sotto", "create.tooltip.chute.contains": "Contiene: %1$s x%2$s", + "create.tooltip.deployer.header": "Informazioni sull'Installatore", + "create.tooltip.deployer.using": "Modalità: Utilizzo", + "create.tooltip.deployer.punching": "Modalità: Attacco", + "create.tooltip.deployer.contains": "Oggetto: %1$s x%2$s", "create.tooltip.brass_tunnel.contains": "Sta distribuendo:", "create.tooltip.brass_tunnel.contains_entry": "> %1$s x%2$s", "create.tooltip.brass_tunnel.retrieve": "Click destro per recuperare", @@ -1643,7 +1649,7 @@ "create.display_source.list_items": "Lista di oggetti filtrati", "create.display_source.fluid_amount": "Quantità di fluidi filtrati", "create.display_source.list_fluids": "Lista di fluidi filtrati", - "create.display_source.nixie_tube": "Copia Tubo di Nixie", + "create.display_source.nixie_tube": "Copia Tubo Nixie", "create.display_source.fill_level": "Livello di riempimento", "create.display_source.fill_level.display": "Formato di visualizzazione", "create.display_source.fill_level.percent": "Percentuale", @@ -3014,8 +3020,5 @@ "create.ponder.windmill_source.text_7": "Fai click destro sul Supporto in qualsiasi momento per fermarlo e poter modificare di nuovo la struttura", "create.ponder.windmill_structure.header": "Macchinari per Mulini a vento", - "create.ponder.windmill_structure.text_1": "Qualsiasi struttura può essere un Mulino a vento vaido, purché contenga almeno 8 blocchi che possano essere considerati vele.", - - "_": "Thank you for translating Create!" - + "create.ponder.windmill_structure.text_1": "Qualsiasi struttura può essere un Mulino a vento valido, purché contenga almeno 8 blocchi che possano essere considerati vele." } \ No newline at end of file From 143b26cab776239a68ad84f83e51290d886684b7 Mon Sep 17 00:00:00 2001 From: Andre_601 Date: Thu, 22 Sep 2022 18:43:44 +0200 Subject: [PATCH 4/4] Updates to de_de.json by Andre601 (#3777) --- src/main/resources/assets/create/lang/de_de.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/assets/create/lang/de_de.json b/src/main/resources/assets/create/lang/de_de.json index fd7918ef3..572ec59ed 100644 --- a/src/main/resources/assets/create/lang/de_de.json +++ b/src/main/resources/assets/create/lang/de_de.json @@ -1602,7 +1602,7 @@ "create.train.status.end_of_track": "Ein Waggon hat das Ende seines Gleises erreicht", "create.train.status.double_portal": "Ein Waggon kann kein Portal während des Verlassens eines anderen betreten", "create.train.status.coupling_stress": "Zwangsbremsung aufgrund von Spannung an einer Kopplung", - "create.train.status.track_missing": "Gleisen fehlen unter dem Zug", + "create.train.status.track_missing": "Gleise fehlen unter dem Zug", "create.train.status.paused_for_manual": "Fahrplan für manuelle Fahrt pausiert", "create.train.status.opposite_driver": "Pfad erfordert einen in die andere Richtung zeigenden Fahrer", "create.train.status.missing_driver": "Fahrer ist verschwunden", @@ -1675,7 +1675,7 @@ "create.display_source.station_summary.platform_column": "Spalte 'Gleis' Größe", "create.display_source.station_summary.now": "jetzt", "create.display_source.station_summary.minutes": "min", - "create.display_source.station_summary.seconds": "%1$sen", + "create.display_source.station_summary.seconds": "%1$ss", "create.display_source.observed_train_name": "Zugnamen ermitteln", "create.display_source.max_enchant_level": "Max. Verzauberungskosten", "create.display_source.boiler_status": "Kesselstatus", @@ -2041,4 +2041,4 @@ "_": "Thank you for translating Create!" -} \ No newline at end of file +}