From e629d02f505c7de2d786a126fe49168351f17124 Mon Sep 17 00:00:00 2001 From: techno-sam Date: Sun, 9 Apr 2023 07:18:22 -0700 Subject: [PATCH] Track API Clean up code a bit --- .../logistics/trains/track/TrackPlacement.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackPlacement.java b/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackPlacement.java index d23751c15..28a0cd4ce 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackPlacement.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackPlacement.java @@ -557,21 +557,15 @@ public class TrackPlacement { if (!simulate) { BlockState onto = info.getMaterial().getTrackBlock().getDefaultState(); - var relevantState = state1; BlockState stateAtPos = level.getBlockState(targetPos1); - var stateAtPosVar = stateAtPos; -// BlockState injectorAllocatedLocal30 = (BlockState)(stateAtPos.getBlock() == state1.getBlock() ? stateAtPos : state1).setValue(TrackBlock.HAS_TE, true); - relevantState = copyProperties(relevantState, onto); - var modifiedBlock = (AllTags.AllBlockTags.TRACKS.matches(stateAtPosVar) ? stateAtPosVar : relevantState).setValue(TrackBlock.HAS_TE, true); - level.setBlock(targetPos1, ProperWaterloggedBlock.withWater(level, modifiedBlock, targetPos1), 3); + level.setBlock(targetPos1, ProperWaterloggedBlock.withWater(level, + (AllTags.AllBlockTags.TRACKS.matches(stateAtPos) ? stateAtPos : copyProperties(state1, onto)) + .setValue(TrackBlock.HAS_TE, true), targetPos1), 3); - relevantState = state2; stateAtPos = level.getBlockState(targetPos2); - stateAtPosVar = stateAtPos; -// BlockState injectorAllocatedLocal30 = (BlockState)(stateAtPos.getBlock() == state1.getBlock() ? stateAtPos : state1).setValue(TrackBlock.HAS_TE, true); - relevantState = copyProperties(relevantState, onto); - modifiedBlock = (AllTags.AllBlockTags.TRACKS.matches(stateAtPosVar) ? stateAtPosVar : relevantState).setValue(TrackBlock.HAS_TE, true); - level.setBlock(targetPos2, ProperWaterloggedBlock.withWater(level, modifiedBlock, targetPos2), 3); + level.setBlock(targetPos2, ProperWaterloggedBlock.withWater(level, + (AllTags.AllBlockTags.TRACKS.matches(stateAtPos) ? stateAtPos : copyProperties(state2, onto)) + .setValue(TrackBlock.HAS_TE, true), targetPos2), 3); } BlockEntity te1 = level.getBlockEntity(targetPos1);