Skip to content

Modify the access modifier of the fields in BlockPattern #4780

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
QiuYe-123 wants to merge 12 commits into
base: 1.20.1
Choose a base branch
from
Open

Modify the access modifier of the fields in BlockPattern #4780

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f2969ec
Modify the access modifier of the fields in BlockPattern
QiuYe-123 Apr 12, 2026
0e8e6a0
final
QiuYe-123 Apr 12, 2026
c015280
spotless
QiuYe-123 Apr 14, 2026
d21b7e7
fix
QiuYe-123 Apr 14, 2026
02b2299
spotless
QiuYe-123 Apr 14, 2026
5ff1e06
Merge branch '1.20.1' into modify-the-fields-in-BlockPattern
QiuYe-123 Apr 14, 2026
3ab03c4
Merge branch '1.20.1' into modify-the-fields-in-BlockPattern
QiuYe-123 Apr 15, 2026
c231cc4
Modify resetFacing
QiuYe-123 Apr 15, 2026
4cd027a
Merge branch '1.20.1' into modify-the-fields-in-BlockPattern
QiuYe-123 Apr 17, 2026
a64911c
Merge branch '1.20.1' into modify-the-fields-in-BlockPattern
QiuYe-123 Apr 17, 2026
4607dc0
Merge branch '1.20.1' into modify-the-fields-in-BlockPattern
QiuYe-123 Apr 22, 2026
6d0bf88
Merge branch '1.20.1' into modify-the-fields-in-BlockPattern
QiuYe-123 Apr 30, 2026
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
15 changes: 8 additions & 7 deletions src/main/java/com/gregtechceu/gtceu/api/pattern/BlockPattern.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,17 @@

public class BlockPattern {

static Direction[] FACINGS = { Direction.SOUTH, Direction.NORTH, Direction.WEST, Direction.EAST, Direction.UP,
protected static final Direction[] FACINGS = { Direction.SOUTH, Direction.NORTH, Direction.WEST, Direction.EAST,
Direction.UP,
Direction.DOWN };
static Direction[] FACINGS_H = { Direction.SOUTH, Direction.NORTH, Direction.WEST, Direction.EAST };
protected static final Direction[] FACINGS_H = { Direction.SOUTH, Direction.NORTH, Direction.WEST, Direction.EAST };
public final int[][] aisleRepetitions;
public final RelativeDirection[] structureDir;
protected final TraceabilityPredicate[][][] blockMatches; // [z][y][x]
public final TraceabilityPredicate[][][] blockMatches; // [z][y][x]
public final int[] centerOffset; // x, y, z, minZ, maxZ
protected final int fingerLength; // z size
protected final int thumbLength; // y size
protected final int palmLength; // x size
protected final int[] centerOffset; // x, y, z, minZ, maxZ
@Getter
protected int[] formedRepetitionCount;

Expand Down Expand Up @@ -517,7 +518,7 @@ public BlockInfo[][][] getPreview(int[] repetition) {
return result;
}

private void resetFacing(BlockPos pos, BlockState blockState, Direction facing,
protected void resetFacing(BlockPos pos, BlockState blockState, Direction facing,
BiPredicate<BlockPos, Direction> checker, Consumer<BlockState> consumer) {
if (blockState.hasProperty(BlockStateProperties.FACING)) {
tryFacings(blockState, pos, checker, consumer, BlockStateProperties.FACING,
Expand All @@ -544,8 +545,8 @@ private void tryFacings(BlockState blockState, BlockPos pos, BiPredicate<BlockPo
consumer.accept(blockState.setValue(property, found));
}

private BlockPos setActualRelativeOffset(int x, int y, int z, Direction facing, Direction upwardsFacing,
boolean isFlipped) {
protected BlockPos setActualRelativeOffset(int x, int y, int z, Direction facing, Direction upwardsFacing,
boolean isFlipped) {
int[] c0 = new int[] { x, y, z }, c1 = new int[3];
if (facing == Direction.UP || facing == Direction.DOWN) {
Direction of = facing == Direction.DOWN ? upwardsFacing : upwardsFacing.getOpposite();
Expand Down
Loading