From a883551473857b7d4a7ea4e64870a6e957694532 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Fri, 8 Apr 2022 02:22:14 +0200 Subject: [PATCH] Updates from the dev branch --- .../assets/create/lang/unfinished/ro_ro.json | 204 +++++++++++++++++- .../com/simibubi/create/AllEntityTypes.java | 1 - .../trains/entity/CarriageContraption.java | 2 +- .../CarriageContraptionEntityRenderer.java | 2 +- .../entity/CarriageContraptionInstance.java | 7 +- 5 files changed, 211 insertions(+), 5 deletions(-) diff --git a/src/generated/resources/assets/create/lang/unfinished/ro_ro.json b/src/generated/resources/assets/create/lang/unfinished/ro_ro.json index 6f80d7eac..9557bf286 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ro_ro.json +++ b/src/generated/resources/assets/create/lang/unfinished/ro_ro.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 3", + "_": "Missing Localizations: 192", "_": "->------------------------] Game Elements [------------------------<-", @@ -54,6 +54,7 @@ "block.create.cogwheel": "Roată Dințată", "block.create.content_observer": "Observator De Conținut", "block.create.controller_rail": "Controlor De Șină", + "block.create.controls": "UNLOCALIZED: Controls", "block.create.copper_backtank": "Backtank De Cupru", "block.create.copper_casing": "Carcasă De Cupru", "block.create.copper_shingle_slab": "Lespede De Șindrilă De Cupru", @@ -192,11 +193,13 @@ "block.create.cyan_valve_handle": "Mâner De Supapă Turcoaz", "block.create.dark_oak_window": "Sticlă De Stejar Negru", "block.create.dark_oak_window_pane": "Geam De Stejar Negru", + "block.create.data_gatherer": "UNLOCALIZED: Data Gatherer", "block.create.deepslate_pillar": "Coloană De Deepslate", "block.create.deepslate_zinc_ore": "Minereu De Zinc De Adâncime", "block.create.deployer": "Deployer", "block.create.depot": "Depot", "block.create.diorite_pillar": "Coloană De Diorit", + "block.create.display_board": "UNLOCALIZED: Display Board", "block.create.dripstone_pillar": "Coloană De Dripstone", "block.create.encased_chain_drive": "Lanț De Distribuție Încapsulat", "block.create.encased_fan": "Ventilator Încapsulat", @@ -240,6 +243,7 @@ "block.create.item_vault": "Seif De Obiecte", "block.create.jungle_window": "Sticlă De Junglă", "block.create.jungle_window_pane": "Geam De Junglă", + "block.create.large_bogey": "UNLOCALIZED: Large Bogey", "block.create.large_cogwheel": "Roată Dințată Mare", "block.create.layered_andesite": "Andezit Stratificat", "block.create.layered_asurine": "Asurină Stratificată", @@ -293,6 +297,8 @@ "block.create.mechanical_pump": "Pompă Mecanică", "block.create.mechanical_saw": "Ferăstrău Mecanic", "block.create.metal_bracket": "Brachetă De Metal", + "block.create.metal_girder": "UNLOCALIZED: Metal Girder", + "block.create.metal_girder_encased_shaft": "UNLOCALIZED: Metal Girder Encased Shaft", "block.create.millstone": "Moară De Piatră", "block.create.minecart_anchor": "Ancoră De Vagonet", "block.create.mysterious_cuckoo_clock": "Ceas Cucu", @@ -380,6 +386,7 @@ "block.create.portable_fluid_interface": "Interfață De Fluid Portabilă", "block.create.portable_storage_interface": "Interfață De Depozitare Portabilă", "block.create.powered_latch": "Manetă Alimentată", + "block.create.powered_shaft": "UNLOCALIZED: Powered Shaft", "block.create.powered_toggle_latch": "Manetă Alimentată Comutatoare", "block.create.pulley_magnet": "Magnet De Scripete", "block.create.pulse_extender": "Prelungitor De Puls", @@ -421,6 +428,7 @@ "block.create.small_asurine_brick_stairs": "Scări De Cărămizi Mici De Asurină", "block.create.small_asurine_brick_wall": "Zid De Cărămizi Mici De Asurină", "block.create.small_asurine_bricks": "Cărămizi Mici De Asurină", + "block.create.small_bogey": "UNLOCALIZED: Small Bogey", "block.create.small_calcite_brick_slab": "Lespede De Cărămizi Mici De Calcit", "block.create.small_calcite_brick_stairs": "Scări De Cărămizi Mici De Calcit", "block.create.small_calcite_brick_wall": "Zid De Cărămizi Mici De Calcit", @@ -475,12 +483,16 @@ "block.create.spout": "Duză", "block.create.spruce_window": "Sticlă De Molid", "block.create.spruce_window_pane": "Geam De Molid", + "block.create.steam_engine": "UNLOCALIZED: Steam Engine", "block.create.sticker": "Abțipild", "block.create.sticky_mechanical_piston": "Piston Mecanic Lipicios", "block.create.stockpile_switch": "Comutator De Depozitare", "block.create.stressometer": "Stresometru", "block.create.tiled_glass": "Sticlă De Țiglă", "block.create.tiled_glass_pane": "Fereastră De Țiglă", + "block.create.track": "UNLOCALIZED: Train Track", + "block.create.track_signal": "UNLOCALIZED: Train Signal", + "block.create.track_station": "UNLOCALIZED: Train Station", "block.create.tuff_pillar": "Coloană De Tuf", "block.create.turntable": "Placă Turnantă", "block.create.veridium": "Veridium", @@ -539,6 +551,7 @@ "enchantment.create.capacity": "Capacitate", "enchantment.create.potato_recovery": "Recuperare Cartofi", + "entity.create.carriage_contraption": "UNLOCALIZED: Carriage Contraption", "entity.create.contraption": "Invenție", "entity.create.crafting_blueprint": "Plan De Meșteșugărit", "entity.create.gantry_contraption": "Invenție De Portal", @@ -618,6 +631,7 @@ "item.create.refined_radiance": "Radianță Rafinată", "item.create.rose_quartz": "Cuarț Roz", "item.create.sand_paper": "Șmirghel", + "item.create.schedule": "UNLOCALIZED: Train Schedule", "item.create.schematic": "Schemă", "item.create.schematic_and_quill": "Schemă Și Condei", "item.create.shadow_steel": "Oțel De Umbră", @@ -865,9 +879,15 @@ "create.generic.length": "Lungime", "create.generic.speed": "Viteză", "create.generic.delay": "Întârziere", + "create.generic.duration": "UNLOCALIZED: Duration", + "create.generic.timeUnit": "UNLOCALIZED: Time Unit", "create.generic.unit.ticks": "Ticuri", "create.generic.unit.seconds": "Secunde", "create.generic.unit.minutes": "Minute", + "create.generic.daytime.hour": "UNLOCALIZED: Hour", + "create.generic.daytime.minute": "UNLOCALIZED: Minute", + "create.generic.daytime.pm": "UNLOCALIZED: pm", + "create.generic.daytime.am": "UNLOCALIZED: am", "create.generic.unit.rpm": "RPM", "create.generic.unit.stress": "su", "create.generic.unit.degrees": "°", @@ -1311,6 +1331,188 @@ "create.hint.empty_bearing": "Apasă _Click-Dreapta_ pe rulment cu o _mână_ _goală_ pentru a _atașa_ structura pe care tocmai a construit-o în fața ei.", "create.hint.full_deployer.title": "Revărsare De Obiecte Deployer", "create.hint.full_deployer": "De pare că acest _Deployer_ conține _obiecte în_ _exces_ care trebuie să fie _extrase._ Folosește o _pâlnie_ sau alte mijloace pentru a-l elibera din revărsare.", + "create.hint.derailed_train.title": "UNLOCALIZED: Derailed Train", + "create.hint.derailed_train": "UNLOCALIZED: It appears this _Train_ is no longer sitting on a connected track piece. _Right-Click_ using a _wrench_ in order to relocate it to a nearby track.", + + "create.gui.schedule.lmb_edit": "UNLOCALIZED: Left-Click to Edit", + "create.gui.schedule.rmb_remove": "UNLOCALIZED: Right-Click to Remove", + "create.gui.schedule.duplicate": "UNLOCALIZED: Duplicate", + "create.gui.schedule.remove_entry": "UNLOCALIZED: Remove Stop", + "create.gui.schedule.add_entry": "UNLOCALIZED: Add Stop", + "create.gui.schedule.move_up": "UNLOCALIZED: Move up", + "create.gui.schedule.move_down": "UNLOCALIZED: Move down", + "create.gui.schedule.add_condition": "UNLOCALIZED: Add Condition", + "create.gui.schedule.alternative_condition": "UNLOCALIZED: Alternative Condition", + + "create.schedule.destination_type": "UNLOCALIZED: Next Stop:", + "create.schedule.destination.editor": "UNLOCALIZED: Destination Editor", + "create.schedule.destination.filtered": "UNLOCALIZED: Specific Station", + "create.schedule.destination.filtered_matching": "UNLOCALIZED: Station: %1$s", + "create.schedule.destination.filter": "UNLOCALIZED: Station Name", + "create.schedule.destination.filter_2": "UNLOCALIZED: Use * as a text wildcard", + "create.schedule.destination.filter_3": "UNLOCALIZED: Example: 'My Station, Platform *'", + "create.schedule.destination.filter_4": "UNLOCALIZED: Train picks nearest unoccupied match", + "create.schedule.destination.nearest": "UNLOCALIZED: Nearest Station", + "create.schedule.destination.redstone": "UNLOCALIZED: Station with Redstone Pulse", + "create.schedule.condition_type": "UNLOCALIZED: Continue when:", + "create.schedule.condition.editor": "UNLOCALIZED: Condition Editor", + "create.schedule.condition.delay": "UNLOCALIZED: Scheduled Delay", + "create.schedule.condition.delay_short": "UNLOCALIZED: Wait: %1$s", + "create.schedule.condition.idle": "UNLOCALIZED: Cargo Inactivity", + "create.schedule.condition.idle_short": "UNLOCALIZED: Cargo Idle: %1$s", + "create.schedule.condition.for_x_time": "UNLOCALIZED: for %1$s", + "create.schedule.condition.unloaded": "UNLOCALIZED: Chunk Unloaded", + "create.schedule.condition.powered": "UNLOCALIZED: Station Powered", + "create.schedule.condition.time_of_day": "UNLOCALIZED: Time of Day", + "create.schedule.condition.time_of_day.scheduled": "UNLOCALIZED: Scheduled Time: %1$s", + "create.schedule.condition.time_of_day.digital_format": "UNLOCALIZED: %1$s:%3$s %4$s", + "create.schedule.condition.time_of_day.grace_period": "UNLOCALIZED: Grace Period", + "create.schedule.condition.time_of_day.grace_period.format": "UNLOCALIZED: +%1$s Hrs.", + "create.schedule.condition.threshold.train_holds": "UNLOCALIZED: Train Holds %1$s", + "create.schedule.condition.threshold.greater": "UNLOCALIZED: More than", + "create.schedule.condition.threshold.less": "UNLOCALIZED: Less than", + "create.schedule.condition.threshold.equal": "UNLOCALIZED: Exactly", + "create.schedule.condition.threshold.x_units_of_item": "UNLOCALIZED: %1$s %2$s of %3$s", + "create.schedule.condition.threshold.matching_content": "UNLOCALIZED: Matching Content", + "create.schedule.condition.threshold.item_measure": "UNLOCALIZED: Item Measure", + "create.schedule.condition.threshold.items": "UNLOCALIZED: Items", + "create.schedule.condition.threshold.stacks": "UNLOCALIZED: Stacks", + "create.schedule.condition.threshold.buckets": "UNLOCALIZED: Buckets", + "create.schedule.condition.threshold.place_item": "UNLOCALIZED: Reference Item", + "create.schedule.condition.threshold.place_item_2": "UNLOCALIZED: Filters can be used", + "create.schedule.condition.fluid_threshold": "UNLOCALIZED: Fluid Cargo Condition", + "create.schedule.condition.item_threshold": "UNLOCALIZED: Item Cargo Condition", + "create.schedule.loop": "UNLOCALIZED: Loop Forever", + "create.schedule.loop1": "UNLOCALIZED: Schedule starts over", + "create.schedule.loop2": "UNLOCALIZED: when completed", + "create.schedule.reset": "UNLOCALIZED: Reset Progress", + "create.schedule.skip": "UNLOCALIZED: Skip current Stop", + "create.schedule.train_still_assembling": "UNLOCALIZED: Confirm Train Assembly in the Station UI first", + "create.schedule.applied_to_train": "UNLOCALIZED: Train is now following this Schedule", + "create.schedule.non_controlling_seat": "UNLOCALIZED: Conductor needs to sit in front of a Controls block", + "create.schedule.remove_with_empty_hand": "UNLOCALIZED: Remove current Schedule with an Empty Hand", + "create.schedule.auto_removed_from_train": "UNLOCALIZED: Auto-Schedule discarded", + "create.schedule.removed_from_train": "UNLOCALIZED: Schedule retrieved from Train", + "create.schedule.no_stops": "UNLOCALIZED: This Schedule does not have any Stops yet", + + "create.track.selection_cleared": "UNLOCALIZED: Selection Cleared", + "create.track.valid_connection": "UNLOCALIZED: Can Connect ✔", + "create.track.second_point": "UNLOCALIZED: Place track or select a second point", + "create.track.too_far": "UNLOCALIZED: Too far away", + "create.track.original_missing": "UNLOCALIZED: Original block removed, Sneak-click to reset", + "create.track.perpendicular": "UNLOCALIZED: Cannot connect perpendicularly", + "create.track.ascending_s_curve": "UNLOCALIZED: Cannot create sloped S-Bends", + "create.track.too_sharp": "UNLOCALIZED: Turn too sharp", + "create.track.too_steep": "UNLOCALIZED: Slope too steep", + "create.track.slope_turn": "UNLOCALIZED: Cannot enter or leave slope on a turn", + "create.track.opposing_slopes": "UNLOCALIZED: Cannot connect opposing slopes", + "create.track.leave_slope_ascending": "UNLOCALIZED: Cannot leave this slope while ascending", + "create.track.leave_slope_descending": "UNLOCALIZED: Cannot leave this slope while descending", + "create.track.turn_90": "UNLOCALIZED: Can only turn up to 90 Degrees", + + "create.station.create_train": "UNLOCALIZED: Create new Train", + "create.station.disassemble_train": "UNLOCALIZED: Disassemble Train", + "create.station.remove_schedule": "UNLOCALIZED: Retrieve Schedule", + "create.station.remove_auto_schedule": "UNLOCALIZED: Discard Auto-Schedule", + + "create.train_assembly.too_many_bogeys": "UNLOCALIZED: Too many Bogeys attached: %1$s", + "create.train_assembly.frontmost_bogey_at_station": "UNLOCALIZED: Frontmost Bogey must be at Station Marker", + "create.train_assembly.no_bogeys": "UNLOCALIZED: No Bogeys Found", + "create.train_assembly.not_connected_in_order": "UNLOCALIZED: Bogeys are not connected in order", + "create.train_assembly.single_bogey_carriage": "UNLOCALIZED: This Bogey type cannot support a carriage on its own", + "create.train_assembly.nothing_attached": "UNLOCALIZED: No structure attached to Bogey %1$s", + "create.train_assembly.no_controls": "UNLOCALIZED: At least one forward-facing controls block needs to be mounted on the train", + "create.train_assembly.sideways_controls": "UNLOCALIZED: A mounted controls block is facing sideways", + + "create.track_target.set": "UNLOCALIZED: Targeted track selected", + "create.track_target.success": "UNLOCALIZED: Successfully bound to targeted track", + "create.track_target.clear": "UNLOCALIZED: Cleared track selection", + "create.track_target.missing": "UNLOCALIZED: Right-click the targeted train track first", + "create.track_target.too_far": "UNLOCALIZED: Targeted track is too far from here", + "create.track_target.no_junctions": "UNLOCALIZED: Targeted track cannot be an intersection", + + "create.train.unnamed": "UNLOCALIZED: Unnamed Train", + "create.train.cannot_relocate_moving": "UNLOCALIZED: Cannot relocate a moving Train", + "create.train.relocate": "UNLOCALIZED: Click a Track to Relocate %1$s to. Sneak-Click to abort", + "create.train.relocate.abort": "UNLOCALIZED: Relocation aborted", + "create.train.relocate.success": "UNLOCALIZED: Relocation successful", + "create.train.relocate.valid": "UNLOCALIZED: Can relocate to here, Click to Confirm", + "create.train.relocate.invalid": "UNLOCALIZED: Cannot relocate Train to here", + "create.train.relocate.too_far": "UNLOCALIZED: Cannot relocate Train this far away", + + "create.track_signal.cannot_change_mode": "UNLOCALIZED: Unable to switch mode of this Signal", + "create.track_signal.mode_change.entry_signal": "UNLOCALIZED: -> Allow passage if section unoccupied", + "create.track_signal.mode_change.cross_signal": "UNLOCALIZED: -> Allow passage if section fully traversable", + + "create.contraption.controls.start_controlling": "UNLOCALIZED: Now controlling: %1$s", + "create.contraption.controls.stop_controlling": "UNLOCALIZED: Stopped controlling contraption", + "create.contraption.controls.approach_station": "UNLOCALIZED: Hold %1$s to approach %2$s", + + "create.data_gatherer.set": "UNLOCALIZED: Targeted position selected", + "create.data_gatherer.success": "UNLOCALIZED: Successfully bound to targeted position", + "create.data_gatherer.clear": "UNLOCALIZED: Cleared position selection", + "create.data_gatherer.too_far": "UNLOCALIZED: Targeted position is too far from here", + "create.data_gatherer.invalid": "UNLOCALIZED: Gatherer has no valid target, try placing it again", + "create.data_gatherer.title": "UNLOCALIZED: Data Gatherer", + "create.data_gatherer.no_source": "UNLOCALIZED: Not a Data Source", + "create.data_gatherer.no_target": "UNLOCALIZED: Not a Data Target", + "create.data_gatherer.reading_from": "UNLOCALIZED: Read from:", + "create.data_gatherer.writing_to": "UNLOCALIZED: Send to:", + "create.data_gatherer.attached_side": "UNLOCALIZED: Block on attached side", + "create.data_gatherer.targeted_location": "UNLOCALIZED: Block in targeted location", + "create.data_gatherer.view_compatible": "UNLOCALIZED: Click to view all Compatible", + "create.data_gatherer.information_type": "UNLOCALIZED: Type of Information", + "create.data_gatherer.display_on": "UNLOCALIZED: Write data to:", + "create.data_gatherer.display_on_multiline": "UNLOCALIZED: Start writing at:", + + "create.data_source.label": "UNLOCALIZED: Attached Label", + "create.data_source.combine_item_names": "UNLOCALIZED: Combine Item Names", + "create.data_source.count_items": "UNLOCALIZED: Amount of matching Items", + "create.data_source.list_items": "UNLOCALIZED: List matching Items", + "create.data_source.nixie_tube": "UNLOCALIZED: Copy Nixie Tubes", + "create.data_source.fill_level": "UNLOCALIZED: Container Fill Level", + "create.data_source.fill_level.display": "UNLOCALIZED: Display Format", + "create.data_source.fill_level.percent": "UNLOCALIZED: Percent", + "create.data_source.fill_level.progress_bar": "UNLOCALIZED: Progress Bar", + "create.data_source.value_list.display": "UNLOCALIZED: Value Display", + "create.data_source.value_list.shortened": "UNLOCALIZED: Shortened", + "create.data_source.value_list.full_number": "UNLOCALIZED: Full Number", + "create.data_source.value_list.thousand": "UNLOCALIZED: k", + "create.data_source.value_list.million": "UNLOCALIZED: m", + "create.data_source.player_deaths": "UNLOCALIZED: Player Deaths", + "create.data_source.scoreboard": "UNLOCALIZED: Scoreboard", + "create.data_source.scoreboard.objective": "UNLOCALIZED: Objective ID", + "create.data_source.scoreboard.objective_not_found": "UNLOCALIZED: '%1$s' not found", + "create.data_source.scoreboard.objective.deaths": "UNLOCALIZED: Player Deaths", + "create.data_source.time_of_day": "UNLOCALIZED: Time of Day", + "create.data_source.stop_watch": "UNLOCALIZED: Stopwatch", + "create.data_source.time.format": "UNLOCALIZED: Time Format", + "create.data_source.time.12_hour": "UNLOCALIZED: 12-hour", + "create.data_source.time.24_hour": "UNLOCALIZED: 24-hour", + "create.data_source.accumulate_items": "UNLOCALIZED: Accumulate Item Count", + "create.data_source.item_throughput": "UNLOCALIZED: Item Throughput", + "create.data_source.item_throughput.interval": "UNLOCALIZED: Interval", + "create.data_source.item_throughput.interval.second": "UNLOCALIZED: per Second", + "create.data_source.item_throughput.interval.minute": "UNLOCALIZED: per Minute", + "create.data_source.item_throughput.interval.hour": "UNLOCALIZED: per Hour", + "create.data_source.station_summary": "UNLOCALIZED: Train Station Summary", + "create.data_source.station_summary.filter": "UNLOCALIZED: Station name filter", + "create.data_source.station_summary.train_name_column": "UNLOCALIZED: Train column size", + "create.data_source.station_summary.platform_column": "UNLOCALIZED: Platform column size", + "create.data_source.station_summary.now": "UNLOCALIZED: now", + "create.data_source.station_summary.minutes": "UNLOCALIZED: min", + "create.data_source.station_summary.seconds": "UNLOCALIZED: %1$ss", + + "create.data_target.line": "UNLOCALIZED: Line %1$s", + "create.data_target.page": "UNLOCALIZED: Page %1$s", + "create.data_target.single_line": "UNLOCALIZED: Single Line", + + "create.flap_display.cycles.alphabet": "UNLOCALIZED: ;A;B;C;D;E;F;G;H;I;J;K;L;M;N;O;P;Q;R;S;T;U;V;X;Y;Z", + "create.flap_display.cycles.numeric": "UNLOCALIZED: ;0;1;2;3;4;5;6;7;8;9", + "create.flap_display.cycles.arrival_time": "UNLOCALIZED: ; min;now;15s;30s;45s", + "create.flap_display.cycles.shortened_numbers": "UNLOCALIZED: ;K;M", + "create.flap_display.cycles.instant": "UNLOCALIZED: ; ", + "create.flap_display.cycles.pixel": "UNLOCALIZED: █;▒", "create.gui.config.overlay1": "Hi :)", "create.gui.config.overlay2": "This is a sample overlay", diff --git a/src/main/java/com/simibubi/create/AllEntityTypes.java b/src/main/java/com/simibubi/create/AllEntityTypes.java index 64e35dcbc..8f9fc0c2b 100644 --- a/src/main/java/com/simibubi/create/AllEntityTypes.java +++ b/src/main/java/com/simibubi/create/AllEntityTypes.java @@ -19,7 +19,6 @@ import com.simibubi.create.content.logistics.trains.entity.CarriageContraptionEn import com.simibubi.create.content.logistics.trains.entity.CarriageContraptionInstance; import com.simibubi.create.foundation.data.CreateEntityBuilder; import com.simibubi.create.foundation.utility.Lang; -import com.tterrag.registrate.builders.EntityBuilder; import com.tterrag.registrate.util.entry.EntityEntry; import com.tterrag.registrate.util.nullness.NonNullConsumer; import com.tterrag.registrate.util.nullness.NonNullFunction; diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraption.java b/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraption.java index 72617f239..276f5e296 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraption.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraption.java @@ -10,10 +10,10 @@ import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.AllBlocks; import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException; import com.simibubi.create.content.contraptions.components.structureMovement.Contraption; -import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionLighter; import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionType; import com.simibubi.create.content.contraptions.components.structureMovement.NonStationaryLighter; import com.simibubi.create.content.contraptions.components.structureMovement.interaction.controls.ControlsBlock; +import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionLighter; import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock; import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock.HeatLevel; import com.simibubi.create.content.logistics.trains.IBogeyBlock; diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntityRenderer.java b/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntityRenderer.java index 28c625ab0..00d06a501 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntityRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntityRenderer.java @@ -5,7 +5,7 @@ import java.util.Objects; import com.jozufozu.flywheel.backend.Backend; import com.jozufozu.flywheel.util.transform.TransformStack; import com.mojang.blaze3d.vertex.PoseStack; -import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionEntityRenderer; +import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionEntityRenderer; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionInstance.java b/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionInstance.java index eeb25566d..76079b4e0 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionInstance.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionInstance.java @@ -75,7 +75,12 @@ public class CarriageContraptionInstance extends EntityInstance { + if (instance != null) + instance.remove(); + }); }