Skip to content

fix sparce multiblock rendering in the book #798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stellanera98 wants to merge 1 commit into
base: 1.21.x
Choose a base branch
from
+12 −10
Open

fix sparce multiblock rendering in the book #798

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions Xplat/src/main/java/vazkii/patchouli/common/multiblock/SparseMultiblock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,33 +21,35 @@

public class SparseMultiblock extends AbstractMultiblock {
private final Map<BlockPos, IStateMatcher> data;
private final Map<BlockPos, IStateMatcher> bookData;
private final Vec3i size;

public SparseMultiblock(Map<BlockPos, IStateMatcher> data) {
Preconditions.checkArgument(!data.isEmpty(), "No data given to sparse multiblock!");
this.data = ImmutableMap.copyOf(data);
this.size = calculateSize();
}

@Override
public Vec3i getSize() {
return size;
}

private Vec3i calculateSize() {
int minX = data.keySet().stream().mapToInt(BlockPos::getX).min().getAsInt();
int maxX = data.keySet().stream().mapToInt(BlockPos::getX).max().getAsInt();
int minY = data.keySet().stream().mapToInt(BlockPos::getY).min().getAsInt();
int maxY = data.keySet().stream().mapToInt(BlockPos::getY).max().getAsInt();
int minZ = data.keySet().stream().mapToInt(BlockPos::getZ).min().getAsInt();
int maxZ = data.keySet().stream().mapToInt(BlockPos::getZ).max().getAsInt();
return new Vec3i(maxX - minX + 1, maxY - minY + 1, maxZ - minZ + 1);
this.size = new Vec3i(maxX - minX + 1, maxY - minY + 1, maxZ - minZ + 1);

ImmutableMap.Builder<BlockPos, IStateMatcher> builder = ImmutableMap.builder();
data.forEach((pos, matcher) -> builder.put(pos.offset(-minX, -minY, -minZ), matcher));
bookData = builder.build();
}

@Override
public Vec3i getSize() {
return size;
}

@Override
public BlockState getBlockState(BlockPos pos) {
long ticks = world != null ? world.getGameTime() : 0L;
return data.getOrDefault(pos, StateMatcher.AIR).getDisplayedState(ticks);
return bookData.getOrDefault(pos, StateMatcher.AIR).getDisplayedState(ticks);
}

@Override
Expand Down