Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-04 12:06:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: address deprecations in vector classes

Browse Source
This commit is contained in:
dordsor21
2024-05-27 18:48:46 +01:00
committed by Jordan
parent 7318685613
commit 36d2c85fdb
244 changed files with 1493 additions and 1515 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
worldedit-core/src/test/java/com/sk89q/worldedit/internal/expression/RealExpressionTest.java
View File

@ -74,7 +74,7 @@ class RealExpressionTest extends BaseExpressionTest {
Expression compiled = compile(expr, "x", "y", "z");
for (TestCase aCase : cases) {
Vector3 loc = aCase.loc;
assertEquals(aCase.result, compiled.evaluate(loc.getX(), loc.getY(), loc.getZ()), 0,
assertEquals(aCase.result, compiled.evaluate(loc.x(), loc.y(), loc.z()), 0,
"Test case " + aCase + " failed (result)"
);
aCase.postChecks.accept(compiled);

10
worldedit-core/src/test/java/com/sk89q/worldedit/internal/util/RegionOptimizedVectorSorterTest.java
View File

@ -100,10 +100,10 @@ public class RegionOptimizedVectorSorterTest {
for (int i = 0; i < toSort.size() - 1; i++) {
BlockVector3 curr = toSort.get(i);
BlockVector3 next = toSort.get(i + 1);
int currChunkX = curr.getX() >> 4;
int nextChunkX = next.getX() >> 4;
int currChunkZ = curr.getZ() >> 4;
int nextChunkZ = next.getZ() >> 4;
int currChunkX = curr.x() >> 4;
int nextChunkX = next.x() >> 4;
int currChunkZ = curr.z() >> 4;
int nextChunkZ = next.z() >> 4;
int currRegionX = currChunkX >> 5;
int nextRegionX = nextChunkX >> 5;
int currRegionZ = currChunkZ >> 5;
@ -125,7 +125,7 @@ public class RegionOptimizedVectorSorterTest {
fail(spaceship + " "
+ currChunkZ + " chunk z should be less than or equal to " + nextChunkZ);
} else if (currChunkZ == nextChunkZ) {
if (curr.getY() < next.getY()) {
if (curr.y() < next.y()) {
fail(spaceship + " "
+ curr + " y should be greater than or equal to " + next);
}

32
worldedit-core/src/test/java/com/sk89q/worldedit/util/LocationTest.java
View File

@ -65,7 +65,7 @@ public class LocationTest {
public void testGetX() throws Exception {
World world = mock(World.class);
Location location = new Location(world, Vector3.at(TEST_VALUE, 0, 0));
assertEquals(TEST_VALUE, location.getX(), EPSILON);
assertEquals(TEST_VALUE, location.x(), EPSILON);
}
@Test
@ -80,17 +80,17 @@ public class LocationTest {
World world = mock(World.class);
Location location1 = new Location(world, Vector3.ZERO);
Location location2 = location1.setX(TEST_VALUE);
assertEquals(0, location1.getX(), EPSILON);
assertEquals(TEST_VALUE, location2.getX(), EPSILON);
assertEquals(0, location2.getY(), EPSILON);
assertEquals(0, location2.getZ(), EPSILON);
assertEquals(0, location1.x(), EPSILON);
assertEquals(TEST_VALUE, location2.x(), EPSILON);
assertEquals(0, location2.y(), EPSILON);
assertEquals(0, location2.z(), EPSILON);
}
@Test
public void testGetY() throws Exception {
World world = mock(World.class);
Location location = new Location(world, Vector3.at(0, TEST_VALUE, 0));
assertEquals(TEST_VALUE, location.getY(), EPSILON);
assertEquals(TEST_VALUE, location.y(), EPSILON);
}
@Test
@ -105,17 +105,17 @@ public class LocationTest {
World world = mock(World.class);
Location location1 = new Location(world, Vector3.ZERO);
Location location2 = location1.setY(TEST_VALUE);
assertEquals(0, location1.getY(), EPSILON);
assertEquals(0, location2.getX(), EPSILON);
assertEquals(TEST_VALUE, location2.getY(), EPSILON);
assertEquals(0, location2.getZ(), EPSILON);
assertEquals(0, location1.y(), EPSILON);
assertEquals(0, location2.x(), EPSILON);
assertEquals(TEST_VALUE, location2.y(), EPSILON);
assertEquals(0, location2.z(), EPSILON);
}
@Test
public void testGetZ() throws Exception {
World world = mock(World.class);
Location location = new Location(world, Vector3.at(0, 0, TEST_VALUE));
assertEquals(TEST_VALUE, location.getZ(), EPSILON);
assertEquals(TEST_VALUE, location.z(), EPSILON);
}
@Test
@ -130,10 +130,10 @@ public class LocationTest {
World world = mock(World.class);
Location location1 = new Location(world, Vector3.ZERO);
Location location2 = location1.setZ(TEST_VALUE);
assertEquals(0, location1.getZ(), EPSILON);
assertEquals(0, location2.getX(), EPSILON);
assertEquals(0, location2.getY(), EPSILON);
assertEquals(TEST_VALUE, location2.getZ(), EPSILON);
assertEquals(0, location1.z(), EPSILON);
assertEquals(0, location2.x(), EPSILON);
assertEquals(0, location2.y(), EPSILON);
assertEquals(TEST_VALUE, location2.z(), EPSILON);
}
@RepeatedTest(value = 5)
@ -141,7 +141,7 @@ public class LocationTest {
World world = mock(World.class);
long start = System.currentTimeMillis();
BlockVector3 location1 = BlockVector3.ZERO;
BlockVector3.at(location1.getX() + 10, location1.getY() + 10, location1.getZ() + 10);
BlockVector3.at(location1.x() + 10, location1.y() + 10, location1.z() + 10);
System.out.println(System.currentTimeMillis() - start + " ms");
}