[CI test] Combined ports of CivMC PRs #916/#917/#918 #2
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,6 +32,7 @@ bin/ | |
| .gradle | ||
| build | ||
| run | ||
| logs | ||
|
|
||
| temp | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,6 +32,10 @@ subprojects { | |
| enabled = false | ||
| } | ||
|
|
||
| tasks.withType<Test> { | ||
| useJUnitPlatform() | ||
| } | ||
|
|
||
| configure<PublishingExtension> { | ||
| val githubActor = System.getenv("GITHUB_ACTOR") | ||
| val githubToken = System.getenv("GITHUB_TOKEN") | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,4 +21,11 @@ dependencies { | |
| compileOnly(libs.fastutil) | ||
|
|
||
| testImplementation(libs.bundles.junit) | ||
| testImplementation(libs.mockbukkit) | ||
| testImplementation("io.papermc.paper:paper-api:${libs.versions.paper.get()}") | ||
| } | ||
|
|
||
| // https://docs.mockbukkit.org/docs/en/user_guide/advanced/paperweight | ||
| paperweight { | ||
| addServerDependencyTo = configurations.named(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME).map { setOf(it) } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,104 +4,63 @@ | |
| import org.bukkit.Material; | ||
| import org.bukkit.inventory.ItemStack; | ||
| import org.bukkit.inventory.meta.ItemMeta; | ||
| import org.junit.jupiter.api.AfterEach; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Disabled; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.mockbukkit.mockbukkit.MockBukkit; | ||
| import vg.civcraft.mc.civmodcore.chat.ChatUtils; | ||
| import vg.civcraft.mc.civmodcore.inventory.items.ItemUtils; | ||
|
|
||
| public class ItemMetaTests { | ||
|
|
||
| private ItemStack templateItem; | ||
|
|
||
| @BeforeEach | ||
| public void setUp() { | ||
| MockBukkit.mock(); | ||
| templateItem = new ItemStack(Material.STICK); | ||
| } | ||
|
|
||
| @AfterEach | ||
| public void tearDown() { | ||
| MockBukkit.unmock(); | ||
| } | ||
|
|
||
| @Test | ||
| @SuppressWarnings("deprecation") | ||
| public void testAdvancedDisplayNameEquality() { | ||
| final var formerItem = templateItem.clone(); | ||
| ItemUtils.handleItemMeta(formerItem, (ItemMeta meta) -> { | ||
| meta.setDisplayName("Hello!"); | ||
| return true; | ||
| }); | ||
| final var latterItem = templateItem.clone(); | ||
| ItemUtils.handleItemMeta(latterItem, (ItemMeta meta) -> { | ||
| meta.displayName(Component.text("Hello!")); | ||
| return true; | ||
| }); | ||
| Assertions.assertTrue(ChatUtils.areComponentsEqual( | ||
| ItemUtils.getComponentDisplayName(formerItem), | ||
| ItemUtils.getComponentDisplayName(latterItem))); | ||
| Assertions.assertTrue(ItemUtils.areItemsSimilar(formerItem, latterItem)); | ||
| } | ||
|
|
||
| @Test | ||
| @Disabled("Paper's switch to native Component display names removed the legacy/Adventure split this assertion relied on") | ||
| @SuppressWarnings("deprecation") | ||
| public void testBaseComponent() { | ||
| final var formerItem = templateItem.clone(); | ||
| ItemUtils.handleItemMeta(formerItem, (ItemMeta meta) -> { | ||
| meta.setDisplayName("Hello!"); | ||
| return true; | ||
| }); | ||
| final var latterItem = templateItem.clone(); | ||
| ItemUtils.handleItemMeta(latterItem, (ItemMeta meta) -> { | ||
| meta.displayName(Component.text("Hello!")); | ||
| return true; | ||
| }); | ||
| Assertions.assertTrue(ChatUtils.isBaseComponent( | ||
| ItemUtils.getComponentDisplayName(formerItem))); | ||
| Assertions.assertFalse(ChatUtils.isBaseComponent( | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,4 +19,13 @@ dependencies { | |
| compileOnly(project(":plugins:randomspawn-paper")) | ||
|
|
||
| compileOnly(files("../../ansible/src/paper-plugins/BreweryX-3.6.0.jar")) | ||
|
|
||
| testImplementation(libs.bundles.junit) | ||
| testImplementation(project(":plugins:civmodcore-paper")) | ||
| testImplementation(project(":plugins:combattagplus-paper")) | ||
| testImplementation("org.mockito:mockito-core:5.11.0") | ||
| } | ||
|
|
||
| tasks.test { | ||
| useJUnitPlatform() | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -84,6 +84,15 @@ private List<String> generateLoreInternal(ExilePearl pearl, int health, boolean | |
| lore.add(parse("")); | ||
|
|
||
| lore.add(parse("<a>Health: <n>%s/%s", health, config.getPearlHealthMaxValue())); | ||
| String unit = config.getPearlHealthDecayHumanInterval(); | ||
| int decayPerHumanInterval = PearlDecayMath.decayPerHumanInterval( | ||
| config.getPearlHealthDecayHumanIntervalMin(), | ||
| config.getPearlHealthDecayIntervalMin(), | ||
| config.getPearlHealthDecayAmount()); | ||
| int intervalsRemaining = PearlDecayMath.intervalsRemaining(health, decayPerHumanInterval); | ||
| if (intervalsRemaining > 0 && pearl.isActive()) { | ||
| lore.add(parse("<a>Time remaining: <n>%d %s", intervalsRemaining, unit)); | ||
| } | ||
| Set<RepairMaterial> repair = config.getRepairMaterials(pearl.getPearlType()); | ||
| if (repair != null) { | ||
| for (RepairMaterial rep : repair) { | ||
|
|
@@ -92,9 +101,8 @@ private List<String> generateLoreInternal(ExilePearl pearl, int health, boolean | |
| if (rep.getStack().hasItemMeta() && rep.getStack().getItemMeta().hasDisplayName()) { | ||
| item = rep.getStack().getItemMeta().getDisplayName(); | ||
| } | ||
| int repairsPerHumanInterval = (int) Math.ceil(decayPerHumanInterval / amountPerItem); | ||
| lore.add(parse("<a>Cost per %s using %s:<n> %s", unit, item, Integer.toString(repairsPerHumanInterval))); | ||
| } | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
JUnit 5 (Jupiter) and JUnit Platform use different versioning schemes (e.g., Jupiter
5.10.3and Platform1.10.3). There is no version6.0.3for either, and using a single version reference for both will cause dependency resolution to fail. We should split them into separate version properties.