diff --git a/.github/compatibility/tlibs-2.3.xml b/.github/compatibility/tlibs-2.3.xml
new file mode 100644
index 0000000..2dc907c
--- /dev/null
+++ b/.github/compatibility/tlibs-2.3.xml
@@ -0,0 +1,22 @@
+
+
+ 4.0.0
+ net.tfminecraft
+ magic-compatibility-fixture
+ main-SNAPSHOT
+
+ 21
+ UTF-8
+ 2.3.0
+
+
+
+ me.plugins
+ tlibs
+ ${tlibs.version}
+ provided
+
+
+
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9dfce1b..c2d0725 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,6 +26,13 @@ jobs:
with:
mode: pinned
+ - name: Install older API compatibility fixture
+ uses: TF-Minecraft/TLibs/.github/actions/setup-plugins@8ef41de589f121c98ff892b10696e7c1feb4ca74
+ with:
+ mode: pinned
+ pom: .github/compatibility/tlibs-2.3.xml
+ lock: .build/legacy-plugin-dependencies.json
+
- name: Prepare pinned dependencies
env:
GH_TOKEN: ${{ secrets.DEPS_TOKEN }}
diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
index c8c049f..39902d4 100644
--- a/.github/workflows/maven-release.yml
+++ b/.github/workflows/maven-release.yml
@@ -51,6 +51,13 @@ jobs:
with:
mode: pinned
+ - name: Install older API compatibility fixture
+ uses: TF-Minecraft/TLibs/.github/actions/setup-plugins@8ef41de589f121c98ff892b10696e7c1feb4ca74
+ with:
+ mode: pinned
+ pom: .github/compatibility/tlibs-2.3.xml
+ lock: .build/legacy-plugin-dependencies.json
+
- name: Prepare pinned dependencies
env:
GH_TOKEN: ${{ secrets.DEPS_TOKEN }}
diff --git a/pom.xml b/pom.xml
index 1441572..279096d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
full
0.2.0
2.16.0
- 2.3.0
+ 2.6.0
diff --git a/src/main/java/net/tfminecraft/magic/Magic.java b/src/main/java/net/tfminecraft/magic/Magic.java
index 795dee6..8e4f707 100644
--- a/src/main/java/net/tfminecraft/magic/Magic.java
+++ b/src/main/java/net/tfminecraft/magic/Magic.java
@@ -157,6 +157,7 @@ public void onEnable() {
getServer().getScheduler().runTask(this, ArtifactDisplayIndex::rebuildFromSaved);
getServer().getScheduler().runTask(this, GearStationStore::load);
GearOrbService.start();
+ net.tfminecraft.magic.gear.ownership.GearOwnershipLifecycle.start(this);
if (ItemScanService.get() != null) {
ItemScanService.get().subscribe(attuneScanHandler);
}
diff --git a/src/main/java/net/tfminecraft/magic/gear/GearChargeService.java b/src/main/java/net/tfminecraft/magic/gear/GearChargeService.java
index a47d24e..1f78a69 100644
--- a/src/main/java/net/tfminecraft/magic/gear/GearChargeService.java
+++ b/src/main/java/net/tfminecraft/magic/gear/GearChargeService.java
@@ -31,6 +31,9 @@ private GearChargeService() {}
private static final class Confirm {
private final String stationKey;
private final long expiresAt;
+ private net.tfminecraft.magic.gear.ownership.GearIdentity.Token token;
+ private UUID generation;
+ private String itemHash;
private Confirm(String stationKey, long expiresAt) {
this.stationKey = stationKey;
@@ -52,7 +55,8 @@ public static void tryApply(Player player, Location station, ItemStack hand) {
player.sendMessage(Messages.get("gear.charge.blank"));
return;
}
- if (!SessionGuard.ready(player)) {
+ var token = GearStationStore.property().identity().current(player);
+ if (token.isEmpty()) {
player.sendMessage(Messages.get("gear.charge.no_character"));
return;
}
@@ -72,14 +76,16 @@ public static void tryApply(Player player, Location station, ItemStack hand) {
}
String stationKey = GearStationStore.key(station);
List over = overResonance(player, charge);
- if (!over.isEmpty() && !confirmed(player, stationKey)) {
+ if (!over.isEmpty() && !confirmed(player, stationKey, occupancy, token.orElseThrow())) {
player.sendMessage(Messages.get("gear.charge.warn"));
for (String line : over) {
player.sendMessage(line);
}
player.sendMessage(Messages.get("gear.charge.warn_again"));
- CONFIRMS.put(player.getUniqueId(), new Confirm(
- stationKey, System.currentTimeMillis() + GearCache.confirmMillis));
+ Confirm confirm = new Confirm(stationKey, System.currentTimeMillis() + GearCache.confirmMillis);
+ confirm.token = token.orElseThrow(); confirm.generation = occupancy.generation();
+ confirm.itemHash = net.tfminecraft.magic.gear.ownership.GearPropertyStore.hash(net.tfminecraft.magic.gear.ownership.GearItems.bytes(occupancy.getItem()));
+ CONFIRMS.put(player.getUniqueId(), confirm);
player.playSound(player.getLocation(), Sound.BLOCK_NOTE_BLOCK_BASS, 1f, 0.8f);
return;
}
@@ -91,24 +97,20 @@ public static void tryApply(Player player, Location station, ItemStack hand) {
snapshot.put(elementId, fill);
}
}
- // The charge is spent up front. What reaches the weapon is decided by the orbs.
- occupancy.setOrbSessionActive(true);
- if (!GearOrbService.begin(player, station, snapshot, charge.primaryElementId(), charge.getTier())) {
- occupancy.setOrbSessionActive(false);
- player.sendMessage(Messages.get("gear.orbs.busy"));
- return;
+ if (!net.tfminecraft.magic.gear.ownership.GearEffects.charge(player, token.orElseThrow(), station, hand, snapshot, charge.primaryElementId(), charge.getTier())) {
+ player.sendMessage(Messages.get("gear.orbs.busy")); return;
}
- consumeOne(player, hand);
player.sendMessage(Messages.get("gear.charge.applied"));
player.playSound(player.getLocation(), Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 1.2f);
}
- private static boolean confirmed(Player player, String stationKey) {
+ private static boolean confirmed(Player player, String stationKey, GearStationStore.Occupancy occupancy, net.tfminecraft.magic.gear.ownership.GearIdentity.Token token) {
Confirm confirm = CONFIRMS.get(player.getUniqueId());
if (confirm == null || System.currentTimeMillis() > confirm.expiresAt) {
return false;
}
- return confirm.stationKey.equals(stationKey);
+ return confirm.stationKey.equals(stationKey) && token.equals(confirm.token) && java.util.Objects.equals(occupancy.generation(), confirm.generation)
+ && net.tfminecraft.magic.gear.ownership.GearPropertyStore.hash(net.tfminecraft.magic.gear.ownership.GearItems.bytes(occupancy.getItem())).equals(confirm.itemHash);
}
private static List overResonance(Player player, Charge charge) {
@@ -138,12 +140,12 @@ private static List overResonance(Player player, Charge charge) {
return lines;
}
- private static void consumeOne(Player player, ItemStack hand) {
- if (hand.getAmount() <= 1) {
- player.getInventory().setItemInMainHand(null);
- } else {
- hand.setAmount(hand.getAmount() - 1);
- }
- player.updateInventory();
+ public static void clear(Player player, net.tfminecraft.magic.gear.ownership.GearIdentity.Token outgoing) {
+ Confirm confirm = CONFIRMS.get(player.getUniqueId());
+ if (confirm != null && outgoing.equals(confirm.token)) clear(player);
+ }
+ public static void clearStale(Player player) {
+ Confirm confirm = CONFIRMS.get(player.getUniqueId());
+ if (confirm != null && !GearStationStore.property().identity().current(confirm.token, player)) clear(player);
}
}
diff --git a/src/main/java/net/tfminecraft/magic/gear/GearCosts.java b/src/main/java/net/tfminecraft/magic/gear/GearCosts.java
index 33d826c..aa6904f 100644
--- a/src/main/java/net/tfminecraft/magic/gear/GearCosts.java
+++ b/src/main/java/net/tfminecraft/magic/gear/GearCosts.java
@@ -90,6 +90,24 @@ public static void take(Player player, Collection parts) {
player.updateInventory();
}
+ /** Plans removal on clones; a deposit checks the captured frame again before commit. */
+ public static ItemStack[] plan(Player player, Collection parts) {
+ ItemStack[] after = net.tfminecraft.magic.gear.ownership.GearEffects.cloneContents(player.getInventory().getContents());
+ if (bypasses(player)) return after;
+ for (var cost : total(parts).entrySet()) {
+ int remaining = cost.getValue();
+ for (int i = 0; i < after.length && remaining > 0; i++) {
+ ItemStack item = after[i]; if (item == null) continue;
+ try { if (!TLibs.getItemAPI().getChecker().checkItemWithPath(item, cost.getKey())) continue; }
+ catch (RuntimeException ex) { continue; }
+ int remove = Math.min(remaining, item.getAmount()); remaining -= remove;
+ if (remove == item.getAmount()) after[i] = null; else item.setAmount(item.getAmount() - remove);
+ }
+ if (remaining > 0) return null;
+ }
+ return after;
+ }
+
public static void refund(Player player, Map costs, Location drop) {
if (player == null || costs == null || costs.isEmpty()) {
return;
diff --git a/src/main/java/net/tfminecraft/magic/gear/GearStationListener.java b/src/main/java/net/tfminecraft/magic/gear/GearStationListener.java
index 8c4637c..e056bf3 100644
--- a/src/main/java/net/tfminecraft/magic/gear/GearStationListener.java
+++ b/src/main/java/net/tfminecraft/magic/gear/GearStationListener.java
@@ -80,10 +80,12 @@ public void onFurnitureBroken(FurnitureBreakEvent event) {
if (station == null) {
return;
}
+ GearStationStore.Occupancy captured = GearStationStore.get(station);
GearOrbService.abort(station);
ItemStack weapon = GearStationStore.takeForAbort(station);
if (weapon != null) {
station.getWorld().dropItem(station.clone().add(0.5, 1.0, 0.5), weapon);
+ GearStationStore.acknowledgeRelease(station, captured.generation());
Magic.plugin.getLogger().warning("[Magic] Gear station at " + GearStationStore.key(station)
+ " lost its furniture. Dropped the weapon and removed its display.");
}
@@ -142,6 +144,7 @@ public void onInteract(PlayerInteractEvent event) {
}
event.setCancelled(true);
Player player = event.getPlayer();
+ if (GearStationStore.property().identity().current(player).isEmpty()) return;
Location location = block.getLocation();
ItemStack hand = player.getInventory().getItemInMainHand();
boolean emptyHand = hand.getType().isAir();
@@ -190,13 +193,14 @@ public void onInteract(PlayerInteractEvent event) {
private static void rest(Player player, Location location, ItemStack hand) {
ItemStack placed = hand.clone();
placed.setAmount(1);
- if (hand.getAmount() <= 1) {
- player.getInventory().setItemInMainHand(null);
- } else {
- hand.setAmount(hand.getAmount() - 1);
- }
- player.updateInventory();
- GearStationStore.rest(location, placed, player.getUniqueId());
+ var token = GearStationStore.property().identity().current(player);
+ if (token.isEmpty()) return;
+ List before = net.tfminecraft.magic.gear.ownership.GearEffects.frame(player.getInventory().getContents());
+ ItemStack[] after = net.tfminecraft.magic.gear.ownership.GearEffects.cloneContents(player.getInventory().getContents());
+ int slot = player.getInventory().getHeldItemSlot();
+ if (after[slot] == null || !java.util.Arrays.equals(net.tfminecraft.magic.gear.ownership.GearItems.bytes(hand), net.tfminecraft.magic.gear.ownership.GearItems.bytes(after[slot]))) return;
+ if (after[slot].getAmount() <= 1) after[slot] = null; else after[slot].setAmount(after[slot].getAmount() - 1);
+ if (GearStationStore.deposit(player, token.orElseThrow(), location, placed, Map.of(), true, after, before) == null) return;
player.sendMessage(Messages.get("gear.station.rested"));
player.playSound(location, Sound.BLOCK_ANVIL_USE, 1f, 1.2f);
}
@@ -258,12 +262,14 @@ private static void eject(Player player, Location location) {
player.playSound(player.getLocation(), Sound.ENTITY_VILLAGER_NO, 1f, 1f);
return;
}
+ if (GearStationStore.property().identity().current(player).isEmpty()) return;
ItemStack item = GearStationStore.eject(location);
if (item == null) {
return;
}
Location drop = location.clone().add(0.5, 1.0, 0.5);
drop.getWorld().dropItem(drop, item);
+ GearStationStore.acknowledgeRelease(location, occupancy.generation());
player.playSound(location, Sound.ENTITY_ITEM_PICKUP, 1f, 1f);
}
@@ -272,24 +278,12 @@ private static void eject(Player player, Location location) {
* weapon. An idle rested weapon stays put; an empty hand picks it up.
*/
private void returnRested(Player player, Location location, GearStationStore.Occupancy occupancy) {
- UUID owner = occupancy.getOwner() != null ? occupancy.getOwner() : GearOrbService.sessionOwner(location);
- if (owner != null && !owner.equals(player.getUniqueId()) && !player.hasPermission("magic.admin")) {
- player.sendMessage(Messages.get("gear.abort.not_yours"));
- player.playSound(player.getLocation(), Sound.ENTITY_VILLAGER_NO, 1f, 1f);
- return;
- }
- GearOrbService.abort(location);
- ItemStack weapon = GearStationStore.takeForAbort(location);
- if (weapon == null) {
- return;
+ if (!net.tfminecraft.magic.gear.ownership.GearEffects.authorize(player, location, occupancy)) {
+ player.sendMessage(Messages.get("gear.abort.not_yours")); return;
}
+ if (!net.tfminecraft.magic.gear.ownership.GearEffects.abortReturn(player, location, occupancy, Map.of())) return;
recentAborts.values().removeIf(at -> System.currentTimeMillis() - at >= ABORT_BREAK_GUARD_MILLIS);
recentAborts.put(GearStationStore.key(location), System.currentTimeMillis());
- Location drop = location.clone().add(0.5, 1.0, 0.5);
- for (ItemStack leftover : player.getInventory().addItem(weapon).values()) {
- drop.getWorld().dropItem(drop, leftover);
- }
- player.updateInventory();
player.sendMessage(Messages.get("gear.abort.returned"));
player.playSound(location, Sound.ENTITY_ITEM_PICKUP, 1f, 1f);
}
@@ -329,23 +323,13 @@ private void tryAbort(PlayerInteractEvent event) {
returnRested(player, location, occupancy);
return;
}
- UUID owner = occupancy.getOwner() != null ? occupancy.getOwner() : GearOrbService.sessionOwner(location);
- if (owner != null && !owner.equals(player.getUniqueId()) && !player.hasPermission("magic.admin")) {
- player.sendMessage(Messages.get("gear.abort.not_yours"));
- player.playSound(player.getLocation(), Sound.ENTITY_VILLAGER_NO, 1f, 1f);
- return;
- }
- GearOrbService.abort(location);
- ItemStack weapon = GearStationStore.takeForAbort(location);
- if (weapon == null) {
- return;
+ if (!net.tfminecraft.magic.gear.ownership.GearEffects.authorize(player, location, occupancy)) {
+ player.sendMessage(Messages.get("gear.abort.not_yours")); return;
}
+ Map charged = occupancy.getCharged();
+ if (!net.tfminecraft.magic.gear.ownership.GearEffects.abortReturn(player, location, occupancy, charged)) return;
recentAborts.values().removeIf(at -> System.currentTimeMillis() - at >= ABORT_BREAK_GUARD_MILLIS);
recentAborts.put(GearStationStore.key(location), System.currentTimeMillis());
- Map charged = occupancy.getCharged() != null
- ? occupancy.getCharged()
- : GearCosts.total(GearProvenance.resolveParts(weapon));
- GearCosts.refund(player, charged, location);
player.sendMessage(Messages.get("gear.abort.done"));
player.playSound(location, Sound.BLOCK_ANVIL_LAND, 0.6f, 1.4f);
}
diff --git a/src/main/java/net/tfminecraft/magic/gear/GearStationStore.java b/src/main/java/net/tfminecraft/magic/gear/GearStationStore.java
index a27f549..f60dd4c 100644
--- a/src/main/java/net/tfminecraft/magic/gear/GearStationStore.java
+++ b/src/main/java/net/tfminecraft/magic/gear/GearStationStore.java
@@ -38,6 +38,8 @@ public final class GearStationStore {
private static boolean loading;
private static final Map retainedRows = new LinkedHashMap<>();
private static boolean unreadableStore;
+ private static net.tfminecraft.magic.gear.ownership.GearPropertyStore property;
+ private static Magic propertyPlugin;
private GearStationStore() {}
@@ -48,6 +50,8 @@ public static final class Occupancy {
private final UUID owner;
private final Map charged;
private final boolean rested;
+ private UUID generation;
+ private net.tfminecraft.magic.gear.ownership.GearIdentity.Owner characterOwner;
Occupancy(ItemStack item, UUID displayId, UUID owner, Map charged, boolean rested) {
this.item = item;
@@ -79,9 +83,12 @@ public boolean isRested() {
}
public ItemStack getItem() {
- return item;
+ return item == null ? null : item.clone();
}
+ public UUID generation() { return generation; }
+ public net.tfminecraft.magic.gear.ownership.GearIdentity.Owner characterOwner() { return characterOwner; }
+
public void setItem(ItemStack item) {
this.item = item;
refreshDisplay();
@@ -106,34 +113,56 @@ private void refreshDisplay() {
}
}
+ public static net.tfminecraft.magic.gear.ownership.GearPropertyStore property() {
+ if (property == null || propertyPlugin != Magic.plugin) {
+ propertyPlugin = Magic.plugin;
+ property = new net.tfminecraft.magic.gear.ownership.GearPropertyStore(
+ Magic.plugin.getDataFolder().toPath().resolve("data"), net.tfminecraft.magic.gear.ownership.GearIdentity.load());
+ }
+ return property;
+ }
+
public static boolean isOccupied(Location location) {
- return location != null && OCCUPIED.containsKey(key(location));
+ if (location == null) return false;
+ try { return property().occupied(key(location)); }
+ catch (IOException ex) { warning(ex); return true; }
}
public static Occupancy get(Location location) {
return location == null ? null : OCCUPIED.get(key(location));
}
- public static Occupancy occupy(Location location, ItemStack item, UUID owner, Map charged) {
- return place(location, item, owner, charged, false);
+ /** Compatibility entry point still requires the exact current owning character. */
+ public static Occupancy occupy(Location location, ItemStack item, UUID account, Map charged) {
+ return place(location, item, account, charged, false);
+ }
+ public static Occupancy rest(Location location, ItemStack item, UUID account) {
+ return place(location, item, account, Map.of(), true);
+ }
+ private static Occupancy place(Location location, ItemStack item, UUID account, Map charged, boolean rested) {
+ org.bukkit.entity.Player player = account == null ? null : Bukkit.getPlayer(account);
+ var token = property().identity().current(player);
+ if (token.isEmpty() || location == null || item == null) return null;
+ return deposit(player, token.orElseThrow(), location, item, charged, rested, player.getInventory().getContents());
}
- /**
- * Sets an existing weapon on an empty station so it can take another charge.
- * Nothing was consumed, so the station records no material cost.
- */
- public static Occupancy rest(Location location, ItemStack item, UUID owner) {
- return place(location, item, owner, Map.of(), true);
+ public static Occupancy deposit(org.bukkit.entity.Player player, net.tfminecraft.magic.gear.ownership.GearIdentity.Token token,
+ Location location, ItemStack item, Map charged, boolean rested, ItemStack[] afterInventory) {
+ return deposit(player, token, location, item, charged, rested, afterInventory,
+ net.tfminecraft.magic.gear.ownership.GearEffects.frame(player.getInventory().getContents()));
+ }
+ public static Occupancy deposit(org.bukkit.entity.Player player, net.tfminecraft.magic.gear.ownership.GearIdentity.Token token,
+ Location location, ItemStack item, Map charged, boolean rested, ItemStack[] afterInventory, List beforeInventory) {
+ return net.tfminecraft.magic.gear.ownership.GearEffects.deposit(player, token, location, item, charged, rested, afterInventory, beforeInventory);
}
- private static Occupancy place(
- Location location, ItemStack item, UUID owner, Map charged, boolean rested) {
- if (location == null || item == null) {
- return null;
- }
- clear(location, false);
+ public static Occupancy install(Location location, ItemStack item, Map row) throws IOException {
+ UUID owner = row.get("owner") instanceof String text ? uuidOf(text) : null;
UUID displayId = spawnDisplay(location, item);
- Occupancy occupancy = new Occupancy(item, displayId, owner, charged, rested);
+ Occupancy occupancy = new Occupancy(item.clone(), displayId, owner, readChargedRaw(row), Boolean.TRUE.equals(row.get("rested")));
+ occupancy.generation = net.tfminecraft.magic.gear.ownership.GearPropertyStore.id(row);
+ if (row.get("ownership") instanceof Map authority && "CHARACTER".equals(authority.get("kind")))
+ occupancy.characterOwner = net.tfminecraft.magic.gear.ownership.GearPropertyStore.owner(row);
OCCUPIED.put(key(location), occupancy);
save();
return occupancy;
@@ -141,26 +170,43 @@ private static Occupancy place(
public static ItemStack eject(Location location) {
Occupancy occupancy = get(location);
- if (occupancy == null) {
- return null;
- }
- if (occupancy.isOrbSessionActive() || (!isAttuned(occupancy.getItem()) && !occupancy.isRested())) {
- return null;
- }
- ItemStack item = occupancy.getItem();
- clear(location, true);
- return item;
+ if (occupancy == null || occupancy.isOrbSessionActive() || (!isAttuned(occupancy.getItem()) && !occupancy.isRested())) return null;
+ return release(location);
}
-
- /** Clears the station even if the weapon is unattuned or mid-orb. Does not return the staff. */
- public static ItemStack takeForAbort(Location location) {
- Occupancy occupancy = get(location);
- if (occupancy == null) {
- return null;
- }
- ItemStack item = occupancy.getItem();
- clear(location, true);
- return item;
+ /** A durable release intent precedes either inventory settlement or a public world drop. */
+ public static ItemStack takeForAbort(Location location) { return release(location); }
+ private static ItemStack release(Location location) {
+ Occupancy occupancy = get(location); if (occupancy == null) return null;
+ try {
+ if (occupancy.characterOwner() != null) property().requireUnlocked(occupancy.characterOwner());
+ var station = expected(location, occupancy);
+ var after = net.tfminecraft.magic.gear.ownership.GearYaml.copy(station.raw());
+ after.put("effect-state", "releasing");
+ after.put("release-intent", Map.of("operation", UUID.randomUUID().toString(), "item", net.tfminecraft.magic.gear.ownership.GearPropertyStore.b64(net.tfminecraft.magic.gear.ownership.GearItems.bytes(occupancy.getItem()))));
+ property().patch(station, after);
+ clear(location);
+ return occupancy.getItem();
+ } catch (IOException ex) { warning(ex); return null; }
+ }
+ public static boolean acknowledgeRelease(Location location, UUID generation) {
+ try {
+ var station = property().station(generation);
+ if (!key(location).equals(net.tfminecraft.magic.gear.ownership.GearPropertyStore.location(station.raw())) || !"releasing".equals(station.raw().get("effect-state"))) throw new IOException("Release target changed");
+ var after = net.tfminecraft.magic.gear.ownership.GearYaml.copy(station.raw()); after.put("effect-state", "released"); property().patch(station, after); return true;
+ } catch (IOException ex) { warning(ex); return false; }
+ }
+ public static net.tfminecraft.magic.gear.ownership.GearPropertyStore.Station expected(Location location, Occupancy occupancy) throws IOException {
+ if (occupancy.getItem() == null) throw new IOException("Cached gear item is unavailable");
+ var station = property().station(occupancy.generation());
+ if (!java.util.Arrays.asList("active", "charging").contains(station.raw().get("effect-state"))
+ || !key(location).equals(net.tfminecraft.magic.gear.ownership.GearPropertyStore.location(station.raw()))
+ || !java.util.Objects.equals(occupancy.characterOwner(), ownerOrNull(station.raw()))
+ || !java.util.Arrays.equals(net.tfminecraft.magic.gear.ownership.GearItems.bytes(decodeItem(station.raw())), net.tfminecraft.magic.gear.ownership.GearItems.bytes(occupancy.getItem()))) throw new IOException("Occupancy authority or item changed");
+ return station;
+ }
+ private static net.tfminecraft.magic.gear.ownership.GearIdentity.Owner ownerOrNull(Map row) throws IOException {
+ if (row.get("ownership") instanceof Map authority && "OWNERLESS".equals(authority.get("kind")) && Integer.valueOf(1).equals(authority.get("format"))) return null;
+ return net.tfminecraft.magic.gear.ownership.GearPropertyStore.owner(row);
}
/** An unattuned weapon never leaves the station, so band 0 gear cannot exist in the world. */
@@ -170,11 +216,18 @@ public static boolean isAttuned(ItemStack item) {
public static void update(Location location, ItemStack item) {
Occupancy occupancy = get(location);
- if (occupancy == null || item == null) {
- return;
- }
- occupancy.setItem(item);
- save();
+ if (occupancy == null || item == null) return;
+ update(location, occupancy, item);
+ }
+ public static boolean update(Location location, Occupancy captured, ItemStack item) {
+ if (get(location) != captured || item == null) return false;
+ try {
+ var station = expected(location, captured);
+ var after = net.tfminecraft.magic.gear.ownership.GearYaml.copy(station.raw());
+ after.put("item-bytes", net.tfminecraft.magic.gear.ownership.GearPropertyStore.b64(net.tfminecraft.magic.gear.ownership.GearItems.bytes(item)));
+ after.put("effect-state", "active"); property().patch(station, after);
+ captured.setItem(item.clone()); captured.setOrbSessionActive(false); return true;
+ } catch (IOException ex) { warning(ex); return false; }
}
public static void shutdown() {
@@ -200,62 +253,50 @@ public static void clearAll() {
}
public static void load() {
- loading = true;
+ loading = true; OCCUPIED.clear(); retainedRows.clear(); unreadableStore = false;
try {
- OCCUPIED.clear();
- retainedRows.clear();
- unreadableStore = false;
- File file = file();
- if (!file.exists()) {
- return;
- }
- YamlConfiguration config = new YamlConfiguration();
+ property().holdInterrupted(); property().migrate(); loadViews();
+ } catch (IOException ex) { unreadableStore = true; warning(ex); }
+ finally { loading = false; }
+ }
+ public static void loadViews() throws IOException {
+ for (var station : property().stations()) {
+ Map row = station.raw();
+ if (!java.util.Arrays.asList("active", "charging").contains(row.get("effect-state"))) continue;
try {
- config.load(file);
- } catch (IOException | InvalidConfigurationException ex) {
- unreadableStore = true;
- Magic.plugin.getLogger().warning("[Magic] Retaining unreadable gear stations: " + ex.getMessage());
- return;
- }
- ConfigurationSection root = config.getConfigurationSection("stations");
- if (root == null) {
- return;
- }
- boolean dropped = false;
- for (String key : root.getKeys(false)) {
- ConfigurationSection section = root.getConfigurationSection(key);
- if (section == null) {
- retainedRows.put(key, root.get(key));
- continue;
- }
- Location location = locationOf(section);
- ItemStack item = section.getItemStack("item");
- if (location == null || item == null) {
- retainedRows.put(key, section.getValues(true));
- continue;
- }
- UUID savedDisplay = uuidOf(section.getString("display"));
- UUID owner = uuidOf(section.getString("owner"));
- Map charged = readCharged(section);
- location.getChunk().load();
- if (furniture(location) == Furniture.ABSENT) {
- removeDisplays(location, null, savedDisplay);
- drop(location, item);
- dropped = true;
- Magic.plugin.getLogger().warning("[Magic] Gear station at " + key(location)
- + " has no furniture. Dropped the weapon and removed its display.");
- continue;
- }
- UUID displayId = ensureDisplay(location, item, savedDisplay);
- OCCUPIED.put(key(location), new Occupancy(
- item, displayId, owner, charged, section.getBoolean("rested")));
- }
- if (dropped) {
- save();
- }
- } finally {
- loading = false;
+ String key = net.tfminecraft.magic.gear.ownership.GearPropertyStore.location(row);
+ UUID id = net.tfminecraft.magic.gear.ownership.GearPropertyStore.id(row); ownerOrNull(row);
+ Location location = locationFromKey(key); if (location == null) continue;
+ ItemStack item = decodeItem(row); if (item == null || item.getType().isAir()) throw new IOException("Gear item cannot be loaded");
+ Occupancy existing = OCCUPIED.get(key);
+ if (existing != null && id.equals(existing.generation()) && java.util.Objects.equals(existing.characterOwner(), ownerOrNull(row))) continue;
+ if (existing != null) removeDisplays(location, null, existing.displayId);
+ UUID display = ensureDisplay(location, item, uuidOf(row.get("display") instanceof String text ? text : null));
+ Occupancy occupancy = new Occupancy(item, display, uuidOf(row.get("owner") instanceof String text ? text : null), readChargedRaw(row), Boolean.TRUE.equals(row.get("rested")));
+ occupancy.generation = id; occupancy.characterOwner = ownerOrNull(row); OCCUPIED.put(key, occupancy);
+ if (furniture(location) == Furniture.ABSENT) abandon(location);
+ } catch (IOException | RuntimeException ex) { warning(ex); }
+ }
+ }
+ public static ItemStack decodeItem(Map row) throws IOException {
+ try {
+ if (row.containsKey("item-bytes")) return net.tfminecraft.magic.gear.ownership.GearItems.item(net.tfminecraft.magic.gear.ownership.GearPropertyStore.bytes((String) row.get("item-bytes")));
+ YamlConfiguration config = new YamlConfiguration();
+ config.loadFromString(new String(net.tfminecraft.magic.gear.ownership.GearYaml.bytes(Map.of("item", row.get("item"))), java.nio.charset.StandardCharsets.UTF_8));
+ ItemStack item = config.getItemStack("item"); if (item == null) throw new IOException("Missing gear item"); return item;
+ } catch (RuntimeException | InvalidConfigurationException ex) { throw new IOException("Gear item needs recovery", ex); }
+ }
+ private static Map readChargedRaw(Map row) {
+ if (!(row.get("charged") instanceof Map costs)) return null;
+ Map result = new HashMap<>();
+ for (Object value : costs.values()) {
+ if (!(value instanceof Map entry) || !(entry.get("path") instanceof String path) || path.isBlank()
+ || !(entry.get("amount") instanceof Integer amount) || amount <= 0) return null;
+ long total = (long) result.getOrDefault(path, 0) + amount;
+ if (total > Integer.MAX_VALUE) return null;
+ result.put(path, (int) total);
}
+ return result;
}
/**
@@ -282,7 +323,7 @@ public static void reconcile(Chunk chunk) {
Location location = locationFromKey(stationKey);
Occupancy occupancy = OCCUPIED.get(stationKey);
// Spawning a preceding display can invoke plugin listeners which remove stations/worlds.
- if (location == null || occupancy == null) {
+ if (location == null || occupancy == null || occupancy.getItem() == null) {
continue;
}
if (furniture(location) == Furniture.ABSENT) {
@@ -336,78 +377,39 @@ public static double distanceSquaredToCenter(Location station, Location at) {
}
public static void save() {
- if (unreadableStore) {
- File file = file();
- try {
- Files.move(file.toPath(), file.toPath().resolveSibling(file.getName() + ".rejected-" + UUID.randomUUID()));
- unreadableStore = false;
- } catch (IOException ex) {
- Magic.plugin.getLogger().warning("[Magic] Cannot preserve unreadable gear stations; refusing overwrite: " + ex.getMessage());
- return;
- }
- }
- YamlConfiguration config = new YamlConfiguration();
- retainedRows.forEach((key, value) -> config.set("stations." + key, value));
- int index = 0;
- for (Map.Entry entry : OCCUPIED.entrySet()) {
+ if (unreadableStore) return;
+ Map displays = new HashMap<>();
+ try { for (var row : property().stations()) displays.put(row.raw().get("occupancy-id"), row.raw().get("display")); }
+ catch (IOException ex) { warning(ex); return; }
+ for (var entry : new ArrayList<>(OCCUPIED.entrySet())) {
Occupancy occupancy = entry.getValue();
- Location location = locationFromKey(entry.getKey());
- if (location == null || occupancy.getItem() == null) {
- continue;
- }
- while (retainedRows.containsKey(Integer.toString(index))) {
- index++;
- }
- String path = "stations." + index++;
- config.set(path + ".world", location.getWorld().getName());
- config.set(path + ".x", location.getBlockX());
- config.set(path + ".y", location.getBlockY());
- config.set(path + ".z", location.getBlockZ());
- config.set(path + ".item", occupancy.getItem());
- config.set(path + ".display", occupancy.displayId.toString());
- if (occupancy.getOwner() != null) {
- config.set(path + ".owner", occupancy.getOwner().toString());
- }
- if (occupancy.isRested()) {
- config.set(path + ".rested", true);
- }
- if (occupancy.getCharged() != null) {
- config.createSection(path + ".charged");
- int chargedIndex = 0;
- for (Map.Entry cost : occupancy.getCharged().entrySet()) {
- String costPath = path + ".charged." + chargedIndex++;
- config.set(costPath + ".path", cost.getKey());
- config.set(costPath + ".amount", cost.getValue());
- }
- }
- }
- try {
- File file = file();
- file.getParentFile().mkdirs();
- config.save(file);
- } catch (IOException ex) {
- Magic.plugin.getLogger().warning("[Magic] Failed to save gear stations: " + ex.getMessage());
+ if (occupancy.displayId == null || occupancy.displayId.toString().equals(displays.get(String.valueOf(occupancy.generation())))) continue;
+ try {
+ var station = property().station(occupancy.generation());
+ if (!java.util.Objects.equals(occupancy.characterOwner(), ownerOrNull(station.raw()))) continue;
+ if (occupancy.characterOwner() != null) property().requireUnlocked(occupancy.characterOwner());
+ var after = net.tfminecraft.magic.gear.ownership.GearYaml.copy(station.raw());
+ after.put("display", occupancy.displayId.toString());
+ property().patch(station, after);
+ } catch (IOException ex) { warning(ex); }
}
}
+ public static void warning(Exception ex) { Magic.plugin.getLogger().warning("[Magic] Gear property held: " + ex.getMessage()); }
- private static void clear(Location location, boolean save) {
+ private static void clear(Location location) {
Occupancy occupancy = OCCUPIED.remove(key(location));
removeDisplays(location, null, occupancy == null ? null : occupancy.displayId);
- if (save) {
- save();
- }
}
- /** Drops the weapon and forgets the station. The display is removed first. */
+ /** Public world release is evidence-backed; an interrupted effect is held at restart. */
private static void abandon(Location location) {
- Occupancy occupancy = OCCUPIED.remove(key(location));
- removeDisplays(location, null, occupancy == null ? null : occupancy.displayId);
- if (occupancy != null && occupancy.getItem() != null) {
- drop(location, occupancy.getItem());
- Magic.plugin.getLogger().warning("[Magic] Gear station at " + key(location)
- + " has no furniture. Dropped the weapon and removed its display.");
+ Occupancy occupancy = get(location); if (occupancy == null) return;
+ net.tfminecraft.magic.gear.orb.GearOrbService.abort(location);
+ ItemStack item = takeForAbort(location);
+ if (item != null) {
+ drop(location, item); acknowledgeRelease(location, occupancy.generation());
+ Magic.plugin.getLogger().warning("[Magic] Gear station at " + key(location) + " has no furniture. Dropped the weapon and removed its display.");
}
- save();
}
private static UUID ensureDisplay(Location location, ItemStack item, UUID savedDisplay) {
@@ -600,10 +602,6 @@ private static Map readCharged(ConfigurationSection section) {
return charged;
}
- private static File file() {
- return new File(Magic.plugin.getDataFolder(), "data/gear-stations.yml");
- }
-
public static String key(Location location) {
if (location == null || location.getWorld() == null) {
return "";
@@ -628,11 +626,4 @@ public static Location locationFromKey(String key) {
}
}
- private static Location locationOf(ConfigurationSection section) {
- World world = Bukkit.getWorld(section.getString("world", ""));
- if (world == null) {
- return null;
- }
- return new Location(world, section.getInt("x"), section.getInt("y"), section.getInt("z"));
- }
}
diff --git a/src/main/java/net/tfminecraft/magic/gear/gui/AssemblyHolder.java b/src/main/java/net/tfminecraft/magic/gear/gui/AssemblyHolder.java
index ae990b8..39d17d1 100644
--- a/src/main/java/net/tfminecraft/magic/gear/gui/AssemblyHolder.java
+++ b/src/main/java/net/tfminecraft/magic/gear/gui/AssemblyHolder.java
@@ -1,12 +1,8 @@
package net.tfminecraft.magic.gear.gui;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
+import org.bukkit.entity.Player;
-public final class AssemblyHolder implements InventoryHolder {
-
- @Override
- public Inventory getInventory() {
- return null;
- }
+public final class AssemblyHolder extends GearMenuHolder {
+ public AssemblyHolder() { this(null); }
+ public AssemblyHolder(Player player) { super(player); }
}
diff --git a/src/main/java/net/tfminecraft/magic/gear/gui/GearInventoryManager.java b/src/main/java/net/tfminecraft/magic/gear/gui/GearInventoryManager.java
index 11a184e..35a4122 100644
--- a/src/main/java/net/tfminecraft/magic/gear/gui/GearInventoryManager.java
+++ b/src/main/java/net/tfminecraft/magic/gear/gui/GearInventoryManager.java
@@ -41,7 +41,7 @@ public final class GearInventoryManager implements Listener {
// Keep the existing legacy text representation, formatting, and exact-string comparisons.
@SuppressWarnings("deprecation")
public void openAssembly(Player player) {
- Inventory inv = Bukkit.createInventory(new AssemblyHolder(), 27, "§6Mage Assembly");
+ Inventory inv = Bukkit.createInventory(new AssemblyHolder(player), 27, "§6Mage Assembly");
ItemStack filler = pane();
for (int i = 0; i < inv.getSize(); i++) {
inv.setItem(i, filler);
@@ -75,7 +75,7 @@ public void openAssembly(Player player) {
// Keep the existing legacy text representation, formatting, and exact-string comparisons.
@SuppressWarnings("deprecation")
public void openTypeSelection(Player player) {
- Inventory inv = Bukkit.createInventory(new TypeSelectionHolder(), 9, "§6Select Archetype");
+ Inventory inv = Bukkit.createInventory(new TypeSelectionHolder(player), 9, "§6Select Archetype");
int slot = 0;
for (GearType type : GearType.values()) {
ArchetypeDef def = ArchetypeRegistry.get(type);
@@ -114,7 +114,7 @@ public void openPartSelection(Player player, String categoryId) {
List options = PartRegistry.matching(categoryId, type);
int size = Math.max(9, Math.min(54, ((options.size() + 8) / 9) * 9));
Inventory inv = Bukkit.createInventory(
- new PartSelectionHolder(categoryId), size, "§6Select " + partTypeName(categoryId));
+ new PartSelectionHolder(categoryId, player), size, "§6Select " + partTypeName(categoryId));
if (options.isEmpty()) {
inv.setItem(size / 2, barrier("No part"));
} else {
@@ -177,6 +177,9 @@ public void onClick(InventoryClickEvent event) {
if (!(event.getWhoClicked() instanceof Player player)) {
return;
}
+ if (event.getInventory().getHolder() instanceof GearMenuHolder holder && !holder.current(player)) {
+ event.setCancelled(true); return;
+ }
if (event.getInventory().getHolder() instanceof AssemblyHolder) {
event.setCancelled(true);
if (event.getClickedInventory() != event.getInventory()) return;
@@ -260,6 +263,8 @@ public void onClick(InventoryClickEvent event) {
}
private void tryPrepare(Player player) {
+ var token = GearStationStore.property().identity().current(player);
+ if (token.isEmpty()) return;
org.bukkit.Location station = OpenStationManager.get(player);
if (station == null || !isStationPresent(station)) {
player.sendMessage(Messages.get("gear.station.gone"));
@@ -290,9 +295,11 @@ private void tryPrepare(Player player) {
}
boolean staffBypass = GearCosts.bypasses(player);
Map charged = staffBypass ? Map.of() : GearCosts.total(parts);
- GearCosts.take(player, parts);
+ List before = net.tfminecraft.magic.gear.ownership.GearEffects.frame(player.getInventory().getContents());
+ ItemStack[] after = GearCosts.plan(player, parts);
+ if (after == null) return;
GearProvenance.stampInputs(prepared, charged);
- GearStationStore.occupy(station, prepared, player.getUniqueId(), charged);
+ if (GearStationStore.deposit(player, token.orElseThrow(), station, prepared, charged, false, after, before) == null) return;
OpenStationManager.clear(player);
player.closeInventory();
player.sendMessage(Messages.get("gear.craft.prepared"));
diff --git a/src/main/java/net/tfminecraft/magic/gear/gui/GearMenuHolder.java b/src/main/java/net/tfminecraft/magic/gear/gui/GearMenuHolder.java
new file mode 100644
index 0000000..afe5635
--- /dev/null
+++ b/src/main/java/net/tfminecraft/magic/gear/gui/GearMenuHolder.java
@@ -0,0 +1,16 @@
+package net.tfminecraft.magic.gear.gui;
+
+import net.tfminecraft.magic.gear.GearStationStore;
+import net.tfminecraft.magic.gear.ownership.GearIdentity;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
+
+/** A rendered menu retains its initiating session even if the account opens another menu. */
+public abstract class GearMenuHolder implements InventoryHolder {
+ private final GearIdentity.Token token;
+ protected GearMenuHolder(Player player) { token = GearStationStore.property().identity().current(player).orElse(null); }
+ public boolean current(Player player) { return GearStationStore.property().identity().current(token, player); }
+ public GearIdentity.Token token() { return token; }
+ @Override public Inventory getInventory() { return null; }
+}
diff --git a/src/main/java/net/tfminecraft/magic/gear/gui/OpenStationManager.java b/src/main/java/net/tfminecraft/magic/gear/gui/OpenStationManager.java
index d15bda1..6fe66b0 100644
--- a/src/main/java/net/tfminecraft/magic/gear/gui/OpenStationManager.java
+++ b/src/main/java/net/tfminecraft/magic/gear/gui/OpenStationManager.java
@@ -10,6 +10,7 @@
public final class OpenStationManager {
private static final Map OPEN = new HashMap<>();
+ private static final Map TOKENS = new HashMap<>();
private OpenStationManager() {}
@@ -18,12 +19,15 @@ public static void set(Player player, Location location) {
return;
}
OPEN.put(player.getUniqueId(), location.clone());
+ net.tfminecraft.magic.gear.GearStationStore.property().identity().current(player).ifPresentOrElse(
+ token -> TOKENS.put(player.getUniqueId(), token), () -> TOKENS.remove(player.getUniqueId()));
}
public static Location get(Player player) {
if (player == null) {
return null;
}
+ if (!net.tfminecraft.magic.gear.GearStationStore.property().identity().current(TOKENS.get(player.getUniqueId()), player)) return null;
Location location = OPEN.get(player.getUniqueId());
return location == null ? null : location.clone();
}
@@ -31,6 +35,13 @@ public static Location get(Player player) {
public static void clear(Player player) {
if (player != null) {
OPEN.remove(player.getUniqueId());
+ TOKENS.remove(player.getUniqueId());
}
}
+ public static void clear(Player player, net.tfminecraft.magic.gear.ownership.GearIdentity.Token outgoing) {
+ if (player != null && java.util.Objects.equals(outgoing, TOKENS.get(player.getUniqueId()))) clear(player);
+ }
+ public static boolean matches(Player player, net.tfminecraft.magic.gear.ownership.GearIdentity.Token token) {
+ return token != null && token.equals(TOKENS.get(player.getUniqueId()));
+ }
}
diff --git a/src/main/java/net/tfminecraft/magic/gear/gui/PartSelectionHolder.java b/src/main/java/net/tfminecraft/magic/gear/gui/PartSelectionHolder.java
index 5967c2d..90a39db 100644
--- a/src/main/java/net/tfminecraft/magic/gear/gui/PartSelectionHolder.java
+++ b/src/main/java/net/tfminecraft/magic/gear/gui/PartSelectionHolder.java
@@ -3,11 +3,13 @@
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
-public final class PartSelectionHolder implements InventoryHolder {
+public final class PartSelectionHolder extends GearMenuHolder {
private final String categoryId;
- public PartSelectionHolder(String categoryId) {
+ public PartSelectionHolder(String categoryId) { this(categoryId, null); }
+ public PartSelectionHolder(String categoryId, org.bukkit.entity.Player player) {
+ super(player);
this.categoryId = categoryId;
}
@@ -15,8 +17,5 @@ public String getCategoryId() {
return categoryId;
}
- @Override
- public Inventory getInventory() {
- return null;
- }
+
}
diff --git a/src/main/java/net/tfminecraft/magic/gear/gui/TypeSelectionHolder.java b/src/main/java/net/tfminecraft/magic/gear/gui/TypeSelectionHolder.java
index cdf30a1..1ea7f29 100644
--- a/src/main/java/net/tfminecraft/magic/gear/gui/TypeSelectionHolder.java
+++ b/src/main/java/net/tfminecraft/magic/gear/gui/TypeSelectionHolder.java
@@ -1,12 +1,8 @@
package net.tfminecraft.magic.gear.gui;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
+import org.bukkit.entity.Player;
-public final class TypeSelectionHolder implements InventoryHolder {
-
- @Override
- public Inventory getInventory() {
- return null;
- }
+public final class TypeSelectionHolder extends GearMenuHolder {
+ public TypeSelectionHolder() { this(null); }
+ public TypeSelectionHolder(Player player) { super(player); }
}
diff --git a/src/main/java/net/tfminecraft/magic/gear/orb/GearOrbService.java b/src/main/java/net/tfminecraft/magic/gear/orb/GearOrbService.java
index 5c83c84..2e1bcb0 100644
--- a/src/main/java/net/tfminecraft/magic/gear/orb/GearOrbService.java
+++ b/src/main/java/net/tfminecraft/magic/gear/orb/GearOrbService.java
@@ -79,6 +79,20 @@ public static void finishForPlayer(UUID playerId) {
}
}
+ public static void finishForSession(UUID playerId, CharacterSession outgoing) {
+ for (GearOrbSession session : new ArrayList<>(SESSIONS.values()))
+ if (playerId.equals(session.getPlayerId()) && session.matches(outgoing)) complete(session, false);
+ }
+ public static void finishStaleForPlayer(UUID playerId) {
+ for (GearOrbSession session : new ArrayList<>(SESSIONS.values()))
+ if (playerId.equals(session.getPlayerId()) && !session.isCurrent()) complete(session, false);
+ }
+ public static boolean touches(net.tfminecraft.magic.gear.ownership.GearIdentity.Owner owner) {
+ for (GearOrbSession session : SESSIONS.values())
+ if (session.occupancy() != null && owner.equals(session.occupancy().characterOwner())) return true;
+ return false;
+ }
+
public static boolean isActive(Location station) {
return station != null && SESSIONS.containsKey(GearStationStore.key(station));
}
@@ -90,6 +104,11 @@ public static UUID sessionOwner(Location station) {
GearOrbSession session = SESSIONS.get(GearStationStore.key(station));
return session == null ? null : session.getPlayerId();
}
+ public static net.tfminecraft.magic.gear.ownership.GearIdentity.Token actor(Location station) {
+ if (station == null) return null;
+ GearOrbSession session = SESSIONS.get(GearStationStore.key(station));
+ return session == null ? null : session.actor();
+ }
/**
* Stops the run without writing captured aura or rift. The charge stays spent.
@@ -118,8 +137,14 @@ public static boolean begin(
Map snapshot,
String primaryElement,
int chargeTier) {
+ var token = GearStationStore.property().identity().current(player);
+ return token.isPresent() && begin(player, station, snapshot, primaryElement, chargeTier, token.orElseThrow());
+ }
+ public static boolean begin(Player player, Location station, Map snapshot, String primaryElement,
+ int chargeTier, net.tfminecraft.magic.gear.ownership.GearIdentity.Token token) {
CharacterSession identity = Characters.currentSession(player).orElse(null);
- if (!SessionGuard.isCurrent(identity)) {
+ if (!GearStationStore.property().identity().current(token, player) || identity == null
+ || !net.tfminecraft.magic.gear.ownership.GearCharacterBridge.token(identity).equals(token) || !SessionGuard.isCurrent(identity)) {
return false;
}
World world = station == null ? null : station.getWorld();
@@ -127,7 +152,7 @@ public static boolean begin(
return false;
}
String key = GearStationStore.key(station);
- if (SESSIONS.containsKey(key)) {
+ if (SESSIONS.containsKey(key) || GearStationStore.get(station) == null) {
return false;
}
GearOrbSession session = new GearOrbSession(
@@ -169,8 +194,8 @@ private static void complete(GearOrbSession session, boolean announce) {
}
session.end();
Player player = Bukkit.getPlayer(session.getPlayerId());
- GearStationStore.Occupancy occupancy = GearStationStore.get(session.getStation());
- if (occupancy == null) {
+ GearStationStore.Occupancy occupancy = session.occupancy();
+ if (occupancy == null || GearStationStore.get(session.getStation()) != occupancy) {
return;
}
occupancy.setOrbSessionActive(false);
@@ -195,7 +220,9 @@ private static void complete(GearOrbSession session, boolean announce) {
} else {
weapon = WeaponLore.updateItem(weapon);
}
- GearStationStore.update(session.getStation(), weapon);
+ if (!GearStationStore.update(session.getStation(), occupancy, weapon)) {
+ net.tfminecraft.magic.gear.ownership.GearEffects.hold(occupancy.generation()); return;
+ }
if (player != null && player.isOnline() && session.isCurrent()) {
Magic.plugin.syncSpellModifiers(
player, Magic.plugin.getResonanceGuiManager().getSessionManager().get(player));
diff --git a/src/main/java/net/tfminecraft/magic/gear/orb/GearOrbSession.java b/src/main/java/net/tfminecraft/magic/gear/orb/GearOrbSession.java
index 8a10d0a..55a44ec 100644
--- a/src/main/java/net/tfminecraft/magic/gear/orb/GearOrbSession.java
+++ b/src/main/java/net/tfminecraft/magic/gear/orb/GearOrbSession.java
@@ -32,6 +32,7 @@
public final class GearOrbSession {
private final CharacterSession identity;
+ private final net.tfminecraft.magic.gear.GearStationStore.Occupancy occupancy;
private final Location station;
private final UUID playerId;
private final Map snapshot;
@@ -56,6 +57,7 @@ public GearOrbSession(
OrbCache.Tier tier,
CharacterSession identity) {
this.identity = identity;
+ this.occupancy = net.tfminecraft.magic.gear.GearStationStore.get(station);
this.station = station.clone();
this.playerId = playerId;
this.snapshot = new LinkedHashMap<>(snapshot);
@@ -64,8 +66,15 @@ public GearOrbSession(
this.beamColor = resolveBeamColor(this.primaryElement);
}
+ public net.tfminecraft.magic.gear.GearStationStore.Occupancy occupancy() { return occupancy; }
+ public net.tfminecraft.magic.gear.ownership.GearIdentity.Token actor() {
+ return identity == null ? null : net.tfminecraft.magic.gear.ownership.GearCharacterBridge.token(identity);
+ }
+ public boolean matches(CharacterSession outgoing) { return java.util.Objects.equals(identity, outgoing); }
+
public boolean isCurrent() {
- return SessionGuard.isCurrent(identity);
+ return identity != null && identity.ref().ownerId().equals(playerId)
+ && net.tfminecraft.magic.gear.GearStationStore.property().identity().current(actor(), org.bukkit.Bukkit.getPlayer(playerId));
}
public Location getStation() {
diff --git a/src/main/java/net/tfminecraft/magic/gear/ownership/CharacterGearEstate.java b/src/main/java/net/tfminecraft/magic/gear/ownership/CharacterGearEstate.java
new file mode 100644
index 0000000..58e8bc2
--- /dev/null
+++ b/src/main/java/net/tfminecraft/magic/gear/ownership/CharacterGearEstate.java
@@ -0,0 +1,73 @@
+package net.tfminecraft.magic.gear.ownership;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import net.tfminecraft.magic.Magic;
+import net.tfminecraft.magic.gear.GearStationStore;
+import net.tfminecraft.magic.gear.orb.GearOrbService;
+import net.tfminecraft.tlibs.character.CharacterRef;
+import net.tfminecraft.tlibs.character.Characters;
+import net.tfminecraft.tlibs.character.estate.EstateDecision;
+import net.tfminecraft.tlibs.character.estate.EstateParticipant;
+import net.tfminecraft.tlibs.character.estate.Estates;
+import net.tfminecraft.tlibs.character.estate.Holdings;
+import net.tfminecraft.tlibs.character.estate.Outcome;
+import org.bukkit.plugin.ServicePriority;
+
+/** Only deposited gear and queued returns participate; profiles and focus never do. */
+public final class CharacterGearEstate implements EstateParticipant {
+ private final Magic plugin;
+ private final Map> reported = new java.util.HashMap<>();
+ public CharacterGearEstate(Magic plugin) { this.plugin = plugin; }
+ public static void start(Magic plugin) {
+ CharacterGearEstate participant = new CharacterGearEstate(plugin);
+ plugin.getServer().getServicesManager().register(EstateParticipant.class, participant, plugin, ServicePriority.Normal);
+ plugin.getServer().getScheduler().runTaskTimer(plugin, participant::reconcile, 1L, 72_000L);
+ }
+ public String id() { return "magic-gear"; }
+ public Outcome settle(EstateDecision decision) {
+ if (!Estates.guardHolds(decision)) return Outcome.retry("Current Magic gear estate decision does not hold");
+ GearIdentity.Owner from = owner(decision.testator());
+ // Public runs can be initiated by an entirely different character/account.
+ if (GearOrbService.touches(from)) return Outcome.retry("An orb run still touches the deposited gear");
+ GearPropertyStore store = GearStationStore.property();
+ try {
+ store.validateEstate(decision.deathId(), decision.toString(), from);
+ store.requireReady(from);
+ List moved;
+ if (decision.property().character().isEmpty()) moved = store.retained(decision.deathId(), decision.toString(), from, () -> Estates.guardHolds(decision));
+ else {
+ GearIdentity.Owner to = owner(decision.property().character().orElseThrow());
+ if (GearOrbService.touches(to)) return Outcome.retry("Recipient gear is still being charged");
+ moved = store.transfer(decision.deathId(), decision.toString(), from, to, () -> Estates.guardHolds(decision));
+ }
+ GearStationStore.loadViews();
+ return Outcome.done(Map.of("gear", moved.size()), moved);
+ } catch (GearPropertyStore.Conflict ex) { return Outcome.blocked(ex.getMessage()); }
+ catch (IOException ex) { return Outcome.retry("Could not persist Magic gear estate: " + ex.getMessage()); }
+ }
+ public Holdings describe(UUID character) {
+ try {
+ var info = Characters.info(character).filter(value -> value.ref().characterId().equals(character)).orElseThrow(); GearIdentity.Owner owner = owner(info.ref());
+ List ids = new ArrayList<>(); var store = GearStationStore.property();
+ for (var station : store.stations()) if (station.raw().get("ownership") instanceof Map raw && "CHARACTER".equals(raw.get("kind")) && owner.equals(GearPropertyStore.owner(station.raw())) && !"released".equals(GearPropertyStore.state(station.raw()))) ids.add("station:" + GearPropertyStore.location(station.raw()) + "@" + GearPropertyStore.id(station.raw()));
+ for (var row : store.returns(owner)) if (!"delivered".equals(GearPropertyStore.text(row, "state"))) ids.add("return:" + GearPropertyStore.text(row, "id"));
+ return ids.isEmpty() ? Holdings.NONE : new Holdings(Map.of("gear", ids.size()), ids);
+ } catch (IOException | RuntimeException ex) { return new Holdings(Map.of("heldGear", 1), List.of("Magic gear needs review")); }
+ }
+ void reconcile() {
+ try { GearStationStore.property().migrate(); GearStationStore.loadViews(); }
+ catch (IOException ex) { GearStationStore.warning(ex); }
+ for (EstateDecision decision : Estates.decided()) {
+ try {
+ if (!Estates.guardHolds(decision)) continue;
+ Outcome outcome = settle(decision); var result = Map.entry(decision.revision(), outcome);
+ if (!result.equals(reported.get(decision.deathId())) && Estates.report(decision.deathId(), id(), decision.revision(), outcome)) reported.put(decision.deathId(), result);
+ } catch (RuntimeException ex) { plugin.getLogger().warning("[Magic] Gear estate held: " + decision.deathId() + " " + ex); }
+ }
+ }
+ private static GearIdentity.Owner owner(CharacterRef ref) { return new GearIdentity.Owner(ref.ownerId(), ref.characterId()); }
+}
diff --git a/src/main/java/net/tfminecraft/magic/gear/ownership/GearCharacterBridge.java b/src/main/java/net/tfminecraft/magic/gear/ownership/GearCharacterBridge.java
new file mode 100644
index 0000000..1e9a8b8
--- /dev/null
+++ b/src/main/java/net/tfminecraft/magic/gear/ownership/GearCharacterBridge.java
@@ -0,0 +1,33 @@
+package net.tfminecraft.magic.gear.ownership;
+
+import java.util.Optional;
+import java.util.UUID;
+import net.tfminecraft.tlibs.character.CharacterSession;
+import net.tfminecraft.tlibs.character.Characters;
+import org.bukkit.entity.Player;
+
+/** Capability-probed property APIs; profile and progression behavior is separate. */
+public final class GearCharacterBridge implements GearIdentity {
+ public GearCharacterBridge() {}
+ public static Token token(CharacterSession session) {
+ return new Token(new Owner(session.ref().ownerId(), session.ref().characterId()), session.sessionId());
+ }
+ public Optional current(Player player) {
+ if (player == null) return Optional.empty();
+ return Characters.currentSession(player)
+ .filter(session -> player.getUniqueId().equals(session.ref().ownerId()))
+ .filter(Characters::isCurrent)
+ .filter(session -> Characters.info(session.ref().characterId())
+ .filter(info -> session.ref().equals(info.ref()) && info.alive()).isPresent())
+ .map(GearCharacterBridge::token);
+ }
+ public boolean current(Token token, Player player) {
+ return token != null && current(player).filter(token::equals).isPresent();
+ }
+ public boolean heirsReady() { return Characters.legacyHeirsReady(); }
+ public Optional heir(UUID account) {
+ if (account == null) return Optional.empty();
+ return Characters.legacyHeir(account).filter(ref -> account.equals(ref.ownerId()))
+ .map(ref -> new Owner(ref.ownerId(), ref.characterId()));
+ }
+}
diff --git a/src/main/java/net/tfminecraft/magic/gear/ownership/GearEffects.java b/src/main/java/net/tfminecraft/magic/gear/ownership/GearEffects.java
new file mode 100644
index 0000000..9d09f3a
--- /dev/null
+++ b/src/main/java/net/tfminecraft/magic/gear/ownership/GearEffects.java
@@ -0,0 +1,145 @@
+package net.tfminecraft.magic.gear.ownership;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import net.tfminecraft.magic.gear.GearStationStore;
+import net.tfminecraft.magic.gear.orb.GearOrbService;
+import net.tfminecraft.magic.util.ItemRef;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+/** Paper inventory saves and these files are separate durability domains; ambiguity is held. */
+public final class GearEffects {
+ private GearEffects() {}
+ public static List frame(ItemStack[] contents) {
+ List frame = new ArrayList<>(); for (ItemStack item : contents) frame.add(item == null || item.getType().isAir() ? null : GearPropertyStore.b64(net.tfminecraft.magic.gear.ownership.GearItems.bytes(item))); return frame;
+ }
+ public static ItemStack[] cloneContents(ItemStack[] contents) {
+ ItemStack[] clone = new ItemStack[contents.length]; for (int i = 0; i < contents.length; i++) clone[i] = contents[i] == null ? null : contents[i].clone(); return clone;
+ }
+ public static GearStationStore.Occupancy deposit(Player player, GearIdentity.Token token, Location location, ItemStack item,
+ Map charged, boolean rested, ItemStack[] inventoryAfter, List before) {
+ GearPropertyStore store = GearStationStore.property();
+ if (!store.identity().current(token, player) || location == null || location.getWorld() == null || item == null) return null;
+ if (!before.equals(frame(player.getInventory().getContents()))) return null;
+ UUID operation = UUID.randomUUID();
+ Map row = new LinkedHashMap<>(); row.put("world", location.getWorld().getName()); row.put("x", location.getBlockX()); row.put("y", location.getBlockY()); row.put("z", location.getBlockZ());
+ row.put("owner", token.owner().account().toString()); row.put("occupancy-id", operation.toString()); row.put("ownership", GearPropertyStore.ownership(token.owner())); row.put("effect-state", "depositing");
+ row.put("item-bytes", GearPropertyStore.b64(net.tfminecraft.magic.gear.ownership.GearItems.bytes(item))); row.put("rested", rested);
+ if (charged != null) { Map costs = new LinkedHashMap<>(); charged.forEach((path, amount) -> costs.put(Integer.toString(costs.size()), Map.of("path", path, "amount", amount))); row.put("charged", costs); }
+ row.put("deposit-intent", Map.of("operation", operation.toString(), "session", token.session(), "inventory-before", before, "inventory-after", frame(inventoryAfter)));
+ try {
+ store.requireUnlocked(token.owner());
+ if (!store.identity().current(token, player) || !before.equals(frame(player.getInventory().getContents()))) return null;
+ store.insert(row);
+ if (!store.identity().current(token, player) || !before.equals(frame(player.getInventory().getContents()))) {
+ var expected = store.station(operation); var cancelled = GearYaml.copy(expected.raw()); cancelled.put("effect-state", "released"); cancelled.put("effect-result", "cancelled-before-removal"); store.patch(expected, cancelled); return null;
+ }
+ player.getInventory().setContents(cloneContents(inventoryAfter)); player.updateInventory(); InventoryCheckpoint.save(player);
+ var expected = store.station(operation); var after = GearYaml.copy(expected.raw()); after.put("effect-state", "active"); store.patch(expected, after);
+ return GearStationStore.install(location, item, after);
+ } catch (IOException | RuntimeException ex) { hold(operation); GearStationStore.warning(ex); return null; }
+ }
+ public static boolean charge(Player player, GearIdentity.Token token, Location station, ItemStack hand,
+ Map snapshot, String element, int tier) {
+ GearPropertyStore store = GearStationStore.property(); var occupancy = GearStationStore.get(station);
+ if (occupancy == null || !store.identity().current(token, player)) return false;
+ UUID operation = UUID.randomUUID(); List before = frame(player.getInventory().getContents());
+ ItemStack[] afterInventory = cloneContents(player.getInventory().getContents());
+ int slot = player.getInventory().getHeldItemSlot();
+ if (!java.util.Arrays.equals(net.tfminecraft.magic.gear.ownership.GearItems.bytes(hand), net.tfminecraft.magic.gear.ownership.GearItems.bytes(afterInventory[slot]))) return false;
+ if (afterInventory[slot].getAmount() <= 1) afterInventory[slot] = null; else afterInventory[slot].setAmount(afterInventory[slot].getAmount() - 1);
+ try {
+ store.requireUnlocked(token.owner());
+ if (occupancy.characterOwner() != null) store.requireUnlocked(occupancy.characterOwner());
+ var expected = GearStationStore.expected(station, occupancy); if (!"active".equals(GearPropertyStore.state(expected.raw()))) return false;
+ var after = GearYaml.copy(expected.raw());
+ ItemStack spent = hand.clone(); spent.setAmount(1);
+ Map intent = new LinkedHashMap<>(); intent.put("operation", operation.toString()); intent.put("actor-account", token.owner().account().toString()); intent.put("actor-character", token.owner().character().toString()); intent.put("session", token.session()); intent.put("occupancy-id", occupancy.generation().toString()); intent.put("item-hash", GearPropertyStore.hash(net.tfminecraft.magic.gear.ownership.GearItems.bytes(occupancy.getItem()))); intent.put("owner", expected.raw().get("ownership")); intent.put("charge", GearPropertyStore.b64(net.tfminecraft.magic.gear.ownership.GearItems.bytes(spent))); intent.put("snapshot", snapshot); intent.put("element", element); intent.put("tier", tier); intent.put("inventory-before", before); intent.put("inventory-after", frame(afterInventory));
+ after.put("charge-intent", intent); after.put("effect-state", "charging"); store.patch(expected, after);
+ if (!store.identity().current(token, player) || !before.equals(frame(player.getInventory().getContents()))) { var cancelled = store.station(occupancy.generation()); var restored = GearYaml.copy(cancelled.raw()); restored.put("effect-state", "active"); restored.put("charge-result", "cancelled-before-removal"); store.patch(cancelled, restored); return false; }
+ player.getInventory().setContents(afterInventory); player.updateInventory(); InventoryCheckpoint.save(player);
+ occupancy.setOrbSessionActive(true);
+ if (!GearOrbService.begin(player, station, snapshot, element, tier, token)) { occupancy.setOrbSessionActive(false); hold(occupancy.generation()); return false; }
+ return true;
+ } catch (IOException | RuntimeException ex) { hold(occupancy.generation()); GearStationStore.warning(ex); return false; }
+ }
+ public static boolean authorize(Player player, GearStationStore.Occupancy occupancy) {
+ var token = GearStationStore.property().identity().current(player);
+ return token.isPresent() && (player.hasPermission("magic.admin") || occupancy.characterOwner() == null || token.orElseThrow().owner().equals(occupancy.characterOwner()));
+ }
+ public static boolean authorize(Player player, Location station, GearStationStore.Occupancy occupancy) {
+ if (!authorize(player, occupancy)) return false;
+ if (occupancy.characterOwner() != null || player.hasPermission("magic.admin")) return true;
+ GearIdentity.Token actor = GearOrbService.actor(station);
+ return actor == null || GearStationStore.property().identity().current(player).filter(token -> token.owner().equals(actor.owner())).isPresent();
+ }
+ public static boolean abortReturn(Player player, Location station, GearStationStore.Occupancy occupancy, Map charged) {
+ GearPropertyStore store = GearStationStore.property(); var token = store.identity().current(player);
+ if (token.isEmpty() || !authorize(player, station, occupancy)) return false;
+ GearIdentity.Owner recipient = occupancy.characterOwner();
+ if (recipient == null) return false;
+ GearIdentity.Token actor = token.orElseThrow();
+ if (!occupancy.isRested() && charged == null) return false;
+ List items = new ArrayList<>();
+ if (occupancy.isRested()) items.add(GearPropertyStore.b64(net.tfminecraft.magic.gear.ownership.GearItems.bytes(occupancy.getItem())));
+ else for (var cost : charged.entrySet()) {
+ int remaining = cost.getValue();
+ while (remaining > 0) {
+ ItemStack item = ItemRef.build(cost.getKey()); if (item == null || item.getType().isAir()) return false;
+ int amount = Math.min(remaining, item.getMaxStackSize()); item.setAmount(amount); remaining -= amount; items.add(GearPropertyStore.b64(net.tfminecraft.magic.gear.ownership.GearItems.bytes(item)));
+ }
+ }
+ UUID operation = UUID.nameUUIDFromBytes((occupancy.generation() + ":abort").getBytes(java.nio.charset.StandardCharsets.UTF_8));
+ try {
+ store.requireUnlocked(actor.owner());
+ if (!recipient.equals(actor.owner())) store.requireUnlocked(recipient);
+ if (!store.identity().current(actor, player) || GearStationStore.get(station) != occupancy) return false;
+ GearStationStore.expected(station, occupancy);
+ GearOrbService.abort(station);
+ if (GearStationStore.takeForAbort(station) == null) return false;
+ store.createReturn(recipient, operation, items, "held");
+ if (!GearStationStore.acknowledgeRelease(station, occupancy.generation())) return false;
+ JsonObject expected = GearPropertyStore.read(store.returnFile(recipient, operation)); JsonObject pending = expected.deepCopy(); pending.addProperty("state", items.isEmpty() ? "delivered" : "pending"); store.saveReturn(expected, pending);
+ if (recipient.equals(actor.owner())) deliver(player, actor); return true;
+ } catch (IOException | RuntimeException ex) { GearStationStore.warning(ex); return false; }
+ }
+ public static void deliver(Player player, GearIdentity.Token token) {
+ GearPropertyStore store = GearStationStore.property(); if (!store.identity().current(token, player)) return;
+ try {
+ store.requireUnlocked(token.owner());
+ for (JsonObject row : store.returns(token.owner())) {
+ if (!"pending".equals(GearPropertyStore.text(row, "state")) || !store.identity().current(token, player)) continue;
+ if (row.getAsJsonArray("items").isEmpty()) {
+ JsonObject completed = row.deepCopy(); completed.addProperty("state", "delivered"); store.saveReturn(row, completed); continue;
+ }
+ ItemStack[] after = cloneContents(player.getInventory().getStorageContents()); List remaining = new ArrayList<>();
+ for (var value : row.getAsJsonArray("items")) {
+ ItemStack item = net.tfminecraft.magic.gear.ownership.GearItems.item(GearPropertyStore.bytes(value.getAsString())); int amount = item.getAmount();
+ for (int i = 0; i < after.length && amount > 0; i++) if (after[i] == null || after[i].getType().isAir()) { ItemStack part = item.clone(); int count = Math.min(amount, item.getMaxStackSize()); part.setAmount(count); after[i] = part; amount -= count; }
+ if (amount > 0) { item.setAmount(amount); remaining.add(GearPropertyStore.b64(net.tfminecraft.magic.gear.ownership.GearItems.bytes(item))); }
+ }
+ List before = frame(player.getInventory().getStorageContents()); if (before.equals(frame(after))) continue;
+ JsonObject intent = row.deepCopy(); intent.addProperty("state", "delivering"); intent.addProperty("attempt", UUID.randomUUID().toString()); intent.add("inventory-before", strings(before)); intent.add("inventory-after", strings(frame(after))); intent.add("remaining", strings(remaining)); store.saveReturn(row, intent);
+ if (!store.identity().current(token, player) || !before.equals(frame(player.getInventory().getStorageContents()))) { JsonObject pending = intent.deepCopy(); pending.addProperty("state", "pending"); store.saveReturn(intent, pending); continue; }
+ player.getInventory().setStorageContents(after); player.updateInventory(); InventoryCheckpoint.save(player);
+ JsonObject acknowledged = intent.deepCopy(); acknowledged.add("items", strings(remaining)); acknowledged.addProperty("state", remaining.isEmpty() ? "delivered" : "pending"); store.saveReturn(intent, acknowledged);
+ }
+ } catch (IOException | RuntimeException ex) { GearStationStore.warning(ex); }
+ }
+ private static JsonArray strings(List values) { JsonArray array = new JsonArray(); values.forEach(array::add); return array; }
+ public static void hold(UUID id) {
+ try {
+ var store = GearStationStore.property(); var row = store.station(id);
+ if (!java.util.Arrays.asList("depositing", "charging", "releasing").contains(row.raw().get("effect-state"))) return;
+ var held = GearYaml.copy(row.raw()); held.put("effect-state", "held"); store.patch(row, held);
+ } catch (IOException ex) { GearStationStore.warning(ex); }
+ }
+}
diff --git a/src/main/java/net/tfminecraft/magic/gear/ownership/GearFiles.java b/src/main/java/net/tfminecraft/magic/gear/ownership/GearFiles.java
new file mode 100644
index 0000000..481fdda
--- /dev/null
+++ b/src/main/java/net/tfminecraft/magic/gear/ownership/GearFiles.java
@@ -0,0 +1,36 @@
+package net.tfminecraft.magic.gear.ownership;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.StandardOpenOption;
+
+/** Acknowledges file contents and every directory link; immutable creates cannot clobber. */
+public final class GearFiles {
+ private GearFiles() {}
+ public static void write(Path file, byte[] data, boolean replace) throws IOException {
+ Path folder = file.toAbsolutePath().getParent();
+ Files.createDirectories(folder);
+ Path pending = Files.createTempFile(folder, "magic-", ".tmp");
+ try {
+ try (FileChannel channel = FileChannel.open(pending, StandardOpenOption.WRITE)) {
+ ByteBuffer bytes = ByteBuffer.wrap(data);
+ while (bytes.hasRemaining()) channel.write(bytes);
+ channel.force(true);
+ }
+ if (replace) Files.move(pending, file, StandardCopyOption.ATOMIC_MOVE, StandardCopyOption.REPLACE_EXISTING);
+ else try { Files.createLink(file, pending); }
+ catch (UnsupportedOperationException ex) { throw new IOException("No-clobber publication unavailable", ex); }
+ for (Path parent = folder; parent != null; parent = parent.getParent()) force(parent);
+ } finally { Files.deleteIfExists(pending); }
+ }
+ public static void delete(Path file) throws IOException {
+ if (Files.deleteIfExists(file)) force(file.toAbsolutePath().getParent());
+ }
+ static void force(Path folder) throws IOException {
+ try (FileChannel channel = FileChannel.open(folder, StandardOpenOption.READ)) { channel.force(true); }
+ }
+}
diff --git a/src/main/java/net/tfminecraft/magic/gear/ownership/GearIdentity.java b/src/main/java/net/tfminecraft/magic/gear/ownership/GearIdentity.java
new file mode 100644
index 0000000..2ebd560
--- /dev/null
+++ b/src/main/java/net/tfminecraft/magic/gear/ownership/GearIdentity.java
@@ -0,0 +1,32 @@
+package net.tfminecraft.magic.gear.ownership;
+
+import java.util.Optional;
+import java.util.UUID;
+import org.bukkit.entity.Player;
+
+/** Optional character APIs stay outside queue files and deferred tokens. */
+public interface GearIdentity {
+ record Owner(UUID account, UUID character) {}
+ record Token(Owner owner, long session) {}
+ Optional current(Player player);
+ boolean current(Token token, Player player);
+ boolean heirsReady();
+ Optional heir(UUID account);
+
+ static GearIdentity load() {
+ try {
+ Class api = Class.forName("net.tfminecraft.tlibs.character.Characters");
+ api.getMethod("legacyHeir", UUID.class);
+ api.getMethod("legacyHeirsReady");
+ return (GearIdentity) Class.forName("net.tfminecraft.magic.gear.ownership.GearCharacterBridge")
+ .getConstructor().newInstance();
+ } catch (ReflectiveOperationException | LinkageError unavailable) {
+ return new GearIdentity() {
+ public Optional current(Player player) { return Optional.empty(); }
+ public boolean current(Token token, Player player) { return false; }
+ public boolean heirsReady() { return false; }
+ public Optional heir(UUID account) { return Optional.empty(); }
+ };
+ }
+ }
+}
diff --git a/src/main/java/net/tfminecraft/magic/gear/ownership/GearItems.java b/src/main/java/net/tfminecraft/magic/gear/ownership/GearItems.java
new file mode 100644
index 0000000..c734182
--- /dev/null
+++ b/src/main/java/net/tfminecraft/magic/gear/ownership/GearItems.java
@@ -0,0 +1,10 @@
+package net.tfminecraft.magic.gear.ownership;
+
+import org.bukkit.inventory.ItemStack;
+
+/** Exact Paper item bytes, including third-party metadata. */
+public final class GearItems {
+ private GearItems() {}
+ public static byte[] bytes(ItemStack item) { return item.serializeAsBytes(); }
+ public static ItemStack item(byte[] bytes) { return ItemStack.deserializeBytes(bytes); }
+}
diff --git a/src/main/java/net/tfminecraft/magic/gear/ownership/GearJson.java b/src/main/java/net/tfminecraft/magic/gear/ownership/GearJson.java
new file mode 100644
index 0000000..9e850ec
--- /dev/null
+++ b/src/main/java/net/tfminecraft/magic/gear/ownership/GearJson.java
@@ -0,0 +1,38 @@
+package net.tfminecraft.magic.gear.ownership;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import java.io.IOException;
+import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
+import java.util.HashSet;
+
+/** Raw documents preserve unknown fields and explicit nulls; duplicate names are held. */
+public final class GearJson {
+ public static final Gson GSON = new GsonBuilder().serializeNulls().create();
+ private GearJson() {}
+ public static JsonObject parse(String source) throws IOException {
+ try (JsonReader reader = new JsonReader(new StringReader(source))) {
+ reader.setStrictness(com.google.gson.Strictness.STRICT);
+ names(reader); reader.peek();
+ return JsonParser.parseString(source).getAsJsonObject();
+ } catch (RuntimeException ex) { throw new IOException("Unreadable gear document", ex); }
+ }
+ private static void names(JsonReader reader) throws IOException {
+ if (reader.peek() == JsonToken.BEGIN_OBJECT) {
+ reader.beginObject(); var seen = new HashSet();
+ while (reader.hasNext()) {
+ if (!seen.add(reader.nextName())) throw new IOException("Duplicate gear field");
+ names(reader);
+ }
+ reader.endObject();
+ } else if (reader.peek() == JsonToken.BEGIN_ARRAY) {
+ reader.beginArray(); while (reader.hasNext()) names(reader); reader.endArray();
+ } else reader.skipValue();
+ }
+ public static byte[] bytes(JsonObject raw) { return GSON.toJson(raw).getBytes(StandardCharsets.UTF_8); }
+}
diff --git a/src/main/java/net/tfminecraft/magic/gear/ownership/GearOwnershipLifecycle.java b/src/main/java/net/tfminecraft/magic/gear/ownership/GearOwnershipLifecycle.java
new file mode 100644
index 0000000..fa02c58
--- /dev/null
+++ b/src/main/java/net/tfminecraft/magic/gear/ownership/GearOwnershipLifecycle.java
@@ -0,0 +1,20 @@
+package net.tfminecraft.magic.gear.ownership;
+
+import net.tfminecraft.magic.Magic;
+
+/** Optional estate types are never linked on the older TLibs runtime. */
+public final class GearOwnershipLifecycle {
+ private GearOwnershipLifecycle() {}
+ public static void start(Magic plugin) {
+ try {
+ Class.forName("net.tfminecraft.tlibs.character.estate.Estates");
+ Class.forName("net.tfminecraft.magic.gear.ownership.CharacterGearEstate").getMethod("start", Magic.class).invoke(null, plugin);
+ } catch (ClassNotFoundException | LinkageError unavailable) {
+ plugin.getLogger().warning("[Magic] Character gear ownership is held until current TLibs estate APIs are available.");
+ } catch (java.lang.reflect.InvocationTargetException failure) {
+ plugin.getLogger().log(java.util.logging.Level.SEVERE, "[Magic] Character gear estate participant failed to start.", failure.getCause());
+ } catch (ReflectiveOperationException | RuntimeException failure) {
+ plugin.getLogger().log(java.util.logging.Level.SEVERE, "[Magic] Character gear estate participant failed to start.", failure);
+ }
+ }
+}
diff --git a/src/main/java/net/tfminecraft/magic/gear/ownership/GearPropertyStore.java b/src/main/java/net/tfminecraft/magic/gear/ownership/GearPropertyStore.java
new file mode 100644
index 0000000..3e4ff83
--- /dev/null
+++ b/src/main/java/net/tfminecraft/magic/gear/ownership/GearPropertyStore.java
@@ -0,0 +1,549 @@
+package net.tfminecraft.magic.gear.ownership;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.function.BooleanSupplier;
+import net.tfminecraft.magic.gear.ownership.GearIdentity.Owner;
+
+/** Raw property files are authoritative; loaded displays and menus are disposable views. */
+public final class GearPropertyStore {
+ public static final class Conflict extends IOException { public Conflict(String message) { super(message); } }
+ public record Station(Object key, Map raw) {}
+ private final Path root;
+ private final GearIdentity identity;
+ public GearPropertyStore(Path root, GearIdentity identity) { this.root = root.toAbsolutePath().normalize(); this.identity = identity; }
+ public Path root() { return root; }
+ public GearIdentity identity() { return identity; }
+ private Path stationFile() { return root.resolve("gear-stations.yml"); }
+
+ private Map document() throws IOException {
+ Map raw = Files.exists(stationFile()) ? GearYaml.read(Files.readAllBytes(stationFile())) : new LinkedHashMap<>();
+ if (!raw.containsKey("stations")) raw.put("stations", new LinkedHashMap<>());
+ if (!(raw.get("stations") instanceof Map)) throw new Conflict("Station mapping needs review");
+ return raw;
+ }
+ @SuppressWarnings("unchecked")
+ private static Map mapping(Map document) { return (Map) document.get("stations"); }
+ public List stations() throws IOException {
+ List rows = new ArrayList<>();
+ for (var entry : mapping(document()).entrySet()) if (entry.getValue() instanceof Map map) rows.add(new Station(entry.getKey(), GearYaml.copy(map)));
+ var ids = new java.util.HashSet(); var places = new java.util.HashSet();
+ for (Station station : rows) {
+ Object id = station.raw().get("occupancy-id");
+ if (id instanceof String value && !ids.add(value)) throw new Conflict("Duplicate occupancy ID");
+ String at = knownLocation(station.raw());
+ if (!"released".equals(station.raw().get("effect-state")) && at != null && !places.add(at)) throw new Conflict("Duplicate occupied location");
+ }
+ return rows;
+ }
+ public static String location(Map row) throws IOException {
+ Object world = row.get("world");
+ if (!(world instanceof String text) || text.isBlank() || text.contains(",")) throw new Conflict("Invalid station world");
+ return text + "," + coordinate(row.get("x")) + "," + coordinate(row.get("y")) + "," + coordinate(row.get("z"));
+ }
+ private static String knownLocation(Map row) {
+ if (!(row.get("world") instanceof String world) || world.isBlank() || world.contains(",")
+ || !(row.get("x") instanceof Integer) || !(row.get("y") instanceof Integer) || !(row.get("z") instanceof Integer)) return null;
+ return world + "," + row.get("x") + "," + row.get("y") + "," + row.get("z");
+ }
+ private static int coordinate(Object value) throws IOException {
+ if (!(value instanceof Integer)) throw new Conflict("Invalid station coordinate");
+ return (Integer) value;
+ }
+ public static UUID id(Map row) throws IOException { return uuid(row.get("occupancy-id")); }
+ public static Owner owner(Map row) throws IOException {
+ if (!(row.get("ownership") instanceof Map own) || !Integer.valueOf(1).equals(own.get("format")) || !"CHARACTER".equals(own.get("kind"))) throw new Conflict("Character ownership needs review");
+ return new Owner(uuid(own.get("account")), uuid(own.get("character")));
+ }
+ public static UUID uuid(Object value) throws IOException {
+ try { UUID uuid = UUID.fromString((String) value); if (!uuid.toString().equals(value)) throw new IllegalArgumentException(); return uuid; }
+ catch (RuntimeException ex) { throw new Conflict("Invalid canonical UUID"); }
+ }
+ public static String state(Map row) throws IOException {
+ Object state = row.get("effect-state");
+ if (!(state instanceof String value) || !List.of("depositing", "active", "charging", "releasing", "held", "released").contains(value)) throw new Conflict("Station effect state needs review");
+ return value;
+ }
+ public Station station(UUID id) throws IOException {
+ Station found = null;
+ for (Station station : stations()) if (id.toString().equals(station.raw().get("occupancy-id"))) {
+ found = station;
+ }
+ if (found == null) throw new Conflict("Occupancy disappeared"); return found;
+ }
+ public boolean occupied(String at) throws IOException {
+ for (Station station : stations()) if (at.equals(knownLocation(station.raw())) && !"released".equals(station.raw().get("effect-state"))) return true;
+ return false;
+ }
+ public void insert(Map row) throws IOException {
+ String at = location(row); UUID id = id(row); owner(row); state(row);
+ if (occupied(at)) throw new Conflict("Station is occupied or held");
+ Map document = document(); mapping(document).put(id.toString(), GearYaml.copy(row));
+ saveStations(document);
+ }
+ public void patch(Station expected, Map after) throws IOException {
+ Map document = document(); Object current = mapping(document).get(expected.key());
+ if (!(current instanceof Map map) || !GearYaml.equal(map, expected.raw())) throw new Conflict("Station changed before publication");
+ mapping(document).put(expected.key(), GearYaml.copy(after)); saveStations(document);
+ }
+ private void saveStations(Map document) throws IOException { GearFiles.write(stationFile(), GearYaml.bytes(document), true); }
+ public void holdInterrupted() throws IOException {
+ for (Station station : stations()) if (java.util.Arrays.asList("depositing", "charging", "releasing").contains(station.raw().get("effect-state"))) {
+ Map after = GearYaml.copy(station.raw()); after.put("effect-state", "held"); patch(station, after);
+ }
+ for (Path file : returnFiles()) {
+ JsonObject row = read(file); validateReturn(file, row);
+ if ("delivering".equals(text(row, "state"))) { row.addProperty("state", "held"); write(file, row); }
+ }
+ }
+
+ /** Existing plans fix their reviewed recipient; changing mappings never redirects a retry. */
+ public void migrate() throws IOException {
+ if (!identity.heirsReady()) return;
+ for (Path file : files(root.resolve("gear-ownership/migration"))) {
+ JsonObject journal = journal(file, "migration", null, null);
+ for (var entry : entries(journal)) {
+ if ("moved".equals(text(entry, "phase")) && sourceMatches(entry, "before")) throw new Conflict("Completed legacy source was restored");
+ preflight(entry);
+ }
+ for (var entry : entries(journal)) apply(file, journal, entry, () -> identity.heirsReady(), false);
+ }
+ JsonObject journal = new JsonObject(); journal.addProperty("format", 1); journal.addProperty("kind", "migration");
+ UUID run = UUID.randomUUID(); journal.addProperty("run", run.toString()); journal.add("entries", new JsonArray());
+ for (Station station : stations()) {
+ if (station.raw().containsKey("ownership")) continue;
+ if (!(station.key() instanceof String || station.key() instanceof Integer)) { classify(station, "HELD"); continue; }
+ Object legacy = station.raw().get("owner");
+ if (legacy == null) { classify(station, "OWNERLESS"); continue; }
+ UUID account;
+ try { account = uuid(legacy); location(station.raw()); }
+ catch (IOException ex) { classify(station, "HELD"); continue; }
+ var heir = identity.heir(account);
+ if (heir.isEmpty() || !account.equals(heir.orElseThrow().account())) continue;
+ Map after = GearYaml.copy(station.raw()); UUID id = UUID.randomUUID();
+ after.put("occupancy-id", id.toString()); after.put("ownership", ownership(heir.orElseThrow())); after.put("effect-state", "active");
+ JsonObject entry = plan("station", "station:" + location(after) + "@" + id, id, "gear-stations.yml", "gear-stations.yml", GearYaml.bytes(station.raw()), GearYaml.bytes(after));
+ entry.addProperty("selector", b64(GearYaml.bytes(Map.of("key", station.key())))); entry.addProperty("from-account", account.toString()); ref(entry, "to", heir.orElseThrow());
+ journal.getAsJsonArray("entries").add(entry);
+ }
+ if (entries(journal).isEmpty()) return;
+ for (var entry : entries(journal)) backup(payload(entry, "before"));
+ Path file = root.resolve("gear-ownership/migration").resolve(run + ".json"); write(file, journal);
+ journal(file, "migration", null, null);
+ for (var entry : entries(journal)) apply(file, journal, entry, () -> identity.heirsReady(), false);
+ }
+ private void classify(Station station, String kind) throws IOException {
+ Map after = GearYaml.copy(station.raw()); after.put("ownership", Map.of("format", 1, "kind", kind));
+ after.put("occupancy-id", UUID.randomUUID().toString()); after.put("effect-state", "HELD".equals(kind) ? "held" : "active"); patch(station, after);
+ }
+ public static Map ownership(Owner owner) {
+ Map authority = new LinkedHashMap<>();
+ authority.put("format", 1); authority.put("kind", "CHARACTER");
+ authority.put("account", owner.account().toString()); authority.put("character", owner.character().toString());
+ return authority;
+ }
+
+ public Path returnFile(Owner owner, UUID id) { return root.resolve("gear-returns").resolve(owner.character().toString()).resolve(id + ".json"); }
+ public void createReturn(Owner owner, UUID id, List items, String state) throws IOException {
+ for (Path existing : returnFiles()) if (existing.getFileName().toString().equals(id + ".json")) throw new Conflict("Return operation ID already exists");
+ JsonObject row = new JsonObject(); row.addProperty("format", 1); row.addProperty("id", id.toString()); setReturnOwner(row, owner); row.addProperty("state", state);
+ JsonArray payload = new JsonArray(); items.forEach(payload::add); row.add("items", payload); validateReturn(returnFile(owner, id), row);
+ GearFiles.write(returnFile(owner, id), GearJson.bytes(row), false);
+ }
+ public List returns(Owner owner) throws IOException {
+ List rows = new ArrayList<>();
+ for (Path file : returnFiles()) {
+ JsonObject row = read(file); validateReturn(file, row);
+ if (returnOwner(row).equals(owner)) rows.add(row);
+ }
+ return rows;
+ }
+ public void saveReturn(JsonObject expected, JsonObject after) throws IOException {
+ Path file = returnFile(returnOwner(expected), uuid(text(expected, "id"))); validateReturn(file, after);
+ if (!java.util.Arrays.equals(GearJson.bytes(read(file)), GearJson.bytes(expected))) throw new Conflict("Return changed before publication"); write(file, after);
+ }
+ private List returnFiles() throws IOException {
+ List paths = new ArrayList<>(); for (Path folder : files(root.resolve("gear-returns"))) paths.addAll(files(folder));
+ Map> ids = new LinkedHashMap<>();
+ for (Path file : paths) { JsonObject row = read(file); validateReturn(file, row); ids.computeIfAbsent(uuid(text(row, "id")), ignored -> new ArrayList<>()).add(file); }
+ for (var entry : ids.entrySet()) if (entry.getValue().size() > 1 && !fixedPublicationPair(entry.getKey(), entry.getValue())) throw new Conflict("Duplicate global return operation ID");
+ return paths;
+ }
+ private boolean fixedPublicationPair(UUID id, List copies) throws IOException {
+ if (copies.size() != 2) return false;
+ for (Path file : files(root.resolve("gear-ownership/estates"))) {
+ JsonObject raw = read(file); JsonObject journal = journal(file, "estate", uuid(text(raw, "death")), ref(raw, "from"));
+ for (JsonObject entry : entries(journal)) if ("return".equals(text(entry, "type")) && id.toString().equals(text(entry, "id")) && !"moved".equals(text(entry, "phase")) && !Files.exists(receiptFile(uuid(text(entry, "death")), text(entry, "property")))) {
+ Path source = path(text(entry, "source")), target = path(text(entry, "target"));
+ if (copies.contains(source) && copies.contains(target) && hash(Files.readAllBytes(source)).equals(text(entry, "before-hash")) && hash(Files.readAllBytes(target)).equals(text(entry, "after-hash"))) return true;
+ }
+ }
+ return false;
+ }
+ public static Owner returnOwner(JsonObject row) throws IOException { return new Owner(uuid(text(row, "owner-account")), uuid(text(row, "owner-character"))); }
+ public static void setReturnOwner(JsonObject row, Owner owner) { row.addProperty("owner-account", owner.account().toString()); row.addProperty("owner-character", owner.character().toString()); }
+ public void validateReturn(Path file, JsonObject row) throws IOException {
+ try {
+ if (!integer(row, "format", 1) || !file.equals(returnFile(returnOwner(row), uuid(text(row, "id")))) || !List.of("pending", "delivering", "held", "delivered").contains(text(row, "state")) || !row.get("items").isJsonArray()) throw new Conflict("Return schema/full owner/path needs review");
+ for (var item : row.getAsJsonArray("items")) bytes(item.getAsString());
+ } catch (RuntimeException ex) { throw new Conflict("Malformed return item/envelope"); }
+ }
+
+ public void requireReady(Owner owner) throws IOException {
+ if (!identity.heirsReady()) throw new IOException("Reviewed legacy ownership is not ready");
+ migrate();
+ for (Station station : stations()) {
+ Map row = station.raw();
+ if (!row.containsKey("ownership") && owner.account().toString().equals(row.get("owner"))) throw new Conflict("Legacy station still needs reviewed ownership");
+ if (row.get("ownership") instanceof Map own && "CHARACTER".equals(own.get("kind"))) {
+ Owner resolved = owner(row);
+ if (owner.equals(resolved) && !List.of("active", "released").contains(state(row))) throw new Conflict("Inventory/world intent needs staff recovery");
+ } else if (owner.account().toString().equals(row.get("owner"))) throw new Conflict("Malformed station ownership needs review");
+ }
+ for (JsonObject row : returns(owner)) if (List.of("held", "delivering").contains(text(row, "state"))) throw new Conflict("Return inventory intent needs staff recovery");
+ }
+ public void requireUnlocked(Owner owner) throws IOException {
+ for (Path file : files(root.resolve("gear-ownership/migration"))) {
+ JsonObject journal = journal(file, "migration", null, null);
+ for (JsonObject entry : entries(journal)) if (!"moved".equals(text(entry, "phase")) && owner.equals(ref(entry, "to"))) throw new Conflict("Fixed legacy publication needs recovery");
+ }
+ for (Path file : files(root.resolve("gear-ownership/estates"))) {
+ JsonObject raw = read(file); JsonObject journal = journal(file, "estate", uuid(text(raw, "death")), ref(raw, "from"));
+ checkReceipts(journal, uuid(text(raw, "death")), ref(raw, "from"));
+ checkCompletions(journal, uuid(text(raw, "death")), ref(raw, "from"));
+ for (JsonObject entry : entries(journal)) if (!"moved".equals(text(entry, "phase")) && (owner.equals(ref(entry, "from")) || owner.equals(ref(entry, "to")))) throw new Conflict("Fixed estate publication needs recovery");
+ }
+ }
+ public List transfer(UUID death, String decision, Owner from, Owner to, BooleanSupplier guard) throws IOException {
+ long revision = decision(decision, death, from, to);
+ Path file = root.resolve("gear-ownership/estates").resolve(death + ".json"); JsonObject journal = estate(file, death, from);
+ checkReceipts(journal, death, from);
+ checkCompletions(journal, death, from);
+ if (completed(journal, death, decision, revision, from)) return moved(journal);
+ boolean continuing = false; var plannedIds = new java.util.HashSet();
+ for (JsonObject entry : entries(journal)) if (entry.get("revision").getAsLong() == revision) { continuing = true; plannedIds.add(text(entry, "property")); }
+ if (continuing && !plannedIds.containsAll(properties(from))) throw new Conflict("New source holdings require a newer estate revision");
+ for (JsonObject entry : entries(journal)) if (!"moved".equals(text(entry, "phase")) && !decision.equals(text(entry, "decision"))) {
+ if (!untouched(entry)) throw new Conflict("Older partial estate publication needs recovery");
+ }
+ var kept = new JsonArray(); for (JsonObject entry : entries(journal)) if ("moved".equals(text(entry, "phase")) || decision.equals(text(entry, "decision"))) kept.add(entry);
+ journal.add("entries", kept);
+ if (!from.equals(to)) {
+ for (Station station : stations()) {
+ Map row = station.raw();
+ if (!(row.get("ownership") instanceof Map own) || !"CHARACTER".equals(own.get("kind")) || !from.equals(owner(row)) || "released".equals(state(row))) continue;
+ if (!"active".equals(state(row))) throw new Conflict("Station effect is unresolved");
+ UUID id = id(row); String property = "station:" + location(row) + "@" + id;
+ if (has(journal, property)) continue;
+ Map after = GearYaml.copy(row); Map authority = new LinkedHashMap<>((Map) after.get("ownership")); authority.put("account", to.account().toString()); authority.put("character", to.character().toString()); after.put("ownership", authority);
+ JsonObject entry = plan("station", property, id, "gear-stations.yml", "gear-stations.yml", GearYaml.bytes(row), GearYaml.bytes(after)); entry.addProperty("selector", b64(GearYaml.bytes(Map.of("key", station.key())))); estateEnvelope(entry, death, decision, revision, from, to); kept.add(entry);
+ }
+ for (JsonObject row : returns(from)) {
+ if ("delivered".equals(text(row, "state"))) continue;
+ if (!"pending".equals(text(row, "state"))) throw new Conflict("Return effect is unresolved");
+ UUID id = uuid(text(row, "id")); String property = "return:" + id; if (has(journal, property)) continue;
+ JsonObject after = row.deepCopy(); setReturnOwner(after, to);
+ JsonObject entry = plan("return", property, id, relative(returnFile(from, id)), relative(returnFile(to, id)), GearJson.bytes(row), GearJson.bytes(after)); estateEnvelope(entry, death, decision, revision, from, to); kept.add(entry);
+ }
+ }
+ for (var entry : entries(journal)) backup(payload(entry, "before"));
+ write(file, journal); journal(file, "estate", death, from);
+ for (var entry : entries(journal)) preflight(entry);
+ for (JsonObject entry : entries(journal)) if (!"moved".equals(text(entry, "phase"))) apply(file, journal, entry, guard, true);
+ complete(file, journal, death, decision, revision, from, guard);
+ return moved(journal);
+ }
+ public List retained(UUID death, String decision, Owner from, BooleanSupplier guard) throws IOException {
+ Path file = root.resolve("gear-ownership/estates").resolve(death + ".json"); JsonObject journal = estate(file, death, from); checkReceipts(journal, death, from);
+ checkCompletions(journal, death, from);
+ Captured request = captured(decision, death, from);
+ if (request.to() != null) throw new Conflict("Retained decision has a character recipient");
+ if (completed(journal, death, decision, request.revision(), from)) return moved(journal);
+ JsonArray retainedEntries = new JsonArray();
+ for (JsonObject entry : entries(journal)) {
+ if ("moved".equals(text(entry, "phase"))) retainedEntries.add(entry);
+ else if (entry.get("revision").getAsLong() >= request.revision() || !untouched(entry)) throw new Conflict("Partial estate publication needs recovery");
+ }
+ journal.add("entries", retainedEntries);
+ complete(file, journal, death, decision, request.revision(), from, guard);
+ return moved(journal);
+ }
+ /** Reads all historical evidence before the caller performs legacy migration or effects. */
+ public void validateEstate(UUID death, String decision, Owner from) throws IOException {
+ JsonObject journal = estate(root.resolve("gear-ownership/estates").resolve(death + ".json"), death, from);
+ checkReceipts(journal, death, from); checkCompletions(journal, death, from);
+ Captured request = captured(decision, death, from); completed(journal, death, decision, request.revision(), from);
+ }
+ private JsonObject estate(Path file, UUID death, Owner from) throws IOException {
+ if (Files.exists(file)) return journal(file, "estate", death, from);
+ JsonObject raw = new JsonObject(); raw.addProperty("format", 1); raw.addProperty("kind", "estate"); raw.addProperty("death", death.toString()); ref(raw, "from", from); raw.add("entries", new JsonArray()); raw.add("completions", new JsonObject()); return raw;
+ }
+
+ private record Captured(long revision, String kind, Owner to) {}
+ private static Captured captured(String value, UUID death, Owner from) throws IOException {
+ var suffix = java.util.regex.Pattern.compile(", revision=(0|[1-9][0-9]*)]$").matcher(value);
+ String prefix = "EstateDecision[deathId=" + death + ", testator=" + reference(from) + ", diedAt=";
+ int start = value.indexOf(", property="), end = value.indexOf(", guildLocks=", start);
+ if (!value.startsWith(prefix) || !suffix.find() || start < 0 || end < 0) throw new Conflict("Captured estate envelope differs");
+ long revision;
+ try { revision = Long.parseLong(suffix.group(1)); } catch (NumberFormatException ex) { throw new Conflict("Unsupported estate revision"); }
+ String property = value.substring(start + ", property=".length(), end);
+ if (property.equals("Waiting[]")) return new Captured(revision, "WAITING", null);
+ if (property.equals("Frozen[]")) return new Captured(revision, "FROZEN", null);
+ var character = java.util.regex.Pattern.compile("Character\\[ref=CharacterRef\\[ownerId=([^,]+), characterId=([^]]+)]]").matcher(property);
+ if (!character.matches()) throw new Conflict("Unsupported property recipient");
+ return new Captured(revision, "CHARACTER", new Owner(uuid(character.group(1)), uuid(character.group(2))));
+ }
+ private List properties(Owner from) throws IOException {
+ var ids = new java.util.TreeSet();
+ for (Station station : stations()) if (station.raw().get("ownership") instanceof Map own && "CHARACTER".equals(own.get("kind")) && from.equals(owner(station.raw())) && !"released".equals(state(station.raw()))) ids.add("station:" + location(station.raw()) + "@" + id(station.raw()));
+ for (JsonObject row : returns(from)) if (!"delivered".equals(text(row, "state"))) ids.add("return:" + text(row, "id"));
+ return new ArrayList<>(ids);
+ }
+ private Path completionFile(UUID death, long revision) { return root.resolve("gear-ownership/completions").resolve(death.toString()).resolve(revision + ".json"); }
+ private static List strings(JsonObject record, String field) throws IOException {
+ try {
+ List result = new ArrayList<>(); for (var id : record.getAsJsonArray(field)) {
+ if (!id.isJsonPrimitive() || !id.getAsJsonPrimitive().isString()) throw new Conflict("Completion property ID is not text");
+ String value = id.getAsString();
+ if (value.startsWith("return:")) uuid(value.substring(7));
+ else if (value.startsWith("station:")) {
+ int at = value.lastIndexOf('@'); if (at < 8) throw new Conflict("Invalid station receipt ID"); uuid(value.substring(at + 1));
+ String[] parts = value.substring(8, at).split(",", -1); if (parts.length != 4 || parts[0].isBlank()) throw new Conflict("Invalid station completion location");
+ for (int i = 1; i < parts.length; i++) { int coordinate = Integer.parseInt(parts[i]); if (!Integer.toString(coordinate).equals(parts[i])) throw new Conflict("Noncanonical station completion coordinate"); }
+ }
+ else throw new Conflict("Unknown completion property type");
+ result.add(value);
+ }
+ if (!result.equals(new ArrayList<>(new java.util.TreeSet<>(result)))) throw new Conflict("Completion IDs are duplicated or unordered");
+ return result;
+ } catch (RuntimeException ex) { throw new Conflict("Malformed completion IDs"); }
+ }
+ private static List movedAt(JsonObject journal, long revision) throws IOException {
+ var ids = new java.util.TreeSet();
+ for (JsonObject entry : entries(journal)) if ("moved".equals(text(entry, "phase")) && entry.get("revision").getAsLong() <= revision) ids.add(text(entry, "property"));
+ return new ArrayList<>(ids);
+ }
+ private void checkCompletions(JsonObject journal, UUID death, Owner from) throws IOException {
+ try {
+ JsonObject completions = journal.getAsJsonObject("completions"); if (completions == null) throw new Conflict("Completion inventory is missing");
+ var expected = new java.util.HashSet();
+ for (var completion : completions.entrySet()) {
+ JsonObject row = completion.getValue().getAsJsonObject(); Captured decision = captured(text(row, "decision"), death, from); long revision = decision.revision(); Path file = completionFile(death, revision); expected.add(file);
+ if (!completion.getKey().equals(Long.toString(revision)) || !integer(row, "format", 1) || !"completion".equals(text(row, "kind")) || !death.equals(uuid(text(row, "death"))) || !from.equals(ref(row, "from")) || !integer(row, "revision", revision) || !decision.kind().equals(text(row, "recipient-kind"))) throw new Conflict("Completion full envelope differs");
+ if (decision.to() == null ? row.has("to-account") || row.has("to-character") : !decision.to().equals(ref(row, "to"))) throw new Conflict("Completion full recipient differs");
+ List moved = strings(row, "moved"), retained = strings(row, "retained");
+ for (JsonObject entry : entries(journal)) if (entry.get("revision").getAsLong() == revision && !text(row, "decision").equals(text(entry, "decision"))) throw new Conflict("Historical completion and captured entries disagree");
+ if (!moved.equals(movedAt(journal, revision)) || !row.getAsJsonObject("counts").keySet().equals(java.util.Set.of("gear")) || !integer(row.getAsJsonObject("counts"), "gear", moved.size()) || retained.stream().anyMatch(moved::contains)) throw new Conflict("Completion counts/property inventory differs");
+ if (!Files.exists(file) || !java.util.Arrays.equals(Files.readAllBytes(file), GearJson.bytes(row))) throw new Conflict("Independent completion evidence differs");
+ }
+ if (!expected.equals(new java.util.HashSet<>(files(root.resolve("gear-ownership/completions").resolve(death.toString()))))) throw new Conflict("Completion inventory disappeared or grew");
+ } catch (RuntimeException ex) { throw new Conflict("Malformed completion evidence"); }
+ }
+ private boolean completed(JsonObject journal, UUID death, String decision, long revision, Owner from) throws IOException {
+ for (JsonObject entry : entries(journal)) if (entry.get("revision").getAsLong() == revision && !decision.equals(text(entry, "decision"))) throw new Conflict("Same revision captured a different full decision");
+ JsonObject completions = journal.getAsJsonObject("completions"); JsonObject record = completions.getAsJsonObject(Long.toString(revision));
+ for (String previous : completions.keySet()) if (Long.parseLong(previous) > revision) throw new Conflict("Estate revision went backwards");
+ if (record == null) return false;
+ if (!decision.equals(text(record, "decision")) || !strings(record, "retained").equals(properties(from))) throw new Conflict("Completed revision changed its decision or source holdings");
+ return true;
+ }
+ private void complete(Path file, JsonObject journal, UUID death, String decision, long revision, Owner from, BooleanSupplier guard) throws IOException {
+ Captured recipient = captured(decision, death, from);
+ JsonObject record = new JsonObject(); record.addProperty("format", 1); record.addProperty("kind", "completion"); record.addProperty("death", death.toString()); ref(record, "from", from); record.addProperty("revision", revision); record.addProperty("decision", decision); record.addProperty("recipient-kind", recipient.kind()); if (recipient.to() != null) ref(record, "to", recipient.to());
+ JsonArray moved = new JsonArray(); movedAt(journal, revision).forEach(moved::add); record.add("moved", moved); JsonArray retained = new JsonArray(); properties(from).forEach(retained::add); record.add("retained", retained); JsonObject counts = new JsonObject(); counts.addProperty("gear", moved.size()); record.add("counts", counts);
+ if (recipient.to() != null && !recipient.to().equals(from) && !retained.isEmpty()) throw new Conflict("New source holdings require a newer estate revision");
+ if (!guard.getAsBoolean()) throw new IOException("Estate changed before completion publication");
+ if (!strings(record, "retained").equals(properties(from))) throw new Conflict("Source holdings changed while checking completion guard");
+ checkReceipts(journal, death, from);
+ immutable(completionFile(death, revision), GearJson.bytes(record)); journal.getAsJsonObject("completions").add(Long.toString(revision), record); write(file, journal);
+ }
+ private boolean untouched(JsonObject entry) throws IOException {
+ return "planned".equals(text(entry, "phase")) && sourceMatches(entry, "before")
+ && ("station".equals(text(entry, "type")) || !Files.exists(path(text(entry, "target"))));
+ }
+ private static void estateEnvelope(JsonObject entry, UUID death, String decision, long revision, Owner from, Owner to) { entry.addProperty("death", death.toString()); entry.addProperty("decision", decision); entry.addProperty("revision", revision); ref(entry, "from", from); ref(entry, "to", to); }
+ private JsonObject journal(Path file, String kind, UUID death, Owner from) throws IOException {
+ try {
+ JsonObject raw = read(file);
+ if (!integer(raw, "format", 1) || !kind.equals(text(raw, "kind"))) throw new Conflict("Unsupported ownership journal");
+ if ("estate".equals(kind)) { if (!death.equals(uuid(text(raw, "death"))) || !from.equals(ref(raw, "from")) || !file.getFileName().toString().equals(death + ".json")) throw new Conflict("Estate journal full source differs"); }
+ else if (!file.getFileName().toString().equals(uuid(text(raw, "run")) + ".json")) throw new Conflict("Migration run differs");
+ var seen = new java.util.HashSet(); var selectors = new java.util.HashSet