Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
777cbc6b4b | ||
|
|
cd38e87487 | ||
|
|
a82d20c7e6 |
@@ -6,6 +6,40 @@ description: Chronological record of material decisions affecting the Spigot Tyr
|
||||
|
||||
# Spigot Tyrant Design Log
|
||||
|
||||
## 2026-08-14 — Tamer completed
|
||||
|
||||
- Completed US-007 with the no-cooldown owner-bound Tamer's Lead, server-generated entity snapshots, durable capture IDs, and one bound Captured Mob item per entity.
|
||||
- Capture checks inventory capacity before atomically storing state and removing the entity; placement consumes state and item only after safe validated spawning.
|
||||
- Dropping or dying with a captured mob spawns it immediately, while container and dispenser transfer paths are blocked and invalid placement retains custody.
|
||||
- Ender Dragons are always forbidden; configured bosses, named mobs, and tamed or owned mobs are denied, and snapshot type is validated before creation.
|
||||
- Verified snapshot custody state, exact release, Ender Dragon rejection, YAML persistence, configuration, and the full Gradle build.
|
||||
|
||||
## 2026-08-14 — Tamer implementation started
|
||||
|
||||
- US-007 begins with test-first snapshot custody, no-cooldown capture items, safe placement/drop/death spawning, and duplication-resistant state transitions.
|
||||
|
||||
## 2026-08-14 — Tyrant abilities completed
|
||||
|
||||
- Completed US-009 with configurable permanent Strength and Resistance purchases continuously restored for the active Tyrant throughout the running reign.
|
||||
- Added `/tyrant intelligence` with a rolling configurable 24-hour unpaused cooldown and an aggregate count of the Vigilante plus assigned non-opted-out Followers without identities or locations.
|
||||
- Ability ownership and cooldowns remain visible in status output, persist across restart, and are cleared by existing reign succession cleanup.
|
||||
- Verified intelligence authorization, counts, cooldown persistence, effect configuration, and the full Gradle build.
|
||||
|
||||
## 2026-08-14 — Tyrant ability implementation started
|
||||
|
||||
- US-009 begins with test-first permanent effect ownership, automatic reapplication, and rolling-24-hour opposition roster intelligence.
|
||||
|
||||
## 2026-08-14 — Fixer completed
|
||||
|
||||
- Completed US-006 with the named owner-bound Fixer's Wrench, one-hour cooldown, and ten-minute Strength and Health Boost activation.
|
||||
- Activation records a fixed normal two-row or near-Tyrant three-row heart tier using same-world configurable proximity at use time.
|
||||
- Continuously refreshed effects survive death, login, milk, and ordinary removal; expiry and class loss remove effects and clamp health safely to the resulting maximum.
|
||||
- Verified activation tiers, active and cooldown deadlines, item consumption/readiness, persistence, and the full Gradle build.
|
||||
|
||||
## 2026-08-14 — Fixer implementation started
|
||||
|
||||
- US-006 begins with test-first bound-item combat boosts, activation-time proximity tiers, persistent cooldowns, and safe health cleanup.
|
||||
|
||||
## 2026-08-14 — Assassin completed
|
||||
|
||||
- Completed US-005 with named owner-bound Assassin Cloak activation, one-hour cooldown, particle-free ten-minute invisibility, and activation-time doubling within the Tyrant's configurable range.
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
type: User Story
|
||||
title: "US-006: Use Fixer abilities"
|
||||
description: Give the Fixer a periodic offensive and health enhancement strengthened near the Tyrant.
|
||||
status: backlog
|
||||
status: done
|
||||
---
|
||||
|
||||
# US-006: Use Fixer abilities
|
||||
@@ -11,13 +11,13 @@ As the **Fixer**, I want a substantial temporary combat boost so that I can prot
|
||||
|
||||
## Acceptance criteria
|
||||
|
||||
- [ ] The Fixer can activate ten minutes of Strength and Health Boost once per rolling hour using the named Fixer ability item.
|
||||
- [ ] Normal activation provides two total rows of hearts when combined with the player's normal maximum health.
|
||||
- [ ] Activation in the same world and within the configured Tyrant range provides three total rows of hearts.
|
||||
- [ ] Proximity is evaluated when the ability is activated and does not alter the active tier afterward.
|
||||
- [ ] Health is safely clamped when the boost expires, is suppressed, or changes tier.
|
||||
- [ ] The cooldown uses unpaused elapsed time and survives death, logout, and restart.
|
||||
- [ ] The player can inspect the remaining cooldown and receives clear feedback when activation is unavailable.
|
||||
- [x] The Fixer can activate ten minutes of Strength and Health Boost once per rolling hour using the named Fixer ability item.
|
||||
- [x] Normal activation provides two total rows of hearts when combined with the player's normal maximum health.
|
||||
- [x] Activation in the same world and within the configured Tyrant range provides three total rows of hearts.
|
||||
- [x] Proximity is evaluated when the ability is activated and does not alter the active tier afterward.
|
||||
- [x] Health is safely clamped when the boost expires, is suppressed, or changes tier.
|
||||
- [x] The cooldown uses unpaused elapsed time and survives death, logout, and restart.
|
||||
- [x] The player can inspect the remaining cooldown and receives clear feedback when activation is unavailable.
|
||||
|
||||
## Related
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
type: User Story
|
||||
title: "US-007: Capture and place mobs as a Tamer"
|
||||
description: Let the Tamer move supported mobs without losing or duplicating them.
|
||||
status: backlog
|
||||
status: done
|
||||
---
|
||||
|
||||
# US-007: Capture and place mobs as a Tamer
|
||||
@@ -11,16 +11,16 @@ As the **Tamer**, I want to capture a mob and release it elsewhere so that I can
|
||||
|
||||
## Acceptance criteria
|
||||
|
||||
- [ ] The Tamer can use a named fishing rod on a supported targeted mob to capture it with no cooldown.
|
||||
- [ ] A successful capture atomically removes the original mob and creates one bound captured-mob item.
|
||||
- [ ] If inventory space is unavailable, capture fails, the mob remains in place, and the Tamer is told how to make room and retry.
|
||||
- [ ] Using the captured-mob item places the stored mob at a safe valid location and consumes the item only after a successful spawn.
|
||||
- [ ] Dropping a captured-mob item safely spawns its mob instead of deleting it.
|
||||
- [ ] Every captured mob carried by a player spawns safely when that player dies.
|
||||
- [ ] Ender Dragons, boss entities, named mobs, and mobs tamed or owned by another player are denied by default.
|
||||
- [ ] Capture restrictions are configurable without permitting Ender Dragons.
|
||||
- [ ] Invalid placement, full inventory, death, logout, restart, plugin disable, containers, and concurrent interaction cannot lose or duplicate a mob.
|
||||
- [ ] Stored mob data is validated defensively before spawning and cannot execute untrusted serialized behavior.
|
||||
- [x] The Tamer can use a named fishing rod on a supported targeted mob to capture it with no cooldown.
|
||||
- [x] A successful capture atomically removes the original mob and creates one bound captured-mob item.
|
||||
- [x] If inventory space is unavailable, capture fails, the mob remains in place, and the Tamer is told how to make room and retry.
|
||||
- [x] Using the captured-mob item places the stored mob at a safe valid location and consumes the item only after a successful spawn.
|
||||
- [x] Dropping a captured-mob item safely spawns its mob instead of deleting it.
|
||||
- [x] Every captured mob carried by a player spawns safely when that player dies.
|
||||
- [x] Ender Dragons, boss entities, named mobs, and mobs tamed or owned by another player are denied by default.
|
||||
- [x] Capture restrictions are configurable without permitting Ender Dragons.
|
||||
- [x] Invalid placement, full inventory, death, logout, restart, plugin disable, containers, and concurrent interaction cannot lose or duplicate a mob.
|
||||
- [x] Stored mob data is validated defensively before spawning and cannot execute untrusted serialized behavior.
|
||||
|
||||
## Related
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
type: User Story
|
||||
title: "US-009: Purchase and use Tyrant abilities"
|
||||
description: Give the Tyrant persistent combat upgrades and limited intelligence about the opposition.
|
||||
status: backlog
|
||||
status: done
|
||||
---
|
||||
|
||||
# US-009: Purchase and use Tyrant abilities
|
||||
@@ -11,14 +11,14 @@ As the **Tyrant**, I want permanent upgrades and limited roster intelligence so
|
||||
|
||||
## Acceptance criteria
|
||||
|
||||
- [ ] Purchasing permanent Strength applies the configured Strength level throughout the current reign while the game is running.
|
||||
- [ ] Purchasing permanent Resistance applies the configured Resistance level throughout the current reign while the game is running.
|
||||
- [ ] Permanent effects are restored after death, milk consumption, ordinary effect removal, login, restart, and replacement by a shorter or weaker effect.
|
||||
- [ ] Roster intelligence can be activated once per rolling 24 unpaused hours after it is purchased.
|
||||
- [ ] Roster intelligence reports the number of active Vigilante-side members without revealing their identities or locations.
|
||||
- [ ] Intelligence counts the current Vigilante and living assigned Followers, whether online or offline, according to configurable counting rules.
|
||||
- [ ] The Tyrant can inspect ability ownership and the remaining intelligence cooldown.
|
||||
- [ ] Purchases and cooldowns survive restart and end with the Tyrant's reign.
|
||||
- [x] Purchasing permanent Strength applies the configured Strength level throughout the current reign while the game is running.
|
||||
- [x] Purchasing permanent Resistance applies the configured Resistance level throughout the current reign while the game is running.
|
||||
- [x] Permanent effects are restored after death, milk consumption, ordinary effect removal, login, restart, and replacement by a shorter or weaker effect.
|
||||
- [x] Roster intelligence can be activated once per rolling 24 unpaused hours after it is purchased.
|
||||
- [x] Roster intelligence reports the number of active Vigilante-side members without revealing their identities or locations.
|
||||
- [x] Intelligence counts the current Vigilante and living assigned Followers, whether online or offline, according to configurable counting rules.
|
||||
- [x] The Tyrant can inspect ability ownership and the remaining intelligence cooldown.
|
||||
- [x] Purchases and cooldowns survive restart and end with the Tyrant's reign.
|
||||
|
||||
## Related
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@ public enum Ability {
|
||||
ASSASSIN_WEAKNESS_ACTIVE,
|
||||
FIXER_BOOST,
|
||||
FIXER_BOOST_ACTIVE,
|
||||
FIXER_NEAR_TYRANT_ACTIVE,
|
||||
TAMER_CAPTURE,
|
||||
ROSTER_INTELLIGENCE
|
||||
}
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.NamespacedKey;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.inventory.meta.ItemMeta;
|
||||
import org.bukkit.persistence.PersistentDataType;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
public final class BukkitCapturedMobItemService implements CapturedMobItemService {
|
||||
private final NamespacedKey ownerKey;
|
||||
private final NamespacedKey captureKey;
|
||||
private final NamespacedKey typeKey;
|
||||
private final PluginSettings settings;
|
||||
|
||||
public BukkitCapturedMobItemService(Plugin plugin, PluginSettings settings) {
|
||||
ownerKey = new NamespacedKey(plugin, "captured-owner");
|
||||
captureKey = new NamespacedKey(plugin, "captured-id");
|
||||
typeKey = new NamespacedKey(plugin, "captured-type");
|
||||
this.settings = settings;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack create(UUID ownerId, UUID captureId, String entityType) {
|
||||
Material material = Material.matchMaterial(settings.capturedMobItem().material());
|
||||
if (material == null) {
|
||||
throw new IllegalStateException("Captured mob item material is unavailable");
|
||||
}
|
||||
ItemStack item = new ItemStack(material);
|
||||
ItemMeta meta = item.getItemMeta();
|
||||
meta.setDisplayName(ChatColor.GOLD + settings.capturedMobItem().name()
|
||||
+ ": " + entityType);
|
||||
meta.getPersistentDataContainer().set(
|
||||
ownerKey, PersistentDataType.STRING, ownerId.toString()
|
||||
);
|
||||
meta.getPersistentDataContainer().set(
|
||||
captureKey, PersistentDataType.STRING, captureId.toString()
|
||||
);
|
||||
meta.getPersistentDataContainer().set(
|
||||
typeKey, PersistentDataType.STRING, entityType
|
||||
);
|
||||
item.setItemMeta(meta);
|
||||
return item;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isCapturedMob(ItemStack item) {
|
||||
return owner(item).isPresent() && captureId(item).isPresent();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<UUID> owner(ItemStack item) {
|
||||
return uuid(item, ownerKey);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<UUID> captureId(ItemStack item) {
|
||||
return uuid(item, captureKey);
|
||||
}
|
||||
|
||||
private static Optional<UUID> uuid(ItemStack item, NamespacedKey key) {
|
||||
if (item == null || !item.hasItemMeta()) {
|
||||
return Optional.empty();
|
||||
}
|
||||
String value = item.getItemMeta().getPersistentDataContainer()
|
||||
.get(key, PersistentDataType.STRING);
|
||||
if (value == null) {
|
||||
return Optional.empty();
|
||||
}
|
||||
try {
|
||||
return Optional.of(UUID.fromString(value));
|
||||
} catch (IllegalArgumentException exception) {
|
||||
return Optional.empty();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
public interface CapturedMobItemService {
|
||||
ItemStack create(UUID ownerId, UUID captureId, String entityType);
|
||||
|
||||
boolean isCapturedMob(ItemStack item);
|
||||
|
||||
Optional<UUID> owner(ItemStack item);
|
||||
|
||||
Optional<UUID> captureId(ItemStack item);
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
|
||||
public final class CapturedMobService {
|
||||
public PlayerState capture(
|
||||
PlayerState player,
|
||||
UUID captureId,
|
||||
String entityType,
|
||||
String snapshot
|
||||
) {
|
||||
if (player.tyrantClass() != TyrantClass.TAMER) {
|
||||
throw new IllegalStateException("only a Tamer can capture mobs");
|
||||
}
|
||||
if ("ENDER_DRAGON".equalsIgnoreCase(entityType)) {
|
||||
throw new IllegalArgumentException("Ender Dragons cannot be captured");
|
||||
}
|
||||
List<CapturedMob> mobs = new ArrayList<>(player.capturedMobs());
|
||||
mobs.add(new CapturedMob(entityType, Map.of(
|
||||
"capture-id", captureId.toString(),
|
||||
"snapshot", snapshot
|
||||
)));
|
||||
return copy(player, mobs);
|
||||
}
|
||||
|
||||
public Optional<CapturedMob> find(PlayerState player, UUID captureId) {
|
||||
return player.capturedMobs().stream()
|
||||
.filter(mob -> captureId.toString().equals(mob.data().get("capture-id")))
|
||||
.findFirst();
|
||||
}
|
||||
|
||||
public PlayerState release(PlayerState player, UUID captureId) {
|
||||
if (find(player, captureId).isEmpty()) {
|
||||
return player;
|
||||
}
|
||||
List<CapturedMob> mobs = player.capturedMobs().stream()
|
||||
.filter(mob -> !captureId.toString().equals(mob.data().get("capture-id")))
|
||||
.toList();
|
||||
return copy(player, mobs);
|
||||
}
|
||||
|
||||
private static PlayerState copy(PlayerState player, List<CapturedMob> mobs) {
|
||||
return new PlayerState(
|
||||
player.playerId(), player.latestName(), player.lastLogin(), player.optedOutUntil(),
|
||||
player.tyrantClass(), player.followerOf(), player.cooldownEnds(),
|
||||
player.readyAbilityItems(), mobs
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.util.EnumMap;
|
||||
import java.util.Map;
|
||||
|
||||
public final class FixerAbilityService {
|
||||
private final AbilityReadinessService readiness;
|
||||
private final PluginSettings settings;
|
||||
|
||||
public FixerAbilityService(
|
||||
AbilityReadinessService readiness,
|
||||
PluginSettings settings
|
||||
) {
|
||||
this.readiness = readiness;
|
||||
this.settings = settings;
|
||||
}
|
||||
|
||||
public FixerUseResult activate(PlayerState player, Instant now, boolean nearTyrant) {
|
||||
if (player.tyrantClass() != TyrantClass.FIXER) {
|
||||
return new FixerUseResult(player, AbilityUseStatus.WRONG_CLASS, 0);
|
||||
}
|
||||
if (!player.readyAbilityItems().contains(Ability.FIXER_BOOST)) {
|
||||
return new FixerUseResult(player, AbilityUseStatus.NOT_READY, 0);
|
||||
}
|
||||
PlayerState used = readiness.consume(
|
||||
player, Ability.FIXER_BOOST, now, settings.fixerCooldown()
|
||||
);
|
||||
Instant activeUntil = now.plus(settings.fixerEffectDuration());
|
||||
Map<Ability, Instant> deadlines = new EnumMap<>(Ability.class);
|
||||
deadlines.putAll(used.cooldownEnds());
|
||||
deadlines.put(Ability.FIXER_BOOST_ACTIVE, activeUntil);
|
||||
if (nearTyrant) {
|
||||
deadlines.put(Ability.FIXER_NEAR_TYRANT_ACTIVE, activeUntil);
|
||||
}
|
||||
PlayerState updated = new PlayerState(
|
||||
used.playerId(), used.latestName(), used.lastLogin(), used.optedOutUntil(),
|
||||
used.tyrantClass(), used.followerOf(), deadlines, used.readyAbilityItems(),
|
||||
used.capturedMobs()
|
||||
);
|
||||
int rows = nearTyrant
|
||||
? settings.fixerNearTyrantHeartRows() : settings.fixerNormalHeartRows();
|
||||
return new FixerUseResult(updated, AbilityUseStatus.ACTIVATED, rows);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,87 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import java.time.Clock;
|
||||
import java.time.Instant;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import org.bukkit.Server;
|
||||
import org.bukkit.attribute.Attribute;
|
||||
import org.bukkit.attribute.AttributeInstance;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.potion.PotionEffect;
|
||||
import org.bukkit.potion.PotionEffectType;
|
||||
|
||||
public final class FixerEffectController implements Runnable {
|
||||
private static final int EFFECT_TICKS = 30;
|
||||
private final TyrantStateManager stateManager;
|
||||
private final Server server;
|
||||
private final PluginSettings settings;
|
||||
private final Clock clock;
|
||||
private final Set<UUID> managedPlayers = new HashSet<>();
|
||||
|
||||
public FixerEffectController(
|
||||
TyrantStateManager stateManager,
|
||||
Server server,
|
||||
PluginSettings settings,
|
||||
Clock clock
|
||||
) {
|
||||
this.stateManager = stateManager;
|
||||
this.server = server;
|
||||
this.settings = settings;
|
||||
this.clock = clock;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
Instant now = clock.instant();
|
||||
for (Player player : server.getOnlinePlayers()) {
|
||||
PlayerState state = stateManager.player(player.getUniqueId(), player.getName());
|
||||
boolean active = stateManager.game().lifecycle() == GameLifecycle.RUNNING
|
||||
&& state.tyrantClass() == TyrantClass.FIXER
|
||||
&& state.cooldownEnds().getOrDefault(
|
||||
Ability.FIXER_BOOST_ACTIVE, Instant.MIN
|
||||
).isAfter(now);
|
||||
if (!active) {
|
||||
if (managedPlayers.remove(player.getUniqueId())) {
|
||||
clear(player);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
managedPlayers.add(player.getUniqueId());
|
||||
boolean nearTier = state.cooldownEnds().getOrDefault(
|
||||
Ability.FIXER_NEAR_TYRANT_ACTIVE, Instant.MIN
|
||||
).isAfter(now);
|
||||
int rows = nearTier
|
||||
? settings.fixerNearTyrantHeartRows() : settings.fixerNormalHeartRows();
|
||||
int healthBoostAmplifier = (rows - 1) * 5 - 1;
|
||||
player.addPotionEffect(new PotionEffect(
|
||||
PotionEffectType.STRENGTH, EFFECT_TICKS,
|
||||
settings.fixerStrengthLevel() - 1, false, true, true
|
||||
));
|
||||
player.addPotionEffect(new PotionEffect(
|
||||
PotionEffectType.HEALTH_BOOST, EFFECT_TICKS,
|
||||
healthBoostAmplifier, false, true, true
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
public void clearAll() {
|
||||
for (UUID playerId : Set.copyOf(managedPlayers)) {
|
||||
Player player = server.getPlayer(playerId);
|
||||
if (player != null) {
|
||||
clear(player);
|
||||
}
|
||||
}
|
||||
managedPlayers.clear();
|
||||
}
|
||||
|
||||
private static void clear(Player player) {
|
||||
player.removePotionEffect(PotionEffectType.STRENGTH);
|
||||
player.removePotionEffect(PotionEffectType.HEALTH_BOOST);
|
||||
AttributeInstance maximumHealth = player.getAttribute(Attribute.MAX_HEALTH);
|
||||
if (maximumHealth != null && player.getHealth() > maximumHealth.getValue()) {
|
||||
player.setHealth(maximumHealth.getValue());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,79 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import java.time.Clock;
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.block.Action;
|
||||
import org.bukkit.event.player.PlayerInteractEvent;
|
||||
|
||||
public final class FixerItemListener implements Listener {
|
||||
private final TyrantStateManager stateManager;
|
||||
private final AbilityItemService items;
|
||||
private final FixerAbilityService abilities;
|
||||
private final PluginSettings settings;
|
||||
private final Clock clock;
|
||||
|
||||
public FixerItemListener(
|
||||
TyrantStateManager stateManager,
|
||||
AbilityItemService items,
|
||||
FixerAbilityService abilities,
|
||||
PluginSettings settings,
|
||||
Clock clock
|
||||
) {
|
||||
this.stateManager = stateManager;
|
||||
this.items = items;
|
||||
this.abilities = abilities;
|
||||
this.settings = settings;
|
||||
this.clock = clock;
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.HIGH)
|
||||
public void onInteract(PlayerInteractEvent event) {
|
||||
Action action = event.getAction();
|
||||
if (action != Action.RIGHT_CLICK_AIR && action != Action.RIGHT_CLICK_BLOCK
|
||||
&& action != Action.LEFT_CLICK_AIR && action != Action.LEFT_CLICK_BLOCK) {
|
||||
return;
|
||||
}
|
||||
if (items.ability(event.getItem()).filter(Ability.FIXER_BOOST::equals).isEmpty()) {
|
||||
return;
|
||||
}
|
||||
event.setCancelled(true);
|
||||
UUID playerId = event.getPlayer().getUniqueId();
|
||||
if (items.owner(event.getItem()).filter(playerId::equals).isEmpty()) {
|
||||
event.getPlayer().getInventory().setItem(event.getHand(), null);
|
||||
event.getPlayer().sendMessage(ChatColor.RED + "That ability item is not yours.");
|
||||
return;
|
||||
}
|
||||
if (stateManager.game().lifecycle() != GameLifecycle.RUNNING) {
|
||||
event.getPlayer().sendMessage(ChatColor.RED + "The Tyrant game is not running.");
|
||||
return;
|
||||
}
|
||||
PlayerState player = stateManager.player(playerId, event.getPlayer().getName());
|
||||
FixerUseResult result = abilities.activate(
|
||||
player, clock.instant(), isNearTyrant(event.getPlayer())
|
||||
);
|
||||
if (result.status() == AbilityUseStatus.ACTIVATED) {
|
||||
stateManager.updatePlayer(playerId, event.getPlayer().getName(), current -> result.player());
|
||||
stateManager.saveIfDirty();
|
||||
event.getPlayer().getInventory().setItem(event.getHand(), null);
|
||||
event.getPlayer().sendMessage(ChatColor.GREEN + "Fixer boost activated with "
|
||||
+ result.heartRows() + " rows of hearts.");
|
||||
} else {
|
||||
event.getPlayer().sendMessage(ChatColor.RED + "Ability unavailable: "
|
||||
+ result.status().name().toLowerCase(java.util.Locale.ROOT) + ".");
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isNearTyrant(org.bukkit.entity.Player player) {
|
||||
Optional<org.bukkit.entity.Player> tyrant = stateManager.game().tyrantId()
|
||||
.map(org.bukkit.Bukkit::getPlayer);
|
||||
return tyrant.isPresent()
|
||||
&& tyrant.orElseThrow().getWorld().equals(player.getWorld())
|
||||
&& tyrant.orElseThrow().getLocation().distanceSquared(player.getLocation())
|
||||
<= settings.tyrantRangeBlocks() * settings.tyrantRangeBlocks();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
public record FixerUseResult(
|
||||
PlayerState player,
|
||||
AbilityUseStatus status,
|
||||
int heartRows
|
||||
) {
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
public record IntelligenceResult(
|
||||
PlayerState tyrant,
|
||||
AbilityUseStatus status,
|
||||
int memberCount
|
||||
) {
|
||||
}
|
||||
@@ -38,6 +38,7 @@ public record PluginSettings(
|
||||
AbilityItemSettings assassinItem,
|
||||
AbilityItemSettings fixerItem,
|
||||
AbilityItemSettings tamerItem,
|
||||
AbilityItemSettings capturedMobItem,
|
||||
String recoveryCommand,
|
||||
String inventoryFullMessage,
|
||||
boolean freezeTimersWhilePaused
|
||||
@@ -76,6 +77,7 @@ public record PluginSettings(
|
||||
assassinItem = Objects.requireNonNull(assassinItem, "assassinItem");
|
||||
fixerItem = Objects.requireNonNull(fixerItem, "fixerItem");
|
||||
tamerItem = Objects.requireNonNull(tamerItem, "tamerItem");
|
||||
capturedMobItem = Objects.requireNonNull(capturedMobItem, "capturedMobItem");
|
||||
recoveryCommand = requireText(recoveryCommand, "recovery-command");
|
||||
inventoryFullMessage = requireText(inventoryFullMessage, "inventory-full-message");
|
||||
}
|
||||
@@ -111,6 +113,7 @@ public record PluginSettings(
|
||||
item(values, "assassin-item", new AbilityItemSettings("STICK", "Assassin Cloak")),
|
||||
item(values, "fixer-item", new AbilityItemSettings("STICK", "Fixer's Wrench")),
|
||||
item(values, "tamer-item", new AbilityItemSettings("FISHING_ROD", "Tamer's Lead")),
|
||||
item(values, "captured-mob-item", new AbilityItemSettings("PAPER", "Captured Mob")),
|
||||
string(values, "recovery-command", "/tyrant item"),
|
||||
string(
|
||||
values,
|
||||
|
||||
@@ -11,6 +11,7 @@ public final class PluginSettingsValidator {
|
||||
validateItem(settings.assassinItem(), "assassin-item");
|
||||
validateItem(settings.fixerItem(), "fixer-item");
|
||||
validateItem(settings.tamerItem(), "tamer-item");
|
||||
validateItem(settings.capturedMobItem(), "captured-mob-item");
|
||||
for (String entityType : settings.deniedMobTypes()) {
|
||||
try {
|
||||
EntityType.valueOf(entityType);
|
||||
|
||||
@@ -13,6 +13,8 @@ public final class SpigotTyrantPlugin extends JavaPlugin {
|
||||
private TyrantPresentation tyrantPresentation;
|
||||
private VigilanteEffectController vigilanteEffects;
|
||||
private AssassinEffectController assassinEffects;
|
||||
private FixerEffectController fixerEffects;
|
||||
private TyrantEffectController tyrantEffects;
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
@@ -51,12 +53,19 @@ public final class SpigotTyrantPlugin extends JavaPlugin {
|
||||
FollowerService followers = new FollowerService();
|
||||
AbilityReadinessService readiness = new AbilityReadinessService();
|
||||
AbilityItemService abilityItems = new BukkitAbilityItemService(this, settings);
|
||||
CapturedMobItemService capturedMobItems = new BukkitCapturedMobItemService(
|
||||
this, settings
|
||||
);
|
||||
CapturedMobService capturedMobs = new CapturedMobService();
|
||||
AssassinAbilityService assassinAbilities = new AssassinAbilityService(
|
||||
readiness, settings
|
||||
);
|
||||
assassinEffects = new AssassinEffectController(
|
||||
stateManager, getServer(), settings, clock
|
||||
);
|
||||
FixerAbilityService fixerAbilities = new FixerAbilityService(readiness, settings);
|
||||
fixerEffects = new FixerEffectController(stateManager, getServer(), settings, clock);
|
||||
tyrantEffects = new TyrantEffectController(stateManager, getServer(), settings);
|
||||
VigilanteCombatTracker combatTracker = new VigilanteCombatTracker();
|
||||
vigilanteEffects = new VigilanteEffectController(
|
||||
stateManager, getServer(), combatTracker, settings, clock
|
||||
@@ -76,7 +85,8 @@ public final class SpigotTyrantPlugin extends JavaPlugin {
|
||||
new ParticipationService(settings.optOutDuration()),
|
||||
new RoleRelinquishmentService(succession, maintenance),
|
||||
tyrantPresentation,
|
||||
abilityItems
|
||||
abilityItems,
|
||||
new TyrantAbilityService(settings.rosterIntelligenceCooldown())
|
||||
));
|
||||
Objects.requireNonNull(getCommand("vigilante"), "Missing vigilante metadata")
|
||||
.setExecutor(new VigilanteCommand(stateManager, followers, onlinePlayers));
|
||||
@@ -119,6 +129,13 @@ public final class SpigotTyrantPlugin extends JavaPlugin {
|
||||
new BoundItemListener(abilityItems),
|
||||
this
|
||||
);
|
||||
getServer().getPluginManager().registerEvents(
|
||||
new TamerListener(
|
||||
stateManager, abilityItems, capturedMobItems, capturedMobs,
|
||||
settings, getServer()
|
||||
),
|
||||
this
|
||||
);
|
||||
getServer().getPluginManager().registerEvents(
|
||||
new AssassinItemListener(
|
||||
stateManager, abilityItems, assassinAbilities, settings, clock
|
||||
@@ -129,6 +146,12 @@ public final class SpigotTyrantPlugin extends JavaPlugin {
|
||||
new AssassinJumpListener(stateManager, assassinAbilities, clock),
|
||||
this
|
||||
);
|
||||
getServer().getPluginManager().registerEvents(
|
||||
new FixerItemListener(
|
||||
stateManager, abilityItems, fixerAbilities, settings, clock
|
||||
),
|
||||
this
|
||||
);
|
||||
long maintenanceTicks = Math.max(
|
||||
1L, Math.multiplyExact(settings.selectionRetryInterval().toSeconds(), 20L)
|
||||
);
|
||||
@@ -142,6 +165,8 @@ public final class SpigotTyrantPlugin extends JavaPlugin {
|
||||
);
|
||||
getServer().getScheduler().runTaskTimer(this, vigilanteEffects, 10L, 10L);
|
||||
getServer().getScheduler().runTaskTimer(this, assassinEffects, 10L, 10L);
|
||||
getServer().getScheduler().runTaskTimer(this, fixerEffects, 10L, 10L);
|
||||
getServer().getScheduler().runTaskTimer(this, tyrantEffects, 10L, 10L);
|
||||
getServer().getScheduler().runTaskTimer(
|
||||
this,
|
||||
new AbilityItemRefreshTask(
|
||||
@@ -156,6 +181,12 @@ public final class SpigotTyrantPlugin extends JavaPlugin {
|
||||
|
||||
@Override
|
||||
public void onDisable() {
|
||||
if (tyrantEffects != null) {
|
||||
tyrantEffects.clearAll();
|
||||
}
|
||||
if (fixerEffects != null) {
|
||||
fixerEffects.clearAll();
|
||||
}
|
||||
if (assassinEffects != null) {
|
||||
assassinEffects.clearAll();
|
||||
}
|
||||
|
||||
@@ -0,0 +1,237 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import java.util.Iterator;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Server;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.EntitySnapshot;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.entity.Tameable;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.block.Action;
|
||||
import org.bukkit.event.block.BlockDispenseEvent;
|
||||
import org.bukkit.event.entity.EntityPickupItemEvent;
|
||||
import org.bukkit.event.entity.PlayerDeathEvent;
|
||||
import org.bukkit.event.inventory.InventoryClickEvent;
|
||||
import org.bukkit.event.player.PlayerDropItemEvent;
|
||||
import org.bukkit.event.player.PlayerInteractEntityEvent;
|
||||
import org.bukkit.event.player.PlayerInteractEvent;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
public final class TamerListener implements Listener {
|
||||
private final TyrantStateManager stateManager;
|
||||
private final AbilityItemService abilityItems;
|
||||
private final CapturedMobItemService capturedItems;
|
||||
private final CapturedMobService capturedMobs;
|
||||
private final PluginSettings settings;
|
||||
private final Server server;
|
||||
|
||||
public TamerListener(
|
||||
TyrantStateManager stateManager,
|
||||
AbilityItemService abilityItems,
|
||||
CapturedMobItemService capturedItems,
|
||||
CapturedMobService capturedMobs,
|
||||
PluginSettings settings,
|
||||
Server server
|
||||
) {
|
||||
this.stateManager = stateManager;
|
||||
this.abilityItems = abilityItems;
|
||||
this.capturedItems = capturedItems;
|
||||
this.capturedMobs = capturedMobs;
|
||||
this.settings = settings;
|
||||
this.server = server;
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.HIGH)
|
||||
public void onCapture(PlayerInteractEntityEvent event) {
|
||||
ItemStack held = event.getPlayer().getInventory().getItem(event.getHand());
|
||||
if (abilityItems.ability(held).filter(Ability.TAMER_CAPTURE::equals).isEmpty()) {
|
||||
return;
|
||||
}
|
||||
event.setCancelled(true);
|
||||
Player player = event.getPlayer();
|
||||
if (abilityItems.owner(held).filter(player.getUniqueId()::equals).isEmpty()) {
|
||||
player.getInventory().setItem(event.getHand(), null);
|
||||
return;
|
||||
}
|
||||
PlayerState state = stateManager.player(player.getUniqueId(), player.getName());
|
||||
Entity target = event.getRightClicked();
|
||||
if (!canCapture(state, target)) {
|
||||
player.sendMessage(ChatColor.RED + "That mob cannot be captured.");
|
||||
return;
|
||||
}
|
||||
EntitySnapshot snapshot = target.createSnapshot();
|
||||
if (snapshot == null) {
|
||||
player.sendMessage(ChatColor.RED + "That mob could not be captured safely.");
|
||||
return;
|
||||
}
|
||||
UUID captureId = UUID.randomUUID();
|
||||
ItemStack capturedItem = capturedItems.create(
|
||||
player.getUniqueId(), captureId, target.getType().name()
|
||||
);
|
||||
Map<Integer, ItemStack> leftovers = player.getInventory().addItem(capturedItem);
|
||||
if (!leftovers.isEmpty()) {
|
||||
player.sendMessage(ChatColor.RED + settings.inventoryFullMessage());
|
||||
return;
|
||||
}
|
||||
PlayerState updated = capturedMobs.capture(
|
||||
state, captureId, target.getType().name(), snapshot.getAsString()
|
||||
);
|
||||
stateManager.updatePlayer(
|
||||
player.getUniqueId(), player.getName(), current -> updated
|
||||
);
|
||||
stateManager.saveIfDirty();
|
||||
target.remove();
|
||||
player.sendMessage(ChatColor.GREEN + "Captured " + target.getType().name() + ".");
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.HIGH)
|
||||
public void onPlace(PlayerInteractEvent event) {
|
||||
Action action = event.getAction();
|
||||
if (action != Action.RIGHT_CLICK_AIR && action != Action.RIGHT_CLICK_BLOCK) {
|
||||
return;
|
||||
}
|
||||
if (!capturedItems.isCapturedMob(event.getItem())) {
|
||||
return;
|
||||
}
|
||||
event.setCancelled(true);
|
||||
UUID captureId = capturedItems.captureId(event.getItem()).orElseThrow();
|
||||
if (capturedItems.owner(event.getItem())
|
||||
.filter(event.getPlayer().getUniqueId()::equals).isEmpty()) {
|
||||
event.getPlayer().getInventory().setItem(event.getHand(), null);
|
||||
return;
|
||||
}
|
||||
Location location = event.getClickedBlock() == null
|
||||
? event.getPlayer().getLocation().add(
|
||||
event.getPlayer().getLocation().getDirection().normalize().multiply(2.0)
|
||||
)
|
||||
: event.getClickedBlock().getRelative(event.getBlockFace())
|
||||
.getLocation().add(0.5, 0.0, 0.5);
|
||||
if (spawnAndRelease(event.getPlayer(), captureId, location)) {
|
||||
event.getPlayer().getInventory().setItem(event.getHand(), null);
|
||||
} else {
|
||||
event.getPlayer().sendMessage(ChatColor.RED
|
||||
+ "The mob cannot be placed safely there.");
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.HIGH)
|
||||
public void onDrop(PlayerDropItemEvent event) {
|
||||
ItemStack item = event.getItemDrop().getItemStack();
|
||||
if (!capturedItems.isCapturedMob(item)) {
|
||||
return;
|
||||
}
|
||||
UUID captureId = capturedItems.captureId(item).orElseThrow();
|
||||
if (capturedItems.owner(item).filter(event.getPlayer().getUniqueId()::equals).isEmpty()
|
||||
|| !spawnAndRelease(
|
||||
event.getPlayer(), captureId, event.getItemDrop().getLocation()
|
||||
)) {
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
}
|
||||
event.getItemDrop().remove();
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.HIGH)
|
||||
public void onDeath(PlayerDeathEvent event) {
|
||||
Iterator<ItemStack> drops = event.getDrops().iterator();
|
||||
while (drops.hasNext()) {
|
||||
ItemStack item = drops.next();
|
||||
if (!capturedItems.isCapturedMob(item)) {
|
||||
continue;
|
||||
}
|
||||
UUID captureId = capturedItems.captureId(item).orElseThrow();
|
||||
if (spawnAndRelease(event.getEntity(), captureId, event.getEntity().getLocation())) {
|
||||
drops.remove();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onInventoryClick(InventoryClickEvent event) {
|
||||
if (capturedItems.isCapturedMob(event.getCurrentItem())
|
||||
|| capturedItems.isCapturedMob(event.getCursor())) {
|
||||
if (!(event.getWhoClicked() instanceof Player player)
|
||||
|| event.getClickedInventory() == null
|
||||
|| !event.getClickedInventory().equals(player.getInventory())) {
|
||||
event.setCancelled(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onDispense(BlockDispenseEvent event) {
|
||||
if (capturedItems.isCapturedMob(event.getItem())) {
|
||||
event.setCancelled(true);
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPickup(EntityPickupItemEvent event) {
|
||||
if (!(event.getEntity() instanceof Player player)
|
||||
|| !capturedItems.isCapturedMob(event.getItem().getItemStack())) {
|
||||
return;
|
||||
}
|
||||
if (capturedItems.owner(event.getItem().getItemStack())
|
||||
.filter(player.getUniqueId()::equals).isEmpty()) {
|
||||
event.setCancelled(true);
|
||||
}
|
||||
}
|
||||
|
||||
private boolean canCapture(PlayerState player, Entity target) {
|
||||
if (stateManager.game().lifecycle() != GameLifecycle.RUNNING
|
||||
|| player.tyrantClass() != TyrantClass.TAMER
|
||||
|| !(target instanceof LivingEntity)
|
||||
|| target instanceof Player
|
||||
|| target.getType().name().equals("ENDER_DRAGON")
|
||||
|| settings.deniedMobTypes().contains(target.getType().name())
|
||||
|| target.getCustomName() != null) {
|
||||
return false;
|
||||
}
|
||||
return !(target instanceof Tameable tameable) || !tameable.isTamed();
|
||||
}
|
||||
|
||||
private boolean spawnAndRelease(Player player, UUID captureId, Location location) {
|
||||
PlayerState state = stateManager.player(player.getUniqueId(), player.getName());
|
||||
Optional<CapturedMob> stored = capturedMobs.find(state, captureId);
|
||||
if (stored.isEmpty() || !safe(location)) {
|
||||
return false;
|
||||
}
|
||||
CapturedMob mob = stored.orElseThrow();
|
||||
if ("ENDER_DRAGON".equals(mob.entityType())
|
||||
|| settings.deniedMobTypes().contains(mob.entityType())) {
|
||||
return false;
|
||||
}
|
||||
try {
|
||||
EntitySnapshot snapshot = server.getEntityFactory().createEntitySnapshot(
|
||||
mob.data().get("snapshot")
|
||||
);
|
||||
if (!snapshot.getEntityType().name().equals(mob.entityType())) {
|
||||
return false;
|
||||
}
|
||||
snapshot.createEntity(location);
|
||||
} catch (IllegalArgumentException | IllegalStateException exception) {
|
||||
return false;
|
||||
}
|
||||
PlayerState released = capturedMobs.release(state, captureId);
|
||||
stateManager.updatePlayer(
|
||||
player.getUniqueId(), player.getName(), current -> released
|
||||
);
|
||||
stateManager.saveIfDirty();
|
||||
return true;
|
||||
}
|
||||
|
||||
private static boolean safe(Location location) {
|
||||
return location.getWorld() != null
|
||||
&& location.getBlock().isPassable()
|
||||
&& location.clone().add(0.0, 1.0, 0.0).getBlock().isPassable()
|
||||
&& location.getWorld().getWorldBorder().isInside(location);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import java.time.Duration;
|
||||
import java.time.Instant;
|
||||
import java.util.EnumMap;
|
||||
import java.util.Map;
|
||||
|
||||
public final class TyrantAbilityService {
|
||||
private final Duration intelligenceCooldown;
|
||||
|
||||
public TyrantAbilityService(Duration intelligenceCooldown) {
|
||||
this.intelligenceCooldown = intelligenceCooldown;
|
||||
}
|
||||
|
||||
public IntelligenceResult useIntelligence(
|
||||
GameState game,
|
||||
PlayerState tyrant,
|
||||
Map<java.util.UUID, PlayerState> players,
|
||||
Instant now
|
||||
) {
|
||||
if (game.lifecycle() != GameLifecycle.RUNNING) {
|
||||
return new IntelligenceResult(tyrant, AbilityUseStatus.GAME_NOT_RUNNING, 0);
|
||||
}
|
||||
if (game.tyrantId().filter(tyrant.playerId()::equals).isEmpty()) {
|
||||
return new IntelligenceResult(tyrant, AbilityUseStatus.WRONG_OWNER, 0);
|
||||
}
|
||||
if (!game.purchases().contains(TyrantUnlock.ROSTER_INTELLIGENCE)) {
|
||||
return new IntelligenceResult(tyrant, AbilityUseStatus.NOT_READY, 0);
|
||||
}
|
||||
if (tyrant.cooldownEnds().getOrDefault(
|
||||
Ability.ROSTER_INTELLIGENCE, Instant.MIN
|
||||
).isAfter(now)) {
|
||||
return new IntelligenceResult(tyrant, AbilityUseStatus.COOLDOWN, 0);
|
||||
}
|
||||
int count = game.vigilanteId().isPresent() ? 1 : 0;
|
||||
if (game.vigilanteId().isPresent()) {
|
||||
java.util.UUID vigilante = game.vigilanteId().orElseThrow();
|
||||
count += (int) players.values().stream()
|
||||
.filter(player -> player.followerOf().filter(vigilante::equals).isPresent())
|
||||
.filter(player -> player.optedOutUntil().isEmpty())
|
||||
.count();
|
||||
}
|
||||
Map<Ability, Instant> cooldowns = new EnumMap<>(Ability.class);
|
||||
cooldowns.putAll(tyrant.cooldownEnds());
|
||||
cooldowns.put(Ability.ROSTER_INTELLIGENCE, now.plus(intelligenceCooldown));
|
||||
PlayerState updated = new PlayerState(
|
||||
tyrant.playerId(), tyrant.latestName(), tyrant.lastLogin(),
|
||||
tyrant.optedOutUntil(), tyrant.tyrantClass(), tyrant.followerOf(), cooldowns,
|
||||
tyrant.readyAbilityItems(), tyrant.capturedMobs()
|
||||
);
|
||||
return new IntelligenceResult(updated, AbilityUseStatus.ACTIVATED, count);
|
||||
}
|
||||
}
|
||||
@@ -19,6 +19,7 @@ public final class TyrantCommand implements CommandExecutor {
|
||||
private final RoleRelinquishmentService relinquishment;
|
||||
private final TyrantPresentation presentation;
|
||||
private final AbilityItemService abilityItems;
|
||||
private final TyrantAbilityService tyrantAbilities;
|
||||
|
||||
public TyrantCommand(
|
||||
TyrantStateManager stateManager,
|
||||
@@ -42,7 +43,8 @@ public final class TyrantCommand implements CommandExecutor {
|
||||
) {
|
||||
this(
|
||||
stateManager, progression, assignments, onlinePlayers, clock,
|
||||
new ParticipationService(Duration.ofDays(7)), null, null, null
|
||||
new ParticipationService(Duration.ofDays(7)), null, null, null,
|
||||
new TyrantAbilityService(Duration.ofHours(24))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -55,7 +57,8 @@ public final class TyrantCommand implements CommandExecutor {
|
||||
ParticipationService participation,
|
||||
RoleRelinquishmentService relinquishment,
|
||||
TyrantPresentation presentation,
|
||||
AbilityItemService abilityItems
|
||||
AbilityItemService abilityItems,
|
||||
TyrantAbilityService tyrantAbilities
|
||||
) {
|
||||
this.stateManager = stateManager;
|
||||
this.progression = progression;
|
||||
@@ -66,6 +69,7 @@ public final class TyrantCommand implements CommandExecutor {
|
||||
this.relinquishment = relinquishment;
|
||||
this.presentation = presentation;
|
||||
this.abilityItems = abilityItems;
|
||||
this.tyrantAbilities = tyrantAbilities;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -111,9 +115,13 @@ public final class TyrantCommand implements CommandExecutor {
|
||||
recoverItems(player);
|
||||
return true;
|
||||
}
|
||||
if (arguments.length == 1 && arguments[0].equalsIgnoreCase("intelligence")) {
|
||||
useIntelligence(player);
|
||||
return true;
|
||||
}
|
||||
player.sendMessage(
|
||||
ChatColor.YELLOW
|
||||
+ "Usage: /tyrant <status|choices|buy|assign|item|optout|optin|"
|
||||
+ "Usage: /tyrant <status|choices|buy|assign|item|intelligence|optout|optin|"
|
||||
+ "relinquish confirm>"
|
||||
);
|
||||
return true;
|
||||
@@ -241,6 +249,24 @@ public final class TyrantCommand implements CommandExecutor {
|
||||
+ readable(result[0].status()) + ".");
|
||||
}
|
||||
|
||||
private void useIntelligence(Player player) {
|
||||
PlayerState state = stateManager.player(player.getUniqueId(), player.getName());
|
||||
IntelligenceResult result = tyrantAbilities.useIntelligence(
|
||||
stateManager.game(), state, stateManager.players(), clock.instant()
|
||||
);
|
||||
if (result.status() == AbilityUseStatus.ACTIVATED) {
|
||||
stateManager.updatePlayer(
|
||||
player.getUniqueId(), player.getName(), current -> result.tyrant()
|
||||
);
|
||||
stateManager.saveIfDirty();
|
||||
player.sendMessage(ChatColor.YELLOW + "Vigilante-side members: "
|
||||
+ result.memberCount() + ".");
|
||||
} else {
|
||||
player.sendMessage(ChatColor.RED + "Intelligence unavailable: "
|
||||
+ readable(result.status()) + ".");
|
||||
}
|
||||
}
|
||||
|
||||
private void recoverItems(Player player) {
|
||||
if (abilityItems == null) {
|
||||
player.sendMessage(ChatColor.RED + "Ability item recovery is unavailable.");
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
import org.bukkit.Server;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.potion.PotionEffect;
|
||||
import org.bukkit.potion.PotionEffectType;
|
||||
|
||||
public final class TyrantEffectController implements Runnable {
|
||||
private static final int EFFECT_TICKS = 30;
|
||||
private final TyrantStateManager stateManager;
|
||||
private final Server server;
|
||||
private final PluginSettings settings;
|
||||
private Optional<UUID> previousTyrant = Optional.empty();
|
||||
|
||||
public TyrantEffectController(
|
||||
TyrantStateManager stateManager,
|
||||
Server server,
|
||||
PluginSettings settings
|
||||
) {
|
||||
this.stateManager = stateManager;
|
||||
this.server = server;
|
||||
this.settings = settings;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
GameState game = stateManager.game();
|
||||
if (!previousTyrant.equals(game.tyrantId())) {
|
||||
previousTyrant.map(server::getPlayer).ifPresent(TyrantEffectController::clear);
|
||||
previousTyrant = game.tyrantId();
|
||||
}
|
||||
Player tyrant = game.tyrantId().map(server::getPlayer).orElse(null);
|
||||
if (tyrant == null || game.lifecycle() != GameLifecycle.RUNNING) {
|
||||
if (tyrant != null) {
|
||||
clear(tyrant);
|
||||
}
|
||||
return;
|
||||
}
|
||||
apply(
|
||||
tyrant, PotionEffectType.STRENGTH,
|
||||
game.purchases().contains(TyrantUnlock.STRENGTH),
|
||||
settings.tyrantStrengthLevel()
|
||||
);
|
||||
apply(
|
||||
tyrant, PotionEffectType.RESISTANCE,
|
||||
game.purchases().contains(TyrantUnlock.RESISTANCE),
|
||||
settings.tyrantResistanceLevel()
|
||||
);
|
||||
}
|
||||
|
||||
public void clearAll() {
|
||||
previousTyrant.map(server::getPlayer).ifPresent(TyrantEffectController::clear);
|
||||
previousTyrant = Optional.empty();
|
||||
}
|
||||
|
||||
private static void apply(
|
||||
Player player,
|
||||
PotionEffectType type,
|
||||
boolean purchased,
|
||||
int level
|
||||
) {
|
||||
if (purchased) {
|
||||
player.addPotionEffect(new PotionEffect(
|
||||
type, EFFECT_TICKS, level - 1, false, true, true
|
||||
));
|
||||
} else {
|
||||
player.removePotionEffect(type);
|
||||
}
|
||||
}
|
||||
|
||||
private static void clear(Player player) {
|
||||
player.removePotionEffect(PotionEffectType.STRENGTH);
|
||||
player.removePotionEffect(PotionEffectType.RESISTANCE);
|
||||
}
|
||||
}
|
||||
@@ -35,6 +35,9 @@ fixer-item:
|
||||
tamer-item:
|
||||
material: FISHING_ROD
|
||||
name: Tamer's Lead
|
||||
captured-mob-item:
|
||||
material: PAPER
|
||||
name: Captured Mob
|
||||
denied-mob-types:
|
||||
- ENDER_DRAGON
|
||||
- WITHER
|
||||
|
||||
@@ -7,7 +7,7 @@ author: dmg.games
|
||||
commands:
|
||||
tyrant:
|
||||
description: View and use Spigot Tyrant game features.
|
||||
usage: /tyrant <status|choices|buy|assign|optout|optin|relinquish confirm>
|
||||
usage: /tyrant <status|choices|buy|assign|item|intelligence|optout|optin|relinquish confirm>
|
||||
vigilante:
|
||||
description: Manage Vigilante Followers.
|
||||
usage: /vigilante <invite <player>|accept|dismiss <player>|leave>
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
final class CapturedMobServiceTest {
|
||||
private final CapturedMobService service = new CapturedMobService();
|
||||
|
||||
@Test
|
||||
void captureAddsSnapshotAndSuccessfulReleaseRemovesExactlyThatMob() {
|
||||
UUID captureId = UUID.fromString("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa");
|
||||
PlayerState tamer = tamer();
|
||||
|
||||
PlayerState captured = service.capture(
|
||||
tamer, captureId, "ZOMBIE", "{id:\"minecraft:zombie\"}"
|
||||
);
|
||||
CapturedMob mob = service.find(captured, captureId).orElseThrow();
|
||||
PlayerState released = service.release(captured, captureId);
|
||||
|
||||
assertEquals("ZOMBIE", mob.entityType());
|
||||
assertEquals("{id:\"minecraft:zombie\"}", mob.data().get("snapshot"));
|
||||
assertEquals(java.util.List.of(), released.capturedMobs());
|
||||
}
|
||||
|
||||
@Test
|
||||
void enderDragonCanNeverBeCapturedAndMissingReleaseDoesNotMutate() {
|
||||
assertThrows(IllegalArgumentException.class, () -> service.capture(
|
||||
tamer(), UUID.randomUUID(), "ENDER_DRAGON", "snapshot"
|
||||
));
|
||||
assertEquals(tamer(), service.release(tamer(), UUID.randomUUID()));
|
||||
}
|
||||
|
||||
private static PlayerState tamer() {
|
||||
return new PlayerState(
|
||||
UUID.fromString("11111111-1111-1111-1111-111111111111"), "Tamer",
|
||||
Optional.empty(), Optional.empty(), TyrantClass.TAMER, Optional.empty(),
|
||||
Map.of(), Set.of(Ability.TAMER_CAPTURE), java.util.List.of()
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
final class FixerAbilityServiceTest {
|
||||
private static final Instant NOW = Instant.parse("2026-08-14T12:00:00Z");
|
||||
private final FixerAbilityService service = new FixerAbilityService(
|
||||
new AbilityReadinessService(), PluginSettings.from(Map.of())
|
||||
);
|
||||
|
||||
@Test
|
||||
void boostConsumesItemAndRecordsNormalOrNearTyrantHeartTier() {
|
||||
PlayerState ready = new PlayerState(
|
||||
UUID.fromString("11111111-1111-1111-1111-111111111111"), "Fixer",
|
||||
Optional.empty(), Optional.empty(), TyrantClass.FIXER, Optional.empty(),
|
||||
Map.of(), Set.of(Ability.FIXER_BOOST), java.util.List.of()
|
||||
);
|
||||
|
||||
FixerUseResult normal = service.activate(ready, NOW, false);
|
||||
FixerUseResult near = service.activate(ready, NOW, true);
|
||||
|
||||
assertEquals(AbilityUseStatus.ACTIVATED, normal.status());
|
||||
assertEquals(2, normal.heartRows());
|
||||
assertEquals(3, near.heartRows());
|
||||
assertEquals(NOW.plusSeconds(600), normal.player().cooldownEnds()
|
||||
.get(Ability.FIXER_BOOST_ACTIVE));
|
||||
assertEquals(NOW.plusSeconds(3600), normal.player().cooldownEnds()
|
||||
.get(Ability.FIXER_BOOST));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package games.dmg.spigottyrant;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
import java.time.Duration;
|
||||
import java.time.Instant;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
final class TyrantAbilityServiceTest {
|
||||
private static final UUID TYRANT = UUID.fromString("11111111-1111-1111-1111-111111111111");
|
||||
private static final UUID VIGILANTE = UUID.fromString("22222222-2222-2222-2222-222222222222");
|
||||
private static final UUID FOLLOWER = UUID.fromString("33333333-3333-3333-3333-333333333333");
|
||||
private static final Instant NOW = Instant.parse("2026-08-14T12:00:00Z");
|
||||
private final TyrantAbilityService service = new TyrantAbilityService(
|
||||
Duration.ofHours(24)
|
||||
);
|
||||
|
||||
@Test
|
||||
void intelligenceCountsVigilanteSideWithoutIdentitiesAndStartsCooldown() {
|
||||
GameState game = new GameState(
|
||||
GameLifecycle.RUNNING, Optional.of(TYRANT), Optional.of(VIGILANTE),
|
||||
Optional.empty(), Optional.empty(), Optional.empty(), Duration.ZERO,
|
||||
1, 0, Set.of(TyrantUnlock.ROSTER_INTELLIGENCE)
|
||||
);
|
||||
PlayerState tyrant = PlayerState.newPlayer(TYRANT, "Tyrant");
|
||||
PlayerState follower = new PlayerState(
|
||||
FOLLOWER, "Follower", Optional.empty(), Optional.empty(), TyrantClass.NONE,
|
||||
Optional.of(VIGILANTE), Map.of(), Set.of(), java.util.List.of()
|
||||
);
|
||||
|
||||
IntelligenceResult used = service.useIntelligence(
|
||||
game, tyrant, Map.of(TYRANT, tyrant, FOLLOWER, follower), NOW
|
||||
);
|
||||
IntelligenceResult blocked = service.useIntelligence(
|
||||
game, used.tyrant(), Map.of(TYRANT, used.tyrant(), FOLLOWER, follower),
|
||||
NOW.plusSeconds(1)
|
||||
);
|
||||
|
||||
assertEquals(AbilityUseStatus.ACTIVATED, used.status());
|
||||
assertEquals(2, used.memberCount());
|
||||
assertEquals(NOW.plus(Duration.ofHours(24)), used.tyrant().cooldownEnds()
|
||||
.get(Ability.ROSTER_INTELLIGENCE));
|
||||
assertEquals(AbilityUseStatus.COOLDOWN, blocked.status());
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user