diff --git a/libraries/packets/implementations/1_21_3/src/test/java/de/oliver/fancysitula/versions/v1_21_3/packets/ClientboundRotateHeadPacketImplTest.java b/libraries/packets/implementations/1_21_3/src/test/java/de/oliver/fancysitula/versions/v1_21_3/packets/ClientboundRotateHeadPacketImplTest.java index cf0106d9..e35eec15 100644 --- a/libraries/packets/implementations/1_21_3/src/test/java/de/oliver/fancysitula/versions/v1_21_3/packets/ClientboundRotateHeadPacketImplTest.java +++ b/libraries/packets/implementations/1_21_3/src/test/java/de/oliver/fancysitula/versions/v1_21_3/packets/ClientboundRotateHeadPacketImplTest.java @@ -17,6 +17,6 @@ class ClientboundRotateHeadPacketImplTest { ClientboundRotateHeadPacket createdPacket = (ClientboundRotateHeadPacket) packet.createPacket(); assert ReflectionUtils.getField(createdPacket, "entityId").equals(entityId); - assert createdPacket.getYHeadRot() == AngelConverter.degreesToVanillaByte(headYaw); + assert createdPacket.getYHeadRot() == headYaw; } } \ No newline at end of file diff --git a/libraries/packets/implementations/1_21_3/src/test/java/de/oliver/fancysitula/versions/v1_21_3/packets/ClientboundTeleportEntityPacketImplTest.java b/libraries/packets/implementations/1_21_3/src/test/java/de/oliver/fancysitula/versions/v1_21_3/packets/ClientboundTeleportEntityPacketImplTest.java index 758e55ce..08f05ed9 100644 --- a/libraries/packets/implementations/1_21_3/src/test/java/de/oliver/fancysitula/versions/v1_21_3/packets/ClientboundTeleportEntityPacketImplTest.java +++ b/libraries/packets/implementations/1_21_3/src/test/java/de/oliver/fancysitula/versions/v1_21_3/packets/ClientboundTeleportEntityPacketImplTest.java @@ -21,12 +21,12 @@ class ClientboundTeleportEntityPacketImplTest { ClientboundTeleportEntityPacket createdPacket = (ClientboundTeleportEntityPacket) packet.createPacket(); assert createdPacket != null; - assert createdPacket.getId() == entityId; - assert createdPacket.getX() == x; - assert createdPacket.getY() == y; - assert createdPacket.getZ() == z; - assert createdPacket.getyRot() == AngelConverter.degreesToVanillaByte(yaw); - assert createdPacket.getxRot() == AngelConverter.degreesToVanillaByte(pitch); - assert createdPacket.isOnGround() == onGround; + assert createdPacket.id() == entityId; + assert createdPacket.change().position().x == x; + assert createdPacket.change().position().y == y; + assert createdPacket.change().position().z == z; + assert createdPacket.change().xRot() == pitch; + assert createdPacket.change().yRot() == yaw; + assert createdPacket.onGround() == onGround; } } \ No newline at end of file diff --git a/libraries/packets/implementations/1_21_4/src/test/java/de/oliver/fancysitula/versions/v1_21_4/packets/ClientboundRotateHeadPacketImplTest.java b/libraries/packets/implementations/1_21_4/src/test/java/de/oliver/fancysitula/versions/v1_21_4/packets/ClientboundRotateHeadPacketImplTest.java index 8084414d..bf9ad4af 100644 --- a/libraries/packets/implementations/1_21_4/src/test/java/de/oliver/fancysitula/versions/v1_21_4/packets/ClientboundRotateHeadPacketImplTest.java +++ b/libraries/packets/implementations/1_21_4/src/test/java/de/oliver/fancysitula/versions/v1_21_4/packets/ClientboundRotateHeadPacketImplTest.java @@ -17,6 +17,6 @@ class ClientboundRotateHeadPacketImplTest { ClientboundRotateHeadPacket createdPacket = (ClientboundRotateHeadPacket) packet.createPacket(); assert ReflectionUtils.getField(createdPacket, "entityId").equals(entityId); - assert createdPacket.getYHeadRot() == AngelConverter.degreesToVanillaByte(headYaw); + assert createdPacket.getYHeadRot() == headYaw; } } \ No newline at end of file diff --git a/libraries/packets/implementations/1_21_4/src/test/java/de/oliver/fancysitula/versions/v1_21_4/packets/ClientboundTeleportEntityPacketImplTest.java b/libraries/packets/implementations/1_21_4/src/test/java/de/oliver/fancysitula/versions/v1_21_4/packets/ClientboundTeleportEntityPacketImplTest.java index b1827c61..dadd4c02 100644 --- a/libraries/packets/implementations/1_21_4/src/test/java/de/oliver/fancysitula/versions/v1_21_4/packets/ClientboundTeleportEntityPacketImplTest.java +++ b/libraries/packets/implementations/1_21_4/src/test/java/de/oliver/fancysitula/versions/v1_21_4/packets/ClientboundTeleportEntityPacketImplTest.java @@ -21,12 +21,12 @@ class ClientboundTeleportEntityPacketImplTest { ClientboundTeleportEntityPacket createdPacket = (ClientboundTeleportEntityPacket) packet.createPacket(); assert createdPacket != null; - assert createdPacket.getId() == entityId; - assert createdPacket.getX() == x; - assert createdPacket.getY() == y; - assert createdPacket.getZ() == z; - assert createdPacket.getyRot() == AngelConverter.degreesToVanillaByte(yaw); - assert createdPacket.getxRot() == AngelConverter.degreesToVanillaByte(pitch); - assert createdPacket.isOnGround() == onGround; + assert createdPacket.id() == entityId; + assert createdPacket.change().position().x == x; + assert createdPacket.change().position().y == y; + assert createdPacket.change().position().z == z; + assert createdPacket.change().xRot() == pitch; + assert createdPacket.change().yRot() == yaw; + assert createdPacket.onGround() == onGround; } } \ No newline at end of file diff --git a/libraries/plugin-tests/build.gradle.kts b/libraries/plugin-tests/build.gradle.kts new file mode 100644 index 00000000..aea4d2fd --- /dev/null +++ b/libraries/plugin-tests/build.gradle.kts @@ -0,0 +1,87 @@ +plugins { + id("java") + id("maven-publish") + id("com.github.johnrengelman.shadow") +} + +group = "de.oliver" +version = "1.0.0" +description = "Library for defining and running tests in a Minecraft server environment" + +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(17)) +} + +repositories { + mavenCentral() + maven("https://repo.papermc.io/repository/maven-public/") + maven("https://repo.fancyplugins.de/releases") +} + +dependencies { + compileOnly("io.papermc.paper:paper-api:1.19.4-R0.1-SNAPSHOT") + compileOnly("com.google.code.gson:gson:2.11.0") + implementation("org.jetbrains:annotations:26.0.2") + + testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.3") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.1") + testImplementation("com.google.code.gson:gson:2.11.0") +} + +tasks { + publishing { + repositories { + maven { + name = "fancypluginsReleases" + url = uri("https://repo.fancyplugins.de/releases") + credentials(PasswordCredentials::class) + authentication { + isAllowInsecureProtocol = true + create("basic") + } + } + + maven { + name = "fancypluginsSnapshots" + url = uri("https://repo.fancyplugins.de/snapshots") + credentials(PasswordCredentials::class) + authentication { + isAllowInsecureProtocol = true + create("basic") + } + } + } + publications { + create("maven") { + groupId = project.group.toString() + artifactId = project.name + version = project.version.toString() + from(project.components["java"]) + } + } + } + + compileJava { + options.encoding = Charsets.UTF_8.name() // We want UTF-8 for everything + + // Set the release flag. This configures what version bytecode the compiler will emit, as well as what JDK APIs are usable. + // See https://openjdk.java.net/jeps/247 for more information. + options.release.set(17) + } + + java { + withSourcesJar() + withJavadocJar() + } + + javadoc { + options.encoding = Charsets.UTF_8.name() // We want UTF-8 for everything + } + processResources { + filteringCharset = Charsets.UTF_8.name() // We want UTF-8 for everything + } + + test { + useJUnitPlatform() + } +} diff --git a/libraries/common/src/main/java/de/oliver/fancylib/tests/Expectable.java b/libraries/plugin-tests/src/main/java/de/oliver/plugintests/Expectable.java similarity index 99% rename from libraries/common/src/main/java/de/oliver/fancylib/tests/Expectable.java rename to libraries/plugin-tests/src/main/java/de/oliver/plugintests/Expectable.java index ed9e6efc..56d1a7ee 100644 --- a/libraries/common/src/main/java/de/oliver/fancylib/tests/Expectable.java +++ b/libraries/plugin-tests/src/main/java/de/oliver/plugintests/Expectable.java @@ -1,4 +1,4 @@ -package de.oliver.fancylib.tests; +package de.oliver.plugintests; /** * A generic class for making assertions on the expected values. diff --git a/libraries/common/src/main/java/de/oliver/fancylib/tests/FPTestClass.java b/libraries/plugin-tests/src/main/java/de/oliver/plugintests/FPTestClass.java similarity index 96% rename from libraries/common/src/main/java/de/oliver/fancylib/tests/FPTestClass.java rename to libraries/plugin-tests/src/main/java/de/oliver/plugintests/FPTestClass.java index c9f221a8..170e0f97 100644 --- a/libraries/common/src/main/java/de/oliver/fancylib/tests/FPTestClass.java +++ b/libraries/plugin-tests/src/main/java/de/oliver/plugintests/FPTestClass.java @@ -1,8 +1,8 @@ -package de.oliver.fancylib.tests; +package de.oliver.plugintests; -import de.oliver.fancylib.tests.annotations.FPAfterEach; -import de.oliver.fancylib.tests.annotations.FPBeforeEach; -import de.oliver.fancylib.tests.annotations.FPTest; +import de.oliver.plugintests.annotations.FPAfterEach; +import de.oliver.plugintests.annotations.FPBeforeEach; +import de.oliver.plugintests.annotations.FPTest; import net.kyori.adventure.text.minimessage.MiniMessage; import org.bukkit.entity.Player; diff --git a/libraries/common/src/main/java/de/oliver/fancylib/tests/annotations/FPAfterEach.java b/libraries/plugin-tests/src/main/java/de/oliver/plugintests/annotations/FPAfterEach.java similarity index 92% rename from libraries/common/src/main/java/de/oliver/fancylib/tests/annotations/FPAfterEach.java rename to libraries/plugin-tests/src/main/java/de/oliver/plugintests/annotations/FPAfterEach.java index e32279b1..48c29f70 100644 --- a/libraries/common/src/main/java/de/oliver/fancylib/tests/annotations/FPAfterEach.java +++ b/libraries/plugin-tests/src/main/java/de/oliver/plugintests/annotations/FPAfterEach.java @@ -1,4 +1,4 @@ -package de.oliver.fancylib.tests.annotations; +package de.oliver.plugintests.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/libraries/common/src/main/java/de/oliver/fancylib/tests/annotations/FPBeforeEach.java b/libraries/plugin-tests/src/main/java/de/oliver/plugintests/annotations/FPBeforeEach.java similarity index 91% rename from libraries/common/src/main/java/de/oliver/fancylib/tests/annotations/FPBeforeEach.java rename to libraries/plugin-tests/src/main/java/de/oliver/plugintests/annotations/FPBeforeEach.java index c8ba9f8a..682f9523 100644 --- a/libraries/common/src/main/java/de/oliver/fancylib/tests/annotations/FPBeforeEach.java +++ b/libraries/plugin-tests/src/main/java/de/oliver/plugintests/annotations/FPBeforeEach.java @@ -1,4 +1,4 @@ -package de.oliver.fancylib.tests.annotations; +package de.oliver.plugintests.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/libraries/common/src/main/java/de/oliver/fancylib/tests/annotations/FPTest.java b/libraries/plugin-tests/src/main/java/de/oliver/plugintests/annotations/FPTest.java similarity index 95% rename from libraries/common/src/main/java/de/oliver/fancylib/tests/annotations/FPTest.java rename to libraries/plugin-tests/src/main/java/de/oliver/plugintests/annotations/FPTest.java index 3add29bb..e402ce2c 100644 --- a/libraries/common/src/main/java/de/oliver/fancylib/tests/annotations/FPTest.java +++ b/libraries/plugin-tests/src/main/java/de/oliver/plugintests/annotations/FPTest.java @@ -1,4 +1,4 @@ -package de.oliver.fancylib.tests.annotations; +package de.oliver.plugintests.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/plugins/fancyholograms/build.gradle.kts b/plugins/fancyholograms/build.gradle.kts index 639194d1..d04e6f01 100644 --- a/plugins/fancyholograms/build.gradle.kts +++ b/plugins/fancyholograms/build.gradle.kts @@ -64,6 +64,8 @@ dependencies { implementation(project(":plugins:fancyholograms::implementation_1_19_4", configuration = "reobf")) implementation(project(":libraries:common")) + implementation(project(":libraries:plugin-tests")) + implementation(project(":libraries:jdb")) implementation("de.oliver:FancySitula:0.0.13") implementation("de.oliver.FancyAnalytics:api:0.1.6") implementation("de.oliver.FancyAnalytics:logger:0.0.6") diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/JsonStorage.java b/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/JsonStorage.java index eaf941b2..89c04eb7 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/JsonStorage.java +++ b/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/storage/json/JsonStorage.java @@ -7,7 +7,7 @@ import de.oliver.fancyholograms.api.data.ItemHologramData; import de.oliver.fancyholograms.api.data.TextHologramData; import de.oliver.fancyholograms.storage.HologramStorage; import de.oliver.fancyholograms.storage.json.model.JsonDataUnion; -import de.oliver.fancylib.jdb.JDB; +import de.oliver.jdb.JDB; import java.io.IOException; import java.util.ArrayList; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/FHTests.java b/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/FHTests.java index b692785b..781d0ef1 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/FHTests.java +++ b/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/FHTests.java @@ -3,7 +3,7 @@ package de.oliver.fancyholograms.tests; import de.oliver.fancyholograms.tests.api.HologramBuilderTest; import de.oliver.fancyholograms.tests.api.HologramControllerTest; import de.oliver.fancyholograms.tests.api.HologramRegistryTest; -import de.oliver.fancylib.tests.FPTestClass; +import de.oliver.plugintests.FPTestClass; import org.bukkit.entity.Player; import java.util.ArrayList; diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/api/HologramBuilderTest.java b/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/api/HologramBuilderTest.java index 15ab79ef..583eddf8 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/api/HologramBuilderTest.java +++ b/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/api/HologramBuilderTest.java @@ -11,7 +11,7 @@ import de.oliver.fancyholograms.api.data.property.Visibility; import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.api.hologram.HologramType; import de.oliver.fancyholograms.main.FancyHologramsPlugin; -import de.oliver.fancylib.tests.annotations.FPTest; +import de.oliver.plugintests.annotations.FPTest; import org.bukkit.Color; import org.bukkit.Material; import org.bukkit.entity.Display; @@ -23,7 +23,7 @@ import org.joml.Vector3f; import java.util.List; import java.util.UUID; -import static de.oliver.fancylib.tests.Expectable.expect; +import static de.oliver.plugintests.Expectable.expect; public class HologramBuilderTest { diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/api/HologramControllerTest.java b/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/api/HologramControllerTest.java index 0e40a8a7..8c3dd7f8 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/api/HologramControllerTest.java +++ b/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/api/HologramControllerTest.java @@ -5,12 +5,12 @@ import de.oliver.fancyholograms.api.data.TextHologramData; import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.controller.HologramControllerImpl; import de.oliver.fancyholograms.tests.mocks.HologramMock; -import de.oliver.fancylib.tests.annotations.FPBeforeEach; -import de.oliver.fancylib.tests.annotations.FPTest; +import de.oliver.plugintests.annotations.FPBeforeEach; +import de.oliver.plugintests.annotations.FPTest; import org.bukkit.Location; import org.bukkit.entity.Player; -import static de.oliver.fancylib.tests.Expectable.expect; +import static de.oliver.plugintests.Expectable.expect; public class HologramControllerTest { diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/api/HologramRegistryTest.java b/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/api/HologramRegistryTest.java index 1dfdcfae..d0d9e278 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/api/HologramRegistryTest.java +++ b/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/tests/api/HologramRegistryTest.java @@ -5,13 +5,13 @@ import de.oliver.fancyholograms.api.data.TextHologramData; import de.oliver.fancyholograms.api.hologram.Hologram; import de.oliver.fancyholograms.registry.HologramRegistryImpl; import de.oliver.fancyholograms.tests.mocks.HologramMock; -import de.oliver.fancylib.tests.annotations.FPBeforeEach; -import de.oliver.fancylib.tests.annotations.FPTest; +import de.oliver.plugintests.annotations.FPBeforeEach; +import de.oliver.plugintests.annotations.FPTest; import org.bukkit.entity.Player; import java.util.Optional; -import static de.oliver.fancylib.tests.Expectable.expect; +import static de.oliver.plugintests.Expectable.expect; public class HologramRegistryTest { diff --git a/settings.gradle.kts b/settings.gradle.kts index d9823f43..8278b8b3 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,6 +9,7 @@ include(":plugins:fancyholograms:implementation_1_19_4") include(":libraries:common") include(":libraries:jdb") +include(":libraries:plugin-tests") include("libraries:packets:api") include("libraries:packets:factories")