Register voting booth furniture and start due elections #70
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
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
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 |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| package net.tfminecraft.simplefactions.government; | ||
|
|
||
| public final class VotingBlock { | ||
| private VotingBlock() { | ||
| } | ||
|
|
||
| public static String furnitureId(String configPath) { | ||
| String path = typedPath(configPath, "iaf"); | ||
| return path == null || path.isBlank() ? null : path; | ||
| } | ||
|
|
||
| public static boolean matches(String configPath, String namespacedId) { | ||
| if (namespacedId == null || namespacedId.isBlank()) { | ||
| return false; | ||
| } | ||
| String configured = furnitureId(configPath); | ||
| return configured != null && configured.equalsIgnoreCase(namespacedId); | ||
| } | ||
|
|
||
| private static String typedPath(String configPath, String expectedType) { | ||
| if (configPath == null || configPath.isBlank()) { | ||
| return null; | ||
| } | ||
| String trimmed = configPath.trim(); | ||
| int openParen = trimmed.indexOf('('); | ||
| int closeParen = trimmed.indexOf(')', openParen + 1); | ||
| String type; | ||
| String path; | ||
| if (openParen >= 0 && closeParen > openParen) { | ||
| type = trimmed.substring(0, openParen); | ||
| path = trimmed.substring(openParen + 1, closeParen); | ||
| } else { | ||
| int dot = trimmed.indexOf('.'); | ||
| if (dot <= 0) { | ||
| return null; | ||
| } | ||
| type = trimmed.substring(0, dot); | ||
| path = trimmed.substring(dot + 1); | ||
| } | ||
| if (!type.equalsIgnoreCase(expectedType)) { | ||
| return null; | ||
| } | ||
| return path.trim(); | ||
| } | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| package net.tfminecraft.simplefactions.managers; | ||
|
|
||
| import org.bukkit.block.Block; | ||
| import org.bukkit.entity.Entity; | ||
| import org.bukkit.event.EventHandler; | ||
| import org.bukkit.event.EventPriority; | ||
| import org.bukkit.event.Listener; | ||
| import org.bukkit.event.block.Action; | ||
|
|
||
| import dev.lone.itemsadder.api.Events.FurnitureBreakEvent; | ||
| import dev.lone.itemsadder.api.Events.FurnitureInteractEvent; | ||
| import dev.lone.itemsadder.api.Events.FurniturePlaceSuccessEvent; | ||
| import net.tfminecraft.simplefactions.Cache; | ||
| import net.tfminecraft.simplefactions.government.VotingBlock; | ||
|
|
||
| public class VotingBoothListener implements Listener { | ||
| private final FactionManager factions; | ||
|
|
||
| public VotingBoothListener(FactionManager factions) { | ||
| this.factions = factions; | ||
| } | ||
|
|
||
| @EventHandler | ||
| public void openVotingFurniture(FurnitureInteractEvent event) { | ||
| Action action = event.getAction(); | ||
| if (action != null && action != Action.RIGHT_CLICK_AIR && action != Action.RIGHT_CLICK_BLOCK) return; | ||
| if (!VotingBlock.matches(Cache.votingBlock, event.getNamespacedID())) return; | ||
| Entity entity = event.getBukkitEntity(); | ||
| if (entity == null) return; | ||
| if (factions.presentBooth(event.getPlayer(), entity.getLocation().getBlock())) { | ||
| event.setCancelled(true); | ||
| } | ||
| } | ||
|
|
||
| @EventHandler | ||
| public void placeVotingFurniture(FurniturePlaceSuccessEvent event) { | ||
| if (!VotingBlock.matches(Cache.votingBlock, event.getNamespacedID())) return; | ||
| Entity entity = event.getBukkitEntity(); | ||
| if (entity == null) return; | ||
| factions.registerVotingBooth(event.getPlayer(), entity.getLocation().getBlock()); | ||
| } | ||
|
|
||
| @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) | ||
| public void breakVotingFurniture(FurnitureBreakEvent event) { | ||
| if (!VotingBlock.matches(Cache.votingBlock, event.getNamespacedID())) return; | ||
| Entity entity = event.getBukkitEntity(); | ||
| if (entity == null) return; | ||
| Block block = entity.getLocation().getBlock(); | ||
| factions.unregisterVotingBooth(event.getPlayer(), block); | ||
| } | ||
| } |
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
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 |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| package net.tfminecraft.simplefactions.government; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
|
|
||
| import java.time.Instant; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| class ElectionCountdownTest { | ||
|
|
||
| @Test | ||
| void formatTimeUntil_countsWholeDaysAndHours() { | ||
| Instant now = Instant.parse("2026-09-21T08:15:00Z"); | ||
| Instant next = Instant.parse("2026-09-28T00:00:00Z"); | ||
| assertEquals("6d 15h", Government.formatTimeUntil(now, next)); | ||
| } | ||
|
|
||
| @Test | ||
| void formatTimeUntil_pastTargetIsZero() { | ||
| Instant now = Instant.parse("2026-09-28T08:15:00Z"); | ||
| Instant next = Instant.parse("2026-09-28T00:00:00Z"); | ||
| assertEquals("0d 0h", Government.formatTimeUntil(now, next)); | ||
| assertEquals("0d 0h", Government.formatTimeUntil(now, null)); | ||
| } | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package net.tfminecraft.simplefactions.government; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertFalse; | ||
| import static org.junit.jupiter.api.Assertions.assertNull; | ||
| import static org.junit.jupiter.api.Assertions.assertTrue; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| class VotingBlockTest { | ||
|
|
||
| @Test | ||
| void furnitureId_readsItemsAdderFurniturePath() { | ||
| assertEquals("tfmc:voting_booth", VotingBlock.furnitureId("iaf(tfmc:voting_booth)")); | ||
| assertEquals("tfmc:voting_booth", VotingBlock.furnitureId("iaf.tfmc:voting_booth")); | ||
| assertNull(VotingBlock.furnitureId("v(chiseled_bookshelf)")); | ||
| assertNull(VotingBlock.furnitureId(null)); | ||
| } | ||
|
|
||
| @Test | ||
| void matches_comparesNamespacedId() { | ||
| assertTrue(VotingBlock.matches("iaf(tfmc:voting_booth)", "tfmc:voting_booth")); | ||
| assertTrue(VotingBlock.matches("iaf(tfmc:voting_booth)", "TFMC:Voting_Booth")); | ||
| assertFalse(VotingBlock.matches("iaf(tfmc:voting_booth)", "tfmc:bank")); | ||
| assertFalse(VotingBlock.matches("v(chiseled_bookshelf)", "tfmc:voting_booth")); | ||
| } | ||
| } |
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.
Uh oh!
There was an error while loading. Please reload this page.