CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename SlotPredicate internals for clarity (why, I hate this file)

Browse Source
This commit is contained in:
caucow
2021-06-06 18:33:38 -05:00
parent 2b3fdc333d
commit fab13f2c37
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventorygui/components/SlotPredicates.java
View File

@@ -14,30 +14,30 @@ public final class SlotPredicates {
return counter::isValid;
}
public static IntPredicate rows(int rows) {
return rows(rows, 9);
public static IntPredicate rows(int height) {
return rows(height, 9);
}
public static IntPredicate rows(int rows, int rowLength) {
return slots(rows * rowLength);
public static IntPredicate rows(int height, int rowLength) {
return slots(height * rowLength);
}
public static IntPredicate offsetRectangle(int rows, int columns, int verticalOffset, int horizontalOffset,
public static IntPredicate offsetRectangle(int height, int width, int y, int x,
int rowLength) {
OffsetSlotter slotter = new OffsetSlotter(verticalOffset, horizontalOffset, rows, columns, rowLength);
OffsetSlotter slotter = new OffsetSlotter(y, x, height, width, rowLength);
return slotter::isValid;
}
public static IntPredicate offsetRectangle(int rows, int columns, int verticalOffset, int horizontalOffset) {
return offsetRectangle(rows, columns, verticalOffset, horizontalOffset, ROW_LENGTH);
public static IntPredicate offsetRectangle(int height, int width, int y, int x) {
return offsetRectangle(height, width, y, x, ROW_LENGTH);
}
public static IntPredicate rectangle(int rows, int columns, int rowLength) {
return offsetRectangle(rows, columns, 0, 0, rowLength);
public static IntPredicate rectangle(int height, int width, int rowLength) {
return offsetRectangle(height, width, 0, 0, rowLength);
}
public static IntPredicate rectangle(int rows, int columns) {
return rectangle(rows, columns, ROW_LENGTH);
public static IntPredicate rectangle(int height, int width) {
return rectangle(height, width, ROW_LENGTH);
}
private static class OffsetSlotter {
@@ -48,11 +48,11 @@ public final class SlotPredicates {
private int upperVerticalBound;
private int rowLength;
OffsetSlotter(int offSetRow, int offSetColumn, int sizeRows, int sizeColumns, int rowLength) {
this.lowerHorizontalBound = offSetColumn;
this.upperHorizontalBound = offSetColumn + sizeColumns - 1;
this.lowerVerticalBound = offSetRow;
this.upperVerticalBound = offSetRow + sizeRows - 1;
OffsetSlotter(int y, int x, int height, int width, int rowLength) {
this.lowerHorizontalBound = x;
this.upperHorizontalBound = x + width - 1;
this.lowerVerticalBound = y;
this.upperVerticalBound = y + height - 1;
this.rowLength = rowLength;
}