mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-01-12 07:16:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

Track API?

Browse source 
Fix up some placement issues
This commit is contained in:
techno-sam 2023-04-08 11:11:24 -07:00
parent 35644f1434
commit 7fbf08ba54
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/com/simibubi/create/content/logistics/trains/track/TrackPlacement.java
View file

@ -5,6 +5,7 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.function.Function;
import com.jozufozu.flywheel.util.Color;
import com.simibubi.create.AllSpecialTextures;
@ -500,8 +501,8 @@ public class TrackPlacement {
return onto;
}
private static BlockState copyProperties(BlockState from, BlockState onto, boolean keepFrom) {
return keepFrom ? copyProperties(from, onto) : from;
private static BlockState copyProperties(BlockState from, BlockState onto, Function<BlockState, Boolean> keepFrom) {
return keepFrom.apply(from) ? copyProperties(from, onto) : from;
}
private static PlacementInfo placeTracks(Level level, PlacementInfo info, BlockState state1, BlockState state2,
@ -558,12 +559,12 @@ public class TrackPlacement {
BlockState stateAtPos = level.getBlockState(targetPos1);
BlockState onto = info.getMaterial().getTrackBlock().getDefaultState();
level.setBlock(targetPos1, ProperWaterloggedBlock.withWater(level,
copyProperties((stateAtPos.getBlock() == state1.getBlock() ? stateAtPos : state1), onto, AllTags.AllBlockTags.TRACKS.matches(stateAtPos)).setValue(TrackBlock.HAS_TE, true),
copyProperties((stateAtPos.getBlock() == state1.getBlock() ? stateAtPos : state1), onto, AllTags.AllBlockTags.TRACKS::matches).setValue(TrackBlock.HAS_TE, true),
targetPos1), 3);
stateAtPos = level.getBlockState(targetPos2);
level.setBlock(targetPos2, ProperWaterloggedBlock.withWater(level,
copyProperties((stateAtPos.getBlock() == state2.getBlock() ? stateAtPos : state2), onto, AllTags.AllBlockTags.TRACKS.matches(stateAtPos)).setValue(TrackBlock.HAS_TE, true),
copyProperties((stateAtPos.getBlock() == state2.getBlock() ? stateAtPos : state2), onto, AllTags.AllBlockTags.TRACKS::matches).setValue(TrackBlock.HAS_TE, true),
targetPos2), 3);
}