Skip to content

GH-44 Fix position E identification. #44

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

Merged
merged 1 commit into from
Dec 29, 2024
Merged

GH-44 Fix position E identification. #44

Show file tree
Hide file tree
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
9 changes: 7 additions & 2 deletions ...alcode-commons-bukkit/src/main/java/com/eternalcode/commons/bukkit/position/Position.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,13 @@ public record Position(double x, double y, double z, float yaw, float pitch, Str
public static final String NONE_WORLD = "__NONE__";

private static final Pattern PARSE_FORMAT = Pattern.compile(
"Position\\{x=(?<x>-?[\\d.]+), y=(?<y>-?[\\d.]+), z=(?<z>-?[\\d.]+), yaw=(?<yaw>-?[\\d.]+), pitch=(?<pitch>-?[\\d.]+), world='(?<world>.+)'}");

"Position\\{x=(?<x>-?[\\d.]+(?:[eE][-+]?\\d+)?), " +
"y=(?<y>-?[\\d.]+(?:[eE][-+]?\\d+)?), " +
"z=(?<z>-?[\\d.]+(?:[eE][-+]?\\d+)?), " +
"yaw=(?<yaw>-?[\\d.]+(?:[eE][-+]?\\d+)?), " +
"pitch=(?<pitch>-?[\\d.]+(?:[eE][-+]?\\d+)?), " +
"world='(?<world>.+)'}");

public Position(double x, double y, double z, String world) {
this(x, y, z, 0F, 0F, world);
}
Expand Down
16 changes: 8 additions & 8 deletions eternalcode-commons-bukkit/test/com/eternalcode/commons/bukkit/position/PositionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class PositionTest {

@BeforeEach
void setUp() {
position = new Position(1.0d, 2.0d, 3.0d, 4.0f, 5.0f, "world");
position = new Position(1.0d, 2.0d, 3.0d, 90.49303f, -6.020069E-6f, "world");
}

@Test
Expand All @@ -36,12 +36,12 @@ void getZ() {

@Test
void getYaw() {
assertEquals(4.0f, position.yaw());
assertEquals(90.49303f, position.yaw());
}

@Test
void getPitch() {
assertEquals(5.0f, position.pitch());
assertEquals(-6.020069E-6f, position.pitch());
}

@Test
Expand All @@ -51,8 +51,8 @@ void isNoneWorld() {

@Test
void testEqualsAndHashCode() {
Position position2 = new Position(1.0d, 2.0d, 3.0d, 4.0f, 5.0f, "world");
Position position3 = new Position(1.0d, 2.0d, 3.1d, 4.0f, 5.0f, "world");
Position position2 = new Position(1.0d, 2.0d, 3.0d, 90.49303f, -6.020069E-6f, "world");
Position position3 = new Position(1.0d, 2.0d, 3.1d, 90.49303f, -6.020069E-6f, "world");

// Reflexive test
assertEquals(position, position);
Expand All @@ -71,18 +71,18 @@ void testEqualsAndHashCode() {

@Test
void testToString() {
String expectedString = "Position{x=1.0, y=2.0, z=3.0, yaw=4.0, pitch=5.0, world='world'}";
String expectedString = "Position{x=1.0, y=2.0, z=3.0, yaw=90.49303, pitch=-6.020069E-6, world='world'}";
assertEquals(expectedString, position.toString());
}

@Test
void parse() {
Position parsed = Position.parse("Position{x=1.0, y=2.0, z=3.0, yaw=4.0, pitch=5.0, world='world'}");
Position parsed = Position.parse("Position{x=1.0, y=2.0, z=3.0, yaw=90.49303, pitch=-6.020069E-6, world='world'}");
assertEquals(position, parsed);
}

@Test
void parseInvalid() {
assertThrows(IllegalArgumentException.class, () -> Position.parse("Invalid{x=1.0, y=2.0, z=3.0, yaw=4.0, pitch=5.0, world='world'}"));
assertThrows(IllegalArgumentException.class, () -> Position.parse("Invalid{x=1.0, y=2.0, z=3.0, yaw=90.49303, pitch=-6.020069E-6, world='world'}"));
}
}
Loading