Skip to content

Commit 1c27fe2

Browse files
NonSwagNonSwag
authored
Merge pull request #63 from TheNextLvl-net/deprecation
Refactor accessor calls to method references
2 parents 50cfe60 + 40f1cdc commit 1c27fe2

File tree

7 files changed

+61
-61
lines changed

7 files changed

+61
-61
lines changed

‎api/src/main/java/net/thenextlvl/gopaint/api/brush/mask/VisibleMask.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ public record VisibleMask(Extent extent, Vector3 viewPoint) implements Mask {
1212
public boolean test(BlockVector3 vector) {
1313

1414
var location = new MutableVector3(
15-
vector.getX(),
16-
vector.getY(),
17-
vector.getZ()
15+
vector.x(),
16+
vector.y(),
17+
vector.z()
1818
);
1919

20-
var distanceX = viewPoint().getX() - location.getX();
21-
var distanceY = viewPoint().getY() - location.getY();
22-
var distanceZ = viewPoint().getZ() - location.getZ();
20+
var distanceX = viewPoint().x() - location.x();
21+
var distanceY = viewPoint().y() - location.y();
22+
var distanceZ = viewPoint().z() - location.z();
2323

2424
location.setComponents(
25-
location.getX() + (distanceX > 1 ? 1 : distanceX > 0 ? 0.5 : 0),
26-
location.getY() + (distanceY > 1 ? 1 : distanceY > 0 ? 0.5 : 0),
27-
location.getZ() + (distanceZ > 1 ? 1 : distanceZ > 0 ? 0.5 : 0)
25+
location.x() + (distanceX > 1 ? 1 : distanceX > 0 ? 0.5 : 0),
26+
location.y() + (distanceY > 1 ? 1 : distanceY > 0 ? 0.5 : 0),
27+
location.z() + (distanceZ > 1 ? 1 : distanceZ > 0 ? 0.5 : 0)
2828
);
2929

3030
var distance = location.distance(viewPoint());

‎api/src/main/java/net/thenextlvl/gopaint/api/math/Height.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ public class Height {
3030
*/
3131
public static int getNearestNonEmptyBlock(Block block) {
3232
if (block.material().isAir()) {
33-
for (var y = block.vector().getY(); y >= block.world().getMinY(); y--) {
34-
if (block.world().getBlock(block.vector().getX(), y, block.vector().getZ()).isAir()) continue;
33+
for (var y = block.vector().y(); y >= block.world().getMinY(); y--) {
34+
if (block.world().getBlock(block.vector().x(), y, block.vector().z()).isAir()) continue;
3535
return y + 1;
3636
}
3737
return block.world().getMinY();
3838
} else {
39-
for (var y = block.vector().getY(); y <= block.world().getMaxY(); y++) {
40-
if (!block.world().getBlock(block.vector().getX(), y, block.vector().getZ()).isAir()) continue;
39+
for (var y = block.vector().y(); y <= block.world().getMaxY(); y++) {
40+
if (!block.world().getBlock(block.vector().x(), y, block.vector().z()).isAir()) continue;
4141
return y;
4242
}
4343
return block.world().getMaxY();

‎api/src/main/java/net/thenextlvl/gopaint/api/math/Sphere.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ public static Set<BlockVector3> getBlocksInRadius(BlockVector3 position, double
3030
var loc1 = position.subtract((int) radius, (int) radius, (int) radius);
3131
var loc2 = position.add((int) radius, (int) radius, (int) radius);
3232

33-
for (var x = loc1.getX(); x <= loc2.getX(); x++) {
34-
for (var y = loc1.getY(); y <= loc2.getY(); y++) {
35-
for (var z = loc1.getZ(); z <= loc2.getZ(); z++) {
33+
for (var x = loc1.x(); x <= loc2.x(); x++) {
34+
for (var y = loc1.y(); y <= loc2.y(); y++) {
35+
for (var z = loc1.z(); z <= loc2.z(); z++) {
3636
var vector3 = BlockVector3.at(x, y, z);
3737
if (vector3.distance(position) >= radius) continue;
3838
vectors.add(vector3);

‎api/src/main/java/net/thenextlvl/gopaint/api/math/curve/BezierSpline.java‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -72,27 +72,27 @@ public BlockVector3 getPoint(int segmentIndex, double factor) {
7272
public void calculateControlPoints() {
7373
if (segments.length == 0) return;
7474

75-
var xFlat = Arrays.stream(knots).allMatch(l -> l.getBlockX() == knots[0].getX())
76-
? OptionalDouble.of(knots[0].getX()) : OptionalDouble.empty();
77-
var yFlat = Arrays.stream(knots).allMatch(l -> l.getBlockY() == knots[0].getY())
78-
? OptionalDouble.of(knots[0].getY()) : OptionalDouble.empty();
79-
var zFlat = Arrays.stream(knots).allMatch(l -> l.getBlockZ() == knots[0].getZ())
80-
? OptionalDouble.of(knots[0].getZ()) : OptionalDouble.empty();
75+
var xFlat = Arrays.stream(knots).allMatch(l -> l.x() == knots[0].x())
76+
? OptionalDouble.of(knots[0].x()) : OptionalDouble.empty();
77+
var yFlat = Arrays.stream(knots).allMatch(l -> l.y() == knots[0].y())
78+
? OptionalDouble.of(knots[0].y()) : OptionalDouble.empty();
79+
var zFlat = Arrays.stream(knots).allMatch(l -> l.z() == knots[0].z())
80+
? OptionalDouble.of(knots[0].z()) : OptionalDouble.empty();
8181

8282
if (segments.length == 1) {
8383
var midpoint = new MutableBlockVector3(0, 0, 0);
84-
midpoint.mutX((segments[0].getStartPoint().getX() + segments[0].getEndPoint().getX()) / 2);
85-
midpoint.mutY((segments[0].getStartPoint().getY() + segments[0].getEndPoint().getY()) / 2);
86-
midpoint.mutZ((segments[0].getStartPoint().getZ() + segments[0].getEndPoint().getZ()) / 2);
84+
midpoint.mutX((segments[0].getStartPoint().x() + segments[0].getEndPoint().x()) / 2);
85+
midpoint.mutY((segments[0].getStartPoint().y() + segments[0].getEndPoint().y()) / 2);
86+
midpoint.mutZ((segments[0].getStartPoint().z() + segments[0].getEndPoint().z()) / 2);
8787
segments[0].setIntermediatePoint1(midpoint);
8888
segments[0].setIntermediatePoint2(new MutableBlockVector3(midpoint));
8989
} else {
9090
segments[0].setCoefficient1(0);
9191
segments[0].setCoefficient2(2);
9292
segments[0].setCoefficient3(1);
93-
segments[0].getResult().mutX(knots[0].getX() + 2 * knots[1].getX());
94-
segments[0].getResult().mutY(knots[0].getY() + 2 * knots[1].getY());
95-
segments[0].getResult().mutZ(knots[0].getZ() + 2 * knots[1].getZ());
93+
segments[0].getResult().mutX(knots[0].x() + 2 * knots[1].x());
94+
segments[0].getResult().mutY(knots[0].y() + 2 * knots[1].y());
95+
segments[0].getResult().mutZ(knots[0].z() + 2 * knots[1].z());
9696

9797
int n = knots.length - 1;
9898
float m;
@@ -101,44 +101,44 @@ public void calculateControlPoints() {
101101
segments[i].setCoefficient1(1);
102102
segments[i].setCoefficient2(4);
103103
segments[i].setCoefficient3(1);
104-
segments[i].getResult().mutX(4 * knots[i].getX() + 2 * knots[i + 1].getX());
105-
segments[i].getResult().mutY(4 * knots[i].getY() + 2 * knots[i + 1].getY());
106-
segments[i].getResult().mutZ(4 * knots[i].getZ() + 2 * knots[i + 1].getZ());
104+
segments[i].getResult().mutX(4 * knots[i].x() + 2 * knots[i + 1].x());
105+
segments[i].getResult().mutY(4 * knots[i].y() + 2 * knots[i + 1].y());
106+
segments[i].getResult().mutZ(4 * knots[i].z() + 2 * knots[i + 1].z());
107107
}
108108

109109
segments[n - 1].setCoefficient1(2);
110110
segments[n - 1].setCoefficient2(7);
111111
segments[n - 1].setCoefficient3(0);
112-
segments[n - 1].getResult().mutX(8 * knots[n - 1].getX() + knots[n].getX());
113-
segments[n - 1].getResult().mutY(8 * knots[n - 1].getY() + knots[n].getY());
114-
segments[n - 1].getResult().mutZ(8 * knots[n - 1].getZ() + knots[n].getZ());
112+
segments[n - 1].getResult().mutX(8 * knots[n - 1].x() + knots[n].x());
113+
segments[n - 1].getResult().mutY(8 * knots[n - 1].y() + knots[n].y());
114+
segments[n - 1].getResult().mutZ(8 * knots[n - 1].z() + knots[n].z());
115115

116116
for (int i = 1; i < n; i++) {
117117
m = segments[i].getCoefficient1() / segments[i - 1].getCoefficient2();
118118
segments[i].setCoefficient2(segments[i].getCoefficient2() - m * segments[i - 1].getCoefficient3());
119-
segments[i].getResult().mutX(segments[i].getResult().getX() - m * segments[i - 1].getResult().getX());
120-
segments[i].getResult().mutY(segments[i].getResult().getY() - m * segments[i - 1].getResult().getY());
121-
segments[i].getResult().mutZ(segments[i].getResult().getZ() - m * segments[i - 1].getResult().getZ());
119+
segments[i].getResult().mutX(segments[i].getResult().x() - m * segments[i - 1].getResult().x());
120+
segments[i].getResult().mutY(segments[i].getResult().y() - m * segments[i - 1].getResult().y());
121+
segments[i].getResult().mutZ(segments[i].getResult().z() - m * segments[i - 1].getResult().z());
122122
}
123123

124-
segments[n - 1].getIntermediatePoint1().mutX(segments[n - 1].getResult().getX() / segments[n - 1].getCoefficient2());
125-
segments[n - 1].getIntermediatePoint1().mutY(segments[n - 1].getResult().getY() / segments[n - 1].getCoefficient2());
126-
segments[n - 1].getIntermediatePoint1().mutZ(segments[n - 1].getResult().getZ() / segments[n - 1].getCoefficient2());
124+
segments[n - 1].getIntermediatePoint1().mutX(segments[n - 1].getResult().x() / segments[n - 1].getCoefficient2());
125+
segments[n - 1].getIntermediatePoint1().mutY(segments[n - 1].getResult().y() / segments[n - 1].getCoefficient2());
126+
segments[n - 1].getIntermediatePoint1().mutZ(segments[n - 1].getResult().z() / segments[n - 1].getCoefficient2());
127127

128128
for (int i = n - 2; i >= 0; i--) {
129-
segments[i].getIntermediatePoint1().mutX((segments[i].getResult().getX() - segments[i].getCoefficient3() * segments[i + 1].getIntermediatePoint1().getX()) / segments[i].getCoefficient2());
130-
segments[i].getIntermediatePoint1().mutY((segments[i].getResult().getY() - segments[i].getCoefficient3() * segments[i + 1].getIntermediatePoint1().getY()) / segments[i].getCoefficient2());
131-
segments[i].getIntermediatePoint1().mutZ((segments[i].getResult().getZ() - segments[i].getCoefficient3() * segments[i + 1].getIntermediatePoint1().getZ()) / segments[i].getCoefficient2());
129+
segments[i].getIntermediatePoint1().mutX((segments[i].getResult().x() - segments[i].getCoefficient3() * segments[i + 1].getIntermediatePoint1().x()) / segments[i].getCoefficient2());
130+
segments[i].getIntermediatePoint1().mutY((segments[i].getResult().y() - segments[i].getCoefficient3() * segments[i + 1].getIntermediatePoint1().y()) / segments[i].getCoefficient2());
131+
segments[i].getIntermediatePoint1().mutZ((segments[i].getResult().z() - segments[i].getCoefficient3() * segments[i + 1].getIntermediatePoint1().z()) / segments[i].getCoefficient2());
132132
}
133133

134134
for (int i = 0; i < n - 1; i++) {
135-
segments[i].getIntermediatePoint2().mutX(2 * knots[i + 1].getX() - segments[i + 1].getIntermediatePoint1().getX());
136-
segments[i].getIntermediatePoint2().mutY(2 * knots[i + 1].getY() - segments[i + 1].getIntermediatePoint1().getY());
137-
segments[i].getIntermediatePoint2().mutZ(2 * knots[i + 1].getZ() - segments[i + 1].getIntermediatePoint1().getZ());
135+
segments[i].getIntermediatePoint2().mutX(2 * knots[i + 1].x() - segments[i + 1].getIntermediatePoint1().x());
136+
segments[i].getIntermediatePoint2().mutY(2 * knots[i + 1].y() - segments[i + 1].getIntermediatePoint1().y());
137+
segments[i].getIntermediatePoint2().mutZ(2 * knots[i + 1].z() - segments[i + 1].getIntermediatePoint1().z());
138138
}
139-
segments[n - 1].getIntermediatePoint2().mutX(0.5 * (knots[n].getX() + segments[n - 1].getIntermediatePoint1().getX()));
140-
segments[n - 1].getIntermediatePoint2().mutY(0.5 * (knots[n].getY() + segments[n - 1].getIntermediatePoint1().getY()));
141-
segments[n - 1].getIntermediatePoint2().mutZ(0.5 * (knots[n].getZ() + segments[n - 1].getIntermediatePoint1().getZ()));
139+
segments[n - 1].getIntermediatePoint2().mutX(0.5 * (knots[n].x() + segments[n - 1].getIntermediatePoint1().x()));
140+
segments[n - 1].getIntermediatePoint2().mutY(0.5 * (knots[n].y() + segments[n - 1].getIntermediatePoint1().y()));
141+
segments[n - 1].getIntermediatePoint2().mutZ(0.5 * (knots[n].z() + segments[n - 1].getIntermediatePoint1().z()));
142142
}
143143

144144
xFlat.ifPresent(value -> Arrays.stream(segments).forEach(segment -> segment.setX(value)));

‎api/src/main/java/net/thenextlvl/gopaint/api/math/curve/BezierSplineSegment.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@ public double getCurveLength() {
8686
@Contract(pure = true)
8787
public BlockVector3 getPoint(double factor) {
8888
var x = Objects.requireNonNullElseGet(xFlat, () -> calculatePoint(
89-
factor, startPoint.getX(), intermediatePoint1.getX(), intermediatePoint2.getX(), endPoint.getX()
89+
factor, startPoint.x(), intermediatePoint1.x(), intermediatePoint2.x(), endPoint.x()
9090
));
9191
var y = Objects.requireNonNullElseGet(yFlat, () -> calculatePoint(
92-
factor, startPoint.getY(), intermediatePoint1.getY(), intermediatePoint2.getY(), endPoint.getY()
92+
factor, startPoint.y(), intermediatePoint1.y(), intermediatePoint2.y(), endPoint.y()
9393
));
9494
var z = Objects.requireNonNullElseGet(zFlat, () -> calculatePoint(
95-
factor, startPoint.getZ(), intermediatePoint1.getZ(), intermediatePoint2.getZ(), endPoint.getZ()
95+
factor, startPoint.z(), intermediatePoint1.z(), intermediatePoint2.z(), endPoint.z()
9696
));
9797
return BlockVector3.at(x, y, z);
9898
}

‎src/main/java/net/thenextlvl/gopaint/brush/pattern/GradientPattern.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public record GradientPattern(
2222
@Override
2323
public boolean apply(Extent extent, BlockVector3 get, BlockVector3 set) throws WorldEditException {
2424
if (settings().getRandom().nextDouble() <= getRate(set)) return false;
25-
return set.setBlock(extent, getRandomBlockState(set.getY()));
25+
return set.setBlock(extent, getRandomBlockState(set.y()));
2626
}
2727

2828
public BlockState getRandomBlockState(int altitude) {
@@ -33,7 +33,7 @@ public BlockState getRandomBlockState(int altitude) {
3333

3434
private int getRandom(int altitude) {
3535
if (settings().getBlocks().size() == 1) return 1;
36-
var y = position().getY() - (settings().getBrushSize() / 2d);
36+
var y = position().y() - (settings().getBrushSize() / 2d);
3737
var _y = (altitude - y) / settings().getBrushSize() * settings().getBlocks().size();
3838
return (int) (_y + (settings().getRandom().nextDouble() * 2 - 1) * (settings().getMixingStrength() / 100d));
3939
}

‎src/main/java/net/thenextlvl/gopaint/brush/standard/PaintBrush.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ public void build(EditSession session, BlockVector3 position, Pattern original,
7575

7676
if (!bukkit.getPlayer().isSneaking()) {
7777
provider.bundle().sendMessage(bukkit.getPlayer(), "brush.paint.point.set",
78-
Placeholder.parsed("x", String.valueOf(position.getX())),
79-
Placeholder.parsed("y", String.valueOf(position.getY())),
80-
Placeholder.parsed("z", String.valueOf(position.getZ())),
78+
Placeholder.parsed("x", String.valueOf(position.x())),
79+
Placeholder.parsed("y", String.valueOf(position.y())),
80+
Placeholder.parsed("z", String.valueOf(position.z())),
8181
Placeholder.parsed("point", String.valueOf(selectedPoints.get(id).size()))
8282
);
8383
return;
@@ -98,11 +98,11 @@ public void build(EditSession session, BlockVector3 position, Pattern original,
9898
pattern.random(settings.getRandom().nextInt(settings.getBlocks().size()));
9999

100100
var curve = new LinkedList<MutableBlockVector3>();
101-
curve.add(MutableBlockVector3.at(vector3.getX(), vector3.getY(), vector3.getZ()));
101+
curve.add(MutableBlockVector3.at(vector3.x(), vector3.y(), vector3.z()));
102102
vectors.stream().skip(1).map(location -> MutableBlockVector3.at(
103-
vector3.getX() + location.getX() - first.getX(),
104-
vector3.getY() + location.getY() - first.getY(),
105-
vector3.getZ() + location.getZ() - first.getZ()
103+
vector3.x() + location.x() - first.x(),
104+
vector3.y() + location.y() - first.y(),
105+
vector3.z() + location.z() - first.z()
106106
)).forEach(curve::add);
107107

108108
var spline = new BezierSpline(curve);

0 commit comments

Comments
 (0)